diff options
Diffstat (limited to 'po/zh_TW.po')
| -rw-r--r-- | po/zh_TW.po | 5696 |
1 files changed, 2908 insertions, 2788 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 1b0cd6dd79..5efe4966f7 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,7 +1,7 @@ # Chinese (traditional) translations for Git package -# Git 套裝軟體的繁體中文翻譯. +# Git 套裝軟體的繁體中文翻譯。 # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> -# Copyright (C) 2019,2019 Yi-Jyun Pan <pan93412@gmail.com> +# Copyright (C) 2019,2020 Yi-Jyun Pan <pan93412@gmail.com> # This file is distributed under the same license as the Git package. # Contributors (CN): # - Fangyi Zhou <me AT fangyi.io> @@ -15,7 +15,6 @@ # - 依云 <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> -# Contributors (TW): # # Git glossary for Chinese translators # @@ -137,292 +136,515 @@ # upstream branch | 上游分支 # working tree | 工作區 # -# pan93412 <pan93412@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-12-30 08:48+0800\n" -"PO-Revision-Date: 2019-12-31 21:06+0800\n" -"Last-Translator: pan93412 <pan93412@gmail.com>\n" -"Language-Team: Chinese <chinese-l10n@googlegroups.com>\n" -"Language: zh_CN\n" +"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"PO-Revision-Date: 2020-03-15 01:48+0800\n" +"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" +"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 |" -" https://zhconvert.org\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.12.0\n" +"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" +"zhconvert.org\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 2.3\n" -#: add-interactive.c:347 +#: add-interactive.c:368 #, c-format -#| msgid "Huh (%s)?\n" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643 -#: builtin/rebase.c:2019 builtin/rebase.c:2063 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 msgid "could not read index" msgstr "不能讀取索引" -#: add-interactive.c:555 git-add--interactive.perl:269 +#: add-interactive.c:576 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "二進位" -#: add-interactive.c:613 git-add--interactive.perl:278 +#: add-interactive.c:634 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "無" -#: add-interactive.c:614 git-add--interactive.perl:314 +#: add-interactive.c:635 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "沒有修改" -#: add-interactive.c:651 git-add--interactive.perl:643 +#: add-interactive.c:672 git-add--interactive.perl:643 msgid "Update" msgstr "更新" -#: add-interactive.c:668 add-interactive.c:856 +#: add-interactive.c:689 add-interactive.c:877 #, c-format -#| msgid "could not stat '%s'" msgid "could not stage '%s'" msgstr "不能暫存 '%s'" -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409 -#: builtin/rebase.c:895 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 msgid "could not write index" msgstr "不能寫入索引" -#: add-interactive.c:677 git-add--interactive.perl:628 +#: add-interactive.c:698 git-add--interactive.perl:628 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 個路徑\n" -msgstr[1] "更新了 %d 個路徑\n" -#: add-interactive.c:695 git-add--interactive.perl:678 +#: add-interactive.c:716 git-add--interactive.perl:678 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "說明：%s 現已成為未追蹤的。\n" -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 #: builtin/reset.c:144 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗" -#: add-interactive.c:730 git-add--interactive.perl:655 +#: add-interactive.c:751 git-add--interactive.perl:655 msgid "Revert" msgstr "還原" -#: add-interactive.c:746 -#| msgid "could not parse HEAD" +#: add-interactive.c:767 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{樹}" -#: add-interactive.c:784 git-add--interactive.perl:631 +#: add-interactive.c:805 git-add--interactive.perl:631 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "還原了 %d 個路徑\n" -msgstr[1] "還原了 %d 個路徑\n" -#: add-interactive.c:835 git-add--interactive.perl:695 +#: add-interactive.c:856 git-add--interactive.perl:695 #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c:839 git-add--interactive.perl:689 +#: add-interactive.c:860 git-add--interactive.perl:689 msgid "Add untracked" msgstr "新增未追蹤的" -#: add-interactive.c:866 git-add--interactive.perl:625 +#: add-interactive.c:887 git-add--interactive.perl:625 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 個路徑\n" -msgstr[1] "增加了 %d 個路徑\n" -#: add-interactive.c:896 +#: add-interactive.c:917 #, c-format -#| msgid "ignoring unmerged: %s\n" msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" -#: add-interactive.c:914 git-add--interactive.perl:1376 +#: add-interactive.c:935 git-add--interactive.perl:1376 msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c:953 git-add--interactive.perl:1754 +#: add-interactive.c:974 git-add--interactive.perl:1754 msgid "Review diff" msgstr "檢視 diff" -#: add-interactive.c:981 -#| msgid "show matching files in the pager" +#: add-interactive.c:1002 msgid "show paths with changes" msgstr "顯示有變更的路徑" -#: add-interactive.c:983 +#: add-interactive.c:1004 msgid "add working tree state to the staged set of changes" msgstr "加入工作區狀態至暫存列表" -#: add-interactive.c:985 +#: add-interactive.c:1006 msgid "revert staged set of changes back to the HEAD version" msgstr "還原修改的暫存集至 HEAD 版本" -#: add-interactive.c:987 -#| msgid "select hunks interactively" +#: add-interactive.c:1008 msgid "pick hunks and update selectively" msgstr "挑選區塊並選擇性更新" -#: add-interactive.c:989 -#| msgid "reset HEAD and index" +#: add-interactive.c:1010 msgid "view diff between HEAD and index" msgstr "檢視 HEAD 及索引之間的差異" -#: add-interactive.c:991 +#: add-interactive.c:1012 msgid "add contents of untracked files to the staged set of changes" msgstr "加入未追蹤檔案的內容至暫存列表" -#: add-interactive.c:999 add-interactive.c:1048 +#: add-interactive.c:1020 add-interactive.c:1069 msgid "Prompt help:" msgstr "提示說明：" -#: add-interactive.c:1001 -#| msgid "select mainline parent" +#: add-interactive.c:1022 msgid "select a single item" msgstr "選擇單一項目" -#: add-interactive.c:1003 -#| msgid "select handling of signed tags" +#: add-interactive.c:1024 msgid "select a range of items" msgstr "選擇項目範圍" -#: add-interactive.c:1005 -#| msgid "%s has multiple values" +#: add-interactive.c:1026 msgid "select multiple ranges" msgstr "選擇多個範圍" -#: add-interactive.c:1007 add-interactive.c:1052 +#: add-interactive.c:1028 add-interactive.c:1073 msgid "select item based on unique prefix" msgstr "基於唯一前綴選擇項目" -#: add-interactive.c:1009 -#| msgid "use specified template file" +#: add-interactive.c:1030 msgid "unselect specified items" msgstr "取消選擇指定項目" -#: add-interactive.c:1011 -#| msgid "choose a diff algorithm" +#: add-interactive.c:1032 msgid "choose all items" msgstr "選擇所有項目" -#: add-interactive.c:1013 +#: add-interactive.c:1034 msgid "(empty) finish selecting" msgstr "（空）完成選取" -#: add-interactive.c:1050 -#| msgid "%s expects a numerical value" +#: add-interactive.c:1071 msgid "select a numbered item" msgstr "選擇編號過的項目" -#: add-interactive.c:1054 -#| msgid "empty exec command" +#: add-interactive.c:1075 msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 msgid "What now" msgstr "請選擇" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "staged" msgstr "快取" -#: add-interactive.c:1115 git-add--interactive.perl:213 +#: add-interactive.c:1136 git-add--interactive.perl:213 msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197 -#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 msgid "path" msgstr "路徑" -#: add-interactive.c:1122 -#| msgid "could not read index" +#: add-interactive.c:1143 msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c:15 -#, c-format -#| msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgid "Stage mode change [y,n,a,q,d%s,?]? " -msgstr "暫存模式變更 [y,n,a,q,d%s,?]？" +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "暫存模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:16 -#, c-format -#| msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgid "Stage deletion [y,n,a,q,d%s,?]? " -msgstr "暫存刪除動作 [y,n,a,q,d%s,?]？" +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " -#: add-patch.c:17 -#, c-format -#| msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgid "Stage this hunk [y,n,a,q,d%s,?]? " -msgstr "暫存此區塊 [y,n,a,q,d%s,?]？" +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 暫存此區塊\n" +"n - 不要暫存此區塊\n" +"q - 離開。不暫存此區塊及後面的全部區塊\n" +"a - 暫存此區塊和本檔案中後面的全部區塊\n" +"d - 不暫存此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? " + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 儲藏此區塊\n" +"n - 不要儲藏此區塊\n" +"q - 離開。不儲藏此區塊及後面的全部區塊\n" +"a - 儲藏此區塊和本檔案中後面的全部區塊\n" +"d - 不儲藏此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? " + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:111 +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 不暫存此區塊\n" +"n - 不要不暫存此區塊\n" +"q - 離開。不要不暫存此區塊及後面的全部區塊\n" +"a - 不暫存此區塊和本檔案中後面的全部區塊\n" +"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 在索引中套用此區塊\n" +"n - 不要在索引中套用此區塊\n" +"q - 離開。不要套用此區塊及後面的全部區塊\n" +"a - 套用此區塊和本檔案中後面的全部區塊\n" +"d - 不要套用此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。" + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 在工作區中捨棄此區塊\n" +"n - 不要在工作區中捨棄此區塊\n" +"q - 離開。不要捨棄此區塊及後面的全部區塊\n" +"a - 捨棄此區塊和本檔案中後面的全部區塊\n" +"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 在索引和工作區中捨棄此區塊\n" +"n - 不要在索引和工作區中捨棄此區塊\n" +"q - 離開。不要捨棄此區塊及後面的全部區塊\n" +"a - 捨棄此區塊和本檔案中後面的全部區塊\n" +"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 在索引和工作區中套用此區塊\n" +"n - 不要在索引和工作區中套用此區塊\n" +"q - 離開。不要套用此區塊及後面的全部區塊\n" +"a - 套用此區塊和本檔案中後面的全部區塊\n" +"d - 不要套用此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - 在工作區中套用此區塊\n" +"n - 不要在工作區中套用此區塊\n" +"q - 離開。不要套用此區塊及後面的全部區塊\n" +"a - 套用此區塊和本檔案中後面的全部區塊\n" +"d - 不要套用此區塊和本檔案中後面的全部區塊\n" + +#: add-patch.c:318 #, c-format -#| msgid "could not parse git header '%.*s'" msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:130 add-patch.c:134 +#: add-patch.c:337 add-patch.c:341 #, c-format -#| msgid "could not parse git header '%.*s'" msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:176 -#| msgid "could not parse %s" +#: add-patch.c:395 msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:194 -#| msgid "could not parse commit %s" +#: add-patch.c:414 msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:508 +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "無法執行 '%s'" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "interactive.diffFilter 的輸出不符" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "您的過濾器必須在其輸入及輸出行維持一對一的對應關係。" + +#: add-patch.c:761 #, c-format -#| msgid "bad config line %d in %s" msgid "" "expected context line #%d in\n" "%.*s" @@ -430,7 +652,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:523 +#: add-patch.c:776 #, c-format msgid "" "hunks do not overlap:\n" @@ -443,17 +665,12 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:799 git-add--interactive.perl:1112 +#: add-patch.c:1052 git-add--interactive.perl:1112 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:803 +#: add-patch.c:1056 #, c-format -#| msgid "" -#| "---\n" -#| "To remove '%s' lines, make them ' ' lines (context).\n" -#| "To remove '%s' lines, delete them.\n" -#| "Lines starting with %s will be removed.\n" msgid "" "---\n" "To remove '%c' lines, make them ' ' lines (context).\n" @@ -465,17 +682,8 @@ msgstr "" "要刪除 '%c' 開始的行，刪除它們。\n" "以 %c 開始的行將被刪除。\n" -#: add-patch.c:810 -#| msgid "" -#| "If the patch applies cleanly, the edited hunk will immediately be\n" -#| "marked for staging." -msgid "" -"If the patch applies cleanly, the edited hunk will immediately be\n" -"marked for staging.\n" -msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。\n" - #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:818 git-add--interactive.perl:1126 +#: add-patch.c:1070 git-add--interactive.perl:1126 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" @@ -484,12 +692,11 @@ msgstr "" "如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" "此次編輯被終止，此區塊不會被修改。\n" -#: add-patch.c:851 -#| msgid "could not parse git header '%.*s'" +#: add-patch.c:1103 msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:895 add-patch.c:1294 +#: add-patch.c:1148 msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -505,42 +712,24 @@ 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:952 git-add--interactive.perl:1239 +#: add-patch.c:1218 git-add--interactive.perl:1239 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? " -#: add-patch.c:1009 -#| msgid "" -#| "y - stage this hunk\n" -#| "n - do not stage this hunk\n" -#| "q - quit; do not stage this hunk or any of the remaining ones\n" -#| "a - stage this hunk and all later hunks in the file\n" -#| "d - do not stage this hunk or any of the later hunks in the file" -msgid "" -"y - stage this hunk\n" -"n - do not stage this hunk\n" -"q - quit; do not stage this hunk or any of the remaining ones\n" -"a - stage this and all the remaining hunks\n" -"d - do not stage this hunk nor any of the remaining hunks\n" -msgstr "" -"y - 暫存此區塊\n" -"n - 不要暫存此區塊\n" -"q - 離開。不暫存此區塊及後面的全部區塊\n" -"a - 暫存這個區塊及所有剩餘區塊\n" -"d - 不暫存這個區塊及任何剩餘區塊\n" - -#: add-patch.c:1016 -#| msgid "" -#| "g - select a hunk to go to\n" -#| "/ - search for a hunk matching the given regex\n" -#| "j - leave this hunk undecided, see next undecided hunk\n" -#| "J - leave this hunk undecided, see next hunk\n" -#| "k - leave this hunk undecided, see previous undecided hunk\n" -#| "K - leave this hunk undecided, see previous hunk\n" -#| "s - split the current hunk into smaller hunks\n" -#| "e - manually edit the current hunk\n" -#| "? - print help\n" +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "選取的區塊不會套用進索引！" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "無論如何都要套用到工作區嗎？" + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "未套用。\n" + +#: add-patch.c:1326 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -562,112 +751,102 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1137 add-patch.c:1147 -#| msgid "No previous hunk\n" +#: add-patch.c:1447 add-patch.c:1457 msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1142 add-patch.c:1152 -#| msgid "No next hunk\n" +#: add-patch.c:1452 add-patch.c:1462 msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1158 -#| msgid "No other hunks to goto\n" +#: add-patch.c:1468 msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1169 git-add--interactive.perl:1577 +#: add-patch.c:1479 git-add--interactive.perl:1577 msgid "go to which hunk (<ret> to see more)? " msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1170 git-add--interactive.perl:1579 +#: add-patch.c:1480 git-add--interactive.perl:1579 msgid "go to which hunk? " msgstr "跳轉到哪個區塊？" -#: add-patch.c:1181 +#: add-patch.c:1491 #, c-format -#| msgid "Invalid number: '%s'\n" msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1186 +#: add-patch.c:1496 #, c-format -#| msgid "Sorry, only %d hunk available.\n" -#| msgid_plural "Sorry, only %d hunks available.\n" msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -msgstr[1] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1195 -#| msgid "No other hunks to search\n" +#: add-patch.c:1505 msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1201 git-add--interactive.perl:1623 +#: add-patch.c:1511 git-add--interactive.perl:1623 msgid "search for regex? " msgstr "使用正規表示式搜尋？" -#: add-patch.c:1216 +#: add-patch.c:1526 #, c-format -#| msgid "Malformed search regexp %s: %s\n" msgid "Malformed search regexp %s: %s" msgstr "錯誤的正規表示式 %s：%s" -#: add-patch.c:1233 -#| msgid "No hunk matches the given pattern\n" +#: add-patch.c:1543 msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1240 -#| msgid "Sorry, cannot split this hunk\n" +#: add-patch.c:1550 msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1244 +#: add-patch.c:1554 #, c-format -#| msgid "Split into %d hunk.\n" -#| msgid_plural "Split into %d hunks.\n" msgid "Split into %d hunks." msgstr "分割為 %d 塊。" -#: add-patch.c:1248 -#| msgid "Sorry, cannot edit this hunk\n" +#: add-patch.c:1558 msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: advice.c:111 +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "'git apply' 失敗" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:164 +#: advice.c:168 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:166 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:168 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:170 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:172 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:174 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:182 +#: advice.c:186 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." @@ -675,23 +854,23 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:190 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:195 builtin/merge.c:1332 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:197 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:198 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:204 +#: advice.c:208 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -823,7 +1002,6 @@ msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" -msgstr[1] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" #: apply.c:1385 #, c-format @@ -903,7 +1081,6 @@ msgstr "無效的行首字元：'%c'" msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）" -msgstr[1] "區塊 #%d 成功套用於 %d（位移 %d 行）" #: apply.c:3069 #, c-format @@ -934,416 +1111,412 @@ msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位 msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" -#: apply.c:3162 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" -#: apply.c:3170 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" -#: apply.c:3188 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" -#: apply.c:3201 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 '%s'" -#: apply.c:3207 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" -#: apply.c:3228 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c:3351 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "不能簽出 %s" -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c:3411 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3440 apply.c:3683 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3526 apply.c:3698 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3535 apply.c:3706 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3570 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: apply.c:3573 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合併...\n" -#: apply.c:3589 apply.c:3593 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3605 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "無法回落到三方合併...\n" -#: apply.c:3619 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3624 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3650 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3723 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3725 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1320 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3934 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3937 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3957 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3962 +#: apply.c:3964 #, 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:3982 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:3986 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4001 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4093 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4100 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4103 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4112 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4122 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4260 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4294 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4300 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4308 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4314 apply.c:4459 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4357 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4361 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4431 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4529 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4537 +#: apply.c:4539 msgid "internal error" msgstr "內部錯誤" -#: apply.c:4540 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -msgstr[1] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4551 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4573 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 個片段成功應用。" -#: apply.c:4577 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個片段。" -#: apply.c:4696 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4704 +#: apply.c:4706 msgid "unrecognized input" msgstr "未能識別的輸入" -#: apply.c:4724 +#: apply.c:4726 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4881 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4908 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -msgstr[1] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4914 apply.c:4929 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -msgstr[1] "%d 行新增了空白字元誤用。" -#: apply.c:4922 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，應用了 %d 行。" -msgstr[1] "修復空白錯誤後，應用了 %d 行。" -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:4966 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "不要應用與給出路徑向符合的變更" -#: apply.c:4969 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "應用與給出路徑向符合的變更" -#: apply.c:4971 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "數字" -#: apply.c:4972 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:4975 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:4977 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:4981 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:4983 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:4985 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可應用" -#: apply.c:4987 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:4989 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:4991 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:4993 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:4996 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:4998 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一個修補檔不能應用則嘗試三方合併" -#: apply.c:5000 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5005 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "動作" -#: apply.c:5007 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5010 apply.c:5013 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5016 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5018 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5020 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中" -#: apply.c:5022 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "允許重疊的修補檔片段" -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "詳細輸出" -#: apply.c:5025 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5028 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔片段的標頭訊息中的行號" -#: apply.c:5030 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "根目錄" -#: apply.c:5031 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" @@ -1358,13 +1531,14 @@ msgstr "git archive --list" #: archive.c:16 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" -msgstr "git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]" +msgstr "" +"git archive --remote <版本庫> [--exec <指令>] [<選項>] <樹或提交> [<路徑>...]" #: archive.c:17 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本庫> [--exec <指令>] --list" -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" @@ -1405,8 +1579,8 @@ msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 #: parse-options.h:190 @@ -1442,7 +1616,7 @@ msgid "list supported archive formats" msgstr "列出支援的歸檔格式" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "版本庫" @@ -1481,17 +1655,17 @@ msgstr "未知歸檔格式 '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" -#: archive-tar.c:125 archive-zip.c:350 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "不能開啟資料物件 %s" -#: archive-tar.c:266 archive-zip.c:368 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:358 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "不能讀取 %s" @@ -1520,12 +1694,12 @@ msgstr "路徑不是有效的 UTF-8：%s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-zip.c:614 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "對於本系統時間戳太大：%<PRIuMAX>" @@ -1558,12 +1732,12 @@ msgstr "檔案 '%s' 包含錯誤的引用格式：%s" msgid "We cannot bisect more!\n" msgstr "我們無法進行更多的二分尋找！\n" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "不是一個有效的提交名 %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1572,7 +1746,7 @@ msgstr "" "合併基礎 %s 是壞的。\n" "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1581,7 +1755,7 @@ msgstr "" "合併基礎 %s 是新的。\n" "介於 %s 和 [%s] 之間的屬性已經被修改。\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1590,7 +1764,7 @@ msgstr "" "合併基礎 %s 是 %s。\n" "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1601,7 +1775,7 @@ msgstr "" "這種情況下 git 二分尋找無法正常工作。\n" "您可能弄錯了 %s 和 %s 版本？\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1612,36 +1786,36 @@ msgstr "" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分尋找中：合併基礎必須是經過測試的\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "需要一個 %s 版本" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "不能讀取檔案 '%s'" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "讀取二分尋找引用失敗" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同時為 %s 和 %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1650,22 +1824,20 @@ msgstr "" "沒有發現可測試的提交。\n" "可能您在執行時使用了錯誤的路徑參數？\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "（大概 %d 步）" -msgstr[1] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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" -msgstr[1] "二分尋找中：在此之後，還剩 %d 個版本待測試 %s\n" #: blame.c:2700 msgid "--contents and --reverse do not blend well." @@ -1679,10 +1851,10 @@ msgstr "不能將 --contents 和最終的提交物件名共用" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" @@ -1845,8 +2017,8 @@ msgstr "'%s' 不像是一個 v2 版本的包檔案" msgid "unrecognized header: %s%s (%d)" msgstr "未能識別的包頭：%s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 -#: builtin/commit.c:811 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "不能開啟 '%s'" @@ -1863,8 +2035,7 @@ msgstr "需要版本庫驗證一個包" #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" -msgstr[0] "這個包中含有這個引用：" -msgstr[1] "這個包中含有 %d 個引用：" +msgstr[0] "這個包中含有這 %d 個引用：" #: bundle.c:204 msgid "The bundle records a complete history." @@ -1874,8 +2045,7 @@ msgstr "這個包記錄一個完整歷史。" #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" -msgstr[0] "這個包需要這個引用：" -msgstr[1] "這個包需要 %d 個引用：" +msgstr[0] "這個包需要這 %d 個引用：" #: bundle.c:273 msgid "unable to dup bundle descriptor" @@ -1916,13 +2086,13 @@ msgstr "不能建立 '%s'" msgid "index-pack died" msgstr "index-pack 終止" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "無效的顏色值：%.*s" -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" @@ -1952,27 +2122,27 @@ msgstr "" "設定 \"git config advice.graftFileDeprecated false\"\n" "可關閉本消息" -#: commit.c:1152 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1155 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1158 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 沒有 GPG 簽名。" -#: commit.c:1161 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" -#: commit.c:1415 +#: commit.c:1417 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" @@ -1982,253 +2152,250 @@ msgstr "" "您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n" "設定為您項目所用的字元編碼。\n" -#: commit-graph.c:130 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" -#: commit-graph.c:195 +#: commit-graph.c:189 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交圖形簽名 %X 和簽名 %X 不符合" -#: commit-graph.c:202 +#: commit-graph.c:196 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交圖形版本 %X 和版本 %X 不符合" -#: commit-graph.c:209 +#: commit-graph.c:203 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" -#: commit-graph.c:232 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整" -#: commit-graph.c:243 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交圖形不正確的區塊位移 %08x%08x" -#: commit-graph.c:286 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交圖形區塊 id %08x 出現了多次" -#: commit-graph.c:350 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "提交圖形沒有基礎圖形區塊" -#: commit-graph.c:360 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "提交圖形鏈不符合" -#: commit-graph.c:407 +#: commit-graph.c:401 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" -#: commit-graph.c:433 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖形檔案" -#: commit-graph.c:564 commit-graph.c:624 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖形可能已損壞" -#: commit-graph.c:585 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "無法找到提交 %s" -#: commit-graph.c:858 builtin/am.c:1287 +#: commit-graph.c:852 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:1017 builtin/pack-objects.c:2641 +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: commit-graph.c:1049 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "正在載入提交圖中的已知提交" -#: commit-graph.c:1066 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "正在擴展提交圖中的可以取得提交" -#: commit-graph.c:1085 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交圖中的提交標記" -#: commit-graph.c:1104 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "正在計算提交圖世代數字" -#: commit-graph.c:1179 +#: commit-graph.c:1173 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 個包中尋找提交圖的提交" -msgstr[1] "正在 %d 個包中尋找提交圖的提交" -#: commit-graph.c:1192 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "新增包 %s 發生錯誤" -#: commit-graph.c:1196 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "為 %s 開啟索引發生錯誤" -#: commit-graph.c:1220 +#: commit-graph.c:1214 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "正在從 %d 個引用中尋找提交圖的提交" -msgstr[1] "正在從 %d 個引用中尋找提交圖的提交" -#: commit-graph.c:1240 +#: commit-graph.c:1234 #, c-format msgid "invalid commit object id: %s" msgstr "無效的提交物件 ID：%s" -#: commit-graph.c:1255 +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包物件中尋找提交圖的提交" -#: commit-graph.c:1270 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "正在計算提交圖中不同的提交" -#: commit-graph.c:1300 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "正在尋找提交圖中額外的邊" -#: commit-graph.c:1346 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1379 midx.c:814 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "不能建立 '%s'" -#: commit-graph.c:1451 +#: commit-graph.c:1445 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步寫出提交圖" -msgstr[1] "正在用 %d 步寫出提交圖" -#: commit-graph.c:1492 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "無法開啟提交圖形鏈檔案" -#: commit-graph.c:1504 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "無法重新命名基礎提交圖形檔案" -#: commit-graph.c:1524 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "無法重新命名暫時提交圖形檔案" -#: commit-graph.c:1635 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "正在掃描合併提交" -#: commit-graph.c:1646 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "意外的重複提交 ID %s" -#: commit-graph.c:1670 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "正在合併提交圖形" -#: commit-graph.c:1860 +#: commit-graph.c:1844 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "提交圖格式不能寫入 %d 個提交" -#: commit-graph.c:1871 +#: commit-graph.c:1855 msgid "too many commits to write graph" msgstr "提交太多不能畫圖" -#: commit-graph.c:1961 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" -#: commit-graph.c:1971 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" -#: commit-graph.c:1981 commit-graph.c:1996 +#: commit-graph.c:1964 commit-graph.c:1979 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" -#: commit-graph.c:1988 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "無法從提交圖形中解析提交 %s" -#: commit-graph.c:2006 +#: commit-graph.c:1989 msgid "Verifying commits in commit graph" msgstr "正在驗證提交圖中的提交" -#: commit-graph.c:2020 +#: commit-graph.c:2003 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "無法從提交圖形的物件庫中解析提交 %s" -#: commit-graph.c:2027 +#: commit-graph.c:2010 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" -#: commit-graph.c:2037 +#: commit-graph.c:2020 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交圖形父提交列表太長了" -#: commit-graph.c:2046 +#: commit-graph.c:2029 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交圖形父提交是 %s != %s" -#: commit-graph.c:2059 +#: commit-graph.c:2042 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交圖形父提交列表過早終止" -#: commit-graph.c:2064 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" -#: commit-graph.c:2068 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" -#: commit-graph.c:2083 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "提交圖形中的提交 %s 的世代號是 %u != %u" -#: commit-graph.c:2089 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" @@ -2275,7 +2442,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s" msgid "key does not contain variable name: %s" msgstr "鍵名沒有包含變數名：%s" -#: config.c:406 sequencer.c:2530 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "無效鍵名：%s" @@ -2411,7 +2578,7 @@ msgstr "%s 的取值格式錯誤：%s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1518 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" @@ -2436,105 +2603,105 @@ msgstr "不能解析設定物件 '%s'" msgid "failed to parse %s" msgstr "解析 %s 失敗" -#: config.c:1745 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2096 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2266 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2311 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2357 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2359 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2440 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2472 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2501 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2753 config.c:3077 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2764 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:2799 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:2824 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:2837 config.c:3090 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:2848 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2857 config.c:3095 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:2942 config.c:3192 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:2976 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:2978 builtin/remote.c:781 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3068 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3235 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -2697,19 +2864,19 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "正在檢查連通性" -#: connected.c:101 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "不能執行 'git rev-list'" -#: connected.c:121 +#: connected.c:130 msgid "failed write to rev-list" msgstr "寫入 rev-list 失敗" -#: connected.c:128 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "關閉 rev-list 的標準輸入失敗" @@ -2753,9 +2920,6 @@ msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" #: convert.c:291 #, c-format -#| msgid "" -#| "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as " -#| "working-tree-encoding." msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." @@ -2848,49 +3012,42 @@ msgstr "在將來" msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> 秒鐘前" -msgstr[1] "%<PRIuMAX> 秒鐘前" #: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> 分鐘前" -msgstr[1] "%<PRIuMAX> 分鐘前" #: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> 小時前" -msgstr[1] "%<PRIuMAX> 小時前" #: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> 天前" -msgstr[1] "%<PRIuMAX> 天前" #: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> 周前" -msgstr[1] "%<PRIuMAX> 周前" #: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> 個月前" -msgstr[1] "%<PRIuMAX> 個月前" #: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" msgstr[0] "%<PRIuMAX> 年" -msgstr[1] "%<PRIuMAX> 年" #. TRANSLATORS: "%s" is "<n> years" #: date.c:192 @@ -2898,14 +3055,12 @@ msgstr[1] "%<PRIuMAX> 年" msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> 個月前" -msgstr[1] "%s %<PRIuMAX> 個月前" #: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" msgstr[0] "%<PRIuMAX> 年前" -msgstr[1] "%<PRIuMAX> 年前" #: delta-islands.c:272 msgid "Propagating island marks" @@ -3022,7 +3177,7 @@ msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" #: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 -#: parse-options.c:199 parse-options.c:203 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" @@ -3075,7 +3230,8 @@ msgstr "--color-moved-ws 中的無效模式 '%s' " msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" -msgstr "diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" +msgstr "" +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" #: diff.c:5020 diff.c:5040 #, c-format @@ -3525,61 +3681,59 @@ msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" -#: dir.c:554 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c:664 +#: dir.c:695 dir.c:724 dir.c:737 #, c-format -#| msgid "unrecognized option: '%s'" msgid "unrecognized pattern: '%s'" msgstr "無法識別樣式：「%s」" -#: dir.c:682 dir.c:696 +#: dir.c:754 dir.c:768 #, c-format -#| msgid "unrecognized option: '%s'" msgid "unrecognized negative pattern: '%s'" msgstr "無法識別反向模式：「%s」" -#: dir.c:714 +#: dir.c:786 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" -#: dir.c:724 +#: dir.c:796 msgid "disabling cone pattern matching" msgstr "停用 cone 樣式符合模式" -#: dir.c:1101 +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:2078 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2415 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2539 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被禁用" -#: dir.c:3343 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3388 dir.c:3393 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3422 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -3824,7 +3978,7 @@ msgstr "處理要取得的引用發生錯誤：%d" msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1785 builtin/clone.c:688 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" @@ -3838,19 +3992,19 @@ msgstr "沒有這樣的遠端引用 %s" msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" -#: gpg-interface.c:223 +#: gpg-interface.c:408 +msgid "gpg failed to sign the data" +msgstr "gpg 無法為資料簽名" + +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "不能建立暫存檔" -#: gpg-interface.c:226 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "無法將分離式簽名寫入 '%s'" -#: gpg-interface.c:390 -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽名" - #: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" @@ -3864,18 +4018,18 @@ msgstr "" "提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" "功能" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "對 '%s' 呼叫 stat 失敗" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s'：讀取不完整" @@ -3925,7 +4079,6 @@ msgid "Low-level Commands / Interrogators" msgstr "低級指令/詢問者" #: help.c:37 -#| msgid "Low-level Commands / Synching Repositories" msgid "Low-level Commands / Syncing Repositories" msgstr "低級指令 / 同步版本庫" @@ -4010,9 +4163,6 @@ msgid_plural "" msgstr[0] "" "\n" "最類似的指令有" -msgstr[1] "" -"\n" -"最類似的指令有" #: help.c:714 msgid "git version [<options>]" @@ -4033,9 +4183,6 @@ msgid_plural "" msgstr[0] "" "\n" "您指的是這個嗎？" -msgstr[1] "" -"\n" -"您指的是這其中的某一個嗎？" #: ident.c:349 msgid "" @@ -4090,7 +4237,7 @@ msgstr "不允許空的姓名（對於 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中僅包含禁用字元：%s" -#: ident.c:436 builtin/commit.c:631 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "無效的日期格式：%s" @@ -4173,110 +4320,110 @@ msgstr "不能建立 '%s.lock'：%s" msgid "failed to read the cache" msgstr "讀取快取失敗" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 -#: builtin/stash.c:264 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "（壞提交）\n" -#: merge-recursive.c:390 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" -#: merge-recursive.c:399 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "建立路徑 '%s'%s 失敗" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "刪除 %s 以便為子目錄留出空間\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr "：可能是一個目錄/檔案衝突？" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能讀取物件 %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 應為資料物件" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "開啟 '%s' 失敗：%s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "建立符號連結 '%s' 失敗：%s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何處理 %06o %s '%s'" -#: merge-recursive.c:1199 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "無法合併子模組 %s （沒有簽出）" -#: merge-recursive.c:1206 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "無法合併子模組 %s（提交不存在）" -#: merge-recursive.c:1213 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" -#: merge-recursive.c:1221 merge-recursive.c:1233 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模組 %s 快轉到如下提交：" -#: merge-recursive.c:1224 merge-recursive.c:1236 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快轉子模組 %s" -#: merge-recursive.c:1259 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" -#: merge-recursive.c:1263 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "無法合併子模組 %s（非快轉）" -#: merge-recursive.c:1264 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模組的一個可能的合併方案：\n" -#: merge-recursive.c:1267 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -4292,31 +4439,31 @@ msgstr "" "\n" "以接受此建議。\n" -#: merge-recursive.c:1276 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "無法合併子模組 %s （發現多個合併）" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "無法執行內部合併" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "不能新增 %s 至物件庫" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "自動合併 %s" -#: merge-recursive.c:1410 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4325,7 +4472,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本被保留。" -#: merge-recursive.c:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4334,7 +4481,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" -#: merge-recursive.c:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -4343,7 +4490,7 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" "本保留在 %8$s 中。" -#: merge-recursive.c:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -4352,40 +4499,41 @@ msgstr "" "衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "重新命名" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "重新命名" -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒絕遺失髒檔案 '%s'" -#: merge-recursive.c:1624 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" -#: merge-recursive.c:1682 +#: merge-recursive.c:1645 #, 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" +msgstr "" +"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" -#: merge-recursive.c:1718 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -4394,18 +4542,18 @@ msgstr "" "衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" "分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr "（留下未解決）" -#: merge-recursive.c:1851 +#: merge-recursive.c:1793 #, 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:2114 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -4415,7 +4563,7 @@ msgstr "" "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" "多個其它目錄，沒有目錄包含大部分檔案。" -#: merge-recursive.c:2146 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -4424,7 +4572,7 @@ msgstr "" "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" "放在：%s。" -#: merge-recursive.c:2156 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -4433,7 +4581,7 @@ msgstr "" "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" "些路徑放置於此：%s" -#: merge-recursive.c:2248 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -4442,66 +4590,67 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" "命名目錄 %4$s->%5$s" -#: merge-recursive.c:2493 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" -#: merge-recursive.c:3019 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "不能讀取物件 %s" -#: merge-recursive.c:3022 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "物件 %s 不是一個資料物件" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modify" msgstr "修改" -#: merge-recursive.c:3086 +#: merge-recursive.c:3028 msgid "modified" msgstr "修改" -#: merge-recursive.c:3098 +#: merge-recursive.c:3040 msgid "content" msgstr "內容" -#: merge-recursive.c:3102 +#: merge-recursive.c:3044 msgid "add/add" msgstr "新增/新增" -#: merge-recursive.c:3125 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3147 git-submodule.sh:993 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "子模組" -#: merge-recursive.c:3148 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-recursive.c:3178 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 為名新增" -#: merge-recursive.c:3261 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." -msgstr "路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" +msgstr "" +"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。" -#: merge-recursive.c:3264 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4510,7 +4659,7 @@ msgstr "" "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" "動到 %s。" -#: merge-recursive.c:3268 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4519,7 +4668,7 @@ msgstr "" "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" "其移動到 %5$s。" -#: merge-recursive.c:3271 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4528,59 +4677,58 @@ msgstr "" "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " "中，建議將其移動到 %5$s。" -#: merge-recursive.c:3385 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "刪除 %s" -#: merge-recursive.c:3408 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "檔案/目錄" -#: merge-recursive.c:3413 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "目錄/檔案" -#: merge-recursive.c:3420 +#: merge-recursive.c:3362 #, 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:3371 #, c-format msgid "Adding %s" msgstr "新增 %s" -#: merge-recursive.c:3438 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3482 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "已經是最新的！" -#: merge-recursive.c:3491 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3595 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3608 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" -msgstr[1] "發現 %u 個共同祖先：" -#: merge-recursive.c:3658 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3717 +#: merge-recursive.c:3659 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4589,12 +4737,12 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-recursive.c:3814 +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -4676,7 +4824,6 @@ msgid "failed to locate object %d in packfile" msgstr "在 packfile 中定位物件 %d 失敗" #: midx.c:842 -#| msgid "error preparing packfile from multi-pack-index" msgid "Adding packfiles to multi-pack-index" msgstr "正在新增 packfile 至多包索引" @@ -4686,7 +4833,6 @@ msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" #: midx.c:973 -#| msgid "Write and verify multi-pack-indexes" msgid "Writing chunks to multi-pack-index" msgstr "寫入區塊至多包索引" @@ -4706,7 +4852,6 @@ msgid "" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" #: midx.c:1128 -#| msgid "Verifying OID order in MIDX" msgid "Verifying OID order in multi-pack-index" msgstr "正在驗證多包索引中的物件 ID 順序" @@ -4739,12 +4884,10 @@ msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" #: midx.c:1220 -#| msgid "prune unreferenced objects" msgid "Counting referenced objects" msgstr "正在計算引用物件" #: midx.c:1230 -#| msgid "Looking for referenced packfiles" msgid "Finding and deleting unreferenced packfiles" msgstr "正在尋找並刪除沒有參考的 packfile" @@ -4830,25 +4973,30 @@ msgstr "物件 %s 有未知的類型 id %d" msgid "unable to parse object: %s" msgstr "不能解析物件：%s" -#: object.c:266 object.c:277 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "雜湊值與 %s 不符合" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:1888 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1892 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "不能得到 %s 的大小" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4864,7 +5012,7 @@ msgstr "%s 與 %s 不相容" msgid "%s : incompatible with something else" msgstr "%s：和其它的不相容" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s 不取值" @@ -4874,41 +5022,41 @@ msgstr "%s 不取值" msgid "%s isn't available" msgstr "%s 不可用" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" -msgstr "你的意思是 `--%s`（有兩個短線？）" +msgid "did you mean `--%s` (with two dashes)?" +msgstr "你的意思是 `--%s`（有兩個短線）嗎？" -#: parse-options.c:860 +#: parse-options.c:857 #, c-format msgid "unknown option `%s'" msgstr "未知選項 `%s'" -#: parse-options.c:862 +#: parse-options.c:859 #, c-format msgid "unknown switch `%c'" msgstr "未知開關 `%c'" -#: parse-options.c:864 +#: parse-options.c:861 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字串中未知的非 ascii 字元選項：`%s'" -#: parse-options.c:888 +#: parse-options.c:885 msgid "..." msgstr "..." -#: parse-options.c:907 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "用法：%s" @@ -4916,22 +5064,22 @@ msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr " 或：%s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:916 +#: parse-options.c:913 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:952 msgid "-NUM" msgstr "-數字" -#: parse-options.c:969 +#: parse-options.c:966 #, c-format msgid "alias of --%s" msgstr "--%s 的別名" @@ -5014,25 +5162,25 @@ msgstr "%s：'literal' 和 'glob' 不相容" #: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s：'%s' 在版本庫之外" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" -#: pathspec.c:516 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助記符：'%c'）" -#: pathspec.c:526 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" -#: pathspec.c:593 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路徑規格 '%s' 位於符號連結中" -#: pathspec.c:638 +#: pathspec.c:639 #, c-format msgid "line is badly quoted: %s" msgstr "某行不應該被括號括住：%s" @@ -5118,7 +5266,7 @@ msgstr "不能啟動 `log`" msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:96 sequencer.c:5163 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" @@ -5171,16 +5319,16 @@ msgstr "無法在索引中新增 '%s'" msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1325 +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1531 +#: read-cache.c:1536 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1646 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -5189,7 +5337,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1656 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -5198,150 +5346,160 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1712 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1715 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1724 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1754 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1756 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1793 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1809 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1866 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1869 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1872 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2119 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2132 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2165 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2169 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2173 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2177 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s：無法對索引檔案執行 map 動作" -#: read-cache.c:2219 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2246 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2278 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2325 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3137 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3149 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3174 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3323 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" +"或者您可以用 'git rebase --abort' 終止重定基底。\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。" -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -5381,14 +5539,13 @@ msgstr "" "\n" "可以對這些行重新排序，將從上至下執行。\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "重定基底 %s 到 %s（%d 個提交）" -msgstr[1] "重定基底 %s 到 %s（%d 個提交）" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -5396,7 +5553,7 @@ msgstr "" "\n" "不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -5404,7 +5561,7 @@ msgstr "" "\n" "如果您在這裡刪除一行，對應的提交將會遺失。\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -5418,7 +5575,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -5428,22 +5585,19 @@ msgstr "" "然而，如果您刪除全部內容，重定基底動作將會終止。\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "注意空提交已被備註掉" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "不能複製 '%s' 至 '%s'。" +msgid "could not write '%s'." +msgstr "不能寫入 '%s'。" -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -5452,7 +5606,7 @@ msgstr "" "警告：一些提交可能被意外捨棄。\n" "捨棄的提交（從新到舊）：\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -5468,6 +5622,13 @@ msgstr "" "可選值有：ignore、warn、error。\n" "\n" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "不能讀取 '%s'。" + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5503,15 +5664,15 @@ msgstr "引用 '%s' 已經存在" msgid "unexpected object ID when writing '%s'" msgstr "寫入 '%s' 時意外的物件 ID" -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 #: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1031 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 '%s' 進行寫入" @@ -5565,18 +5726,18 @@ msgstr "'%s' 已存在，無法建立 '%s'" msgid "cannot process '%s' and '%s' at the same time" msgstr "無法同時處理 '%s' 和 '%s'" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "無法刪除引用 %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "無法刪除引用 %s：%s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "無法刪除引用：%s" @@ -5840,45 +6001,45 @@ msgstr "選項 `%s' 必須指向一個提交" msgid "config remote shorthand cannot begin with '/': %s" msgstr "設定的遠端短名稱不能以 '/' 開始：%s" -#: remote.c:413 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "提供了一個以上的 receivepack，使用第一個" -#: remote.c:421 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "提供了一個以上的 uploadpack，使用第一個" -#: remote.c:611 +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "不能同時取得 %s 和 %s 至 %s" -#: remote.c:615 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常追蹤 %s，而非 %s" -#: remote.c:619 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s 同時追蹤 %s 和 %s" -#: remote.c:687 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "模式的鍵 '%s' 沒有 '*'" -#: remote.c:697 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "模式的值 '%s' 沒有 '*'" -#: remote.c:1003 +#: remote.c:1004 #, c-format msgid "src refspec %s does not match any" msgstr "源引用表達式 %s 沒有符合" -#: remote.c:1008 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "源引用表達式 %s 符合超過一個" @@ -5887,7 +6048,7 @@ msgstr "源引用表達式 %s 符合超過一個" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1023 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5909,7 +6070,7 @@ msgstr "" "\n" "都不行，所以我們已放棄。您必須給出完整的引用。" -#: remote.c:1043 +#: remote.c:1044 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5919,7 +6080,7 @@ msgstr "" "引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n" "'%s:refs/heads/%s' 推送嗎？" -#: remote.c:1048 +#: remote.c:1049 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5929,7 +6090,7 @@ msgstr "" "引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1053 +#: remote.c:1054 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5939,7 +6100,7 @@ msgstr "" "引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1058 +#: remote.c:1059 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5949,127 +6110,125 @@ msgstr "" "引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n" "'%s:refs/tags/%s' 推送嗎？" -#: remote.c:1094 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s 無法被解析為分支" -#: remote.c:1105 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "無法刪除 '%s'：遠端引用不存在" -#: remote.c:1117 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "目標引用表達式 %s 符合超過一個" -#: remote.c:1124 +#: remote.c:1125 #, c-format msgid "dst ref %s receives from more than one src" msgstr "目標引用 %s 接收超過一個源" -#: remote.c:1627 remote.c:1728 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD 沒有指向一個分支" -#: remote.c:1636 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "沒有此分支：'%s'" -#: remote.c:1639 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未給分支 '%s' 設定上游" -#: remote.c:1645 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" -#: remote.c:1660 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支" -#: remote.c:1672 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" -#: remote.c:1682 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "向 '%s' 推送引用規格未包含 '%s'" -#: remote.c:1695 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "推送無目標（push.default 是 'nothing'）" -#: remote.c:1717 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "無法解析 'simple' 推送至一個單獨的目標" -#: remote.c:1843 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "無法找到遠端引用 %s" -#: remote.c:1856 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* 在本機忽略可笑的引用 '%s'" -#: remote.c:2019 +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" -#: remote.c:2023 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" -#: remote.c:2026 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支與上游分支 '%s' 一致。\n" -#: remote.c:2030 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指向不同的提交。\n" -#: remote.c:2033 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr " （使用 \"%s\" 檢視詳情）\n" -#: remote.c:2037 +#: remote.c:2038 #, 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" -msgstr[1] "您的分支領先 '%s' 共 %d 個提交。\n" -#: remote.c:2043 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr " （使用 \"git push\" 來發布您的本機提交）\n" -#: remote.c:2046 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" -msgstr[1] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" # 譯者：請維持前導空格 -#: remote.c:2054 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" -#: remote.c:2057 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6080,16 +6239,13 @@ msgid_plural "" msgstr[0] "" "您的分支和 '%s' 出現了偏離，\n" "並且分別有 %d 和 %d 處不同的提交。\n" -msgstr[1] "" -"您的分支和 '%s' 出現了偏離，\n" -"並且分別有 %d 和 %d 處不同的提交。\n" # 譯者：請維持前導空格 -#: remote.c:2067 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " （使用 \"git pull\" 來合併遠端分支）\n" -#: remote.c:2250 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "無法解析期望的物件名 '%s'" @@ -6104,7 +6260,7 @@ msgstr "錯誤的取代引用名稱：%s" msgid "duplicate replace ref: %s" msgstr "重複的取代引用：%s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "物件 %s 的取代層級太深" @@ -6167,8 +6323,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -6219,16 +6375,16 @@ msgstr "--first-parent 與 --bisect 不相容" msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:762 +#: run-command.c:763 msgid "open /dev/null failed" msgstr "不能開啟 /dev/null" -#: run-command.c:1268 +#: run-command.c:1269 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1332 +#: run-command.c:1333 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6273,39 +6429,39 @@ msgstr "接收端不支援原子推送" msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" -#: sequencer.c:189 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "無效的提交訊息清理模式 '%s'" -#: sequencer.c:294 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:323 +#: sequencer.c:325 msgid "revert" msgstr "還原" -#: sequencer.c:325 +#: sequencer.c:327 msgid "cherry-pick" msgstr "揀選" -#: sequencer.c:327 -msgid "rebase -i" -msgstr "rebase -i" - #: sequencer.c:329 +msgid "rebase" +msgstr "rebase" + +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "未知動作：%d" -#: sequencer.c:387 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -6313,7 +6469,7 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "指令標記修正後的檔案" -#: sequencer.c:390 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -6322,115 +6478,110 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "對修正後的檔案做標記，然後用 'git commit' 提交" -#: sequencer.c:403 sequencer.c:2993 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" -#: sequencer.c:410 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 -#: sequencer.c:3277 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117 -#: builtin/rebase.c:589 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "不能讀取 '%s'" -#: sequencer.c:464 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本機修改將被%s覆蓋。" -#: sequencer.c:468 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或儲藏後再繼續。" -#: sequencer.c:500 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s：快轉" -#: sequencer.c:539 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "無效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:633 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：無法寫入新索引檔案" -#: sequencer.c:650 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "不能更新快取樹" -#: sequencer.c:664 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:744 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中沒有 key" -#: sequencer.c:755 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" -#: sequencer.c:802 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已經給出 'GIT_AUTHOR_NAME'" -#: sequencer.c:807 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已經給出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:812 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已經給出 'GIT_AUTHOR_DATE'" -#: sequencer.c:816 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "未知變數 '%s'" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:825 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:902 sequencer.c:1427 -#| msgid "malformed input line: '%s'." -msgid "malformed ident line" -msgstr "識別行的格式錯誤" - -#: sequencer.c:925 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6459,11 +6610,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1218 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 掛鉤失敗" -#: sequencer.c:1224 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6487,7 +6638,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1237 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6510,331 +6661,325 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1279 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "無法找到新建立的提交" -#: sequencer.c:1281 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "不能解析新建立的提交" -#: sequencer.c:1327 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "建立提交後，不能解析 HEAD" -#: sequencer.c:1329 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "分離開頭指標" # 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1333 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c:1354 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1356 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1411 sequencer.c:2055 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1431 -#| msgid "refresh stat information" -msgid "corrupted author without date information" -msgstr "" - -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: sequencer.c:1480 sequencer.c:1550 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1577 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1582 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1656 sequencer.c:1767 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "未知指令：%d" -#: sequencer.c:1714 sequencer.c:1739 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "這是一個 %d 個提交的組合。" -#: sequencer.c:1724 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1726 sequencer.c:3304 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:1728 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "不能讀取 HEAD 的提交說明" -#: sequencer.c:1734 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "不能寫 '%s'" -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "這是第一個提交說明：" -#: sequencer.c:1749 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "不能讀取 %s 的提交說明" -#: sequencer.c:1756 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "這是提交說明 #%d：" -#: sequencer.c:1762 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交說明 #%d 將被跳過：" -#: sequencer.c:1850 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "您的索引檔案未完成合併。" -#: sequencer.c:1857 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "不能修復根提交" -#: sequencer.c:1876 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c:1884 sequencer.c:1892 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 沒有第 %d 個父提交" -#: sequencer.c:1898 +#: sequencer.c:1804 #, 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:1917 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1982 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能將 '%s' 重新命名為 '%s'" -#: sequencer.c:2037 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "不能還原 %s... %s" -#: sequencer.c:2038 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "不能應用 %s... %s" -#: sequencer.c:2105 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：無法讀取索引" -#: sequencer.c:2112 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：無法重新整理索引" -#: sequencer.c:2189 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: sequencer.c:2198 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" -#: sequencer.c:2235 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" -msgstr "無法解析 '%.*s'" +msgid "could not parse '%s'" +msgstr "無法解析 '%s'" -#: sequencer.c:2289 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "無效行 %d：%.*s" -#: sequencer.c:2300 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "沒有父提交的情況下不能 '%s'" -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197 -#: builtin/rebase.c:223 builtin/rebase.c:248 -#, c-format -msgid "could not read '%s'." -msgstr "不能讀取 '%s'。" - -#: sequencer.c:2384 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "正在取消一個進行中的揀選" -#: sequencer.c:2391 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "正在取消一個進行中的還原" -#: sequencer.c:2435 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "請用 'git rebase --edit-todo' 來修改。" -#: sequencer.c:2437 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清單：'%s'" -#: sequencer.c:2442 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "沒有解析提交。" -#: sequencer.c:2453 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "不能在還原提交中執行揀選。" -#: sequencer.c:2455 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "不能在揀選中執行還原提交。" -#: sequencer.c:2533 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: sequencer.c:2630 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2646 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:2736 sequencer.c:4463 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2752 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "一個還原動作已在進行" -#: sequencer.c:2754 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2757 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "揀選動作已在進行" -#: sequencer.c:2759 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2773 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能建立序列目錄 '%s'" -#: sequencer.c:2788 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:2848 sequencer.c:4209 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c:2850 sequencer.c:2861 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2852 sequencer.c:2896 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:2882 builtin/grep.c:736 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: sequencer.c:2884 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "不能讀取 '%s'：%s" -#: sequencer.c:2885 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "意外的檔案結束" -#: sequencer.c:2891 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" -#: sequencer.c:2902 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" -#: sequencer.c:2943 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "沒有正在進行的還原" -#: sequencer.c:2951 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "沒有正在進行的揀選" -#: sequencer.c:2961 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "無法跳過這個提交" -#: sequencer.c:2968 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "沒有要跳過的" -#: sequencer.c:2971 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" @@ -6843,21 +6988,21 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:3095 sequencer.c:4121 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:3134 sequencer.c:4101 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:3151 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "無法複製 '%s' 至 '%s'" -#: sequencer.c:3159 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6876,23 +7021,23 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3169 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能應用 %s... %.*s" -#: sequencer.c:3176 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "不能合併 %.*s" -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" # 譯者：請維持前導空格 -#: sequencer.c:3221 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -6907,11 +7052,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3227 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "並且修改索引和/或工作區\n" -#: sequencer.c:3233 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -6928,72 +7073,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3294 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3348 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3353 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹。" -#: sequencer.c:3436 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3467 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3489 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3498 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3510 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3526 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3688 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:3704 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:3773 builtin/rebase.c:733 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "已應用 autostash。\n" -#: sequencer.c:3785 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -7004,31 +7149,26 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3849 -#, c-format -msgid "could not checkout %s" -msgstr "不能簽出 %s" - -#: sequencer.c:3863 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s：不是一個有效的物件 ID" -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:3883 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3885 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3893 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -7048,48 +7188,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3979 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:4050 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:4109 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:4114 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:4128 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4221 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4230 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4232 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4234 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4237 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7098,68 +7238,59 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4273 sequencer.c:4312 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4327 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4334 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4440 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4444 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4479 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:4952 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:4955 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:5113 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 終止重定基底。\n" - -#: sequencer.c:5226 sequencer.c:5243 +#: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5257 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "無法跳過不必要的揀選" -#: sequencer.c:5351 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" #: setup.c:124 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' 在版本庫之外" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' 在位於 '%s' 的版本庫之外" -#: setup.c:174 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -7168,7 +7299,7 @@ msgstr "" "%s：工作區中無此路徑。\n" "使用指令 'git <指令> -- <路徑>...' 來指定本機不存在的路徑。" -#: setup.c:187 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -7179,12 +7310,12 @@ msgstr "" "使用 '--' 來分隔版本和路徑，例如：\n" "'git <指令> [<版本>...] -- [<檔案>...]'" -#: setup.c:236 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "選項 '%s' 必須在其他非選項參數之前" -#: setup.c:255 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -7195,92 +7326,92 @@ msgstr "" "使用 '--' 來分隔版本和路徑，例如：\n" "'git <指令> [<版本>...] -- [<檔案>...]'" -#: setup.c:391 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "無法使用無效設定來建立工作區" -#: setup.c:395 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "該動作必須在一個工作區中執行" -#: setup.c:541 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" -#: setup.c:549 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "發現未知的版本庫擴展：" -#: setup.c:568 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "開啟 '%s' 發生錯誤" -#: setup.c:570 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "檔案太大，無法作為 .git 檔案：'%s'" -#: setup.c:572 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "讀取 %s 發生錯誤" -#: setup.c:574 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "無效的 gitfile 格式：%s" -#: setup.c:576 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile 中沒有路徑：%s" -#: setup.c:578 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "不是一個 git 版本庫：%s" -#: setup.c:677 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" -#: setup.c:691 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "不是一個 git 版本庫：'%s'" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "不能切換目錄到 '%s'" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: setup.c:852 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "取得 '%*s%s%s' 狀態（stat）失敗" -#: setup.c:1090 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "不能讀取目前工作目錄" -#: setup.c:1099 setup.c:1105 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "不能切換到 '%s'" -#: setup.c:1110 +#: setup.c:1128 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" -#: setup.c:1116 +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -7289,7 +7420,7 @@ msgstr "" "不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" "停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" -#: setup.c:1227 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -7298,15 +7429,15 @@ msgstr "" "參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" "檔案所有者必須始終擁有讀寫權限。" -#: setup.c:1271 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "不能開啟或者複製 /dev/null" -#: setup.c:1286 +#: setup.c:1304 msgid "fork failed" msgstr "fork 失敗" -#: setup.c:1291 +#: setup.c:1309 msgid "setsid failed" msgstr "setsid 失敗" @@ -7386,194 +7517,194 @@ msgstr "mmap 失敗" msgid "object file %s is empty" msgstr "物件檔案 %s 為空" -#: sha1-file.c:1252 sha1-file.c:2392 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "損壞的鬆散物件 '%s'" -#: sha1-file.c:1254 sha1-file.c:2396 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "鬆散物件 '%s' 後面有垃圾資料" -#: sha1-file.c:1296 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "無效的物件類型" -#: sha1-file.c:1380 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" -#: sha1-file.c:1383 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "無法解開 %s 頭部" -#: sha1-file.c:1389 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" -#: sha1-file.c:1392 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "無法解析 %s 頭部" -#: sha1-file.c:1584 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "讀取物件 %s 失敗" -#: sha1-file.c:1588 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" -#: sha1-file.c:1592 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "鬆散物件 %s（儲存在 %s）已損壞" -#: sha1-file.c:1596 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包物件 %s（儲存在 %s）已損壞" -#: sha1-file.c:1699 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "無法寫檔案 %s" -#: sha1-file.c:1706 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "無法為 '%s' 設定權限" -#: sha1-file.c:1713 +#: sha1-file.c:1760 msgid "file write error" msgstr "檔案寫錯誤" -#: sha1-file.c:1732 +#: sha1-file.c:1780 msgid "error when closing loose object file" msgstr "關閉鬆散物件檔案時發生錯誤" -#: sha1-file.c:1797 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" -#: sha1-file.c:1799 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "無法建立暫存檔" -#: sha1-file.c:1823 +#: sha1-file.c:1871 msgid "unable to write loose object file" msgstr "不能寫鬆散物件檔案" -#: sha1-file.c:1829 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能壓縮新物件 %s（%d）" -#: sha1-file.c:1833 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" -#: sha1-file.c:1837 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不穩定物件源資料搞糊塗了" -#: sha1-file.c:1847 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上呼叫 utime() 失敗" -#: sha1-file.c:1922 +#: sha1-file.c:1972 #, c-format msgid "cannot read object for %s" msgstr "不能讀取物件 %s" -#: sha1-file.c:1962 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "損壞的提交" -#: sha1-file.c:1970 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "損壞的標籤" -#: sha1-file.c:2069 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 時讀取錯誤" -#: sha1-file.c:2072 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 時讀入不完整" -#: sha1-file.c:2145 sha1-file.c:2154 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入資料庫失敗" -#: sha1-file.c:2160 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支援的檔案類型" -#: sha1-file.c:2184 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一個有效的物件" -#: sha1-file.c:2186 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一個有效的 '%s' 物件" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "不能開啟 %s" -#: sha1-file.c:2403 sha1-file.c:2455 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的雜湊值不符合（預期 %s）" -#: sha1-file.c:2427 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" -#: sha1-file.c:2432 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "無法解壓縮 %s 的頭部" -#: sha1-file.c:2438 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "無法解析 %s 的頭部" -#: sha1-file.c:2449 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "無法解壓縮 %s 的內容" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "短 SHA1 %s 存在歧義" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "候選者有：" -#: sha1-name.c:797 +#: sha1-name.c:796 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" @@ -7594,61 +7725,124 @@ msgstr "" "引用，可能需要刪除它們。執行 \"git config advice.objectNameWarning\n" "false\" 指令關閉本消息通知。" +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "'%.*s' 的日誌只能回到 %s" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "'%.*s' 的日誌只有 %d 個項目" + +#: sha1-name.c:1689 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"'%s' 路徑存在，但不是 '%s'\n" +"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" + +#: sha1-name.c:1704 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "'%s' 路徑不存在於 '%.*s'" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"'%s' 路徑在索引，但不在 %d 暫存區\n" +"提示：你在說 ':%d:%s' 嗎？" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"'%s' 路徑在索引，但不是 '%s'\n" +"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" + +#: sha1-name.c:1756 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "磁碟上存在 '%s' 路徑，但不在索引中" + +#: sha1-name.c:1758 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" + +#: sha1-name.c:1771 +msgid "relative path syntax can't be used outside working tree" +msgstr "相對路徑與法不能用在工作區外" + +#: sha1-name.c:1909 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "'%.*s' 物件名稱無效。" + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:822 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:824 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:832 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:834 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:841 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:843 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:849 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" msgstr[0] "%u 位元組" -msgstr[1] "%u 位元組" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:851 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" -msgstr[1] "%u 位元組/秒" -#: strbuf.c:1149 +#: strbuf.c:1164 #, c-format -#| msgid "could not read '%s'" msgid "could not edit '%s'" msgstr "無法編輯 '%s'" @@ -7680,72 +7874,139 @@ msgstr "位於未簽出的子模組 '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "無效 --ignore-submodules 參數：%s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。" + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 +#: submodule.c:995 +#, 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:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "處理 '%s' 子模組失敗" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" -#: submodule.c:1481 +#: submodule.c:1158 #, c-format -msgid "Could not access submodule '%s'" -msgstr "無法存取子模組 '%s'" +msgid "Pushing submodule '%s'\n" +msgstr "正在推送 '%s' 子模組\n" -#: submodule.c:1651 +#: submodule.c:1161 +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "無法推送 '%s' 子模組\n" + +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "正在抓取 %s%s 子模組\n" + +#: submodule.c:1483 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "無法存取子模組 '%s'\n" + +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"抓取子模組時發生錯誤：\n" +"%s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "無法將 '%s' 識別為一個 git 版本庫" -#: submodule.c:1789 +#: submodule.c:1679 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" + +#: submodule.c:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中啟動 'git status'" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "無法在子模組 '%s' 中執行 'git status'" -#: submodule.c:1817 +#: submodule.c:1828 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" -#: submodule.c:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "無法遞迴子模組路徑 '%s'" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "無法重設子模組的索引" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "子模組 '%s' 中有髒索引" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2027 +#: submodule.c:2038 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" -#: submodule.c:2048 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2060 submodule.c:2119 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2064 +#: submodule.c:2075 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "拒絕移動「%s」至現存 git 目錄" -#: submodule.c:2071 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7756,16 +8017,11 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2154 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "無法遞迴子模組路徑 '%s'" - -#: submodule.c:2198 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2237 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -7789,7 +8045,7 @@ msgstr "忽略可能被解析為指令列選項的 '%s'：%s" msgid "invalid value for %s" msgstr "%s 的值無效" -#: submodule-config.c:769 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 條目 %s" @@ -7805,7 +8061,7 @@ msgstr "執行 trailer 指令 '%s' 失敗" msgid "unknown value '%s' for key '%s'" msgstr "鍵 '%2$s' 的未知取值 '%1$s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "多於一個 %s" @@ -7935,7 +8191,7 @@ msgstr "正在終止。" msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" -#: transport.c:1345 transport-helper.c:656 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -7948,7 +8204,7 @@ msgstr "完整寫入遠端助手失敗" msgid "unable to find remote helper for '%s'" msgstr "無法為 '%s' 找到遠端助手" -#: transport-helper.c:160 transport-helper.c:570 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "無法複製助手輸出檔案句柄" @@ -7963,100 +8219,100 @@ msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git" msgid "this remote helper should implement refspec capability" msgstr "遠端助手需要實現 refspec 能力" -#: transport-helper.c:284 transport-helper.c:424 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s 意外地說：'%s'" -#: transport-helper.c:413 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s 也鎖定了 %s" -#: transport-helper.c:492 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "不能執行 fast-import" -#: transport-helper.c:515 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "執行 fast-import 發生錯誤" -#: transport-helper.c:544 transport-helper.c:1133 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "無法讀取引用 %s" -#: transport-helper.c:589 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "連線時未知的回應：%s" -#: transport-helper.c:611 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "協定不支援設定遠端服務路徑" -#: transport-helper.c:613 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:659 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:735 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "預期 ok/error，助手說 '%s'" -#: transport-helper.c:788 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手報告 %s 的意外狀態" -#: transport-helper.c:849 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支援 dry-run" -#: transport-helper.c:852 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支援 --signed" -#: transport-helper.c:855 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支援 --signed=if-asked" -#: transport-helper.c:860 +#: transport-helper.c:861 #, c-format msgid "helper %s does not support --atomic" msgstr "助手 %s 不支援 --atomic" -#: transport-helper.c:866 +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支援 'push-option'" -#: transport-helper.c:964 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支援 push，需要引用表達式" -#: transport-helper.c:969 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支援 'force'" -#: transport-helper.c:1016 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "無法執行 fast-export" -#: transport-helper.c:1021 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "執行 fast-export 時發生錯誤" -#: transport-helper.c:1046 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -8065,68 +8321,63 @@ msgstr "" "沒有共同的引用並且也沒有指定，什麼也不會做。\n" "可能您應該指定一個分支如 'master'。\n" -#: transport-helper.c:1119 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式錯誤的回應：%s" -#: transport-helper.c:1271 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "讀取（%s）失敗" -#: transport-helper.c:1298 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "寫（%s）失敗" -#: transport-helper.c:1347 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "%s 執行緒失敗" -#: transport-helper.c:1351 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 執行緒等待失敗：%s" -#: transport-helper.c:1370 transport-helper.c:1374 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能啟動執行緒來複製資料：%s" -#: transport-helper.c:1411 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "%s 進程等待失敗" -#: transport-helper.c:1415 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "%s 進程失敗" -#: transport-helper.c:1433 transport-helper.c:1442 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "不能啟動執行緒來複製資料" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "太短的樹狀物件" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "樹狀物件中的條目模式錯誤" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "樹狀物件條目中空的檔案名" -#: tree-walk.c:48 -#, c-format -msgid "filename in tree entry contains backslash: '%s'" -msgstr "樹狀物件中的檔案名稱有反斜線：'%s'" - -#: tree-walk.c:124 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "太短的樹檔案" @@ -8364,8 +8615,7 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" -#: unpack-trees.c:1441 -#| msgid "Updating files" +#: unpack-trees.c:1445 msgid "Updating index flags" msgstr "正在更新索引旗標" @@ -8398,32 +8648,36 @@ msgstr "無效的埠號" msgid "invalid '..' path segment" msgstr "無效的 '..' 路徑片段" -#: worktree.c:258 builtin/am.c:2084 +#: walker.c:170 +msgid "Fetching objects" +msgstr "正在抓取物件" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "讀取 '%s' 失敗" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作區的 '%s' 不是版本庫目錄" -#: worktree.c:315 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "檔案 '%s' 不包含工作區的絕對路徑" -#: worktree.c:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' 不存在" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 沒有指回到 '%s'" @@ -8592,7 +8846,6 @@ msgstr "未追蹤的內容, " msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的儲藏區目前有 %d 條紀錄" -msgstr[1] "您的儲藏區目前有 %d 條紀錄" #: wt-status.c:938 msgid "Submodules changed but not updated:" @@ -8680,7 +8933,6 @@ msgstr "沒有指令被執行。" msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最後一條指令已完成（%d 條指令被執行）：" -msgstr[1] "最後的指令已完成（%d 條指令被執行）：" #: wt-status.c:1325 #, c-format @@ -8696,7 +8948,6 @@ msgstr "未剩下任何指令。" msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下來要執行的指令（剩餘 %d 條指令）：" -msgstr[1] "接下來要執行的指令（剩餘 %d 條指令）：" # 譯者：請維持前導空格 #: wt-status.c:1341 @@ -8995,122 +9246,126 @@ msgstr "刪除 '%s' 失敗" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<選項>] [--] <路徑規格>..." -#: builtin/add.c:87 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "意外的差異狀態 %c" -#: builtin/add.c:92 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "更新檔案失敗" -#: builtin/add.c:102 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "刪除 '%s'\n" -#: builtin/add.c:177 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:252 builtin/rev-parse.c:899 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:263 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "無法為寫入開啟 '%s'。" -#: builtin/add.c:267 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:270 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:273 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:275 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:280 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "不能應用 '%s'" -#: builtin/add.c:288 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548 -#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "測試執行" -#: builtin/add.c:311 +#: builtin/add.c:325 msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:313 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "編輯目前差異並應用" -#: builtin/add.c:314 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:315 +#: builtin/add.c:329 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:316 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:317 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:318 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:321 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:323 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:324 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "跳過因發生錯誤不能新增的檔案" -#: builtin/add.c:325 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:327 builtin/update-index.c:1004 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:329 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:347 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "`git stash -p` 的後端" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9127,8 +9382,8 @@ msgid "" "\n" "See \"git help submodule\" for more information." msgstr "" -"您在目前版本庫中新增了另外一個Git版本庫。複製外層的版本庫將不包含嵌入版本庫的" -"內容，並且不知道該如何取得它。\n" +"您在目前版本庫中新增了另外一個 Git 版本庫。複製外層的版本庫將不包含嵌入版本庫" +"的內容，並且不知道該如何取得它。\n" "如果您要新增一個子模組，使用：\n" "\n" "\tgit submodule add <url> %s\n" @@ -9139,163 +9394,170 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:375 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:393 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "使用 -f 參數如果您確實要新增它們。\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"如果您真的想加入，請使用 -f。\n" +"如要關閉此訊息，請執行\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:400 +#: builtin/add.c:419 msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:428 builtin/commit.c:348 -#| msgid "--first-parent is incompatible with --bisect" +#: builtin/add.c:447 builtin/commit.c:348 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" -#: builtin/add.c:434 -#| msgid "--first-parent is incompatible with --bisect" +#: builtin/add.c:464 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file 與 --edit 不相容" -#: builtin/add.c:446 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 選項互斥" -#: builtin/add.c:449 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" -#: builtin/add.c:453 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 -#: builtin/reset.c:327 -#| msgid "--patch is incompatible with --{hard,mixed,soft}" +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" -#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360 -#: builtin/reset.c:333 +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul 需要 --pathspec-from-file" -#: builtin/add.c:482 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:483 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "也許您想要執行 'git add .'？\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"可能你要做的是 'git add .'？\n" +"如要關閉此訊息，請執行\n" +"\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一個 StGIT 修補檔佇列被應用" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:948 builtin/clone.c:409 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補檔動作，執行 \"%s --abort\"。" -#: builtin/am.c:1169 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "修補檔為空。" -#: builtin/am.c:1262 +#: builtin/am.c:1267 #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -9303,24 +9565,24 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上打修補檔及進行三方合併..." -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "提交內容為：" @@ -9329,39 +9591,39 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, 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:1695 builtin/commit.c:394 +#: builtin/am.c:1700 builtin/commit.c:398 msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1699 +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "應用：%.*s" -#: builtin/am.c:1756 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "沒有變更 —— 修補檔已經應用過。" -#: builtin/am.c:1762 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1766 -msgid "Use 'git am --show-current-patch' to see the failed patch" -msgstr "用 'git am --show-current-patch' 指令檢視失敗的修補檔" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" +msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1810 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -9371,7 +9633,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要跳過這個修補檔。" -#: builtin/am.c:1817 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -9382,159 +9644,169 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 #: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:1976 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2020 +#: builtin/am.c:2025 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:2117 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "無效的 --patch-format 值：%s" -#: builtin/am.c:2153 +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "無效的 --show-current-patch 值：%s" + +#: builtin/am.c:2176 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2154 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2160 +#: builtin/am.c:2214 msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2162 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2164 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併。" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:304 builtin/stash.c:811 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2167 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "在提交說明中新增一個 Signed-off-by 簽名" -#: builtin/am.c:2170 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2172 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2174 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2176 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2178 +#: builtin/am.c:2232 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2181 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2184 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673 -#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 #: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 #: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "格式" -#: builtin/am.c:2210 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2216 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2218 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2221 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2224 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "跳過目前修補檔" -#: builtin/am.c:2227 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "復原原始分支並終止打修補檔動作。" -#: builtin/am.c:2230 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "終止修補檔動作但保持 HEAD 不變。" -#: builtin/am.c:2233 -msgid "show the patch being applied." -msgstr "顯示正在套用的修補檔。" +#: builtin/am.c:2288 +msgid "show the patch being applied" +msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2237 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2239 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509 -#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2245 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2263 +#: builtin/am.c:2319 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." @@ -9542,16 +9814,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2270 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2285 +#: builtin/am.c:2341 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2309 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" @@ -9560,11 +9832,11 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2315 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2325 +#: builtin/am.c:2381 msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" @@ -9630,7 +9902,8 @@ msgstr "" msgid "" "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " "<bad_term>" -msgstr "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>" +msgstr "" +"git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>" #: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" @@ -9731,7 +10004,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:322 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分尋找" @@ -9741,22 +10014,22 @@ msgstr "在只有一個 %s 提交的情況下二分尋找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:330 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:377 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:380 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n" -#: builtin/bisect--helper.c:390 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9765,111 +10038,111 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:476 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:480 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:512 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:527 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:548 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分尋找" -#: builtin/bisect--helper.c:551 +#: builtin/bisect--helper.c:553 msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:575 +#: builtin/bisect--helper.c:577 #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:631 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "執行 'git bisect next'" -#: builtin/bisect--helper.c:633 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "將術語寫入 .git/BISECT_TERMS" -#: builtin/bisect--helper.c:635 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "清除二分尋找狀態" -#: builtin/bisect--helper.c:637 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "檢查預期的版本" -#: builtin/bisect--helper.c:639 +#: builtin/bisect--helper.c:641 msgid "reset the bisection state" msgstr "清除二分尋找狀態" -#: builtin/bisect--helper.c:641 +#: builtin/bisect--helper.c:643 msgid "write out the bisection state in BISECT_LOG" msgstr "將二分尋找的狀態寫入 BISECT_LOG" -#: builtin/bisect--helper.c:643 +#: builtin/bisect--helper.c:645 msgid "check and set terms in a bisection state" msgstr "在一個二分尋找狀態中檢查和設定術語" -#: builtin/bisect--helper.c:645 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:647 +#: builtin/bisect--helper.c:649 msgid "print out the bisect terms" msgstr "列印二分尋找術語" -#: builtin/bisect--helper.c:649 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "啟動二分尋找過程" -#: builtin/bisect--helper.c:651 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非簽出目前提交" -#: builtin/bisect--helper.c:653 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:670 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要兩個參數" -#: builtin/bisect--helper.c:674 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state 不帶參數" -#: builtin/bisect--helper.c:681 +#: builtin/bisect--helper.c:684 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:685 +#: builtin/bisect--helper.c:688 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write 需要 4 或 5 個參數" -#: builtin/bisect--helper.c:691 +#: builtin/bisect--helper.c:694 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms 需要 3 個參數" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:700 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:703 +#: builtin/bisect--helper.c:706 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" @@ -10041,7 +10314,6 @@ msgstr "4 年 11 個月前" msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "檔案 %s 只有 %lu 行" -msgstr[1] "檔案 %s 只有 %lu 行" #: builtin/blame.c:1125 msgid "Blaming lines" @@ -10254,7 +10526,7 @@ msgstr "設定追蹤模式（參見 git-pull(1)）" msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:505 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "上游" @@ -10263,7 +10535,6 @@ msgid "change the upstream info" msgstr "改變上游訊息" #: builtin/branch.c:627 -#| msgid "Unset the upstream info" msgid "unset the upstream info" msgstr "取消上游資訊設定" @@ -10366,7 +10637,7 @@ msgstr "排序和過濾屬於大小寫不敏感" msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:684 builtin/clone.c:784 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" @@ -10449,15 +10720,14 @@ msgstr "" msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." -msgstr "不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" +msgstr "" +"不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" #: builtin/bundle.c:15 builtin/bundle.c:23 -#| msgid "git remote add [<options>] <name> <url>" msgid "git bundle create [<options>] <file> <git-rev-list args>" msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>" #: builtin/bundle.c:16 builtin/bundle.c:28 -#| msgid "git rm [<options>] [--] <file>..." msgid "git bundle verify [<options>] <file>" msgstr "git bundle verify [<選項>] <檔案>" @@ -10469,19 +10739,19 @@ msgstr "git bundle list-heads <檔案> [<參考名稱>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <檔案> [<參考名稱>...]" -#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度表" -#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" @@ -10490,7 +10760,6 @@ msgid "Need a repository to create a bundle." msgstr "需要一個版本庫來建立包。" #: builtin/bundle.c:104 -#| msgid "do not show peeled tags" msgid "do not show bundle details" msgstr "不顯示包 (bundle) 詳細資訊" @@ -10503,11 +10772,11 @@ msgstr "%s 可以\n" msgid "Need a repository to unbundle." msgstr "需要一個版本庫來解包。" -#: builtin/bundle.c:168 builtin/remote.c:1609 +#: builtin/bundle.c:168 builtin/remote.c:1686 msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" -#: builtin/bundle.c:190 builtin/remote.c:1640 +#: builtin/bundle.c:190 builtin/remote.c:1717 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子指令：%s" @@ -10560,7 +10829,7 @@ msgstr "對於資料物件，對其內容做文字轉換" msgid "for blob objects, run filters on object's content" msgstr "對於資料物件，對其內容做過濾" -#: builtin/cat-file.c:645 git-submodule.sh:992 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "資料物件" @@ -10620,8 +10889,8 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -10633,27 +10902,27 @@ msgstr "顯示未符合的輸入路徑" msgid "ignore index when checking" msgstr "檢查時忽略索引" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "不能同時指定路徑及 --stdin 參數" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 參數共用才有意義" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "未指定路徑" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "參數 --quiet 只在提供一個路徑名時有效" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "不能同時提供 --quiet 和 --verbose 參數" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 選項只在使用 --verbose 時有效" @@ -10711,9 +10980,9 @@ msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 -#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "字串" @@ -10776,21 +11045,18 @@ msgstr "無法為 '%s' 新增合併結果" msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -msgstr[1] "重新建立了 %d 個合併衝突" #: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -msgstr[1] "從 %2$s 更新了 %1$d 個路徑" #: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -msgstr[1] "從索引區更新了 %d 個路徑" #: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 #: builtin/checkout.c:422 @@ -10828,11 +11094,11 @@ msgstr "'%s' 或 '%s' 不能和 %s 一起使用" msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:732 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10841,51 +11107,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:835 +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:877 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:881 builtin/clone.c:716 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:885 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:888 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:892 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:894 builtin/checkout.c:1291 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:896 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:947 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:953 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10901,12 +11167,8 @@ msgstr[0] "" "警告：您正丟下 %d 個提交，未和任何分支關聯：\n" "\n" "%s\n" -msgstr[1] "" -"警告：您正丟下 %d 個提交，未和任何分支關聯：\n" -"\n" -"%s\n" -#: builtin/checkout.c:972 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10926,35 +11188,20 @@ msgstr[0] "" "\n" " git branch <新分支名> %s\n" "\n" -msgstr[1] "" -"如果您想要透過建立新分支儲存它們，這可能是一個好時候。\n" -"如下動作：\n" -"\n" -" git branch <新分支名> %s\n" -"\n" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1051 builtin/checkout.c:1286 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1178 -msgid "only one reference expected" -msgstr "預期只有一個引用" - -#: builtin/checkout.c:1195 -#, c-format -msgid "only one reference expected, %d given." -msgstr "應只有一個引用，卻給出了 %d 個" - -#: builtin/checkout.c:1232 +#: builtin/checkout.c:1128 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10963,37 +11210,70 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1135 +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" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n" +"使用 --track 選項寫出全名：\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" +"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" + +#: builtin/checkout.c:1145 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" +msgstr "預期只有一個引用" + +#: builtin/checkout.c:1228 +#, c-format +msgid "only one reference expected, %d given." +msgstr "應只有一個引用，卻給出了 %d 個" + +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1258 builtin/checkout.c:1622 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1334 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1307 +#: builtin/checkout.c:1336 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1308 builtin/checkout.c:1316 +#: builtin/checkout.c:1337 builtin/checkout.c:1345 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1311 +#: builtin/checkout.c:1340 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1327 +#: builtin/checkout.c:1356 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11001,7 +11281,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1331 +#: builtin/checkout.c:1360 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11009,7 +11289,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1335 +#: builtin/checkout.c:1364 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11017,7 +11297,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1339 +#: builtin/checkout.c:1368 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11025,7 +11305,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1343 +#: builtin/checkout.c:1372 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11033,247 +11313,219 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1347 +#: builtin/checkout.c:1376 msgid "you are switching branch while bisecting" msgstr "您在執行二分尋找時切換分支" -#: builtin/checkout.c:1354 +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 -#: builtin/checkout.c:1380 builtin/checkout.c:1385 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1382 +#: builtin/checkout.c:1411 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1390 +#: builtin/checkout.c:1419 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1397 +#: builtin/checkout.c:1426 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52 -#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285 -#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563 +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "強制顯示進度報告" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1469 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "風格" -#: builtin/checkout.c:1442 +#: builtin/checkout.c:1471 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1454 builtin/worktree.c:503 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1486 msgid "force checkout (throw away local modifications)" msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1459 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1461 builtin/merge.c:288 +#: builtin/checkout.c:1490 builtin/merge.c:289 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1464 +#: builtin/checkout.c:1493 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1477 +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1480 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1484 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1537 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1540 +#: builtin/checkout.c:1568 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1577 +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1582 +#: builtin/checkout.c:1610 msgid "missing branch name; try -b" msgstr "缺少分支名，嘗試 -b" -#: builtin/checkout.c:1615 +#: builtin/checkout.c:1642 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1665 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1651 -#| msgid "--first-parent is incompatible with --bisect" +#: builtin/checkout.c:1678 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file 與 --detach 不相容" -#: builtin/checkout.c:1654 builtin/reset.c:324 -#| msgid "--first-parent is incompatible with --bisect" +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file 與 --patch 不相容" -#: builtin/checkout.c:1665 +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." -msgstr "git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" +msgstr "" +"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" -#: builtin/checkout.c:1670 +#: builtin/checkout.c:1697 msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1689 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"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" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"'%s' 符合了一個以上的遠端追蹤分支。\n" -"我們發現 %d 個遠端版本庫具有同名分支。所以我們轉而嘗試將這個參數解析為\n" -"路徑，但是也失敗了！\n" -"\n" -"如果您想要簽出一個遠端追蹤分支，例如在遠端版本庫 'origin' 上的，您可以\n" -"使用分支全名和 --track 選項：\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" -"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" - -#: builtin/checkout.c:1714 builtin/checkout.c:1716 builtin/checkout.c:1765 -#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1715 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1717 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1720 +#: builtin/checkout.c:1729 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1721 +#: builtin/checkout.c:1730 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1775 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1777 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1770 +#: builtin/checkout.c:1779 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1781 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1804 +#: builtin/checkout.c:1813 msgid "which tree-ish to checkout from" msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1806 +#: builtin/checkout.c:1815 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1808 +#: builtin/checkout.c:1817 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1810 +#: builtin/checkout.c:1819 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1811 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "使用疊加模式" #: builtin/clean.c:28 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." +msgstr "" +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." #: builtin/clean.c:32 #, c-format @@ -11387,7 +11639,6 @@ msgstr "" msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將刪除如下條目：" -msgstr[1] "將刪除如下條目：" #: builtin/clean.c:847 msgid "No more files to clean, exiting." @@ -11409,9 +11660,9 @@ msgstr "互動式清除" msgid "remove whole directories" msgstr "刪除整個目錄" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179 -#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "模式" @@ -11436,13 +11687,15 @@ msgstr "-x 和 -X 不能同時使用" msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" -msgstr "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" +msgstr "" +"clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" #: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" -msgstr "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" +msgstr "" +"clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" #: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" @@ -11492,18 +11745,18 @@ msgstr "範本目錄" msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 -#: builtin/submodule--helper.c:1885 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "參考版本庫" -#: builtin/clone.c:118 builtin/submodule--helper.c:1394 -#: builtin/submodule--helper.c:1887 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:327 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "名稱" @@ -11519,8 +11772,8 @@ msgstr "簽出 <分支> 而不是遠端 HEAD" msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "深度" @@ -11528,7 +11781,7 @@ msgstr "深度" msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "時間" @@ -11537,7 +11790,7 @@ msgid "create a shallow clone since a specific time" msgstr "從一個特定時間建立一個淺複製" #: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 -#: builtin/rebase.c:1445 +#: builtin/rebase.c:1480 msgid "revision" msgstr "版本" @@ -11545,7 +11798,8 @@ msgstr "版本" msgid "deepen history of shallow clone, excluding rev" msgstr "深化淺複製的歷史，除了特定版本" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" @@ -11583,12 +11837,12 @@ msgstr "server-specific" msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 #: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 #: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" @@ -11659,130 +11913,129 @@ msgstr "" msgid "Could not find remote branch %s to clone." msgstr "不能發現要複製的遠端分支 %s。" -#: builtin/clone.c:704 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:752 -#| msgid "failed to finalize '%s'" +#: builtin/clone.c:753 msgid "failed to initialize sparse-checkout" msgstr "無法初始化稀疏簽出" -#: builtin/clone.c:775 +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" -#: builtin/clone.c:806 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "不能簽出工作區" -#: builtin/clone.c:856 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c:919 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c:921 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:959 builtin/receive-pack.c:1948 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:963 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "您必須指定一個版本庫來複製。" -#: builtin/clone.c:976 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 選項不相容。" -#: builtin/clone.c:979 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 選項不相容。" -#: builtin/clone.c:992 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:998 builtin/fetch.c:1787 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c:1008 +#: builtin/clone.c:1014 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:1018 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 -#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c:1038 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c:1058 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c:1060 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c:1084 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" -#: builtin/clone.c:1148 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1150 +#: builtin/clone.c:1156 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1152 +#: builtin/clone.c:1158 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1154 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1157 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "源版本庫是淺複製，忽略 --local" -#: builtin/clone.c:1162 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1237 builtin/clone.c:1245 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1248 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "您似乎複製了一個空版本庫。" @@ -11859,13 +12112,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1496 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 #: builtin/tag.c:412 msgid "message" msgstr "說明" -#: builtin/commit-tree.c:115 builtin/commit.c:1496 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "提交說明" @@ -11873,8 +12126,8 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -11947,7 +12200,6 @@ msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" #: builtin/commit.c:351 -#| msgid "paths '%s ...' with -a does not make sense" msgid "--pathspec-from-file with -a does not make sense" msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" @@ -11959,90 +12211,90 @@ msgstr "參數 --include/--only 不跟路徑沒有意義。" msgid "unable to create temporary index" msgstr "不能建立暫時索引" -#: builtin/commit.c:382 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "互動式新增失敗" -#: builtin/commit.c:396 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "無法更新暫時索引" -#: builtin/commit.c:398 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "不能更新樹的主快取" -#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "無法寫 new_index 檔案" -#: builtin/commit.c:475 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "在合併過程中不能做部分提交。" -#: builtin/commit.c:477 +#: builtin/commit.c:481 msgid "cannot do a partial commit during a cherry-pick." msgstr "在揀選過程中不能做部分提交。" -#: builtin/commit.c:485 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "無法讀取索引" -#: builtin/commit.c:504 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "無法寫暫時索引檔案" -#: builtin/commit.c:602 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者訊息" -#: builtin/commit.c:604 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: builtin/commit.c:623 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "格式錯誤的 --author 參數" -#: builtin/commit.c:676 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" -#: builtin/commit.c:726 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" -#: builtin/commit.c:728 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "不能從標準輸入中讀取日誌訊息" -#: builtin/commit.c:732 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "不能讀取日誌檔案 '%s'" -#: builtin/commit.c:763 builtin/commit.c:779 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "不能讀取 SQUASH_MSG" -#: builtin/commit.c:770 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "不能讀取 MERGE_MSG" -#: builtin/commit.c:830 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:849 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -12056,7 +12308,7 @@ msgstr "" "\t%s\n" "然後重試。\n" -#: builtin/commit.c:854 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -12070,7 +12322,7 @@ msgstr "" "\t%s\n" "然後重試。\n" -#: builtin/commit.c:867 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12079,7 +12331,7 @@ msgstr "" "請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" "說明將會終止提交。\n" -#: builtin/commit.c:875 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -12090,318 +12342,320 @@ msgstr "" "也可以刪除它們。一個空的提交說明將會終止提交。\n" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:892 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:900 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:907 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:925 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:992 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1006 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c:1050 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1064 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1122 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1175 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1178 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1180 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1193 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1195 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1203 +#: builtin/commit.c:1208 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1220 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1357 builtin/commit.c:1519 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1359 builtin/commit.c:1521 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1361 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1363 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1365 +#: builtin/commit.c:1370 msgid "version" msgstr "版本" -#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 -#: builtin/worktree.c:650 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1368 builtin/commit.c:1527 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1371 builtin/commit.c:1530 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1374 builtin/commit.c:1533 +#: builtin/commit.c:1379 builtin/commit.c:1538 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設：all）" -#: builtin/commit.c:1378 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" -msgstr "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" +msgstr "" +"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" -#: builtin/commit.c:1380 parse-options.h:192 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "何時" -#: builtin/commit.c:1381 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" -msgstr "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設：all）" +msgstr "" +"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設：all）" -#: builtin/commit.c:1383 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1384 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1386 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1406 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1489 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1490 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1492 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "author" msgstr "作者" -#: builtin/commit.c:1494 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1495 builtin/gc.c:538 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "日期" -#: builtin/commit.c:1495 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 -#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1497 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1498 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" -#: builtin/commit.c:1499 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交說明用以修正指定的提交" -#: builtin/commit.c:1500 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1501 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "新增 Signed-off-by: 簽名" -#: builtin/commit.c:1503 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1504 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1506 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1511 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1512 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1513 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1514 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1515 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1516 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1517 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1518 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1531 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1532 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1539 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1541 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1614 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1621 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1640 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1647 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1652 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1686 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12425,54 +12679,59 @@ msgstr "" "git commit-graph write [--object-dir <物件目錄>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 -#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "找不到符合 %s 的物件目錄" + +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "目錄" -#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 -#: builtin/commit-graph.c:188 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "儲存圖形的物件目錄" -#: builtin/commit-graph.c:51 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "無法開啟提交圖形 '%s'" -#: builtin/commit-graph.c:106 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "開始遍歷所有引用" -#: builtin/commit-graph.c:108 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: builtin/commit-graph.c:110 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "從標準輸入中的提交開始掃描" -#: builtin/commit-graph.c:112 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 檔案中已有所有提交" -#: builtin/commit-graph.c:115 +#: builtin/commit-graph.c:137 msgid "allow writing an incremental commit-graph file" msgstr "允許寫一個增量提交圖形檔案" -#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本分割提交圖形中的最大提交數" -#: builtin/commit-graph.c:119 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" @@ -12480,205 +12739,211 @@ msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" msgid "git config [<options>]" msgstr "git config [<選項>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "未能識別的 --type 參數，%s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "一次只能一個類型" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "設定檔案位置" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "使用全域設定檔案" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "使用系統級設定檔案" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "使用版本庫級設定檔案" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "使用指定的設定檔案" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "資料物件 ID" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "從提供的資料物件讀取設定" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "動作" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "取得值：name [value-regex]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "獲得所有的值：key [value-regex]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "根據正規表示式獲得值：name-regex [value-regex]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "獲得 URL 取值：section[.var] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "取代所有符合的變數：name value [value_regex]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "新增一個新的變數：name value" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "刪除一個變數：name [value-regex]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "刪除所有符合項：name [value-regex]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "重新命名小節：old-name new-name" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "刪除一個小節：name" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "全部列出" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "開啟一個編輯器" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "獲得設定的顏色：設定 [預設]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "獲得顏色設定：設定 [stdout-is-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "類型" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "取值為該類型" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "值是十進位數" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "值是一個路徑（檔案或目錄名）" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "值是一個到期日期" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "其它" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "終止值是 NUL 位元組" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "只顯示變數名" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "查詢時參照 include 指令遞迴尋找" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" +"令 command)" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "取值" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "使用 --get 但未指定參數時所使用的預設值" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "錯誤的參數個數，應該為 %d 個" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "無效鍵名模式：%s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "格式化預設設定值失敗：%s" -#: builtin/config.c:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "無法解析顏色 '%s'" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "不在 git 版本庫中" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "不支援寫到標準輸入" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "不支援寫到設定資料物件" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12693,23 +12958,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "一次只能有一個設定檔案" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local 只能在一個版本庫內使用" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一個版本庫內使用" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME 未設定" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12718,51 +12983,51 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color 和變數類型不相容" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "一次只能有一個動作" -#: builtin/config.c:706 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 僅適用於 --list 或 --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list" -#: builtin/config.c:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default 僅適用於 --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "不支援編輯標準輸入" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "不支援編輯資料物件" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "不能建立設定檔案 %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12771,7 +13036,7 @@ msgstr "" "無法用一個值覆蓋多個值\n" " 使用一個正規表示式、--add 或 --replace-all 來修改 %s。" -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "無此小節：%s" @@ -12829,12 +13094,12 @@ msgstr "沒有標籤準確符合 '%s'" msgid "No exact match on refs or tags, searching to describe\n" msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n" -#: builtin/describe.c:381 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "完成搜尋 %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12843,7 +13108,7 @@ msgstr "" "沒有附註標籤能描述 '%s'。\n" "然而，存在未附註標籤：嘗試 --tags。" -#: builtin/describe.c:411 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12852,12 +13117,12 @@ msgstr "" "沒有標籤能描述 '%s'。\n" "嘗試 --always，或者建立一些標籤。" -#: builtin/describe.c:441 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "已遍歷 %lu 個提交\n" -#: builtin/describe.c:444 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12866,90 +13131,90 @@ msgstr "" "發現多於 %i 個標籤，列出最近的 %i 個\n" "在 %s 放棄搜尋\n" -#: builtin/describe.c:512 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "不是一個有效的物件名 %s" -#: builtin/describe.c:523 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是資料物件" -#: builtin/describe.c:537 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "尋找該提交之後的標籤" -#: builtin/describe.c:538 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "在標準錯誤上除錯搜尋策略" -#: builtin/describe.c:539 +#: builtin/describe.c:553 msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:540 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "使用任意標籤，即使未附帶備註" -#: builtin/describe.c:541 +#: builtin/describe.c:555 msgid "always use long format" msgstr "始終使用長提交號格式" -#: builtin/describe.c:542 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "只跟隨第一個父提交" -#: builtin/describe.c:545 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "只輸出精確符合" -#: builtin/describe.c:547 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "考慮最近 <n> 個標籤（預設：10）" -#: builtin/describe.c:549 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "只考慮符合 <模式> 的標籤" -#: builtin/describe.c:551 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "不考慮符合 <模式> 的標籤" -#: builtin/describe.c:553 builtin/name-rev.c:473 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "標記" -#: builtin/describe.c:555 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "對於髒工作區，追加 <標記>（預設：\"-dirty\"）" -#: builtin/describe.c:558 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "對於損壞的工作區，追加 <標記>（預設：\"-broken\"）" -#: builtin/describe.c:576 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long 與 --abbrev=0 不相容" -#: builtin/describe.c:605 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c:656 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 與提交號不相容" -#: builtin/describe.c:658 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 與提交號不相容" @@ -13126,7 +13391,7 @@ msgstr "選項 `--default' 和 `type=ulong` 期望一個無符號長整型，不 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:852 +#: builtin/fast-export.c:853 msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" @@ -13222,19 +13487,19 @@ msgstr "git fetch --all [<選項>]" msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:139 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:141 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:228 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:143 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:145 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" @@ -13246,7 +13511,7 @@ msgstr "強制覆蓋本機引用" msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:150 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" @@ -13258,7 +13523,7 @@ msgstr "不抓取任何標籤(--no-tags)" msgid "number of submodules fetched in parallel" msgstr "子模組取得的並發數" -#: builtin/fetch.c:156 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" @@ -13267,7 +13532,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "on-demand" @@ -13275,7 +13540,7 @@ msgstr "on-demand" msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:164 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "保持下載包" @@ -13283,7 +13548,7 @@ msgstr "保持下載包" msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "深化淺複製的歷史" @@ -13291,7 +13556,7 @@ msgstr "深化淺複製的歷史" msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:177 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" @@ -13305,15 +13570,15 @@ msgid "" "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:187 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:188 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:189 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" @@ -13325,15 +13590,13 @@ msgstr "報告我們只擁有從該物件開始可以取得的物件" msgid "run 'gc --auto' after fetching" msgstr "取得後執行 'gc --auto'" -#: builtin/fetch.c:201 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" #: builtin/fetch.c:203 -#, fuzzy -#| msgid "prune remotes after fetching" msgid "write the commit-graph after fetching" -msgstr "抓取後清除遠端" +msgstr "抓取後寫入分支圖" #: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" @@ -13415,22 +13678,22 @@ msgstr "" "花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" "或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" -#: builtin/fetch.c:911 +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:932 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒絕 %s 因為淺複製不允許被更新" -#: builtin/fetch.c:1017 builtin/fetch.c:1155 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1028 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13440,58 +13703,57 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1125 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1126 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1159 builtin/remote.c:1035 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1182 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒絕取得到非純版本庫的目前分支 %s" -#: builtin/fetch.c:1201 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" -#: builtin/fetch.c:1204 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "選項 \"%s\" 為 %s 所忽略\n" -#: builtin/fetch.c:1412 -#| msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1421 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1427 +#: builtin/fetch.c:1436 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1438 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1440 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1442 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -13499,65 +13761,65 @@ msgstr "" "未發現源分支。\n" "您需要使用 --set-upstream 選項指定一個分支。" -#: builtin/fetch.c:1559 builtin/fetch.c:1622 +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1581 +#: builtin/fetch.c:1590 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:1684 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。" -#: builtin/fetch.c:1721 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1771 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:1773 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1778 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:1780 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:1796 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:1798 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:1807 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:1814 +#: builtin/fetch.c:1823 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13568,23 +13830,23 @@ msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <說明>] [--log[=<n>] | --no-log] [--file <檔案>]" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" -#: builtin/fmt-merge-msg.c:677 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "參數 --log 的別名（已棄用）" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "文字" -#: builtin/fmt-merge-msg.c:681 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "使用 <文字> 作為提交說明的開始" -#: builtin/fmt-merge-msg.c:682 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "從檔案中讀取" @@ -13792,7 +14054,7 @@ msgstr "正在檢查物件目錄" msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:695 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "無效的 %s" @@ -13985,7 +14247,7 @@ msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。" -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" @@ -14003,259 +14265,259 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹（%s）" -#: builtin/grep.c:650 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:716 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:815 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:817 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:819 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:821 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:823 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:826 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:828 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:830 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:832 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:834 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:837 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:839 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:841 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:845 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "使用擴展的 POSIX 正規表示式" -#: builtin/grep.c:848 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正規表示式（預設）" -#: builtin/grep.c:851 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:854 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的正規表示式" -#: builtin/grep.c:857 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:858 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:859 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:860 +#: builtin/grep.c:848 msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:862 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:864 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:866 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:869 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:871 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:874 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:876 +#: builtin/grep.c:864 msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:877 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:879 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:881 +#: builtin/grep.c:869 msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:884 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:887 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:889 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:891 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:892 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:895 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:897 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:900 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:902 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:904 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:916 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:918 +#: builtin/grep.c:906 msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:920 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "顯示 grep 表達式的解析樹" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "pager" msgstr "分頁" -#: builtin/grep.c:924 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:928 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次構建忽略）" -#: builtin/grep.c:992 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1028 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1036 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1067 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "--untracked 不支援與 --recurse-submodules 一起使用" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c:1096 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1119 -msgid "option not supported with --recurse-submodules" -msgstr "選項不支援和 --recurse-submodules 共用" - -#: builtin/grep.c:1125 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" -#: builtin/grep.c:1131 +#: builtin/grep.c:1133 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1139 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" @@ -14425,7 +14687,6 @@ msgstr "物件 %s：應為類型 %s，卻是 %s" msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "無法填充 %d 位元組" -msgstr[1] "無法填充 %d 位元組" #: builtin/index-pack.c:268 msgid "early EOF" @@ -14439,7 +14700,7 @@ msgstr "輸入上的讀錯誤" msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" @@ -14493,197 +14754,192 @@ msgstr "無法讀取包檔案" msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" -msgstr[1] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" #: builtin/index-pack.c:590 msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "不能讀 %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "應用 delta 失敗" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -msgstr[1] "完成 %d 個本機物件" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -msgstr[1] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "無法儲存包檔案" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "無法儲存索引檔案" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "壞的 pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現存包檔案 '%s'" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1647 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -msgstr[1] "非 delta：%d 個物件" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1654 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -msgstr[1] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin 不能和 --stdin 同時使用" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" @@ -14924,7 +15180,7 @@ msgstr "未知類型：%d" #: builtin/log.c:814 #, c-format msgid "%s: invalid cover from description mode" -msgstr "" +msgstr "%s：從描述產生附函的模式無效" #: builtin/log.c:821 msgid "format.headers without value" @@ -15055,11 +15311,11 @@ msgstr "使用 [RFC PATCH] 代替 [PATCH]" #: builtin/log.c:1651 msgid "cover-from-description-mode" -msgstr "" +msgstr "從描述產生附函的模式" #: builtin/log.c:1652 msgid "generate parts of a cover letter based on a branch's description" -msgstr "" +msgstr "基於分支描述產生部分附函" #: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" @@ -15385,7 +15641,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "exec" @@ -15470,179 +15726,179 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "option `%s' requires a value" msgstr "選項 `%s' 需要一個值" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合併策略 '%s'。\n" -#: builtin/merge.c:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "可用的自訂策略有：" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "（和 --stat 同義）" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功，執行一次提交（預設）" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "在提交前編輯提交說明" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "允許快轉（預設）" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "策略" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "option=value" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "合併的提交說明（針對非快轉式合併）" -#: builtin/merge.c:278 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "放棄目前正在進行的合併" # -#: builtin/merge.c:280 +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作區" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" -#: builtin/merge.c:290 +#: builtin/merge.c:291 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "不能執行儲藏。" -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "儲藏失敗" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "不是一個有效物件：%s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " （無可壓縮）" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:705 +#: builtin/merge.c:708 msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:719 +#: builtin/merge.c:722 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知選項：-X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:786 +#: builtin/merge.c:789 #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:795 +#: builtin/merge.c:798 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:801 +#: builtin/merge.c:804 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -15652,83 +15908,83 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:806 +#: builtin/merge.c:809 msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:809 +#: builtin/merge.c:812 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" -#: builtin/merge.c:862 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "空提交訊息。" -#: builtin/merge.c:877 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:938 +#: builtin/merge.c:941 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:977 +#: builtin/merge.c:980 msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:979 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:981 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:986 +#: builtin/merge.c:989 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1043 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1146 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1180 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1283 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1287 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1296 +#: builtin/merge.c:1299 msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1309 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1313 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1329 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15736,7 +15992,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1336 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15744,96 +16000,96 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1339 +#: builtin/merge.c:1342 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1353 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "您不能將 --squash 和 --no-ff 組合使用。" -#: builtin/merge.c:1355 +#: builtin/merge.c:1358 msgid "You cannot combine --squash with --commit." msgstr "您不能將 --squash 和 --commit 組合使用。" -#: builtin/merge.c:1371 +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1388 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1390 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1395 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1397 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1476 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1485 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "已經是最新的。" -#: builtin/merge.c:1495 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1544 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "已經是最新的。耶！" -#: builtin/merge.c:1575 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以準備手動解決。\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" @@ -15933,7 +16189,6 @@ msgstr "不能解析物件 '%s'" msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" -msgstr[1] "無法處理 %d 條以上的基礎。忽略 %s。" #: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." @@ -15966,15 +16221,12 @@ msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" #: builtin/multi-pack-index.c:9 -#| msgid "" -#| "git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -#| "batch-size=<size>)" msgid "" "git multi-pack-index [<options>] (write|verify|expire|repack --batch-" "size=<size>)" msgstr "" -"git multi-pack-index [<選項>] (write|verify|expire|repack --batch-" -"size=<大小>)" +"git multi-pack-index [<選項>] (write|verify|expire|repack --batch-size=<大小" +">)" #: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" @@ -16086,52 +16338,52 @@ msgstr "%s，源=%s，目標=%s" msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" -#: builtin/name-rev.c:403 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<選項>] <提交>..." -#: builtin/name-rev.c:404 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<選項>] --all" -#: builtin/name-rev.c:405 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<選項>] --stdin" -#: builtin/name-rev.c:462 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "只列印名稱（無 SHA-1）" -#: builtin/name-rev.c:463 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "只使用標籤來命名提交" -#: builtin/name-rev.c:465 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相符合的引用" -#: builtin/name-rev.c:467 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相符合的引用" -#: builtin/name-rev.c:469 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "列出可以從所有引用存取的提交" -#: builtin/name-rev.c:470 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "從標準輸入讀取" -#: builtin/name-rev.c:471 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "允許列印 `未定義` 的名稱（預設）" -#: builtin/name-rev.c:477 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" @@ -16534,7 +16786,7 @@ msgstr "註解引用" msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" @@ -16549,124 +16801,101 @@ msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" -#: builtin/pack-objects.c:794 -#, c-format -msgid "packfile is invalid: %s" -msgstr "無效的 packfile：%s" - -#: builtin/pack-objects.c:798 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "無法為重用開啟 packfile：%s" - -#: builtin/pack-objects.c:802 -msgid "unable to seek in reused packfile" -msgstr "無法在重用的 packfile 中尋找" - -#: builtin/pack-objects.c:813 -msgid "unable to read from reused packfile" -msgstr "無法從復用的 packfile 中讀取" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:917 builtin/update-index.c:90 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1297 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1592 +#: builtin/pack-objects.c:1724 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:1601 +#: builtin/pack-objects.c:1733 #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:1870 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2000 -#, c-format -msgid "unable to get size of %s" -msgstr "不能得到 %s 的大小" - -#: builtin/pack-objects.c:2015 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 -#: builtin/pack-objects.c:2111 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2125 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2440 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:2572 +#: builtin/pack-objects.c:2713 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:2742 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16675,7 +16904,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:2748 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16684,229 +16913,233 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "選項 --missing 的值無效" -#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:2936 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3021 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3113 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3116 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3141 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3236 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3395 msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3397 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3434 msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3289 +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3291 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3295 +#: builtin/pack-objects.c:3442 msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3297 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3299 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3454 msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3314 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3316 +#: builtin/pack-objects.c:3463 msgid "respect islands during delta compression" msgstr "在增量壓縮時參考資料島" -#: builtin/pack-objects.c:3345 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:3404 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 來構建傳輸用的包檔案" -#: builtin/pack-objects.c:3406 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3558 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:3414 +#: builtin/pack-objects.c:3561 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3567 msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:3481 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:3511 +#: builtin/pack-objects.c:3657 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" -msgstr "總共 %<PRIu32> （差異 %<PRIu32>），復用 %<PRIu32> （差異 %<PRIu32>）" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" +msgstr "" +"總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 " +"%<PRIu32>" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16948,70 +17181,70 @@ msgstr "限制遍歷 promisor packfile 以外的物件" msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品版本庫中執行清理動作" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/pull.c:142 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "控制子模組的遞迴取得" -#: builtin/pull.c:146 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "和合併相關的選項" -#: builtin/pull.c:149 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允許快轉式" -#: builtin/pull.c:186 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "重定基底動作前後執行自動儲藏和彈出儲藏" -#: builtin/pull.c:202 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "和取得相關的參數" -#: builtin/pull.c:212 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "強制覆蓋本機分支" -#: builtin/pull.c:220 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "並發拉取的子模組的數量" -#: builtin/pull.c:320 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff 的取值無效：%s" -#: builtin/pull.c:437 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。" -#: builtin/pull.c:439 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您剛剛取得到的引用中沒有合併動作的候選。" -#: builtin/pull.c:440 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。" -#: builtin/pull.c:443 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -17021,42 +17254,42 @@ msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" -#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c:453 builtin/pull.c:468 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 -#: builtin/rebase.c:1381 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" -#: builtin/pull.c:472 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要為此分支建立追蹤訊息，您可以執行：" -#: builtin/pull.c:477 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -17065,32 +17298,32 @@ msgstr "" "您的設定中指定要合併遠端的引用 '%s'，\n" "但是沒有取得到這個引用。" -#: builtin/pull.c:587 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "無法存取提交 %s" -#: builtin/pull.c:867 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "為重定基底動作忽略 --verify-signatures" -#: builtin/pull.c:922 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。" -#: builtin/pull.c:930 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:934 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:935 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:960 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -17100,7 +17333,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:966 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -17117,15 +17350,15 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:981 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:985 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:992 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" @@ -17426,12 +17659,10 @@ msgid "use simple diff colors" msgstr "使用簡單差異顏色" #: builtin/range-diff.c:26 -#| msgid "notes-ref" msgid "notes" msgstr "註解" #: builtin/range-diff.c:26 -#| msgid "passed to 'git am'" msgid "passed to 'git log'" msgstr "傳遞給 'git log'" @@ -17527,7 +17758,6 @@ msgid "suppress feedback messages" msgstr "抑制回饋訊息" #: builtin/read-tree.c:188 -#| msgid "you need to resolve your current index first" msgid "You need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" @@ -17542,222 +17772,214 @@ msgstr "" #: builtin/rebase.c:34 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" -msgstr "git rebase [-i] [選項] [--exec <指令>] [--onto <新基礎>] --root [<分支>]" +msgstr "" +"git rebase [-i] [選項] [--exec <指令>] [--onto <新基礎>] --root [<分支>]" #: builtin/rebase.c:36 msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待辦列表：'%s'" -#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 -#, c-format -msgid "could not write '%s'." -msgstr "不能寫入 '%s'。" - -#: builtin/rebase.c:271 -msgid "no HEAD?" -msgstr "沒有 HEAD？" - -#: builtin/rebase.c:298 +#: builtin/rebase.c:292 #, c-format msgid "could not create temporary %s" msgstr "無法建立暫時的 %s" -#: builtin/rebase.c:304 +#: builtin/rebase.c:298 msgid "could not mark as interactive" msgstr "無法標記為互動式" -#: builtin/rebase.c:362 +#: builtin/rebase.c:352 msgid "could not generate todo list" msgstr "無法生成待辦列表" -#: builtin/rebase.c:402 +#: builtin/rebase.c:391 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" -#: builtin/rebase.c:457 +#: builtin/rebase.c:461 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<選項>]" -#: builtin/rebase.c:469 -msgid "keep empty commits" -msgstr "保持空提交" +#: builtin/rebase.c:474 builtin/rebase.c:1550 +msgid "(DEPRECATED) keep empty commits" +msgstr "(棄用) 保持空提交" -#: builtin/rebase.c:471 builtin/revert.c:128 +#: builtin/rebase.c:478 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允許提交說明為空" -#: builtin/rebase.c:472 +#: builtin/rebase.c:480 msgid "rebase merge commits" msgstr "對合併提交重定基底" -#: builtin/rebase.c:474 +#: builtin/rebase.c:482 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支點" -#: builtin/rebase.c:476 +#: builtin/rebase.c:484 msgid "move commits that begin with squash!/fixup!" msgstr "移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:477 +#: builtin/rebase.c:485 msgid "sign commits" msgstr "簽名提交" -#: builtin/rebase.c:479 builtin/rebase.c:1455 +#: builtin/rebase.c:487 builtin/rebase.c:1490 msgid "display a diffstat of what changed upstream" msgstr "顯示上游變化的差異統計" -#: builtin/rebase.c:481 +#: builtin/rebase.c:489 msgid "continue rebase" msgstr "繼續重定基底" -#: builtin/rebase.c:483 +#: builtin/rebase.c:491 msgid "skip commit" msgstr "跳過提交" -#: builtin/rebase.c:484 +#: builtin/rebase.c:492 msgid "edit the todo list" msgstr "重定基底待辦列表" -#: builtin/rebase.c:486 +#: builtin/rebase.c:494 msgid "show the current patch" msgstr "顯示目前修補檔" -#: builtin/rebase.c:489 +#: builtin/rebase.c:497 msgid "shorten commit ids in the todo list" msgstr "縮短待辦列表中的提交號" -#: builtin/rebase.c:491 +#: builtin/rebase.c:499 msgid "expand commit ids in the todo list" msgstr "擴展待辦列表中的提交號" -#: builtin/rebase.c:493 +#: builtin/rebase.c:501 msgid "check the todo list" msgstr "檢查待辦列表" -#: builtin/rebase.c:495 +#: builtin/rebase.c:503 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:497 +#: builtin/rebase.c:505 msgid "insert exec commands in todo list" msgstr "在待辦列表中插入 exec 執行指令" -#: builtin/rebase.c:498 +#: builtin/rebase.c:506 msgid "onto" msgstr "onto" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:501 +#: builtin/rebase.c:509 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:503 +#: builtin/rebase.c:511 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:504 +#: builtin/rebase.c:512 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:506 +#: builtin/rebase.c:514 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:508 +#: builtin/rebase.c:516 msgid "head name" msgstr "head 名稱" -#: builtin/rebase.c:513 +#: builtin/rebase.c:521 msgid "rebase strategy" msgstr "重定基底策略" -#: builtin/rebase.c:514 +#: builtin/rebase.c:522 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:515 +#: builtin/rebase.c:523 msgid "strategy options" msgstr "策略選項" -#: builtin/rebase.c:516 +#: builtin/rebase.c:524 msgid "switch-to" msgstr "切換到" -#: builtin/rebase.c:517 +#: builtin/rebase.c:525 msgid "the branch or commit to checkout" msgstr "要簽出的分支或提交" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:518 +#: builtin/rebase.c:526 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:519 +#: builtin/rebase.c:527 msgid "the command to run" msgstr "要執行的指令" -#: builtin/rebase.c:522 builtin/rebase.c:1540 +#: builtin/rebase.c:530 builtin/rebase.c:1584 msgid "automatically re-schedule any `exec` that fails" msgstr "自動重新安排任何失敗的 `exec`" -#: builtin/rebase.c:540 +#: builtin/rebase.c:546 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" -#: builtin/rebase.c:556 +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "%s 需要互動式重定基底" -#: builtin/rebase.c:608 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "無法取得 'onto'：'%s'" -#: builtin/rebase.c:623 +#: builtin/rebase.c:627 #, c-format msgid "invalid orig-head: '%s'" msgstr "無效的原始 head：'%s'" -#: builtin/rebase.c:648 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:724 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "不能讀取 '%s'" -#: builtin/rebase.c:742 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "不能儲存 %s" -#: builtin/rebase.c:849 +#: builtin/rebase.c:853 msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17770,7 +17992,7 @@ msgstr "" "\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n" "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" -#: builtin/rebase.c:1060 +#: builtin/rebase.c:1058 #, c-format msgid "" "\n" @@ -17788,7 +18010,14 @@ msgstr "" "\n" "因此 git 無法對其重定基底。" -#: builtin/rebase.c:1367 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -17805,7 +18034,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1383 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17818,147 +18047,136 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1413 +#: builtin/rebase.c:1447 msgid "exec commands cannot contain newlines" msgstr "exec 指令不能包含換行符號" -#: builtin/rebase.c:1417 +#: builtin/rebase.c:1451 msgid "empty exec command" msgstr "空的 exec 指令" -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "重定基底到提供的分支而非上游" -#: builtin/rebase.c:1448 +#: builtin/rebase.c:1483 msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合併基礎做為目前基礎" -#: builtin/rebase.c:1450 +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "允許執行 pre-rebase 掛鉤" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "安靜。暗示 --no-stat" -#: builtin/rebase.c:1458 +#: builtin/rebase.c:1493 msgid "do not show diffstat of what changed upstream" msgstr "不顯示上游變化的差異統計" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1496 msgid "add a Signed-off-by: line to each commit" msgstr "為每一個提交新增一個 Signed-off-by: 簽名" -#: builtin/rebase.c:1464 -#| msgid "Group by committer rather than author" -msgid "make committer date match author date" -msgstr "使提交日期符合撰寫日期" +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 +msgid "passed to 'git am'" +msgstr "傳遞給 'git am'" -#: builtin/rebase.c:1466 -msgid "ignore author date and use current date" -msgstr "忽略撰寫日期，使用目前日期" - -#: builtin/rebase.c:1468 -#| msgid "synonym for --files-with-matches" -msgid "synonym of --reset-author-date" -msgstr "和 --reset-author-date 同義" - -#: builtin/rebase.c:1470 builtin/rebase.c:1474 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" -#: builtin/rebase.c:1472 -#| msgid "ignore changes in whitespace at EOL" -msgid "ignore changes in whitespace" -msgstr "忽略空白字元變更" - -#: builtin/rebase.c:1476 builtin/rebase.c:1479 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1515 msgid "continue" msgstr "繼續" -#: builtin/rebase.c:1484 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "跳過目前修補檔並繼續" # 譯者：請維持前導空格 -#: builtin/rebase.c:1486 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "終止並簽出原有分支" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "終止但保持 HEAD 不變" -#: builtin/rebase.c:1490 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "在互動式重定基底中編輯待辦列表" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "顯示正在套用或合併的修補檔案" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1530 +msgid "use apply strategies to rebase" +msgstr "使用套用策略進行重定基底" + +#: builtin/rebase.c:1534 msgid "use merging strategies to rebase" msgstr "使用合併策略進行重定基底" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "讓使用者編輯要重定基底的提交列表" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1542 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已棄用）嘗試重建合併提交而非忽略它們" -#: builtin/rebase.c:1509 -msgid "preserve empty commits during rebase" -msgstr "重定基底時保留空提交" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" +msgstr "處理空白提交的方式" -#: builtin/rebase.c:1511 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:1517 +#: builtin/rebase.c:1560 msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" -#: builtin/rebase.c:1519 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" -#: builtin/rebase.c:1523 +#: builtin/rebase.c:1566 msgid "allow rebasing commits with empty messages" msgstr "允許針對空提交說明的提交重定基底" -#: builtin/rebase.c:1526 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "嘗試對合併提交重定基底而不是忽略它們" -#: builtin/rebase.c:1529 +#: builtin/rebase.c:1573 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 來最佳化上游" -#: builtin/rebase.c:1531 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "使用提供的合併策略" -#: builtin/rebase.c:1533 builtin/revert.c:115 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "選項" -#: builtin/rebase.c:1534 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "將參數傳遞給合併策略" -#: builtin/rebase.c:1537 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "將所有可以取得的提交重定基底到根提交" -#: builtin/rebase.c:1554 +#: builtin/rebase.c:1598 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17966,36 +18184,36 @@ msgstr "" "對 rebase.useBuiltin 的支援已被刪除！\n" "詳見 'git help config' 中的條目。" -#: builtin/rebase.c:1560 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起來 'git-am' 正在執行中。無法重定基底。" -#: builtin/rebase.c:1601 +#: builtin/rebase.c:1645 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1606 +#: builtin/rebase.c:1650 msgid "cannot combine '--keep-base' with '--onto'" msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" -#: builtin/rebase.c:1608 +#: builtin/rebase.c:1652 msgid "cannot combine '--keep-base' with '--root'" msgstr "不能將 '--keep-base' 和 '--root' 組合使用" -#: builtin/rebase.c:1612 +#: builtin/rebase.c:1656 msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" -#: builtin/rebase.c:1616 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1639 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" -#: builtin/rebase.c:1651 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -18003,16 +18221,16 @@ msgstr "" "您必須編輯所有的合併衝突，然後透過 git add\n" "指令將它們標記為已解決" -#: builtin/rebase.c:1670 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "無法捨棄工作區變更" -#: builtin/rebase.c:1689 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" msgstr "無法移回 %s" -#: builtin/rebase.c:1734 +#: builtin/rebase.c:1778 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -18031,163 +18249,164 @@ msgstr "" "\t%s\n" "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c:1798 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1820 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" +msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" + +#: builtin/rebase.c:1912 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "未知 rebase 後端：%s" + +#: builtin/rebase.c:1937 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1872 -msgid "cannot combine am options with either interactive or merge options" -msgstr "不能將 am 選項與互動或合併選項同時使用" - -#: builtin/rebase.c:1891 +#: builtin/rebase.c:1957 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" -#: builtin/rebase.c:1895 +#: builtin/rebase.c:1961 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -msgstr "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" +msgstr "" +"錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "無效的上游 '%s'" -#: builtin/rebase.c:1925 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "不能建立新的根提交" -#: builtin/rebase.c:1951 +#: builtin/rebase.c:2017 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要與分支的一個合併基礎" -#: builtin/rebase.c:1954 +#: builtin/rebase.c:2020 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一個合併基礎" -#: builtin/rebase.c:1962 +#: builtin/rebase.c:2028 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "沒有指向一個有效的提交 '%s'" -#: builtin/rebase.c:1987 +#: builtin/rebase.c:2054 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 -#: builtin/submodule--helper.c:1961 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" -#: builtin/rebase.c:2006 +#: builtin/rebase.c:2073 msgid "Could not resolve HEAD to a revision" msgstr "無法將 HEAD 解析為一個版本" -#: builtin/rebase.c:2044 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "無法 autostash" -#: builtin/rebase.c:2047 +#: builtin/rebase.c:2114 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2120 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: builtin/rebase.c:2056 +#: builtin/rebase.c:2123 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: builtin/rebase.c:2059 +#: builtin/rebase.c:2126 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: builtin/rebase.c:2068 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "請提交或儲藏修改。" -#: builtin/rebase.c:2095 -#, c-format -msgid "could not parse '%s'" -msgstr "無法解析 '%s'" - -#: builtin/rebase.c:2108 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:2121 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "目前分支 %s 是最新的。\n" -#: builtin/rebase.c:2129 +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，強制重定基底。" -#: builtin/rebase.c:2131 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "目前分支 %s 是最新的，強制重定基底。\n" -#: builtin/rebase.c:2139 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" -#: builtin/rebase.c:2146 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的變更：\n" -#: builtin/rebase.c:2149 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "從 %s 到 %s 的變更：\n" -#: builtin/rebase.c:2174 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" -#: builtin/rebase.c:2183 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "無法分離開頭指標" -#: builtin/rebase.c:2192 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快轉 %s 到 %s。\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:830 +#: builtin/receive-pack.c:821 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" @@ -18213,7 +18432,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:850 +#: builtin/receive-pack.c:841 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" @@ -18232,11 +18451,11 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:1936 +#: builtin/receive-pack.c:1938 msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:1950 +#: builtin/receive-pack.c:1952 msgid "You must specify a directory." msgstr "您必須指定一個目錄。" @@ -18262,49 +18481,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <引用>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' 不是一個有效的時間戳" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s 指向不存在！" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "未指定要刪除的引用日誌" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "不是一個引用日誌：%s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "沒有 '%s' 的引用日誌" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "無效的引用格式：%s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18312,81 +18531,81 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名稱> <位址>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <舊名稱> <新名稱>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <名稱>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <名稱>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <名稱>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名稱> <分支>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <名稱>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名稱> <新的位址>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名稱> <位址>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<選項>] <名稱> <位址>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名稱> <分支>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名稱> <分支>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<選項>] <名稱>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<選項>] <名稱>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<選項>] [<組> | <遠端>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18394,82 +18613,98 @@ msgstr "" "--mirror 選項危險且過時，請使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的鏡像參數：%s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "抓取遠端的分支" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "抓取時匯入所有的標籤和關聯物件" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或不抓取任何標籤（--no-tags）" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "追蹤的分支" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "主線分支" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "把遠端設定為用以推送或抓取的鏡像" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "無法設定 master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "無法得到引用規格 %s 的取得列表" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "（符合）" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "（刪除）" -#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 +#: builtin/remote.c:653 +#, c-format +msgid "could not set '%s'" +msgstr "無法設定 '%s'" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" +"位於下述位置的 %s 設定項 remote.pushDefault：\n" +"\t%s:%d\n" +"現命名成不存在的遠端分支 '%s'" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重新命名設定小節 '%s' 到 '%s'" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18480,17 +18715,17 @@ msgstr "" "\t%s\n" "\t如果必要請手動更新設定。" -#: builtin/remote.c:701 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "刪除 '%s' 失敗" -#: builtin/remote.c:735 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "建立 '%s' 失敗" -#: builtin/remote.c:801 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18498,120 +18733,119 @@ msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" -msgstr[1] "注意：ref/remotes 層級之外的一些分支未被移除。要刪除它們，使用：" -#: builtin/remote.c:815 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除設定小節 '%s'" -#: builtin/remote.c:916 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次取得將儲存於 remotes/%s）" -#: builtin/remote.c:919 +#: builtin/remote.c:996 msgid " tracked" msgstr " 已追蹤" -#: builtin/remote.c:921 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " 過時（使用 'git remote prune' 來移除）" -#: builtin/remote.c:923 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:964 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支" -#: builtin/remote.c:973 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "互動式重定基底到遠端 %s" -#: builtin/remote.c:975 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "互動式重定基底（含合併提交）到遠端 %s" -#: builtin/remote.c:978 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "重定基底到遠端 %s" -#: builtin/remote.c:982 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr " 與遠端 %s 合併" -#: builtin/remote.c:985 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "與遠端 %s 合併" -#: builtin/remote.c:988 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和遠端 %s\n" -#: builtin/remote.c:1031 +#: builtin/remote.c:1108 msgid "create" msgstr "建立" -#: builtin/remote.c:1034 +#: builtin/remote.c:1111 msgid "delete" msgstr "刪除" -#: builtin/remote.c:1038 +#: builtin/remote.c:1115 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1041 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "可快轉" -#: builtin/remote.c:1044 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "本機已過時" -#: builtin/remote.c:1051 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 強制推送至 %-*s (%s)" -#: builtin/remote.c:1054 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1058 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 強制推送至 %s" -#: builtin/remote.c:1061 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1129 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "不查詢遠端" -#: builtin/remote.c:1156 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* 遠端 %s" -#: builtin/remote.c:1157 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " 取得位址：%s" -#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(無 URL)" @@ -18619,180 +18853,177 @@ msgstr "(無 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1172 builtin/remote.c:1174 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" -#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1176 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "（未查詢）" -#: builtin/remote.c:1178 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1182 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n" -#: builtin/remote.c:1194 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" -msgstr[1] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1197 builtin/remote.c:1223 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr "（狀態未查詢）" -#: builtin/remote.c:1206 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 為 'git pull' 設定的本機分支：" -msgstr[1] " 為 'git pull' 設定的本機分支：" -#: builtin/remote.c:1214 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " 本機引用將在 'git push' 時被鏡像" -#: builtin/remote.c:1220 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 為 'git push' 設定的本機引用%s：" -msgstr[1] " 為 'git push' 設定的本機引用%s：" -#: builtin/remote.c:1241 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1243 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "刪除 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1258 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "無法確定遠端 HEAD" -#: builtin/remote.c:1260 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令：" -#: builtin/remote.c:1270 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "無法刪除 %s" -#: builtin/remote.c:1278 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "不是一個有效引用：%s" -#: builtin/remote.c:1280 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "不能設定 %s" # 譯者：請維持前導空格 -#: builtin/remote.c:1298 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" msgstr " %s 將成為懸空狀態！" # 譯者：請維持前導空格 -#: builtin/remote.c:1299 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" msgstr " %s 已成為懸空狀態！" -#: builtin/remote.c:1309 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1310 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1326 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [將刪除] %s" -#: builtin/remote.c:1329 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [已刪除] %s" -#: builtin/remote.c:1374 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "抓取後清除遠端" -#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" -#: builtin/remote.c:1453 +#: builtin/remote.c:1530 msgid "add branch" msgstr "新增分支" -#: builtin/remote.c:1460 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "未指定遠端" -#: builtin/remote.c:1477 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "查詢推送 URL 位址，而非取得 URL 位址" -#: builtin/remote.c:1479 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "返回所有 URL 位址" -#: builtin/remote.c:1507 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "沒有給遠端版本庫 '%s' 設定 URL" -#: builtin/remote.c:1533 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "動作推送 URLS" -#: builtin/remote.c:1535 +#: builtin/remote.c:1612 msgid "add URL" msgstr "新增 URL" -#: builtin/remote.c:1537 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "刪除 URL" -#: builtin/remote.c:1544 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete 無意義" -#: builtin/remote.c:1583 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "無效的舊 URL 符合範本：%s" -#: builtin/remote.c:1591 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1593 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "將不會刪除所有非推送 URL 位址" @@ -19036,8 +19267,8 @@ msgstr "無法對 %s 執行 fstat" msgid "unable to write object to database" msgstr "無法向資料庫寫入物件" -#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 -#: builtin/replace.c:453 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "不是一個有效的物件名：'%s'" @@ -19061,48 +19292,48 @@ msgstr "新物件和舊物件相同：'%s'" msgid "could not parse %s as a commit" msgstr "無法將 %s 解析為一個提交" -#: builtin/replace.c:415 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有損壞的合併標籤" -#: builtin/replace.c:417 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式錯誤的合併標籤" -#: builtin/replace.c:429 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:468 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一個 gpg 簽名" -#: builtin/replace.c:469 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "在取代的提交中簽名將被移除！" -#: builtin/replace.c:479 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能為 '%s' 寫取代提交" -#: builtin/replace.c:487 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "對 '%s' 移植沒有必要" -#: builtin/replace.c:491 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和舊的一樣：'%s'" -#: builtin/replace.c:526 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -19111,71 +19342,71 @@ msgstr "" "不能轉換下列移植：\n" "%s" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "列出取代的引用" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "刪除取代的引用" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "編輯現存的物件" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "修改一個提交的父提交" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "轉換現存的移植檔案" -#: builtin/replace.c:552 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "如果存在則取代引用" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "不要為 --edit 動作美觀顯示內容" -#: builtin/replace.c:555 +#: builtin/replace.c:556 msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:568 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "不列出時不能使用 --format" -#: builtin/replace.c:576 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "只有寫一個取代時 -f 才有意義" -#: builtin/replace.c:580 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意義" -#: builtin/replace.c:586 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d 需要至少一個參數" -#: builtin/replace.c:592 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "錯誤的參數個數" -#: builtin/replace.c:598 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e 需要且僅需要一個參數" -#: builtin/replace.c:604 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g 需要至少一個參數" -#: builtin/replace.c:610 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不帶參數" -#: builtin/replace.c:616 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" @@ -19202,17 +19433,16 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:33 -#| msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..." #: builtin/reset.c:34 msgid "" "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" -msgstr "git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<樹或提交>]" #: builtin/reset.c:35 -#| msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]" @@ -19260,8 +19490,8 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -19344,21 +19574,21 @@ msgstr "不能重設索引檔案至版本 '%s'。" msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:411 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" -#: builtin/rev-list.c:472 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "物件過濾需要 --objects" -#: builtin/rev-list.c:522 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" -#: builtin/rev-list.c:525 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "不能將 --use-bitmap-index 和物件過濾組合使用" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "--objects 不相容標記計數 (marked counting)" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19488,7 +19718,6 @@ msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣：" -msgstr[1] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣：" #: builtin/rm.c:212 msgid "" @@ -19502,7 +19731,6 @@ msgstr "" msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列檔案索引中有變更" -msgstr[1] "下列檔案索引中有變更" #: builtin/rm.c:220 builtin/rm.c:229 msgid "" @@ -19516,38 +19744,41 @@ msgstr "" msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下檔案有本機修改：" -msgstr[1] "如下檔案有本機修改：" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "不列出刪除的檔案" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "只從索引區刪除" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "忽略檔案更新狀態檢查" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "允許遞迴刪除" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "即使沒有符合，也以零狀態離開" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "沒有提供路徑規格。我該移除哪個檔案？" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 選項不會遞迴刪除 '%s'" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能刪除 %s" @@ -19636,7 +19867,6 @@ msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]" msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %s，無法處理 %d 個以上的引用" -msgstr[1] "忽略 %s，無法處理 %d 個以上的引用" #: builtin/show-branch.c:548 #, c-format @@ -19725,7 +19955,6 @@ msgstr "選項 --reflog 需要一個分支名" msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "一次只能顯示 %d 個條目。" -msgstr[1] "一次只能顯示 %d 個條目。" #: builtin/show-branch.c:745 #, c-format @@ -19737,7 +19966,6 @@ msgstr "無此引用 %s" msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能處理 %d 個以上的版本。" -msgstr[1] "不能處理 %d 個以上的版本。" #: builtin/show-branch.c:835 #, c-format @@ -19793,71 +20021,82 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" -#: builtin/sparse-checkout.c:20 -msgid "git sparse-checkout (init|list|set|disable) <options>" -msgstr "git sparse-checkout (init|list|set|disable) <選項>" +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|disable) <選項>" -#: builtin/sparse-checkout.c:61 +#: builtin/sparse-checkout.c:64 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" -#: builtin/sparse-checkout.c:220 +#: builtin/sparse-checkout.c:225 +msgid "failed to create directory for sparse-checkout file" +msgstr "無法建立稀疏簽出檔案的目錄" + +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "無法設定 extensions.worktreeConfig 設定" -#: builtin/sparse-checkout.c:237 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:256 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" -#: builtin/sparse-checkout.c:262 -#| msgid "skip applying sparse checkout filter" +#: builtin/sparse-checkout.c:308 msgid "initialize sparse-checkout" msgstr "初始化稀疏簽出" -#: builtin/sparse-checkout.c:295 +#: builtin/sparse-checkout.c:341 #, c-format -#| msgid "failed to open '%s': %s" msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:361 -#| msgid "git hash-object --stdin-paths" -msgid "git sparse-checkout set (--stdin | <patterns>)" -msgstr "git sparse-checkout set (--stdin | <樣式>)" +#: builtin/sparse-checkout.c:398 +#, c-format +msgid "could not normalize path %s" +msgstr "無法標準化路徑 %s" + +#: builtin/sparse-checkout.c:410 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)" + +#: builtin/sparse-checkout.c:435 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:378 -#| msgid "read updates from stdin" +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +msgid "unable to load existing sparse-checkout patterns" +msgstr "無法載入現存的稀疏簽出樣式" + +#: builtin/sparse-checkout.c:558 msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:384 -#| msgid "skip applying sparse checkout filter" +#: builtin/sparse-checkout.c:564 msgid "set sparse-checkout patterns" msgstr "設定稀疏簽出樣式" -#: builtin/sparse-checkout.c:447 -#| msgid "skip applying sparse checkout filter" +#: builtin/sparse-checkout.c:581 msgid "disable sparse-checkout" msgstr "停用稀疏簽出" -#: builtin/sparse-checkout.c:459 -#| msgid "unable to get current working directory" +#: builtin/sparse-checkout.c:593 msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<選項>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<選項>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19865,25 +20104,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <訊息>]\n" +" [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" " [--] [<路徑規格>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -19891,186 +20132,196 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<消息>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" +" [--] [<路徑規格>...]]" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' 不像是一個儲藏提交" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:161 git-legacy-stash.sh:549 +#: builtin/stash.c:162 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "未發現儲藏條目。" -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s 不是一個有效的引用名" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear 不支援參數" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "無法在合併過程套用儲藏" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "無法生成差異 %s^!." -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "索引中有衝突。嘗試不用 --index。" -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "不能儲存索引樹" -#: builtin/stash.c:436 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "無法從儲藏條目中復原未追蹤檔案" -#: builtin/stash.c:450 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "正在合併 %s 和 %s" -#: builtin/stash.c:460 git-legacy-stash.sh:681 +#: builtin/stash.c:461 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:521 builtin/stash.c:620 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:554 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:557 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:582 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:632 git-legacy-stash.sh:695 +#: builtin/stash.c:633 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:655 git-legacy-stash.sh:713 +#: builtin/stash.c:656 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:795 builtin/stash.c:832 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:823 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1045 git-legacy-stash.sh:218 +#: builtin/stash.c:1049 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1145 git-legacy-stash.sh:150 +#: builtin/stash.c:1149 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1172 git-legacy-stash.sh:165 +#: builtin/stash.c:1176 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1181 git-legacy-stash.sh:180 +#: builtin/stash.c:1185 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 #: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1229 git-legacy-stash.sh:234 +#: builtin/stash.c:1233 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1278 git-legacy-stash.sh:338 +#: builtin/stash.c:1282 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1294 +#: builtin/stash.c:1298 msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1309 git-legacy-stash.sh:346 +#: builtin/stash.c:1313 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1316 git-legacy-stash.sh:351 +#: builtin/stash.c:1320 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1331 git-legacy-stash.sh:355 +#: builtin/stash.c:1335 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1336 +#: builtin/stash.c:1340 #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1426 git-legacy-stash.sh:385 +#: builtin/stash.c:1430 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1463 builtin/stash.c:1499 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1464 builtin/stash.c:1500 +#: builtin/stash.c:1472 builtin/stash.c:1537 msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1466 builtin/stash.c:1502 +#: builtin/stash.c:1474 builtin/stash.c:1539 msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1468 builtin/stash.c:1504 +#: builtin/stash.c:1476 builtin/stash.c:1541 msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stash.c:1564 +#: builtin/stash.c:1600 #, c-format msgid "could not exec %s" msgstr "不能執行 %s" @@ -20091,7 +20342,7 @@ msgstr "跳過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" @@ -20105,7 +20356,7 @@ msgstr "submodule--helper print-default-remote 不帶參數" msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' 剝離一個元件" -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" @@ -20147,7 +20398,7 @@ msgstr "" msgid "Suppress output of entering each submodule command" msgstr "阻止進入每一個子模組指令的輸出" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" @@ -20190,72 +20441,72 @@ msgstr "阻止子模組初始化的輸出" msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:827 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "阻止子模組狀態輸出" -#: builtin/submodule--helper.c:879 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:880 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:885 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:909 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:973 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:979 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1004 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1051 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "阻止子模組 url 同步的輸出" -#: builtin/submodule--helper.c:1058 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1112 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20264,253 +20515,258 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1124 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1132 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1134 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1145 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1161 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1190 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "刪除子模組工作區，即使包含本機修改" -#: builtin/submodule--helper.c:1191 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "將所有子模組取消註冊" -#: builtin/submodule--helper.c:1196 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" -msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" +msgstr "" +"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1210 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確實想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1275 +#: builtin/submodule--helper.c:1289 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" "submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" "'--reference-if-able' instead of '--reference'." msgstr "" +"從上級專案的備用版本庫計算得出的備用版本庫無效。\n" +"這種情況下，請設定 submodule.alternateErrorStrategy 為 'info'\n" +"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" +"而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1353 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1360 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:1383 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1386 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1389 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 -#| msgid "applying to an empty history" +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1424 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<路徑>] [--quiet] [--reference <版本庫" -">] [--name <名字>] [--depth <深度>] --url <url> --path <路徑>" +">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路" +"徑>" -#: builtin/submodule--helper.c:1431 +#: builtin/submodule--helper.c:1449 #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" -#: builtin/submodule--helper.c:1442 +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1446 +#: builtin/submodule--helper.c:1464 #, c-format -#| msgid "source directory is empty" msgid "directory not empty: '%s'" msgstr "目錄不是空的：「%s」" -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" -#: builtin/submodule--helper.c:1494 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1498 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1594 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:1598 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:1628 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:1657 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:1803 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "複製 '%s' 失敗。按計劃重試" -#: builtin/submodule--helper.c:1814 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次嘗試複製 '%s' 失敗，離開" -#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:1879 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:1883 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1889 +#: builtin/submodule--helper.c:1916 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "建立一個指定深度的淺複製" -#: builtin/submodule--helper.c:1892 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "並發任務" -#: builtin/submodule--helper.c:1894 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始複製是否應該遵守推薦的淺複製選項" -#: builtin/submodule--helper.c:1895 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:1904 +#: builtin/submodule--helper.c:1933 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:1917 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:1965 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" -msgstr "子模組（%s）的分支設定為繼承上級項目的分支，但是上級項目不在任何分支上" +msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" -#: builtin/submodule--helper.c:2088 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2121 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2127 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2183 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2186 +#: builtin/submodule--helper.c:2215 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2191 +#: builtin/submodule--helper.c:2220 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2192 +#: builtin/submodule--helper.c:2221 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2193 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2212 git-submodule.sh:173 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:2268 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -20763,7 +21019,7 @@ msgstr "標籤 '%s' 已存在" msgid "Updated tag '%s' (was %s)\n" msgstr "已更新標籤 '%s'（曾為 %s）\n" -#: builtin/unpack-objects.c:501 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "展開物件中" @@ -20964,13 +21220,15 @@ msgstr "清除 fsmonitor 有效位" msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" -msgstr "core.splitIndex 被設定為 false。如果您確實要啟用索引分割，請刪除或修改它。" +msgstr "" +"core.splitIndex 被設定為 false。如果您確實要啟用索引分割，請刪除或修改它。" #: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" -msgstr "core.splitIndex 被設定為 true。如果您確實要禁用索引分割，請刪除或修改它。" +msgstr "" +"core.splitIndex 被設定為 true。如果您確實要禁用索引分割，請刪除或修改它。" #: builtin/update-index.c:1194 msgid "" @@ -21130,7 +21388,7 @@ msgstr "git worktree remove [<選項>] <工作區>" msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:60 builtin/worktree.c:898 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" @@ -21180,12 +21438,12 @@ msgstr "將早於 <時間> 的工作區過期" msgid "'%s' already exists" msgstr "'%s' 已經存在" -#: builtin/worktree.c:251 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "無法再次新增工作區 '%s'" -#: builtin/worktree.c:256 +#: builtin/worktree.c:249 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21194,7 +21452,7 @@ msgstr "" "'%s' 是一個遺失但鎖定的工作區，使用\n" "'add -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除" -#: builtin/worktree.c:258 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21203,120 +21461,120 @@ msgstr "" "'%s' 是一個遺失但已經註冊的工作區，使用\n" "'add -f' 覆蓋，或 'prune' 或 'remove' 清除" -#: builtin/worktree.c:308 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "不能建立目錄 '%s'" -#: builtin/worktree.c:439 builtin/worktree.c:445 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" -#: builtin/worktree.c:441 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "準備工作區（重設分支 '%s'，之前為 %s）" -#: builtin/worktree.c:450 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "準備工作區（簽出 '%s'）" -#: builtin/worktree.c:456 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "準備工作區（分離開頭指標 %s）" -#: builtin/worktree.c:497 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "簽出 <分支>，即使已經被簽出到其它工作區" -#: builtin/worktree.c:500 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "建立一個新分支" -#: builtin/worktree.c:502 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "建立或重設一個分支" -#: builtin/worktree.c:504 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "生成新的工作區" -#: builtin/worktree.c:505 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:508 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "設定追蹤模式（參見 git-branch(1)）" -#: builtin/worktree.c:511 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:519 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b、-B 和 --detach 是互斥的" -#: builtin/worktree.c:580 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用選項 --[no-]track " -#: builtin/worktree.c:680 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "鎖定原因" -#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 -#: builtin/worktree.c:926 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:694 builtin/worktree.c:727 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:699 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:701 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:729 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:770 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:778 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:801 builtin/worktree.c:928 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:806 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目標名稱" -#: builtin/worktree.c:812 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "目標 '%s' 已存在" -#: builtin/worktree.c:820 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21325,7 +21583,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:822 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21333,36 +21591,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:825 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:830 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:878 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:882 +#: builtin/worktree.c:875 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:887 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:910 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:933 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21371,7 +21629,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:935 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21379,7 +21637,7 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:938 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" @@ -21413,7 +21671,7 @@ msgstr "預期 'to' 指令，得到 %s" #: fast-import.c:3254 #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" -msgstr "" +msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" #: credential-cache--daemon.c:223 #, c-format @@ -21694,41 +21952,41 @@ msgstr "不能壓縮請求，zlib 結束錯誤 %d" msgid "dumb http transport does not support shallow capabilities" msgstr "啞 http 傳輸不支援 shalllow 能力" -#: remote-curl.c:1037 +#: remote-curl.c:1038 msgid "fetch failed." msgstr "取得失敗。" -#: remote-curl.c:1085 +#: remote-curl.c:1086 msgid "cannot fetch by sha1 over smart http" msgstr "無法透過智慧 HTTP 取得 sha1" -#: remote-curl.c:1129 remote-curl.c:1135 +#: remote-curl.c:1130 remote-curl.c:1136 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" -#: remote-curl.c:1147 remote-curl.c:1261 +#: remote-curl.c:1148 remote-curl.c:1263 #, c-format msgid "http transport does not support %s" msgstr "http 傳輸協定不支援 %s" -#: remote-curl.c:1183 +#: remote-curl.c:1184 msgid "git-http-push failed" msgstr "git-http-push 失敗" -#: remote-curl.c:1367 +#: remote-curl.c:1369 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" -#: remote-curl.c:1399 +#: remote-curl.c:1401 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl：錯誤讀取來自 git 的指令流" -#: remote-curl.c:1406 +#: remote-curl.c:1408 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl：嘗試沒有本機版本庫下取得" -#: remote-curl.c:1446 +#: remote-curl.c:1448 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl：未知的來自 git 的指令 '%s'" @@ -21766,12 +22024,10 @@ msgid "how to strip spaces and #comments from message" msgstr "設定如何刪除提交說明裡的空格和 #備註" #: parse-options.h:337 -#| msgid "read patterns from file" msgid "read pathspec from file" msgstr "從檔案讀取 <路徑規格>" #: parse-options.h:338 -#| msgid "paths are separated with NUL character" msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" @@ -22653,57 +22909,46 @@ msgstr "${REV}：無法捨棄儲藏條目" msgid "(To restore them type \"git stash apply\")" msgstr "（為復原資料輸入 \"git stash apply\"）" -#: git-submodule.sh:202 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作區的頂級目錄中使用相對路徑" -#: git-submodule.sh:212 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始" -#: git-submodule.sh:231 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已經存在於索引中" -#: git-submodule.sh:234 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" -#: git-submodule.sh:241 +#: git-submodule.sh:242 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 沒有簽出的提交" -#: git-submodule.sh:247 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" -"以下路徑被您的一個 .gitignore 檔案所忽略：\n" -"$sm_path\n" -"如果您確實想新增它，使用 -f 參數。" - -#: git-submodule.sh:270 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "新增位於 '$sm_path' 的現存版本庫到索引" -#: git-submodule.sh:272 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" -#: git-submodule.sh:280 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" -#: git-submodule.sh:282 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22718,125 +22963,126 @@ msgstr "" "使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" "或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" -#: git-submodule.sh:288 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" -#: git-submodule.sh:300 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能簽出子模組 '$sm_path'" -#: git-submodule.sh:305 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "無法新增子模組 '$sm_path'" -#: git-submodule.sh:314 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "無法註冊子模組 '$sm_path'" -#: git-submodule.sh:580 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" -#: git-submodule.sh:590 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中取得" -#: git-submodule.sh:595 +#: git-submodule.sh:605 #, 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:613 +#: git-submodule.sh:623 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" -#: git-submodule.sh:619 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." -msgstr "取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" +msgstr "" +"取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。" -#: git-submodule.sh:626 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'" -#: git-submodule.sh:627 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'" -#: git-submodule.sh:631 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" -#: git-submodule.sh:632 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" -#: git-submodule.sh:638 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" -#: git-submodule.sh:643 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" -#: git-submodule.sh:644 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模組 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:675 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "無法遞迴進子模組路徑 '$displaypath'" -#: git-submodule.sh:886 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "選項 --cached 不能和選項 --files 同時使用" -#: git-submodule.sh:938 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 譯者：請維持前導空格 -#: git-submodule.sh:958 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 譯者：請維持前導空格 -#: git-submodule.sh:961 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 譯者：請維持前導空格 -#: git-submodule.sh:964 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" @@ -22976,7 +23222,6 @@ msgstr "提交說明 #${n} 將被跳過：" msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "這是一個 $count 個提交的組合。" -msgstr[1] "這是一個 $count 個提交的組合。" #: git-rebase--preserve-merges.sh:492 #, sh-format @@ -23111,7 +23356,8 @@ msgstr "在修補提交中尋找作者訊息時遇到錯誤" msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." -msgstr "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" +msgstr "" +"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" #: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848 msgid "Could not commit staged changes." @@ -23144,7 +23390,10 @@ msgstr "不能標記為互動式" msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）" -msgstr[1] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）" + +#: git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "注意空提交已被備註掉" #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" @@ -23218,7 +23467,6 @@ msgstr "%12s %12s %s" msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "建立了 %d 個路徑\n" -msgstr[1] "建立了 %d 個路徑\n" #: git-add--interactive.perl:1053 msgid "" @@ -23413,124 +23661,11 @@ msgstr "" msgid "The selected hunks do not apply to the index!\n" msgstr "選中的區塊不能套用到索引！\n" -#: git-add--interactive.perl:1343 -msgid "Apply them to the worktree anyway? " -msgstr "無論如何都要套用到工作區嗎？" - -#: git-add--interactive.perl:1346 -msgid "Nothing was applied.\n" -msgstr "未套用。\n" - #: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" -#: git-add--interactive.perl:1428 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "暫存模式變更 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1429 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1430 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1433 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1434 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1435 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1438 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1439 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1440 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1443 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1444 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1445 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1449 git-add--interactive.perl:1464 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1450 git-add--interactive.perl:1465 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1453 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1454 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1455 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1458 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1459 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1460 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " - #: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " @@ -23560,7 +23695,6 @@ msgstr "無效數字：'%s'\n" msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "對不起，只有 %d 個可用區塊。\n" -msgstr[1] "對不起，只有 %d 個可用區塊。\n" #: git-add--interactive.perl:1619 msgid "No other hunks to search\n" @@ -23592,7 +23726,6 @@ msgstr "對不起，不能分割這個區塊\n" msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "分割為 %d 塊。\n" -msgstr[1] "分割為 %d 塊。\n" #: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" @@ -23985,16 +24118,3 @@ msgstr "略過 %s 含備份後綴 '%s'。\n" #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]：" - -#, c-format -#~ msgid "unable to get tree for %s" -#~ msgstr "無法得到 %s 的樹狀物件" - -#~ msgid "Use an experimental heuristic to improve diffs" -#~ msgstr "使用一個實驗性的啟發式演算法改進差異顯示" - -#~ msgid "git commit-graph [--object-dir <objdir>]" -#~ msgstr "git commit-graph [--object-dir <物件目錄>]" - -#~ msgid "git commit-graph read [--object-dir <objdir>]" -#~ msgstr "git commit-graph read [--object-dir <物件目錄>]" |