diff options
| author |  pan93412 <pan93412@gmail.com> | 2019-12-31 00:58:40 +0800 |
|---|---|---|
| committer | pan93412 <pan93412@gmail.com> | 2019-12-31 21:17:41 +0800 |
| commit | 13185fd241626c07e96ca1228eb62911e590189e (patch) | |
| tree | 1726815683a6d5d1bdddac89316a4a35569ae204 /po | |
| parent | l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) (diff) | |
| download | tgif-13185fd241626c07e96ca1228eb62911e590189e.tar.xz | |
l10n: zh_TW.po: update translation for v2.25.0 round 1
Signed-off-by: pan93412 <pan93412@gmail.com>
Diffstat (limited to 'po')
| -rw-r--r-- | po/zh_TW.po | 5317 |
1 files changed, 2974 insertions, 2343 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index 8460999654..1b0cd6dd79 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -142,50 +142,532 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-10-28 13:19+0800\n" -"PO-Revision-Date: 2019-11-16 22:26+0800\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" "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" +"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.08.3\n" +"X-Generator: Lokalize 19.12.0\n" -#: advice.c:109 +#: add-interactive.c:347 +#, 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 +msgid "could not read index" +msgstr "不能讀取索引" + +#: add-interactive.c:555 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "二進位" + +#: add-interactive.c:613 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "無" + +#: add-interactive.c:614 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "沒有修改" + +#: add-interactive.c:651 git-add--interactive.perl:643 +msgid "Update" +msgstr "更新" + +#: add-interactive.c:668 add-interactive.c:856 +#, 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 +msgid "could not write index" +msgstr "不能寫入索引" + +#: add-interactive.c:677 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 +#, 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 +#: 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 +msgid "Revert" +msgstr "還原" + +#: add-interactive.c:746 +#| msgid "could not parse HEAD" +msgid "Could not parse HEAD^{tree}" +msgstr "不能解析 HEAD^{樹}" + +#: add-interactive.c:784 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 +#, c-format +msgid "No untracked files.\n" +msgstr "沒有未追蹤的檔案。\n" + +#: add-interactive.c:839 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "新增未追蹤的" + +#: add-interactive.c:866 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 +#, 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 +#, c-format +msgid "Only binary files changed.\n" +msgstr "只有二進位檔案被修改。\n" + +#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "沒有修改。\n" + +#: add-interactive.c:914 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "修補檔更新" + +#: add-interactive.c:953 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "檢視 diff" + +#: add-interactive.c:981 +#| msgid "show matching files in the pager" +msgid "show paths with changes" +msgstr "顯示有變更的路徑" + +#: add-interactive.c:983 +msgid "add working tree state to the staged set of changes" +msgstr "加入工作區狀態至暫存列表" + +#: add-interactive.c:985 +msgid "revert staged set of changes back to the HEAD version" +msgstr "還原修改的暫存集至 HEAD 版本" + +#: add-interactive.c:987 +#| msgid "select hunks interactively" +msgid "pick hunks and update selectively" +msgstr "挑選區塊並選擇性更新" + +#: add-interactive.c:989 +#| msgid "reset HEAD and index" +msgid "view diff between HEAD and index" +msgstr "檢視 HEAD 及索引之間的差異" + +#: add-interactive.c:991 +msgid "add contents of untracked files to the staged set of changes" +msgstr "加入未追蹤檔案的內容至暫存列表" + +#: add-interactive.c:999 add-interactive.c:1048 +msgid "Prompt help:" +msgstr "提示說明：" + +#: add-interactive.c:1001 +#| msgid "select mainline parent" +msgid "select a single item" +msgstr "選擇單一項目" + +#: add-interactive.c:1003 +#| msgid "select handling of signed tags" +msgid "select a range of items" +msgstr "選擇項目範圍" + +#: add-interactive.c:1005 +#| msgid "%s has multiple values" +msgid "select multiple ranges" +msgstr "選擇多個範圍" + +#: add-interactive.c:1007 add-interactive.c:1052 +msgid "select item based on unique prefix" +msgstr "基於唯一前綴選擇項目" + +#: add-interactive.c:1009 +#| msgid "use specified template file" +msgid "unselect specified items" +msgstr "取消選擇指定項目" + +#: add-interactive.c:1011 +#| msgid "choose a diff algorithm" +msgid "choose all items" +msgstr "選擇所有項目" + +#: add-interactive.c:1013 +msgid "(empty) finish selecting" +msgstr "（空）完成選取" + +#: add-interactive.c:1050 +#| msgid "%s expects a numerical value" +msgid "select a numbered item" +msgstr "選擇編號過的項目" + +#: add-interactive.c:1054 +#| msgid "empty exec command" +msgid "(empty) select nothing" +msgstr "（空）全不選取" + +#: add-interactive.c:1062 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 +msgid "What now" +msgstr "請選擇" + +#: add-interactive.c:1115 git-add--interactive.perl:213 +msgid "staged" +msgstr "快取" + +#: add-interactive.c:1115 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 +msgid "path" +msgstr "路徑" + +#: add-interactive.c:1122 +#| msgid "could not read index" +msgid "could not refresh index" +msgstr "無法重新整理索引" + +#: add-interactive.c:1136 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: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: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:111 +#, 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 +#, 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" +msgid "could not parse diff" +msgstr "無法解析差異 (diff)" + +#: add-patch.c:194 +#| msgid "could not parse commit %s" +msgid "could not parse colored diff" +msgstr "無法解析上色過的差異 (diff)" + +#: add-patch.c:508 +#, c-format +#| msgid "bad config line %d in %s" +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"應有上下文行 #%d 於\n" +"%.*s" + +#: add-patch.c:523 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"區塊未重疊：\n" +"%.*s\n" +"\t不以下述結尾：\n" +"%.*s" + +#: add-patch.c:799 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" + +#: add-patch.c:803 +#, 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" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"要刪除 '%c' 開始的行，使其成為 ' ' 開始的行（上下文）。\n" +"要刪除 '%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 +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" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" +"此次編輯被終止，此區塊不會被修改。\n" + +#: add-patch.c:851 +#| msgid "could not parse git header '%.*s'" +msgid "could not parse hunk header" +msgstr "無法解析區塊標頭" + +#: add-patch.c:895 add-patch.c:1294 +msgid "'git apply --cached' failed" +msgstr "「git apply --cached」失敗" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. 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 +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" +msgid "" +"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" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - 維持此區塊未決狀態，檢視下一個未決定區塊\n" +"J - 維持此區塊未決狀態，檢視下一個區塊\n" +"k - 維持此區塊未決狀態，檢視上一個未決定區塊\n" +"K - 維持此區塊未決狀態，檢視上一個區塊\n" +"g - 選擇要跳轉至的區塊\n" +"/ - 尋找符合提供之正規表示式的區塊\n" +"s - 分割目前區塊為更小的區塊\n" +"e - 手動編輯目前區塊\n" +"? - 顯示說明\n" + +#: add-patch.c:1137 add-patch.c:1147 +#| msgid "No previous hunk\n" +msgid "No previous hunk" +msgstr "沒有上一個區塊" + +#: add-patch.c:1142 add-patch.c:1152 +#| msgid "No next hunk\n" +msgid "No next hunk" +msgstr "沒有下一個區塊" + +#: add-patch.c:1158 +#| msgid "No other hunks to goto\n" +msgid "No other hunks to goto" +msgstr "沒有其它可供跳轉的區塊" + +#: add-patch.c:1169 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 +msgid "go to which hunk? " +msgstr "跳轉到哪個區塊？" + +#: add-patch.c:1181 +#, c-format +#| msgid "Invalid number: '%s'\n" +msgid "Invalid number: '%s'" +msgstr "無效數字：'%s'" + +#: add-patch.c:1186 +#, 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" +msgid "No other hunks to search" +msgstr "沒有其它可供尋找的區塊" + +#: add-patch.c:1201 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "使用正規表示式搜尋？" + +#: add-patch.c:1216 +#, 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" +msgid "No hunk matches the given pattern" +msgstr "沒有和提供模式相符合的區塊" + +#: add-patch.c:1240 +#| msgid "Sorry, cannot split this hunk\n" +msgid "Sorry, cannot split this hunk" +msgstr "對不起，不能分割這個區塊" + +#: add-patch.c:1244 +#, 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" +msgid "Sorry, cannot edit this hunk" +msgstr "對不起，不能編輯這個區塊" + +#: advice.c:111 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:162 +#: advice.c:164 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:164 +#: advice.c:166 msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:166 +#: advice.c:168 msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:168 +#: advice.c:170 msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:170 +#: advice.c:172 msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:172 +#: advice.c:174 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:180 +#: advice.c:182 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." @@ -193,23 +675,23 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:188 +#: advice.c:190 msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:195 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:195 +#: advice.c:197 msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:196 +#: advice.c:198 msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:202 +#: advice.c:204 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -411,24 +893,24 @@ msgstr "無法讀取符號連結 %s" msgid "unable to open or read %s" msgstr "不能開啟或讀取 %s" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "無效的行首字元：'%c'" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）" msgstr[1] "區塊 #%d 成功套用於 %d（位移 %d 行）" -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔片段" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -437,445 +919,431 @@ msgstr "" "當查詢：\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺少 '%s' 的二進位修補檔資料" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" -#: apply.c:3152 +#: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" -#: apply.c:3160 +#: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" -#: apply.c:3178 +#: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" -#: apply.c:3191 +#: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 '%s'" -#: apply.c:3197 +#: apply.c:3207 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" -#: apply.c:3218 +#: apply.c:3228 #, c-format msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c:3341 +#: apply.c:3351 #, c-format msgid "cannot checkout %s" msgstr "不能簽出 %s" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c:3401 +#: apply.c:3411 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3430 apply.c:3673 +#: apply.c:3440 apply.c:3683 #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3516 apply.c:3688 +#: apply.c:3526 apply.c:3698 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3525 apply.c:3696 +#: apply.c:3535 apply.c:3706 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3560 +#: apply.c:3570 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: apply.c:3563 +#: apply.c:3573 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回落到三方合併...\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3589 apply.c:3593 #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3595 +#: apply.c:3605 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "無法回落到三方合併...\n" -#: apply.c:3609 +#: apply.c:3619 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3614 +#: apply.c:3624 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3640 +#: apply.c:3650 msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3713 +#: apply.c:3723 #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3715 +#: apply.c:3725 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1320 #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3924 +#: apply.c:3934 #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3927 +#: apply.c:3937 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3947 +#: apply.c:3957 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3952 +#: apply.c:3962 #, 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:3972 +#: apply.c:3982 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:3976 +#: apply.c:3986 #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:3991 +#: apply.c:4001 #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4083 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4090 +#: apply.c:4100 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4093 +#: apply.c:4103 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗" - -#: apply.c:4102 +#: apply.c:4112 #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4112 +#: apply.c:4122 #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4250 +#: apply.c:4260 #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4284 +#: apply.c:4294 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4290 +#: apply.c:4300 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4298 +#: apply.c:4308 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4304 apply.c:4449 +#: apply.c:4314 apply.c:4459 #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4347 +#: apply.c:4357 #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4351 +#: apply.c:4361 #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4421 +#: apply.c:4431 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4519 +#: apply.c:4529 #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4527 +#: apply.c:4537 msgid "internal error" msgstr "內部錯誤" -#: apply.c:4530 +#: apply.c:4540 #, 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:4541 +#: apply.c:4551 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192 #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4563 +#: apply.c:4573 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 個片段成功應用。" -#: apply.c:4567 +#: apply.c:4577 #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個片段。" -#: apply.c:4686 +#: apply.c:4696 #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4694 +#: apply.c:4704 msgid "unrecognized input" msgstr "未能識別的輸入" -#: apply.c:4714 +#: apply.c:4724 msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4871 +#: apply.c:4881 #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4898 +#: apply.c:4908 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" msgstr[1] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4904 apply.c:4919 +#: apply.c:4914 apply.c:4929 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" msgstr[1] "%d 行新增了空白字元誤用。" -#: apply.c:4912 +#: apply.c:4922 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "路徑" - -#: apply.c:4956 +#: apply.c:4966 msgid "don't apply changes matching the given path" msgstr "不要應用與給出路徑向符合的變更" -#: apply.c:4959 +#: apply.c:4969 msgid "apply changes matching the given path" msgstr "應用與給出路徑向符合的變更" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4971 builtin/am.c:2206 msgid "num" msgstr "數字" -#: apply.c:4962 +#: apply.c:4972 msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:4965 +#: apply.c:4975 msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:4967 +#: apply.c:4977 msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:4971 +#: apply.c:4981 msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:4973 +#: apply.c:4983 msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:4975 +#: apply.c:4985 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可應用" -#: apply.c:4977 +#: apply.c:4987 msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:4979 +#: apply.c:4989 msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:4981 +#: apply.c:4991 msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:4983 +#: apply.c:4993 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:4986 +#: apply.c:4996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:4988 +#: apply.c:4998 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一個修補檔不能應用則嘗試三方合併" -#: apply.c:4990 +#: apply.c:5000 msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:4995 +#: apply.c:5005 msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1474 msgid "action" msgstr "動作" -#: apply.c:4997 +#: apply.c:5007 msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5000 apply.c:5003 +#: apply.c:5010 apply.c:5013 msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5006 +#: apply.c:5016 msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5008 +#: apply.c:5018 msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5010 +#: apply.c:5020 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中" -#: apply.c:5012 +#: apply.c:5022 msgid "allow overlapping hunks" msgstr "允許重疊的修補檔片段" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: 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 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "詳細輸出" -#: apply.c:5015 +#: apply.c:5025 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5018 +#: apply.c:5028 msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔片段的標頭訊息中的行號" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5030 builtin/am.c:2194 msgid "root" msgstr "根目錄" -#: apply.c:5021 +#: apply.c:5031 msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" @@ -890,14 +1358,13 @@ 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:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" @@ -929,7 +1396,7 @@ msgstr "格式" msgid "archive format" msgstr "歸檔格式" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "前綴" @@ -937,12 +1404,12 @@ msgstr "前綴" msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: 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/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:186 +#: parse-options.h:190 msgid "file" msgstr "檔案" @@ -974,8 +1441,8 @@ msgstr "壓縮效果更好" msgid "list supported archive formats" msgstr "列出支援的歸檔格式" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: 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 msgid "repo" msgstr "版本庫" @@ -1014,17 +1481,17 @@ msgstr "未知歸檔格式 '%s'" msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:350 #, c-format msgid "cannot stream blob %s" msgstr "不能開啟資料物件 %s" -#: archive-tar.c:266 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:368 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:293 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:358 #, c-format msgid "cannot read %s" msgstr "不能讀取 %s" @@ -1043,42 +1510,42 @@ msgstr "無法重定向描述符" msgid "'%s' filter reported error" msgstr "'%s' 過濾器報告了錯誤" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路徑不是有效的 UTF-8：%s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-zip.c:609 +#: archive-zip.c:614 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "對於本系統時間戳太大：%<PRIuMAX>" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一個有效的屬性名" -#: attr.c:370 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"負值範本在 git attributes 中被忽略\n" +"反向模式在 git attributes 中被忽略\n" "當字串確實要以驚嘆號開始時，使用 '\\!'。" #: bisect.c:468 @@ -1212,9 +1679,9 @@ 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:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: 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 #: builtin/shortlog.c:192 msgid "revision walk setup failed" @@ -1378,8 +1845,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:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108 +#: builtin/commit.c:811 #, c-format msgid "could not open '%s'" msgstr "不能開啟 '%s'" @@ -1390,7 +1857,7 @@ msgstr "版本庫中缺少這些必備的提交：" #: bundle.c:146 msgid "need a repository to verify a bundle" -msgstr "需要一個版本庫來校驗一個包" +msgstr "需要版本庫驗證一個包" #: bundle.c:197 #, c-format @@ -1410,42 +1877,42 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "這個包需要這個引用：" msgstr[1] "這個包需要 %d 個引用：" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "無法複製 bundle 描述符" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 進程" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "pack-objects 終止" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "rev-list 終止" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 選項排除" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "未能識別的參數：%s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "不能建立空包。" -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "不能建立 '%s'" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "index-pack 終止" @@ -1454,18 +1921,18 @@ msgstr "index-pack 終止" msgid "invalid color value: %.*s" msgstr "無效的顏色值：%.*s" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: 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 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一個提交！" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1485,27 +1952,27 @@ msgstr "" "設定 \"git config advice.graftFileDeprecated false\"\n" "可關閉本消息" -#: commit.c:1128 +#: commit.c:1152 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1131 +#: commit.c:1155 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" -#: commit.c:1134 +#: commit.c:1158 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 沒有 GPG 簽名。" -#: commit.c:1137 +#: commit.c:1161 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" -#: commit.c:1391 +#: commit.c:1415 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" @@ -1515,75 +1982,70 @@ msgstr "" "您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n" "設定為您項目所用的字元編碼。\n" -#: commit-graph.c:127 +#: commit-graph.c:130 msgid "commit-graph file is too small" msgstr "提交圖形檔案太小" -#: commit-graph.c:192 +#: commit-graph.c:195 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交圖形簽名 %X 和簽名 %X 不符合" -#: commit-graph.c:199 +#: commit-graph.c:202 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交圖形版本 %X 和版本 %X 不符合" -#: commit-graph.c:206 +#: commit-graph.c:209 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" -#: commit-graph.c:229 +#: commit-graph.c:232 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整" -#: commit-graph.c:240 +#: commit-graph.c:243 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "提交圖形不正確的區塊位移 %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:286 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "提交圖形區塊 id %08x 出現了多次" -#: commit-graph.c:347 +#: commit-graph.c:350 msgid "commit-graph has no base graphs chunk" msgstr "提交圖形沒有基礎圖形區塊" -#: commit-graph.c:357 +#: commit-graph.c:360 msgid "commit-graph chain does not match" msgstr "提交圖形鏈不符合" -#: commit-graph.c:404 +#: commit-graph.c:407 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" -#: commit-graph.c:430 +#: commit-graph.c:433 msgid "unable to find all commit-graph files" msgstr "無法找到所有提交圖形檔案" -#: commit-graph.c:561 commit-graph.c:621 +#: commit-graph.c:564 commit-graph.c:624 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "無效的提交位置。提交圖形可能已損壞" -#: commit-graph.c:582 +#: commit-graph.c:585 #, c-format msgid "could not find commit %s" msgstr "無法找到提交 %s" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:858 builtin/am.c:1287 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" -#: commit-graph.c:859 -#, c-format -msgid "unable to get tree for %s" -msgstr "無法得到 %s 的樹狀物件" - #: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" @@ -1650,12 +2112,12 @@ msgstr "正在尋找提交圖中額外的邊" msgid "failed to write correct number of base graph ids" msgstr "無法寫入正確數量的基礎圖形 ID" -#: commit-graph.c:1379 midx.c:810 +#: commit-graph.c:1379 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:241 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "不能建立 '%s'" @@ -1703,7 +2165,7 @@ msgstr "提交太多不能畫圖" #: commit-graph.c:1961 msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交圖檔案的校驗碼錯誤，可能已經損壞" +msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" #: commit-graph.c:1971 #, c-format @@ -1722,7 +2184,7 @@ msgstr "無法從提交圖形中解析提交 %s" #: commit-graph.c:2006 msgid "Verifying commits in commit graph" -msgstr "正在校驗提交圖中的提交" +msgstr "正在驗證提交圖中的提交" #: commit-graph.c:2020 #, c-format @@ -1813,7 +2275,7 @@ msgstr "鍵名沒有包含一個小節名稱：%s" msgid "key does not contain variable name: %s" msgstr "鍵名沒有包含變數名：%s" -#: config.c:406 sequencer.c:2401 +#: config.c:406 sequencer.c:2530 #, c-format msgid "invalid key: %s" msgstr "無效鍵名：%s" @@ -1935,144 +2397,144 @@ msgstr "core.commentChar 應該是一個字元" msgid "invalid mode for object creation: %s" msgstr "無效的物件建立模式：%s" -#: config.c:1425 +#: config.c:1430 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式錯誤" -#: config.c:1451 +#: config.c:1456 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式錯誤：%s" -#: config.c:1452 +#: config.c:1457 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1518 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "錯誤的打包壓縮級別 %d" -#: config.c:1634 +#: config.c:1639 #, c-format msgid "unable to load config blob object '%s'" msgstr "無法從資料物件 '%s' 載入設定" -#: config.c:1637 +#: config.c:1642 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 沒有指向一個資料物件" -#: config.c:1654 +#: config.c:1659 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析設定物件 '%s'" -#: config.c:1684 +#: config.c:1689 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失敗" -#: config.c:1740 +#: config.c:1745 msgid "unable to parse command-line config" msgstr "無法解析指令列中的設定" -#: config.c:2091 +#: config.c:2096 msgid "unknown error occurred while reading the configuration files" msgstr "在讀取設定檔案時遇到未知錯誤" -#: config.c:2261 +#: config.c:2266 #, c-format msgid "Invalid %s: '%s'" msgstr "無效 %s：'%s'" -#: config.c:2306 +#: config.c:2311 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" -#: config.c:2352 +#: config.c:2357 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "無法解析指令列設定中的 '%s'" -#: config.c:2354 +#: config.c:2359 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" -#: config.c:2435 +#: config.c:2440 #, c-format msgid "invalid section name '%s'" msgstr "無效的小節名稱 '%s'" -#: config.c:2467 +#: config.c:2472 #, c-format msgid "%s has multiple values" msgstr "%s 有多個取值" -#: config.c:2496 +#: config.c:2501 #, c-format msgid "failed to write new configuration file %s" msgstr "寫入新的設定檔案 %s 失敗" -#: config.c:2748 config.c:3072 +#: config.c:2753 config.c:3077 #, c-format msgid "could not lock config file %s" msgstr "不能鎖定設定檔案 %s" -#: config.c:2759 +#: config.c:2764 #, c-format msgid "opening %s" msgstr "開啟 %s" -#: config.c:2794 builtin/config.c:328 +#: config.c:2799 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "無效模式：%s" -#: config.c:2819 +#: config.c:2824 #, c-format msgid "invalid config file %s" msgstr "無效的設定檔案 %s" -#: config.c:2832 config.c:3085 +#: config.c:2837 config.c:3090 #, c-format msgid "fstat on %s failed" msgstr "對 %s 呼叫 fstat 失敗" -#: config.c:2843 +#: config.c:2848 #, c-format msgid "unable to mmap '%s'" msgstr "不能 mmap '%s'" -#: config.c:2852 config.c:3090 +#: config.c:2857 config.c:3095 #, c-format msgid "chmod on %s failed" msgstr "對 %s 呼叫 chmod 失敗" -#: config.c:2937 config.c:3187 +#: config.c:2942 config.c:3192 #, c-format msgid "could not write config file %s" msgstr "不能寫入設定檔案 %s" -#: config.c:2971 +#: config.c:2976 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能設定 '%s' 為 '%s'" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2978 builtin/remote.c:781 #, c-format msgid "could not unset '%s'" msgstr "不能取消設定 '%s'" -#: config.c:3063 +#: config.c:3068 #, c-format msgid "invalid section name: %s" msgstr "無效的小節名稱：%s" -#: config.c:3230 +#: config.c:3235 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺少" @@ -2235,19 +2697,19 @@ msgstr "已阻止奇怪的路徑名 '%s'" msgid "unable to fork" msgstr "無法 fork" -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "正在檢查連通性" -#: connected.c:100 +#: connected.c:101 msgid "Could not run 'git rev-list'" msgstr "不能執行 'git rev-list'" -#: connected.c:120 +#: connected.c:121 msgid "failed write to rev-list" msgstr "寫入 rev-list 失敗" -#: connected.c:127 +#: connected.c:128 msgid "failed to close rev-list's stdin" msgstr "關閉 rev-list 的標準輸入失敗" @@ -2284,25 +2746,27 @@ msgstr "" "%s 中的 LF 將被 CRLF 取代。\n" "在工作區中該檔案仍保持原有的換行符號" -#: convert.c:280 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" -#: convert.c:287 +#: 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." -msgstr "" -"檔案 '%s' 包含一個位元組順序標記（BOM）。請使用 UTF-%s 作為工作區編碼。" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" -#: convert.c:305 +#: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" -#: convert.c:307 +#: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2311,66 +2775,66 @@ msgstr "" "檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" "字節序）作為工作區編碼。" -#: convert.c:425 convert.c:496 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" -#: convert.c:468 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" -#: convert.c:674 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以執行外部過濾器 '%s'" -#: convert.c:694 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能將輸入傳遞給外部過濾器 '%s'" -#: convert.c:701 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "外部過濾器 '%s' 失敗碼 %d" -#: convert.c:736 convert.c:739 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "從外部過濾器 '%s' 讀取失敗" -#: convert.c:742 convert.c:797 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "外部過濾器 '%s' 失敗" -#: convert.c:845 +#: convert.c:839 msgid "unexpected filter type" msgstr "意外的過濾類型" -#: convert.c:856 +#: convert.c:850 msgid "path name too long for external filter" msgstr "外部過濾器的路徑名太長" -#: convert.c:930 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" -#: convert.c:1229 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作區編碼" -#: convert.c:1417 convert.c:1451 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 過濾器 '%s' 失敗" -#: convert.c:1495 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 過濾器 %s 失敗" @@ -2535,35 +2999,35 @@ msgstr "" "發現設定變數 'diff.dirstat' 中的錯誤：\n" "%s" -#: diff.c:4218 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 離開，停止在 %s" -#: diff.c:4563 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" -#: diff.c:4566 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" -#: diff.c:4644 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow 明確要求只跟一個路徑規格" -#: diff.c:4692 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "無效的 --stat 值：%s" -#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一個數字值" -#: diff.c:4729 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2572,195 +3036,194 @@ msgstr "" "無法解析 --dirstat/-X 選項的參數：\n" "%s" -#: diff.c:4814 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" -#: diff.c:4838 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之後未知的值" -#: diff.c:4852 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" -#: diff.c:4902 diff.c:4908 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s 期望 <n>/<m> 格式" -#: diff.c:4920 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一個字元，得到 '%s'" -#: diff.c:4941 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "壞的 --color-moved 參數：%s" -#: diff.c:4960 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的無效模式 '%s' " -#: diff.c:5000 +#: diff.c:4984 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:5036 diff.c:5056 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "%s 的參數無效" -#: diff.c:5194 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "無法解析 --submodule 選項的參數：'%s'" -#: diff.c:5250 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "壞的 --word-diff 參數：%s" -#: diff.c:5273 +#: diff.c:5257 msgid "Diff output format options" msgstr "差異輸出格式化選項" -#: diff.c:5275 diff.c:5281 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "生成修補檔" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "不顯示差異輸出" -#: diff.c:5283 diff.c:5397 diff.c:5404 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "<n>" msgstr "<n>" -#: diff.c:5284 diff.c:5287 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with <n> lines context" msgstr "生成含 <n> 行上下文的差異" -#: diff.c:5289 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "生成原始格式的差異" -#: diff.c:5292 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同義" -#: diff.c:5296 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同義" -#: diff.c:5300 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "機器友好的 --stat" -#: diff.c:5303 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "只輸出 --stat 的最後一行" -#: diff.c:5305 diff.c:5313 +#: diff.c:5289 diff.c:5297 msgid "<param1,param2>..." msgstr "<參數1,參數2>..." -#: diff.c:5306 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "輸出每個子目錄相對變更的分布" -#: diff.c:5310 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同義" -#: diff.c:5314 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同義詞" -#: diff.c:5318 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" -#: diff.c:5321 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "精簡摘要，例如建立、重新命名和模式變更" -#: diff.c:5324 +#: diff.c:5308 msgid "show only names of changed files" msgstr "只顯示變更檔案的檔案名" -#: diff.c:5327 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "只顯示變更檔案的檔案名和狀態" -#: diff.c:5329 +#: diff.c:5313 msgid "<width>[,<name-width>[,<count>]]" msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" -#: diff.c:5330 +#: diff.c:5314 msgid "generate diffstat" msgstr "生成差異統計（diffstat）" -#: diff.c:5332 diff.c:5335 diff.c:5338 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "<width>" msgstr "<寬度>" -#: diff.c:5333 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "使用提供的長度生成差異統計" -#: diff.c:5336 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "使用提供的檔案名長度生成差異統計" -#: diff.c:5339 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "使用提供的圖形長度生成差異統計" -#: diff.c:5341 +#: diff.c:5325 msgid "<count>" msgstr "<次數>" -#: diff.c:5342 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "生成有限行數的差異統計" -#: diff.c:5345 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "生成差異統計的簡潔摘要" -#: diff.c:5348 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "輸出一個可以應用的二進位差異" -#: diff.c:5351 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行顯示完整的前後物件名稱" -#: diff.c:5353 +#: diff.c:5337 msgid "show colored diff" msgstr "顯示帶顏色的差異" -#: diff.c:5354 +#: diff.c:5338 msgid "<kind>" msgstr "<類型>" -#: diff.c:5355 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" -#: diff.c:5358 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2768,334 +3231,355 @@ msgstr "" "在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" "符" -#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "<prefix>" msgstr "<前綴>" -#: diff.c:5362 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "顯示提供的源前綴取代 \"a/\"" -#: diff.c:5365 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "顯示提供的目標前綴取代 \"b/\"" -#: diff.c:5368 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "輸出的每一行附加前綴" -#: diff.c:5371 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "不顯示任何源和目標前綴" -#: diff.c:5374 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "顯示指定行數的差異區塊間的上下文" -#: diff.c:5378 diff.c:5383 diff.c:5388 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "<char>" msgstr "<字元>" -#: diff.c:5379 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一個字元取代 '+' 來表示新的一行" -#: diff.c:5384 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一個字元取代 '-' 來表示舊的一行" -#: diff.c:5389 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一個字元取代 ' ' 來表示一行上下文" -#: diff.c:5392 +#: diff.c:5376 msgid "Diff rename options" msgstr "差異重新命名選項" -#: diff.c:5393 +#: diff.c:5377 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5394 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "將完全重寫的變更打破為成對的刪除和建立" -#: diff.c:5398 +#: diff.c:5382 msgid "detect renames" msgstr "檢測重新命名" -#: diff.c:5402 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "省略刪除動作的差異輸出" -#: diff.c:5405 +#: diff.c:5389 msgid "detect copies" msgstr "檢測複製" -#: diff.c:5409 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "使用未修改的檔案做為發現複製的源" -#: diff.c:5411 +#: diff.c:5395 msgid "disable rename detection" msgstr "禁用重新命名偵測" -#: diff.c:5414 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "使用空的資料物件做為重新命名的源" -#: diff.c:5416 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "繼續列出檔案重新命名以外的歷史記錄" -#: diff.c:5419 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" -#: diff.c:5421 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "差異演算法選項" -#: diff.c:5423 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "生成儘可能小的差異" -#: diff.c:5426 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "行比較時忽略空白字元" -#: diff.c:5429 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字元的變更" -#: diff.c:5432 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字元變更" -#: diff.c:5435 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的Enter符（CR）" -#: diff.c:5438 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的變更" -#: diff.c:5441 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "啟發式轉換差異邊界以便閱讀" -#: diff.c:5444 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 演算法生成差異" -#: diff.c:5448 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 演算法生成差異" -#: diff.c:5450 +#: diff.c:5434 msgid "<algorithm>" msgstr "<演算法>" -#: diff.c:5451 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "選擇一個差異演算法" -#: diff.c:5453 +#: diff.c:5437 msgid "<text>" msgstr "<文字>" -#: diff.c:5454 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 演算法生成差異" -#: diff.c:5456 diff.c:5465 diff.c:5468 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "<mode>" msgstr "<模式>" -#: diff.c:5457 +#: diff.c:5441 msgid "show word diff, using <mode> to delimit changed words" msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" -#: diff.c:5459 diff.c:5462 diff.c:5507 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "<regex>" msgstr "<正則>" -#: diff.c:5460 +#: diff.c:5444 msgid "use <regex> to decide what a word is" msgstr "使用 <正規表示式> 確定何為一個詞" -#: diff.c:5463 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" -#: diff.c:5466 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "移動的程式碼行用不同方式著色" -#: diff.c:5469 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字元" -#: diff.c:5472 +#: diff.c:5456 msgid "Other diff options" msgstr "其它差異選項" -#: diff.c:5474 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" -#: diff.c:5478 +#: diff.c:5462 msgid "treat all files as text" msgstr "把所有檔案當做文字處理" -#: diff.c:5480 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "交換兩個輸入，反轉差異" -#: diff.c:5482 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差異時離開碼為 1，否則為 0" -#: diff.c:5484 +#: diff.c:5468 msgid "disable all output of the program" msgstr "禁用本程式的所有輸出" -#: diff.c:5486 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "允許執行一個外部的差異助手" -#: diff.c:5488 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" -#: diff.c:5490 +#: diff.c:5474 msgid "<when>" msgstr "<何時>" -#: diff.c:5491 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差異時，忽略子模組的更改" -#: diff.c:5494 +#: diff.c:5478 msgid "<format>" msgstr "<格式>" -#: diff.c:5495 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "指定子模組的差異如何顯示" -#: diff.c:5499 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "隱藏索引中 'git add -N' 條目" -#: diff.c:5502 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "將索引中 'git add -N' 條目當做真實的" -#: diff.c:5504 +#: diff.c:5488 msgid "<string>" msgstr "<字串>" -#: diff.c:5505 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "尋找改變了指定字串出現次數的差異" -#: diff.c:5508 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "尋找改變指定正則符合出現次數的差異" -#: diff.c:5511 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "顯示使用 -S 或 -G 的變更集的所有變更" -#: diff.c:5514 +#: diff.c:5498 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式" -#: diff.c:5517 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "控制輸出中的檔案顯示順序" -#: diff.c:5518 +#: diff.c:5502 msgid "<object-id>" msgstr "<物件 ID>" -#: diff.c:5519 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "尋找改變指定物件出現次數的差異" -#: diff.c:5521 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5522 +#: diff.c:5506 msgid "select files by diff type" msgstr "透過差異類型選擇檔案" -#: diff.c:5524 +#: diff.c:5508 msgid "<file>" msgstr "<檔案>" -#: diff.c:5525 +#: diff.c:5509 msgid "Output to a specific file" msgstr "輸出到一個指定的檔案" -#: diff.c:6180 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "因為檔案太多，略過不嚴格的重新命名檢查。" -#: diff.c:6183 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "因為檔案太多，只在修改的路徑中尋找複製。" -#: diff.c:6186 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" -#: dir.c:549 +#: dir.c:554 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" -#: dir.c:938 +#: dir.c:664 +#, c-format +#| msgid "unrecognized option: '%s'" +msgid "unrecognized pattern: '%s'" +msgstr "無法識別樣式：「%s」" + +#: dir.c:682 dir.c:696 +#, c-format +#| msgid "unrecognized option: '%s'" +msgid "unrecognized negative pattern: '%s'" +msgstr "無法識別反向模式：「%s」" + +#: dir.c:714 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" + +#: dir.c:724 +msgid "disabling cone pattern matching" +msgstr "停用 cone 樣式符合模式" + +#: dir.c:1101 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能將 %s 用作排除檔案" -#: dir.c:1877 +#: dir.c:2078 #, c-format msgid "could not open directory '%s'" msgstr "不能開啟目錄 '%s'" -#: dir.c:2128 +#: dir.c:2415 msgid "failed to get kernel name and information" msgstr "無法獲得核心名稱和訊息" -#: dir.c:2252 +#: dir.c:2539 msgid "untracked cache is disabled on this system or location" msgstr "快取未追蹤檔案在本系統或位置中被禁用" -#: dir.c:3056 +#: dir.c:3343 #, c-format msgid "index file corrupt in repo %s" msgstr "版本庫 %s 中的索引檔案損壞" -#: dir.c:3101 dir.c:3106 +#: dir.c:3388 dir.c:3393 #, c-format msgid "could not create directories for %s" msgstr "不能為 %s 建立目錄" -#: dir.c:3135 +#: dir.c:3422 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" @@ -3114,12 +3598,12 @@ msgstr "過濾內容" msgid "could not stat file '%s'" msgstr "不能對檔案 '%s' 呼叫 stat" -#: environment.c:148 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "錯誤的 git 名字空間路徑 \"%s\"" -#: environment.c:330 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "不能設定 GIT_DIR 為 '%s'" @@ -3154,32 +3638,32 @@ msgstr "無法寫到遠端" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "無效的 shallow 訊息：%s" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "無效的 unshallow 訊息：%s" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "物件中發生錯誤：%s" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "未發現 shallow：%s" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "應為 shallow/unshallow，卻得到 %s" @@ -3198,7 +3682,7 @@ msgstr "無效提交 %s" msgid "giving up" msgstr "放棄" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "完成" @@ -3212,162 +3696,162 @@ msgstr "得到 %s (%d) %s" msgid "Marking %s as complete" msgstr "標記 %s 為完成" -#: fetch-pack.c:742 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "已經有 %s（%s）" -#: fetch-pack.c:781 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：無法衍生 sideband 多路輸出" -#: fetch-pack.c:789 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "協定錯誤：壞的包頭" -#: fetch-pack.c:857 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：無法衍生進程 %s" -#: fetch-pack.c:873 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s 失敗" -#: fetch-pack.c:875 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "sideband 多路輸出發生錯誤" -#: fetch-pack.c:907 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "伺服器版本 %.*s" -#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 -#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 -#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 -#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "伺服器支援 %s" -#: fetch-pack.c:914 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "伺服器不支援 shalllow 用戶端" -#: fetch-pack.c:974 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "伺服器不支援 --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "伺服器不支援 --shallow-exclude" -#: fetch-pack.c:983 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "伺服器不支援 --deepen" -#: fetch-pack.c:1000 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "沒有共同的提交" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：取得失敗。" -#: fetch-pack.c:1150 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "伺服器不支援 shalllow 請求" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "伺服器支援 filter" -#: fetch-pack.c:1180 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "無法將請求寫到遠端" -#: fetch-pack.c:1198 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "讀取節標題 '%s' 發生錯誤" -#: fetch-pack.c:1204 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "預期 '%s'，得到 '%s'" -#: fetch-pack.c:1243 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的確認行：'%s'" -#: fetch-pack.c:1248 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "處理 ack 發生錯誤：%d" -#: fetch-pack.c:1258 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "預期在 'ready' 之後傳送 packfile" -#: fetch-pack.c:1260 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "在沒有 'ready' 不應該傳送其它小節" -#: fetch-pack.c:1302 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "處理淺複製訊息發生錯誤：%d" -#: fetch-pack.c:1349 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "預期 wanted-ref，得到 '%s'" -#: fetch-pack.c:1354 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" -#: fetch-pack.c:1359 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "處理要取得的引用發生錯誤：%d" -#: fetch-pack.c:1693 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "沒有符合的遠端分支" -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1785 builtin/clone.c:688 msgid "remote did not send all necessary objects" msgstr "遠端沒有傳送所有必需的物件" -#: fetch-pack.c:1743 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "沒有這樣的遠端引用 %s" -#: fetch-pack.c:1746 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "伺服器不允許請求未公開的物件 %s" -#: gpg-interface.c:321 -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽名" - -#: gpg-interface.c:347 +#: gpg-interface.c:223 msgid "could not create temporary file" msgstr "不能建立暫存檔" -#: gpg-interface.c:350 +#: gpg-interface.c:226 #, c-format msgid "failed writing detached signature to '%s'" msgstr "無法將分離式簽名寫入 '%s'" -#: graph.c:97 +#: 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" msgstr "忽略 log.graphColors 中無效的顏色 '%.*s'" @@ -3385,7 +3869,7 @@ msgstr "" msgid "'%s': unable to read %s" msgstr "'%s'：無法讀取 %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" @@ -3441,8 +3925,9 @@ msgid "Low-level Commands / Interrogators" msgstr "低級指令/詢問者" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" -msgstr "低級指令/同步版本庫" +#| msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" +msgstr "低級指令 / 同步版本庫" #: help.c:38 msgid "Low-level Commands / Internal Helpers" @@ -3605,7 +4090,7 @@ msgstr "不允許空的姓名（對於 <%s>）" msgid "name consists only of disallowed characters: %s" msgstr "姓名中僅包含禁用字元：%s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:631 #, c-format msgid "invalid date format: %s" msgstr "無效的日期格式：%s" @@ -3689,7 +4174,7 @@ msgid "failed to read the cache" msgstr "讀取快取失敗" #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 +#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "無法寫新的索引檔案" @@ -3875,7 +4360,7 @@ msgstr "重新命名" msgid "renamed" msgstr "重新命名" -#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 +#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒絕遺失髒檔案 '%s'" @@ -3888,8 +4373,7 @@ msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名 #: merge-recursive.c:1682 #, 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 #, c-format @@ -3921,7 +4405,7 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " "%4$s->%5$s" -#: merge-recursive.c:2056 +#: merge-recursive.c:2114 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3931,7 +4415,7 @@ msgstr "" "衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" "多個其它目錄，沒有目錄包含大部分檔案。" -#: merge-recursive.c:2088 +#: merge-recursive.c:2146 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3940,7 +4424,7 @@ msgstr "" "衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" "放在：%s。" -#: merge-recursive.c:2098 +#: merge-recursive.c:2156 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3949,7 +4433,7 @@ msgstr "" "衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" "些路徑放置於此：%s" -#: merge-recursive.c:2190 +#: merge-recursive.c:2248 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3958,67 +4442,66 @@ msgstr "" "衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" "命名目錄 %4$s->%5$s" -#: merge-recursive.c:2435 +#: merge-recursive.c:2493 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" -#: merge-recursive.c:2961 +#: merge-recursive.c:3019 #, c-format msgid "cannot read object %s" msgstr "不能讀取物件 %s" -#: merge-recursive.c:2964 +#: merge-recursive.c:3022 #, c-format msgid "object %s is not a blob" msgstr "物件 %s 不是一個資料物件" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modify" msgstr "修改" -#: merge-recursive.c:3028 +#: merge-recursive.c:3086 msgid "modified" msgstr "修改" -#: merge-recursive.c:3040 +#: merge-recursive.c:3098 msgid "content" msgstr "內容" -#: merge-recursive.c:3044 +#: merge-recursive.c:3102 msgid "add/add" msgstr "新增/新增" -#: merge-recursive.c:3067 +#: merge-recursive.c:3125 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略過 %s（已經做過相同合併）" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3147 git-submodule.sh:993 msgid "submodule" msgstr "子模組" -#: merge-recursive.c:3090 +#: merge-recursive.c:3148 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "衝突（%s）：合併衝突於 %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3178 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 為名新增" -#: merge-recursive.c:3203 +#: merge-recursive.c:3261 #, 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:3206 +#: merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4027,7 +4510,7 @@ msgstr "" "衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" "動到 %s。" -#: merge-recursive.c:3210 +#: merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4036,7 +4519,7 @@ msgstr "" "路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" "其移動到 %5$s。" -#: merge-recursive.c:3213 +#: merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4045,59 +4528,59 @@ msgstr "" "衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " "中，建議將其移動到 %5$s。" -#: merge-recursive.c:3327 +#: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "刪除 %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3408 msgid "file/directory" msgstr "檔案/目錄" -#: merge-recursive.c:3355 +#: merge-recursive.c:3413 msgid "directory/file" msgstr "目錄/檔案" -#: merge-recursive.c:3362 +#: merge-recursive.c:3420 #, 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:3371 +#: merge-recursive.c:3429 #, c-format msgid "Adding %s" msgstr "新增 %s" -#: merge-recursive.c:3380 +#: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "衝突（add/add）：合併衝突於 %s" -#: merge-recursive.c:3424 +#: merge-recursive.c:3482 msgid "Already up to date!" msgstr "已經是最新的！" -#: merge-recursive.c:3433 +#: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "無法合併樹 %s 和 %s" -#: merge-recursive.c:3537 +#: merge-recursive.c:3595 msgid "Merging:" msgstr "合併：" -#: merge-recursive.c:3550 +#: merge-recursive.c:3608 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "發現 %u 個共同祖先：" msgstr[1] "發現 %u 個共同祖先：" -#: merge-recursive.c:3600 +#: merge-recursive.c:3658 msgid "merge returned no commit" msgstr "合併未返回提交" -#: merge-recursive.c:3659 +#: merge-recursive.c:3717 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4106,12 +4589,12 @@ msgstr "" "您對下列檔案的本機修改將被合併動作覆蓋：\n" " %s" -#: merge-recursive.c:3756 +#: merge-recursive.c:3814 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "不能寫入索引。" @@ -4175,80 +4658,101 @@ msgstr "多包索引儲存一個64位位移，但是 off_t 太小" #: midx.c:288 msgid "error preparing packfile from multi-pack-index" -msgstr "從多包索引準備 packfile 發生錯誤" +msgstr "從多包索引準備 packfile 時發生錯誤" -#: midx.c:469 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" -msgstr "新增包檔案 '%s' 失敗" +msgstr "新增 packfile '%s' 失敗" -#: midx.c:475 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "開啟包索引 '%s' 失敗" -#: midx.c:535 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" -msgstr "在包檔案中定位物件 %d 失敗" +msgstr "在 packfile 中定位物件 %d 失敗" + +#: midx.c:842 +#| msgid "error preparing packfile from multi-pack-index" +msgid "Adding packfiles to multi-pack-index" +msgstr "正在新增 packfile 至多包索引" -#: midx.c:864 +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "沒有看到要捨棄的包檔案 %s" -#: midx.c:1035 +#: midx.c:973 +#| msgid "Write and verify multi-pack-indexes" +msgid "Writing chunks to multi-pack-index" +msgstr "寫入區塊至多包索引" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位於 %s 的多包索引失敗" -#: midx.c:1090 +#: midx.c:1108 msgid "Looking for referenced packfiles" -msgstr "正在尋找引用的包檔案" +msgstr "正在尋找引用的 packfile" -#: midx.c:1105 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1109 -msgid "Verifying OID order in MIDX" -msgstr "正在校驗 MIDX 中的物件 ID 順序" +#: midx.c:1128 +#| msgid "Verifying OID order in MIDX" +msgid "Verifying OID order in multi-pack-index" +msgstr "正在驗證多包索引中的物件 ID 順序" -#: midx.c:1118 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1137 +#: midx.c:1157 msgid "Sorting objects by packfile" -msgstr "透過包檔案為物件排序" +msgstr "透過 packfile 為物件排序" -#: midx.c:1143 +#: midx.c:1164 msgid "Verifying object offsets" -msgstr "校驗物件位移" +msgstr "正在驗證物件位移" -#: midx.c:1159 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "為 oid[%d] = %s 載入包條目失敗" -#: midx.c:1165 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" -msgstr "為包檔案 %s 載入包索引失敗" +msgstr "為 packfile %s 載入包索引失敗" -#: midx.c:1174 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" -#: midx.c:1349 +#: 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" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "不能開始 pack-objects" -#: midx.c:1368 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "不能結束 pack-objects" @@ -4333,14 +4837,14 @@ msgstr "雜湊值與 %s 不符合" #: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" -msgstr "位移量在包檔案結束之前（損壞的 .idx？）" +msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" -#: packfile.c:1887 +#: packfile.c:1888 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" -#: packfile.c:1891 +#: packfile.c:1892 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" @@ -4452,82 +4956,87 @@ msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" msgid "malformed object name '%s'" msgstr "格式錯誤的物件名 '%s'" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "不能設定 %s 為組可寫" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "只允許一個 'attr:' 規格。" -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "屬性規格不能為空" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "無效的屬性名 %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路徑規格包含無效的神奇前綴" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不相容" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s：'%s' 在版本庫之外" -#: pathspec.c:514 +#: pathspec.c:516 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助記符：'%c'）" -#: pathspec.c:524 +#: pathspec.c:526 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" -#: pathspec.c:591 +#: pathspec.c:593 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路徑規格 '%s' 位於符號連結中" +#: pathspec.c:638 +#, c-format +msgid "line is badly quoted: %s" +msgstr "某行不應該被括號括住：%s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "無法寫 flush 包" @@ -4588,42 +5097,42 @@ msgstr "正在重新整理索引" msgid "unable to create threaded lstat: %s" msgstr "無法建立執行緒 lstat：%s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "遠端未設定 URL" -#: promisor-remote.c:61 +#: promisor-remote.c:58 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 遠端名稱不能以 '/' 開始：%s" -#: range-diff.c:71 +#: range-diff.c:75 msgid "could not start `log`" msgstr "不能啟動 `log`" -#: range-diff.c:73 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "不能讀取 `log` 的輸出" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:96 sequencer.c:5163 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" -#: range-diff.c:118 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "無法解析 git 頭 '%.*s'" -#: range-diff.c:275 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "生成 diff 失敗" -#: range-diff.c:507 range-diff.c:509 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日誌" @@ -4662,16 +5171,16 @@ msgstr "無法在索引中新增 '%s'" msgid "unable to stat '%s'" msgstr "無法對 %s 執行 stat" -#: read-cache.c:1314 +#: read-cache.c:1325 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起來既是檔案又是目錄" -#: read-cache.c:1520 +#: read-cache.c:1531 msgid "Refresh index" msgstr "重新整理索引" -#: read-cache.c:1635 +#: read-cache.c:1646 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4680,7 +5189,7 @@ msgstr "" "設定了 index.version，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1645 +#: read-cache.c:1656 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4689,139 +5198,139 @@ msgstr "" "設定了 GIT_INDEX_VERSION，但是取值無效。\n" "使用版本 %i" -#: read-cache.c:1701 +#: read-cache.c:1712 #, c-format msgid "bad signature 0x%08x" msgstr "壞的簽名 0x%08x" -#: read-cache.c:1704 +#: read-cache.c:1715 #, c-format msgid "bad index version %d" msgstr "壞的索引版本 %d" -#: read-cache.c:1713 +#: read-cache.c:1724 msgid "bad index file sha1 signature" msgstr "壞的索引檔案 sha1 簽名" -#: read-cache.c:1743 +#: read-cache.c:1754 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支援的 %.4s 擴展" # -#: read-cache.c:1745 +#: read-cache.c:1756 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 擴展" -#: read-cache.c:1782 +#: read-cache.c:1793 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引條目格式 0x%08x" -#: read-cache.c:1798 +#: read-cache.c:1809 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" -#: read-cache.c:1855 +#: read-cache.c:1866 msgid "unordered stage entries in index" msgstr "索引中有未排序的暫存條目" -#: read-cache.c:1858 +#: read-cache.c:1869 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合併檔案 '%s' 有多個暫存條目" -#: read-cache.c:1861 +#: read-cache.c:1872 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暫存條目" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 +#: 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:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "索引檔案損壞" -#: read-cache.c:2108 +#: read-cache.c:2119 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "無法建立 load_cache_entries 執行緒：%s" -#: read-cache.c:2121 +#: read-cache.c:2132 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "無法加入 load_cache_entries 執行緒：%s" -#: read-cache.c:2154 +#: read-cache.c:2165 #, c-format msgid "%s: index file open failed" msgstr "%s：開啟索引檔案失敗" -#: read-cache.c:2158 +#: read-cache.c:2169 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能對開啟的索引執行 stat 動作" -#: read-cache.c:2162 +#: read-cache.c:2173 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引檔案比預期的小" -#: read-cache.c:2166 +#: read-cache.c:2177 #, c-format msgid "%s: unable to map index file" msgstr "%s：無法對索引檔案執行 map 動作" -#: read-cache.c:2208 +#: read-cache.c:2219 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "無法建立 load_index_extensions 執行緒：%s" -#: read-cache.c:2235 +#: read-cache.c:2246 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "無法加入 load_index_extensions 執行緒：%s" -#: read-cache.c:2267 +#: read-cache.c:2278 #, c-format msgid "could not freshen shared index '%s'" msgstr "無法重新整理共享索引 '%s'" -#: read-cache.c:2314 +#: read-cache.c:2325 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "不能關閉 '%s'" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069 #, c-format msgid "could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: read-cache.c:3126 +#: read-cache.c:3137 #, c-format msgid "unable to open git dir: %s" msgstr "不能開啟 git 目錄：%s" -#: read-cache.c:3138 +#: read-cache.c:3149 #, c-format msgid "unable to unlink: %s" msgstr "無法刪除：%s" -#: read-cache.c:3163 +#: read-cache.c:3174 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修復 '%s' 的權限位" -#: read-cache.c:3312 +#: read-cache.c:3323 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暫存區 #0" @@ -4923,8 +5432,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "注意空提交已被備註掉" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 -#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 +#: 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 #, c-format msgid "could not write '%s'" msgstr "不能寫入 '%s'" @@ -4994,14 +5503,15 @@ msgstr "引用 '%s' 已經存在" msgid "unexpected object ID when writing '%s'" msgstr "寫入 '%s' 時意外的物件 ID" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997 +#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "不能寫入 '%s'" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1031 #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟 '%s' 進行寫入" @@ -5657,8 +6167,8 @@ msgstr "不能刪除 stray '%s'" msgid "Recorded preimage for '%s'" msgstr "為 '%s' 記錄 preimage" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2067 builtin/log.c:1871 +#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448 #, c-format msgid "could not create directory '%s'" msgstr "不能建立目錄 '%s'" @@ -5692,33 +6202,33 @@ msgstr "忘記 '%s' 的解決方案\n" msgid "unable to open rr-cache directory" msgstr "不能開啟 rr-cache 目錄" -#: revision.c:2509 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "您的目前分支好像被損壞" -#: revision.c:2512 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的目前分支 '%s' 尚無任何提交" -#: revision.c:2720 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 與 --bisect 不相容" -#: revision.c:2724 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" -#: run-command.c:763 +#: run-command.c:762 msgid "open /dev/null failed" msgstr "不能開啟 /dev/null" -#: run-command.c:1269 +#: run-command.c:1268 #, c-format msgid "cannot create async thread: %s" msgstr "不能建立 async 執行緒：%s" -#: run-command.c:1333 +#: run-command.c:1332 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -5727,75 +6237,75 @@ msgstr "" "因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" "設定 `git config advice.ignoredHook false` 來關閉這條警告。" -#: send-pack.c:142 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "讀取遠端解包狀態時收到意外的 flush 包" -#: send-pack.c:144 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "不能解析遠端解包狀態：%s" -#: send-pack.c:146 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "遠端解包失敗：%s" -#: send-pack.c:307 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "為推送證書籤名失敗" -#: send-pack.c:421 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "接收端不支援簽名推送" -#: send-pack.c:423 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未傳送推送證書，因為接收端不支援簽名推送" -#: send-pack.c:435 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "接收端不支援原子推送" -#: send-pack.c:440 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "接收端不支援推送選項" -#: sequencer.c:187 +#: sequencer.c:189 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "無效的提交訊息清理模式 '%s'" -#: sequencer.c:292 +#: sequencer.c:294 #, c-format msgid "could not delete '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 +#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "無法刪除 '%s'" -#: sequencer.c:321 +#: sequencer.c:323 msgid "revert" msgstr "還原" -#: sequencer.c:323 +#: sequencer.c:325 msgid "cherry-pick" msgstr "揀選" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" -#: sequencer.c:327 +#: sequencer.c:329 #, c-format msgid "unknown action: %d" msgstr "未知動作：%d" -#: sequencer.c:385 +#: sequencer.c:387 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5803,7 +6313,7 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "指令標記修正後的檔案" -#: sequencer.c:388 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5812,44 +6322,44 @@ msgstr "" "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" "對修正後的檔案做標記，然後用 'git commit' 提交" -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:403 sequencer.c:2993 #, c-format msgid "could not lock '%s'" msgstr "不能鎖定 '%s'" -#: sequencer.c:408 +#: sequencer.c:410 #, c-format msgid "could not write eol to '%s'" msgstr "不能將換行符號寫入 '%s'" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013 +#: sequencer.c:3277 #, c-format msgid "failed to finalize '%s'" msgstr "無法完成 '%s'" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: 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 #, c-format msgid "could not read '%s'" msgstr "不能讀取 '%s'" -#: sequencer.c:462 +#: sequencer.c:464 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本機修改將被%s覆蓋。" -#: sequencer.c:466 +#: sequencer.c:468 msgid "commit your changes or stash them to proceed." msgstr "提交您的修改或儲藏後再繼續。" -#: sequencer.c:498 +#: sequencer.c:500 #, c-format msgid "%s: fast-forward" msgstr "%s：快轉" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:539 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "無效的清理模式 %s" @@ -5857,65 +6367,70 @@ msgstr "無效的清理模式 %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:631 +#: sequencer.c:633 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：無法寫入新索引檔案" -#: sequencer.c:648 +#: sequencer.c:650 msgid "unable to update cache tree" msgstr "不能更新快取樹" -#: sequencer.c:662 +#: sequencer.c:664 msgid "could not resolve HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:742 +#: sequencer.c:744 #, c-format msgid "no key present in '%.*s'" msgstr "在 '%.*s' 中沒有 key" -#: sequencer.c:753 +#: sequencer.c:755 #, c-format msgid "unable to dequote value of '%s'" msgstr "無法為 '%s' 的值去引號" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: 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 #, c-format msgid "could not open '%s' for reading" msgstr "無法開啟 '%s' 進行讀取" -#: sequencer.c:800 +#: sequencer.c:802 msgid "'GIT_AUTHOR_NAME' already given" msgstr "已經給出 'GIT_AUTHOR_NAME'" -#: sequencer.c:805 +#: sequencer.c:807 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "已經給出 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:810 +#: sequencer.c:812 msgid "'GIT_AUTHOR_DATE' already given" msgstr "已經給出 'GIT_AUTHOR_DATE'" -#: sequencer.c:814 +#: sequencer.c:816 #, c-format msgid "unknown variable '%s'" msgstr "未知變數 '%s'" -#: sequencer.c:819 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "缺少 'GIT_AUTHOR_NAME'" -#: sequencer.c:821 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "缺少 'GIT_AUTHOR_EMAIL'" -#: sequencer.c:823 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "缺少 'GIT_AUTHOR_DATE'" -#: sequencer.c:872 +#: sequencer.c:902 sequencer.c:1427 +#| msgid "malformed input line: '%s'." +msgid "malformed ident line" +msgstr "識別行的格式錯誤" + +#: sequencer.c:925 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5944,11 +6459,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1146 +#: sequencer.c:1218 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' 掛鉤失敗" -#: sequencer.c:1153 +#: sequencer.c:1224 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5962,7 +6477,7 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"您的姓名和信件位址基於登入名和主機名稱進行了自動設定。請檢查它們正確\n" +"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n" "與否。您可以對其進行設定以免再出現本提示訊息。執行如下指令在編輯器\n" "中編輯您的設定檔案：\n" "\n" @@ -5972,7 +6487,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1166 +#: sequencer.c:1237 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5985,7 +6500,7 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"您的姓名和信件位址基於登入名和主機名稱進行了自動設定。請檢查它們正確\n" +"您的姓名和信件位址基於登入名稱和主機名稱自動設定。請檢查它們正確\n" "與否。您可以對其進行設定以免再出現本提示訊息：\n" "\n" " git config --global user.name \"Your Name\"\n" @@ -5995,326 +6510,331 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1208 +#: sequencer.c:1279 msgid "couldn't look up newly created commit" msgstr "無法找到新建立的提交" -#: sequencer.c:1210 +#: sequencer.c:1281 msgid "could not parse newly created commit" msgstr "不能解析新建立的提交" -#: sequencer.c:1256 +#: sequencer.c:1327 msgid "unable to resolve HEAD after creating commit" msgstr "建立提交後，不能解析 HEAD" -#: sequencer.c:1258 +#: sequencer.c:1329 msgid "detached HEAD" msgstr "分離開頭指標" # 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1262 +#: sequencer.c:1333 msgid " (root-commit)" msgstr " (根提交)" -#: sequencer.c:1283 +#: sequencer.c:1354 msgid "could not parse HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:1285 +#: sequencer.c:1356 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s 不是一個提交！" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1411 sequencer.c:2055 msgid "unable to parse commit author" msgstr "不能解析提交作者" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: 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 msgid "git write-tree failed to write a tree" msgstr "git write-tree 無法寫入樹狀物件" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1480 sequencer.c:1550 #, c-format msgid "unable to read commit message from '%s'" msgstr "不能從 '%s' 讀取提交說明" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883 #: builtin/merge.c:908 msgid "failed to write commit object" msgstr "寫提交物件失敗" -#: sequencer.c:1456 +#: sequencer.c:1577 #, c-format msgid "could not parse commit %s" msgstr "不能解析提交 %s" -#: sequencer.c:1461 +#: sequencer.c:1582 #, c-format msgid "could not parse parent commit %s" msgstr "不能解析父提交 %s" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1656 sequencer.c:1767 #, c-format msgid "unknown command: %d" msgstr "未知指令：%d" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1714 sequencer.c:1739 #, c-format msgid "This is a combination of %d commits." msgstr "這是一個 %d 個提交的組合。" -#: sequencer.c:1602 +#: sequencer.c:1724 msgid "need a HEAD to fixup" msgstr "需要一個 HEAD 來修復" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1726 sequencer.c:3304 msgid "could not read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:1606 +#: sequencer.c:1728 msgid "could not read HEAD's commit message" msgstr "不能讀取 HEAD 的提交說明" -#: sequencer.c:1612 +#: sequencer.c:1734 #, c-format msgid "cannot write '%s'" msgstr "不能寫 '%s'" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1741 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "這是第一個提交說明：" -#: sequencer.c:1627 +#: sequencer.c:1749 #, c-format msgid "could not read commit message of %s" msgstr "不能讀取 %s 的提交說明" -#: sequencer.c:1634 +#: sequencer.c:1756 #, c-format msgid "This is the commit message #%d:" msgstr "這是提交說明 #%d：" -#: sequencer.c:1640 +#: sequencer.c:1762 #, c-format msgid "The commit message #%d will be skipped:" msgstr "提交說明 #%d 將被跳過：" -#: sequencer.c:1728 +#: sequencer.c:1850 msgid "your index file is unmerged." msgstr "您的索引檔案未完成合併。" -#: sequencer.c:1735 +#: sequencer.c:1857 msgid "cannot fixup root commit" msgstr "不能修復根提交" -#: sequencer.c:1754 +#: sequencer.c:1876 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1884 sequencer.c:1892 #, c-format msgid "commit %s does not have parent %d" msgstr "提交 %s 沒有第 %d 個父提交" -#: sequencer.c:1776 +#: sequencer.c:1898 #, 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:1795 +#: sequencer.c:1917 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:1860 +#: sequencer.c:1982 #, c-format msgid "could not rename '%s' to '%s'" msgstr "不能將 '%s' 重新命名為 '%s'" -#: sequencer.c:1915 +#: sequencer.c:2037 #, c-format msgid "could not revert %s... %s" msgstr "不能還原 %s... %s" -#: sequencer.c:1916 +#: sequencer.c:2038 #, c-format msgid "could not apply %s... %s" msgstr "不能應用 %s... %s" -#: sequencer.c:1983 +#: sequencer.c:2105 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：無法讀取索引" -#: sequencer.c:1990 +#: sequencer.c:2112 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：無法重新整理索引" -#: sequencer.c:2066 +#: sequencer.c:2189 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: sequencer.c:2075 +#: sequencer.c:2198 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s 的參數" -#: sequencer.c:2112 +#: sequencer.c:2235 #, c-format msgid "could not parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:2166 +#: sequencer.c:2289 #, c-format msgid "invalid line %d: %.*s" msgstr "無效行 %d：%.*s" -#: sequencer.c:2177 +#: sequencer.c:2300 #, c-format msgid "cannot '%s' without a previous commit" msgstr "沒有父提交的情況下不能 '%s'" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: 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:2261 +#: sequencer.c:2384 msgid "cancelling a cherry picking in progress" msgstr "正在取消一個進行中的揀選" -#: sequencer.c:2268 +#: sequencer.c:2391 msgid "cancelling a revert in progress" msgstr "正在取消一個進行中的還原" -#: sequencer.c:2302 +#: sequencer.c:2435 msgid "please fix this using 'git rebase --edit-todo'." msgstr "請用 'git rebase --edit-todo' 來修改。" -#: sequencer.c:2304 +#: sequencer.c:2437 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "不可用的指令清單：'%s'" -#: sequencer.c:2309 +#: sequencer.c:2442 msgid "no commits parsed." msgstr "沒有解析提交。" -#: sequencer.c:2320 +#: sequencer.c:2453 msgid "cannot cherry-pick during a revert." msgstr "不能在還原提交中執行揀選。" -#: sequencer.c:2322 +#: sequencer.c:2455 msgid "cannot revert during a cherry-pick." msgstr "不能在揀選中執行還原提交。" -#: sequencer.c:2404 +#: sequencer.c:2533 #, c-format msgid "invalid value for %s: %s" msgstr "%s 的值無效：%s" -#: sequencer.c:2491 +#: sequencer.c:2630 msgid "unusable squash-onto" msgstr "不可用的 squash-onto" -#: sequencer.c:2507 +#: sequencer.c:2646 #, c-format msgid "malformed options sheet: '%s'" msgstr "格式錯誤的選項清單：'%s'" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2736 sequencer.c:4463 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:2606 +#: sequencer.c:2752 msgid "revert is already in progress" msgstr "一個還原動作已在進行" -#: sequencer.c:2608 +#: sequencer.c:2754 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2611 +#: sequencer.c:2757 msgid "cherry-pick is already in progress" msgstr "揀選動作已在進行" -#: sequencer.c:2613 +#: sequencer.c:2759 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2627 +#: sequencer.c:2773 #, c-format msgid "could not create sequencer directory '%s'" msgstr "不能建立序列目錄 '%s'" -#: sequencer.c:2642 +#: sequencer.c:2788 msgid "could not lock HEAD" msgstr "不能鎖定 HEAD" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2848 sequencer.c:4209 msgid "no cherry-pick or revert in progress" msgstr "揀選或還原動作並未進行" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2850 sequencer.c:2861 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2852 sequencer.c:2896 msgid "cannot abort from a branch yet to be born" msgstr "不能從尚未建立的分支終止" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2882 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" -#: sequencer.c:2738 +#: sequencer.c:2884 #, c-format msgid "cannot read '%s': %s" msgstr "不能讀取 '%s'：%s" -#: sequencer.c:2739 +#: sequencer.c:2885 msgid "unexpected end of file" msgstr "意外的檔案結束" -#: sequencer.c:2745 +#: sequencer.c:2891 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" -#: sequencer.c:2756 +#: sequencer.c:2902 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" -#: sequencer.c:2797 +#: sequencer.c:2943 msgid "no revert in progress" msgstr "沒有正在進行的還原" -#: sequencer.c:2805 +#: sequencer.c:2951 msgid "no cherry-pick in progress" msgstr "沒有正在進行的揀選" -#: sequencer.c:2815 +#: sequencer.c:2961 msgid "failed to skip the commit" msgstr "無法跳過這個提交" -#: sequencer.c:2822 +#: sequencer.c:2968 msgid "there is nothing to skip" msgstr "沒有要跳過的" -#: sequencer.c:2825 +#: sequencer.c:2971 #, c-format msgid "" "have you committed already?\n" @@ -6323,21 +6843,21 @@ msgstr "" "您已經提交了嗎？\n" "試試 \"git %s --continue\"" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:3095 sequencer.c:4121 #, c-format msgid "could not update %s" msgstr "不能更新 %s" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3134 sequencer.c:4101 msgid "cannot read HEAD" msgstr "不能讀取 HEAD" -#: sequencer.c:3004 +#: sequencer.c:3151 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "無法複製 '%s' 至 '%s'" -#: sequencer.c:3012 +#: sequencer.c:3159 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6356,28 +6876,23 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3022 +#: sequencer.c:3169 #, c-format msgid "Could not apply %s... %.*s" msgstr "不能應用 %s... %.*s" -#: sequencer.c:3029 +#: sequencer.c:3176 #, c-format msgid "Could not merge %.*s" msgstr "不能合併 %.*s" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 -msgid "could not read index" -msgstr "不能讀取索引" - # 譯者：請維持前導空格 -#: sequencer.c:3074 +#: sequencer.c:3221 #, c-format msgid "" "execution failed: %s\n" @@ -6392,11 +6907,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3080 +#: sequencer.c:3227 msgid "and made changes to the index and/or the working tree\n" msgstr "並且修改索引和/或工作區\n" -#: sequencer.c:3086 +#: sequencer.c:3233 #, c-format msgid "" "execution succeeded: %s\n" @@ -6413,76 +6928,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3147 +#: sequencer.c:3294 #, c-format msgid "illegal label name: '%.*s'" msgstr "非法的標籤名稱：'%.*s'" -#: sequencer.c:3201 +#: sequencer.c:3348 msgid "writing fake root commit" msgstr "寫偽根提交" -#: sequencer.c:3206 +#: sequencer.c:3353 msgid "writing squash-onto" msgstr "寫入 squash-onto" -#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 +#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882 #, c-format msgid "failed to find tree of %s" msgstr "無法找到 %s 指向的樹。" -#: sequencer.c:3262 builtin/rebase.c:874 -msgid "could not write index" -msgstr "不能寫入索引" - -#: sequencer.c:3289 +#: sequencer.c:3436 #, c-format msgid "could not resolve '%s'" msgstr "無法解析 '%s'" -#: sequencer.c:3320 +#: sequencer.c:3467 msgid "cannot merge without a current revision" msgstr "沒有目前版本不能合併" -#: sequencer.c:3342 +#: sequencer.c:3489 #, c-format msgid "unable to parse '%.*s'" msgstr "無法解析 '%.*s'" -#: sequencer.c:3351 +#: sequencer.c:3498 #, c-format msgid "nothing to merge: '%.*s'" msgstr "無可用合併：'%.*s'" -#: sequencer.c:3363 +#: sequencer.c:3510 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "章魚合並不能在一個新的根提交上執行" -#: sequencer.c:3378 +#: sequencer.c:3526 #, c-format msgid "could not get commit message of '%s'" msgstr "不能取得 '%s' 的提交說明" -#: sequencer.c:3538 +#: sequencer.c:3688 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至不能嘗試合併 '%.*s'" -#: sequencer.c:3554 +#: sequencer.c:3704 msgid "merge: Unable to write new index file" msgstr "合併：無法寫入新索引檔案" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3773 builtin/rebase.c:733 #, c-format msgid "Applied autostash.\n" msgstr "已應用 autostash。\n" -#: sequencer.c:3635 +#: sequencer.c:3785 #, c-format msgid "cannot store %s" msgstr "不能儲存 %s" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6493,31 +7004,31 @@ msgstr "" "您的修改安全地儲存在儲藏區中。\n" "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" -#: sequencer.c:3699 +#: sequencer.c:3849 #, c-format msgid "could not checkout %s" msgstr "不能簽出 %s" -#: sequencer.c:3713 +#: sequencer.c:3863 #, c-format msgid "%s: not a valid OID" msgstr "%s：不是一個有效的物件 ID" -#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3868 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "不能分離開頭指標" -#: sequencer.c:3733 +#: sequencer.c:3883 #, c-format msgid "Stopped at HEAD\n" msgstr "停止在 HEAD\n" -#: sequencer.c:3735 +#: sequencer.c:3885 #, c-format msgid "Stopped at %s\n" msgstr "停止在 %s\n" -#: sequencer.c:3743 +#: sequencer.c:3893 #, c-format msgid "" "Could not execute the todo command\n" @@ -6537,48 +7048,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3827 +#: sequencer.c:3979 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "停止在 %s... %.*s\n" -#: sequencer.c:3898 +#: sequencer.c:4050 #, c-format msgid "unknown command %d" msgstr "未知指令 %d" -#: sequencer.c:3957 +#: sequencer.c:4109 msgid "could not read orig-head" msgstr "不能讀取 orig-head" -#: sequencer.c:3962 +#: sequencer.c:4114 msgid "could not read 'onto'" msgstr "不能讀取 'onto'" -#: sequencer.c:3976 +#: sequencer.c:4128 #, c-format msgid "could not update HEAD to %s" msgstr "不能更新 HEAD 為 %s" -#: sequencer.c:4069 +#: sequencer.c:4221 msgid "cannot rebase: You have unstaged changes." msgstr "不能重定基底：您有未暫存的變更。" -#: sequencer.c:4078 +#: sequencer.c:4230 msgid "cannot amend non-existing commit" msgstr "不能修補不存在的提交" -#: sequencer.c:4080 +#: sequencer.c:4232 #, c-format msgid "invalid file: '%s'" msgstr "無效檔案：'%s'" -#: sequencer.c:4082 +#: sequencer.c:4234 #, c-format msgid "invalid contents: '%s'" msgstr "無效內容：'%s'" -#: sequencer.c:4085 +#: sequencer.c:4237 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6587,42 +7098,42 @@ msgstr "" "\n" "您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" -#: sequencer.c:4121 sequencer.c:4159 +#: sequencer.c:4273 sequencer.c:4312 #, c-format msgid "could not write file: '%s'" msgstr "不能寫入檔案：'%s'" -#: sequencer.c:4174 +#: sequencer.c:4327 msgid "could not remove CHERRY_PICK_HEAD" msgstr "不能刪除 CHERRY_PICK_HEAD" -#: sequencer.c:4181 +#: sequencer.c:4334 msgid "could not commit staged changes." msgstr "不能提交暫存的修改。" -#: sequencer.c:4285 +#: sequencer.c:4440 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s：不能揀選一個%s" -#: sequencer.c:4289 +#: sequencer.c:4444 #, c-format msgid "%s: bad revision" msgstr "%s：錯誤的版本" -#: sequencer.c:4324 +#: sequencer.c:4479 msgid "can't revert as initial commit" msgstr "不能作為初始提交還原提交" -#: sequencer.c:4774 +#: sequencer.c:4952 msgid "make_script: unhandled options" msgstr "make_script：有未能處理的選項" -#: sequencer.c:4777 +#: sequencer.c:4955 msgid "make_script: error preparing revisions" msgstr "make_script：準備版本時錯誤" -#: sequencer.c:4935 +#: sequencer.c:5113 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6631,15 +7142,15 @@ msgstr "" "您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" "或者您可以用 'git rebase --abort' 終止重定基底。\n" -#: sequencer.c:5047 sequencer.c:5064 +#: sequencer.c:5226 sequencer.c:5243 msgid "nothing to do" msgstr "無事可做" -#: sequencer.c:5078 +#: sequencer.c:5257 msgid "could not skip unnecessary pick commands" msgstr "無法跳過不必要的揀選" -#: sequencer.c:5166 +#: sequencer.c:5351 msgid "the script was already rearranged." msgstr "腳本已經重新編排。" @@ -7135,6 +7646,12 @@ msgid_plural "%u bytes/s" msgstr[0] "%u 位元組/秒" msgstr[1] "%u 位元組/秒" +#: strbuf.c:1149 +#, c-format +#| msgid "could not read '%s'" +msgid "could not edit '%s'" +msgstr "無法編輯 '%s'" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "無法修改未合併的 .gitmodules，先解決合併衝突" @@ -7168,7 +7685,7 @@ msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" 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:1989 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016 msgid "Failed to resolve HEAD as a valid ref." msgstr "無法將 HEAD 解析為有效引用。" @@ -7207,18 +7724,28 @@ msgstr "子模組 '%s' 中有髒索引" msgid "Submodule '%s' could not be updated." msgstr "子模組 '%s' 無法被更新。" -#: submodule.c:2007 +#: submodule.c:2027 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" + +#: submodule.c:2048 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2060 submodule.c:2119 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "不能查詢子模組 '%s' 的名稱" -#: submodule.c:2026 +#: submodule.c:2064 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "拒絕移動「%s」至現存 git 目錄" + +#: submodule.c:2071 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7229,16 +7756,16 @@ msgstr "" "'%s' 遷移至\n" "'%s'\n" -#: submodule.c:2109 +#: submodule.c:2154 #, c-format msgid "could not recurse into submodule '%s'" -msgstr "無法遞迴進子模組路徑 '%s'" +msgstr "無法遞迴子模組路徑 '%s'" -#: submodule.c:2153 +#: submodule.c:2198 msgid "could not start ls-files in .." msgstr "無法在 .. 中啟動 ls-files" -#: submodule.c:2192 +#: submodule.c:2237 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" @@ -7257,12 +7784,12 @@ msgstr "submodule.fetchjobs 不允許為負值" msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "忽略可能被解析為指令列選項的 '%s'：%s" -#: submodule-config.c:490 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "%s 的值無效" -#: submodule-config.c:761 +#: submodule-config.c:769 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "不能更新 .gitmodules 條目 %s" @@ -7408,7 +7935,7 @@ msgstr "正在終止。" msgid "failed to push all needed submodules" msgstr "不能推送全部需要的子模組" -#: transport.c:1345 transport-helper.c:655 +#: transport.c:1345 transport-helper.c:656 msgid "operation not supported by protocol" msgstr "協定不支援該動作" @@ -7421,7 +7948,7 @@ msgstr "完整寫入遠端助手失敗" msgid "unable to find remote helper for '%s'" msgstr "無法為 '%s' 找到遠端助手" -#: transport-helper.c:160 transport-helper.c:569 +#: transport-helper.c:160 transport-helper.c:570 msgid "can't dup helper output fd" msgstr "無法複製助手輸出檔案句柄" @@ -7446,90 +7973,90 @@ msgstr "%s 意外地說：'%s'" msgid "%s also locked %s" msgstr "%s 也鎖定了 %s" -#: transport-helper.c:491 +#: transport-helper.c:492 msgid "couldn't run fast-import" msgstr "不能執行 fast-import" -#: transport-helper.c:514 +#: transport-helper.c:515 msgid "error while running fast-import" msgstr "執行 fast-import 發生錯誤" -#: transport-helper.c:543 transport-helper.c:1132 +#: transport-helper.c:544 transport-helper.c:1133 #, c-format msgid "could not read ref %s" msgstr "無法讀取引用 %s" -#: transport-helper.c:588 +#: transport-helper.c:589 #, c-format msgid "unknown response to connect: %s" msgstr "連線時未知的回應：%s" -#: transport-helper.c:610 +#: transport-helper.c:611 msgid "setting remote service path not supported by protocol" msgstr "協定不支援設定遠端服務路徑" -#: transport-helper.c:612 +#: transport-helper.c:613 msgid "invalid remote service path" msgstr "無效的遠端服務路徑" -#: transport-helper.c:658 +#: transport-helper.c:659 #, c-format msgid "can't connect to subservice %s" msgstr "不能連線到子服務 %s" -#: transport-helper.c:734 +#: transport-helper.c:735 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "預期 ok/error，助手說 '%s'" -#: transport-helper.c:787 +#: transport-helper.c:788 #, c-format msgid "helper reported unexpected status of %s" msgstr "助手報告 %s 的意外狀態" -#: transport-helper.c:848 +#: transport-helper.c:849 #, c-format msgid "helper %s does not support dry-run" msgstr "助手 %s 不支援 dry-run" -#: transport-helper.c:851 +#: transport-helper.c:852 #, c-format msgid "helper %s does not support --signed" msgstr "助手 %s 不支援 --signed" -#: transport-helper.c:854 +#: transport-helper.c:855 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "助手 %s 不支援 --signed=if-asked" -#: transport-helper.c:859 +#: transport-helper.c:860 #, c-format msgid "helper %s does not support --atomic" msgstr "助手 %s 不支援 --atomic" -#: transport-helper.c:865 +#: transport-helper.c:866 #, c-format msgid "helper %s does not support 'push-option'" msgstr "助手 %s 不支援 'push-option'" -#: transport-helper.c:963 +#: transport-helper.c:964 msgid "remote-helper doesn't support push; refspec needed" msgstr "remote-heper 不支援 push，需要引用表達式" -#: transport-helper.c:968 +#: transport-helper.c:969 #, c-format msgid "helper %s does not support 'force'" msgstr "助手 %s 不支援 'force'" -#: transport-helper.c:1015 +#: transport-helper.c:1016 msgid "couldn't run fast-export" msgstr "無法執行 fast-export" -#: transport-helper.c:1020 +#: transport-helper.c:1021 msgid "error while running fast-export" msgstr "執行 fast-export 時發生錯誤" -#: transport-helper.c:1045 +#: transport-helper.c:1046 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7538,47 +8065,47 @@ msgstr "" "沒有共同的引用並且也沒有指定，什麼也不會做。\n" "可能您應該指定一個分支如 'master'。\n" -#: transport-helper.c:1118 +#: transport-helper.c:1119 #, c-format msgid "malformed response in ref list: %s" msgstr "引用列表中格式錯誤的回應：%s" -#: transport-helper.c:1270 +#: transport-helper.c:1271 #, c-format msgid "read(%s) failed" msgstr "讀取（%s）失敗" -#: transport-helper.c:1297 +#: transport-helper.c:1298 #, c-format msgid "write(%s) failed" msgstr "寫（%s）失敗" -#: transport-helper.c:1346 +#: transport-helper.c:1347 #, c-format msgid "%s thread failed" msgstr "%s 執行緒失敗" -#: transport-helper.c:1350 +#: transport-helper.c:1351 #, c-format msgid "%s thread failed to join: %s" msgstr "%s 執行緒等待失敗：%s" -#: transport-helper.c:1369 transport-helper.c:1373 +#: transport-helper.c:1370 transport-helper.c:1374 #, c-format msgid "can't start thread for copying data: %s" msgstr "不能啟動執行緒來複製資料：%s" -#: transport-helper.c:1410 +#: transport-helper.c:1411 #, c-format msgid "%s process failed to wait" msgstr "%s 進程等待失敗" -#: transport-helper.c:1414 +#: transport-helper.c:1415 #, c-format msgid "%s process failed" msgstr "%s 進程失敗" -#: transport-helper.c:1432 transport-helper.c:1441 +#: transport-helper.c:1433 transport-helper.c:1442 msgid "can't start thread for copying data" msgstr "不能啟動執行緒來複製資料" @@ -7594,7 +8121,12 @@ msgstr "樹狀物件中的條目模式錯誤" msgid "empty filename in tree entry" msgstr "樹狀物件條目中空的檔案名" -#: tree-walk.c:118 +#: tree-walk.c:48 +#, c-format +msgid "filename in tree entry contains backslash: '%s'" +msgstr "樹狀物件中的檔案名稱有反斜線：'%s'" + +#: tree-walk.c:124 msgid "too-short tree file" msgstr "太短的樹檔案" @@ -7832,6 +8364,11 @@ msgstr "" "以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" "並且碰撞組中只有一個檔案存在工作區中：\n" +#: unpack-trees.c:1441 +#| msgid "Updating files" +msgid "Updating index flags" +msgstr "正在更新索引旗標" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "無效的 URL 方案名稱或遺失 '://' 後綴" @@ -8449,131 +8986,131 @@ msgstr "另外，您的索引中包含未提交的變更。" msgid "cannot %s: Your index contains uncommitted changes." msgstr "不能%s：您的索引中包含未提交的變更。" -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 #, c-format msgid "failed to unlink '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<選項>] [--] <路徑規格>..." -#: builtin/add.c:84 +#: builtin/add.c:87 #, c-format msgid "unexpected diff status %c" msgstr "意外的差異狀態 %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:92 builtin/commit.c:288 msgid "updating files failed" msgstr "更新檔案失敗" -#: builtin/add.c:99 +#: builtin/add.c:102 #, c-format msgid "remove '%s'\n" msgstr "刪除 '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:177 msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:252 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:245 +#: builtin/add.c:263 #, c-format msgid "Could not open '%s' for writing." msgstr "無法為寫入開啟 '%s'。" -#: builtin/add.c:249 +#: builtin/add.c:267 msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:252 +#: builtin/add.c:270 msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:255 +#: builtin/add.c:273 #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:257 +#: builtin/add.c:275 msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:262 +#: builtin/add.c:280 #, c-format msgid "Could not apply '%s'" msgstr "不能應用 '%s'" -#: builtin/add.c:270 +#: builtin/add.c:288 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: 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 msgid "dry run" msgstr "測試執行" -#: builtin/add.c:293 +#: builtin/add.c:311 msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307 msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:295 +#: builtin/add.c:313 msgid "edit current diff and apply" msgstr "編輯目前差異並應用" -#: builtin/add.c:296 +#: builtin/add.c:314 msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:297 +#: builtin/add.c:315 msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:298 +#: builtin/add.c:316 msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:299 +#: builtin/add.c:317 msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:300 +#: builtin/add.c:318 msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:303 +#: builtin/add.c:321 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:305 +#: builtin/add.c:323 msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:306 +#: builtin/add.c:324 msgid "just skip files which cannot be added because of errors" msgstr "跳過因發生錯誤不能新增的檔案" -#: builtin/add.c:307 +#: builtin/add.c:325 msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:327 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:311 +#: builtin/add.c:329 msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:326 +#: builtin/add.c:347 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8602,39 +9139,60 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:354 +#: builtin/add.c:375 #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 參數如果您確實要新增它們。\n" -#: builtin/add.c:379 +#: builtin/add.c:400 msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:419 +#: builtin/add.c:428 builtin/commit.c:348 +#| msgid "--first-parent is incompatible with --bisect" +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" +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file 與 --edit 不相容" + +#: builtin/add.c:446 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 選項互斥" -#: builtin/add.c:426 +#: builtin/add.c:449 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" -#: builtin/add.c:430 +#: builtin/add.c:453 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:445 +#: builtin/add.c:471 builtin/checkout.c:1648 builtin/commit.c:354 +#: builtin/reset.c:327 +#| msgid "--patch is incompatible with --{hard,mixed,soft}" +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 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul 需要 --pathspec-from-file" + +#: builtin/add.c:482 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也許您想要執行 'git add .'？\n" @@ -8687,7 +9245,7 @@ msgstr "無效的時區位移值" msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:948 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" @@ -8776,7 +9334,7 @@ msgstr "提交內容為：" 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:374 +#: builtin/am.c:1695 builtin/commit.c:394 msgid "unable to write index file" msgstr "無法寫入索引檔案" @@ -8824,8 +9382,8 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" @@ -8866,7 +9424,7 @@ 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:297 builtin/stash.c:812 +#: builtin/repack.c:304 builtin/stash.c:811 msgid "be quiet" msgstr "靜默模式" @@ -8908,12 +9466,12 @@ msgstr "捨棄裁切線前的所有內容" msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 +#: 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/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:150 parse-options.h:171 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" @@ -8962,13 +9520,13 @@ msgstr "將作者日期作為提交日期" msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: 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 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514 msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" @@ -9072,8 +9630,7 @@ 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>]" @@ -9128,33 +9685,33 @@ msgstr "我們沒有在二分尋找。\n" msgid "'%s' is not a valid commit" msgstr "'%s' 不是一個有效的提交" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。" -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "壞的 bisect_write 參數：%s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得版本 '%s' 的物件 ID" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "無效的指令：您目前正處於一個 %s/%s 二分尋找中" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9163,7 +9720,7 @@ msgstr "" "您需要給我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9174,7 +9731,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:322 #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分尋找" @@ -9184,22 +9741,22 @@ msgstr "在只有一個 %s 提交的情況下二分尋找" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:330 msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:377 msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:380 #, 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:389 +#: builtin/bisect--helper.c:390 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9208,111 +9765,111 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:476 #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:480 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:512 msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:527 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:548 msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分尋找" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:551 msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:575 #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:631 msgid "perform 'git bisect next'" msgstr "執行 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:633 msgid "write the terms to .git/BISECT_TERMS" msgstr "將術語寫入 .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:635 msgid "cleanup the bisection state" msgstr "清除二分尋找狀態" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:637 msgid "check for expected revs" msgstr "檢查預期的版本" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:639 msgid "reset the bisection state" msgstr "清除二分尋找狀態" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:641 msgid "write out the bisection state in BISECT_LOG" msgstr "將二分尋找的狀態寫入 BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:643 msgid "check and set terms in a bisection state" msgstr "在一個二分尋找狀態中檢查和設定術語" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:645 msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:647 msgid "print out the bisect terms" msgstr "列印二分尋找術語" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:649 msgid "start the bisect session" msgstr "啟動二分尋找過程" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:651 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "更新 BISECT_HEAD 而非簽出目前提交" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:653 msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:670 msgid "--write-terms requires two arguments" msgstr "--write-terms 需要兩個參數" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:674 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state 不帶參數" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:681 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:685 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write 需要 4 或 5 個參數" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:691 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms 需要 3 個參數" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:697 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check 需要 2 或 3 個參數" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:703 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" @@ -9411,7 +9968,7 @@ msgstr "顯示作者的信箱而不是名字（預設：關閉）" msgid "Ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:860 builtin/log.c:1630 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "版本" @@ -9431,43 +9988,39 @@ msgstr "使用顏色間隔輸出與前一行不同的重複元訊息" msgid "color lines by age" msgstr "依據時間著色" -#: builtin/blame.c:870 -msgid "Use an experimental heuristic to improve diffs" -msgstr "使用一個實驗性的啟發式演算法改進差異顯示" - -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "花費額外的循環來找到更好的符合" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "使用 <檔案> 的內容作為最終的圖片" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "得分" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "找到檔案內及跨檔案的行複製" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "找到檔案內及跨檔案的行移動" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "只處理行範圍在 n 和 m 之間的，從 1 開始" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" @@ -9479,18 +10032,18 @@ msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "4 年 11 個月前" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format 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:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "追蹤程式碼行" @@ -9701,7 +10254,7 @@ msgstr "設定追蹤模式（參見 git-pull(1)）" msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:505 msgid "upstream" msgstr "上游" @@ -9710,8 +10263,9 @@ msgid "change the upstream info" msgstr "改變上游訊息" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "取消上游訊息的設定" +#| msgid "Unset the upstream info" +msgid "unset the upstream info" +msgstr "取消上游資訊設定" #: builtin/branch.c:628 msgid "use colored output" @@ -9812,7 +10366,7 @@ msgstr "排序和過濾屬於大小寫不敏感" msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:684 builtin/clone.c:784 msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" @@ -9895,22 +10449,69 @@ 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:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s 可以\n" +#: 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 [<選項>] <檔案>" + +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <檔案> [<參考名稱>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <檔案> [<參考名稱>...]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3228 +msgid "do not show progress meter" +msgstr "不顯示進度表" -#: builtin/bundle.c:58 +#: builtin/bundle.c:68 builtin/pack-objects.c:3230 +msgid "show progress meter" +msgstr "顯示進度表" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3232 +msgid "show progress meter during object writing phase" +msgstr "在物件寫入階段顯示進度表" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3235 +msgid "similar to --all-progress when progress meter is shown" +msgstr "當進度表顯示時類似於 --all-progress" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "需要一個版本庫來建立包。" -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +#| msgid "do not show peeled tags" +msgid "do not show bundle details" +msgstr "不顯示包 (bundle) 詳細資訊" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s 可以\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "需要一個版本庫來解包。" +#: builtin/bundle.c:168 builtin/remote.c:1609 +msgid "be verbose; must be placed before a subcommand" +msgstr "詳細輸出；必須置於子指令之前" + +#: builtin/bundle.c:190 builtin/remote.c:1640 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "未知子指令：%s" + #: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" @@ -9959,7 +10560,7 @@ msgstr "對於資料物件，對其內容做文字轉換" msgid "for blob objects, run filters on object's content" msgstr "對於資料物件，對其內容做過濾" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:992 msgid "blob" msgstr "資料物件" @@ -10019,7 +10620,7 @@ msgstr "從標準輸入讀出檔案名" msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537 #: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -10110,8 +10711,8 @@ msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 +#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388 +#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882 #: builtin/worktree.c:679 msgid "string" msgstr "字串" @@ -10140,98 +10741,98 @@ msgstr "git switch [<選項>] [<分支>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "路徑 '%s' 沒有我們的版本" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "路徑 '%s' 沒有他們的版本" -#: builtin/checkout.c:191 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路徑 '%s' 沒有全部必需的版本" -#: builtin/checkout.c:241 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路徑 '%s' 沒有必需的版本" -#: builtin/checkout.c:259 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：無法合併" -#: builtin/checkout.c:275 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:375 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" msgstr[1] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:380 +#: 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:387 +#: 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:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' 不能和 %s 同時使用" -#: builtin/checkout.c:430 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:434 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:438 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:443 builtin/checkout.c:448 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:680 +#: builtin/checkout.c:682 builtin/sparse-checkout.c:82 msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:730 +#: builtin/checkout.c:732 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10240,51 +10841,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:833 +#: builtin/checkout.c:835 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:877 msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:881 builtin/clone.c:716 msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:885 #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:888 #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:892 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:894 builtin/checkout.c:1291 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:896 #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:945 +#: builtin/checkout.c:947 #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:953 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10305,7 +10906,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:972 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10332,28 +10933,28 @@ msgstr[1] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1007 msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1011 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1051 builtin/checkout.c:1286 msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1176 +#: builtin/checkout.c:1178 msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1195 #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻給出了 %d 個" -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1232 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10362,37 +10963,37 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1245 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1258 builtin/checkout.c:1622 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1305 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1307 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1308 builtin/checkout.c:1316 #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1311 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1327 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10400,15 +11001,15 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1331 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" -"不能在一個 am 工作階段期間切換分支\n" +"不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1335 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10416,7 +11017,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1339 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10424,7 +11025,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1343 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10432,122 +11033,119 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1347 msgid "you are switching branch while bisecting" msgstr "您在執行二分尋找時切換分支" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1354 msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375 +#: builtin/checkout.c:1380 builtin/checkout.c:1385 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1382 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1390 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1397 msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: 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/send-pack.c:174 msgid "force progress reporting" msgstr "強制顯示進度報告" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1440 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "風格" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1442 msgid "conflict style (merge or diff3)" msgstr "衝突輸出風格（merge 或 diff3）" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1454 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1455 msgid "set upstream info for new branch" msgstr "為新的分支設定上游訊息" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1457 msgid "force checkout (throw away local modifications)" msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1459 msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1461 builtin/merge.c:288 msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1464 msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1477 msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1480 msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1484 msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1537 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1540 msgid "-p and --overlay are mutually exclusive" msgstr "-p 和 --overlay 互斥" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1577 msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1582 msgid "missing branch name; try -b" msgstr "缺少分支名，嘗試 -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1615 #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "您必須指定一個要復原的路徑" - #: builtin/checkout.c:1631 msgid "invalid path specification" msgstr "無效的路徑規格" @@ -10562,14 +11160,27 @@ msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1651 +#| msgid "--first-parent is incompatible with --bisect" +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" +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file 與 --patch 不相容" + +#: builtin/checkout.c:1665 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:1666 +#: builtin/checkout.c:1670 +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" @@ -10597,73 +11208,72 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: 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 msgid "branch" msgstr "分支" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1715 msgid "create and checkout a new branch" msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1717 msgid "create/reset and checkout a branch" msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1718 msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1720 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1721 msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1743 +#: builtin/checkout.c:1766 msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1745 +#: builtin/checkout.c:1768 msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1747 +#: builtin/checkout.c:1770 msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1749 +#: builtin/checkout.c:1772 msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1781 +#: builtin/checkout.c:1804 msgid "which tree-ish to checkout from" msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1783 +#: builtin/checkout.c:1806 msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1785 +#: builtin/checkout.c:1808 msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1787 +#: builtin/checkout.c:1810 msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1788 +#: builtin/checkout.c:1811 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 @@ -10695,7 +11305,7 @@ msgstr "刪除 %s 失敗" msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10708,7 +11318,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10729,8 +11339,8 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" @@ -10755,11 +11365,6 @@ msgstr "選擇要刪除的條目" msgid "Remove %s [y/N]? " msgstr "刪除 %s [y/N]？" -#: builtin/clean.c:787 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "再見。\n" - #: builtin/clean.c:795 msgid "" "clean - start cleaning\n" @@ -10778,14 +11383,6 @@ msgstr "" "help - 顯示本協助\n" "? - 顯示如何在提示符下選擇的協助" -#: builtin/clean.c:822 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "*** 指令 ***" - -#: builtin/clean.c:823 git-add--interactive.perl:1846 -msgid "What now" -msgstr "請選擇" - #: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" @@ -10813,8 +11410,8 @@ msgid "remove whole directories" msgstr "刪除整個目錄" #: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: 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/show-ref.c:179 msgid "pattern" msgstr "模式" @@ -10839,170 +11436,172 @@ 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>]" msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "不建立一個簽出" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 msgid "create a bare repository" msgstr "建立一個純版本庫" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "建立一個鏡像版本庫（也是純版本庫）" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "從本機版本庫複製" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "不使用本機硬連結，始終複製" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "設定為共享版本庫" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "pathspec" msgstr "路徑規格" -#: builtin/clone.c:106 +#: builtin/clone.c:107 msgid "initialize submodules in the clone" msgstr "在複製時初始化子模組" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "並發複製的子模組的數量" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:486 msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1392 +#: builtin/submodule--helper.c:1885 msgid "reference repository" msgstr "參考版本庫" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1394 +#: builtin/submodule--helper.c:1887 msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:327 msgid "name" msgstr "名稱" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout <branch> instead of the remote's HEAD" msgstr "簽出 <分支> 而不是遠端 HEAD" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840 #: builtin/pull.c:227 msgid "depth" msgstr "深度" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283 msgid "time" msgstr "時間" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "從一個特定時間建立一個淺複製" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1445 msgid "revision" msgstr "版本" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "深化淺複製的歷史，除了特定版本" -#: builtin/clone.c:131 +#: builtin/clone.c:132 msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要複製任何標籤，並且後續取得動作也不下載它們" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:495 msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "key=value" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 -#: builtin/push.c:572 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" -#: builtin/clone.c:148 +#: builtin/clone.c:149 msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何複製的子模組將使用它們的遠端追蹤分支" -#: builtin/clone.c:284 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11010,42 +11609,42 @@ msgstr "" "無法猜到目錄名。\n" "請在指令列指定一個目錄" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一個目錄" -#: builtin/clone.c:427 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" -#: builtin/clone.c:457 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "建立連結 '%s' 失敗" -#: builtin/clone.c:461 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "複製檔案至 '%s' 失敗" -#: builtin/clone.c:466 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "無法在 '%s' 上疊代" -#: builtin/clone.c:491 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:505 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11055,130 +11654,135 @@ msgstr "" "您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" -#: builtin/clone.c:582 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能發現要複製的遠端分支 %s。" -#: builtin/clone.c:701 +#: builtin/clone.c:704 #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:751 +#: builtin/clone.c:752 +#| msgid "failed to finalize '%s'" +msgid "failed to initialize sparse-checkout" +msgstr "無法初始化稀疏簽出" + +#: builtin/clone.c:775 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" -#: builtin/clone.c:782 +#: builtin/clone.c:806 msgid "unable to checkout working tree" msgstr "不能簽出工作區" -#: builtin/clone.c:832 +#: builtin/clone.c:856 msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c:895 +#: builtin/clone.c:919 msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c:897 +#: builtin/clone.c:921 msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:959 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:941 +#: builtin/clone.c:963 msgid "You must specify a repository to clone." msgstr "您必須指定一個版本庫來複製。" -#: builtin/clone.c:954 +#: builtin/clone.c:976 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 選項不相容。" -#: builtin/clone.c:957 +#: builtin/clone.c:979 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare 和 --separate-git-dir 選項不相容。" -#: builtin/clone.c:970 +#: builtin/clone.c:992 #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:998 builtin/fetch.c:1787 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c:986 +#: builtin/clone.c:1008 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:996 +#: builtin/clone.c:1018 #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c:1016 +#: builtin/clone.c:1038 #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c:1036 +#: builtin/clone.c:1058 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c:1038 +#: builtin/clone.c:1060 #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c:1062 +#: builtin/clone.c:1084 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容" -#: builtin/clone.c:1123 +#: builtin/clone.c:1148 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1125 +#: builtin/clone.c:1150 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1127 +#: builtin/clone.c:1152 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1129 +#: builtin/clone.c:1154 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。" -#: builtin/clone.c:1132 +#: builtin/clone.c:1157 msgid "source repository is shallow, ignoring --local" msgstr "源版本庫是淺複製，忽略 --local" -#: builtin/clone.c:1137 +#: builtin/clone.c:1162 msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1237 builtin/clone.c:1245 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1223 +#: builtin/clone.c:1248 msgid "You appear to have cloned an empty repository." msgstr "您似乎複製了一個空版本庫。" @@ -11227,7 +11831,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -11255,13 +11859,13 @@ msgstr "父提交" msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 +#: 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/tag.c:412 msgid "message" msgstr "說明" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1496 msgid "commit message" msgstr "提交說明" @@ -11269,7 +11873,7 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 +#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287 #: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -11342,94 +11946,103 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" -#: builtin/commit.c:356 +#: 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 同時使用沒有意義" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "參數 --include/--only 不跟路徑沒有意義。" + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "不能建立暫時索引" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "互動式新增失敗" -#: builtin/commit.c:376 +#: builtin/commit.c:396 msgid "unable to update temporary index" msgstr "無法更新暫時索引" -#: builtin/commit.c:378 +#: builtin/commit.c:398 msgid "Failed to update main cache tree" msgstr "不能更新樹的主快取" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:423 builtin/commit.c:446 builtin/commit.c:492 msgid "unable to write new_index file" msgstr "無法寫 new_index 檔案" -#: builtin/commit.c:455 +#: builtin/commit.c:475 msgid "cannot do a partial commit during a merge." msgstr "在合併過程中不能做部分提交。" -#: builtin/commit.c:457 +#: builtin/commit.c:477 msgid "cannot do a partial commit during a cherry-pick." msgstr "在揀選過程中不能做部分提交。" -#: builtin/commit.c:465 +#: builtin/commit.c:485 msgid "cannot read the index" msgstr "無法讀取索引" -#: builtin/commit.c:484 +#: builtin/commit.c:504 msgid "unable to write temporary index file" msgstr "無法寫暫時索引檔案" -#: builtin/commit.c:582 +#: builtin/commit.c:602 #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者訊息" -#: builtin/commit.c:584 +#: builtin/commit.c:604 #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: builtin/commit.c:603 +#: builtin/commit.c:623 msgid "malformed --author parameter" msgstr "格式錯誤的 --author 參數" -#: builtin/commit.c:656 +#: builtin/commit.c:676 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092 #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:726 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" -#: builtin/commit.c:708 +#: builtin/commit.c:728 msgid "could not read log from standard input" msgstr "不能從標準輸入中讀取日誌訊息" -#: builtin/commit.c:712 +#: builtin/commit.c:732 #, c-format msgid "could not read log file '%s'" msgstr "不能讀取日誌檔案 '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:763 builtin/commit.c:779 msgid "could not read SQUASH_MSG" msgstr "不能讀取 SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:770 msgid "could not read MERGE_MSG" msgstr "不能讀取 MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:830 msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:829 +#: builtin/commit.c:849 #, c-format msgid "" "\n" @@ -11443,7 +12056,7 @@ msgstr "" "\t%s\n" "然後重試。\n" -#: builtin/commit.c:834 +#: builtin/commit.c:854 #, c-format msgid "" "\n" @@ -11457,7 +12070,7 @@ msgstr "" "\t%s\n" "然後重試。\n" -#: builtin/commit.c:847 +#: builtin/commit.c:867 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11466,7 +12079,7 @@ msgstr "" "請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n" "說明將會終止提交。\n" -#: builtin/commit.c:855 +#: builtin/commit.c:875 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11477,324 +12090,318 @@ msgstr "" "也可以刪除它們。一個空的提交說明將會終止提交。\n" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:872 +#: builtin/commit.c:892 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:880 +#: builtin/commit.c:900 #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:887 +#: builtin/commit.c:907 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:925 msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:972 +#: builtin/commit.c:992 msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1006 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:1030 +#: builtin/commit.c:1050 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1044 +#: builtin/commit.c:1064 #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1082 builtin/commit.c:1322 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1122 msgid "--long and -z are incompatible" msgstr "--long 和 -z 選項不相容" -#: builtin/commit.c:1146 +#: builtin/commit.c:1166 msgid "Using both --reset-author and --author does not make sense" msgstr "同時使用 --reset-author 和 --author 沒有意義" -#: builtin/commit.c:1155 +#: builtin/commit.c:1175 msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1158 +#: builtin/commit.c:1178 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1160 +#: builtin/commit.c:1180 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1163 +#: builtin/commit.c:1183 msgid "Options --squash and --fixup cannot be used together" msgstr "選項 --squash 和 --fixup 不能同時使用" -#: builtin/commit.c:1173 +#: builtin/commit.c:1193 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一個 -c/-C/-F/--fixup 選項。" -#: builtin/commit.c:1175 +#: builtin/commit.c:1195 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" -#: builtin/commit.c:1183 +#: builtin/commit.c:1203 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1200 +#: builtin/commit.c:1220 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "參數 --include/--only 不跟路徑沒有意義。" - -#: builtin/commit.c:1208 +#: builtin/commit.c:1226 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1357 builtin/commit.c:1519 msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1359 builtin/commit.c:1521 msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1343 +#: builtin/commit.c:1361 msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1363 builtin/commit.c:1523 msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1347 +#: builtin/commit.c:1365 msgid "version" msgstr "版本" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549 #: builtin/worktree.c:650 msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1368 builtin/commit.c:1527 msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1371 builtin/commit.c:1530 msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336 msgid "mode" msgstr "模式" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設：all）" -#: builtin/commit.c:1360 +#: builtin/commit.c:1378 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" -msgstr "" -"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" +msgstr "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1380 parse-options.h:192 msgid "when" msgstr "何時" -#: builtin/commit.c:1363 +#: builtin/commit.c:1381 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:1365 +#: builtin/commit.c:1383 msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1366 +#: builtin/commit.c:1384 msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1368 +#: builtin/commit.c:1386 msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1388 +#: builtin/commit.c:1406 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1493 +#: builtin/commit.c:1489 msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1494 +#: builtin/commit.c:1490 msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1496 +#: builtin/commit.c:1492 msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414 msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "author" msgstr "作者" -#: builtin/commit.c:1498 +#: builtin/commit.c:1494 msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1495 builtin/gc.c:538 msgid "date" msgstr "日期" -#: builtin/commit.c:1499 +#: builtin/commit.c:1495 msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499 +#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "提交" -#: builtin/commit.c:1501 +#: builtin/commit.c:1497 msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1502 +#: builtin/commit.c:1498 msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" -#: builtin/commit.c:1503 +#: builtin/commit.c:1499 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash 格式的提交說明用以修正指定的提交" -#: builtin/commit.c:1504 +#: builtin/commit.c:1500 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1505 +#: builtin/commit.c:1501 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289 #: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "新增 Signed-off-by: 簽名" -#: builtin/commit.c:1507 +#: builtin/commit.c:1503 msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1508 +#: builtin/commit.c:1504 msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1510 +#: builtin/commit.c:1506 msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1515 +#: builtin/commit.c:1511 msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1516 +#: builtin/commit.c:1512 msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1517 +#: builtin/commit.c:1513 msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1518 +#: builtin/commit.c:1514 msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1519 +#: builtin/commit.c:1515 msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1520 +#: builtin/commit.c:1516 msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1521 +#: builtin/commit.c:1517 msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1522 +#: builtin/commit.c:1518 msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1535 +#: builtin/commit.c:1531 msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1536 +#: builtin/commit.c:1532 msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1541 +#: builtin/commit.c:1539 msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1543 +#: builtin/commit.c:1541 msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1616 +#: builtin/commit.c:1614 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1623 +#: builtin/commit.c:1621 msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1640 #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1647 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1686 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -11803,22 +12410,14 @@ msgstr "" "版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n" "磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。" -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <物件目錄>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <物件目錄>]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 msgid "" "git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--" "[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" @@ -11826,55 +12425,54 @@ msgstr "" "git commit-graph write [--object-dir <物件目錄>] [--append|--split] [--" "reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:48 builtin/commit-graph.c:103 +#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "目錄" -#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 -#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 +#: builtin/commit-graph.c:49 builtin/commit-graph.c:104 +#: builtin/commit-graph.c:188 msgid "The object directory to store the graph" msgstr "儲存圖形的物件目錄" -#: builtin/commit-graph.c:58 +#: builtin/commit-graph.c:51 msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "無法開啟提交圖形 '%s'" -#: builtin/commit-graph.c:173 +#: builtin/commit-graph.c:106 msgid "start walk at all refs" msgstr "開始遍歷所有引用" -#: builtin/commit-graph.c:175 +#: builtin/commit-graph.c:108 msgid "scan pack-indexes listed by stdin for commits" msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: builtin/commit-graph.c:177 +#: builtin/commit-graph.c:110 msgid "start walk at commits listed by stdin" msgstr "從標準輸入中的提交開始掃描" -#: builtin/commit-graph.c:179 +#: builtin/commit-graph.c:112 msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 檔案中已有所有提交" -#: builtin/commit-graph.c:182 +#: builtin/commit-graph.c:115 msgid "allow writing an incremental commit-graph file" msgstr "允許寫一個增量提交圖形檔案" -#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 +#: builtin/commit-graph.c:117 builtin/commit-graph.c:121 msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本分割提交圖形中的最大提交數" -#: builtin/commit-graph.c:186 +#: builtin/commit-graph.c:119 msgid "maximum ratio between two levels of a split commit-graph" msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: builtin/commit-graph.c:204 +#: builtin/commit-graph.c:137 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" @@ -12323,7 +12921,7 @@ msgstr "只考慮符合 <模式> 的標籤" msgid "do not consider tags matching <pattern>" msgstr "不考慮符合 <模式> 的標籤" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:553 builtin/name-rev.c:473 msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" @@ -12576,7 +13174,7 @@ msgstr "使用 done 功能來終止流" msgid "Skip output of blob data" msgstr "跳過資料物件的輸出" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "引用規格" @@ -12620,177 +13218,183 @@ msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c:115 +#: builtin/fetch.c:116 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:139 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:140 builtin/pull.c:248 +#: builtin/fetch.c:141 builtin/pull.c:248 msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:143 builtin/pull.c:207 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:145 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c:145 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c:147 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:150 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c:151 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c:153 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "子模組取得的並發數" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:156 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c:157 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:141 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:159 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:164 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c:165 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "深化淺複製的歷史" -#: builtin/fetch.c:170 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:177 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c:179 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c:182 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:187 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:236 msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:189 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:195 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c:198 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "取得後執行 'gc --auto'" -#: builtin/fetch.c:200 builtin/pull.c:246 +#: builtin/fetch.c:201 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c:510 +#: builtin/fetch.c:203 +#, fuzzy +#| msgid "prune remotes after fetching" +msgid "write the commit-graph after fetching" +msgstr "抓取後清除遠端" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "無法發現遠端 HEAD 引用" -#: builtin/fetch.c:650 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "設定變數 fetch.output 包含無效值 %s" -#: builtin/fetch.c:748 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "物件 %s 未發現" -#: builtin/fetch.c:752 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[已拒絕]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "目前分支下不能執行取得動作" -#: builtin/fetch.c:776 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c:781 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c:803 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c:806 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:848 +#: builtin/fetch.c:851 msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c:853 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c:874 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -12800,7 +13404,7 @@ msgstr "" "要重新啟用，請使用 '--show-forced-updates' 選項或執行\n" "'git config fetch.showForcedUpdates true'。" -#: builtin/fetch.c:878 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -12811,22 +13415,22 @@ msgstr "" "花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n" "或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n" -#: builtin/fetch.c:908 +#: builtin/fetch.c:911 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:929 +#: builtin/fetch.c:932 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "拒絕 %s 因為淺複製不允許被更新" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1017 builtin/fetch.c:1155 #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1031 +#: builtin/fetch.c:1028 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12836,57 +13440,58 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1125 #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1126 #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1158 msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1159 builtin/remote.c:1035 msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1182 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒絕取得到非純版本庫的目前分支 %s" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1201 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "選項 \"%s\" 為 %s 所忽略\n" -#: builtin/fetch.c:1414 -msgid "multiple branch detected, incompatible with --set-upstream" +#: builtin/fetch.c:1412 +#| msgid "multiple branch detected, incompatible with --set-upstream" +msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1429 +#: builtin/fetch.c:1427 msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1431 +#: builtin/fetch.c:1429 msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1433 +#: builtin/fetch.c:1431 msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1435 +#: builtin/fetch.c:1433 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -12894,65 +13499,65 @@ msgstr "" "未發現源分支。\n" "您需要使用 --set-upstream 選項指定一個分支。" -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1559 builtin/fetch.c:1622 #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1583 +#: builtin/fetch.c:1581 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1684 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:1722 +#: builtin/fetch.c:1721 msgid "You need to specify a tag name." msgstr "您需要指定一個標籤名稱。" -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1771 msgid "Negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1773 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen 和 --depth 是互斥的" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1778 msgid "--depth and --unshallow cannot be used together" msgstr "--depth 和 --unshallow 不能同時使用" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1780 msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1796 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1798 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1807 #, c-format msgid "No such remote or remote group: %s" msgstr "沒有這樣的遠端或遠端組：%s" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1814 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "取得組並指定引用規格沒有意義" -#: builtin/fetch.c:1835 +#: builtin/fetch.c:1832 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -12963,23 +13568,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:672 +#: builtin/fmt-merge-msg.c:674 msgid "populate log with at most <n> entries from shortlog" msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:677 msgid "alias for --log (deprecated)" msgstr "參數 --log 的別名（已棄用）" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:680 msgid "text" msgstr "文字" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:681 msgid "use <text> as start of message" msgstr "使用 <文字> 作為提交說明的開始" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:682 msgid "file to read from" msgstr "從檔案中讀取" @@ -13043,32 +13648,32 @@ msgstr "只列印包含該提交的引用" msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" @@ -13077,211 +13682,211 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "標記 %s %s (%s) 於 %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:842 #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的頭節點（預設）" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" @@ -13373,8 +13978,7 @@ msgstr "手動維護參見 \"git help gc\"。\n" #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" -msgstr "" -"已經有一個 gc 正執行在機器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）" +msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）" #: builtin/gc.c:694 msgid "" @@ -13839,14 +14443,14 @@ msgstr "用掉了超過可用的位元組" msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "包超過了最大允許值" #: builtin/index-pack.c:312 #, c-format msgid "cannot open packfile '%s'" -msgstr "無法開啟包檔案 '%s'" +msgstr "無法開啟 packfile '%s'" #: builtin/index-pack.c:326 msgid "pack signature mismatch" @@ -13949,7 +14553,7 @@ msgstr "包衝突（SHA1 不符合）" #: builtin/index-pack.c:1157 msgid "cannot fstat packfile" -msgstr "不能對包檔案呼叫 fstat" +msgstr "不能對 packfile 呼叫 fstat" #: builtin/index-pack.c:1160 msgid "pack has junk at the end" @@ -13982,7 +14586,7 @@ msgstr[1] "完成 %d 個本機物件" #: builtin/index-pack.c:1264 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "對 %s 的尾部校驗出現意外（磁碟損壞？）" +msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" #: builtin/index-pack.c:1268 #, c-format @@ -14004,7 +14608,7 @@ msgstr "本機物件 %s 已損壞" #: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" -msgstr "包檔案名 '%s' 沒有以 '.pack' 結尾" +msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾" #: builtin/index-pack.c:1427 #, c-format @@ -14077,9 +14681,9 @@ msgstr "--stdin 需要一個 git 版本庫" #: builtin/index-pack.c:1785 msgid "--verify with no packfile name given" -msgstr "--verify 沒有提供包檔案名參數" +msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581 msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" @@ -14260,121 +14864,126 @@ msgstr "--trailer 和 --only-input 同時使用沒有意義" msgid "no input file given for in-place editing" msgstr "沒有給出要原位編輯的檔案" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<選項>] <物件>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "無效的 --decorate 選項：%s" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "顯示源" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "使用信件映射檔案" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "只修飾與 <模式> 符合的引用" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "不修飾和 <模式> 符合的引用" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "修飾選項" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "處理檔案中第 n 到 m 之間的行，從 1 開始" -#: builtin/log.c:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:549 builtin/log.c:644 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:669 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:792 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:909 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "輸出目錄名太長" -#: builtin/log.c:925 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:942 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:952 +#: builtin/log.c:979 msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1075 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1081 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1160 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1187 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1245 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c:1371 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1375 +#: builtin/log.c:1443 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -14384,267 +14993,275 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1395 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1406 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1410 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1463 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1515 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "無法推斷 range-diff 範圍" -#: builtin/log.c:1560 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1563 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1567 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1569 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1571 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1572 +#: builtin/log.c:1641 msgid "sfx" msgstr "後綴" -#: builtin/log.c:1573 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1575 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1577 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1579 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1582 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1585 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1588 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1591 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1593 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1595 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1597 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1599 +#: builtin/log.c:1671 msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1600 +#: builtin/log.c:1672 msgid "header" msgstr "header" -#: builtin/log.c:1601 +#: builtin/log.c:1673 msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "信件位址" -#: builtin/log.c:1602 +#: builtin/log.c:1674 msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1604 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1606 +#: builtin/log.c:1678 msgid "ident" msgstr "標記" -#: builtin/log.c:1607 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1609 +#: builtin/log.c:1681 msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1610 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "邊界" -#: builtin/log.c:1612 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1615 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1619 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1621 +#: builtin/log.c:1693 msgid "signature" msgstr "簽名" -#: builtin/log.c:1622 +#: builtin/log.c:1694 msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1623 +#: builtin/log.c:1695 msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1624 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1626 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1627 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1629 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1631 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1634 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1636 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1711 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1726 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "-n 和 -k 互斥" -#: builtin/log.c:1728 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc 和 -k 互斥" -#: builtin/log.c:1736 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1738 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1740 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1773 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "標準輸出或目錄，哪一個？" -#: builtin/log.c:1877 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:1881 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:1882 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:1888 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor 需要 --range-diff" -#: builtin/log.c:1892 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:1900 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:1901 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:1912 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:1948 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:1992 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2051 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -14768,7 +15385,7 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518 msgid "exec" msgstr "exec" @@ -14918,7 +15535,7 @@ 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:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114 msgid "strategy" msgstr "策略" @@ -15349,32 +15966,35 @@ 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 [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<目錄>] (write|verify|expire|repack --" -"batch-size=<大小>)" +"git multi-pack-index [<選項>] (write|verify|expire|repack --batch-" +"size=<大小>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" -msgstr "包含成對包檔案和包索引的物件目錄" +msgstr "包含成對 packfile 和包索引的物件目錄" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "太多參數" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "--batch-size 選項僅用於 'repack' 子指令" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" @@ -15466,52 +16086,52 @@ msgstr "%s，源=%s，目標=%s" msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:716 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:403 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<選項>] <提交>..." -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:404 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<選項>] --all" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:405 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<選項>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:462 msgid "print only names (no SHA-1)" msgstr "只列印名稱（無 SHA-1）" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:463 msgid "only use tags to name the commits" msgstr "只使用標籤來命名提交" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:465 msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相符合的引用" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:467 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相符合的引用" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:469 msgid "list all commits reachable from all refs" msgstr "列出可以從所有引用存取的提交" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:470 msgid "read from stdin" msgstr "從標準輸入讀取" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:471 msgid "allow to print `undefined` names (default)" msgstr "允許列印 `未定義` 的名稱（預設）" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:477 msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" @@ -15952,20 +16572,20 @@ msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" #: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" -msgstr "無效的包檔案：%s" +msgstr "無效的 packfile：%s" #: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" -msgstr "無法為重用開啟包檔案：%s" +msgstr "無法為重用開啟 packfile：%s" #: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" -msgstr "無法在重用的包檔案中尋找" +msgstr "無法在重用的 packfile 中尋找" #: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" -msgstr "無法讀取索引檔案" +msgstr "無法從復用的 packfile 中讀取" #: builtin/pack-objects.c:841 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" @@ -15975,7 +16595,7 @@ msgstr "禁用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切 msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" @@ -16105,22 +16725,6 @@ msgstr "不支援的索引版本 %s" msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3228 -msgid "do not show progress meter" -msgstr "不顯示進度表" - -#: builtin/pack-objects.c:3230 -msgid "show progress meter" -msgstr "顯示進度表" - -#: builtin/pack-objects.c:3232 -msgid "show progress meter during object writing phase" -msgstr "在物件寫入階段顯示進度表" - -#: builtin/pack-objects.c:3235 -msgid "similar to --all-progress when progress meter is shown" -msgstr "當進度表顯示時類似於 --all-progress" - #: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" @@ -16259,7 +16863,7 @@ msgstr "處理遺失的物件" #: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" -msgstr "不要打包 promisor 包檔案中的物件" +msgstr "不要打包 promisor packfile 中的物件" #: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" @@ -16338,7 +16942,7 @@ msgstr "使早於提供時間的物件過期" #: builtin/prune.c:136 msgid "limit traversal to objects outside promisor packfiles" -msgstr "限制遍歷 promisor 包以外的物件" +msgstr "限制遍歷 promisor packfile 以外的物件" #: builtin/prune.c:150 msgid "cannot prune in a precious-objects repo" @@ -16365,7 +16969,7 @@ msgstr "和合併相關的選項" msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:467 builtin/revert.c:126 msgid "allow fast-forward" msgstr "允許快轉式" @@ -16417,7 +17021,7 @@ msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" -#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" @@ -16434,7 +17038,7 @@ 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:1353 git-parse-remote.sh:64 +#: builtin/rebase.c:1381 git-parse-remote.sh:64 msgid "<remote>" msgstr "<遠端>" @@ -16443,7 +17047,7 @@ msgstr "<遠端>" msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" @@ -16529,15 +17133,15 @@ msgstr "本機子模組中有修改，無法重定基底" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "標籤後面未提供 <標籤> 參數" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受簡單的目標引用名" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16545,7 +17149,7 @@ msgstr "" "\n" "為了永久地選擇任一選項，參見 'git help config' 中的 push.default。" -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16569,7 +17173,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16583,7 +17187,7 @@ msgstr "" "\n" " git push %s HEAD:<遠端分支名字>\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16596,12 +17200,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "目前分支 %s 有多個上游分支，拒絕推送。" -#: builtin/push.c:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -16611,12 +17215,12 @@ msgstr "" "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" "而沒有告訴我要推送什麼、更新哪個遠端分支。" -#: builtin/push.c:269 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" -#: builtin/push.c:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -16627,7 +17231,7 @@ msgstr "" "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:282 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -16638,7 +17242,7 @@ msgstr "" "簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:288 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -16651,11 +17255,11 @@ msgstr "" "（如 'git pull ...'）。\n" "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:295 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒絕，因為該標籤在遠端已經存在。" -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -16664,99 +17268,99 @@ msgstr "" "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" "也不能更新遠端引用讓其指向一個非提交物件。\n" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:366 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:541 +#: builtin/push.c:542 msgid "repository" msgstr "版本庫" -#: builtin/push.c:542 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "鏡像所有引用" -#: builtin/push.c:545 +#: builtin/push.c:546 msgid "delete refs" msgstr "刪除引用" -#: builtin/push.c:546 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "推送標籤（不能使用 --all or --mirror）" -#: builtin/push.c:549 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "強制更新" -#: builtin/push.c:551 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:552 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "要求引用舊的取值為設定值" -#: builtin/push.c:555 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "控制子模組的遞迴推送" -#: builtin/push.c:557 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "接收包程式" -#: builtin/push.c:560 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "設定 git pull/status 的上游" -#: builtin/push.c:563 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "清除本機刪除的引用" -#: builtin/push.c:565 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "繞過 pre-push 掛鉤" -#: builtin/push.c:566 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "推送缺少但有關的標籤" -#: builtin/push.c:569 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "用 GPG 為推送簽名" -#: builtin/push.c:571 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "需要遠端支援原子事務" -#: builtin/push.c:589 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 與 --all、--mirror 及 --tags 不相容" -#: builtin/push.c:591 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" -#: builtin/push.c:611 +#: builtin/push.c:612 #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" -#: builtin/push.c:612 +#: builtin/push.c:613 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -16777,27 +17381,27 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:627 +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不相容" -#: builtin/push.c:629 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:633 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不相容" -#: builtin/push.c:635 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:638 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不相容" -#: builtin/push.c:642 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" @@ -16813,24 +17417,34 @@ msgstr "git range-diff [<選項>] <old-tip>...<new-tip>" msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "使用簡單差異顏色" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: 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'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "沒有在範圍中使用 ..：'%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "單個參數格式必須是對稱範圍（即包含...）" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "需要兩個提交範圍" @@ -16912,6 +17526,11 @@ msgstr "除錯 unpack-trees" 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 "您需要先解決目前索引的衝突" + #: builtin/rebase.c:32 msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " @@ -16923,223 +17542,222 @@ 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:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:177 builtin/rebase.c:201 builtin/rebase.c:228 #, c-format msgid "unusable todo list: '%s'" msgstr "不可用的待辦列表：'%s'" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 +#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236 #, c-format msgid "could not write '%s'." msgstr "不能寫入 '%s'。" -#: builtin/rebase.c:252 +#: builtin/rebase.c:271 msgid "no HEAD?" msgstr "沒有 HEAD？" -#: builtin/rebase.c:279 +#: builtin/rebase.c:298 #, c-format msgid "could not create temporary %s" msgstr "無法建立暫時的 %s" -#: builtin/rebase.c:285 +#: builtin/rebase.c:304 msgid "could not mark as interactive" msgstr "無法標記為互動式" -#: builtin/rebase.c:343 +#: builtin/rebase.c:362 msgid "could not generate todo list" msgstr "無法生成待辦列表" -#: builtin/rebase.c:383 +#: builtin/rebase.c:402 msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" -#: builtin/rebase.c:438 +#: builtin/rebase.c:457 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<選項>]" -#: builtin/rebase.c:450 +#: builtin/rebase.c:469 msgid "keep empty commits" msgstr "保持空提交" -#: builtin/rebase.c:452 builtin/revert.c:128 +#: builtin/rebase.c:471 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "允許提交說明為空" -#: builtin/rebase.c:453 +#: builtin/rebase.c:472 msgid "rebase merge commits" msgstr "對合併提交重定基底" -#: builtin/rebase.c:455 +#: builtin/rebase.c:474 msgid "keep original branch points of cousins" msgstr "保持兄弟提交的原始分支點" -#: builtin/rebase.c:457 +#: builtin/rebase.c:476 msgid "move commits that begin with squash!/fixup!" msgstr "移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:458 +#: builtin/rebase.c:477 msgid "sign commits" msgstr "簽名提交" -#: builtin/rebase.c:460 builtin/rebase.c:1427 +#: builtin/rebase.c:479 builtin/rebase.c:1455 msgid "display a diffstat of what changed upstream" msgstr "顯示上游變化的差異統計" -#: builtin/rebase.c:462 +#: builtin/rebase.c:481 msgid "continue rebase" msgstr "繼續重定基底" -#: builtin/rebase.c:464 +#: builtin/rebase.c:483 msgid "skip commit" msgstr "跳過提交" -#: builtin/rebase.c:465 +#: builtin/rebase.c:484 msgid "edit the todo list" msgstr "重定基底待辦列表" -#: builtin/rebase.c:467 +#: builtin/rebase.c:486 msgid "show the current patch" msgstr "顯示目前修補檔" -#: builtin/rebase.c:470 +#: builtin/rebase.c:489 msgid "shorten commit ids in the todo list" msgstr "縮短待辦列表中的提交號" -#: builtin/rebase.c:472 +#: builtin/rebase.c:491 msgid "expand commit ids in the todo list" msgstr "擴展待辦列表中的提交號" -#: builtin/rebase.c:474 +#: builtin/rebase.c:493 msgid "check the todo list" msgstr "檢查待辦列表" -#: builtin/rebase.c:476 +#: builtin/rebase.c:495 msgid "rearrange fixup/squash lines" msgstr "重新排列 fixup/squash 行" -#: builtin/rebase.c:478 +#: builtin/rebase.c:497 msgid "insert exec commands in todo list" msgstr "在待辦列表中插入 exec 執行指令" -#: builtin/rebase.c:479 +#: builtin/rebase.c:498 msgid "onto" msgstr "onto" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:482 +#: builtin/rebase.c:501 msgid "restrict revision" msgstr "限制版本" -#: builtin/rebase.c:484 +#: builtin/rebase.c:503 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:485 +#: builtin/rebase.c:504 msgid "squash onto" msgstr "squash onto" -#: builtin/rebase.c:487 +#: builtin/rebase.c:506 msgid "the upstream commit" msgstr "上游提交" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:489 +#: builtin/rebase.c:508 msgid "head name" msgstr "head 名稱" -#: builtin/rebase.c:494 +#: builtin/rebase.c:513 msgid "rebase strategy" msgstr "重定基底策略" -#: builtin/rebase.c:495 +#: builtin/rebase.c:514 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:496 +#: builtin/rebase.c:515 msgid "strategy options" msgstr "策略選項" -#: builtin/rebase.c:497 +#: builtin/rebase.c:516 msgid "switch-to" msgstr "切換到" -#: builtin/rebase.c:498 +#: builtin/rebase.c:517 msgid "the branch or commit to checkout" msgstr "要簽出的分支或提交" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:499 +#: builtin/rebase.c:518 msgid "onto name" msgstr "onto name" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "cmd" msgstr "cmd" -#: builtin/rebase.c:500 +#: builtin/rebase.c:519 msgid "the command to run" msgstr "要執行的指令" -#: builtin/rebase.c:503 builtin/rebase.c:1510 +#: builtin/rebase.c:522 builtin/rebase.c:1540 msgid "automatically re-schedule any `exec` that fails" msgstr "自動重新安排任何失敗的 `exec`" -#: builtin/rebase.c:519 +#: builtin/rebase.c:540 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" -#: builtin/rebase.c:535 +#: builtin/rebase.c:556 #, c-format msgid "%s requires an interactive rebase" msgstr "%s 需要互動式重定基底" -#: builtin/rebase.c:587 +#: builtin/rebase.c:608 #, c-format msgid "could not get 'onto': '%s'" msgstr "無法取得 'onto'：'%s'" -#: builtin/rebase.c:602 +#: builtin/rebase.c:623 #, c-format msgid "invalid orig-head: '%s'" msgstr "無效的原始 head：'%s'" -#: builtin/rebase.c:627 +#: builtin/rebase.c:648 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:703 +#: builtin/rebase.c:724 #, c-format msgid "Could not read '%s'" msgstr "不能讀取 '%s'" -#: builtin/rebase.c:721 +#: builtin/rebase.c:742 #, c-format msgid "Cannot store %s" msgstr "不能儲存 %s" -#: builtin/rebase.c:828 +#: builtin/rebase.c:849 msgid "could not determine HEAD revision" msgstr "不能確定 HEAD 版本" -#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:972 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" @@ -17152,7 +17770,7 @@ msgstr "" "\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n" "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" -#: builtin/rebase.c:1032 +#: builtin/rebase.c:1060 #, c-format msgid "" "\n" @@ -17170,7 +17788,7 @@ msgstr "" "\n" "因此 git 無法對其重定基底。" -#: builtin/rebase.c:1339 +#: builtin/rebase.c:1367 #, c-format msgid "" "%s\n" @@ -17187,7 +17805,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1355 +#: builtin/rebase.c:1383 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17200,132 +17818,147 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1413 msgid "exec commands cannot contain newlines" msgstr "exec 指令不能包含換行符號" -#: builtin/rebase.c:1389 +#: builtin/rebase.c:1417 msgid "empty exec command" msgstr "空的 exec 指令" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1446 msgid "rebase onto given branch instead of upstream" msgstr "重定基底到提供的分支而非上游" -#: builtin/rebase.c:1420 +#: builtin/rebase.c:1448 msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合併基礎做為目前基礎" -#: builtin/rebase.c:1422 +#: builtin/rebase.c:1450 msgid "allow pre-rebase hook to run" msgstr "允許執行 pre-rebase 掛鉤" -#: builtin/rebase.c:1424 +#: builtin/rebase.c:1452 msgid "be quiet. implies --no-stat" msgstr "安靜。暗示 --no-stat" -#: builtin/rebase.c:1430 +#: builtin/rebase.c:1458 msgid "do not show diffstat of what changed upstream" msgstr "不顯示上游變化的差異統計" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1461 msgid "add a Signed-off-by: line to each commit" msgstr "為每一個提交新增一個 Signed-off-by: 簽名" -#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 -msgid "passed to 'git am'" -msgstr "傳遞給 'git am'" +#: builtin/rebase.c:1464 +#| msgid "Group by committer rather than author" +msgid "make committer date match author date" +msgstr "使提交日期符合撰寫日期" + +#: builtin/rebase.c:1466 +msgid "ignore author date and use current date" +msgstr "忽略撰寫日期，使用目前日期" -#: builtin/rebase.c:1443 builtin/rebase.c:1445 +#: 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 msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" -#: builtin/rebase.c:1447 builtin/rebase.c:1450 +#: 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 msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" -#: builtin/rebase.c:1452 +#: builtin/rebase.c:1481 msgid "continue" msgstr "繼續" -#: builtin/rebase.c:1455 +#: builtin/rebase.c:1484 msgid "skip current patch and continue" msgstr "跳過目前修補檔並繼續" # 譯者：請維持前導空格 -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1486 msgid "abort and check out the original branch" msgstr "終止並簽出原有分支" -#: builtin/rebase.c:1460 +#: builtin/rebase.c:1489 msgid "abort but keep HEAD where it is" msgstr "終止但保持 HEAD 不變" -#: builtin/rebase.c:1461 +#: builtin/rebase.c:1490 msgid "edit the todo list during an interactive rebase" msgstr "在互動式重定基底中編輯待辦列表" -#: builtin/rebase.c:1464 +#: builtin/rebase.c:1493 msgid "show the patch file being applied or merged" msgstr "顯示正在套用或合併的修補檔案" -#: builtin/rebase.c:1467 +#: builtin/rebase.c:1496 msgid "use merging strategies to rebase" msgstr "使用合併策略進行重定基底" -#: builtin/rebase.c:1471 +#: builtin/rebase.c:1500 msgid "let the user edit the list of commits to rebase" msgstr "讓使用者編輯要重定基底的提交列表" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1504 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "（已棄用）嘗試重建合併提交而非忽略它們" -#: builtin/rebase.c:1479 +#: builtin/rebase.c:1509 msgid "preserve empty commits during rebase" msgstr "重定基底時保留空提交" -#: builtin/rebase.c:1481 +#: builtin/rebase.c:1511 msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1517 msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" -#: builtin/rebase.c:1489 +#: builtin/rebase.c:1519 msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" -#: builtin/rebase.c:1493 +#: builtin/rebase.c:1523 msgid "allow rebasing commits with empty messages" msgstr "允許針對空提交說明的提交重定基底" -#: builtin/rebase.c:1496 +#: builtin/rebase.c:1526 msgid "try to rebase merges instead of skipping them" msgstr "嘗試對合併提交重定基底而不是忽略它們" -#: builtin/rebase.c:1499 +#: builtin/rebase.c:1529 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 來最佳化上游" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1531 msgid "use the given merge strategy" msgstr "使用提供的合併策略" -#: builtin/rebase.c:1503 builtin/revert.c:115 +#: builtin/rebase.c:1533 builtin/revert.c:115 msgid "option" msgstr "選項" -#: builtin/rebase.c:1504 +#: builtin/rebase.c:1534 msgid "pass the argument through to the merge strategy" msgstr "將參數傳遞給合併策略" -#: builtin/rebase.c:1507 +#: builtin/rebase.c:1537 msgid "rebase all reachable commits up to the root(s)" msgstr "將所有可以取得的提交重定基底到根提交" -#: builtin/rebase.c:1524 +#: builtin/rebase.c:1554 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17333,36 +17966,36 @@ msgstr "" "對 rebase.useBuiltin 的支援已被刪除！\n" "詳見 'git help config' 中的條目。" -#: builtin/rebase.c:1530 +#: builtin/rebase.c:1560 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起來 'git-am' 正在執行中。無法重定基底。" -#: builtin/rebase.c:1571 +#: builtin/rebase.c:1601 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。" -#: builtin/rebase.c:1576 +#: builtin/rebase.c:1606 msgid "cannot combine '--keep-base' with '--onto'" msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1608 msgid "cannot combine '--keep-base' with '--root'" msgstr "不能將 '--keep-base' 和 '--root' 組合使用" -#: builtin/rebase.c:1582 +#: builtin/rebase.c:1612 msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" -#: builtin/rebase.c:1586 +#: builtin/rebase.c:1616 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1639 msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" -#: builtin/rebase.c:1621 +#: builtin/rebase.c:1651 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17370,16 +18003,16 @@ msgstr "" "您必須編輯所有的合併衝突，然後透過 git add\n" "指令將它們標記為已解決" -#: builtin/rebase.c:1640 +#: builtin/rebase.c:1670 msgid "could not discard worktree changes" msgstr "無法捨棄工作區變更" -#: builtin/rebase.c:1659 +#: builtin/rebase.c:1689 #, c-format msgid "could not move back to %s" msgstr "無法移回 %s" -#: builtin/rebase.c:1704 +#: builtin/rebase.c:1734 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17398,155 +18031,154 @@ msgstr "" "\t%s\n" "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" -#: builtin/rebase.c:1725 +#: builtin/rebase.c:1757 msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c:1766 +#: builtin/rebase.c:1798 #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1788 +#: builtin/rebase.c:1820 msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1860 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1840 +#: builtin/rebase.c:1872 msgid "cannot combine am options with either interactive or merge options" msgstr "不能將 am 選項與互動或合併選項同時使用" -#: builtin/rebase.c:1859 +#: builtin/rebase.c:1891 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" -#: builtin/rebase.c:1863 +#: builtin/rebase.c:1895 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:1887 +#: builtin/rebase.c:1919 #, c-format msgid "invalid upstream '%s'" msgstr "無效的上游 '%s'" -#: builtin/rebase.c:1893 +#: builtin/rebase.c:1925 msgid "Could not create new root commit" msgstr "不能建立新的根提交" -#: builtin/rebase.c:1919 +#: builtin/rebase.c:1951 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要與分支的一個合併基礎" -#: builtin/rebase.c:1922 +#: builtin/rebase.c:1954 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一個合併基礎" -#: builtin/rebase.c:1930 +#: builtin/rebase.c:1962 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "沒有指向一個有效的提交 '%s'" -#: builtin/rebase.c:1955 +#: builtin/rebase.c:1987 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "致命錯誤：無此分支/提交 '%s'" -#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:1995 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1961 #, c-format msgid "No such ref: %s" msgstr "沒有這樣的引用：%s" -#: builtin/rebase.c:1974 +#: builtin/rebase.c:2006 msgid "Could not resolve HEAD to a revision" msgstr "無法將 HEAD 解析為一個版本" -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2044 msgid "Cannot autostash" msgstr "無法 autostash" -#: builtin/rebase.c:2015 +#: builtin/rebase.c:2047 #, c-format msgid "Unexpected stash response: '%s'" msgstr "意外的 stash 回應：'%s'" -#: builtin/rebase.c:2021 +#: builtin/rebase.c:2053 #, c-format msgid "Could not create directory for '%s'" msgstr "不能為 '%s' 建立目錄" -#: builtin/rebase.c:2024 +#: builtin/rebase.c:2056 #, c-format msgid "Created autostash: %s\n" msgstr "建立了 autostash：%s\n" -#: builtin/rebase.c:2027 +#: builtin/rebase.c:2059 msgid "could not reset --hard" msgstr "無法 reset --hard" -#: builtin/rebase.c:2036 +#: builtin/rebase.c:2068 msgid "Please commit or stash them." msgstr "請提交或儲藏修改。" -#: builtin/rebase.c:2063 +#: builtin/rebase.c:2095 #, c-format msgid "could not parse '%s'" msgstr "無法解析 '%s'" -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2108 #, c-format msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c:2087 +#: builtin/rebase.c:2119 msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:2089 +#: builtin/rebase.c:2121 #, c-format msgid "Current branch %s is up to date.\n" msgstr "目前分支 %s 是最新的。\n" -#: builtin/rebase.c:2097 +#: builtin/rebase.c:2129 msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，強制重定基底。" -#: builtin/rebase.c:2099 +#: builtin/rebase.c:2131 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "目前分支 %s 是最新的，強制重定基底。\n" -#: builtin/rebase.c:2107 +#: builtin/rebase.c:2139 msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" -#: builtin/rebase.c:2114 +#: builtin/rebase.c:2146 #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的變更：\n" -#: builtin/rebase.c:2117 +#: builtin/rebase.c:2149 #, c-format msgid "Changes from %s to %s:\n" msgstr "從 %s 到 %s 的變更：\n" -#: builtin/rebase.c:2142 +#: builtin/rebase.c:2174 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" -#: builtin/rebase.c:2151 +#: builtin/rebase.c:2183 msgid "Could not detach HEAD" msgstr "無法分離開頭指標" -#: builtin/rebase.c:2160 +#: builtin/rebase.c:2192 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快轉 %s 到 %s。\n" @@ -17827,7 +18459,7 @@ msgstr "（符合）" msgid "(delete)" msgstr "（刪除）" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863 #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" @@ -17848,17 +18480,17 @@ msgstr "" "\t%s\n" "\t如果必要請手動更新設定。" -#: builtin/remote.c:702 +#: builtin/remote.c:701 #, c-format msgid "deleting '%s' failed" msgstr "刪除 '%s' 失敗" -#: builtin/remote.c:736 +#: builtin/remote.c:735 #, c-format msgid "creating '%s' failed" msgstr "建立 '%s' 失敗" -#: builtin/remote.c:802 +#: builtin/remote.c:801 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -17868,118 +18500,118 @@ msgid_plural "" msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" msgstr[1] "注意：ref/remotes 層級之外的一些分支未被移除。要刪除它們，使用：" -#: builtin/remote.c:816 +#: builtin/remote.c:815 #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除設定小節 '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:916 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次取得將儲存於 remotes/%s）" -#: builtin/remote.c:920 +#: builtin/remote.c:919 msgid " tracked" msgstr " 已追蹤" -#: builtin/remote.c:922 +#: builtin/remote.c:921 msgid " stale (use 'git remote prune' to remove)" msgstr " 過時（使用 'git remote prune' 來移除）" -#: builtin/remote.c:924 +#: builtin/remote.c:923 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:964 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支" -#: builtin/remote.c:974 +#: builtin/remote.c:973 #, c-format msgid "rebases interactively onto remote %s" msgstr "互動式重定基底到遠端 %s" -#: builtin/remote.c:976 +#: builtin/remote.c:975 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "互動式重定基底（含合併提交）到遠端 %s" -#: builtin/remote.c:979 +#: builtin/remote.c:978 #, c-format msgid "rebases onto remote %s" msgstr "重定基底到遠端 %s" -#: builtin/remote.c:983 +#: builtin/remote.c:982 #, c-format msgid " merges with remote %s" msgstr " 與遠端 %s 合併" -#: builtin/remote.c:986 +#: builtin/remote.c:985 #, c-format msgid "merges with remote %s" msgstr "與遠端 %s 合併" -#: builtin/remote.c:989 +#: builtin/remote.c:988 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和遠端 %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1031 msgid "create" msgstr "建立" -#: builtin/remote.c:1035 +#: builtin/remote.c:1034 msgid "delete" msgstr "刪除" -#: builtin/remote.c:1039 +#: builtin/remote.c:1038 msgid "up to date" msgstr "最新" -#: builtin/remote.c:1042 +#: builtin/remote.c:1041 msgid "fast-forwardable" msgstr "可快轉" -#: builtin/remote.c:1045 +#: builtin/remote.c:1044 msgid "local out of date" msgstr "本機已過時" -#: builtin/remote.c:1052 +#: builtin/remote.c:1051 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 強制推送至 %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1054 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1058 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 強制推送至 %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1061 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1129 msgid "do not query remotes" msgstr "不查詢遠端" -#: builtin/remote.c:1157 +#: builtin/remote.c:1156 #, c-format msgid "* remote %s" msgstr "* 遠端 %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1157 #, c-format msgid " Fetch URL: %s" msgstr " 取得位址：%s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313 msgid "(no URL)" msgstr "(無 URL)" @@ -17987,32 +18619,32 @@ msgstr "(無 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1177 +#: builtin/remote.c:1176 msgid "(not queried)" msgstr "（未查詢）" -#: builtin/remote.c:1179 +#: builtin/remote.c:1178 msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1183 +#: builtin/remote.c:1182 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1194 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" @@ -18020,159 +18652,150 @@ msgstr[0] " 遠端分支：%s" msgstr[1] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1197 builtin/remote.c:1223 msgid " (status not queried)" msgstr "（狀態未查詢）" -#: builtin/remote.c:1207 +#: builtin/remote.c:1206 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:1215 +#: builtin/remote.c:1214 msgid " Local refs will be mirrored by 'git push'" msgstr " 本機引用將在 'git push' 時被鏡像" -#: builtin/remote.c:1221 +#: builtin/remote.c:1220 #, 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:1242 +#: builtin/remote.c:1241 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1244 +#: builtin/remote.c:1243 msgid "delete refs/remotes/<name>/HEAD" msgstr "刪除 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1258 msgid "Cannot determine remote HEAD" msgstr "無法確定遠端 HEAD" -#: builtin/remote.c:1261 +#: builtin/remote.c:1260 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令：" -#: builtin/remote.c:1271 +#: builtin/remote.c:1270 #, c-format msgid "Could not delete %s" msgstr "無法刪除 %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1278 #, c-format msgid "Not a valid ref: %s" msgstr "不是一個有效引用：%s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1280 #, c-format msgid "Could not setup %s" msgstr "不能設定 %s" # 譯者：請維持前導空格 -#: builtin/remote.c:1299 +#: builtin/remote.c:1298 #, c-format msgid " %s will become dangling!" msgstr " %s 將成為懸空狀態！" # 譯者：請維持前導空格 -#: builtin/remote.c:1300 +#: builtin/remote.c:1299 #, c-format msgid " %s has become dangling!" msgstr " %s 已成為懸空狀態！" -#: builtin/remote.c:1310 +#: builtin/remote.c:1309 #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1311 +#: builtin/remote.c:1310 #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1326 #, c-format msgid " * [would prune] %s" msgstr " * [將刪除] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1329 #, c-format msgid " * [pruned] %s" msgstr " * [已刪除] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1374 msgid "prune remotes after fetching" msgstr "抓取後清除遠端" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559 #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" -#: builtin/remote.c:1454 +#: builtin/remote.c:1453 msgid "add branch" msgstr "新增分支" -#: builtin/remote.c:1461 +#: builtin/remote.c:1460 msgid "no remote specified" msgstr "未指定遠端" -#: builtin/remote.c:1478 +#: builtin/remote.c:1477 msgid "query push URLs rather than fetch URLs" msgstr "查詢推送 URL 位址，而非取得 URL 位址" -#: builtin/remote.c:1480 +#: builtin/remote.c:1479 msgid "return all URLs" msgstr "返回所有 URL 位址" -#: builtin/remote.c:1508 +#: builtin/remote.c:1507 #, c-format msgid "no URLs configured for remote '%s'" msgstr "沒有給遠端版本庫 '%s' 設定 URL" -#: builtin/remote.c:1534 +#: builtin/remote.c:1533 msgid "manipulate push URLs" msgstr "動作推送 URLS" -#: builtin/remote.c:1536 +#: builtin/remote.c:1535 msgid "add URL" msgstr "新增 URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1537 msgid "delete URLs" msgstr "刪除 URL" -#: builtin/remote.c:1545 +#: builtin/remote.c:1544 msgid "--add --delete doesn't make sense" msgstr "--add --delete 無意義" -#: builtin/remote.c:1584 +#: builtin/remote.c:1583 #, c-format msgid "Invalid old URL pattern: %s" msgstr "無效的舊 URL 符合範本：%s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1591 #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1593 msgid "Will not delete all non-push URLs" msgstr "將不會刪除所有非推送 URL 位址" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "詳細輸出；必須置於子指令之前" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "未知子指令：%s" - #: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<選項>]" @@ -18189,107 +18812,107 @@ msgstr "" msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:230 builtin/repack.c:409 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" -#: builtin/repack.c:247 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "無法完成 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:285 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" -#: builtin/repack.c:287 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" -#: builtin/repack.c:290 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "刪除多餘的包，執行 git-prune-packed" -#: builtin/repack.c:292 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" -#: builtin/repack.c:294 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" -#: builtin/repack.c:296 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" -#: builtin/repack.c:299 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --local" -#: builtin/repack.c:301 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "寫 bitmap 索引" -#: builtin/repack.c:303 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --delta-islands" -#: builtin/repack.c:304 +#: builtin/repack.c:311 msgid "approxidate" msgstr "近似日期" -#: builtin/repack.c:305 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要將早於提供時間的物件過期" -#: builtin/repack.c:307 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新對無法取得物件打包" -#: builtin/repack.c:309 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "用於增量壓縮的視窗值" -#: builtin/repack.c:310 builtin/repack.c:316 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "位元組" -#: builtin/repack.c:311 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制記憶體大小而非條目數" -#: builtin/repack.c:313 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:315 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "限制最大執行緒數" -#: builtin/repack.c:317 +#: builtin/repack.c:324 msgid "maximum size of each packfile" -msgstr "每個包檔案的最大尺寸" +msgstr "每個 packfile 的最大尺寸" -#: builtin/repack.c:319 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "對標記為 .keep 的包中的物件重新打包" -#: builtin/repack.c:321 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "不要對該包檔案重新打包" -#: builtin/repack.c:331 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的打包檔案" -#: builtin/repack.c:335 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable 和 -A 不相容" -#: builtin/repack.c:418 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "沒有新的要打包。" -#: builtin/repack.c:479 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18305,7 +18928,7 @@ msgstr "" "警告：並且嘗試重新命名改回原有檔案名的動作也失敗。\n" "警告：請手動將 %s 下的這些檔案重新命名：\n" -#: builtin/repack.c:527 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "刪除 '%s' 失敗" @@ -18579,121 +19202,128 @@ msgid "" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<樹或提交>] [--] <路徑>..." +#| 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 --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<樹或提交>] [--] [<路徑>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +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 [<樹或提交>] [--] [<路徑規格>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "混雜" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "軟性" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "硬性" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "合併" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "保持" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "您沒有一個有效的 HEAD。" -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "無法找到 HEAD 指向的樹。" -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "無法找到 %s 指向的樹。" -#: builtin/reset.c:114 +#: builtin/reset.c:115 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 現在位於 %s" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:193 +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 -#: builtin/stash.c:619 +#: builtin/reset.c:294 builtin/stash.c:519 builtin/stash.c:594 +#: builtin/stash.c:618 msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "重設 HEAD 和索引" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "重設 HEAD 但儲存本機變更" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "將刪除的路徑標記為稍後新增" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "無法將 '%s' 解析為一個有效的版本。" -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "無法將 '%s' 解析為一個有效的樹狀物件。" -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 與 --{hard、mixed、soft} 選項不相容" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能帶路徑進行%s重設。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能對純版本庫進行%s重設" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N 只能和 --mixed 同時使用" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "重設後取消暫存的變更：" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -18705,12 +19335,12 @@ msgstr "" "重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n" "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重設索引檔案至版本 '%s'。" -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" @@ -19163,6 +19793,62 @@ 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:61 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" + +#: builtin/sparse-checkout.c:220 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "無法設定 extensions.worktreeConfig 設定" + +#: builtin/sparse-checkout.c:237 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:256 +msgid "initialize the sparse-checkout in cone mode" +msgstr "以 cone 模式初始化稀疏簽出" + +#: builtin/sparse-checkout.c:262 +#| msgid "skip applying sparse checkout filter" +msgid "initialize sparse-checkout" +msgstr "初始化稀疏簽出" + +#: builtin/sparse-checkout.c:295 +#, 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:378 +#| msgid "read updates from stdin" +msgid "read patterns from standard in" +msgstr "從標準輸入讀取樣式" + +#: builtin/sparse-checkout.c:384 +#| msgid "skip applying sparse checkout filter" +msgid "set sparse-checkout patterns" +msgstr "設定稀疏簽出樣式" + +#: builtin/sparse-checkout.c:447 +#| msgid "skip applying sparse checkout filter" +msgid "disable sparse-checkout" +msgstr "停用稀疏簽出" + +#: builtin/sparse-checkout.c:459 +#| msgid "unable to get current working directory" +msgid "error while refreshing working directory" +msgstr "重新整理工作目錄時發生錯誤" + #: builtin/stash.c:22 builtin/stash.c:37 msgid "git stash list [<options>]" msgstr "git stash list [<選項>]" @@ -19227,7 +19913,7 @@ msgstr "'%s' 不像是一個儲藏提交" msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:161 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "未發現儲藏條目。" @@ -19266,51 +19952,51 @@ msgstr "無法從儲藏條目中復原未追蹤檔案" msgid "Merging %s with %s" msgstr "正在合併 %s 和 %s" -#: builtin/stash.c:460 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:522 builtin/stash.c:621 +#: builtin/stash.c:521 builtin/stash.c:620 msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:555 +#: builtin/stash.c:554 #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:558 +#: builtin/stash.c:557 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:583 +#: builtin/stash.c:582 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:633 git-legacy-stash.sh:694 +#: builtin/stash.c:632 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:656 git-legacy-stash.sh:712 +#: builtin/stash.c:655 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:796 builtin/stash.c:833 +#: builtin/stash.c:795 builtin/stash.c:832 #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 +#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:824 +#: builtin/stash.c:823 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1046 git-legacy-stash.sh:217 +#: builtin/stash.c:1045 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "沒有選擇變更" @@ -19326,16 +20012,16 @@ msgstr "無法儲存目前索引狀態" msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1192 builtin/stash.c:1201 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:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1278 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" @@ -19343,15 +20029,15 @@ msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1309 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1316 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1331 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "無法儲存目前狀態" @@ -19360,7 +20046,7 @@ msgstr "無法儲存目前狀態" msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1426 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" @@ -19405,40 +20091,40 @@ msgstr "跳過和移除所有的備註行" msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote 不帶參數" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "無法從 url '%s' 剝離一個元件" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1380 msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "進入 '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19447,7 +20133,7 @@ msgstr "" "對 %s 執行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19457,119 +20143,119 @@ msgstr "" "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "阻止進入每一個子模組指令的輸出" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1053 msgid "Recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <指令>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "阻止子模組初始化的輸出" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:827 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:854 builtin/submodule--helper.c:1023 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:878 builtin/submodule--helper.c:1189 msgid "Suppress submodule status output" msgstr "阻止子模組狀態輸出" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:879 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:880 msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:885 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:909 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:973 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:979 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:993 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1004 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1051 msgid "Suppress output of synchronizing submodule url" msgstr "阻止子模組 url 同步的輸出" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1058 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1112 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -19578,87 +20264,99 @@ msgstr "" "子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm " "-rf' 指令）" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1124 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1132 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1134 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1145 #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1161 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1190 msgid "Remove submodule working trees even if they contain local changes" msgstr "刪除子模組工作區，即使包含本機修改" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1191 msgid "Unregister all submodules" msgstr "將所有子模組取消註冊" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1196 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:1207 +#: builtin/submodule--helper.c:1210 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確實想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1275 +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 "" + +#: builtin/submodule--helper.c:1314 builtin/submodule--helper.c:1317 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1353 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1360 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1383 msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1386 msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1389 msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1397 msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897 msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1402 builtin/submodule--helper.c:1899 +#| msgid "applying to an empty history" +msgid "disallow cloning into non-empty directory" +msgstr "不允許複製至非空白目錄" + +#: builtin/submodule--helper.c:1407 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -19666,142 +20364,153 @@ msgstr "" "git submodule--helper clone [--prefix=<路徑>] [--quiet] [--reference <版本庫" ">] [--name <名字>] [--depth <深度>] --url <url> --path <路徑>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1431 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" + +#: builtin/submodule--helper.c:1442 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1446 +#, c-format +#| msgid "source directory is empty" +msgid "directory not empty: '%s'" +msgstr "目錄不是空的：「%s」" + +#: builtin/submodule--helper.c:1458 #, c-format msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1494 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1498 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1594 #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1598 msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1628 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1657 #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1803 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "複製 '%s' 失敗。按計劃重試" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1814 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次嘗試複製 '%s' 失敗，離開" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1876 builtin/submodule--helper.c:2120 msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1879 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1883 msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1889 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "建立一個指定深度的淺複製" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1892 msgid "parallel jobs" msgstr "並發任務" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1894 msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始複製是否應該遵守推薦的淺複製選項" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1895 msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:1877 +#: builtin/submodule--helper.c:1904 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1917 msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1965 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模組（%s）的分支設定為繼承上級項目的分支，但是上級項目不在任何分支上" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2088 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2121 msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2127 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2183 msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2186 msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2191 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2192 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2193 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2212 git-submodule.sh:173 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 +#: builtin/submodule--helper.c:2262 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2268 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" @@ -20054,214 +20763,216 @@ msgstr "標籤 '%s' 已存在" msgid "Updated tag '%s' (was %s)\n" msgstr "已更新標籤 '%s'（曾為 %s）\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:501 msgid "Unpacking objects" msgstr "展開物件中" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "建立目錄 %s 失敗" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "建立檔案 %s 失敗" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "刪除檔案 %s 失敗" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "刪除目錄 %s 失敗" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' 中測試 mtime " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "新增一個新檔案後，目錄的狀態訊息未改變" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "新增一個新目錄後，目錄的狀態訊息未改變" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "更新一個檔案後，目錄的狀態訊息被修改" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "刪除一個檔案後，目錄的狀態訊息未改變" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "刪除一個目錄後，目錄的狀態訊息未改變" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<選項>] [--] [<檔案>...]" -#: builtin/update-index.c:972 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "當索引需要更新時繼續重新整理" -#: builtin/update-index.c:975 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "重新整理：忽略子模組" -#: builtin/update-index.c:978 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "不忽略新的檔案" -#: builtin/update-index.c:980 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "讓檔案取代目錄（反之亦然）" -#: builtin/update-index.c:982 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "通知檔案從工作區遺失" -#: builtin/update-index.c:984 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "即使索引區包含未合併的條目也執行重新整理" -#: builtin/update-index.c:987 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "重新整理統計訊息" -#: builtin/update-index.c:991 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定" -#: builtin/update-index.c:995 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<物件>,<路徑>" -#: builtin/update-index.c:996 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "新增指定的條目到索引區" -#: builtin/update-index.c:1006 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "把檔案標記為 \"沒有變更\"" -#: builtin/update-index.c:1009 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1012 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "把檔案標記為 \"僅索引\"" -#: builtin/update-index.c:1015 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1018 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "不要建立只有索引的項目" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "只新增到索引區；不新增物件到物件庫" -#: builtin/update-index.c:1020 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "即使存在工作區裡，也刪除路徑" -#: builtin/update-index.c:1022 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "攜帶 --stdin：輸入的行以 null 字元終止" -#: builtin/update-index.c:1024 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "從標準輸入中讀取需要更新的路徑列表" -#: builtin/update-index.c:1028 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "從標準輸入新增條目到索引區" -#: builtin/update-index.c:1032 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "為指定檔案重新生成第2和第3暫存區" -#: builtin/update-index.c:1036 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "只更新與 HEAD 不同的條目" -#: builtin/update-index.c:1040 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "忽略工作區遺失的檔案" -#: builtin/update-index.c:1043 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "在標準輸出顯示動作" -#: builtin/update-index.c:1045 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘記儲存的未解決的衝突" -#: builtin/update-index.c:1049 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "以這種格式寫入索引區" -#: builtin/update-index.c:1051 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "啟用或禁用索引分割" -#: builtin/update-index.c:1053 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "啟用/禁用對未追蹤檔案的快取" -#: builtin/update-index.c:1055 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "測試檔案系統是否支援未追蹤檔案快取" -#: builtin/update-index.c:1057 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取" -#: builtin/update-index.c:1059 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "即使沒有被標記為已更改，也要寫出索引" -#: builtin/update-index.c:1061 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "啟用或禁用檔案系統監控" -#: builtin/update-index.c:1063 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "標記檔案為 fsmonitor 有效" -#: builtin/update-index.c:1066 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1169 +#: builtin/update-index.c:1173 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:1178 +#: 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:1190 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20269,11 +20980,11 @@ msgstr "" "core.untrackedCache 被設定為 true。如果您確實要禁用未追蹤檔案快取，請刪除或修" "改它。" -#: builtin/update-index.c:1194 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "快取未追蹤檔案被禁用" -#: builtin/update-index.c:1202 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20281,25 +20992,25 @@ msgstr "" "core.untrackedCache 被設定為 false。如果您確實要啟用未追蹤檔案快取，請刪除或" "修改它。" -#: builtin/update-index.c:1206 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "快取未追蹤檔案在 '%s' 啟用" -#: builtin/update-index.c:1214 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項" -#: builtin/update-index.c:1218 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "fsmonitor 被啟用" -#: builtin/update-index.c:1221 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已設定；如果想要禁用 fsmonitor 請移除該選項" -#: builtin/update-index.c:1225 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "fsmonitor 被禁用" @@ -20689,16 +21400,21 @@ msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" msgid "only useful for debugging" msgstr "只對除錯有用" -#: fast-import.c:3118 +#: fast-import.c:3125 #, c-format msgid "Expected 'mark' command, got %s" msgstr "預期 'mark' 指令，得到 %s" -#: fast-import.c:3123 +#: fast-import.c:3130 #, c-format msgid "Expected 'to' command, got %s" msgstr "預期 'to' 指令，得到 %s" +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -20832,17 +21548,17 @@ msgstr "到標準輸出的未知寫入錯誤" msgid "close failed on standard output" msgstr "標準輸出關閉失敗" -#: git.c:792 +#: git.c:793 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "檢測到別名循環：'%s'的擴展未終止：%s" -#: git.c:842 +#: git.c:843 #, c-format msgid "cannot handle %s as a builtin" msgstr "不能作為內建指令處理 %s" -#: git.c:855 +#: git.c:856 #, c-format msgid "" "usage: %s\n" @@ -20851,12 +21567,12 @@ msgstr "" "用法：%s\n" "\n" -#: git.c:875 +#: git.c:876 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" -#: git.c:887 +#: git.c:888 #, c-format msgid "failed to run command '%s': %s\n" msgstr "執行指令 '%s' 失敗：%s\n" @@ -20874,30 +21590,30 @@ msgstr "不支援委託控制，因為 cURL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.44.0" -#: http.c:878 +#: http.c:876 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0" -#: http.c:951 +#: http.c:949 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "不支援協定限制，因為 cURL < 7.19.4" -#: http.c:1088 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" -#: http.c:1095 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端構建" -#: http.c:1099 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "無法將 SSL 後端設定為 '%s'：已經設定" -#: http.c:1968 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21025,30 +21741,41 @@ msgstr "參數" msgid "object filtering" msgstr "物件過濾" -#: parse-options.h:179 +#: parse-options.h:183 msgid "expiry-date" msgstr "到期時間" -#: parse-options.h:193 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "空動作（向後相容）" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "更加詳細" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "更加安靜" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位數字顯示 SHA-1 雜湊值" -#: parse-options.h:332 +#: parse-options.h:336 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 字元分隔" + #: ref-filter.h:101 msgid "key" msgstr "key" @@ -21167,7 +21894,7 @@ msgstr "記錄變更到版本庫" #: command-list.h:74 msgid "Write and verify Git commit-graph files" -msgstr "寫入和校驗 Git 提交圖檔案" +msgstr "寫入和驗證 Git 提交圖檔案" #: command-list.h:75 msgid "Create a new commit object" @@ -21383,7 +22110,7 @@ msgstr "顯示三路合併而不動索引" #: command-list.h:128 msgid "Write and verify multi-pack-indexes" -msgstr "寫入和校驗多包索引" +msgstr "寫入和驗證多包索引" #: command-list.h:129 msgid "Creates a tag object" @@ -21555,162 +22282,170 @@ msgid "Common Git shell script setup code" msgstr "常用的 Git shell 腳本設定程式碼" #: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "初始化並修改稀疏簽出" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "儲藏髒工作區中的修改" -#: command-list.h:172 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "將檔案內容新增到索引" -#: command-list.h:173 +#: command-list.h:174 msgid "Show the working tree status" msgstr "顯示工作區狀態" -#: command-list.h:174 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "刪除不必要的空白字元" -#: command-list.h:175 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或檢查子模組" -#: command-list.h:176 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subversion 版本庫和 Git 之間的雙向動作" -#: command-list.h:177 +#: command-list.h:178 msgid "Switch branches" msgstr "切換分支" -#: command-list.h:178 +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "讀取、修改和刪除符號引用" -#: command-list.h:179 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "建立、列出、刪除或校驗一個 GPG 簽名的標籤物件" +msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件" -#: command-list.h:180 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob 資料物件的內容建立一個暫存檔" -#: command-list.h:181 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "從打包檔案中解壓縮物件" -#: command-list.h:182 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "將工作區的檔案內容註冊到索引" -#: command-list.h:183 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "安全地更新儲存於引用中的物件名稱" -#: command-list.h:184 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "更新輔助訊息檔案以協助啞協定服務" -#: command-list.h:185 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "將存檔傳送回 git-archive" -#: command-list.h:186 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "將物件壓縮包傳送回 git-fetch-pack" -#: command-list.h:187 +#: command-list.h:188 msgid "Show a Git logical variable" -msgstr "顯示一個 Git 邏輯變數" +msgstr "顯示 Git 邏輯變數" -#: command-list.h:188 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "檢查 GPG 提交簽名" -#: command-list.h:189 +#: command-list.h:190 msgid "Validate packed Git archive files" -msgstr "校驗打包的Git存倉檔案" +msgstr "驗證打包的 Git 封存檔案" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "檢查標籤的 GPG 簽名" -#: command-list.h:191 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 介面（Git 版本庫的 web 前端）" -#: command-list.h:192 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "顯示每一個提交引入的差異日誌" -#: command-list.h:193 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "管理多個工作區" -#: command-list.h:194 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "從目前索引建立一個樹狀物件" -#: command-list.h:195 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "定義路徑的屬性" -#: command-list.h:196 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Git 指令列介面和約定" -#: command-list.h:197 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "面向開發人員的 Git 核心教學" -#: command-list.h:198 +#: command-list.h:199 msgid "Git for CVS users" msgstr "適合 CVS 使用者的 Git 協助" -#: command-list.h:199 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "調整差異輸出" -#: command-list.h:200 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一組有用的最小指令集合" -#: command-list.h:201 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Git 詞彙表" -#: command-list.h:202 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Git 使用的掛鉤" -#: command-list.h:203 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未追蹤檔案" -#: command-list.h:204 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "定義子模組屬性" -#: command-list.h:205 +#: command-list.h:206 msgid "Git namespaces" msgstr "Git 名字空間" -#: command-list.h:206 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Git 版本庫配置" -#: command-list.h:207 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本範圍" -#: command-list.h:208 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "在某個版本庫掛載某個版本庫" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "一個 Git 教學：第二部分" -#: command-list.h:209 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "一個 Git 教學" -#: command-list.h:210 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Git 推薦的工作流概覽" @@ -21836,113 +22571,113 @@ msgstr "嘗試和 $pretty_name 的簡單合併" msgid "Simple merge did not work, trying automatic merge." msgstr "簡單合併未生效，嘗試自動合併。" -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "無法刪除暫時索引（不應發生）" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "無法用 $w_commit 更新 $ref_stash" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "錯誤：'stash push' 的未知選項：$option" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "儲存工作目錄和索引狀態 $stash_msg" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "未知選項: $opt" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本：$REV" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference 不是一個有效的引用" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' 不是儲藏式提交" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' 不是一個儲藏引用" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "無法重新整理索引" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "無法在合併過程套用儲藏" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "索引中有衝突。嘗試不使用 --index。" -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "不能儲存索引樹" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "無法從儲藏條目中復原未追蹤檔案" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "無法將修改的檔案取消暫存" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "捨棄了 ${REV} ($s)" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}：無法捨棄儲藏條目" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "（為復原資料輸入 \"git stash apply\"）" -#: git-submodule.sh:200 +#: git-submodule.sh:202 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作區的頂級目錄中使用相對路徑" -#: git-submodule.sh:210 +#: git-submodule.sh:212 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始" -#: git-submodule.sh:229 +#: git-submodule.sh:231 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已經存在於索引中" -#: git-submodule.sh:232 +#: git-submodule.sh:234 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' 已經存在於索引中且不是一個子模組" -#: git-submodule.sh:239 +#: git-submodule.sh:241 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' 沒有簽出的提交" -#: git-submodule.sh:245 +#: git-submodule.sh:247 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -21953,22 +22688,22 @@ msgstr "" "$sm_path\n" "如果您確實想新增它，使用 -f 參數。" -#: git-submodule.sh:268 +#: git-submodule.sh:270 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "新增位於 '$sm_path' 的現存版本庫到索引" -#: git-submodule.sh:270 +#: git-submodule.sh:272 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫" -#: git-submodule.sh:278 +#: git-submodule.sh:280 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫：" -#: git-submodule.sh:280 +#: git-submodule.sh:282 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -21983,126 +22718,125 @@ msgstr "" "使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" "或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。" -#: git-submodule.sh:286 +#: git-submodule.sh:288 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "啟動本機 git 目錄到子模組 '$sm_name'。" -#: git-submodule.sh:298 +#: git-submodule.sh:300 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能簽出子模組 '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:305 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "無法新增子模組 '$sm_path'" -#: git-submodule.sh:312 +#: git-submodule.sh:314 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "無法註冊子模組 '$sm_path'" -#: git-submodule.sh:573 +#: git-submodule.sh:580 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本" -#: git-submodule.sh:583 +#: git-submodule.sh:590 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "無法在子模組路徑 '$sm_path' 中取得" -#: git-submodule.sh:588 +#: git-submodule.sh:595 #, 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:606 +#: git-submodule.sh:613 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " "$sha1:" msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1：" -#: git-submodule.sh:612 +#: git-submodule.sh:619 #, 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:619 +#: git-submodule.sh:626 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'" -#: git-submodule.sh:620 +#: git-submodule.sh:627 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:631 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'" -#: git-submodule.sh:625 +#: git-submodule.sh:632 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:637 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中" -#: git-submodule.sh:631 +#: git-submodule.sh:638 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:643 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗" -#: git-submodule.sh:637 +#: git-submodule.sh:644 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "子模組 '$displaypath'：'$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:675 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "無法遞迴進子模組路徑 '$displaypath'" -#: git-submodule.sh:830 +#: git-submodule.sh:886 msgid "The --cached option cannot be used with the --files option" msgstr "選項 --cached 不能和選項 --files 同時使用" -#: git-submodule.sh:882 +#: git-submodule.sh:938 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 譯者：請維持前導空格 -#: git-submodule.sh:902 +#: git-submodule.sh:958 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " 警告：$display_name 未包含提交 $sha1_src" # 譯者：請維持前導空格 -#: git-submodule.sh:905 +#: git-submodule.sh:961 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_dst" # 譯者：請維持前導空格 -#: git-submodule.sh:908 +#: git-submodule.sh:964 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst" @@ -22377,8 +23111,7 @@ 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." @@ -22475,122 +23208,56 @@ msgid "Unable to determine absolute path of git directory" msgstr "不能確定 git 目錄的絕對路徑" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "快取" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "未快取" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "二進位" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "無" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "沒有修改" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "增加了 %d 個路徑\n" -msgstr[1] "增加了 %d 個路徑\n" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "更新了 %d 個路徑\n" -msgstr[1] "更新了 %d 個路徑\n" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "還原了 %d 個路徑\n" -msgstr[1] "還原了 %d 個路徑\n" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "建立了 %d 個路徑\n" msgstr[1] "建立了 %d 個路徑\n" -#: git-add--interactive.perl:641 -msgid "Update" -msgstr "更新" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "還原" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "說明：%s 現已成為未追蹤的。\n" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "新增未追蹤的" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "沒有未追蹤的檔案。\n" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。" -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。" -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。" -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。" -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。" -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "為寫入開啟區塊編輯檔案失敗：%s" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -22603,33 +23270,12 @@ msgstr "" "要刪除 '%s' 開始的行，刪除它們。\n" "以 %s 開始的行將被刪除。\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1124 -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" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n" -"此次編輯被終止，此區塊不會被修改。\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "無法讀取區塊編輯檔案：%s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? " - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -22643,7 +23289,7 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -22657,7 +23303,7 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -22671,7 +23317,7 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -22685,7 +23331,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -22699,7 +23345,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -22713,7 +23359,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -22727,7 +23373,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -22741,7 +23387,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -22763,226 +23409,198 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "選中的區塊不能套用到索引！\n" -#: git-add--interactive.perl:1341 +#: git-add--interactive.perl:1343 msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？" -#: git-add--interactive.perl:1344 +#: git-add--interactive.perl:1346 msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "只有二進位檔案被修改。\n" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "沒有修改。\n" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "修補檔更新" - -#: git-add--interactive.perl:1426 +#: 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:1427 +#: 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:1428 +#: 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:1431 +#: 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:1432 +#: 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:1433 +#: 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:1436 +#: 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:1437 +#: 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:1438 +#: 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:1441 +#: 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:1442 +#: 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:1443 +#: 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:1446 git-add--interactive.perl:1461 +#: 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:1447 git-add--interactive.perl:1462 +#: 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:1448 git-add--interactive.perl:1463 +#: 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:1451 +#: 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:1452 +#: 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:1453 +#: 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:1456 +#: 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:1457 +#: 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:1458 +#: 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:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "沒有其它可供跳轉的區塊\n" -#: git-add--interactive.perl:1575 -msgid "go to which hunk (<ret> to see more)? " -msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ " - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "跳轉到哪個區塊？" - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "無效數字：'%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, perl-format 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:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "沒有其它可供尋找的區塊\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "使用正規表示式搜尋？" - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "錯誤的正規表示式 %s：%s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "沒有和提供模式相符合的區塊\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "沒有前一個區塊\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "沒有下一個區塊\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "對不起，不能分割這個區塊\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, perl-format 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:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "對不起，不能編輯這個區塊\n" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "檢視 diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -22999,19 +23617,19 @@ msgstr "" "diff - 顯示 HEAD 和索引間差異\n" "add untracked - 新增未追蹤檔案的內容至暫存列表\n" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "缺少 --" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" @@ -23367,3 +23985,16 @@ 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 <物件目錄>]" |