diff options
| author |   Jiang Xin <worldhello.net@gmail.com> | 2022-06-26 13:54:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-06-26 13:54:26 +0800 |
| commit | e7022fcdb53db04cf6f40cbb4db4d0df59c05abf (patch) | |
| tree | c5f3d3dda9f93e31cea40e0494308df907d634ac | |
| parent | Merge branch 'master' of github.com:vnwildman/git (diff) | |
| parent | l10n: zh_TW: v2.37.0 round 1 (diff) | |
| download | git-e7022fcdb53db04cf6f40cbb4db4d0df59c05abf.tar.xz git-e7022fcdb53db04cf6f40cbb4db4d0df59c05abf.zip | |
Merge branch 'l10n/zh_TW/220623' of github.com:l10n-tw/git-po
* 'l10n/zh_TW/220623' of github.com:l10n-tw/git-po:
l10n: zh_TW: v2.37.0 round 1
| -rw-r--r-- | po/zh_TW.po | 26951 |
1 files changed, 12996 insertions, 13955 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po index caf60573321..2f7d01c3031 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2022-04-13 14:52+0800\n" -"PO-Revision-Date: 2022-04-14 08:04+0800\n" +"POT-Creation-Date: 2022-06-23 21:13+0800\n" +"PO-Revision-Date: 2022-06-23 23:02+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-" "po/git-cli/zh_Hant/>\n" @@ -32,244 +32,234 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" -#: add-interactive.c:382 +#: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c:535 add-interactive.c:836 reset.c:136 sequencer.c:3505 -#: sequencer.c:3970 sequencer.c:4127 builtin/rebase.c:1261 -#: builtin/rebase.c:1671 +#: add-interactive.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" -#: add-interactive.c:590 git-add--interactive.perl:269 -#: git-add--interactive.perl:294 +#: add-interactive.c git-add--interactive.perl msgid "binary" msgstr "二進位" -#: add-interactive.c:648 git-add--interactive.perl:278 -#: git-add--interactive.perl:332 +#: add-interactive.c git-add--interactive.perl msgid "nothing" msgstr "無" -#: add-interactive.c:649 git-add--interactive.perl:314 -#: git-add--interactive.perl:329 +#: add-interactive.c git-add--interactive.perl msgid "unchanged" msgstr "未變更" -#: add-interactive.c:686 git-add--interactive.perl:641 +#: add-interactive.c git-add--interactive.perl msgid "Update" msgstr "更新" -#: add-interactive.c:703 add-interactive.c:891 +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c:709 add-interactive.c:898 reset.c:160 sequencer.c:3709 +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "無法寫入索引" -#: add-interactive.c:712 git-add--interactive.perl:626 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "已更新 %d 個路徑\n" -#: add-interactive.c:730 git-add--interactive.perl:676 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "注意：%s 現已不再追蹤。\n" -#: add-interactive.c:735 apply.c:4133 builtin/checkout.c:311 -#: builtin/reset.c:167 +#: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "「%s」路徑執行 make_cache_entry 失敗" -#: add-interactive.c:765 git-add--interactive.perl:653 +#: add-interactive.c git-add--interactive.perl msgid "Revert" msgstr "還原" -#: add-interactive.c:781 +#: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{樹}" -#: add-interactive.c:819 git-add--interactive.perl:629 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "還原了 %d 個路徑\n" -#: add-interactive.c:870 git-add--interactive.perl:693 +#: add-interactive.c git-add--interactive.perl #, c-format msgid "No untracked files.\n" msgstr "沒有未追蹤的檔案。\n" -#: add-interactive.c:874 git-add--interactive.perl:687 +#: add-interactive.c git-add--interactive.perl msgid "Add untracked" msgstr "新增未追蹤的" -#: add-interactive.c:901 git-add--interactive.perl:623 +#: add-interactive.c git-add--interactive.perl #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 個路徑\n" -#: add-interactive.c:931 +#: add-interactive.c #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合併：%s" -#: add-interactive.c:943 add-patch.c:1758 git-add--interactive.perl:1371 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "Only binary files changed.\n" msgstr "只有二進位檔案被修改。\n" -#: add-interactive.c:945 add-patch.c:1756 git-add--interactive.perl:1373 +#: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "No changes.\n" msgstr "沒有修改。\n" -#: add-interactive.c:949 git-add--interactive.perl:1381 +#: add-interactive.c git-add--interactive.perl msgid "Patch update" msgstr "修補檔更新" -#: add-interactive.c:988 git-add--interactive.perl:1794 +#: add-interactive.c git-add--interactive.perl msgid "Review diff" msgstr "檢視 diff" -#: add-interactive.c:1016 +#: add-interactive.c msgid "show paths with changes" msgstr "顯示有變更的路徑" -#: add-interactive.c:1018 +#: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "加入工作區狀態至暫存列表" -#: add-interactive.c:1020 +#: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "還原修改的暫存集至 HEAD 版本" -#: add-interactive.c:1022 +#: add-interactive.c msgid "pick hunks and update selectively" msgstr "挑選區塊並選擇性更新" -#: add-interactive.c:1024 +#: add-interactive.c msgid "view diff between HEAD and index" msgstr "檢視 HEAD 及索引之間的差異" -#: add-interactive.c:1026 +#: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "加入未追蹤檔案的內容至暫存列表" -#: add-interactive.c:1034 add-interactive.c:1083 +#: add-interactive.c msgid "Prompt help:" msgstr "提示說明：" -#: add-interactive.c:1036 +#: add-interactive.c msgid "select a single item" msgstr "選擇單一項目" -#: add-interactive.c:1038 +#: add-interactive.c msgid "select a range of items" msgstr "選擇項目範圍" -#: add-interactive.c:1040 +#: add-interactive.c msgid "select multiple ranges" msgstr "選擇多個範圍" -#: add-interactive.c:1042 add-interactive.c:1087 +#: add-interactive.c msgid "select item based on unique prefix" msgstr "基於唯一前綴選擇項目" -#: add-interactive.c:1044 +#: add-interactive.c msgid "unselect specified items" msgstr "取消選擇指定項目" -#: add-interactive.c:1046 +#: add-interactive.c msgid "choose all items" msgstr "選擇所有項目" -#: add-interactive.c:1048 +#: add-interactive.c msgid "(empty) finish selecting" msgstr "（空）完成選取" -#: add-interactive.c:1085 +#: add-interactive.c msgid "select a numbered item" msgstr "選擇編號過的項目" -#: add-interactive.c:1089 +#: add-interactive.c msgid "(empty) select nothing" msgstr "（空）全不選取" -#: add-interactive.c:1097 builtin/clean.c:839 git-add--interactive.perl:1898 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "*** Commands ***" msgstr "*** 指令 ***" -#: add-interactive.c:1098 builtin/clean.c:840 git-add--interactive.perl:1895 +#: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "What now" msgstr "請選擇" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "staged" msgstr "快取" -#: add-interactive.c:1150 git-add--interactive.perl:213 +#: add-interactive.c git-add--interactive.perl msgid "unstaged" msgstr "未快取" -#: add-interactive.c:1150 apply.c:5002 apply.c:5005 builtin/am.c:2370 -#: builtin/am.c:2373 builtin/bugreport.c:107 builtin/clone.c:132 -#: builtin/fetch.c:154 builtin/merge.c:287 builtin/pull.c:194 -#: builtin/submodule--helper.c:412 builtin/submodule--helper.c:1872 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:2709 -#: builtin/submodule--helper.c:2712 builtin/submodule--helper.c:2891 -#: git-add--interactive.perl:213 +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/fetch.c builtin/merge.c builtin/pull.c builtin/submodule--helper.c +#: git-add--interactive.perl msgid "path" msgstr "路徑" -#: add-interactive.c:1157 +#: add-interactive.c msgid "could not refresh index" msgstr "無法重新整理索引" -#: add-interactive.c:1171 builtin/clean.c:804 git-add--interactive.perl:1805 +#: add-interactive.c builtin/clean.c git-add--interactive.perl #, c-format msgid "Bye.\n" msgstr "再見。\n" -#: add-patch.c:34 git-add--interactive.perl:1433 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暫存模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:35 git-add--interactive.perl:1434 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:36 git-add--interactive.perl:1435 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:37 git-add--interactive.perl:1436 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:39 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" -#: add-patch.c:42 +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -283,33 +273,33 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:56 git-add--interactive.perl:1439 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:57 git-add--interactive.perl:1440 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:58 git-add--interactive.perl:1441 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "儲藏新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:59 git-add--interactive.perl:1442 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:61 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" -#: add-patch.c:64 +#: add-patch.c msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -323,33 +313,33 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:80 git-add--interactive.perl:1445 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:81 git-add--interactive.perl:1446 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:82 git-add--interactive.perl:1447 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暫存新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:83 git-add--interactive.perl:1448 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:85 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" -#: add-patch.c:88 +#: add-patch.c msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -363,33 +353,33 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:103 git-add--interactive.perl:1451 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:104 git-add--interactive.perl:1452 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:105 git-add--interactive.perl:1453 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "套用新增變更至索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:106 git-add--interactive.perl:1454 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? " -#: add-patch.c:108 add-patch.c:176 add-patch.c:221 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" -#: add-patch.c:111 +#: add-patch.c msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -403,37 +393,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:126 git-add--interactive.perl:1457 -#: git-add--interactive.perl:1475 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:127 git-add--interactive.perl:1458 -#: git-add--interactive.perl:1476 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:128 git-add--interactive.perl:1459 -#: git-add--interactive.perl:1477 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "放棄工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:129 git-add--interactive.perl:1460 -#: git-add--interactive.perl:1478 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:131 add-patch.c:154 add-patch.c:199 +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c:134 add-patch.c:202 +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -447,27 +433,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? " -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "放棄索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? " -#: add-patch.c:157 +#: add-patch.c msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -481,27 +467,27 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "套用索引及工作目錄的新增變更 [y,n,q,a,d%s,?]? " -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472 +#: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? " -#: add-patch.c:179 +#: add-patch.c msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -515,7 +501,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:224 +#: add-patch.c msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -529,34 +515,34 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c:343 +#: add-patch.c #, c-format msgid "could not parse hunk header '%.*s'" msgstr "無法解析區塊標頭 '%.*s'" -#: add-patch.c:362 add-patch.c:366 +#: add-patch.c #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "無法解析上色過的區塊標頭 '%.*s'" -#: add-patch.c:431 +#: add-patch.c msgid "could not parse diff" msgstr "無法解析差異 (diff)" -#: add-patch.c:450 +#: add-patch.c msgid "could not parse colored diff" msgstr "無法解析上色過的差異 (diff)" -#: add-patch.c:464 +#: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "無法執行 '%s'" -#: add-patch.c:618 +#: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的輸出不符" -#: add-patch.c:619 +#: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." @@ -564,7 +550,7 @@ msgstr "" "您的過濾器必須在其輸入及輸出行\n" "維持一對一的對應關係。" -#: add-patch.c:797 +#: add-patch.c #, c-format msgid "" "expected context line #%d in\n" @@ -573,7 +559,7 @@ msgstr "" "應有上下文行 #%d 於\n" "%.*s" -#: add-patch.c:812 +#: add-patch.c #, c-format msgid "" "hunks do not overlap:\n" @@ -586,11 +572,11 @@ msgstr "" "\t不以下述結尾：\n" "%.*s" -#: add-patch.c:1088 git-add--interactive.perl:1115 +#: add-patch.c git-add--interactive.perl msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n" -#: add-patch.c:1092 +#: add-patch.c #, c-format msgid "" "---\n" @@ -604,7 +590,7 @@ msgstr "" "以 %c 開始的行將被刪除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: add-patch.c:1106 git-add--interactive.perl:1129 +#: add-patch.c git-add--interactive.perl 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" @@ -614,11 +600,11 @@ msgstr "" "若刪掉此區塊的全部內容，則會中止\n" "本次編輯，區塊則不會被修改。\n" -#: add-patch.c:1139 +#: add-patch.c msgid "could not parse hunk header" msgstr "無法解析區塊標頭" -#: add-patch.c:1184 +#: add-patch.c msgid "'git apply --cached' failed" msgstr "「git apply --cached」失敗" @@ -634,24 +620,24 @@ msgstr "「git apply --cached」失敗" #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. -#: add-patch.c:1253 git-add--interactive.perl:1244 +#: add-patch.c git-add--interactive.perl msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "未套用編輯區塊。是否重新編輯（輸入 “no” 捨棄！） [y/n]? " -#: add-patch.c:1296 +#: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "選取的區塊不會套用進索引！" -#: add-patch.c:1297 git-add--interactive.perl:1348 +#: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " msgstr "無論如何都要套用到工作區嗎？ " -#: add-patch.c:1304 git-add--interactive.perl:1351 +#: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" msgstr "未套用。\n" -#: add-patch.c:1361 +#: add-patch.c msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" @@ -673,72 +659,72 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: add-patch.c:1523 add-patch.c:1533 +#: add-patch.c msgid "No previous hunk" msgstr "沒有上一個區塊" -#: add-patch.c:1528 add-patch.c:1538 +#: add-patch.c msgid "No next hunk" msgstr "沒有下一個區塊" -#: add-patch.c:1544 +#: add-patch.c msgid "No other hunks to goto" msgstr "沒有其它可供跳轉的區塊" -#: add-patch.c:1555 git-add--interactive.perl:1608 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk (<ret> to see more)? " msgstr "要跳轉到哪個區塊（<Enter> 檢視更多）？ " -#: add-patch.c:1556 git-add--interactive.perl:1610 +#: add-patch.c git-add--interactive.perl msgid "go to which hunk? " msgstr "跳轉到哪個區塊？ " -#: add-patch.c:1567 +#: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "無效數字：'%s'" -#: add-patch.c:1572 +#: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "對不起，只有 %d 個可用區塊。" -#: add-patch.c:1581 +#: add-patch.c msgid "No other hunks to search" msgstr "沒有其它可供尋找的區塊" -#: add-patch.c:1587 git-add--interactive.perl:1663 +#: add-patch.c git-add--interactive.perl msgid "search for regex? " msgstr "使用常規表示式搜尋？ " -#: add-patch.c:1602 +#: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "錯誤的常規表示式 %s：%s" -#: add-patch.c:1619 +#: add-patch.c msgid "No hunk matches the given pattern" msgstr "沒有和提供模式相符合的區塊" -#: add-patch.c:1626 +#: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "對不起，不能分割這個區塊" -#: add-patch.c:1630 +#: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "分割為 %d 個區塊。" -#: add-patch.c:1634 +#: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "對不起，不能編輯這個區塊" -#: add-patch.c:1686 +#: add-patch.c msgid "'git apply' failed" msgstr "'git apply' 失敗" -#: advice.c:81 +#: advice.c #, c-format msgid "" "\n" @@ -747,37 +733,37 @@ msgstr "" "\n" "請使用「git config advice.%s false」來停用此訊息" -#: advice.c:97 +#: advice.c #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" -#: advice.c:181 +#: advice.c msgid "Cherry-picking is not possible because you have unmerged files." msgstr "無法揀選，因為您有未合併的檔案。" -#: advice.c:183 +#: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "無法提交，因為您有未合併的檔案。" -#: advice.c:185 +#: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "無法合併，因為您有未合併的檔案。" -#: advice.c:187 +#: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "無法拉取，因為您有未合併的檔案。" -#: advice.c:189 +#: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "無法還原提交，因為您有未合併的檔案。" -#: advice.c:191 +#: advice.c #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "無法 %s，因為您有未合併的檔案。" -#: advice.c:199 +#: advice.c 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." @@ -785,27 +771,27 @@ msgstr "" "請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n" "解決方案並提交。" -#: advice.c:207 +#: advice.c msgid "Exiting because of an unresolved conflict." msgstr "因為存在未解決的衝突而離開。" -#: advice.c:212 builtin/merge.c:1388 +#: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。" -#: advice.c:214 +#: advice.c msgid "Please, commit your changes before merging." msgstr "請在合併前先提交您的修改。" -#: advice.c:215 +#: advice.c msgid "Exiting because of unfinished merge." msgstr "因為存在未完成的合併而離開。" -#: advice.c:220 +#: advice.c msgid "Not possible to fast-forward, aborting." msgstr "無法快轉，終止。" -#: advice.c:230 +#: advice.c #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" @@ -816,7 +802,7 @@ msgstr "" "符合稀疏簽出定義外且存在的路徑，\n" "所以不會在索引中更新：\n" -#: advice.c:237 +#: advice.c msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" @@ -826,7 +812,7 @@ msgstr "" "* 使用 --sparse 選項。\n" "* 停用或修改稀疏規則。" -#: advice.c:245 +#: advice.c #, c-format msgid "" "Note: switching to '%s'.\n" @@ -866,101 +852,87 @@ msgstr "" "將組態變數 advice.detachedHead 設定為 false，即可關閉本建議\n" "\n" -#: alias.c:50 +#: alias.c msgid "cmdline ends with \\" msgstr "指令列以 \\ 結尾" -#: alias.c:51 +#: alias.c msgid "unclosed quote" msgstr "未閉合的引號" -#: apply.c:70 +#: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "無法識別的空白字元選項 '%s'" -#: apply.c:86 +#: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "無法識別的空白字元忽略選項 '%s'" -#: apply.c:138 archive.c:584 parse-options.c:1122 range-diff.c:555 -#: revision.c:2314 revision.c:2318 revision.c:2327 revision.c:2332 -#: revision.c:2560 revision.c:2895 revision.c:2899 revision.c:2907 -#: revision.c:2910 revision.c:2912 builtin/add.c:507 builtin/add.c:509 -#: builtin/add.c:515 builtin/add.c:527 builtin/branch.c:755 -#: builtin/checkout.c:472 builtin/checkout.c:475 builtin/checkout.c:1663 -#: builtin/checkout.c:1773 builtin/checkout.c:1776 builtin/clone.c:921 -#: builtin/commit.c:359 builtin/commit.c:362 builtin/commit.c:1200 -#: builtin/commit.c:1256 builtin/commit.c:1273 builtin/describe.c:593 -#: builtin/diff-tree.c:155 builtin/difftool.c:733 builtin/fast-export.c:1245 -#: builtin/fetch.c:2141 builtin/fetch.c:2162 builtin/fetch.c:2167 -#: builtin/help.c:602 builtin/index-pack.c:1858 builtin/init-db.c:560 -#: builtin/log.c:1968 builtin/log.c:1970 builtin/ls-files.c:778 -#: builtin/merge-base.c:163 builtin/merge-base.c:169 builtin/merge.c:1409 -#: builtin/merge.c:1411 builtin/pack-objects.c:4098 builtin/push.c:592 -#: builtin/push.c:630 builtin/push.c:636 builtin/push.c:641 -#: builtin/rebase.c:1221 builtin/rebase.c:1223 builtin/rebase.c:1227 -#: builtin/repack.c:688 builtin/repack.c:719 builtin/reset.c:433 -#: builtin/reset.c:469 builtin/rev-list.c:537 builtin/show-branch.c:711 -#: builtin/stash.c:1696 builtin/stash.c:1699 builtin/submodule--helper.c:1328 -#: builtin/submodule--helper.c:3054 builtin/tag.c:527 builtin/tag.c:573 -#: builtin/worktree.c:779 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c +#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c +#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c +#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c +#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c +#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c +#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c +#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "不能同時使用 '%s' 和 '%s' 選項" -#: apply.c:141 apply.c:152 apply.c:155 +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "'%s' 在版本庫之外" -#: apply.c:807 +#: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "無法準備時間戳常規表示式 %s" -#: apply.c:816 +#: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，輸入為：%s" -#: apply.c:890 +#: apply.c #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在修補檔的第 %d 行找到檔案名" -#: apply.c:928 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s" -#: apply.c:934 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案名不一致" -#: apply.c:935 +#: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案名不一致" -#: apply.c:940 +#: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null" -#: apply.c:969 +#: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含無效檔案模式：%s" -#: apply.c:1288 +#: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的檔案頭，%d 行和 %d 行" -#: apply.c:1378 +#: apply.c #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -970,91 +942,91 @@ msgid_plural "" "components (line %d)" msgstr[0] "當移除 %d 個前導路徑後 git diff 頭缺乏檔案名訊息（第 %d 行）" -#: apply.c:1391 +#: apply.c #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的標頭訊息中缺乏檔案名訊息（第 %d 行）" -#: apply.c:1487 +#: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: apply.c:1556 +#: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的修補檔區塊沒有標頭訊息：%.*s" -#: apply.c:1759 +#: apply.c msgid "new file depends on old contents" msgstr "新檔案依賴舊內容" -#: apply.c:1761 +#: apply.c msgid "deleted file still has contents" msgstr "刪除的檔案仍有內容" -#: apply.c:1795 +#: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "修補檔在第 %d 行發現損壞" -#: apply.c:1832 +#: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "新檔案 %s 依賴舊內容" -#: apply.c:1834 +#: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "刪除的檔案 %s 仍有內容" -#: apply.c:1837 +#: apply.c #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：檔案 %s 成為空檔案但並未刪除" -#: apply.c:1985 +#: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二進位修補檔在第 %d 行損壞：%.*s" -#: apply.c:2022 +#: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "無法識別的二進位修補檔位於第 %d 行" -#: apply.c:2184 +#: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "修補檔案的第 %d 行只有垃圾資料" -#: apply.c:2270 +#: apply.c #, c-format msgid "unable to read symlink %s" msgstr "無法讀取符號連結 %s" -#: apply.c:2274 +#: apply.c #, c-format msgid "unable to open or read %s" msgstr "不能開啟或讀取 %s" -#: apply.c:2943 +#: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "無效的行首字元：'%c'" -#: apply.c:3064 +#: apply.c #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。" -#: apply.c:3076 +#: apply.c #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔區塊" -#: apply.c:3082 +#: apply.c #, c-format msgid "" "while searching for:\n" @@ -1063,641 +1035,646 @@ msgstr "" "當查詢：\n" "%.*s" -#: apply.c:3104 +#: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "缺少 '%s' 的二進位修補檔資料" -#: apply.c:3112 +#: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向套用一個缺少到 '%s' 的反向資料區塊的二進位修補檔" -#: apply.c:3159 +#: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上套用沒有完整索引行的二進位修補檔" -#: apply.c:3170 +#: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "修補檔套用到 '%s'（%s），但是和目前內容不符合。" -#: apply.c:3178 +#: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "修補檔套用到空檔案 '%s'，但其並非空檔案" -#: apply.c:3196 +#: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "無法讀取 '%2$s' 必需的目標檔案 %1$s" -#: apply.c:3209 +#: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "二進位修補檔未套用到 '%s'" -#: apply.c:3216 +#: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二進位修補檔產生了不正確的結果（應為 %s，卻為 %s）" -#: apply.c:3237 +#: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "打修補檔失敗：%s:%ld" -#: apply.c:3360 +#: apply.c #, c-format msgid "cannot checkout %s" msgstr "不能簽出 %s" -#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:105 pack-revindex.c:214 -#: setup.c:310 +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" -#: apply.c:3420 +#: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "讀取位於符號連結中的 '%s'" -#: apply.c:3449 apply.c:3721 +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已經被重新命名/刪除" -#: apply.c:3559 apply.c:3736 +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在於索引中" -#: apply.c:3568 apply.c:3744 apply.c:3960 +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：和索引不符合" -#: apply.c:3605 +#: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "版本庫缺少用來進行三方合併所需要的資料物件。" -#: apply.c:3608 +#: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "正在進行三方合併⋯⋯\n" -#: apply.c:3624 apply.c:3628 +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取 '%s' 的目前內容" -#: apply.c:3640 +#: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "無法進行三方合併⋯⋯\n" -#: apply.c:3654 +#: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "套用修補檔到 '%s' 存在衝突。\n" -#: apply.c:3659 +#: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功套用修補檔到 '%s'。\n" -#: apply.c:3676 +#: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "回復至直接套用模式⋯⋯\n" -#: apply.c:3688 +#: apply.c msgid "removal patch leaves file contents" msgstr "移除修補檔仍留下了檔案內容" -#: apply.c:3761 +#: apply.c #, c-format msgid "%s: wrong type" msgstr "%s：錯誤類型" -#: apply.c:3763 +#: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，應為 %o" -#: apply.c:3900 apply.c:3902 read-cache.c:903 read-cache.c:932 -#: read-cache.c:1399 +#: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "無效路徑 '%s'" -#: apply.c:3958 +#: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s：已經存在於索引中" -#: apply.c:3962 +#: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s：已經存在於工作區中" -#: apply.c:3982 +#: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合" -#: apply.c:3987 +#: apply.c #, 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:4007 +#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案 '%s' 位於符號連結中" -#: apply.c:4011 +#: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s：修補檔未套用" -#: apply.c:4026 +#: apply.c #, c-format msgid "Checking patch %s..." msgstr "正在檢查修補檔 %s..." -#: apply.c:4118 +#: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模組 %s 的 sha1 訊息缺少或無效" -#: apply.c:4125 +#: apply.c #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式變更，但它不在目前 HEAD 中" -#: apply.c:4128 +#: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 訊息缺少或無效（%s）。" -#: apply.c:4137 +#: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "不能在暫時索引中新增 %s" -#: apply.c:4147 +#: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "不能把暫時索引寫入到 %s" -#: apply.c:4285 +#: apply.c #, c-format msgid "unable to remove %s from index" msgstr "不能從索引中移除 %s" -#: apply.c:4319 +#: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "子模組 %s 損壞的修補檔" -#: apply.c:4325 +#: apply.c #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能對建立檔案 '%s' 呼叫 stat" -#: apply.c:4333 +#: apply.c #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能為建立檔案 %s 建立後端儲存" -#: apply.c:4339 apply.c:4484 +#: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 新增快取條目" -#: apply.c:4382 builtin/bisect--helper.c:540 builtin/gc.c:2258 -#: builtin/gc.c:2293 +#: apply.c builtin/bisect--helper.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "寫入 '%s' 失敗" -#: apply.c:4386 +#: apply.c #, c-format msgid "closing file '%s'" msgstr "關閉檔案 '%s'" -#: apply.c:4456 +#: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能寫入檔案 '%s' 權限 %o" -#: apply.c:4554 +#: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "成功套用修補檔 %s。" -#: apply.c:4562 +#: apply.c msgid "internal error" msgstr "內部錯誤" -#: apply.c:4565 +#: apply.c #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..." -#: apply.c:4576 +#: apply.c #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 檔案名為 %.*s.rej" -#: apply.c:4584 +#: apply.c #, c-format msgid "cannot open %s" msgstr "不能開啟 %s" -#: apply.c:4598 +#: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "成功套用第 #%d 個區塊。" -#: apply.c:4602 +#: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "拒絕第 #%d 個區塊。" -#: apply.c:4731 +#: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "略過修補檔 '%s'。" -#: apply.c:4740 +#: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "輸入中沒有有效的修補檔內容（傳入「--allow-empty」允許）" -#: apply.c:4761 +#: apply.c msgid "unable to read index file" msgstr "無法讀取索引檔案" -#: apply.c:4918 +#: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "不能開啟修補檔 '%s'：%s" -#: apply.c:4945 +#: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c:4951 apply.c:4966 +#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字元誤用。" -#: apply.c:4959 +#: apply.c #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修復空白錯誤後，套用了 %d 行。" -#: apply.c:4975 builtin/add.c:690 builtin/mv.c:338 builtin/rm.c:430 +#: apply.c builtin/add.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "無法寫入新索引檔案" -#: apply.c:5003 +#: apply.c msgid "don't apply changes matching the given path" msgstr "不要套用符合提供路徑的變更" -#: apply.c:5006 +#: apply.c msgid "apply changes matching the given path" msgstr "套用符合提供路徑的變更" -#: apply.c:5008 builtin/am.c:2379 +#: apply.c builtin/am.c msgid "num" msgstr "數字" -#: apply.c:5009 +#: apply.c msgid "remove <num> leading slashes from traditional diff paths" msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線" -#: apply.c:5012 +#: apply.c msgid "ignore additions made by the patch" msgstr "忽略修補檔中的新增的檔案" -#: apply.c:5014 +#: apply.c msgid "instead of applying the patch, output diffstat for the input" msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）" -#: apply.c:5018 +#: apply.c msgid "show number of added and deleted lines in decimal notation" msgstr "以十進位數顯示新增和刪除的行數" -#: apply.c:5020 +#: apply.c msgid "instead of applying the patch, output a summary for the input" msgstr "不套用修補檔，而是顯示輸入的概要" -#: apply.c:5022 +#: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "不套用修補檔，而是檢視修補檔是否可套用" -#: apply.c:5024 +#: apply.c msgid "make sure the patch is applicable to the current index" msgstr "確認修補檔可以套用到目前索引" -#: apply.c:5026 +#: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "使用指令 `git add --intent-to-add` 標記新增檔案" -#: apply.c:5028 +#: apply.c msgid "apply a patch without touching the working tree" msgstr "套用修補檔而不修改工作區" -#: apply.c:5030 +#: apply.c msgid "accept a patch that touches outside the working area" msgstr "接受修改工作區之外檔案的修補檔" -#: apply.c:5033 +#: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）" -#: apply.c:5035 +#: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "嘗試三方合併。如果失敗，則回到正常修補檔 (patch) 模式" -#: apply.c:5037 +#: apply.c msgid "build a temporary index based on embedded index information" msgstr "建立一個暫時索引基於嵌入的索引訊息" -#: apply.c:5040 builtin/checkout-index.c:230 +#: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "路徑以 NUL 字元分隔" -#: apply.c:5042 +#: apply.c msgid "ensure at least <n> lines of context match" msgstr "確保至少符合 <n> 行上下文" -#: apply.c:5043 builtin/am.c:2355 builtin/am.c:2358 -#: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3983 -#: builtin/rebase.c:1079 +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "動作" -#: apply.c:5044 +#: apply.c msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的行中間的空白字元濫用" -#: apply.c:5047 apply.c:5050 +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元的變更" -#: apply.c:5053 +#: apply.c msgid "apply the patch in reverse" msgstr "反向套用修補檔" -#: apply.c:5055 +#: apply.c msgid "don't expect at least one line of context" msgstr "無需至少一行上下文" -#: apply.c:5057 +#: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "將拒絕的修補檔區塊儲存在對應的 *.rej 檔案中" -#: apply.c:5059 +#: apply.c msgid "allow overlapping hunks" msgstr "允許重疊的修補檔區塊" -#: apply.c:5062 +#: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允許不正確的檔案末尾換行符號" -#: apply.c:5065 +#: apply.c msgid "do not trust the line counts in the hunk headers" msgstr "不信任修補檔區塊的標頭訊息中的行號" -#: apply.c:5067 builtin/am.c:2367 +#: apply.c builtin/am.c msgid "root" msgstr "根目錄" -#: apply.c:5068 +#: apply.c msgid "prepend <root> to all filenames" msgstr "為所有檔案名前新增 <根目錄>" -#: apply.c:5071 +#: apply.c msgid "don't return error for empty patches" msgstr "遇到空白修補檔時不回傳錯誤" -#: archive-tar.c:125 archive-zip.c:346 +#: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "不能開啟資料物件 %s" -#: archive-tar.c:265 archive-zip.c:359 +#: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1: %s)" -#: archive-tar.c:447 +#: archive-tar.c #, c-format msgid "unable to start '%s' filter" msgstr "無法啟動 '%s' 過濾器" -#: archive-tar.c:450 +#: archive-tar.c msgid "unable to redirect descriptor" msgstr "無法重定向描述符" -#: archive-tar.c:457 +#: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "'%s' 過濾器報告了錯誤" -#: archive-zip.c:319 +#: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "路徑不是有效的 UTF-8：%s" -#: archive-zip.c:323 +#: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路徑太長（%d 字元，SHA1：%s）：%s" -#: archive-zip.c:470 builtin/pack-objects.c:363 builtin/pack-objects.c:366 +#: archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" -#: archive-zip.c:604 +#: archive-zip.c #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "對於本系統時間戳太大：%<PRIuMAX>" -#: archive.c:14 +#: archive.c msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<選項>] <樹或提交> [<路徑>...]" -#: archive.c:16 +#: archive.c msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <版本庫> [--exec <命令>] [<選項>] <樹或提交> [<路徑>...]" -#: archive.c:17 +#: archive.c msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本庫> [--exec <命令>] --list" -#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238 -#: builtin/tag.c:579 +#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "不能讀取 '%s'" -#: archive.c:426 builtin/add.c:214 builtin/add.c:657 builtin/rm.c:334 +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格 '%s' 未符合任何檔案" -#: archive.c:450 +#: archive.c #, c-format msgid "no such ref: %.*s" msgstr "無此引用：%.*s" -#: archive.c:456 +#: archive.c #, c-format msgid "not a valid object name: %s" msgstr "不是一個有效的物件名：%s" -#: archive.c:469 +#: archive.c #, c-format msgid "not a tree object: %s" msgstr "不是一個樹狀物件：%s" -#: archive.c:481 +#: archive.c msgid "current working directory is untracked" msgstr "目前工作目錄未被追蹤" -#: archive.c:522 +#: archive.c #, c-format msgid "File not found: %s" msgstr "找不到檔案：%s" -#: archive.c:524 +#: archive.c #, c-format msgid "Not a regular file: %s" msgstr "不是一般檔案：%s" -#: archive.c:551 +#: archive.c +#, c-format +msgid "unclosed quote: '%s'" +msgstr "未閉合的引號：「%s」" + +#: archive.c +#, c-format +msgid "missing colon: '%s'" +msgstr "缺少冒號：「%s」" + +#: archive.c +#, c-format +msgid "empty file name: '%s'" +msgstr "檔案名稱空白：「%s」" + +#: archive.c msgid "fmt" msgstr "格式" -#: archive.c:551 +#: archive.c msgid "archive format" msgstr "歸檔格式" -#: archive.c:552 builtin/log.c:1809 +#: archive.c builtin/log.c msgid "prefix" msgstr "前綴" -#: archive.c:553 +#: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "為歸檔中每個路徑名加上前綴" -#: archive.c:554 archive.c:557 builtin/blame.c:881 builtin/blame.c:885 -#: builtin/blame.c:886 builtin/commit-tree.c:115 builtin/config.c:135 -#: builtin/fast-export.c:1181 builtin/fast-export.c:1183 -#: builtin/fast-export.c:1187 builtin/grep.c:936 builtin/hash-object.c:104 -#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410 -#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:195 +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c +#: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "檔案" -#: archive.c:555 +#: archive.c msgid "add untracked file to archive" msgstr "將未追蹤檔案加入歸檔" -#: archive.c:558 builtin/archive.c:88 +#: archive.c +msgid "path:content" +msgstr "路徑:內容" + +#: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "歸檔寫入此檔案" -#: archive.c:560 +#: archive.c msgid "read .gitattributes in working directory" msgstr "讀取工作區中的 .gitattributes" -#: archive.c:561 +#: archive.c msgid "report archived files on stderr" msgstr "在標準錯誤上報告歸檔檔案" -#: archive.c:563 +#: archive.c msgid "set compression level" msgstr "設定壓縮級別" -#: archive.c:566 +#: archive.c msgid "list supported archive formats" msgstr "列出支援的歸檔格式" -#: archive.c:568 builtin/archive.c:89 builtin/clone.c:122 builtin/clone.c:125 -#: builtin/submodule--helper.c:1884 builtin/submodule--helper.c:2718 +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "版本庫" -#: archive.c:569 builtin/archive.c:90 +#: archive.c builtin/archive.c msgid "retrieve the archive from remote repository <repo>" msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案" -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708 -#: builtin/notes.c:496 +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "指令" -#: archive.c:571 builtin/archive.c:92 +#: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "遠端 git-upload-archive 指令的路徑" -#: archive.c:578 +#: archive.c msgid "Unexpected option --remote" msgstr "未知參數 --remote" -#: archive.c:580 fetch-pack.c:300 revision.c:2914 builtin/add.c:530 -#: builtin/add.c:562 builtin/checkout.c:1782 builtin/clone.c:1099 -#: builtin/clone.c:1102 builtin/commit.c:371 builtin/fast-export.c:1230 -#: builtin/index-pack.c:1854 builtin/log.c:2140 builtin/reset.c:442 -#: builtin/reset.c:500 builtin/rm.c:281 builtin/stash.c:1708 -#: builtin/worktree.c:580 builtin/worktree.c:781 http-fetch.c:144 -#: http-fetch.c:153 +#: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c +#: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c +#: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c +#: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "「%s」選項需要「%s」" -#: archive.c:582 +#: archive.c msgid "Unexpected option --output" msgstr "未知參數 --output" -#: archive.c:606 +#: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "未知歸檔格式 '%s'" -#: archive.c:615 +#: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "參數不支援此格式 '%s'：-%d" -#: attr.c:202 +#: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一個有效的屬性名" -#: attr.c:363 +#: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "不允許 %s：%s:%d" -#: attr.c:403 +#: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1705,22 +1682,22 @@ msgstr "" "反向模式在 git attributes 中被忽略\n" "當字串確定要以驚嘆號開始時，使用 '\\!'。" -#: bisect.c:488 +#: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "檔案 '%s' 包含錯誤的引用格式：%s" -#: bisect.c:698 +#: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "我們無法進行更多的二分搜尋！\n" -#: bisect.c:765 +#: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "不是一個有效的提交名 %s" -#: bisect.c:790 +#: bisect.c #, c-format msgid "" "The merge base %s is bad.\n" @@ -1729,7 +1706,7 @@ msgstr "" "合併基礎 %s 是壞的。\n" "這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n" -#: bisect.c:795 +#: bisect.c #, c-format msgid "" "The merge base %s is new.\n" @@ -1738,7 +1715,7 @@ msgstr "" "合併基礎 %s 是新的。\n" "介於 %s 和 [%s] 之間的屬性已經被修改。\n" -#: bisect.c:800 +#: bisect.c #, c-format msgid "" "The merge base %s is %s.\n" @@ -1747,7 +1724,7 @@ msgstr "" "合併基礎 %s 是 %s。\n" "這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n" -#: bisect.c:808 +#: bisect.c #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1758,7 +1735,7 @@ msgstr "" "這種情況下 git 二分搜尋無法正常工作。\n" "您可能弄錯了 %s 和 %s 版本？\n" -#: bisect.c:821 +#: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1769,36 +1746,36 @@ msgstr "" "所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" "我們仍舊繼續。" -#: bisect.c:860 +#: bisect.c #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分搜尋中：合併基礎必須是經過測試的\n" -#: bisect.c:910 +#: bisect.c #, c-format msgid "a %s revision is needed" msgstr "需要一個 %s 版本" -#: bisect.c:940 +#: bisect.c #, c-format msgid "could not create file '%s'" msgstr "不能建立檔案 '%s'" -#: bisect.c:986 builtin/merge.c:155 +#: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "不能讀取檔案 '%s'" -#: bisect.c:1026 +#: bisect.c msgid "reading bisect refs failed" msgstr "讀取二分搜尋引用失敗" -#: bisect.c:1056 +#: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同時為 %s 和 %s\n" -#: bisect.c:1065 +#: bisect.c #, c-format msgid "" "No testable commit found.\n" @@ -1807,7 +1784,7 @@ msgstr "" "沒找到能夠測試的提交。\n" "可能是執行傳入的路徑引數是錯誤的？\n" -#: bisect.c:1094 +#: bisect.c #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1816,79 +1793,76 @@ msgstr[0] "（大概 %d 步）" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1100 +#: bisect.c #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n" -#: blame.c:2773 +#: blame.c msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" -#: blame.c:2787 +#: blame.c msgid "cannot use --contents with final commit object name" msgstr "不能將 --contents 和最終的提交物件名共用" -#: blame.c:2808 +#: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c:2817 bundle.c:231 midx.c:1058 ref-filter.c:2371 remote.c:2157 -#: sequencer.c:2348 sequencer.c:4872 submodule.c:913 builtin/commit.c:1118 -#: builtin/log.c:437 builtin/log.c:1055 builtin/log.c:1663 builtin/log.c:2096 -#: builtin/log.c:2387 builtin/merge.c:431 builtin/pack-objects.c:3381 -#: builtin/pack-objects.c:3781 builtin/pack-objects.c:3796 -#: builtin/shortlog.c:255 +#: blame.c builtin/commit.c builtin/log.c builtin/merge.c +#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c ref-filter.c +#: remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍歷設定失敗" -#: blame.c:2835 +#: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍" -#: blame.c:2846 +#: blame.c #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中無此路徑 %1$s" -#: blame.c:2857 +#: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "不能為路徑 %2$s 讀取資料物件 %1$s" -#: branch.c:93 +#: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "請求重定基底時，無法繼承多個參照的上游追蹤設定" -#: branch.c:104 +#: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "未將「%s」分支設定為其自己的上游" -#: branch.c:160 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "已將「%s」分支設定為透過重定基底追蹤「%s」。" -#: branch.c:161 +#: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "已將「%s」分支設定為追蹤「%s」。" -#: branch.c:164 +#: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "「%s」分支已設定追蹤：" -#: branch.c:176 +#: branch.c msgid "unable to write upstream branch configuration" msgstr "無法寫入上游分支設定" -#: branch.c:178 +#: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" @@ -1898,17 +1872,17 @@ msgstr "" "修正錯誤後，您可以執行下述命令\n" "命令修正遠端追蹤資訊：" -#: branch.c:219 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "請求繼承「%s」的追蹤設定，但未設定遠端" -#: branch.c:225 +#: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "請求繼承「%s」的追蹤設定，但未設定合併設定" -#: branch.c:277 +#: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：「%s」引用有歧義" @@ -1923,7 +1897,7 @@ msgstr "未追蹤：「%s」引用有歧義" #. you'll probably want to swap the "%s" and leading " " space #. around. #. -#: branch.c:289 object-name.c:464 +#: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" @@ -1931,7 +1905,7 @@ msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. -#: branch.c:295 +#: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" @@ -1950,32 +1924,32 @@ msgstr "" "若要支援設定追蹤分支，請確定不同遠端的抓取引用規格\n" "映射到不同的追蹤命名空間。" -#: branch.c:344 +#: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "「%s」不是一個有效的分支名稱" -#: branch.c:364 +#: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "已有同名「%s」分支" -#: branch.c:370 +#: branch.c #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" msgstr "無法強制更新在「%2$s」簽出的「%1$s」分支" -#: branch.c:393 +#: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "無法設定追蹤資訊：起始點「%s」不是分支" -#: branch.c:395 +#: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "請求的上游分支 '%s' 不存在" -#: branch.c:397 +#: branch.c msgid "" "\n" "If you are planning on basing your work on an upstream\n" @@ -1994,28 +1968,27 @@ msgstr "" "且建立兩個分支間的追蹤關係，\n" "您可能需要使用「git push -u」推送分支並設定和上游的關聯。" -#: branch.c:445 builtin/replace.c:321 builtin/replace.c:377 -#: builtin/replace.c:423 builtin/replace.c:453 +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "不是一個有效的物件名：'%s'" -#: branch.c:465 +#: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "物件名稱有歧義：「%s」" -#: branch.c:470 +#: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "無效的分支點：「%s」" -#: branch.c:658 +#: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "「%s」子模組：找不到子模組" -#: branch.c:661 +#: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " @@ -2024,8502 +1997,151 @@ msgstr "" "您可以嘗試使用「git checkout %s && git submodule update --init」命令更新子模" "組" -#: branch.c:672 branch.c:698 +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "「%s」子模組：無法建立「%s」分支" -#: branch.c:730 +#: branch.c #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已經簽出到 '%s'" -#: branch.c:755 +#: branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作區 %s 的 HEAD 指向沒有被更新" -#: bundle.c:45 -#, c-format -msgid "unrecognized bundle hash algorithm: %s" -msgstr "無法識別的套件雜湊演算法：%s" - -#: bundle.c:53 -#, c-format -msgid "unknown capability '%s'" -msgstr "未知功能 '%s'" - -#: bundle.c:79 -#, c-format -msgid "'%s' does not look like a v2 or v3 bundle file" -msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案" - -#: bundle.c:118 -#, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "無法識別的包頭：%s%s (%d)" - -#: bundle.c:145 rerere.c:464 rerere.c:675 sequencer.c:2616 sequencer.c:3402 -#: builtin/commit.c:865 -#, c-format -msgid "could not open '%s'" -msgstr "不能開啟 '%s'" - -#: bundle.c:203 -msgid "Repository lacks these prerequisite commits:" -msgstr "版本庫中缺少這些必備的提交：" - -#: bundle.c:206 -msgid "need a repository to verify a bundle" -msgstr "需要版本庫驗證套件" - -#: bundle.c:264 -#, c-format -msgid "The bundle contains this ref:" -msgid_plural "The bundle contains these %<PRIuMAX> refs:" -msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用：" - -#: bundle.c:272 -msgid "The bundle records a complete history." -msgstr "這個套件記錄完整歷史紀錄。" - -#: bundle.c:274 -#, c-format -msgid "The bundle requires this ref:" -msgid_plural "The bundle requires these %<PRIuMAX> refs:" -msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用：" - -#: bundle.c:350 -msgid "unable to dup bundle descriptor" -msgstr "無法複製套件描述符" - -#: bundle.c:357 -msgid "Could not spawn pack-objects" -msgstr "不能生成 pack-objects 進程" - -#: bundle.c:368 -msgid "pack-objects died" -msgstr "pack-objects 終止" - -#: bundle.c:417 -#, c-format -msgid "ref '%s' is excluded by the rev-list options" -msgstr "引用 '%s' 被 rev-list 選項排除" - -#: bundle.c:533 builtin/log.c:211 builtin/log.c:1975 builtin/shortlog.c:400 -#, c-format -msgid "unrecognized argument: %s" -msgstr "無法識別的參數：%s" - -#: bundle.c:548 -#, c-format -msgid "unsupported bundle version %d" -msgstr "不支援的套件版本 %d" - -#: bundle.c:550 -#, c-format -msgid "cannot write bundle version %d with algorithm %s" -msgstr "無法寫入 %2$s 演算法的套件版本 %1$d" - -#: bundle.c:600 -msgid "Refusing to create empty bundle." -msgstr "不能建立空套件。" - -#: bundle.c:610 -#, c-format -msgid "cannot create '%s'" -msgstr "不能建立 '%s'" - -#: bundle.c:639 -msgid "index-pack died" -msgstr "index-pack 終止" - -#: chunk-format.c:117 -msgid "terminating chunk id appears earlier than expected" -msgstr "終止區塊 id 出現的時間早於預期" - -#: chunk-format.c:126 -#, c-format -msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" -msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>" - -#: chunk-format.c:133 -#, c-format -msgid "duplicate chunk ID %<PRIx32> found" -msgstr "找到重複的區塊 ID %<PRIx32>" - -#: chunk-format.c:147 -#, c-format -msgid "final chunk has non-zero id %<PRIx32>" -msgstr "最終區塊有非零 ID %<PRIx32>" - -#: color.c:354 -#, c-format -msgid "invalid color value: %.*s" -msgstr "無效的顏色值：%.*s" - -#: commit-graph.c:204 midx.c:52 -msgid "invalid hash version" -msgstr "無效的雜湊版本" - -#: commit-graph.c:262 -msgid "commit-graph file is too small" -msgstr "提交圖形檔案太小" - -#: commit-graph.c:355 -#, c-format -msgid "commit-graph signature %X does not match signature %X" -msgstr "提交圖形簽名 %X 和簽名 %X 不符合" - -#: commit-graph.c:362 -#, c-format -msgid "commit-graph version %X does not match version %X" -msgstr "提交圖形版本 %X 和版本 %X 不符合" - -#: commit-graph.c:369 -#, c-format -msgid "commit-graph hash version %X does not match version %X" -msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" - -#: commit-graph.c:386 -#, c-format -msgid "commit-graph file is too small to hold %u chunks" -msgstr "commit-graph 檔案不夠放置 %u 個區塊" - -#: commit-graph.c:485 -msgid "commit-graph has no base graphs chunk" -msgstr "提交圖形沒有基礎圖形區塊" - -#: commit-graph.c:495 -msgid "commit-graph chain does not match" -msgstr "提交圖形鏈不符合" - -#: commit-graph.c:543 -#, c-format -msgid "invalid commit-graph chain: line '%s' not a hash" -msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" - -#: commit-graph.c:567 -msgid "unable to find all commit-graph files" -msgstr "無法找到所有提交圖形檔案" - -#: commit-graph.c:752 commit-graph.c:789 -msgid "invalid commit position. commit-graph is likely corrupt" -msgstr "無效的提交位置。提交圖形可能已損壞" - -#: commit-graph.c:773 -#, c-format -msgid "could not find commit %s" -msgstr "無法找到提交 %s" - -#: commit-graph.c:806 -msgid "commit-graph requires overflow generation data but has none" -msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" - -#: commit-graph.c:1111 builtin/am.c:1370 builtin/checkout.c:775 -#: builtin/clone.c:705 -#, c-format -msgid "unable to parse commit %s" -msgstr "不能解析提交 %s" - -#: commit-graph.c:1373 builtin/pack-objects.c:3078 -#, c-format -msgid "unable to get type of object %s" -msgstr "無法獲得物件 %s 類型" - -#: commit-graph.c:1404 -msgid "Loading known commits in commit graph" -msgstr "正在載入提交圖中的已知提交" - -#: commit-graph.c:1421 -msgid "Expanding reachable commits in commit graph" -msgstr "正在展開提交圖中的可以取得的提交" - -#: commit-graph.c:1441 -msgid "Clearing commit marks in commit graph" -msgstr "正在清除提交圖中的提交標記" - -#: commit-graph.c:1460 -msgid "Computing commit graph topological levels" -msgstr "正在計算提交圖拓樸級別" - -#: commit-graph.c:1513 -msgid "Computing commit graph generation numbers" -msgstr "正在計算提交圖世代數字" - -#: commit-graph.c:1598 -msgid "Computing commit changed paths Bloom filters" -msgstr "正在計算提交變更路徑的布隆過濾器" - -#: commit-graph.c:1675 -msgid "Collecting referenced commits" -msgstr "正在收集引用提交" - -#: commit-graph.c:1701 -#, c-format -msgid "Finding commits for commit graph in %<PRIuMAX> pack" -msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" -msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交" - -#: commit-graph.c:1714 -#, c-format -msgid "error adding pack %s" -msgstr "新增包 %s 發生錯誤" - -#: commit-graph.c:1718 -#, c-format -msgid "error opening index for %s" -msgstr "為 %s 開啟索引發生錯誤" - -#: commit-graph.c:1756 -msgid "Finding commits for commit graph among packed objects" -msgstr "正在打包物件中尋找提交圖的提交" - -#: commit-graph.c:1774 -msgid "Finding extra edges in commit graph" -msgstr "正在尋找提交圖中額外的邊" - -#: commit-graph.c:1823 -msgid "failed to write correct number of base graph ids" -msgstr "無法寫入正確數量的基礎圖形 ID" - -#: commit-graph.c:1854 midx.c:1168 builtin/sparse-checkout.c:475 -#, c-format -msgid "unable to create leading directories of %s" -msgstr "不能為 %s 建立先導目錄" - -#: commit-graph.c:1868 -msgid "unable to create temporary graph layer" -msgstr "無法建立暫時的圖形層" - -#: commit-graph.c:1873 -#, c-format -msgid "unable to adjust shared permissions for '%s'" -msgstr "無法調整「%s」的共用權限" - -#: commit-graph.c:1930 -#, c-format -msgid "Writing out commit graph in %d pass" -msgid_plural "Writing out commit graph in %d passes" -msgstr[0] "正在用 %d 步寫出提交圖" - -#: commit-graph.c:1967 -msgid "unable to open commit-graph chain file" -msgstr "無法開啟提交圖形鏈檔案" - -#: commit-graph.c:1983 -msgid "failed to rename base commit-graph file" -msgstr "無法重新命名基礎提交圖形檔案" - -#: commit-graph.c:2004 -msgid "failed to rename temporary commit-graph file" -msgstr "無法重新命名暫時提交圖形檔案" - -#: commit-graph.c:2137 -msgid "Scanning merged commits" -msgstr "正在掃描合併提交" - -#: commit-graph.c:2181 -msgid "Merging commit-graph" -msgstr "正在合併提交圖形" - -#: commit-graph.c:2289 -msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" -msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" - -#: commit-graph.c:2396 -msgid "too many commits to write graph" -msgstr "提交太多不能畫圖" - -#: commit-graph.c:2494 -msgid "the commit-graph file has incorrect checksum and is likely corrupt" -msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" - -#: commit-graph.c:2504 -#, c-format -msgid "commit-graph has incorrect OID order: %s then %s" -msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" - -#: commit-graph.c:2514 commit-graph.c:2529 -#, c-format -msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" -msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" - -#: commit-graph.c:2521 -#, c-format -msgid "failed to parse commit %s from commit-graph" -msgstr "無法從提交圖形中解析提交 %s" - -#: commit-graph.c:2539 -msgid "Verifying commits in commit graph" -msgstr "正在驗證提交圖中的提交" - -#: commit-graph.c:2554 -#, c-format -msgid "failed to parse commit %s from object database for commit-graph" -msgstr "無法從提交圖形的物件庫中解析提交 %s" - -#: commit-graph.c:2561 -#, c-format -msgid "root tree OID for commit %s in commit-graph is %s != %s" -msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" - -#: commit-graph.c:2571 -#, c-format -msgid "commit-graph parent list for commit %s is too long" -msgstr "提交 %s 的提交圖形父提交列表太長了" - -#: commit-graph.c:2580 -#, c-format -msgid "commit-graph parent for %s is %s != %s" -msgstr "%s 的提交圖形父提交是 %s != %s" - -#: commit-graph.c:2594 -#, c-format -msgid "commit-graph parent list for commit %s terminates early" -msgstr "提交 %s 的提交圖形父提交列表過早終止" - -#: commit-graph.c:2599 -#, c-format -msgid "" -"commit-graph has generation number zero for commit %s, but non-zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" - -#: commit-graph.c:2603 -#, c-format -msgid "" -"commit-graph has non-zero generation number for commit %s, but zero elsewhere" -msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" - -#: commit-graph.c:2620 -#, c-format -msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" -msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" - -#: commit-graph.c:2626 -#, c-format -msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" -msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" - -#: commit.c:54 sequencer.c:3105 builtin/am.c:400 builtin/am.c:445 -#: builtin/am.c:450 builtin/am.c:1449 builtin/am.c:2124 builtin/replace.c:456 -#, c-format -msgid "could not parse %s" -msgstr "不能解析 %s" - -#: commit.c:56 -#, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s 不是一個提交！" - -#: commit.c:197 -msgid "" -"Support for <GIT_DIR>/info/grafts is deprecated\n" -"and will be removed in a future Git version.\n" -"\n" -"Please use \"git replace --convert-graft-file\"\n" -"to convert the grafts into replace refs.\n" -"\n" -"Turn this message off by running\n" -"\"git config advice.graftFileDeprecated false\"" -msgstr "" -"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n" -"未來的Git版本中被移除。\n" -"\n" -"請使用 \"git replace --convert-graft-file\" 將\n" -"grafts 轉換為取代引用。\n" -"\n" -"設定 \"git config advice.graftFileDeprecated false\"\n" -"可關閉本消息" - -#: commit.c:1252 -#, c-format -msgid "Commit %s has an untrusted GPG signature, allegedly by %s." -msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" - -#: commit.c:1256 -#, c-format -msgid "Commit %s has a bad GPG signature allegedly by %s." -msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" - -#: commit.c:1259 -#, c-format -msgid "Commit %s does not have a GPG signature." -msgstr "提交 %s 沒有 GPG 簽名。" - -#: commit.c:1262 -#, c-format -msgid "Commit %s has a good GPG signature by %s\n" -msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" - -#: commit.c:1516 -msgid "" -"Warning: commit message did not conform to UTF-8.\n" -"You may want to amend it after fixing the message, or set the config\n" -"variable i18n.commitencoding to the encoding your project uses.\n" -msgstr "" -"警告：提交說明不符合 UTF-8 字元編碼。\n" -"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n" -"設定為您項目所用的字元編碼。\n" - -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "記憶體耗盡" - -#: compat/terminal.c:167 -msgid "cannot resume in the background, please use 'fg' to resume" -msgstr "無法在背景繼續；請使用 “fg” 繼續" - -#: compat/terminal.c:168 -msgid "cannot restore terminal settings" -msgstr "無法復原終端機設定" - -#: config.c:143 -#, c-format -msgid "" -"exceeded maximum include depth (%d) while including\n" -"\t%s\n" -"from\n" -"\t%s\n" -"This might be due to circular includes." -msgstr "" -"超過了最大包含深度（%1$d），當從\n" -"\t%3$s\n" -"包含\n" -"\t%2$s\n" -"這可能是因為循環包含。" - -#: config.c:159 -#, c-format -msgid "could not expand include path '%s'" -msgstr "無法展開包含路徑 '%s'" - -#: config.c:170 -msgid "relative config includes must come from files" -msgstr "相對路徑的設定檔案引用必須來自於檔案" - -#: config.c:219 -msgid "relative config include conditionals must come from files" -msgstr "相對路徑的設定檔案條件引用必須來自於檔案" - -#: config.c:364 -msgid "" -"remote URLs cannot be configured in file directly or indirectly included by " -"includeIf.hasconfig:remote.*.url" -msgstr "" -"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*." -"url 引入" - -#: config.c:508 -#, c-format -msgid "invalid config format: %s" -msgstr "無效的設定檔格式：%s" - -#: config.c:512 -#, c-format -msgid "missing environment variable name for configuration '%.*s'" -msgstr "缺少「%.*s」組態設定的環境變數名稱" - -#: config.c:517 -#, c-format -msgid "missing environment variable '%s' for configuration '%.*s'" -msgstr "缺少環境變數「%s」（於「%.*s」組態設定）" - -#: config.c:553 -#, c-format -msgid "key does not contain a section: %s" -msgstr "鍵名沒有包含一個小節名稱：%s" - -#: config.c:558 -#, c-format -msgid "key does not contain variable name: %s" -msgstr "鍵名沒有包含變數名：%s" - -#: config.c:580 sequencer.c:2802 -#, c-format -msgid "invalid key: %s" -msgstr "無效鍵名：%s" - -#: config.c:585 -#, c-format -msgid "invalid key (newline): %s" -msgstr "無效鍵名（有換行符號）：%s" - -#: config.c:605 -msgid "empty config key" -msgstr "空白設定鍵" - -#: config.c:623 config.c:635 -#, c-format -msgid "bogus config parameter: %s" -msgstr "偽設定參數：%s" - -#: config.c:649 config.c:666 config.c:673 config.c:682 -#, c-format -msgid "bogus format in %s" -msgstr "%s 中格式錯誤" - -#: config.c:716 -#, c-format -msgid "bogus count in %s" -msgstr "%s 中有偽計數" - -#: config.c:720 -#, c-format -msgid "too many entries in %s" -msgstr "%s 中的項目過多" - -#: config.c:730 -#, c-format -msgid "missing config key %s" -msgstr "缺少 %s 設定鍵" - -#: config.c:738 -#, c-format -msgid "missing config value %s" -msgstr "缺少 %s 設定值" - -#: config.c:1089 -#, c-format -msgid "bad config line %d in blob %s" -msgstr "資料物件 %2$s 中錯誤的設定行 %1$d" - -#: config.c:1093 -#, c-format -msgid "bad config line %d in file %s" -msgstr "檔案 %2$s 中錯誤的設定行 %1$d" - -#: config.c:1097 -#, c-format -msgid "bad config line %d in standard input" -msgstr "標準輸入中錯誤的設定行 %d" - -#: config.c:1101 -#, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d" - -#: config.c:1105 -#, c-format -msgid "bad config line %d in command line %s" -msgstr "指令列 %2$s 中錯誤的設定行 %1$d" - -#: config.c:1109 -#, c-format -msgid "bad config line %d in %s" -msgstr "在 %2$s 中錯誤的設定行 %1$d" - -#: config.c:1246 -msgid "out of range" -msgstr "超出範圍" - -#: config.c:1246 -msgid "invalid unit" -msgstr "無效的單位" - -#: config.c:1247 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s" - -#: config.c:1257 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1260 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1263 -#, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" -msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s" - -#: config.c:1266 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1269 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" -msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1272 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" - -#: config.c:1368 -#, c-format -msgid "invalid value for variable %s" -msgstr "%s 變數的值無效" - -#: config.c:1389 -#, c-format -msgid "ignoring unknown core.fsync component '%s'" -msgstr "忽略未知的 core.fsync 組件「%s」" - -#: config.c:1425 -#, c-format -msgid "bad boolean config value '%s' for '%s'" -msgstr "「%2$s」的「%1$s」布林設定值無效" - -#: config.c:1443 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "無法展開使用者目錄於：’%s’" - -#: config.c:1452 -#, c-format -msgid "'%s' for '%s' is not a valid timestamp" -msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳" - -#: config.c:1545 -#, c-format -msgid "abbrev length out of range: %d" -msgstr "縮寫長度超出範圍：%d" - -#: config.c:1559 config.c:1570 -#, c-format -msgid "bad zlib compression level %d" -msgstr "錯誤的 zlib 壓縮級別 %d" - -#: config.c:1660 -msgid "core.commentChar should only be one character" -msgstr "core.commentChar 應該是一個字元" - -#: config.c:1692 -#, c-format -msgid "ignoring unknown core.fsyncMethod value '%s'" -msgstr "忽略未知的 core.fsyncMethod 值「%s」" - -#: config.c:1698 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" -msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync" - -#: config.c:1714 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "無效的物件建立模式：%s" - -#: config.c:1800 -#, c-format -msgid "malformed value for %s" -msgstr "%s 的取值格式錯誤" - -#: config.c:1826 -#, c-format -msgid "malformed value for %s: %s" -msgstr "%s 的取值格式錯誤：%s" - -#: config.c:1827 -msgid "must be one of nothing, matching, simple, upstream or current" -msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" - -#: config.c:1888 builtin/pack-objects.c:4078 -#, c-format -msgid "bad pack compression level %d" -msgstr "錯誤的打包壓縮級別 %d" - -#: config.c:2014 -#, c-format -msgid "unable to load config blob object '%s'" -msgstr "無法從資料物件 '%s' 載入設定" - -#: config.c:2017 -#, c-format -msgid "reference '%s' does not point to a blob" -msgstr "引用 '%s' 沒有指向一個資料物件" - -#: config.c:2035 -#, c-format -msgid "unable to resolve config blob '%s'" -msgstr "不能解析設定物件 '%s'" - -#: config.c:2080 -#, c-format -msgid "failed to parse %s" -msgstr "解析 %s 失敗" - -#: config.c:2136 -msgid "unable to parse command-line config" -msgstr "無法解析指令列中的設定" - -#: config.c:2512 -msgid "unknown error occurred while reading the configuration files" -msgstr "在讀取設定檔案時遇到未知錯誤" - -#: config.c:2686 -#, c-format -msgid "Invalid %s: '%s'" -msgstr "無效 %s：'%s'" - -#: config.c:2731 -#, c-format -msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" -msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" - -#: config.c:2763 -#, c-format -msgid "unable to parse '%s' from command-line config" -msgstr "無法解析指令列設定中的 '%s'" - -#: config.c:2765 -#, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" - -#: config.c:2850 -#, c-format -msgid "invalid section name '%s'" -msgstr "無效的小節名稱 '%s'" - -#: config.c:2882 -#, c-format -msgid "%s has multiple values" -msgstr "%s 有多個取值" - -#: config.c:2911 -#, c-format -msgid "failed to write new configuration file %s" -msgstr "寫入新的設定檔案 %s 失敗" - -#: config.c:3177 config.c:3518 -#, c-format -msgid "could not lock config file %s" -msgstr "不能鎖定設定檔案 %s" - -#: config.c:3188 -#, c-format -msgid "opening %s" -msgstr "開啟 %s" - -#: config.c:3225 builtin/config.c:361 -#, c-format -msgid "invalid pattern: %s" -msgstr "無效模式：%s" - -#: config.c:3250 -#, c-format -msgid "invalid config file %s" -msgstr "無效的設定檔案 %s" - -#: config.c:3263 config.c:3531 -#, c-format -msgid "fstat on %s failed" -msgstr "對 %s 呼叫 fstat 失敗" - -#: config.c:3274 -#, c-format -msgid "unable to mmap '%s'%s" -msgstr "無法 mmap '%s'%s" - -#: config.c:3284 config.c:3536 -#, c-format -msgid "chmod on %s failed" -msgstr "對 %s 呼叫 chmod 失敗" - -#: config.c:3369 config.c:3633 -#, c-format -msgid "could not write config file %s" -msgstr "不能寫入設定檔案 %s" - -#: config.c:3403 -#, c-format -msgid "could not set '%s' to '%s'" -msgstr "不能設定 '%s' 為 '%s'" - -#: config.c:3405 builtin/remote.c:666 builtin/remote.c:885 builtin/remote.c:893 -#, c-format -msgid "could not unset '%s'" -msgstr "不能取消設定 '%s'" - -#: config.c:3509 -#, c-format -msgid "invalid section name: %s" -msgstr "無效的小節名稱：%s" - -#: config.c:3676 -#, c-format -msgid "missing value for '%s'" -msgstr "%s 的取值缺少" - -#: connect.c:61 -msgid "the remote end hung up upon initial contact" -msgstr "遠端在初始連線時即掛斷" - -#: connect.c:63 -msgid "" -"Could not read from remote repository.\n" -"\n" -"Please make sure you have the correct access rights\n" -"and the repository exists." -msgstr "" -"無法讀取遠端版本庫。\n" -"\n" -"請確認您有正確的存取權限並且版本庫存在。" - -#: connect.c:81 -#, c-format -msgid "server doesn't support '%s'" -msgstr "伺服器不支援 '%s'" - -#: connect.c:118 -#, c-format -msgid "server doesn't support feature '%s'" -msgstr "伺服器不支援特性 '%s'" - -#: connect.c:129 -msgid "expected flush after capabilities" -msgstr "在能力之後應為一個 flush 包" - -#: connect.c:265 -#, c-format -msgid "ignoring capabilities after first line '%s'" -msgstr "忽略第一行 '%s' 之後的能力欄位" - -#: connect.c:286 -msgid "protocol error: unexpected capabilities^{}" -msgstr "協定錯誤：意外的 capabilities^{}" - -#: connect.c:308 -#, c-format -msgid "protocol error: expected shallow sha-1, got '%s'" -msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'" - -#: connect.c:310 -msgid "repository on the other end cannot be shallow" -msgstr "另一端的版本庫不能是淺複製版本庫" - -#: connect.c:349 -msgid "invalid packet" -msgstr "無效封包" - -#: connect.c:369 -#, c-format -msgid "protocol error: unexpected '%s'" -msgstr "協定錯誤：意外的 '%s'" - -#: connect.c:499 -#, c-format -msgid "unknown object format '%s' specified by server" -msgstr "伺服器指定的「%s」物件格式無效" - -#: connect.c:528 -#, c-format -msgid "invalid ls-refs response: %s" -msgstr "無效的 ls-refs 回應：%s" - -#: connect.c:532 -msgid "expected flush after ref listing" -msgstr "在引用列表之後應該有一個 flush 包" - -#: connect.c:535 -msgid "expected response end packet after ref listing" -msgstr "在引用列表後預期要有回應結束封包" - -#: connect.c:670 -#, c-format -msgid "protocol '%s' is not supported" -msgstr "不支援 '%s' 協定" - -#: connect.c:721 -msgid "unable to set SO_KEEPALIVE on socket" -msgstr "無法為 socket 設定 SO_KEEPALIVE" - -#: connect.c:761 connect.c:824 -#, c-format -msgid "Looking up %s ... " -msgstr "尋找 %s ... " - -#: connect.c:765 -#, c-format -msgid "unable to look up %s (port %s) (%s)" -msgstr "無法尋找 %s（埠 %s）（%s）" - -#. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:769 connect.c:840 -#, c-format -msgid "" -"done.\n" -"Connecting to %s (port %s) ... " -msgstr "" -"完成。\n" -"連線到 %s（埠 %s）... " - -#: connect.c:791 connect.c:868 -#, c-format -msgid "" -"unable to connect to %s:\n" -"%s" -msgstr "" -"無法連線到 %s：\n" -"%s" - -#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:797 connect.c:874 -msgid "done." -msgstr "完成。" - -#: connect.c:828 -#, c-format -msgid "unable to look up %s (%s)" -msgstr "無法尋找 %s（%s）" - -#: connect.c:834 -#, c-format -msgid "unknown port %s" -msgstr "未知埠 %s" - -#: connect.c:971 connect.c:1303 -#, c-format -msgid "strange hostname '%s' blocked" -msgstr "已阻止奇怪的主機名稱 '%s'" - -#: connect.c:973 -#, c-format -msgid "strange port '%s' blocked" -msgstr "已阻止奇怪的埠號 '%s'" - -#: connect.c:983 -#, c-format -msgid "cannot start proxy %s" -msgstr "不能啟動代理 %s" - -#: connect.c:1054 -msgid "no path specified; see 'git help pull' for valid url syntax" -msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法" - -#: connect.c:1194 -msgid "newline is forbidden in git:// hosts and repo paths" -msgstr "git:// 主機名稱和版本庫路徑中不能有換行" - -#: connect.c:1251 -msgid "ssh variant 'simple' does not support -4" -msgstr "ssh 變體 'simple' 不支援 -4" - -#: connect.c:1263 -msgid "ssh variant 'simple' does not support -6" -msgstr "ssh 變體 'simple' 不支援 -6" - -#: connect.c:1280 -msgid "ssh variant 'simple' does not support setting port" -msgstr "ssh 變體 'simple' 不支援設定埠" - -#: connect.c:1392 -#, c-format -msgid "strange pathname '%s' blocked" -msgstr "已阻止奇怪的路徑名 '%s'" - -#: connect.c:1440 -msgid "unable to fork" -msgstr "無法 fork" - -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57 -msgid "Checking connectivity" -msgstr "正在檢查連通性" - -#: connected.c:122 -msgid "Could not run 'git rev-list'" -msgstr "不能執行 'git rev-list'" - -#: connected.c:146 -msgid "failed write to rev-list" -msgstr "寫入 rev-list 失敗" - -#: connected.c:151 -msgid "failed to close rev-list's stdin" -msgstr "關閉 rev-list 的標準輸入失敗" - -#: convert.c:183 -#, c-format -msgid "illegal crlf_action %d" -msgstr "非法的 crlf_action %d" - -#: convert.c:196 -#, c-format -msgid "CRLF would be replaced by LF in %s" -msgstr "%s 中的 CRLF 將被 LF 取代" - -#: convert.c:198 -#, c-format -msgid "" -"CRLF will be replaced by LF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 CRLF 將被 LF 取代。\n" -"在工作區中該檔案仍保持原有的換行符號" - -#: convert.c:206 -#, c-format -msgid "LF would be replaced by CRLF in %s" -msgstr "檔案 %s 中的 LF 將被 CRLF 取代" - -#: convert.c:208 -#, c-format -msgid "" -"LF will be replaced by CRLF in %s.\n" -"The file will have its original line endings in your working directory" -msgstr "" -"%s 中的 LF 將被 CRLF 取代。\n" -"在工作區中該檔案仍保持原有的換行符號" - -#: convert.c:273 -#, c-format -msgid "BOM is prohibited in '%s' if encoded as %s" -msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" - -#: convert.c:280 -#, c-format -msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " -"working-tree-encoding." -msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" - -#: convert.c:293 -#, c-format -msgid "BOM is required in '%s' if encoded as %s" -msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" - -#: convert.c:295 -#, c-format -msgid "" -"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" -"%sLE (depending on the byte order) as working-tree-encoding." -msgstr "" -"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" -"字節序）作為工作區編碼。" - -#: convert.c:408 convert.c:479 -#, c-format -msgid "failed to encode '%s' from %s to %s" -msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" - -#: convert.c:451 -#, c-format -msgid "encoding '%s' from %s to %s and back is not the same" -msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" - -#: convert.c:654 -#, c-format -msgid "cannot fork to run external filter '%s'" -msgstr "不能 fork 以執行外部過濾器 '%s'" - -#: convert.c:674 -#, c-format -msgid "cannot feed the input to external filter '%s'" -msgstr "不能將輸入傳遞給外部過濾器 '%s'" - -#: convert.c:681 -#, c-format -msgid "external filter '%s' failed %d" -msgstr "外部過濾器 '%s' 失敗碼 %d" - -#: convert.c:716 convert.c:719 -#, c-format -msgid "read from external filter '%s' failed" -msgstr "從外部過濾器 '%s' 讀取失敗" - -#: convert.c:722 convert.c:777 -#, c-format -msgid "external filter '%s' failed" -msgstr "外部過濾器 '%s' 失敗" - -#: convert.c:826 -msgid "unexpected filter type" -msgstr "意外的過濾類型" - -#: convert.c:837 -msgid "path name too long for external filter" -msgstr "外部過濾器的路徑名太長" - -#: convert.c:935 -#, c-format -msgid "" -"external filter '%s' is not available anymore although not all paths have " -"been filtered" -msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" - -#: convert.c:1236 -msgid "true/false are no valid working-tree-encodings" -msgstr "true/false 不是有效的工作區編碼" - -#: convert.c:1416 convert.c:1449 -#, c-format -msgid "%s: clean filter '%s' failed" -msgstr "%s：clean 過濾器 '%s' 失敗" - -#: convert.c:1492 -#, c-format -msgid "%s: smudge filter %s failed" -msgstr "%s：smudge 過濾器 %s 失敗" - -#: credential.c:96 -#, c-format -msgid "skipping credential lookup for key: credential.%s" -msgstr "略過鍵的憑證查詢：credential.%s" - -#: credential.c:112 -msgid "refusing to work with credential missing host field" -msgstr "拒絕使用缺少主機欄位的憑證" - -#: credential.c:114 -msgid "refusing to work with credential missing protocol field" -msgstr "拒絕使用缺少通訊協定欄位的憑證" - -#: credential.c:396 -#, c-format -msgid "url contains a newline in its %s component: %s" -msgstr "URL 的 %s 部分有換行：%s" - -#: credential.c:440 -#, c-format -msgid "url has no scheme: %s" -msgstr "URL 沒有 Scheme：%s" - -#: credential.c:513 -#, c-format -msgid "credential url cannot be parsed: %s" -msgstr "無法解析憑證 URL：%s" - -#: date.c:139 -msgid "in the future" -msgstr "在將來" - -#: date.c:145 -#, c-format -msgid "%<PRIuMAX> second ago" -msgid_plural "%<PRIuMAX> seconds ago" -msgstr[0] "%<PRIuMAX> 秒鐘前" - -#: date.c:152 -#, c-format -msgid "%<PRIuMAX> minute ago" -msgid_plural "%<PRIuMAX> minutes ago" -msgstr[0] "%<PRIuMAX> 分鐘前" - -#: date.c:159 -#, c-format -msgid "%<PRIuMAX> hour ago" -msgid_plural "%<PRIuMAX> hours ago" -msgstr[0] "%<PRIuMAX> 小時前" - -#: date.c:166 -#, c-format -msgid "%<PRIuMAX> day ago" -msgid_plural "%<PRIuMAX> days ago" -msgstr[0] "%<PRIuMAX> 天前" - -#: date.c:172 -#, c-format -msgid "%<PRIuMAX> week ago" -msgid_plural "%<PRIuMAX> weeks ago" -msgstr[0] "%<PRIuMAX> 周前" - -#: date.c:179 -#, c-format -msgid "%<PRIuMAX> month ago" -msgid_plural "%<PRIuMAX> months ago" -msgstr[0] "%<PRIuMAX> 個月前" - -#: date.c:190 -#, c-format -msgid "%<PRIuMAX> year" -msgid_plural "%<PRIuMAX> years" -msgstr[0] "%<PRIuMAX> 年" - -#. TRANSLATORS: "%s" is "<n> years" -#: date.c:193 -#, c-format -msgid "%s, %<PRIuMAX> month ago" -msgid_plural "%s, %<PRIuMAX> months ago" -msgstr[0] "%s %<PRIuMAX> 個月前" - -#: date.c:198 date.c:203 -#, c-format -msgid "%<PRIuMAX> year ago" -msgid_plural "%<PRIuMAX> years ago" -msgstr[0] "%<PRIuMAX> 年前" - -#: delta-islands.c:272 -msgid "Propagating island marks" -msgstr "正在傳播資料島標記" - -#: delta-islands.c:290 -#, c-format -msgid "bad tree object %s" -msgstr "壞的樹狀物件 %s" - -#: delta-islands.c:334 -#, c-format -msgid "failed to load island regex for '%s': %s" -msgstr "未能載入 '%s' 的資料島常規表示式：%s" - -#: delta-islands.c:390 -#, c-format -msgid "island regex from config has too many capture groups (max=%d)" -msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）" - -#: delta-islands.c:467 -#, c-format -msgid "Marked %d islands, done.\n" -msgstr "已標記 %d 個資料島，結束。\n" - -#: diff-merges.c:81 gpg-interface.c:719 gpg-interface.c:734 ls-refs.c:37 -#: parallel-checkout.c:42 sequencer.c:2805 setup.c:563 builtin/am.c:203 -#: builtin/am.c:2243 builtin/am.c:2287 builtin/blame.c:724 builtin/blame.c:742 -#: builtin/fetch.c:792 builtin/pack-objects.c:3515 builtin/pull.c:45 -#: builtin/pull.c:47 builtin/pull.c:321 -#, c-format -msgid "invalid value for '%s': '%s'" -msgstr "「%s」的值無效：「%s」" - -#: diff-lib.c:561 -msgid "--merge-base does not work with ranges" -msgstr "--merge-base 跟範圍無法搭配運作" - -#: diff-lib.c:563 -msgid "--merge-base only works with commits" -msgstr "--merge-base 只能跟提交搭配才能運作" - -#: diff-lib.c:580 -msgid "unable to get HEAD" -msgstr "不能取得 HEAD" - -#: diff-lib.c:587 -msgid "no merge base found" -msgstr "找不到合併基底" - -#: diff-lib.c:589 -msgid "multiple merge bases found" -msgstr "找到多個合併基底" - -#: diff-no-index.c:237 -msgid "git diff --no-index [<options>] <path> <path>" -msgstr "git diff --no-index [<選項>] <路徑> <路徑>" - -#: diff-no-index.c:262 -msgid "" -"Not a git repository. Use --no-index to compare two paths outside a working " -"tree" -msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑" - -# 譯者：請維持前導空格 -#: diff.c:159 -#, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n" - -# 譯者：請維持前導空格 -#: diff.c:164 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " 未知的 dirstat 參數 '%s'\n" - -#: diff.c:300 -msgid "" -"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " -"'dimmed-zebra', 'plain'" -msgstr "" -"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" -"zebra'、'plain'" - -#: diff.c:328 -#, c-format -msgid "" -"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " -"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" -msgstr "" -"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" -"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" - -#: diff.c:336 -msgid "" -"color-moved-ws: allow-indentation-change cannot be combined with other " -"whitespace modes" -msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用" - -#: diff.c:413 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" - -#: diff.c:473 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" -"發現設定變數 'diff.dirstat' 中的錯誤：\n" -"%s" - -#: diff.c:4282 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "外部 diff 離開，停止在 %s" - -#: diff.c:4677 parse-options.c:1114 -#, c-format -msgid "options '%s', '%s', '%s', and '%s' cannot be used together" -msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用" - -#: diff.c:4681 parse-options.c:1118 builtin/worktree.c:578 -#, c-format -msgid "options '%s', '%s', and '%s' cannot be used together" -msgstr "「%s」、「%s」和「%s」選項不得同時使用" - -#: diff.c:4685 -#, c-format -msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」" - -#: diff.c:4689 -#, c-format -msgid "" -"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" -msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」" - -#: diff.c:4769 -msgid "--follow requires exactly one pathspec" -msgstr "--follow 明確要求只跟一個路徑規格" - -#: diff.c:4823 -#, c-format -msgid "invalid --stat value: %s" -msgstr "無效的 --stat 值：%s" - -#: diff.c:4828 diff.c:4833 diff.c:4838 diff.c:4843 diff.c:5319 -#: parse-options.c:217 parse-options.c:221 -#, c-format -msgid "%s expects a numerical value" -msgstr "%s 期望一個數字值" - -#: diff.c:4860 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"無法解析 --dirstat/-X 選項的參數：\n" -"%s" - -#: diff.c:4893 -#, c-format -msgid "unknown change class '%c' in --diff-filter=%s" -msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" - -#: diff.c:4917 -#, c-format -msgid "unknown value after ws-error-highlight=%.*s" -msgstr "ws-error-highlight=%.*s 之後未知的值" - -#: diff.c:4931 -#, c-format -msgid "unable to resolve '%s'" -msgstr "不能解析 '%s'" - -#: diff.c:4981 diff.c:4987 -#, c-format -msgid "%s expects <n>/<m> form" -msgstr "%s 期望 <n>/<m> 格式" - -#: diff.c:4999 -#, c-format -msgid "%s expects a character, got '%s'" -msgstr "%s 期望一個字元，得到 '%s'" - -#: diff.c:5020 -#, c-format -msgid "bad --color-moved argument: %s" -msgstr "壞的 --color-moved 參數：%s" - -#: diff.c:5039 -#, c-format -msgid "invalid mode '%s' in --color-moved-ws" -msgstr "--color-moved-ws 中的無效模式 '%s'" - -#: diff.c:5079 -msgid "" -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " -"\"histogram\"" -msgstr "" -"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" - -#: diff.c:5115 diff.c:5135 -#, c-format -msgid "invalid argument to %s" -msgstr "%s 的參數無效" - -#: diff.c:5239 -#, c-format -msgid "invalid regex given to -I: '%s'" -msgstr "傳入 -I 的常規表示式無效：「%s」" - -#: diff.c:5288 -#, c-format -msgid "failed to parse --submodule option parameter: '%s'" -msgstr "無法解析 --submodule 選項的參數：'%s'" - -#: diff.c:5344 -#, c-format -msgid "bad --word-diff argument: %s" -msgstr "壞的 --word-diff 參數：%s" - -#: diff.c:5380 -msgid "Diff output format options" -msgstr "差異輸出格式化選項" - -#: diff.c:5382 diff.c:5388 -msgid "generate patch" -msgstr "生成修補檔" - -#: diff.c:5385 builtin/log.c:180 -msgid "suppress diff output" -msgstr "不顯示差異輸出" - -#: diff.c:5390 diff.c:5504 diff.c:5511 -msgid "<n>" -msgstr "<n>" - -#: diff.c:5391 diff.c:5394 -msgid "generate diffs with <n> lines context" -msgstr "生成含 <n> 行上下文的差異" - -#: diff.c:5396 -msgid "generate the diff in raw format" -msgstr "生成原始格式的差異" - -#: diff.c:5399 -msgid "synonym for '-p --raw'" -msgstr "和 '-p --raw' 同義" - -#: diff.c:5403 -msgid "synonym for '-p --stat'" -msgstr "和 '-p --stat' 同義" - -#: diff.c:5407 -msgid "machine friendly --stat" -msgstr "機器友好的 --stat" - -#: diff.c:5410 -msgid "output only the last line of --stat" -msgstr "只輸出 --stat 的最後一行" - -#: diff.c:5412 diff.c:5420 -msgid "<param1,param2>..." -msgstr "<參數1,參數2>..." - -#: diff.c:5413 -msgid "" -"output the distribution of relative amount of changes for each sub-directory" -msgstr "輸出每個子目錄相對變更的分布" - -#: diff.c:5417 -msgid "synonym for --dirstat=cumulative" -msgstr "和 --dirstat=cumulative 同義" - -#: diff.c:5421 -msgid "synonym for --dirstat=files,param1,param2..." -msgstr "是 --dirstat=files,param1,param2... 的同義詞" - -#: diff.c:5425 -msgid "warn if changes introduce conflict markers or whitespace errors" -msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" - -#: diff.c:5428 -msgid "condensed summary such as creations, renames and mode changes" -msgstr "精簡摘要，例如建立、重新命名和模式變更" - -#: diff.c:5431 -msgid "show only names of changed files" -msgstr "只顯示變更檔案的檔案名" - -#: diff.c:5434 -msgid "show only names and status of changed files" -msgstr "只顯示變更檔案的檔案名和狀態" - -#: diff.c:5436 -msgid "<width>[,<name-width>[,<count>]]" -msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" - -#: diff.c:5437 -msgid "generate diffstat" -msgstr "生成差異統計（diffstat）" - -#: diff.c:5439 diff.c:5442 diff.c:5445 -msgid "<width>" -msgstr "<寬度>" - -#: diff.c:5440 -msgid "generate diffstat with a given width" -msgstr "使用提供的長度生成差異統計" - -#: diff.c:5443 -msgid "generate diffstat with a given name width" -msgstr "使用提供的檔案名長度生成差異統計" - -#: diff.c:5446 -msgid "generate diffstat with a given graph width" -msgstr "使用提供的圖形長度生成差異統計" - -#: diff.c:5448 -msgid "<count>" -msgstr "<次數>" - -#: diff.c:5449 -msgid "generate diffstat with limited lines" -msgstr "生成有限行數的差異統計" - -#: diff.c:5452 -msgid "generate compact summary in diffstat" -msgstr "生成差異統計的簡潔摘要" - -#: diff.c:5455 -msgid "output a binary diff that can be applied" -msgstr "輸出一個可以套用的二進位差異" - -#: diff.c:5458 -msgid "show full pre- and post-image object names on the \"index\" lines" -msgstr "在 \"index\" 行顯示完整的前後物件名稱" - -#: diff.c:5460 -msgid "show colored diff" -msgstr "顯示帶顏色的差異" - -#: diff.c:5461 -msgid "<kind>" -msgstr "<類型>" - -#: diff.c:5462 -msgid "" -"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " -"diff" -msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" - -#: diff.c:5465 -msgid "" -"do not munge pathnames and use NULs as output field terminators in --raw or " -"--numstat" -msgstr "" -"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" -"符" - -#: diff.c:5468 diff.c:5471 diff.c:5474 diff.c:5583 -msgid "<prefix>" -msgstr "<前綴>" - -#: diff.c:5469 -msgid "show the given source prefix instead of \"a/\"" -msgstr "顯示提供的來源前綴，而非 \"a/\"" - -#: diff.c:5472 -msgid "show the given destination prefix instead of \"b/\"" -msgstr "顯示提供的目的地前綴取代 \"b/\"" - -#: diff.c:5475 -msgid "prepend an additional prefix to every line of output" -msgstr "輸出的每一行附加前綴" - -#: diff.c:5478 -msgid "do not show any source or destination prefix" -msgstr "不顯示任何來源和目的地前綴" - -#: diff.c:5481 -msgid "show context between diff hunks up to the specified number of lines" -msgstr "顯示指定行數的差異區塊間的上下文" - -#: diff.c:5485 diff.c:5490 diff.c:5495 -msgid "<char>" -msgstr "<字元>" - -#: diff.c:5486 -msgid "specify the character to indicate a new line instead of '+'" -msgstr "指定一個字元取代 '+' 來表示新的一行" - -#: diff.c:5491 -msgid "specify the character to indicate an old line instead of '-'" -msgstr "指定一個字元取代 '-' 來表示舊的一行" - -#: diff.c:5496 -msgid "specify the character to indicate a context instead of ' '" -msgstr "指定一個字元取代 ' ' 來表示一行上下文" - -#: diff.c:5499 -msgid "Diff rename options" -msgstr "差異重新命名選項" - -#: diff.c:5500 -msgid "<n>[/<m>]" -msgstr "<n>[/<m>]" - -#: diff.c:5501 -msgid "break complete rewrite changes into pairs of delete and create" -msgstr "將完全重寫的變更打破為成對的刪除和建立" - -#: diff.c:5505 -msgid "detect renames" -msgstr "檢測重新命名" - -#: diff.c:5509 -msgid "omit the preimage for deletes" -msgstr "省略刪除變更的差異輸出" - -#: diff.c:5512 -msgid "detect copies" -msgstr "檢測複製" - -#: diff.c:5516 -msgid "use unmodified files as source to find copies" -msgstr "使用未修改的檔案做為發現拷貝的來源" - -#: diff.c:5518 -msgid "disable rename detection" -msgstr "停用重新命名偵測" - -#: diff.c:5521 -msgid "use empty blobs as rename source" -msgstr "使用空的資料物件做為重新命名的來源" - -#: diff.c:5523 -msgid "continue listing the history of a file beyond renames" -msgstr "繼續列出檔案重新命名以外的歷史記錄" - -#: diff.c:5526 -msgid "" -"prevent rename/copy detection if the number of rename/copy targets exceeds " -"given limit" -msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" - -#: diff.c:5528 -msgid "Diff algorithm options" -msgstr "差異演算法選項" - -#: diff.c:5530 -msgid "produce the smallest possible diff" -msgstr "生成儘可能小的差異" - -#: diff.c:5533 -msgid "ignore whitespace when comparing lines" -msgstr "行比較時忽略空白字元" - -#: diff.c:5536 -msgid "ignore changes in amount of whitespace" -msgstr "忽略空白字元的變更" - -#: diff.c:5539 -msgid "ignore changes in whitespace at EOL" -msgstr "忽略行尾的空白字元變更" - -#: diff.c:5542 -msgid "ignore carrier-return at the end of line" -msgstr "忽略行尾的Enter符（CR）" - -#: diff.c:5545 -msgid "ignore changes whose lines are all blank" -msgstr "忽略整行都是空白的變更" - -#: diff.c:5547 diff.c:5569 diff.c:5572 diff.c:5617 -msgid "<regex>" -msgstr "<正則>" - -#: diff.c:5548 -msgid "ignore changes whose all lines match <regex>" -msgstr "忽略整行符合 <regex> 的變更" - -#: diff.c:5551 -msgid "heuristic to shift diff hunk boundaries for easy reading" -msgstr "啟發式轉換差異邊界以便閱讀" - -#: diff.c:5554 -msgid "generate diff using the \"patience diff\" algorithm" -msgstr "使用 \"patience diff\" 演算法生成差異" - -#: diff.c:5558 -msgid "generate diff using the \"histogram diff\" algorithm" -msgstr "使用 \"histogram diff\" 演算法生成差異" - -#: diff.c:5560 -msgid "<algorithm>" -msgstr "<演算法>" - -#: diff.c:5561 -msgid "choose a diff algorithm" -msgstr "選擇一個差異演算法" - -#: diff.c:5563 -msgid "<text>" -msgstr "<文字>" - -#: diff.c:5564 -msgid "generate diff using the \"anchored diff\" algorithm" -msgstr "使用 \"anchored diff\" 演算法生成差異" - -#: diff.c:5566 diff.c:5575 diff.c:5578 -msgid "<mode>" -msgstr "<模式>" - -#: diff.c:5567 -msgid "show word diff, using <mode> to delimit changed words" -msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" - -#: diff.c:5570 -msgid "use <regex> to decide what a word is" -msgstr "使用 <常規表示式> 確定何為一個詞" - -#: diff.c:5573 -msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" -msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" - -#: diff.c:5576 -msgid "moved lines of code are colored differently" -msgstr "移動的程式碼行用不同方式著色" - -#: diff.c:5579 -msgid "how white spaces are ignored in --color-moved" -msgstr "在 --color-moved 下如何忽略空白字元" - -#: diff.c:5582 -msgid "Other diff options" -msgstr "其它差異選項" - -#: diff.c:5584 -msgid "when run from subdir, exclude changes outside and show relative paths" -msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" - -#: diff.c:5588 -msgid "treat all files as text" -msgstr "把所有檔案當做文字處理" - -#: diff.c:5590 -msgid "swap two inputs, reverse the diff" -msgstr "交換兩個輸入，反轉差異" - -#: diff.c:5592 -msgid "exit with 1 if there were differences, 0 otherwise" -msgstr "有差異時離開碼為 1，否則為 0" - -#: diff.c:5594 -msgid "disable all output of the program" -msgstr "停用本程式的所有輸出" - -#: diff.c:5596 -msgid "allow an external diff helper to be executed" -msgstr "允許執行一個外部的差異協助工具" - -#: diff.c:5598 -msgid "run external text conversion filters when comparing binary files" -msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" - -#: diff.c:5600 -msgid "<when>" -msgstr "<何時>" - -#: diff.c:5601 -msgid "ignore changes to submodules in the diff generation" -msgstr "在生成差異時，忽略子模組的更改" - -#: diff.c:5604 -msgid "<format>" -msgstr "<格式>" - -#: diff.c:5605 -msgid "specify how differences in submodules are shown" -msgstr "指定子模組的差異如何顯示" - -#: diff.c:5609 -msgid "hide 'git add -N' entries from the index" -msgstr "隱藏索引中 'git add -N' 條目" - -#: diff.c:5612 -msgid "treat 'git add -N' entries as real in the index" -msgstr "將索引中 'git add -N' 條目當做真實的" - -#: diff.c:5614 -msgid "<string>" -msgstr "<字串>" - -#: diff.c:5615 -msgid "" -"look for differences that change the number of occurrences of the specified " -"string" -msgstr "尋找改變了指定字串出現次數的差異" - -#: diff.c:5618 -msgid "" -"look for differences that change the number of occurrences of the specified " -"regex" -msgstr "尋找改變指定正則符合出現次數的差異" - -#: diff.c:5621 -msgid "show all changes in the changeset with -S or -G" -msgstr "顯示使用 -S 或 -G 的變更集的所有變更" - -#: diff.c:5624 -msgid "treat <string> in -S as extended POSIX regular expression" -msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式" - -#: diff.c:5627 -msgid "control the order in which files appear in the output" -msgstr "控制輸出中的檔案顯示順序" - -#: diff.c:5628 diff.c:5631 -msgid "<path>" -msgstr "<路徑>" - -#: diff.c:5629 -msgid "show the change in the specified path first" -msgstr "先顯示指定路徑的變更" - -#: diff.c:5632 -msgid "skip the output to the specified path" -msgstr "略過輸出至指定路徑" - -#: diff.c:5634 -msgid "<object-id>" -msgstr "<物件 ID>" - -#: diff.c:5635 -msgid "" -"look for differences that change the number of occurrences of the specified " -"object" -msgstr "尋找改變指定物件出現次數的差異" - -#: diff.c:5637 -msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" -msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" - -#: diff.c:5638 -msgid "select files by diff type" -msgstr "透過差異類型選擇檔案" - -#: diff.c:5640 -msgid "<file>" -msgstr "<檔案>" - -#: diff.c:5641 -msgid "output to a specific file" -msgstr "輸出至指定檔案" - -#: diff.c:6321 -msgid "exhaustive rename detection was skipped due to too many files." -msgstr "因為檔案太多，已略過詳細重新命名偵測。" - -#: diff.c:6324 -msgid "only found copies from modified paths due to too many files." -msgstr "因為檔案太多，只在修改的路徑中尋找複製。" - -#: diff.c:6327 -#, c-format -msgid "" -"you may want to set your %s variable to at least %d and retry the command." -msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" - -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "讀取排序檔案 '%s' 失敗" - -#: diffcore-rename.c:1564 -msgid "Performing inexact rename detection" -msgstr "正在進行非精確的重新命名偵測" - -#: diffcore-rotate.c:29 -#, c-format -msgid "No such path '%s' in the diff" -msgstr "diff 中沒有「%s」路徑" - -#: dir.c:593 -#, c-format -msgid "pathspec '%s' did not match any file(s) known to git" -msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" - -#: dir.c:733 dir.c:762 dir.c:775 -#, c-format -msgid "unrecognized pattern: '%s'" -msgstr "無法識別樣式：「%s」" - -#: dir.c:790 dir.c:804 -#, c-format -msgid "unrecognized negative pattern: '%s'" -msgstr "無法識別反向模式：「%s」" - -#: dir.c:820 -#, c-format -msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" -msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" - -#: dir.c:828 -msgid "disabling cone pattern matching" -msgstr "停用 cone 樣式符合模式" - -#: dir.c:1212 -#, c-format -msgid "cannot use %s as an exclude file" -msgstr "不能將 %s 用作排除檔案" - -#: dir.c:2419 -#, c-format -msgid "could not open directory '%s'" -msgstr "不能開啟目錄 '%s'" - -#: dir.c:2721 -msgid "failed to get kernel name and information" -msgstr "無法獲得核心名稱和訊息" - -#: dir.c:2846 -msgid "untracked cache is disabled on this system or location" -msgstr "快取未追蹤檔案在本系統或位置中被停用" - -#: dir.c:3119 -msgid "" -"No directory name could be guessed.\n" -"Please specify a directory on the command line" -msgstr "" -"無法猜到目錄名。\n" -"請在指令列指定一個目錄" - -#: dir.c:3807 -#, c-format -msgid "index file corrupt in repo %s" -msgstr "版本庫 %s 中的索引檔案損壞" - -#: dir.c:3854 dir.c:3859 -#, c-format -msgid "could not create directories for %s" -msgstr "不能為 %s 建立目錄" - -#: dir.c:3888 -#, c-format -msgid "could not migrate git directory from '%s' to '%s'" -msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" - -#: editor.c:74 -#, c-format -msgid "hint: Waiting for your editor to close the file...%c" -msgstr "提示：等待您的編輯器關閉檔案...%c" - -#: entry.c:179 -msgid "Filtering content" -msgstr "過濾內容" - -#: entry.c:500 -#, c-format -msgid "could not stat file '%s'" -msgstr "不能對檔案 '%s' 呼叫 stat" - -#: environment.c:147 -#, c-format -msgid "bad git namespace path \"%s\"" -msgstr "錯誤的 git 名字空間路徑 \"%s\"" - -#: exec-cmd.c:363 -#, c-format -msgid "too many args to run %s" -msgstr "執行 %s 的參數太多" - -#: fetch-pack.c:194 -msgid "git fetch-pack: expected shallow list" -msgstr "git fetch-pack：應為 shallow 列表" - -#: fetch-pack.c:197 -msgid "git fetch-pack: expected a flush packet after shallow list" -msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" - -#: fetch-pack.c:208 -msgid "git fetch-pack: expected ACK/NAK, got a flush packet" -msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" - -#: fetch-pack.c:228 -#, c-format -msgid "git fetch-pack: expected ACK/NAK, got '%s'" -msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" - -#: fetch-pack.c:239 -msgid "unable to write to remote" -msgstr "無法寫到遠端" - -#: fetch-pack.c:397 fetch-pack.c:1460 -#, c-format -msgid "invalid shallow line: %s" -msgstr "無效的 shallow 訊息：%s" - -#: fetch-pack.c:403 fetch-pack.c:1466 -#, c-format -msgid "invalid unshallow line: %s" -msgstr "無效的 unshallow 訊息：%s" - -#: fetch-pack.c:405 fetch-pack.c:1468 -#, c-format -msgid "object not found: %s" -msgstr "物件未找到：%s" - -#: fetch-pack.c:408 fetch-pack.c:1471 -#, c-format -msgid "error in object: %s" -msgstr "物件中發生錯誤：%s" - -#: fetch-pack.c:410 fetch-pack.c:1473 -#, c-format -msgid "no shallow found: %s" -msgstr "未發現 shallow：%s" - -#: fetch-pack.c:413 fetch-pack.c:1477 -#, c-format -msgid "expected shallow/unshallow, got %s" -msgstr "應為 shallow/unshallow，卻得到 %s" - -#: fetch-pack.c:453 -#, c-format -msgid "got %s %d %s" -msgstr "得到 %s %d %s" - -#: fetch-pack.c:470 -#, c-format -msgid "invalid commit %s" -msgstr "無效提交 %s" - -#: fetch-pack.c:501 -msgid "giving up" -msgstr "放棄" - -#: fetch-pack.c:514 progress.h:25 -msgid "done" -msgstr "完成" - -#: fetch-pack.c:526 -#, c-format -msgid "got %s (%d) %s" -msgstr "得到 %s (%d) %s" - -#: fetch-pack.c:562 -#, c-format -msgid "Marking %s as complete" -msgstr "標記 %s 為完成" - -#: fetch-pack.c:784 -#, c-format -msgid "already have %s (%s)" -msgstr "已經有 %s（%s）" - -#: fetch-pack.c:870 -msgid "fetch-pack: unable to fork off sideband demultiplexer" -msgstr "fetch-pack：無法衍生 sideband 多路輸出" - -#: fetch-pack.c:878 -msgid "protocol error: bad pack header" -msgstr "協定錯誤：壞的包頭" - -#: fetch-pack.c:974 -#, c-format -msgid "fetch-pack: unable to fork off %s" -msgstr "fetch-pack：無法 fork %s 處理程序" - -#: fetch-pack.c:980 -msgid "fetch-pack: invalid index-pack output" -msgstr "fetch-pack：無效的 index-pack 輸出" - -#: fetch-pack.c:997 -#, c-format -msgid "%s failed" -msgstr "%s 失敗" - -#: fetch-pack.c:999 -msgid "error in sideband demultiplexer" -msgstr "sideband 多路輸出發生錯誤" - -#: fetch-pack.c:1048 -#, c-format -msgid "Server version is %.*s" -msgstr "伺服器版本 %.*s" - -#: fetch-pack.c:1056 fetch-pack.c:1062 fetch-pack.c:1065 fetch-pack.c:1071 -#: fetch-pack.c:1075 fetch-pack.c:1079 fetch-pack.c:1083 fetch-pack.c:1087 -#: fetch-pack.c:1091 fetch-pack.c:1095 fetch-pack.c:1099 fetch-pack.c:1103 -#: fetch-pack.c:1109 fetch-pack.c:1115 fetch-pack.c:1120 fetch-pack.c:1125 -#, c-format -msgid "Server supports %s" -msgstr "伺服器支援 %s" - -#: fetch-pack.c:1058 -msgid "Server does not support shallow clients" -msgstr "伺服器不支援 shallow 用戶端" - -#: fetch-pack.c:1118 -msgid "Server does not support --shallow-since" -msgstr "伺服器不支援 --shallow-since" - -#: fetch-pack.c:1123 -msgid "Server does not support --shallow-exclude" -msgstr "伺服器不支援 --shallow-exclude" - -#: fetch-pack.c:1127 -msgid "Server does not support --deepen" -msgstr "伺服器不支援 --deepen" - -#: fetch-pack.c:1129 -msgid "Server does not support this repository's object format" -msgstr "伺服器不支援此版本庫的物件格式" - -#: fetch-pack.c:1142 -msgid "no common commits" -msgstr "沒有共同的提交" - -#: fetch-pack.c:1151 fetch-pack.c:1506 builtin/clone.c:1166 -msgid "source repository is shallow, reject to clone." -msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" - -#: fetch-pack.c:1157 fetch-pack.c:1705 -msgid "git fetch-pack: fetch failed." -msgstr "git fetch-pack：取得失敗。" - -#: fetch-pack.c:1271 -#, c-format -msgid "mismatched algorithms: client %s; server %s" -msgstr "算法不一致：用戶端 %s；伺服器 %s" - -#: fetch-pack.c:1275 -#, c-format -msgid "the server does not support algorithm '%s'" -msgstr "伺服器不支援「%s」算法" - -#: fetch-pack.c:1308 -msgid "Server does not support shallow requests" -msgstr "伺服器不支援 shallow 請求" - -#: fetch-pack.c:1315 -msgid "Server supports filter" -msgstr "伺服器支援 filter" - -#: fetch-pack.c:1358 fetch-pack.c:2087 -msgid "unable to write request to remote" -msgstr "無法將請求寫到遠端" - -#: fetch-pack.c:1376 -#, c-format -msgid "error reading section header '%s'" -msgstr "讀取節標題 '%s' 發生錯誤" - -#: fetch-pack.c:1382 -#, c-format -msgid "expected '%s', received '%s'" -msgstr "預期 '%s'，得到 '%s'" - -#: fetch-pack.c:1416 -#, c-format -msgid "unexpected acknowledgment line: '%s'" -msgstr "意外的確認行：'%s'" - -#: fetch-pack.c:1421 -#, c-format -msgid "error processing acks: %d" -msgstr "處理 ack 發生錯誤：%d" - -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1435 -#, c-format -msgid "expected packfile to be sent after '%s'" -msgstr "預期在 「%s」後傳送 packfile" - -#. TRANSLATORS: The parameter will be 'ready', a protocol -#. keyword. -#. -#: fetch-pack.c:1441 -#, c-format -msgid "expected no other sections to be sent after no '%s'" -msgstr "預期在沒有「%s」後不傳送其他區段" - -#: fetch-pack.c:1482 -#, c-format -msgid "error processing shallow info: %d" -msgstr "處理淺複製訊息發生錯誤：%d" - -#: fetch-pack.c:1531 -#, c-format -msgid "expected wanted-ref, got '%s'" -msgstr "預期 wanted-ref，得到 '%s'" - -#: fetch-pack.c:1536 -#, c-format -msgid "unexpected wanted-ref: '%s'" -msgstr "意外的 wanted-ref：'%s'" - -#: fetch-pack.c:1541 -#, c-format -msgid "error processing wanted refs: %d" -msgstr "處理要取得的引用發生錯誤：%d" - -#: fetch-pack.c:1571 -msgid "git fetch-pack: expected response end packet" -msgstr "git fetch-pack: 預期要有回應結束封包" - -#: fetch-pack.c:1983 -msgid "no matching remote head" -msgstr "沒有符合的遠端分支" - -#: fetch-pack.c:2006 builtin/clone.c:587 -msgid "remote did not send all necessary objects" -msgstr "遠端沒有傳送所有必需的物件" - -#: fetch-pack.c:2109 -msgid "unexpected 'ready' from remote" -msgstr "從遠端收到非預期的 ‘ready’" - -#: fetch-pack.c:2132 -#, c-format -msgid "no such remote ref %s" -msgstr "沒有這樣的遠端引用 %s" - -#: fetch-pack.c:2135 -#, c-format -msgid "Server does not allow request for unadvertised object %s" -msgstr "伺服器不允許請求未公開的物件 %s" - -#: fsmonitor-ipc.c:119 -#, c-format -msgid "fsmonitor_ipc__send_query: invalid path '%s'" -msgstr "fsmonitor_ipc__send_query：路徑「%s」無效" - -#: fsmonitor-ipc.c:125 -#, c-format -msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" -msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤" - -#: fsmonitor-ipc.c:155 -msgid "fsmonitor--daemon is not running" -msgstr "fsmonitor--daemon 未在運作" - -#: fsmonitor-ipc.c:164 -#, c-format -msgid "could not send '%s' command to fsmonitor--daemon" -msgstr "無法將「%s」命令傳送到 fsmonitor--daemon" - -#: gpg-interface.c:329 gpg-interface.c:456 gpg-interface.c:995 -#: gpg-interface.c:1011 -msgid "could not create temporary file" -msgstr "不能建立暫存檔" - -#: gpg-interface.c:332 gpg-interface.c:459 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "無法將分離式簽名寫入 '%s'" - -#: gpg-interface.c:450 -msgid "" -"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " -"signature verification" -msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在" - -#: gpg-interface.c:479 -msgid "" -"ssh-keygen -Y find-principals/verify is needed for ssh signature " -"verification (available in openssh version 8.2p1+)" -msgstr "" -"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ " -"版本使用）" - -#: gpg-interface.c:550 -#, c-format -msgid "ssh signing revocation file configured but not found: %s" -msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s" - -#: gpg-interface.c:638 -#, c-format -msgid "bad/incompatible signature '%s'" -msgstr "簽名「%s」損壞或者不相容" - -#: gpg-interface.c:815 gpg-interface.c:820 -#, c-format -msgid "failed to get the ssh fingerprint for key '%s'" -msgstr "無法取得「%s」金鑰的 SSH 指紋" - -#: gpg-interface.c:843 -msgid "" -"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" -msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一" - -#: gpg-interface.c:865 -#, c-format -msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s" - -#: gpg-interface.c:871 -#, c-format -msgid "gpg.ssh.defaultKeyCommand failed: %s %s" -msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s" - -#: gpg-interface.c:966 -msgid "gpg failed to sign the data" -msgstr "gpg 無法為資料簽名" - -#: gpg-interface.c:988 -msgid "user.signingkey needs to be set for ssh signing" -msgstr "需要設定 user.signingkey 才能進行 SSH 簽名" - -#: gpg-interface.c:999 -#, c-format -msgid "failed writing ssh signing key to '%s'" -msgstr "無法將 SSH 簽名金鑰寫入「%s」" - -#: gpg-interface.c:1017 -#, c-format -msgid "failed writing ssh signing key buffer to '%s'" -msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」" - -#: gpg-interface.c:1035 -msgid "" -"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " -"8.2p1+)" -msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）" - -#: gpg-interface.c:1047 -#, c-format -msgid "failed reading ssh signing data buffer from '%s'" -msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區" - -#: graph.c:98 -#, c-format -msgid "ignored invalid color '%.*s' in log.graphColors" -msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" - -#: grep.c:446 -msgid "" -"given pattern contains NULL byte (via -f <file>). This is only supported " -"with -P under PCRE v2" -msgstr "" -"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" -"功能" - -#: grep.c:1859 -#, c-format -msgid "'%s': unable to read %s" -msgstr "'%s'：無法讀取 %s" - -#: grep.c:1876 setup.c:178 builtin/clone.c:308 builtin/diff.c:90 -#: builtin/rm.c:136 -#, c-format -msgid "failed to stat '%s'" -msgstr "對 '%s' 呼叫 stat 失敗" - -#: grep.c:1887 -#, c-format -msgid "'%s': short read" -msgstr "'%s'：讀取不完整" - -#: help.c:25 -msgid "start a working area (see also: git help tutorial)" -msgstr "開始一個工作區（參見：git help tutorial）" - -#: help.c:26 -msgid "work on the current change (see also: git help everyday)" -msgstr "在目前變更上工作（參見：git help everyday）" - -#: help.c:27 -msgid "examine the history and state (see also: git help revisions)" -msgstr "檢查歷史和狀態（參見：git help revisions）" - -#: help.c:28 -msgid "grow, mark and tweak your common history" -msgstr "擴展、標記和調校您的歷史記錄" - -#: help.c:29 -msgid "collaborate (see also: git help workflows)" -msgstr "協同（參見：git help workflows）" - -#: help.c:33 -msgid "Main Porcelain Commands" -msgstr "主要的上層指令" - -#: help.c:34 -msgid "Ancillary Commands / Manipulators" -msgstr "輔助指令/動作者" - -#: help.c:35 -msgid "Ancillary Commands / Interrogators" -msgstr "輔助指令/詢問者" - -#: help.c:36 -msgid "Interacting with Others" -msgstr "與其它系統互動" - -#: help.c:37 -msgid "Low-level Commands / Manipulators" -msgstr "低級指令/動作者" - -#: help.c:38 -msgid "Low-level Commands / Interrogators" -msgstr "低級指令/詢問者" - -#: help.c:39 -msgid "Low-level Commands / Syncing Repositories" -msgstr "低級指令 / 同步版本庫" - -#: help.c:40 -msgid "Low-level Commands / Internal Helpers" -msgstr "低級指令/內部協助工具" - -#: help.c:316 -#, c-format -msgid "available git commands in '%s'" -msgstr "在 '%s' 下可用的 git 指令" - -#: help.c:323 -msgid "git commands available from elsewhere on your $PATH" -msgstr "在 $PATH 路徑中的其他地方可用的 git 指令" - -#: help.c:332 -msgid "These are common Git commands used in various situations:" -msgstr "這些是各種場合常見的 Git 指令：" - -#: help.c:382 git.c:100 -#, c-format -msgid "unsupported command listing type '%s'" -msgstr "不支援的指令列表類型 '%s'" - -#: help.c:422 -msgid "The Git concept guides are:" -msgstr "Git 概念嚮導有：" - -#: help.c:446 -msgid "External commands" -msgstr "外部指令" - -#: help.c:468 -msgid "Command aliases" -msgstr "指令別名" - -#: help.c:486 -msgid "See 'git help <command>' to read about a specific subcommand" -msgstr "執行 'git help <command>' 來檢視特定子指令" - -#: help.c:563 -#, c-format -msgid "" -"'%s' appears to be a git command, but we were not\n" -"able to execute it. Maybe git-%s is broken?" -msgstr "" -"'%s' 像是一個 git 指令，但卻無法執行。\n" -"可能是 git-%s 受損？" - -#: help.c:585 help.c:682 -#, c-format -msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" - -#: help.c:633 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "唉呀，您的系統中未發現 Git 指令。" - -#: help.c:655 -#, c-format -msgid "WARNING: You called a Git command named '%s', which does not exist." -msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。" - -#: help.c:660 -#, c-format -msgid "Continuing under the assumption that you meant '%s'." -msgstr "假定你想要的是 '%s' 並繼續。" - -#: help.c:666 -#, c-format -msgid "Run '%s' instead [y/N]? " -msgstr "改執行「%s」[y/N]？ " - -#: help.c:674 -#, c-format -msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." -msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。" - -#: help.c:686 -msgid "" -"\n" -"The most similar command is" -msgid_plural "" -"\n" -"The most similar commands are" -msgstr[0] "" -"\n" -"最類似的指令有" - -#: help.c:729 -msgid "git version [<options>]" -msgstr "git version [<選項>]" - -#: help.c:784 -#, c-format -msgid "%s: %s - %s" -msgstr "%s：%s - %s" - -#: help.c:788 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"您指的是這個嗎？" - -#: hook.c:28 -#, c-format -msgid "" -"The '%s' hook was ignored because it's not set as executable.\n" -"You can disable this warning with `git config advice.ignoredHook false`." -msgstr "" -"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" -"設定 `git config advice.ignoredHook false` 來關閉這條警告。" - -#: hook.c:87 -#, c-format -msgid "Couldn't start hook '%s'\n" -msgstr "無法啟動「%s」掛鉤\n" - -#: ident.c:354 -msgid "Author identity unknown\n" -msgstr "作者身分未知\n" - -#: ident.c:357 -msgid "Committer identity unknown\n" -msgstr "提交者身分未知\n" - -#: ident.c:363 -msgid "" -"\n" -"*** Please tell me who you are.\n" -"\n" -"Run\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"to set your account's default identity.\n" -"Omit --global to set the identity only in this repository.\n" -"\n" -msgstr "" -"\n" -"*** 請告訴我你是誰。\n" -"\n" -"執行\n" -"\n" -" git config --global user.email \"you@example.com\"\n" -" git config --global user.name \"Your Name\"\n" -"\n" -"來設定您帳號的預設身份標記。\n" -"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n" -"\n" - -#: ident.c:398 -msgid "no email was given and auto-detection is disabled" -msgstr "未提供信件位址且自動偵測被停用" - -#: ident.c:403 -#, c-format -msgid "unable to auto-detect email address (got '%s')" -msgstr "無法自動偵測信件位址（得到 '%s'）" - -#: ident.c:420 -msgid "no name was given and auto-detection is disabled" -msgstr "未提供姓名且自動偵測被停用" - -#: ident.c:426 -#, c-format -msgid "unable to auto-detect name (got '%s')" -msgstr "無法自動偵測姓名（得到 '%s'）" - -#: ident.c:434 -#, c-format -msgid "empty ident name (for <%s>) not allowed" -msgstr "不允許空的姓名（對於 <%s>）" - -#: ident.c:440 -#, c-format -msgid "name consists only of disallowed characters: %s" -msgstr "姓名中僅包含停用字元：%s" - -#: ident.c:455 builtin/commit.c:649 -#, c-format -msgid "invalid date format: %s" -msgstr "無效的日期格式：%s" - -#: list-objects-filter-options.c:68 -msgid "expected 'tree:<depth>'" -msgstr "期望 'tree:<深度>'" - -#: list-objects-filter-options.c:83 -msgid "sparse:path filters support has been dropped" -msgstr "sparse:path 過濾器支援已被刪除" - -#: list-objects-filter-options.c:90 -#, c-format -msgid "'%s' for 'object:type=<type>' is not a valid object type" -msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式" - -#: list-objects-filter-options.c:109 -#, c-format -msgid "invalid filter-spec '%s'" -msgstr "無效的過濾器規格 '%s'" - -#: list-objects-filter-options.c:125 -#, c-format -msgid "must escape char in sub-filter-spec: '%c'" -msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" - -#: list-objects-filter-options.c:167 -msgid "expected something after combine:" -msgstr "期望在組合後有一些東西：" - -#: list-objects-filter-options.c:249 -msgid "multiple filter-specs cannot be combined" -msgstr "不能混用多種過濾規格" - -#: list-objects-filter-options.c:365 -msgid "unable to upgrade repository format to support partial clone" -msgstr "無法升級版本庫格式，以致不支援部分複製" - -#: list-objects-filter.c:532 -#, c-format -msgid "unable to access sparse blob in '%s'" -msgstr "不能存取 '%s' 中的稀疏資料物件" - -#: list-objects-filter.c:535 -#, c-format -msgid "unable to parse sparse filter data in %s" -msgstr "無法解析 %s 中的稀疏過濾器資料" - -#: list-objects.c:144 -#, c-format -msgid "entry '%s' in tree %s has tree mode, but is not a tree" -msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件" - -#: list-objects.c:157 -#, c-format -msgid "entry '%s' in tree %s has blob mode, but is not a blob" -msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" - -#: list-objects.c:415 -#, c-format -msgid "unable to load root tree for commit %s" -msgstr "無法為提交 %s 載入根樹" - -#: lockfile.c:152 -#, c-format -msgid "" -"Unable to create '%s.lock': %s.\n" -"\n" -"Another git process seems to be running in this repository, e.g.\n" -"an editor opened by 'git commit'. Please make sure all processes\n" -"are terminated then try again. If it still fails, a git process\n" -"may have crashed in this repository earlier:\n" -"remove the file manually to continue." -msgstr "" -"無法建立 '%s.lock'：%s。\n" -"\n" -"這個版本庫似乎有另一個 git 處理程序在執行，\n" -"例如「git commit」命令開啟的編輯器。\n" -"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n" -"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n" -"如果是這樣，請自行刪除這個檔案再繼續。" - -#: lockfile.c:160 -#, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "不能建立 '%s.lock'：%s" - -#: ls-refs.c:175 -#, c-format -msgid "unexpected line: '%s'" -msgstr "遇到非預期橫列：「%s」" - -#: ls-refs.c:179 -msgid "expected flush after ls-refs arguments" -msgstr "在 ls-refs 引數之後應該有一個 flush 包" - -#: mailinfo.c:1050 -msgid "quoted CRLF detected" -msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" - -#: mailinfo.c:1254 builtin/am.c:185 builtin/mailinfo.c:46 -#, c-format -msgid "bad action '%s' for '%s'" -msgstr "「%s」動作對「%s」無效" - -#: merge-ort.c:1630 merge-recursive.c:1214 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "無法合併子模組 %s （沒有簽出）" - -#: merge-ort.c:1639 merge-recursive.c:1221 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "無法合併子模組 %s（提交不存在）" - -#: merge-ort.c:1648 merge-recursive.c:1228 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" - -#: merge-ort.c:1658 merge-ort.c:1666 -#, c-format -msgid "Note: Fast-forwarding submodule %s to %s" -msgstr "注意：正在將 %s 子模組快轉到 %s" - -#: merge-ort.c:1688 -#, c-format -msgid "Failed to merge submodule %s" -msgstr "無法合併 %s 子模組" - -#: merge-ort.c:1695 -#, c-format -msgid "" -"Failed to merge submodule %s, but a possible merge resolution exists:\n" -"%s\n" -msgstr "" -"無法合併 %s 子模組，但有找到一個可行的合併方案：\n" -"%s\n" - -#: merge-ort.c:1699 merge-recursive.c:1284 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"正確的話，就能直接加進索引，例如執行下述命令：\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"接受本建議。\n" - -#: merge-ort.c:1712 -#, c-format -msgid "" -"Failed to merge submodule %s, but multiple possible merges exist:\n" -"%s" -msgstr "" -"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" -"%s" - -#: merge-ort.c:1937 merge-recursive.c:1375 -msgid "Failed to execute internal merge" -msgstr "無法執行內部合併" - -#: merge-ort.c:1942 merge-recursive.c:1380 -#, c-format -msgid "Unable to add %s to database" -msgstr "不能新增 %s 至物件庫" - -#: merge-ort.c:1949 merge-recursive.c:1413 -#, c-format -msgid "Auto-merging %s" -msgstr "自動合併 %s" - -#: merge-ort.c:2088 merge-recursive.c:2135 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" -"放在：%s。" - -#: merge-ort.c:2098 merge-recursive.c:2145 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" -"些路徑放置於此：%s" - -#: merge-ort.c:2156 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to rename %s to; it was " -"renamed to multiple other directories, with no destination getting a " -"majority of the files." -msgstr "" -"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" -"錄，但沒有目的地取得過半檔案。" - -#: merge-ort.c:2310 merge-recursive.c:2481 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" - -#: merge-ort.c:2450 merge-recursive.c:3264 -#, 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。" - -#: merge-ort.c:2457 merge-recursive.c:3271 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" -"其移動到 %5$s。" - -#: merge-ort.c:2470 merge-recursive.c:3267 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" -"動到 %s。" - -#: merge-ort.c:2478 merge-recursive.c:3274 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " -"中，建議將其移動到 %5$s。" - -#: merge-ort.c:2634 -#, c-format -msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." -msgstr "" -"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " -"%4$s。" - -#: merge-ort.c:2729 -#, c-format -msgid "" -"CONFLICT (rename involved in collision): rename of %s -> %s has content " -"conflicts AND collides with another path; this may result in nested conflict " -"markers." -msgstr "" -"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" -"能會因此出現巢狀衝突標記。" - -#: merge-ort.c:2748 merge-ort.c:2772 -#, c-format -msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." -msgstr "" -"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" - -#: merge-ort.c:3261 merge-recursive.c:3025 -#, c-format -msgid "cannot read object %s" -msgstr "不能讀取物件 %s" - -#: merge-ort.c:3264 merge-recursive.c:3028 -#, c-format -msgid "object %s is not a blob" -msgstr "物件 %s 不是一個資料物件" - -#: merge-ort.c:3693 -#, c-format -msgid "" -"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " -"%s instead." -msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" - -#: merge-ort.c:3770 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed both " -"of them so each can be recorded somewhere." -msgstr "" -"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" -"別記錄這兩方檔案。" - -#: merge-ort.c:3777 -#, c-format -msgid "" -"CONFLICT (distinct types): %s had different types on each side; renamed one " -"of them so each can be recorded somewhere." -msgstr "" -"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" -"分別記錄這兩方檔案。" - -#: merge-ort.c:3866 merge-recursive.c:3104 -msgid "content" -msgstr "內容" - -#: merge-ort.c:3868 merge-recursive.c:3108 -msgid "add/add" -msgstr "新增/新增" - -#: merge-ort.c:3870 merge-recursive.c:3153 -msgid "submodule" -msgstr "子模組" - -#: merge-ort.c:3872 merge-recursive.c:3154 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "衝突（%s）：合併衝突於 %s" - -#: merge-ort.c:3916 -#, c-format -msgid "" -"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " -"of %s left in tree." -msgstr "" -"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" -"上。" - -#: merge-ort.c:4212 -#, c-format -msgid "" -"Note: %s not up to date and in way of checking out conflicted version; old " -"copy renamed to %s" -msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s" - -#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge -#. base, and 2-3) the trees for the two trees we're merging. -#. -#: merge-ort.c:4586 -#, c-format -msgid "collecting merge info failed for trees %s, %s, %s" -msgstr "%s, %s, %s 樹的合併資訊收集失敗" - -#: merge-ort-wrappers.c:13 merge-recursive.c:3723 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -" %s" - -#: merge-ort-wrappers.c:33 merge-recursive.c:3485 builtin/merge.c:405 -msgid "Already up to date." -msgstr "已經是最新的。" - -#: merge-recursive.c:353 -msgid "(bad commit)\n" -msgstr "（壞提交）\n" - -#: merge-recursive.c:381 -#, c-format -msgid "add_cacheinfo failed for path '%s'; merge aborting." -msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" - -#: merge-recursive.c:390 -#, c-format -msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." -msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" - -#: merge-recursive.c:881 -#, c-format -msgid "failed to create path '%s'%s" -msgstr "建立路徑 '%s'%s 失敗" - -#: merge-recursive.c:892 -#, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "刪除 %s 以便為子目錄留出空間\n" - -#: merge-recursive.c:906 merge-recursive.c:925 -msgid ": perhaps a D/F conflict?" -msgstr "：可能是一個目錄/檔案衝突？" - -#: merge-recursive.c:915 -#, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" - -#: merge-recursive.c:956 builtin/cat-file.c:47 -#, c-format -msgid "cannot read object %s '%s'" -msgstr "不能讀取物件 %s '%s'" - -#: merge-recursive.c:961 -#, c-format -msgid "blob expected for %s '%s'" -msgstr "%s '%s' 應為資料物件" - -#: merge-recursive.c:986 -#, c-format -msgid "failed to open '%s': %s" -msgstr "開啟 '%s' 失敗：%s" - -#: merge-recursive.c:997 -#, c-format -msgid "failed to symlink '%s': %s" -msgstr "建立符號連結 '%s' 失敗：%s" - -#: merge-recursive.c:1002 -#, c-format -msgid "do not know what to do with %06o %s '%s'" -msgstr "不知道如何處理 %06o %s '%s'" - -#: merge-recursive.c:1236 merge-recursive.c:1249 -#, c-format -msgid "Fast-forwarding submodule %s to the following commit:" -msgstr "子模組 %s 快轉到如下提交：" - -#: merge-recursive.c:1239 merge-recursive.c:1252 -#, c-format -msgid "Fast-forwarding submodule %s" -msgstr "快轉子模組 %s" - -#: merge-recursive.c:1276 -#, c-format -msgid "Failed to merge submodule %s (merge following commits not found)" -msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" - -#: merge-recursive.c:1280 -#, c-format -msgid "Failed to merge submodule %s (not fast-forward)" -msgstr "無法合併子模組 %s（非快轉）" - -#: merge-recursive.c:1281 -msgid "Found a possible merge resolution for the submodule:\n" -msgstr "找到子模組的一個可能的合併方案：\n" - -#: merge-recursive.c:1293 -#, c-format -msgid "Failed to merge submodule %s (multiple merges found)" -msgstr "無法合併子模組 %s （發現多個合併）" - -#: merge-recursive.c:1437 -#, c-format -msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." -msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" - -#: merge-recursive.c:1509 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本被保留。" - -#: merge-recursive.c:1514 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本被保留。" - -#: merge-recursive.c:1521 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" -"本保留在 %8$s 中。" - -#: merge-recursive.c:1526 -#, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " -"left in tree at %s." -msgstr "" -"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " -"%7$s 版本保留在 %9$s 中。" - -#: merge-recursive.c:1561 -msgid "rename" -msgstr "重新命名" - -#: merge-recursive.c:1561 -msgid "renamed" -msgstr "重新命名" - -#: merge-recursive.c:1612 merge-recursive.c:2518 merge-recursive.c:3181 -#, c-format -msgid "Refusing to lose dirty file at %s" -msgstr "拒絕遺失髒檔案 '%s'" - -#: merge-recursive.c:1622 -#, c-format -msgid "Refusing to lose untracked file at %s, even though it's in the way." -msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" - -#: merge-recursive.c:1680 -#, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" -msgstr "" -"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" - -#: merge-recursive.c:1711 -#, c-format -msgid "%s is a directory in %s adding as %s instead" -msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" - -#: merge-recursive.c:1716 -#, c-format -msgid "Refusing to lose untracked file at %s; adding as %s instead" -msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" - -#: merge-recursive.c:1743 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" -msgstr "" -"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" -"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" - -#: merge-recursive.c:1748 -msgid " (left unresolved)" -msgstr " （留下未解決）" - -#: merge-recursive.c:1840 -#, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " -"%4$s->%5$s" - -#: merge-recursive.c:2103 -#, c-format -msgid "" -"CONFLICT (directory rename split): Unclear where to place %s because " -"directory %s was renamed to multiple other directories, with no destination " -"getting a majority of the files." -msgstr "" -"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" -"多個其它目錄，沒有目錄包含大部分檔案。" - -#: merge-recursive.c:2237 -#, c-format -msgid "" -"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" -">%s in %s" -msgstr "" -"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" -"命名目錄 %4$s->%5$s" - -#: merge-recursive.c:3092 -msgid "modify" -msgstr "修改" - -#: merge-recursive.c:3092 -msgid "modified" -msgstr "修改" - -#: merge-recursive.c:3131 -#, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "略過 %s（已經做過相同合併）" - -#: merge-recursive.c:3184 -#, c-format -msgid "Adding as %s instead" -msgstr "而是以 %s 為名新增" - -#: merge-recursive.c:3388 -#, c-format -msgid "Removing %s" -msgstr "刪除 %s" - -#: merge-recursive.c:3411 -msgid "file/directory" -msgstr "檔案/目錄" - -#: merge-recursive.c:3416 -msgid "directory/file" -msgstr "目錄/檔案" - -#: merge-recursive.c:3423 -#, c-format -msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "衝突（%1$s）：在 %3$s 中有一個名為 %2$s 的目錄。以 %5$s 為名新增 %4$s" - -#: merge-recursive.c:3432 -#, c-format -msgid "Adding %s" -msgstr "新增 %s" - -#: merge-recursive.c:3441 -#, c-format -msgid "CONFLICT (add/add): Merge conflict in %s" -msgstr "衝突（add/add）：合併衝突於 %s" - -#: merge-recursive.c:3494 -#, c-format -msgid "merging of trees %s and %s failed" -msgstr "無法合併樹 %s 和 %s" - -#: merge-recursive.c:3588 -msgid "Merging:" -msgstr "合併：" - -#: merge-recursive.c:3601 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "發現 %u 個共同祖先：" - -#: merge-recursive.c:3651 -msgid "merge returned no commit" -msgstr "合併未返回提交" - -#: merge-recursive.c:3823 -#, c-format -msgid "Could not parse object '%s'" -msgstr "不能解析物件 '%s'" - -#: merge-recursive.c:3841 builtin/merge.c:720 builtin/merge.c:912 -#: builtin/stash.c:489 -msgid "Unable to write index." -msgstr "不能寫入索引。" - -#: merge.c:41 -msgid "failed to read the cache" -msgstr "讀取快取失敗" - -#: merge.c:102 rerere.c:705 builtin/am.c:1989 builtin/am.c:2023 -#: builtin/checkout.c:603 builtin/checkout.c:865 builtin/clone.c:714 -#: builtin/stash.c:269 -msgid "unable to write new index file" -msgstr "無法寫新的索引檔案" - -#: midx.c:79 -msgid "multi-pack-index OID fanout is of the wrong size" -msgstr "多包索引的物件 ID fanout 大小錯誤" - -#: midx.c:112 -#, c-format -msgid "multi-pack-index file %s is too small" -msgstr "多包索引檔案 %s 太小" - -#: midx.c:128 -#, c-format -msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" -msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" - -#: midx.c:133 -#, c-format -msgid "multi-pack-index version %d not recognized" -msgstr "multi-pack-index 版本 %d 不能被識別" - -#: midx.c:138 -#, c-format -msgid "multi-pack-index hash version %u does not match version %u" -msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" - -#: midx.c:155 -msgid "multi-pack-index missing required pack-name chunk" -msgstr "多包索引缺少必需的包名區塊" - -#: midx.c:157 -msgid "multi-pack-index missing required OID fanout chunk" -msgstr "多包索引缺少必需的物件 ID fanout 區塊" - -#: midx.c:159 -msgid "multi-pack-index missing required OID lookup chunk" -msgstr "多包索引缺少必需的物件 ID 查詢區塊" - -#: midx.c:161 -msgid "multi-pack-index missing required object offsets chunk" -msgstr "多包索引缺少必需的物件位移區塊" - -#: midx.c:180 -#, c-format -msgid "multi-pack-index pack names out of order: '%s' before '%s'" -msgstr "多包索引包名無序：'%s' 在 '%s' 之前" - -#: midx.c:228 -#, c-format -msgid "bad pack-int-id: %u (%u total packs)" -msgstr "錯的 pack-int-id：%u（共有 %u 個包）" - -#: midx.c:278 -msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" -msgstr "多包索引儲存一個64位位移，但是 off_t 太小" - -#: midx.c:509 -#, c-format -msgid "failed to add packfile '%s'" -msgstr "新增 packfile '%s' 失敗" - -#: midx.c:515 -#, c-format -msgid "failed to open pack-index '%s'" -msgstr "開啟包索引 '%s' 失敗" - -#: midx.c:583 -#, c-format -msgid "failed to locate object %d in packfile" -msgstr "在 packfile 中定位物件 %d 失敗" - -#: midx.c:911 -msgid "cannot store reverse index file" -msgstr "無法儲存倒排索引檔案" - -#: midx.c:1009 -#, c-format -msgid "could not parse line: %s" -msgstr "無法解析橫列：%s" - -#: midx.c:1011 -#, c-format -msgid "malformed line: %s" -msgstr "橫列格式錯誤：%s" - -#: midx.c:1181 -msgid "ignoring existing multi-pack-index; checksum mismatch" -msgstr "忽略現有的多包索引：總和檢查碼不符" - -#: midx.c:1206 -msgid "could not load pack" -msgstr "無法載入包" - -#: midx.c:1212 -#, c-format -msgid "could not open index for %s" -msgstr "無法開啟 %s 的索引" - -#: midx.c:1223 -msgid "Adding packfiles to multi-pack-index" -msgstr "正在新增 packfile 至多包索引" - -#: midx.c:1266 -#, c-format -msgid "unknown preferred pack: '%s'" -msgstr "未知偏好包：「%s」" - -#: midx.c:1311 -#, c-format -msgid "cannot select preferred pack %s with no objects" -msgstr "無法選取偏好，沒有物件的 %s 包" - -#: midx.c:1343 -#, c-format -msgid "did not see pack-file %s to drop" -msgstr "沒有看到要捨棄的包檔案 %s" - -#: midx.c:1389 -#, c-format -msgid "preferred pack '%s' is expired" -msgstr "偏好包「%s」已經過期" - -#: midx.c:1402 -msgid "no pack files to index." -msgstr "沒有要索引的 pack 檔案。" - -#: midx.c:1409 -msgid "refusing to write multi-pack .bitmap without any objects" -msgstr "拒絕寫入無任何物件的多包 .bitmap" - -#: midx.c:1451 -msgid "could not write multi-pack bitmap" -msgstr "無法寫入多包位圖" - -#: midx.c:1461 -msgid "could not write multi-pack-index" -msgstr "無法寫入多包索引" - -#: midx.c:1520 builtin/clean.c:37 -#, c-format -msgid "failed to remove %s" -msgstr "刪除 %s 失敗" - -#: midx.c:1553 -#, c-format -msgid "failed to clear multi-pack-index at %s" -msgstr "清理位於 %s 的多包索引失敗" - -#: midx.c:1616 -msgid "multi-pack-index file exists, but failed to parse" -msgstr "有 multi-pack-index 檔案，但無法解析" - -#: midx.c:1624 -msgid "incorrect checksum" -msgstr "總和檢查碼不正確" - -#: midx.c:1627 -msgid "Looking for referenced packfiles" -msgstr "正在尋找引用的 packfile" - -#: midx.c:1642 -#, c-format -msgid "" -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" - -#: midx.c:1647 -msgid "the midx contains no oid" -msgstr "midx 沒有 oid" - -#: midx.c:1656 -msgid "Verifying OID order in multi-pack-index" -msgstr "正在驗證多包索引中的物件 ID 順序" - -#: midx.c:1665 -#, c-format -msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" -msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" - -#: midx.c:1685 -msgid "Sorting objects by packfile" -msgstr "透過 packfile 為物件排序" - -#: midx.c:1692 -msgid "Verifying object offsets" -msgstr "正在驗證物件位移" - -#: midx.c:1708 -#, c-format -msgid "failed to load pack entry for oid[%d] = %s" -msgstr "為 oid[%d] = %s 載入包條目失敗" - -#: midx.c:1714 -#, c-format -msgid "failed to load pack-index for packfile %s" -msgstr "為 packfile %s 載入包索引失敗" - -#: midx.c:1723 -#, c-format -msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" -msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" - -#: midx.c:1750 -msgid "Counting referenced objects" -msgstr "正在計算引用物件" - -#: midx.c:1760 -msgid "Finding and deleting unreferenced packfiles" -msgstr "正在尋找並刪除沒有引用的 packfile" - -#: midx.c:1952 -msgid "could not start pack-objects" -msgstr "不能開始 pack-objects" - -#: midx.c:1972 -msgid "could not finish pack-objects" -msgstr "不能結束 pack-objects" - -#: name-hash.c:542 -#, c-format -msgid "unable to create lazy_dir thread: %s" -msgstr "不能建立 lazy_dir 執行緒：%s" - -#: name-hash.c:564 -#, c-format -msgid "unable to create lazy_name thread: %s" -msgstr "不能建立 lazy_name 執行緒：%s" - -#: name-hash.c:570 -#, c-format -msgid "unable to join lazy_name thread: %s" -msgstr "不能加入 lazy_name 執行緒：%s" - -#: notes-merge.c:276 -#, c-format -msgid "" -"You have not concluded your previous notes merge (%s exists).\n" -"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " -"commit/abort the previous merge before you start a new notes merge." -msgstr "" -"您的前一次備註合併尚未結束（存在 %s）。\n" -"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git " -"notes merge --abort' 來提交/終止前一次合併。" - -#: notes-merge.c:283 -#, c-format -msgid "You have not concluded your notes merge (%s exists)." -msgstr "您尚未結束備註合併（存在 %s）。" - -#: notes-utils.c:46 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "不能提交未初始化/未引用的註解樹" - -#: notes-utils.c:105 -#, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "壞的 notes.rewriteMode 值：'%s'" - -#: notes-utils.c:115 -#, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" - -#. TRANSLATORS: The first %s is the name of -#. the environment variable, the second %s is -#. its value. -#. -#: notes-utils.c:145 -#, c-format -msgid "Bad %s value: '%s'" -msgstr "壞的 %s 值：'%s'" - -#: object-file.c:457 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" - -#: object-file.c:515 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "無法規範化備用物件路徑：%s" - -#: object-file.c:589 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s：忽略備用物件庫，嵌套太深" - -#: object-file.c:596 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "無法規範化物件目錄: %s" - -#: object-file.c:639 -msgid "unable to fdopen alternates lockfile" -msgstr "無法 fdopen 取代鎖檔案" - -#: object-file.c:657 -msgid "unable to read alternates file" -msgstr "無法讀取替代檔案" - -#: object-file.c:664 -msgid "unable to move new alternates file into place" -msgstr "無法將新的替代檔案移動到位" - -#: object-file.c:742 -#, c-format -msgid "path '%s' does not exist" -msgstr "路徑 '%s' 不存在" - -#: object-file.c:763 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" - -#: object-file.c:769 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "引用版本庫 '%s' 不是一個本機版本庫。" - -#: object-file.c:775 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "引用版本庫 '%s' 是一個淺複製" - -#: object-file.c:783 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "引用版本庫 '%s' 已被移植" - -#: object-file.c:814 -#, c-format -msgid "could not find object directory matching %s" -msgstr "找不到符合 %s 的物件目錄" - -#: object-file.c:864 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "解析備用引用時無效的行：%s" - -#: object-file.c:1014 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" - -#: object-file.c:1049 -#, c-format -msgid "mmap failed%s" -msgstr "mmap 失敗%s" - -#: object-file.c:1230 -#, c-format -msgid "object file %s is empty" -msgstr "物件檔案 %s 為空" - -#: object-file.c:1349 object-file.c:2588 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "損壞的鬆散物件 '%s'" - -#: object-file.c:1351 object-file.c:2592 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "鬆散物件 '%s' 後面有垃圾資料" - -#: object-file.c:1473 -#, c-format -msgid "unable to parse %s header" -msgstr "無法解析 %s 頭部" - -#: object-file.c:1475 -msgid "invalid object type" -msgstr "無效的物件類型" - -#: object-file.c:1486 -#, c-format -msgid "unable to unpack %s header" -msgstr "無法解開 %s 頭部" - -#: object-file.c:1490 -#, c-format -msgid "header for %s too long, exceeds %d bytes" -msgstr "%s 的標頭過長，超出 %d 位元組" - -#: object-file.c:1720 -#, c-format -msgid "failed to read object %s" -msgstr "讀取物件 %s 失敗" - -#: object-file.c:1724 -#, c-format -msgid "replacement %s not found for %s" -msgstr "找不到 %2$s 的替代 %1$s" - -#: object-file.c:1728 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "鬆散物件 %s（儲存在 %s）已損壞" - -#: object-file.c:1732 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "打包物件 %s（儲存在 %s）已損壞" - -#: object-file.c:1855 -#, c-format -msgid "unable to write file %s" -msgstr "無法寫檔案 %s" - -#: object-file.c:1862 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "無法為 '%s' 設定權限" - -#: object-file.c:1869 -msgid "file write error" -msgstr "檔案寫錯誤" - -#: object-file.c:1904 -msgid "error when closing loose object file" -msgstr "關閉鬆散物件檔案時發生錯誤" - -#: object-file.c:1971 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" - -#: object-file.c:1973 -msgid "unable to create temporary file" -msgstr "無法建立暫存檔" - -#: object-file.c:1997 -msgid "unable to write loose object file" -msgstr "不能寫鬆散物件檔案" - -#: object-file.c:2003 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "不能壓縮新物件 %s（%d）" - -#: object-file.c:2007 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" - -#: object-file.c:2011 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "被 %s 的不穩定物件來源資料混淆" - -#: object-file.c:2022 builtin/pack-objects.c:1251 -#, c-format -msgid "failed utime() on %s" -msgstr "在 %s 上呼叫 utime() 失敗" - -#: object-file.c:2100 -#, c-format -msgid "cannot read object for %s" -msgstr "不能讀取物件 %s" - -#: object-file.c:2151 -msgid "corrupt commit" -msgstr "損壞的提交" - -#: object-file.c:2159 -msgid "corrupt tag" -msgstr "損壞的標籤" - -#: object-file.c:2259 -#, c-format -msgid "read error while indexing %s" -msgstr "索引 %s 時讀取錯誤" - -#: object-file.c:2262 -#, c-format -msgid "short read while indexing %s" -msgstr "索引 %s 時讀入不完整" - -#: object-file.c:2335 object-file.c:2345 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s：插入資料庫失敗" - -#: object-file.c:2351 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s：不支援的檔案類型" - -#: object-file.c:2375 builtin/fetch.c:1494 -#, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一個有效的物件" - -#: object-file.c:2377 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s 不是一個有效的 '%s' 物件" - -#: object-file.c:2404 -#, c-format -msgid "unable to open %s" -msgstr "不能開啟 %s" - -#: object-file.c:2599 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "%s 的雜湊值不符合（預期 %s）" - -#: object-file.c:2622 -#, c-format -msgid "unable to mmap %s" -msgstr "不能 mmap %s" - -#: object-file.c:2628 -#, c-format -msgid "unable to unpack header of %s" -msgstr "無法解壓縮 %s 的頭部" - -#: object-file.c:2633 -#, c-format -msgid "unable to parse header of %s" -msgstr "無法解析 %s 的頭部" - -#: object-file.c:2644 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "無法解壓縮 %s 的內容" - -#. TRANSLATORS: This is a line of ambiguous object -#. output shown when we cannot look up or parse the -#. object in question. E.g. "deadbeef [bad object]". -#. -#: object-name.c:382 -#, c-format -msgid "%s [bad object]" -msgstr "%s [無效物件]" - -#. TRANSLATORS: This is a line of ambiguous commit -#. object output. E.g.: -#. * -#. "deadbeef commit 2021-01-01 - Some Commit Message" -#. -#: object-name.c:407 -#, c-format -msgid "%s commit %s - %s" -msgstr "%s 提交 %s - %s" - -#. TRANSLATORS: This is a line of ambiguous -#. tag object output. E.g.: -#. * -#. "deadbeef tag 2022-01-01 - Some Tag Message" -#. * -#. The second argument is the YYYY-MM-DD found -#. in the tag. -#. * -#. The third argument is the "tag" string -#. from object.c. -#. -#: object-name.c:428 -#, c-format -msgid "%s tag %s - %s" -msgstr "%s 標籤 %s - %s" - -#. TRANSLATORS: This is a line of ambiguous -#. tag object output where we couldn't parse -#. the tag itself. E.g.: -#. * -#. "deadbeef [bad tag, could not parse it]" -#. -#: object-name.c:439 -#, c-format -msgid "%s [bad tag, could not parse it]" -msgstr "%s [無效標籤，無法解析]" - -#. TRANSLATORS: This is a line of ambiguous <type> -#. object output. E.g. "deadbeef tree". -#. -#: object-name.c:447 -#, c-format -msgid "%s tree" -msgstr "%s 樹" - -#. TRANSLATORS: This is a line of ambiguous <type> -#. object output. E.g. "deadbeef blob". -#. -#: object-name.c:453 -#, c-format -msgid "%s blob" -msgstr "%s blob" - -#: object-name.c:569 -#, c-format -msgid "short object ID %s is ambiguous" -msgstr "短物件 ID %s 存在歧義" - -#. TRANSLATORS: The argument is the list of ambiguous -#. objects composed in show_ambiguous_object(). See -#. its "TRANSLATORS" comments for details. -#. -#: object-name.c:591 -#, c-format -msgid "" -"The candidates are:\n" -"%s" -msgstr "" -"候選物件有：\n" -"%s" - -#: object-name.c:888 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n" -"因為當您只提供 40 個十六進位字元時，其將被忽略。\n" -"這些引用可能被意外建立。例如：\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n" -"請檢查這些引用，並視需要刪除。執行\n" -"「git config advice.objectNameWarning false」命令以關閉本訊息通知" - -#: object-name.c:1008 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "'%.*s' 的日誌只能回到 %s" - -#: object-name.c:1016 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "'%.*s' 的日誌只有 %d 個項目" - -#: object-name.c:1794 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" - -#: object-name.c:1800 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"'%s' 路徑存在，但不是 '%s'\n" -"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" - -#: object-name.c:1809 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "'%s' 路徑不存在於 '%.*s'" - -#: object-name.c:1837 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"'%s' 路徑在索引，但不在 %d 暫存區\n" -"提示：你在說 ':%d:%s' 嗎？" - -#: object-name.c:1853 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"'%s' 路徑在索引，但不是 '%s'\n" -"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" - -#: object-name.c:1861 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "磁碟上存在 '%s' 路徑，但不在索引中" - -#: object-name.c:1863 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" - -#: object-name.c:1876 -msgid "relative path syntax can't be used outside working tree" -msgstr "相對路徑與法不能用在工作區外" - -#: object-name.c:1901 -#, c-format -msgid "<object>:<path> required, only <object> '%s' given" -msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」" - -#: object-name.c:2014 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "'%.*s' 物件名稱無效。" - -#: object.c:53 -#, c-format -msgid "invalid object type \"%s\"" -msgstr "無效的物件類型 \"%s\"" - -#: object.c:173 -#, c-format -msgid "object %s is a %s, not a %s" -msgstr "物件 %s 是一個 %s，不是一個 %s" - -#: object.c:250 -#, c-format -msgid "object %s has unknown type id %d" -msgstr "物件 %s 有未知的類型 id %d" - -#: object.c:263 -#, c-format -msgid "unable to parse object: %s" -msgstr "不能解析物件：%s" - -#: object.c:283 object.c:294 -#, c-format -msgid "hash mismatch %s" -msgstr "雜湊值與 %s 不符合" - -#: pack-bitmap.c:353 -msgid "multi-pack bitmap is missing required reverse index" -msgstr "多包位圖缺少需要的反向索引" - -#: pack-bitmap.c:433 -msgid "load_reverse_index: could not open pack" -msgstr "load_reverse_index：無法開啟包" - -#: pack-bitmap.c:1072 pack-bitmap.c:1078 builtin/pack-objects.c:2432 -#, c-format -msgid "unable to get size of %s" -msgstr "不能得到 %s 的大小" - -#: pack-bitmap.c:1937 -#, c-format -msgid "could not find %s in pack %s at offset %<PRIuMAX>" -msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s" - -#: pack-bitmap.c:1973 builtin/rev-list.c:91 -#, c-format -msgid "unable to get disk usage of %s" -msgstr "無法取得 %s 的磁碟用量" - -#: pack-revindex.c:221 -#, c-format -msgid "reverse-index file %s is too small" -msgstr "%s 倒排索引檔案過小" - -#: pack-revindex.c:226 -#, c-format -msgid "reverse-index file %s is corrupt" -msgstr "%s 倒排索引檔案損壞" - -#: pack-revindex.c:234 -#, c-format -msgid "reverse-index file %s has unknown signature" -msgstr "%s 倒排索引檔案有未知簽章" - -#: pack-revindex.c:238 -#, c-format -msgid "reverse-index file %s has unsupported version %<PRIu32>" -msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>" - -#: pack-revindex.c:243 -#, c-format -msgid "reverse-index file %s has unsupported hash id %<PRIu32>" -msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>" - -#: pack-write.c:251 -msgid "cannot both write and verify reverse index" -msgstr "無法同時寫入和驗證倒排索引" - -#: pack-write.c:270 -#, c-format -msgid "could not stat: %s" -msgstr "無法 stat：%s" - -#: pack-write.c:282 -#, c-format -msgid "failed to make %s readable" -msgstr "無法讓 %s 能夠寫入" - -#: pack-write.c:521 -#, c-format -msgid "could not write '%s' promisor file" -msgstr "無法寫入「%s」promisor 檔案" - -#: packfile.c:627 -msgid "offset before end of packfile (broken .idx?)" -msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" - -#: packfile.c:657 -#, c-format -msgid "packfile %s cannot be mapped%s" -msgstr "包檔案 %s 無法映射%s" - -#: packfile.c:1924 -#, c-format -msgid "offset before start of pack index for %s (corrupt index?)" -msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" - -#: packfile.c:1928 -#, c-format -msgid "offset beyond end of pack index for %s (truncated index?)" -msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" - -#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175 -#, c-format -msgid "option `%s' expects a numerical value" -msgstr "選項 `%s' 期望一個數字值" - -#: parse-options-cb.c:42 -#, c-format -msgid "malformed expiration date '%s'" -msgstr "格式錯誤的到期時間：'%s'" - -#: parse-options-cb.c:55 -#, c-format -msgid "option `%s' expects \"always\", \"auto\", or \"never\"" -msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" - -#: parse-options-cb.c:133 parse-options-cb.c:150 -#, c-format -msgid "malformed object name '%s'" -msgstr "格式錯誤的物件名 '%s'" - -#: parse-options-cb.c:307 -#, c-format -msgid "option `%s' expects \"%s\" or \"%s\"" -msgstr "選項「%s」期望「%s」或「%s」" - -#: parse-options.c:58 -#, c-format -msgid "%s requires a value" -msgstr "%s 需要一個值" - -#: parse-options.c:93 -#, c-format -msgid "%s is incompatible with %s" -msgstr "%s 與 %s 不相容" - -#: parse-options.c:98 -#, c-format -msgid "%s : incompatible with something else" -msgstr "%s：和其它的不相容" - -#: parse-options.c:112 parse-options.c:116 -#, c-format -msgid "%s takes no value" -msgstr "%s 不取值" - -#: parse-options.c:114 -#, c-format -msgid "%s isn't available" -msgstr "%s 不可用" - -#: parse-options.c:237 -#, c-format -msgid "%s expects a non-negative integer value with an optional k/m/g suffix" -msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" - -#: parse-options.c:393 -#, c-format -msgid "ambiguous option: %s (could be --%s%s or --%s%s)" -msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" - -#: parse-options.c:428 parse-options.c:436 -#, c-format -msgid "did you mean `--%s` (with two dashes)?" -msgstr "你的意思是 `--%s`（有兩個短線）嗎？" - -#: parse-options.c:678 parse-options.c:1054 -#, c-format -msgid "alias of --%s" -msgstr "--%s 的別名" - -#: parse-options.c:892 -#, c-format -msgid "unknown option `%s'" -msgstr "未知選項 `%s'" - -#: parse-options.c:894 -#, c-format -msgid "unknown switch `%c'" -msgstr "未知開關 `%c'" - -#: parse-options.c:896 -#, c-format -msgid "unknown non-ascii option in string: `%s'" -msgstr "字串中未知的非 ascii 字元選項：`%s'" - -#: parse-options.c:920 -msgid "..." -msgstr "..." - -#: parse-options.c:934 -#, c-format -msgid "usage: %s" -msgstr "用法：%s" - -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation. -#. -#: parse-options.c:949 -#, c-format -msgid " or: %s" -msgstr " 或：%s" - -#. TRANSLATORS: You should only need to translate this format -#. string if your language is a RTL language (e.g. Arabic, -#. Hebrew etc.), not if it's a LTR language (e.g. German, -#. Russian, Chinese etc.). -#. * -#. When a translated usage string has an embedded "\n" it's -#. because options have wrapped to the next line. The line -#. after the "\n" will then be padded to align with the -#. command name, such as N_("git cmd [opt]\n<8 -#. spaces>[opt2]"), where the 8 spaces are the same length as -#. "git cmd ". -#. * -#. This format string prints out that already-translated -#. line. The "%*s" is whitespace padding to account for the -#. padding at the start of the line that we add in this -#. function. The "%s" is a line in the (hopefully already -#. translated) N_() usage string, which contained embedded -#. newlines before we split it up. -#. -#: parse-options.c:970 -#, c-format -msgid "%*s%s" -msgstr "%*s%s" - -# 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: parse-options.c:993 -#, c-format -msgid " %s" -msgstr " %s" - -#: parse-options.c:1040 -msgid "-NUM" -msgstr "-數字" - -#: path.c:922 -#, c-format -msgid "Could not make %s writable by group" -msgstr "不能設定 %s 為組可寫" - -#: pathspec.c:150 -msgid "Escape character '\\' not allowed as last character in attr value" -msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" - -#: pathspec.c:168 -msgid "Only one 'attr:' specification is allowed." -msgstr "只允許一個 'attr:' 規格。" - -#: pathspec.c:171 -msgid "attr spec must not be empty" -msgstr "屬性規格不能為空" - -#: pathspec.c:214 -#, c-format -msgid "invalid attribute name %s" -msgstr "無效的屬性名 %s" - -#: pathspec.c:279 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" - -#: pathspec.c:286 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" - -#: pathspec.c:326 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "路徑規格包含無效的神奇前綴" - -#: pathspec.c:347 -#, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" - -#: pathspec.c:352 -#, c-format -msgid "Missing ')' at the end of pathspec magic in '%s'" -msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" - -#: pathspec.c:390 -#, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" - -#: pathspec.c:449 -#, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s：'literal' 和 'glob' 不相容" - -#: pathspec.c:465 -#, c-format -msgid "%s: '%s' is outside repository at '%s'" -msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" - -#: pathspec.c:541 -#, c-format -msgid "'%s' (mnemonic: '%c')" -msgstr "'%s'（助記符：'%c'）" - -#: pathspec.c:551 -#, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" - -#: pathspec.c:618 -#, c-format -msgid "pathspec '%s' is beyond a symbolic link" -msgstr "路徑規格 '%s' 位於符號連結中" - -#: pathspec.c:663 -#, c-format -msgid "line is badly quoted: %s" -msgstr "某行不應該被括號括住：%s" - -#: pkt-line.c:92 -msgid "unable to write flush packet" -msgstr "無法寫 flush 包" - -#: pkt-line.c:99 -msgid "unable to write delim packet" -msgstr "無法寫 delim 包" - -#: pkt-line.c:106 -msgid "unable to write response end packet" -msgstr "無法寫入回應結尾封包" - -#: pkt-line.c:113 -msgid "flush packet write failed" -msgstr "flush 包寫錯誤" - -#: pkt-line.c:153 -msgid "protocol error: impossibly long line" -msgstr "協定錯誤：不可能的長行" - -#: pkt-line.c:169 pkt-line.c:171 -msgid "packet write with format failed" -msgstr "格式化包寫入錯誤" - -#: pkt-line.c:204 pkt-line.c:252 -msgid "packet write failed - data exceeds max packet size" -msgstr "寫封包失敗：資料超過了包的最大長度" - -#: pkt-line.c:222 -#, c-format -msgid "packet write failed: %s" -msgstr "封包寫入失敗：%s" - -#: pkt-line.c:349 pkt-line.c:350 -msgid "read error" -msgstr "讀取錯誤" - -#: pkt-line.c:360 pkt-line.c:361 -msgid "the remote end hung up unexpectedly" -msgstr "遠端意外掛斷了" - -#: pkt-line.c:417 pkt-line.c:419 -#, c-format -msgid "protocol error: bad line length character: %.4s" -msgstr "協定錯誤：錯誤的行長度字串：%.4s" - -#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444 -#, c-format -msgid "protocol error: bad line length %d" -msgstr "協定錯誤：錯誤的行長度 %d" - -#: pkt-line.c:472 sideband.c:165 -#, c-format -msgid "remote error: %s" -msgstr "遠端錯誤：%s" - -#: preload-index.c:125 -msgid "Refreshing index" -msgstr "正在重新整理索引" - -#: preload-index.c:144 -#, c-format -msgid "unable to create threaded lstat: %s" -msgstr "無法建立執行緒 lstat：%s" - -#: pretty.c:1051 -msgid "unable to parse --pretty format" -msgstr "不能解析 --pretty 格式" - -#: promisor-remote.c:31 -msgid "promisor-remote: unable to fork off fetch subprocess" -msgstr "promisor-remote: 無法 fork fetch 子處理程序" - -#: promisor-remote.c:38 promisor-remote.c:40 -msgid "promisor-remote: could not write to fetch subprocess" -msgstr "promisor-remote: 無法寫入 fetch 子處理程序" - -#: promisor-remote.c:44 -msgid "promisor-remote: could not close stdin to fetch subprocess" -msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" - -#: promisor-remote.c:54 -#, c-format -msgid "promisor remote name cannot begin with '/': %s" -msgstr "promisor 遠端名稱不能以 '/' 開始：%s" - -#: protocol-caps.c:103 -msgid "object-info: expected flush after arguments" -msgstr "object-info：引數後預期要有 flush" - -#: prune-packed.c:35 -msgid "Removing duplicate objects" -msgstr "正在刪除重複物件" - -#: range-diff.c:68 -msgid "could not start `log`" -msgstr "不能啟動 `log`" - -#: range-diff.c:70 -msgid "could not read `log` output" -msgstr "不能讀取 `log` 的輸出" - -#: range-diff.c:98 sequencer.c:5575 -#, c-format -msgid "could not parse commit '%s'" -msgstr "不能解析提交 '%s'" - -#: range-diff.c:109 -#, c-format -msgid "" -"could not parse first line of `log` output: did not start with 'commit ': " -"'%s'" -msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」" - -#: range-diff.c:132 -#, c-format -msgid "could not parse git header '%.*s'" -msgstr "無法解析 git 頭 '%.*s'" - -#: range-diff.c:300 -msgid "failed to generate diff" -msgstr "生成 diff 失敗" - -#: range-diff.c:558 range-diff.c:560 -#, c-format -msgid "could not parse log for '%s'" -msgstr "不能解析 '%s' 的日誌" - -#: read-cache.c:737 -#, c-format -msgid "will not add file alias '%s' ('%s' already exists in index)" -msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" - -#: read-cache.c:753 -msgid "cannot create an empty blob in the object database" -msgstr "不能在物件資料庫中建立空的資料物件" - -#: read-cache.c:775 -#, c-format -msgid "%s: can only add regular files, symbolic links or git-directories" -msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" - -#: read-cache.c:780 builtin/submodule--helper.c:3359 -#, c-format -msgid "'%s' does not have a commit checked out" -msgstr "'%s' 沒有簽出一個提交" - -#: read-cache.c:832 -#, c-format -msgid "unable to index file '%s'" -msgstr "無法索引檔案 '%s'" - -#: read-cache.c:851 -#, c-format -msgid "unable to add '%s' to index" -msgstr "無法在索引中新增 '%s'" - -#: read-cache.c:862 -#, c-format -msgid "unable to stat '%s'" -msgstr "無法對 %s 執行 stat" - -#: read-cache.c:1404 -#, c-format -msgid "'%s' appears as both a file and as a directory" -msgstr "'%s' 看起來既是檔案又是目錄" - -#: read-cache.c:1619 -msgid "Refresh index" -msgstr "重新整理索引" - -#: read-cache.c:1751 -#, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"設定了 index.version，但是取值無效。\n" -"使用版本 %i" - -#: read-cache.c:1761 -#, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"設定了 GIT_INDEX_VERSION，但是取值無效。\n" -"使用版本 %i" - -#: read-cache.c:1817 -#, c-format -msgid "bad signature 0x%08x" -msgstr "壞的簽名 0x%08x" - -#: read-cache.c:1820 -#, c-format -msgid "bad index version %d" -msgstr "壞的索引版本 %d" - -#: read-cache.c:1829 -msgid "bad index file sha1 signature" -msgstr "壞的索引檔案 sha1 簽名" - -#: read-cache.c:1863 -#, c-format -msgid "index uses %.4s extension, which we do not understand" -msgstr "索引使用不被支援的 %.4s 副檔名" - -# -#: read-cache.c:1865 -#, c-format -msgid "ignoring %.4s extension" -msgstr "忽略 %.4s 副檔名" - -#: read-cache.c:1902 -#, c-format -msgid "unknown index entry format 0x%08x" -msgstr "未知的索引條目格式 0x%08x" - -#: read-cache.c:1918 -#, c-format -msgid "malformed name field in the index, near path '%s'" -msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" - -#: read-cache.c:1975 -msgid "unordered stage entries in index" -msgstr "索引中有未排序的暫存條目" - -#: read-cache.c:1978 -#, c-format -msgid "multiple stage entries for merged file '%s'" -msgstr "合併檔案 '%s' 有多個暫存條目" - -#: read-cache.c:1981 -#, c-format -msgid "unordered stage entries for '%s'" -msgstr "'%s' 的未排序暫存條目" - -#: read-cache.c:2096 read-cache.c:2402 rerere.c:549 rerere.c:583 rerere.c:1096 -#: submodule.c:1831 builtin/add.c:586 builtin/check-ignore.c:183 -#: builtin/checkout.c:532 builtin/checkout.c:724 builtin/clean.c:1016 -#: builtin/commit.c:379 builtin/diff-tree.c:122 builtin/grep.c:521 -#: builtin/mv.c:148 builtin/reset.c:506 builtin/rm.c:293 -#: builtin/submodule--helper.c:335 builtin/submodule--helper.c:3319 -msgid "index file corrupt" -msgstr "索引檔案損壞" - -#: read-cache.c:2240 -#, c-format -msgid "unable to create load_cache_entries thread: %s" -msgstr "無法建立 load_cache_entries 執行緒：%s" - -#: read-cache.c:2253 -#, c-format -msgid "unable to join load_cache_entries thread: %s" -msgstr "無法加入 load_cache_entries 執行緒：%s" - -#: read-cache.c:2286 -#, c-format -msgid "%s: index file open failed" -msgstr "%s：開啟索引檔案失敗" - -#: read-cache.c:2290 -#, c-format -msgid "%s: cannot stat the open index" -msgstr "%s：不能對開啟的索引執行 stat 動作" - -#: read-cache.c:2294 -#, c-format -msgid "%s: index file smaller than expected" -msgstr "%s：索引檔案比預期的小" - -#: read-cache.c:2298 -#, c-format -msgid "%s: unable to map index file%s" -msgstr "%s：無法 map 索引檔案%s" - -#: read-cache.c:2341 -#, c-format -msgid "unable to create load_index_extensions thread: %s" -msgstr "無法建立 load_index_extensions 執行緒：%s" - -#: read-cache.c:2368 -#, c-format -msgid "unable to join load_index_extensions thread: %s" -msgstr "無法加入 load_index_extensions 執行緒：%s" - -#: read-cache.c:2414 -#, c-format -msgid "could not freshen shared index '%s'" -msgstr "無法重新整理共享索引 '%s'" - -#: read-cache.c:2473 -#, c-format -msgid "broken index, expect %s in %s, got %s" -msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" - -#: read-cache.c:3032 -msgid "cannot write split index for a sparse index" -msgstr "無法寫入稀疏索引的索引分割" - -#: read-cache.c:3114 strbuf.c:1192 wrapper.c:717 builtin/merge.c:1156 -#, c-format -msgid "could not close '%s'" -msgstr "不能關閉 '%s'" - -#: read-cache.c:3157 -msgid "failed to convert to a sparse-index" -msgstr "無法轉換成稀疏索引" - -#: read-cache.c:3228 -#, c-format -msgid "could not stat '%s'" -msgstr "不能對 '%s' 呼叫 stat" - -#: read-cache.c:3241 -#, c-format -msgid "unable to open git dir: %s" -msgstr "不能開啟 git 目錄：%s" - -#: read-cache.c:3253 -#, c-format -msgid "unable to unlink: %s" -msgstr "無法刪除：%s" - -#: read-cache.c:3282 -#, c-format -msgid "cannot fix permission bits on '%s'" -msgstr "不能修復 '%s' 的權限位" - -#: read-cache.c:3439 -#, c-format -msgid "%s: cannot drop to stage #0" -msgstr "%s：不能落到暫存區 #0" - -#: rebase-interactive.c:11 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" -"或者您可以用 'git rebase --abort' 終止重定基底。\n" - -#: rebase-interactive.c:33 -#, c-format -msgid "" -"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." -msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。" - -#: rebase-interactive.c:42 -msgid "" -"\n" -"Commands:\n" -"p, pick <commit> = use commit\n" -"r, reword <commit> = use commit, but edit the commit message\n" -"e, edit <commit> = use commit, but stop for amending\n" -"s, squash <commit> = use commit, but meld into previous commit\n" -"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" -" commit's log message, unless -C is used, in which case\n" -" keep only this commit's message; -c is same as -C but\n" -" opens the editor\n" -"x, exec <command> = run command (the rest of the line) using shell\n" -"b, break = stop here (continue rebase later with 'git rebase --continue')\n" -"d, drop <commit> = remove commit\n" -"l, label <label> = label current HEAD with a name\n" -"t, reset <label> = reset HEAD to a label\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". create a merge commit using the original merge commit's\n" -". message (or the oneline, if no original merge commit was\n" -". specified); use -c <commit> to reword the commit message\n" -"\n" -"These lines can be re-ordered; they are executed from top to bottom.\n" -msgstr "" -"\n" -"指令：\n" -"p, pick <提交> = 使用提交\n" -"r, reword <提交> = 使用提交，但編輯提交說明\n" -"e, edit <提交> = 使用提交，但不直接修補 (amend) \n" -"s, squash <提交> = 使用提交，但融合至上個提交\n" -"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n" -" 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n" -" 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n" -"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n" -"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n" -"d, drop <提交> = 移除提交\n" -"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n" -"t, reset <標籤> = 重設 HEAD 到指定標籤\n" -"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" -". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -". -c <commit> 可以編輯提交說明。\n" -"\n" -"可以對這些行重新排序，會從上至下執行。\n" - -#: rebase-interactive.c:66 -#, c-format -msgid "Rebase %s onto %s (%d command)" -msgid_plural "Rebase %s onto %s (%d commands)" -msgstr[0] "重定基底 %s 到 %s（%d 個提交）" - -#: rebase-interactive.c:75 -msgid "" -"\n" -"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" -msgstr "" -"\n" -"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" - -#: rebase-interactive.c:78 -msgid "" -"\n" -"If you remove a line here THAT COMMIT WILL BE LOST.\n" -msgstr "" -"\n" -"如果您在這裡刪除一行，對應的提交將會遺失。\n" - -#: rebase-interactive.c:84 -msgid "" -"\n" -"You are editing the todo file of an ongoing interactive rebase.\n" -"To continue rebase after editing, run:\n" -" git rebase --continue\n" -"\n" -msgstr "" -"\n" -"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n" -"請執行：\n" -" git rebase --continue\n" -"\n" - -#: rebase-interactive.c:89 -msgid "" -"\n" -"However, if you remove everything, the rebase will be aborted.\n" -"\n" -msgstr "" -"\n" -"然而，如果您刪除全部內容，重定基底動作將會終止。\n" -"\n" - -#: rebase-interactive.c:113 rerere.c:469 rerere.c:677 sequencer.c:3879 -#: sequencer.c:3905 sequencer.c:5681 builtin/fsck.c:328 builtin/gc.c:1791 -#: builtin/rebase.c:191 -#, c-format -msgid "could not write '%s'" -msgstr "不能寫入 '%s'" - -#: rebase-interactive.c:119 -#, c-format -msgid "could not write '%s'." -msgstr "不能寫入 '%s'。" - -#: rebase-interactive.c:196 -#, c-format -msgid "" -"Warning: some commits may have been dropped accidentally.\n" -"Dropped commits (newer to older):\n" -msgstr "" -"警告：一些提交可能被意外捨棄。\n" -"捨棄的提交（從新到舊）：\n" - -#: rebase-interactive.c:203 -#, c-format -msgid "" -"To avoid this message, use \"drop\" to explicitly remove a commit.\n" -"\n" -"Use 'git config rebase.missingCommitsCheck' to change the level of " -"warnings.\n" -"The possible behaviours are: ignore, warn, error.\n" -"\n" -msgstr "" -"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n" -"\n" -"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n" -"可選值有：ignore、warn、error。\n" -"\n" - -#: rebase.c:29 -#, c-format -msgid "%s: 'preserve' superseded by 'merges'" -msgstr "%s：「preserve」已經改成「merges」" - -#: ref-filter.c:42 wt-status.c:2057 -msgid "gone" -msgstr "遺失" - -#: ref-filter.c:43 -#, c-format -msgid "ahead %d" -msgstr "領先 %d" - -#: ref-filter.c:44 -#, c-format -msgid "behind %d" -msgstr "落後 %d" - -#: ref-filter.c:45 -#, c-format -msgid "ahead %d, behind %d" -msgstr "領先 %d，落後 %d" - -#: ref-filter.c:235 -#, c-format -msgid "expected format: %%(color:<color>)" -msgstr "期望的格式：%%(color:<顏色>)" - -#: ref-filter.c:237 -#, c-format -msgid "unrecognized color: %%(color:%s)" -msgstr "無法識別的顏色：%%(color:%s)" - -#: ref-filter.c:259 -#, c-format -msgid "Integer value expected refname:lstrip=%s" -msgstr "期望整數值 refname:lstrip=%s" - -#: ref-filter.c:263 -#, c-format -msgid "Integer value expected refname:rstrip=%s" -msgstr "期望整數值 refname:rstrip=%s" - -#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431 -#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560 -#, c-format -msgid "unrecognized %%(%s) argument: %s" -msgstr "無法識別的 %%(%s) 參數：%s" - -#: ref-filter.c:320 -#, c-format -msgid "%%(objecttype) does not take arguments" -msgstr "%%(objecttype) 不帶參數" - -#: ref-filter.c:352 -#, c-format -msgid "%%(deltabase) does not take arguments" -msgstr "%%(deltabase) 不帶參數" - -#: ref-filter.c:364 -#, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) 不帶參數" - -#: ref-filter.c:396 -#, c-format -msgid "expected %%(trailers:key=<value>)" -msgstr "預期是 %%(trailers:key=<value>)" - -#: ref-filter.c:398 -#, c-format -msgid "unknown %%(trailers) argument: %s" -msgstr "未知的 %%(trailers) 參數：%s" - -#: ref-filter.c:429 -#, c-format -msgid "positive value expected contents:lines=%s" -msgstr "期望一個正數 contents:lines=%s" - -#: ref-filter.c:458 -#, c-format -msgid "positive value expected '%s' in %%(%s)" -msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" - -#: ref-filter.c:476 -#, c-format -msgid "unrecognized email option: %s" -msgstr "無法識別的 email 選項：%s" - -#: ref-filter.c:506 -#, c-format -msgid "expected format: %%(align:<width>,<position>)" -msgstr "期望的格式：%%(align:<寬度>,<位置>)" - -#: ref-filter.c:518 -#, c-format -msgid "unrecognized position:%s" -msgstr "無法識別的位置：%s" - -#: ref-filter.c:525 -#, c-format -msgid "unrecognized width:%s" -msgstr "無法識別的寬度：%s" - -#: ref-filter.c:542 -#, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "元素 %%(align) 需要一個正數的寬度" - -#: ref-filter.c:568 -#, c-format -msgid "%%(rest) does not take arguments" -msgstr "%%(rest) 未取引數" - -#: ref-filter.c:680 -#, c-format -msgid "malformed field name: %.*s" -msgstr "格式錯誤的欄位名：%.*s" - -#: ref-filter.c:707 -#, c-format -msgid "unknown field name: %.*s" -msgstr "未知的欄位名：%.*s" - -#: ref-filter.c:711 -#, c-format -msgid "" -"not a git repository, but the field '%.*s' requires access to object data" -msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" - -#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948 -#, c-format -msgid "format: %%(%s) atom used without a %%(%s) atom" -msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素" - -#: ref-filter.c:912 -#, c-format -msgid "format: %%(then) atom used more than once" -msgstr "格式：%%(then) 元素用了多次" - -#: ref-filter.c:914 -#, c-format -msgid "format: %%(then) atom used after %%(else)" -msgstr "格式：%%(then) 元素用在了 %%(else) 之後" - -#: ref-filter.c:950 -#, c-format -msgid "format: %%(else) atom used more than once" -msgstr "格式：%%(else) 元素用了多次" - -#: ref-filter.c:965 -#, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" - -#: ref-filter.c:1027 -#, c-format -msgid "malformed format string %s" -msgstr "錯誤的格式化字串 %s" - -#: ref-filter.c:1033 -#, c-format -msgid "this command reject atom %%(%.*s)" -msgstr "本命令拒絕 atom %%(%.*s)" - -#: ref-filter.c:1040 -#, c-format -msgid "--format=%.*s cannot be used with --python, --shell, --tcl" -msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用" - -#: ref-filter.c:1707 -#, c-format -msgid "(no branch, rebasing %s)" -msgstr "（無分支，重定 %s 的基底）" - -#: ref-filter.c:1710 -#, c-format -msgid "(no branch, rebasing detached HEAD %s)" -msgstr "（無分支，重定 %s 分離開頭指標的基底）" - -#: ref-filter.c:1713 -#, c-format -msgid "(no branch, bisect started on %s)" -msgstr "（無分支，二分搜尋從 %s 開始）" - -#: ref-filter.c:1717 -#, c-format -msgid "(HEAD detached at %s)" -msgstr "（開頭指標分離於 %s）" - -#: ref-filter.c:1720 -#, c-format -msgid "(HEAD detached from %s)" -msgstr "（開頭指標分離自 %s）" - -#: ref-filter.c:1723 -msgid "(no branch)" -msgstr "（無分支）" - -#: ref-filter.c:1755 ref-filter.c:1973 -#, c-format -msgid "missing object %s for %s" -msgstr "缺少 %2$s 的物件 %1$s" - -#: ref-filter.c:1765 -#, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" - -#: ref-filter.c:2156 -#, c-format -msgid "malformed object at '%s'" -msgstr "格式錯誤的物件 '%s'" - -#: ref-filter.c:2246 -#, c-format -msgid "ignoring ref with broken name %s" -msgstr "忽略帶有錯誤名稱 %s 的引用" - -#: ref-filter.c:2251 refs.c:672 -#, c-format -msgid "ignoring broken ref %s" -msgstr "忽略損壞的引用 %s" - -#: ref-filter.c:2630 -#, c-format -msgid "format: %%(end) atom missing" -msgstr "格式：缺少 %%(end) 元素" - -#: ref-filter.c:2741 -#, c-format -msgid "malformed object name %s" -msgstr "格式錯誤的物件名 %s" - -#: ref-filter.c:2746 -#, c-format -msgid "option `%s' must point to a commit" -msgstr "選項 `%s' 必須指向一個提交" - -#: reflog.c:407 -#, c-format -msgid "not a reflog: %s" -msgstr "不是引用日誌：%s" - -#: reflog.c:410 -#, c-format -msgid "no reflog for '%s'" -msgstr "沒有 '%s' 的引用日誌" - -#: refs.c:262 -#, c-format -msgid "%s does not point to a valid object!" -msgstr "%s 沒有指向一個有效的物件！" - -#: refs.c:561 -#, c-format -msgid "" -"Using '%s' as the name for the initial branch. This default branch name\n" -"is subject to change. To configure the initial branch name to use in all\n" -"of your new repositories, which will suppress this warning, call:\n" -"\n" -"\tgit config --global init.defaultBranch <name>\n" -"\n" -"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" -"'development'. The just-created branch can be renamed via this command:\n" -"\n" -"\tgit branch -m <name>\n" -msgstr "" -"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n" -"如果要設定所有新版本庫要使用的初始分支名稱，\n" -"請呼叫（會隱藏這個警告）：\n" -"\n" -"\tgit config --global init.defaultBranch <name>\n" -"\n" -"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n" -"“development”。剛建立的分支可以用這個命令重新命名：\n" -"\n" -"\tgit branch -m <name>\n" - -#: refs.c:583 -#, c-format -msgid "could not retrieve `%s`" -msgstr "無法擷取「%s」" - -#: refs.c:593 -#, c-format -msgid "invalid branch name: %s = %s" -msgstr "分支名稱無效：%s = %s" - -#: refs.c:670 -#, c-format -msgid "ignoring dangling symref %s" -msgstr "忽略懸空符號引用 %s" - -#: refs.c:919 -#, c-format -msgid "log for ref %s has gap after %s" -msgstr "引用 %s 的日誌在 %s 之後有缺口" - -#: refs.c:926 -#, c-format -msgid "log for ref %s unexpectedly ended on %s" -msgstr "引用 %s 的日誌意外終止於 %s" - -#: refs.c:991 -#, c-format -msgid "log for %s is empty" -msgstr "%s 的日誌為空" - -#: refs.c:1086 -#, c-format -msgid "refusing to update ref with bad name '%s'" -msgstr "拒絕更新有錯誤名稱 '%s' 的引用" - -#: refs.c:1164 -#, c-format -msgid "update_ref failed for ref '%s': %s" -msgstr "對引用 '%s' 執行 update_ref 失敗：%s" - -#: refs.c:2059 -#, c-format -msgid "multiple updates for ref '%s' not allowed" -msgstr "不允許對引用 '%s' 多次更新" - -#: refs.c:2145 -msgid "ref updates forbidden inside quarantine environment" -msgstr "在隔離環境中禁止更新引用" - -#: refs.c:2156 -msgid "ref updates aborted by hook" -msgstr "引用更新被掛鉤拒絕" - -#: refs.c:2264 refs.c:2294 -#, c-format -msgid "'%s' exists; cannot create '%s'" -msgstr "'%s' 已存在，無法建立 '%s'" - -#: refs.c:2270 refs.c:2305 -#, c-format -msgid "cannot process '%s' and '%s' at the same time" -msgstr "無法同時處理 '%s' 和 '%s'" - -#: refs/files-backend.c:1295 -#, c-format -msgid "could not remove reference %s" -msgstr "無法刪除引用 %s" - -#: refs/files-backend.c:1310 refs/packed-backend.c:1565 -#: refs/packed-backend.c:1575 -#, c-format -msgid "could not delete reference %s: %s" -msgstr "無法刪除引用 %s：%s" - -#: refs/files-backend.c:1313 refs/packed-backend.c:1578 -#, c-format -msgid "could not delete references: %s" -msgstr "無法刪除引用：%s" - -#: refspec.c:170 -#, c-format -msgid "invalid refspec '%s'" -msgstr "無效的引用規格：「%s」" - -#: remote.c:402 -#, c-format -msgid "config remote shorthand cannot begin with '/': %s" -msgstr "設定的遠端短名稱不能以 '/' 開始：%s" - -#: remote.c:450 -msgid "more than one receivepack given, using the first" -msgstr "提供了一個以上的 receivepack，使用第一個" - -#: remote.c:458 -msgid "more than one uploadpack given, using the first" -msgstr "提供了一個以上的 uploadpack，使用第一個" - -#: remote.c:698 -#, c-format -msgid "Cannot fetch both %s and %s to %s" -msgstr "不能同時取得 %s 和 %s 至 %s" - -#: remote.c:702 -#, c-format -msgid "%s usually tracks %s, not %s" -msgstr "%s 通常追蹤 %s，而非 %s" - -#: remote.c:706 -#, c-format -msgid "%s tracks both %s and %s" -msgstr "%s 同時追蹤 %s 和 %s" - -#: remote.c:774 -#, c-format -msgid "key '%s' of pattern had no '*'" -msgstr "模式的鍵 '%s' 沒有 '*'" - -#: remote.c:784 -#, c-format -msgid "value '%s' of pattern has no '*'" -msgstr "模式的值 '%s' 沒有 '*'" - -#: remote.c:1191 -#, c-format -msgid "src refspec %s does not match any" -msgstr "來源引用規格 %s 沒有符合項目" - -#: remote.c:1196 -#, c-format -msgid "src refspec %s matches more than one" -msgstr "來源引用規格 %s 符合超過一個" - -#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push -#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is -#. the <src>. -#. -#: remote.c:1211 -#, c-format -msgid "" -"The destination you provided is not a full refname (i.e.,\n" -"starting with \"refs/\"). We tried to guess what you meant by:\n" -"\n" -"- Looking for a ref that matches '%s' on the remote side.\n" -"- Checking if the <src> being pushed ('%s')\n" -" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" -" refs/{heads,tags}/ prefix on the remote side.\n" -"\n" -"Neither worked, so we gave up. You must fully qualify the ref." -msgstr "" -"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n" -"我們覺得您可能想要：\n" -"\n" -"- 在遠端查詢符合「%s」的引用。\n" -"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n" -" 如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n" -"\n" -"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。" - -#: remote.c:1231 -#, c-format -msgid "" -"The <src> part of the refspec is a commit object.\n" -"Did you mean to create a new branch by pushing to\n" -"'%s:refs/heads/%s'?" -msgstr "" -"引用規格的 <src> 是個提交物件。\n" -"您是想透過推送至「%s:refs/heads/%s」\n" -"來建立新分支嗎？" - -#: remote.c:1236 -#, c-format -msgid "" -"The <src> part of the refspec is a tag object.\n" -"Did you mean to create a new tag by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用規格的 <src> 是個標籤物件。\n" -"您是想透過推送至「%s:refs/tags/%s」\n" -"來建立新標籤嗎？" - -#: remote.c:1241 -#, c-format -msgid "" -"The <src> part of the refspec is a tree object.\n" -"Did you mean to tag a new tree by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用規格的 <src> 是個樹狀物件。\n" -"您是想透過推送至「%s:refs/tags/%s」\n" -"為新樹狀物件貼上標籤嗎？" - -#: remote.c:1246 -#, c-format -msgid "" -"The <src> part of the refspec is a blob object.\n" -"Did you mean to tag a new blob by pushing to\n" -"'%s:refs/tags/%s'?" -msgstr "" -"引用規格的 <src> 是個資料 (blob) 物件。\n" -"您是想透過推送至「%s:refs/tags/%s」\n" -"為新資料物件貼上標籤嗎？" - -#: remote.c:1282 -#, c-format -msgid "%s cannot be resolved to branch" -msgstr "%s 無法被解析為分支" - -#: remote.c:1293 -#, c-format -msgid "unable to delete '%s': remote ref does not exist" -msgstr "無法刪除 '%s'：遠端引用不存在" - -#: remote.c:1305 -#, c-format -msgid "dst refspec %s matches more than one" -msgstr "目的地引用規格 %s 符合超過一個" - -#: remote.c:1312 -#, c-format -msgid "dst ref %s receives from more than one src" -msgstr "目的地引用 %s 接收超過一個來源" - -#: remote.c:1833 remote.c:1940 -msgid "HEAD does not point to a branch" -msgstr "HEAD 沒有指向一個分支" - -#: remote.c:1842 -#, c-format -msgid "no such branch: '%s'" -msgstr "沒有此分支：'%s'" - -#: remote.c:1845 -#, c-format -msgid "no upstream configured for branch '%s'" -msgstr "尚未給分支 '%s' 設定上游" - -#: remote.c:1851 -#, c-format -msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" - -#: remote.c:1866 -#, c-format -msgid "push destination '%s' on remote '%s' has no local tracking branch" -msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支" - -#: remote.c:1881 -#, c-format -msgid "branch '%s' has no remote for pushing" -msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" - -#: remote.c:1891 -#, c-format -msgid "push refspecs for '%s' do not include '%s'" -msgstr "向 '%s' 推送引用規格未包含 '%s'" - -#: remote.c:1904 -msgid "push has no destination (push.default is 'nothing')" -msgstr "推送沒有目的地（push.default 是 'nothing'）" - -#: remote.c:1926 -msgid "cannot resolve 'simple' push to a single destination" -msgstr "無法解析 'simple' 推送至單獨目的地" - -#: remote.c:2059 -#, c-format -msgid "couldn't find remote ref %s" -msgstr "無法找到遠端引用 %s" - -#: remote.c:2072 -#, c-format -msgid "* Ignoring funny ref '%s' locally" -msgstr "* 在本機忽略可笑的引用 '%s'" - -#: remote.c:2235 -#, c-format -msgid "Your branch is based on '%s', but the upstream is gone.\n" -msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" - -#: remote.c:2239 -msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" - -#: remote.c:2242 -#, c-format -msgid "Your branch is up to date with '%s'.\n" -msgstr "您的分支與上游分支 '%s' 一致。\n" - -#: remote.c:2246 -#, c-format -msgid "Your branch and '%s' refer to different commits.\n" -msgstr "您的分支和 '%s' 指向不同的提交。\n" - -#: remote.c:2249 -#, c-format -msgid " (use \"%s\" for details)\n" -msgstr " （使用 \"%s\" 檢視詳情）\n" - -#: remote.c:2253 -#, c-format -msgid "Your branch is ahead of '%s' by %d commit.\n" -msgid_plural "Your branch is ahead of '%s' by %d commits.\n" -msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n" - -#: remote.c:2259 -msgid " (use \"git push\" to publish your local commits)\n" -msgstr " （使用 \"git push\" 來發布您的本機提交）\n" - -#: remote.c:2262 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" - -# 譯者：請維持前導空格 -#: remote.c:2270 -msgid " (use \"git pull\" to update your local branch)\n" -msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" - -#: remote.c:2273 -#, c-format -msgid "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commit each, respectively.\n" -msgid_plural "" -"Your branch and '%s' have diverged,\n" -"and have %d and %d different commits each, respectively.\n" -msgstr[0] "" -"您的分支和 '%s' 出現了偏離，\n" -"並且分別有 %d 和 %d 處不同的提交。\n" - -# 譯者：請維持前導空格 -#: remote.c:2283 -msgid " (use \"git pull\" to merge the remote branch into yours)\n" -msgstr " （使用 \"git pull\" 來合併遠端分支）\n" - -#: remote.c:2475 -#, c-format -msgid "cannot parse expected object name '%s'" -msgstr "無法解析期望的物件名 '%s'" - -#: replace-object.c:21 -#, c-format -msgid "bad replace ref name: %s" -msgstr "錯誤的取代引用名稱：%s" - -#: replace-object.c:30 -#, c-format -msgid "duplicate replace ref: %s" -msgstr "重複的取代引用：%s" - -#: replace-object.c:82 -#, c-format -msgid "replace depth too high for object %s" -msgstr "物件 %s 的取代層級太深" - -#: rerere.c:201 rerere.c:210 rerere.c:213 -msgid "corrupt MERGE_RR" -msgstr "損壞的 MERGE_RR" - -#: rerere.c:248 rerere.c:253 -msgid "unable to write rerere record" -msgstr "無法寫入 rerere 記錄" - -#: rerere.c:479 -#, c-format -msgid "there were errors while writing '%s' (%s)" -msgstr "寫入 '%s' (%s) 時發生錯誤" - -#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298 -#, c-format -msgid "failed to flush '%s'" -msgstr "排清 '%s' 失敗" - -#: rerere.c:487 rerere.c:1024 -#, c-format -msgid "could not parse conflict hunks in '%s'" -msgstr "不能解析 '%s' 中的衝突區塊" - -#: rerere.c:669 -#, c-format -msgid "failed utime() on '%s'" -msgstr "在 '%s' 上呼叫 utime() 失敗" - -#: rerere.c:679 -#, c-format -msgid "writing '%s' failed" -msgstr "寫入 '%s' 失敗" - -#: rerere.c:699 -#, c-format -msgid "Staged '%s' using previous resolution." -msgstr "使用之前的解決方案暫存 '%s'。" - -#: rerere.c:738 -#, c-format -msgid "Recorded resolution for '%s'." -msgstr "已記錄 '%s' 的解決方案。" - -#: rerere.c:773 -#, c-format -msgid "Resolved '%s' using previous resolution." -msgstr "使用之前的解決方案解決 '%s'。" - -#: rerere.c:788 -#, c-format -msgid "cannot unlink stray '%s'" -msgstr "不能刪除 stray '%s'" - -#: rerere.c:792 -#, c-format -msgid "Recorded preimage for '%s'" -msgstr "為 '%s' 記錄 preimage" - -#: rerere.c:866 submodule.c:2290 builtin/log.c:2042 -#: builtin/submodule--helper.c:1786 builtin/submodule--helper.c:1833 -#, c-format -msgid "could not create directory '%s'" -msgstr "不能建立目錄 '%s'" - -#: rerere.c:1042 -#, c-format -msgid "failed to update conflicted state in '%s'" -msgstr "更新 '%s' 中的衝突狀態失敗" - -#: rerere.c:1053 rerere.c:1060 -#, c-format -msgid "no remembered resolution for '%s'" -msgstr "沒有為 '%s' 記憶的解決方案" - -#: rerere.c:1062 -#, c-format -msgid "cannot unlink '%s'" -msgstr "不能刪除 '%s'" - -#: rerere.c:1072 -#, c-format -msgid "Updated preimage for '%s'" -msgstr "已為 '%s' 更新 preimage" - -#: rerere.c:1081 -#, c-format -msgid "Forgot resolution for '%s'\n" -msgstr "忘記 '%s' 的解決方案\n" - -#: rerere.c:1192 -msgid "unable to open rr-cache directory" -msgstr "不能開啟 rr-cache 目錄" - -#: reset.c:112 -msgid "could not determine HEAD revision" -msgstr "不能確定 HEAD 版本" - -#: reset.c:141 reset.c:147 sequencer.c:3696 -#, c-format -msgid "failed to find tree of %s" -msgstr "無法找到 %s 指向的樹" - -#: revision.c:2358 -msgid "--unpacked=<packfile> no longer supported" -msgstr "--unpacked=<packfile> 已不受支援" - -#: revision.c:2712 -msgid "your current branch appears to be broken" -msgstr "您的目前分支好像被損壞" - -#: revision.c:2715 -#, c-format -msgid "your current branch '%s' does not have any commits yet" -msgstr "您的目前分支 '%s' 尚無任何提交" - -#: revision.c:2901 -msgid "object filtering requires --objects" -msgstr "物件過濾需要 --objects" - -#: revision.c:2918 -msgid "-L does not yet support diff formats besides -p and -s" -msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" - -#: run-command.c:1262 -#, c-format -msgid "cannot create async thread: %s" -msgstr "不能建立 async 執行緒：%s" - -#: send-pack.c:150 -msgid "unexpected flush packet while reading remote unpack status" -msgstr "讀取遠端解包狀態時收到意外的 flush 包" - -#: send-pack.c:152 -#, c-format -msgid "unable to parse remote unpack status: %s" -msgstr "不能解析遠端解包狀態：%s" - -#: send-pack.c:154 -#, c-format -msgid "remote unpack failed: %s" -msgstr "遠端解包失敗：%s" - -#: send-pack.c:378 -msgid "failed to sign the push certificate" -msgstr "為推送證書籤名失敗" - -#: send-pack.c:435 -msgid "send-pack: unable to fork off fetch subprocess" -msgstr "send-pack：無法 fork 一個 fetch 子處理程序" - -#: send-pack.c:457 -msgid "push negotiation failed; proceeding anyway with push" -msgstr "push 協商失敗。繼續使用 push 處理" - -#: send-pack.c:528 -msgid "the receiving end does not support this repository's hash algorithm" -msgstr "接收端不支援此版本庫的雜湊算法" - -#: send-pack.c:537 -msgid "the receiving end does not support --signed push" -msgstr "接收端不支援 --signed 推送" - -#: send-pack.c:539 -msgid "" -"not sending a push certificate since the receiving end does not support --" -"signed push" -msgstr "未傳送推送證書，因為接收端不支援 --signed 推送" - -#: send-pack.c:546 -msgid "the receiving end does not support --atomic push" -msgstr "接收端不支援 --atomic 推送" - -#: send-pack.c:551 -msgid "the receiving end does not support push options" -msgstr "接收端不支援推送選項" - -#: sequencer.c:197 -#, c-format -msgid "invalid commit message cleanup mode '%s'" -msgstr "無效的提交說明清理模式 '%s'" - -#: sequencer.c:325 -#, c-format -msgid "could not delete '%s'" -msgstr "無法刪除 '%s'" - -#: sequencer.c:345 sequencer.c:4724 builtin/rebase.c:564 builtin/rebase.c:1326 -#: builtin/rm.c:409 -#, c-format -msgid "could not remove '%s'" -msgstr "無法刪除 '%s'" - -#: sequencer.c:355 -msgid "revert" -msgstr "復原" - -#: sequencer.c:357 -msgid "cherry-pick" -msgstr "摘取" - -#: sequencer.c:359 -msgid "rebase" -msgstr "rebase" - -#: sequencer.c:361 -#, c-format -msgid "unknown action: %d" -msgstr "未知動作：%d" - -#: sequencer.c:420 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add <paths>' or 'git rm <paths>'" -msgstr "" -"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" -"指令標記修正後的檔案" - -#: sequencer.c:423 -msgid "" -"After resolving the conflicts, mark them with\n" -"\"git add/rm <pathspec>\", then run\n" -"\"git cherry-pick --continue\".\n" -"You can instead skip this commit with \"git cherry-pick --skip\".\n" -"To abort and get back to the state before \"git cherry-pick\",\n" -"run \"git cherry-pick --abort\"." -msgstr "" -"解決衝突後，請使用\n" -"\"git add/rm <pathspec>\" 標記路徑，再執行\n" -"\"git cherry-pick --continue\"。\n" -"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n" -"若要取消並返回 \"git cherry-pick\" 前的狀態，\n" -"請執行 \"git cherry-pick --abort\"。" - -#: sequencer.c:430 -msgid "" -"After resolving the conflicts, mark them with\n" -"\"git add/rm <pathspec>\", then run\n" -"\"git revert --continue\".\n" -"You can instead skip this commit with \"git revert --skip\".\n" -"To abort and get back to the state before \"git revert\",\n" -"run \"git revert --abort\"." -msgstr "" -"解決衝突後，請使用\n" -"\"git add/rm <pathspec>\" 標記路徑，再執行\n" -"\"git revert --continue\"。\n" -"亦可以使用 \"git revert --skip\" 略過提交。\n" -"若要取消並返回 \"git revert\" 前的狀態，\n" -"請執行 \"git revert --abort\"。" - -#: sequencer.c:448 sequencer.c:3288 -#, c-format -msgid "could not lock '%s'" -msgstr "不能鎖定 '%s'" - -#: sequencer.c:450 sequencer.c:3087 sequencer.c:3292 sequencer.c:3306 -#: sequencer.c:3557 sequencer.c:5591 strbuf.c:1189 wrapper.c:715 -#, c-format -msgid "could not write to '%s'" -msgstr "不能寫入 '%s'" - -#: sequencer.c:455 -#, c-format -msgid "could not write eol to '%s'" -msgstr "不能將換行符號寫入 '%s'" - -#: sequencer.c:460 sequencer.c:3092 sequencer.c:3294 sequencer.c:3308 -#: sequencer.c:3565 -#, c-format -msgid "failed to finalize '%s'" -msgstr "無法完成 '%s'" - -#: sequencer.c:473 sequencer.c:1930 sequencer.c:3112 sequencer.c:3547 -#: sequencer.c:3675 builtin/am.c:290 builtin/commit.c:837 builtin/merge.c:1154 -#, c-format -msgid "could not read '%s'" -msgstr "不能讀取 '%s'" - -#: sequencer.c:499 -#, c-format -msgid "your local changes would be overwritten by %s." -msgstr "您的本機修改將被%s覆蓋。" - -#: sequencer.c:503 -msgid "commit your changes or stash them to proceed." -msgstr "提交您的修改或儲藏後再繼續。" - -#: sequencer.c:535 -#, c-format -msgid "%s: fast-forward" -msgstr "%s：快轉" - -#: sequencer.c:574 builtin/tag.c:615 -#, c-format -msgid "Invalid cleanup mode %s" -msgstr "無效的清理模式 %s" - -#. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase". -#. -#: sequencer.c:685 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "%s：無法寫入新索引檔案" - -#: sequencer.c:699 -msgid "unable to update cache tree" -msgstr "不能更新快取樹" - -#: sequencer.c:713 -msgid "could not resolve HEAD commit" -msgstr "不能解析 HEAD 提交" - -#: sequencer.c:793 -#, c-format -msgid "no key present in '%.*s'" -msgstr "在 '%.*s' 中沒有 key" - -#: sequencer.c:804 -#, c-format -msgid "unable to dequote value of '%s'" -msgstr "無法為 '%s' 的值去引號" - -#: sequencer.c:841 wrapper.c:219 wrapper.c:389 builtin/am.c:757 -#: builtin/am.c:849 builtin/rebase.c:699 -#, c-format -msgid "could not open '%s' for reading" -msgstr "無法開啟 '%s' 進行讀取" - -#: sequencer.c:851 -msgid "'GIT_AUTHOR_NAME' already given" -msgstr "已經給出 'GIT_AUTHOR_NAME'" - -#: sequencer.c:856 -msgid "'GIT_AUTHOR_EMAIL' already given" -msgstr "已經給出 'GIT_AUTHOR_EMAIL'" - -#: sequencer.c:861 -msgid "'GIT_AUTHOR_DATE' already given" -msgstr "已經給出 'GIT_AUTHOR_DATE'" - -#: sequencer.c:865 -#, c-format -msgid "unknown variable '%s'" -msgstr "未知變數 '%s'" - -#: sequencer.c:870 -msgid "missing 'GIT_AUTHOR_NAME'" -msgstr "缺少 'GIT_AUTHOR_NAME'" - -#: sequencer.c:872 -msgid "missing 'GIT_AUTHOR_EMAIL'" -msgstr "缺少 'GIT_AUTHOR_EMAIL'" - -#: sequencer.c:874 -msgid "missing 'GIT_AUTHOR_DATE'" -msgstr "缺少 'GIT_AUTHOR_DATE'" - -#: sequencer.c:939 -#, c-format -msgid "" -"you have staged changes in your working tree\n" -"If these changes are meant to be squashed into the previous commit, run:\n" -"\n" -" git commit --amend %s\n" -"\n" -"If they are meant to go into a new commit, run:\n" -"\n" -" git commit %s\n" -"\n" -"In both cases, once you're done, continue with:\n" -"\n" -" git rebase --continue\n" -msgstr "" -"您的工作區中存在已暫存的修改\n" -"如果這些修改需要被併入前一個提交，執行：\n" -"\n" -" git commit --amend %s\n" -"\n" -"如果這些修改要形成一個新提交，執行：\n" -"\n" -" git commit %s\n" -"\n" -"無論哪種情況，當您完成提交，繼續執行：\n" -"\n" -" git rebase --continue\n" - -#: sequencer.c:1225 -msgid "'prepare-commit-msg' hook failed" -msgstr "'prepare-commit-msg' 掛鉤失敗" - -#: sequencer.c:1231 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly. Run the\n" -"following command and follow the instructions in your editor to edit\n" -"your configuration file:\n" -"\n" -" git config --global --edit\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n" -"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n" -"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n" -"\n" -" git config --global --edit\n" -"\n" -"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n" -"\n" -" git commit --amend --reset-author\n" - -#: sequencer.c:1244 -msgid "" -"Your name and email address were configured automatically based\n" -"on your username and hostname. Please check that they are accurate.\n" -"You can suppress this message by setting them explicitly:\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"After doing this, you may fix the identity used for this commit with:\n" -"\n" -" git commit --amend --reset-author\n" -msgstr "" -"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n" -"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n" -"\n" -" git config --global user.name \"Your Name\"\n" -" git config --global user.email you@example.com\n" -"\n" -"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n" -"\n" -" git commit --amend --reset-author\n" - -#: sequencer.c:1287 -msgid "couldn't look up newly created commit" -msgstr "無法找到新建立的提交" - -#: sequencer.c:1289 -msgid "could not parse newly created commit" -msgstr "不能解析新建立的提交" - -#: sequencer.c:1336 -msgid "unable to resolve HEAD after creating commit" -msgstr "建立提交後，不能解析 HEAD" - -#: sequencer.c:1338 -msgid "detached HEAD" -msgstr "分離 HEAD" - -# 譯者：中文字串拼接，可刪除前導空格 -#: sequencer.c:1342 -msgid " (root-commit)" -msgstr " (根提交)" - -#: sequencer.c:1363 -msgid "could not parse HEAD" -msgstr "不能解析 HEAD" - -#: sequencer.c:1365 -#, c-format -msgid "HEAD %s is not a commit!" -msgstr "HEAD %s 不是一個提交！" - -#: sequencer.c:1369 sequencer.c:1447 builtin/commit.c:1707 -msgid "could not parse HEAD commit" -msgstr "不能解析 HEAD 提交" - -#: sequencer.c:1425 sequencer.c:2310 -msgid "unable to parse commit author" -msgstr "不能解析提交作者" - -#: sequencer.c:1436 builtin/am.c:1644 builtin/merge.c:710 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree 無法寫入樹狀物件" - -#: sequencer.c:1469 sequencer.c:1589 -#, c-format -msgid "unable to read commit message from '%s'" -msgstr "不能從 '%s' 讀取提交說明" - -#: sequencer.c:1500 sequencer.c:1532 -#, c-format -msgid "invalid author identity '%s'" -msgstr "無效的作者身分 '%s'" - -#: sequencer.c:1506 -msgid "corrupt author: missing date information" -msgstr "作者資訊損壞：缺少日期資訊" - -#: sequencer.c:1545 builtin/am.c:1671 builtin/commit.c:1821 builtin/merge.c:921 -#: builtin/merge.c:946 t/helper/test-fast-rebase.c:78 -msgid "failed to write commit object" -msgstr "寫提交物件失敗" - -#: sequencer.c:1572 sequencer.c:4496 t/helper/test-fast-rebase.c:199 -#: t/helper/test-fast-rebase.c:217 -#, c-format -msgid "could not update %s" -msgstr "不能更新 %s" - -#: sequencer.c:1621 -#, c-format -msgid "could not parse commit %s" -msgstr "不能解析提交 %s" - -#: sequencer.c:1626 -#, c-format -msgid "could not parse parent commit %s" -msgstr "不能解析父提交 %s" - -#: sequencer.c:1709 sequencer.c:1990 -#, c-format -msgid "unknown command: %d" -msgstr "未知指令：%d" - -#: sequencer.c:1751 -msgid "This is the 1st commit message:" -msgstr "這是第一個提交說明：" - -#: sequencer.c:1752 -#, c-format -msgid "This is the commit message #%d:" -msgstr "這是提交說明 #%d：" - -#: sequencer.c:1753 -msgid "The 1st commit message will be skipped:" -msgstr "略過第 1 個提交說明：" - -#: sequencer.c:1754 -#, c-format -msgid "The commit message #%d will be skipped:" -msgstr "略過第 %d 個提交說明：" - -#: sequencer.c:1755 -#, c-format -msgid "This is a combination of %d commits." -msgstr "這是整合 %d 個提交的集合提交。" - -#: sequencer.c:1902 sequencer.c:1959 -#, c-format -msgid "cannot write '%s'" -msgstr "不能寫 '%s'" - -#: sequencer.c:1949 -msgid "need a HEAD to fixup" -msgstr "需要一個 HEAD 來修復" - -#: sequencer.c:1951 sequencer.c:3592 -msgid "could not read HEAD" -msgstr "不能讀取 HEAD" - -#: sequencer.c:1953 -msgid "could not read HEAD's commit message" -msgstr "不能讀取 HEAD 的提交說明" - -#: sequencer.c:1977 -#, c-format -msgid "could not read commit message of %s" -msgstr "不能讀取 %s 的提交說明" - -#: sequencer.c:2087 -msgid "your index file is unmerged." -msgstr "您的索引檔案未完成合併。" - -#: sequencer.c:2094 -msgid "cannot fixup root commit" -msgstr "不能修復根提交" - -#: sequencer.c:2113 -#, c-format -msgid "commit %s is a merge but no -m option was given." -msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" - -#: sequencer.c:2121 sequencer.c:2129 -#, c-format -msgid "commit %s does not have parent %d" -msgstr "提交 %s 沒有第 %d 個父提交" - -#: sequencer.c:2135 -#, c-format -msgid "cannot get commit message for %s" -msgstr "不能得到 %s 的提交說明" - -#. TRANSLATORS: The first %s will be a "todo" command like -#. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:2154 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "%s：不能解析父提交 %s" - -#: sequencer.c:2220 -#, c-format -msgid "could not rename '%s' to '%s'" -msgstr "不能將 '%s' 重新命名為 '%s'" - -#: sequencer.c:2280 -#, c-format -msgid "could not revert %s... %s" -msgstr "不能還原 %s... %s" - -#: sequencer.c:2281 -#, c-format -msgid "could not apply %s... %s" -msgstr "不能套用 %s... %s" - -#: sequencer.c:2302 -#, c-format -msgid "dropping %s %s -- patch contents already upstream\n" -msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" - -#: sequencer.c:2360 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s：無法讀取索引" - -#: sequencer.c:2368 -#, c-format -msgid "git %s: failed to refresh the index" -msgstr "git %s：無法重新整理索引" - -#: sequencer.c:2448 -#, c-format -msgid "%s does not accept arguments: '%s'" -msgstr "%s 不接受參數：'%s'" - -#: sequencer.c:2457 -#, c-format -msgid "missing arguments for %s" -msgstr "缺少 %s 的參數" - -#: sequencer.c:2500 -#, c-format -msgid "could not parse '%s'" -msgstr "無法解析 '%s'" - -#: sequencer.c:2561 -#, c-format -msgid "invalid line %d: %.*s" -msgstr "無效行 %d：%.*s" - -#: sequencer.c:2572 -#, c-format -msgid "cannot '%s' without a previous commit" -msgstr "沒有父提交的情況下不能 '%s'" - -#: sequencer.c:2620 builtin/rebase.c:185 -#, c-format -msgid "could not read '%s'." -msgstr "不能讀取 '%s'。" - -#: sequencer.c:2658 -msgid "cancelling a cherry picking in progress" -msgstr "正在取消一個進行中的揀選" - -#: sequencer.c:2667 -msgid "cancelling a revert in progress" -msgstr "正在取消一個進行中的還原" - -#: sequencer.c:2707 -msgid "please fix this using 'git rebase --edit-todo'." -msgstr "請用 'git rebase --edit-todo' 來修改。" - -#: sequencer.c:2709 -#, c-format -msgid "unusable instruction sheet: '%s'" -msgstr "不可用的指令清單：'%s'" - -#: sequencer.c:2714 -msgid "no commits parsed." -msgstr "沒有解析提交。" - -#: sequencer.c:2725 -msgid "cannot cherry-pick during a revert." -msgstr "不能在還原提交中執行揀選。" - -#: sequencer.c:2727 -msgid "cannot revert during a cherry-pick." -msgstr "不能在揀選中執行還原提交。" - -#: sequencer.c:2914 -msgid "unusable squash-onto" -msgstr "不可用的 squash-onto" - -#: sequencer.c:2934 -#, c-format -msgid "malformed options sheet: '%s'" -msgstr "格式錯誤的選項清單：'%s'" - -#: sequencer.c:3029 sequencer.c:4875 -msgid "empty commit set passed" -msgstr "提供了空的提交集" - -#: sequencer.c:3046 -msgid "revert is already in progress" -msgstr "一個還原動作已在進行" - -#: sequencer.c:3048 -#, c-format -msgid "try \"git revert (--continue | %s--abort | --quit)\"" -msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" - -#: sequencer.c:3051 -msgid "cherry-pick is already in progress" -msgstr "揀選動作已在進行" - -#: sequencer.c:3053 -#, c-format -msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" -msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" - -#: sequencer.c:3067 -#, c-format -msgid "could not create sequencer directory '%s'" -msgstr "不能建立序列目錄 '%s'" - -#: sequencer.c:3082 -msgid "could not lock HEAD" -msgstr "不能鎖定 HEAD" - -#: sequencer.c:3142 sequencer.c:4585 -msgid "no cherry-pick or revert in progress" -msgstr "揀選或還原動作並未進行" - -#: sequencer.c:3144 sequencer.c:3155 -msgid "cannot resolve HEAD" -msgstr "不能解析 HEAD" - -#: sequencer.c:3146 sequencer.c:3190 -msgid "cannot abort from a branch yet to be born" -msgstr "不能從尚未建立的分支終止" - -#: sequencer.c:3176 builtin/fetch.c:1030 builtin/fetch.c:1457 -#: builtin/grep.c:774 -#, c-format -msgid "cannot open '%s'" -msgstr "不能開啟 '%s'" - -#: sequencer.c:3178 -#, c-format -msgid "cannot read '%s': %s" -msgstr "不能讀取 '%s'：%s" - -#: sequencer.c:3179 -msgid "unexpected end of file" -msgstr "意外的檔案結束" - -#: sequencer.c:3185 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" - -#: sequencer.c:3196 -msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" -msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" - -#: sequencer.c:3237 -msgid "no revert in progress" -msgstr "沒有正在進行的還原" - -#: sequencer.c:3246 -msgid "no cherry-pick in progress" -msgstr "沒有正在進行的揀選" - -#: sequencer.c:3256 -msgid "failed to skip the commit" -msgstr "無法略過這個提交" - -#: sequencer.c:3263 -msgid "there is nothing to skip" -msgstr "沒有要略過的" - -#: sequencer.c:3266 -#, c-format -msgid "" -"have you committed already?\n" -"try \"git %s --continue\"" -msgstr "" -"您已經提交了嗎？\n" -"試試 \"git %s --continue\"" - -#: sequencer.c:3428 sequencer.c:4476 -msgid "cannot read HEAD" -msgstr "不能讀取 HEAD" - -#: sequencer.c:3445 -#, c-format -msgid "unable to copy '%s' to '%s'" -msgstr "無法複製 '%s' 至 '%s'" - -#: sequencer.c:3453 -#, c-format -msgid "" -"You can amend the commit now, with\n" -"\n" -" git commit --amend %s\n" -"\n" -"Once you are satisfied with your changes, run\n" -"\n" -" git rebase --continue\n" -msgstr "" -"您現在可以修補這個提交，使用\n" -"\n" -" git commit --amend %s\n" -"\n" -"當您對變更感到滿意，執行\n" -"\n" -" git rebase --continue\n" - -#: sequencer.c:3463 -#, c-format -msgid "Could not apply %s... %.*s" -msgstr "不能套用 %s... %.*s" - -#: sequencer.c:3470 -#, c-format -msgid "Could not merge %.*s" -msgstr "不能合併 %.*s" - -#: sequencer.c:3484 sequencer.c:3488 builtin/difftool.c:633 -#, c-format -msgid "could not copy '%s' to '%s'" -msgstr "不能複製 '%s' 至 '%s'" - -#: sequencer.c:3499 -#, c-format -msgid "Executing: %s\n" -msgstr "執行：%s\n" - -# 譯者：請維持前導空格 -#: sequencer.c:3510 -#, c-format -msgid "" -"execution failed: %s\n" -"%sYou can fix the problem, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"執行失敗：%s\n" -"%s您可以改正該問題，然後執行\n" -"\n" -" git rebase --continue\n" -"\n" - -#: sequencer.c:3516 -msgid "and made changes to the index and/or the working tree\n" -msgstr "並且修改索引和/或工作區\n" - -#: sequencer.c:3522 -#, c-format -msgid "" -"execution succeeded: %s\n" -"but left changes to the index and/or the working tree\n" -"Commit or stash your changes, and then run\n" -"\n" -" git rebase --continue\n" -"\n" -msgstr "" -"執行成功：%s\n" -"但是在索引和/或工作區中存在變更\n" -"提交或儲藏修改，然後執行\n" -"\n" -" git rebase --continue\n" -"\n" - -#: sequencer.c:3582 -#, c-format -msgid "illegal label name: '%.*s'" -msgstr "非法的標籤名稱：'%.*s'" - -#: sequencer.c:3655 -msgid "writing fake root commit" -msgstr "寫偽根提交" - -#: sequencer.c:3660 -msgid "writing squash-onto" -msgstr "寫入 squash-onto" - -#: sequencer.c:3739 -#, c-format -msgid "could not resolve '%s'" -msgstr "無法解析 '%s'" - -#: sequencer.c:3771 -msgid "cannot merge without a current revision" -msgstr "沒有目前版本不能合併" - -#: sequencer.c:3793 -#, c-format -msgid "unable to parse '%.*s'" -msgstr "無法解析 '%.*s'" - -#: sequencer.c:3802 -#, c-format -msgid "nothing to merge: '%.*s'" -msgstr "無可用合併：'%.*s'" - -#: sequencer.c:3814 -msgid "octopus merge cannot be executed on top of a [new root]" -msgstr "章魚合並不能在一個新的根提交上執行" - -#: sequencer.c:3869 -#, c-format -msgid "could not get commit message of '%s'" -msgstr "不能取得 '%s' 的提交說明" - -#: sequencer.c:4013 -#, c-format -msgid "could not even attempt to merge '%.*s'" -msgstr "甚至不能嘗試合併 '%.*s'" - -#: sequencer.c:4029 -msgid "merge: Unable to write new index file" -msgstr "合併：無法寫入新索引檔案" - -#: sequencer.c:4110 -msgid "Cannot autostash" -msgstr "無法 autostash" - -#: sequencer.c:4113 -#, c-format -msgid "Unexpected stash response: '%s'" -msgstr "意外的 stash 回應：'%s'" - -#: sequencer.c:4119 -#, c-format -msgid "Could not create directory for '%s'" -msgstr "不能為 '%s' 建立目錄" - -#: sequencer.c:4122 -#, c-format -msgid "Created autostash: %s\n" -msgstr "建立了 autostash：%s\n" - -#: sequencer.c:4124 -msgid "could not reset --hard" -msgstr "無法 reset --hard" - -#: sequencer.c:4148 -#, c-format -msgid "Applied autostash.\n" -msgstr "已套用 autostash。\n" - -#: sequencer.c:4160 -#, c-format -msgid "cannot store %s" -msgstr "不能儲存 %s" - -#: sequencer.c:4163 -#, c-format -msgid "" -"%s\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"%s\n" -"您的修改安全地儲存在儲藏區中。\n" -"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" - -#: sequencer.c:4168 -msgid "Applying autostash resulted in conflicts." -msgstr "因套用自動儲藏而導致衝突。" - -#: sequencer.c:4169 -msgid "Autostash exists; creating a new stash entry." -msgstr "已有自動儲藏；建立新儲藏項目。" - -#: sequencer.c:4225 -msgid "could not detach HEAD" -msgstr "不能分離開頭指標" - -#: sequencer.c:4240 -#, c-format -msgid "Stopped at HEAD\n" -msgstr "停止在 HEAD\n" - -#: sequencer.c:4242 -#, c-format -msgid "Stopped at %s\n" -msgstr "停止在 %s\n" - -#: sequencer.c:4274 -#, c-format -msgid "" -"Could not execute the todo command\n" -"\n" -" %.*s\n" -"It has been rescheduled; To edit the command before continuing, please\n" -"edit the todo list first:\n" -"\n" -" git rebase --edit-todo\n" -" git rebase --continue\n" -msgstr "" -"無法執行待辦指令\n" -"\n" -" %.*s\n" -"已被重新安排，在繼續之前編輯指令，請先編輯待辦列表：\n" -"\n" -" git rebase --edit-todo\n" -" git rebase --continue\n" - -#: sequencer.c:4320 -#, c-format -msgid "Rebasing (%d/%d)%s" -msgstr "正在重定基底 (%d/%d)%s" - -#: sequencer.c:4366 -#, c-format -msgid "Stopped at %s... %.*s\n" -msgstr "停止在 %s... %.*s\n" - -#: sequencer.c:4436 -#, c-format -msgid "unknown command %d" -msgstr "未知指令 %d" - -#: sequencer.c:4484 -msgid "could not read orig-head" -msgstr "不能讀取 orig-head" - -#: sequencer.c:4489 -msgid "could not read 'onto'" -msgstr "不能讀取 'onto'" - -#: sequencer.c:4503 -#, c-format -msgid "could not update HEAD to %s" -msgstr "不能更新 HEAD 為 %s" - -#: sequencer.c:4563 -#, c-format -msgid "Successfully rebased and updated %s.\n" -msgstr "成功重定基底並更新 %s。\n" - -#: sequencer.c:4615 -msgid "cannot rebase: You have unstaged changes." -msgstr "不能重定基底：您有未暫存的變更。" - -#: sequencer.c:4624 -msgid "cannot amend non-existing commit" -msgstr "不能修補不存在的提交" - -#: sequencer.c:4626 -#, c-format -msgid "invalid file: '%s'" -msgstr "無效檔案：'%s'" - -#: sequencer.c:4628 -#, c-format -msgid "invalid contents: '%s'" -msgstr "無效內容：'%s'" - -#: sequencer.c:4631 -msgid "" -"\n" -"You have uncommitted changes in your working tree. Please, commit them\n" -"first and then run 'git rebase --continue' again." -msgstr "" -"\n" -"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" - -#: sequencer.c:4667 sequencer.c:4706 -#, c-format -msgid "could not write file: '%s'" -msgstr "不能寫入檔案：'%s'" - -#: sequencer.c:4722 -msgid "could not remove CHERRY_PICK_HEAD" -msgstr "不能刪除 CHERRY_PICK_HEAD" - -#: sequencer.c:4732 -msgid "could not commit staged changes." -msgstr "不能提交暫存的修改。" - -#: sequencer.c:4852 -#, c-format -msgid "%s: can't cherry-pick a %s" -msgstr "%s：不能揀選一個%s" - -#: sequencer.c:4856 -#, c-format -msgid "%s: bad revision" -msgstr "%s：錯誤的版本" - -#: sequencer.c:4891 -msgid "can't revert as initial commit" -msgstr "不能作為初始提交還原提交" - -#: sequencer.c:5162 sequencer.c:5391 -#, c-format -msgid "skipped previously applied commit %s" -msgstr "已略過先前套用的 %s 提交" - -#: sequencer.c:5232 sequencer.c:5407 -msgid "use --reapply-cherry-picks to include skipped commits" -msgstr "使用 --reapply-cherry-picks 以包含略過提交" - -#: sequencer.c:5378 -msgid "make_script: unhandled options" -msgstr "make_script：有未能處理的選項" - -#: sequencer.c:5381 -msgid "make_script: error preparing revisions" -msgstr "make_script：準備版本時錯誤" - -#: sequencer.c:5639 sequencer.c:5656 -msgid "nothing to do" -msgstr "無事可做" - -#: sequencer.c:5675 -msgid "could not skip unnecessary pick commands" -msgstr "無法略過不必要的揀選" - -#: sequencer.c:5775 -msgid "the script was already rearranged." -msgstr "腳本已經重新編排。" - -#: setup.c:135 -#, c-format -msgid "'%s' is outside repository at '%s'" -msgstr "'%s' 在位於 '%s' 的版本庫之外" - -#: setup.c:187 -#, c-format -msgid "" -"%s: no such path in the working tree.\n" -"Use 'git <command> -- <path>...' to specify paths that do not exist locally." -msgstr "" -"%s：工作區中無此路徑。\n" -"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。" - -#: setup.c:200 -#, c-format -msgid "" -"ambiguous argument '%s': unknown revision or path not in the working tree.\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n" -"使用 '--' 來分隔版本和路徑，例如：\n" -"'git <命令> [<版本>...] -- [<檔案>...]'" - -#: setup.c:266 -#, c-format -msgid "option '%s' must come before non-option arguments" -msgstr "選項 '%s' 必須在其他非選項參數之前" - -#: setup.c:285 -#, c-format -msgid "" -"ambiguous argument '%s': both revision and filename\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git <command> [<revision>...] -- [<file>...]'" -msgstr "" -"有歧義的參數 '%s'：可同時是版本和檔案\n" -"使用 '--' 來分隔版本和路徑，例如：\n" -"'git <命令> [<版本>...] -- [<檔案>...]'" - -#: setup.c:421 -msgid "unable to set up work tree using invalid config" -msgstr "無法使用無效設定來建立工作區" - -#: setup.c:425 builtin/rev-parse.c:895 -msgid "this operation must be run in a work tree" -msgstr "該動作必須在一個工作區中執行" - -#: setup.c:724 -#, c-format -msgid "Expected git repo version <= %d, found %d" -msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" - -#: setup.c:732 -msgid "unknown repository extension found:" -msgid_plural "unknown repository extensions found:" -msgstr[0] "找到未知的儲存庫擴充元件：" - -#: setup.c:746 -msgid "repo version is 0, but v1-only extension found:" -msgid_plural "repo version is 0, but v1-only extensions found:" -msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件：" - -#: setup.c:767 -#, c-format -msgid "error opening '%s'" -msgstr "開啟 '%s' 發生錯誤" - -#: setup.c:769 -#, c-format -msgid "too large to be a .git file: '%s'" -msgstr "檔案太大，無法作為 .git 檔案：'%s'" - -#: setup.c:771 -#, c-format -msgid "error reading %s" -msgstr "讀取 %s 發生錯誤" - -#: setup.c:773 -#, c-format -msgid "invalid gitfile format: %s" -msgstr "無效的 gitfile 格式：%s" - -#: setup.c:775 -#, c-format -msgid "no path in gitfile: %s" -msgstr "在 gitfile 中沒有路徑：%s" - -#: setup.c:777 -#, c-format -msgid "not a git repository: %s" -msgstr "不是一個 git 版本庫：%s" - -#: setup.c:879 -#, c-format -msgid "'$%s' too big" -msgstr "'$%s' 太大" - -#: setup.c:893 -#, c-format -msgid "not a git repository: '%s'" -msgstr "不是一個 git 版本庫：'%s'" - -#: setup.c:922 setup.c:924 setup.c:955 -#, c-format -msgid "cannot chdir to '%s'" -msgstr "不能切換目錄到 '%s'" - -#: setup.c:927 setup.c:983 setup.c:993 setup.c:1032 setup.c:1040 -msgid "cannot come back to cwd" -msgstr "無法返回目前工作目錄" - -#: setup.c:1054 -#, c-format -msgid "failed to stat '%*s%s%s'" -msgstr "取得 '%*s%s%s' 狀態（stat）失敗" - -#: setup.c:1338 -msgid "Unable to read current working directory" -msgstr "不能讀取目前工作目錄" - -#: setup.c:1347 setup.c:1353 -#, c-format -msgid "cannot change to '%s'" -msgstr "不能切換到 '%s'" - -#: setup.c:1358 -#, c-format -msgid "not a git repository (or any of the parent directories): %s" -msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" - -#: setup.c:1364 -#, c-format -msgid "" -"not a git repository (or any parent up to mount point %s)\n" -"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." -msgstr "" -"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" -"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" - -#: setup.c:1374 -#, c-format -msgid "" -"unsafe repository ('%s' is owned by someone else)\n" -"To add an exception for this directory, call:\n" -"\n" -"\tgit config --global --add safe.directory %s" -msgstr "" -"不安全版本庫（「%s」由其他人所有）\n" -"若要放行本目錄，請呼叫：\n" -"\n" -"\tgit config --global --add safe.directory %s" - -#: setup.c:1502 -#, c-format -msgid "" -"problem with core.sharedRepository filemode value (0%.3o).\n" -"The owner of files must always have read and write permissions." -msgstr "" -"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" -"檔案所有者必須始終擁有讀寫權限。" - -#: setup.c:1564 -msgid "fork failed" -msgstr "fork 失敗" - -#: setup.c:1569 -msgid "setsid failed" -msgstr "setsid 失敗" - -#: sparse-index.c:285 -#, c-format -msgid "index entry is a directory, but not sparse (%08x)" -msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" - -#: split-index.c:9 -msgid "cannot use split index with a sparse index" -msgstr "無法在稀疏索引使用索引分割" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:851 -#, c-format -msgid "%u.%2.2u GiB" -msgstr "%u.%2.2u GiB" - -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:853 -#, c-format -msgid "%u.%2.2u GiB/s" -msgstr "%u.%2.2u GiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:861 -#, c-format -msgid "%u.%2.2u MiB" -msgstr "%u.%2.2u MiB" - -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:863 -#, c-format -msgid "%u.%2.2u MiB/s" -msgstr "%u.%2.2u MiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:870 -#, c-format -msgid "%u.%2.2u KiB" -msgstr "%u.%2.2u KiB" - -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:872 -#, c-format -msgid "%u.%2.2u KiB/s" -msgstr "%u.%2.2u KiB/s" - -#. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:878 -#, c-format -msgid "%u byte" -msgid_plural "%u bytes" -msgstr[0] "%u 位元組" - -#. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:880 -#, c-format -msgid "%u byte/s" -msgid_plural "%u bytes/s" -msgstr[0] "%u 位元組/秒" - -#: strbuf.c:1187 wrapper.c:217 wrapper.c:387 builtin/am.c:766 -#: builtin/rebase.c:653 -#, c-format -msgid "could not open '%s' for writing" -msgstr "無法開啟 '%s' 進行寫入" - -#: strbuf.c:1196 -#, c-format -msgid "could not edit '%s'" -msgstr "無法編輯 '%s'" - -#: submodule-config.c:238 -#, c-format -msgid "ignoring suspicious submodule name: %s" -msgstr "忽略可疑的子模組名稱：%s" - -#: submodule-config.c:305 -msgid "negative values not allowed for submodule.fetchjobs" -msgstr "submodule.fetchjobs 不允許為負值" - -#: submodule-config.c:403 -#, c-format -msgid "ignoring '%s' which may be interpreted as a command-line option: %s" -msgstr "忽略可能被解析為指令列選項的 '%s'：%s" - -#: submodule-config.c:500 builtin/push.c:489 builtin/send-pack.c:148 -#, c-format -msgid "invalid value for '%s'" -msgstr "「%s」的值無效" - -#: submodule-config.c:828 -#, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "不能更新 .gitmodules 條目 %s" - -#: submodule.c:115 submodule.c:144 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "無法修改未合併的 .gitmodules，先解決合併衝突" - -#: submodule.c:119 submodule.c:148 -#, c-format -msgid "Could not find section in .gitmodules where path=%s" -msgstr "無法在 .gitmodules 中找到 path=%s 的小節" - -#: submodule.c:155 -#, c-format -msgid "Could not remove .gitmodules entry for %s" -msgstr "無法移除 %s 的 .gitmodules 條目" - -#: submodule.c:166 -msgid "staging updated .gitmodules failed" -msgstr "將更新後 .gitmodules 新增暫存區失敗" - -#: submodule.c:346 -#, c-format -msgid "in unpopulated submodule '%s'" -msgstr "位於未簽出的子模組 '%s'" - -#: submodule.c:377 -#, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" - -#: submodule.c:454 -#, c-format -msgid "bad --ignore-submodules argument: %s" -msgstr "無效 --ignore-submodules 參數：%s" - -#: submodule.c:866 -#, c-format -msgid "" -"Submodule in commit %s at path: '%s' collides with a submodule named the " -"same. Skipping it." -msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。" - -#: submodule.c:987 -#, c-format -msgid "submodule entry '%s' (%s) is a %s, not a commit" -msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" - -#: submodule.c:1069 -#, c-format -msgid "" -"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " -"submodule %s" -msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" - -#: submodule.c:1192 -#, c-format -msgid "process for submodule '%s' failed" -msgstr "處理 '%s' 子模組失敗" - -#: submodule.c:1221 builtin/branch.c:714 builtin/submodule--helper.c:2827 -msgid "Failed to resolve HEAD as a valid ref." -msgstr "無法將 HEAD 解析為有效引用。" - -#: submodule.c:1232 -#, c-format -msgid "Pushing submodule '%s'\n" -msgstr "正在推送 '%s' 子模組\n" - -#: submodule.c:1235 -#, c-format -msgid "Unable to push submodule '%s'\n" -msgstr "無法推送 '%s' 子模組\n" - -#: submodule.c:1567 -#, c-format -msgid "Fetching submodule %s%s\n" -msgstr "正在抓取 %s%s 子模組\n" - -#: submodule.c:1589 -#, c-format -msgid "Could not access submodule '%s'\n" -msgstr "無法存取子模組 '%s'\n" - -#: submodule.c:1618 -#, c-format -msgid "Could not access submodule '%s' at commit %s\n" -msgstr "無法存取 %2$s 提交的子模組「%1$s」\n" - -#: submodule.c:1629 -#, c-format -msgid "Fetching submodule %s%s at commit %s\n" -msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n" - -#: submodule.c:1849 -#, c-format -msgid "" -"Errors during submodule fetch:\n" -"%s" -msgstr "" -"抓取子模組時發生錯誤：\n" -"%s" - -#: submodule.c:1874 -#, c-format -msgid "'%s' not recognized as a git repository" -msgstr "無法將 '%s' 識別為一個 git 版本庫" - -#: submodule.c:1891 -#, c-format -msgid "Could not run 'git status --porcelain=2' in submodule %s" -msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" - -#: submodule.c:1932 -#, c-format -msgid "'git status --porcelain=2' failed in submodule %s" -msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" - -#: submodule.c:2007 -#, c-format -msgid "could not start 'git status' in submodule '%s'" -msgstr "無法在子模組 '%s' 中啟動 'git status'" - -#: submodule.c:2020 -#, c-format -msgid "could not run 'git status' in submodule '%s'" -msgstr "無法在子模組 '%s' 中執行 'git status'" - -#: submodule.c:2037 -#, c-format -msgid "Could not unset core.worktree setting in submodule '%s'" -msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" - -#: submodule.c:2064 submodule.c:2379 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "無法遞迴子模組路徑 '%s'" - -#: submodule.c:2086 -msgid "could not reset submodule index" -msgstr "無法重設子模組的索引" - -#: submodule.c:2128 -#, c-format -msgid "submodule '%s' has dirty index" -msgstr "子模組 '%s' 中有髒索引" - -#: submodule.c:2182 -#, c-format -msgid "Submodule '%s' could not be updated." -msgstr "子模組 '%s' 無法被更新。" - -#: submodule.c:2250 -#, c-format -msgid "submodule git dir '%s' is inside git dir '%.*s'" -msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" - -#: submodule.c:2271 -#, c-format -msgid "" -"relocate_gitdir for submodule '%s' with more than one worktree not supported" -msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" - -#: submodule.c:2283 submodule.c:2343 -#, c-format -msgid "could not lookup name for submodule '%s'" -msgstr "不能查詢子模組 '%s' 的名稱" - -#: submodule.c:2287 -#, c-format -msgid "refusing to move '%s' into an existing git dir" -msgstr "拒絕移動「%s」至現存 git 目錄" - -#: submodule.c:2293 -#, c-format -msgid "" -"Migrating git directory of '%s%s' from\n" -"'%s' to\n" -"'%s'\n" -msgstr "" -"將 '%s%s' 的 git 目錄從\n" -"'%s' 遷移至\n" -"'%s'\n" - -#: submodule.c:2424 -msgid "could not start ls-files in .." -msgstr "無法在 .. 中啟動 ls-files" - -#: submodule.c:2464 -#, c-format -msgid "ls-tree returned unexpected return code %d" -msgstr "ls-tree 返回未知返回值 %d" - -#: symlinks.c:244 -#, c-format -msgid "failed to lstat '%s'" -msgstr "無法 lstat “%s”" - -#: trailer.c:244 -#, c-format -msgid "running trailer command '%s' failed" -msgstr "執行 trailer 指令 '%s' 失敗" - -#: trailer.c:493 trailer.c:498 trailer.c:503 trailer.c:562 trailer.c:566 -#: trailer.c:570 -#, c-format -msgid "unknown value '%s' for key '%s'" -msgstr "鍵 '%2$s' 的未知取值 '%1$s'" - -#: trailer.c:547 trailer.c:552 trailer.c:557 builtin/remote.c:300 -#: builtin/remote.c:328 -#, c-format -msgid "more than one %s" -msgstr "多於一個 %s" - -#: trailer.c:743 -#, c-format -msgid "empty trailer token in trailer '%.*s'" -msgstr "簽名 '%.*s' 的鍵為空" - -#: trailer.c:763 -#, c-format -msgid "could not read input file '%s'" -msgstr "不能讀取輸入檔案 '%s'" - -#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1563 -msgid "could not read from stdin" -msgstr "不能自標準輸入讀取" - -#: trailer.c:1024 wrapper.c:760 -#, c-format -msgid "could not stat %s" -msgstr "不能對 %s 呼叫 stat" - -#: trailer.c:1026 -#, c-format -msgid "file %s is not a regular file" -msgstr "檔案 %s 不是一個正規檔案" - -#: trailer.c:1028 -#, c-format -msgid "file %s is not writable by user" -msgstr "檔案 %s 使用者不可寫" - -#: trailer.c:1040 -msgid "could not open temporary file" -msgstr "不能開啟暫存檔" - -#: trailer.c:1080 -#, c-format -msgid "could not rename temporary file to %s" -msgstr "不能重新命名暫存檔為 %s" - -#: transport-helper.c:62 transport-helper.c:91 -msgid "full write to remote helper failed" -msgstr "完整寫入遠端協助工具失敗" - -#: transport-helper.c:145 -#, c-format -msgid "unable to find remote helper for '%s'" -msgstr "無法為 '%s' 找到遠端協助工具" - -#: transport-helper.c:161 transport-helper.c:575 -msgid "can't dup helper output fd" -msgstr "無法複製協助工具輸出檔案句柄" - -#: transport-helper.c:214 -#, c-format -msgid "" -"unknown mandatory capability %s; this remote helper probably needs newer " -"version of Git" -msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的Git" - -#: transport-helper.c:220 -msgid "this remote helper should implement refspec capability" -msgstr "遠端協助工具需要實現 refspec 引用規格能力" - -#: transport-helper.c:287 transport-helper.c:429 -#, c-format -msgid "%s unexpectedly said: '%s'" -msgstr "%s 意外地說：'%s'" - -#: transport-helper.c:417 -#, c-format -msgid "%s also locked %s" -msgstr "%s 也鎖定了 %s" - -#: transport-helper.c:497 -msgid "couldn't run fast-import" -msgstr "不能執行 fast-import" - -#: transport-helper.c:520 -msgid "error while running fast-import" -msgstr "執行 fast-import 發生錯誤" - -#: transport-helper.c:549 transport-helper.c:1254 -#, c-format -msgid "could not read ref %s" -msgstr "無法讀取引用 %s" - -#: transport-helper.c:594 -#, c-format -msgid "unknown response to connect: %s" -msgstr "連線時未知的回應：%s" - -#: transport-helper.c:616 -msgid "setting remote service path not supported by protocol" -msgstr "協定不支援設定遠端服務路徑" - -#: transport-helper.c:618 -msgid "invalid remote service path" -msgstr "無效的遠端服務路徑" - -#: transport-helper.c:661 transport.c:1496 -msgid "operation not supported by protocol" -msgstr "協定不支援該動作" - -#: transport-helper.c:664 -#, c-format -msgid "can't connect to subservice %s" -msgstr "不能連線到子服務 %s" - -#: transport-helper.c:693 transport.c:415 -msgid "--negotiate-only requires protocol v2" -msgstr "--negotiate-only 需要 v2 版協定" - -#: transport-helper.c:758 -msgid "'option' without a matching 'ok/error' directive" -msgstr "'option' 缺少對應的 'ok/error' 指令" - -#: transport-helper.c:801 -#, c-format -msgid "expected ok/error, helper said '%s'" -msgstr "預期 ok/error，協助工具說 '%s'" - -#: transport-helper.c:862 -#, c-format -msgid "helper reported unexpected status of %s" -msgstr "協助工具報告 %s 的意外狀態" - -#: transport-helper.c:945 -#, c-format -msgid "helper %s does not support dry-run" -msgstr "協助工具 %s 不支援 dry-run" - -#: transport-helper.c:948 -#, c-format -msgid "helper %s does not support --signed" -msgstr "協助工具 %s 不支援 --signed" - -#: transport-helper.c:951 -#, c-format -msgid "helper %s does not support --signed=if-asked" -msgstr "協助工具 %s 不支援 --signed=if-asked" - -#: transport-helper.c:956 -#, c-format -msgid "helper %s does not support --atomic" -msgstr "協助工具 %s 不支援 --atomic" - -#: transport-helper.c:960 -#, c-format -msgid "helper %s does not support --%s" -msgstr "協助工具 %s 不支援 --%s" - -#: transport-helper.c:967 -#, c-format -msgid "helper %s does not support 'push-option'" -msgstr "協助工具 %s 不支援 'push-option'" - -#: transport-helper.c:1067 -msgid "remote-helper doesn't support push; refspec needed" -msgstr "remote-heper 不支援 push，需要引用規格" - -#: transport-helper.c:1072 -#, c-format -msgid "helper %s does not support 'force'" -msgstr "協助工具 %s 不支援 'force'" - -#: transport-helper.c:1119 -msgid "couldn't run fast-export" -msgstr "無法執行 fast-export" - -#: transport-helper.c:1124 -msgid "error while running fast-export" -msgstr "執行 fast-export 時發生錯誤" - -#: transport-helper.c:1149 -#, c-format -msgid "" -"No refs in common and none specified; doing nothing.\n" -"Perhaps you should specify a branch.\n" -msgstr "" -"沒有共同的引用並且也沒有指定，什麼也不會做。\n" -"您或許得指定一個分支。\n" - -#: transport-helper.c:1231 -#, c-format -msgid "unsupported object format '%s'" -msgstr "不支援的物件格式「%s」" - -#: transport-helper.c:1240 -#, c-format -msgid "malformed response in ref list: %s" -msgstr "引用列表中格式錯誤的回應：%s" - -#: transport-helper.c:1392 -#, c-format -msgid "read(%s) failed" -msgstr "讀取（%s）失敗" - -#: transport-helper.c:1419 -#, c-format -msgid "write(%s) failed" -msgstr "寫（%s）失敗" - -#: transport-helper.c:1468 -#, c-format -msgid "%s thread failed" -msgstr "%s 執行緒失敗" - -#: transport-helper.c:1472 -#, c-format -msgid "%s thread failed to join: %s" -msgstr "%s 執行緒等待失敗：%s" - -#: transport-helper.c:1491 transport-helper.c:1495 -#, c-format -msgid "can't start thread for copying data: %s" -msgstr "不能啟動執行緒來複製資料：%s" - -#: transport-helper.c:1532 -#, c-format -msgid "%s process failed to wait" -msgstr "%s 進程等待失敗" - -#: transport-helper.c:1536 -#, c-format -msgid "%s process failed" -msgstr "%s 進程失敗" - -#: transport-helper.c:1554 transport-helper.c:1563 -msgid "can't start thread for copying data" -msgstr "不能啟動執行緒來複製資料" - -#: transport.c:116 -#, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" - -#: transport.c:138 -#, c-format -msgid "could not read bundle '%s'" -msgstr "無法讀取「%s」套件" - -#: transport.c:234 -#, c-format -msgid "transport: invalid depth option '%s'" -msgstr "傳輸：無效的深度選項 '%s'" - -#: transport.c:289 -msgid "see protocol.version in 'git help config' for more details" -msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" - -#: transport.c:290 -msgid "server options require protocol version 2 or later" -msgstr "服務端選項需要版本 2 協定或更高" - -#: transport.c:418 -msgid "server does not support wait-for-done" -msgstr "伺服器不支援「等待完成」(wait-for-done) 功能" - -#: transport.c:770 -msgid "could not parse transport.color.* config" -msgstr "不能解析 transport.color.* 設定" - -#: transport.c:845 -msgid "support for protocol v2 not implemented yet" -msgstr "協定 v2 的支援尚未實現" - -#: transport.c:978 -#, c-format -msgid "unknown value for config '%s': %s" -msgstr "設定 '%s' 的取值未知：%s" - -#: transport.c:1044 -#, c-format -msgid "transport '%s' not allowed" -msgstr "傳輸 '%s' 不允許" - -#: transport.c:1093 -msgid "git-over-rsync is no longer supported" -msgstr "不再支援 git-over-rsync" - -#: transport.c:1196 -#, c-format -msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" -msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n" - -#: transport.c:1200 -#, c-format -msgid "" -"\n" -"Please try\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"or cd to the path and use\n" -"\n" -"\tgit push\n" -"\n" -"to push them to a remote.\n" -"\n" -msgstr "" -"\n" -"請嘗試\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"或者進入到子目錄執行\n" -"\n" -"\tgit push\n" -"\n" -"以推送至遠端。\n" -"\n" - -#: transport.c:1208 -msgid "Aborting." -msgstr "正在終止。" - -#: transport.c:1354 -msgid "failed to push all needed submodules" -msgstr "不能推送全部需要的子模組" - -#: tree-walk.c:33 -msgid "too-short tree object" -msgstr "太短的樹狀物件" - -#: tree-walk.c:39 -msgid "malformed mode in tree entry" -msgstr "樹狀物件中的條目模式錯誤" - -#: tree-walk.c:43 -msgid "empty filename in tree entry" -msgstr "樹狀物件條目中空的檔案名" - -#: tree-walk.c:118 -msgid "too-short tree file" -msgstr "太短的樹檔案" - -#: unpack-trees.c:118 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you switch branches." -msgstr "" -"您對下列檔案的本機修改將被簽出動作覆蓋：\n" -"%%s請在切換分支前提交或儲藏您的修改。" - -#: unpack-trees.c:120 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被簽出動作覆蓋：\n" -"%%s" - -#: unpack-trees.c:123 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you merge." -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -"%%s請在合併前提交或儲藏您的修改。" - -#: unpack-trees.c:125 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被合併動作覆蓋：\n" -"%%s" - -#: unpack-trees.c:128 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%sPlease commit your changes or stash them before you %s." -msgstr "" -"您對下列檔案的本機修改將被 %s 覆蓋：\n" -"%%s請在 %s 之前提交或儲藏您的修改。" - -#: unpack-trees.c:130 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%s" -msgstr "" -"您對下列檔案的本機修改將被 %s 覆蓋：\n" -"%%s" - -#: unpack-trees.c:135 -#, c-format -msgid "" -"Updating the following directories would lose untracked files in them:\n" -"%s" -msgstr "" -"更新如下目錄將會遺失其中未追蹤的檔案：\n" -"%s" - -#: unpack-trees.c:138 -#, c-format -msgid "" -"Refusing to remove the current working directory:\n" -"%s" -msgstr "" -"拒絕移除目前工作目錄：\n" -"%s" - -#: unpack-trees.c:142 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" -"%%s請在切換分支之前移動或刪除。" - -#: unpack-trees.c:144 -#, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:147 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" -"%%s請在合併前移動或刪除。" - -#: unpack-trees.c:149 -#, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:152 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" -"%%s請在 %s 前移動或刪除。" - -#: unpack-trees.c:154 -#, c-format -msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" -"%%s" - -#: unpack-trees.c:160 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%sPlease move or remove them before you switch branches." -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" -"%%s請在切換分支前移動或刪除。" - -#: unpack-trees.c:162 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:165 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" -"%%s請在合併前移動或刪除。" - -#: unpack-trees.c:167 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:170 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you %s." -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" -"%%s請在 %s 前移動或刪除。" - -#: unpack-trees.c:172 -#, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%s" -msgstr "" -"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" -"%%s" - -#: unpack-trees.c:180 -#, c-format -msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "條目 '%s' 和 '%s' 重疊。無法合併。" - -#: unpack-trees.c:183 -#, c-format -msgid "" -"Cannot update submodule:\n" -"%s" -msgstr "" -"無法更新子模組：\n" -"%s" - -#: unpack-trees.c:186 -#, c-format -msgid "" -"The following paths are not up to date and were left despite sparse " -"patterns:\n" -"%s" -msgstr "" -"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" -"%s" - -#: unpack-trees.c:188 -#, c-format -msgid "" -"The following paths are unmerged and were left despite sparse patterns:\n" -"%s" -msgstr "" -"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" -"%s" - -#: unpack-trees.c:190 -#, c-format -msgid "" -"The following paths were already present and thus not updated despite sparse " -"patterns:\n" -"%s" -msgstr "" -"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" -"%s" - -#: unpack-trees.c:270 -#, c-format -msgid "Aborting\n" -msgstr "正在終止\n" - -#: unpack-trees.c:297 -#, c-format -msgid "" -"After fixing the above paths, you may want to run `git sparse-checkout " -"reapply`.\n" -msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n" - -#: unpack-trees.c:358 -msgid "Updating files" -msgstr "正在更新檔案" - -#: unpack-trees.c:390 -msgid "" -"the following paths have collided (e.g. case-sensitive paths\n" -"on a case-insensitive filesystem) and only one from the same\n" -"colliding group is in the working tree:\n" -msgstr "" -"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" -"並且碰撞組中只有一個檔案存在工作區中：\n" - -#: unpack-trees.c:1664 -msgid "Updating index flags" -msgstr "正在更新索引旗標" - -#: unpack-trees.c:2925 -#, c-format -msgid "worktree and untracked commit have duplicate entries: %s" -msgstr "工作區和未追蹤提交有重複項目：%s" - -#: upload-pack.c:1579 -msgid "expected flush after fetch arguments" -msgstr "在 fetch 引數應為一個 flush 包" - -#: urlmatch.c:163 -msgid "invalid URL scheme name or missing '://' suffix" -msgstr "無效的 URL 方案名稱或遺失 '://' 後綴" - -#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 -#, c-format -msgid "invalid %XX escape sequence" -msgstr "無效的 %XX 轉義序列" - -#: urlmatch.c:215 -msgid "missing host and scheme is not 'file:'" -msgstr "缺少主機名稱且 URL 方案不是 'file:'" - -#: urlmatch.c:232 -msgid "a 'file:' URL may not have a port number" -msgstr "一個 'file:' URL 不應該包含埠號" - -#: urlmatch.c:247 -msgid "invalid characters in host name" -msgstr "主機名稱中包含無效的字元" - -#: urlmatch.c:292 urlmatch.c:303 -msgid "invalid port number" -msgstr "無效的埠號" - -#: urlmatch.c:371 -msgid "invalid '..' path segment" -msgstr "無效的 '..' 路徑區塊" - -#: walker.c:170 -msgid "Fetching objects" -msgstr "正在抓取物件" - -#: worktree.c:237 builtin/am.c:2210 builtin/bisect--helper.c:156 -#, c-format -msgid "failed to read '%s'" -msgstr "讀取 '%s' 失敗" - -#: worktree.c:304 -#, c-format -msgid "'%s' at main working tree is not the repository directory" -msgstr "在主工作區的 '%s' 不是版本庫目錄" - -#: worktree.c:315 -#, c-format -msgid "'%s' file does not contain absolute path to the working tree location" -msgstr "檔案 '%s' 不包含工作區的絕對路徑" - -#: worktree.c:327 -#, c-format -msgid "'%s' does not exist" -msgstr "'%s' 不存在" - -#: worktree.c:333 -#, c-format -msgid "'%s' is not a .git file, error code %d" -msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" - -#: worktree.c:342 -#, c-format -msgid "'%s' does not point back to '%s'" -msgstr "'%s' 沒有指回到 '%s'" - -#: worktree.c:600 -msgid "not a directory" -msgstr "不是目錄" - -#: worktree.c:609 -msgid ".git is not a file" -msgstr ".git 不是檔案" - -#: worktree.c:611 -msgid ".git file broken" -msgstr ".git 檔案損毀" - -#: worktree.c:613 -msgid ".git file incorrect" -msgstr ".git 檔案不正確" - -#: worktree.c:719 -msgid "not a valid path" -msgstr "非有效路徑" - -#: worktree.c:725 -msgid "unable to locate repository; .git is not a file" -msgstr "無法定位版本庫；.git 不是檔案" - -#: worktree.c:729 -msgid "unable to locate repository; .git file does not reference a repository" -msgstr "無法定位版本庫：.git 檔案未指向版本庫" - -#: worktree.c:733 -msgid "unable to locate repository; .git file broken" -msgstr "無法定位版本庫；.git 檔案損壞" - -#: worktree.c:739 -msgid "gitdir unreadable" -msgstr "無法讀取 gitdir" - -#: worktree.c:743 -msgid "gitdir incorrect" -msgstr "不正確的 gitdir" - -#: worktree.c:768 -msgid "not a valid directory" -msgstr "非有效目錄" - -#: worktree.c:774 -msgid "gitdir file does not exist" -msgstr "找不到 gitdir 檔案" - -#: worktree.c:779 worktree.c:788 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "無法讀取 gitdir 檔案 (%s)" - -#: worktree.c:798 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）" - -#: worktree.c:806 -msgid "invalid gitdir file" -msgstr "gitdir 檔案無效" - -#: worktree.c:814 -msgid "gitdir file points to non-existent location" -msgstr "gitdir 檔案指向的位置不存在" - -#: worktree.c:830 -#, c-format -msgid "unable to set %s in '%s'" -msgstr "無法在「%2$s」設定 %1$s" - -#: worktree.c:832 -#, c-format -msgid "unable to unset %s in '%s'" -msgstr "無法取消在「%2$s」設定的 %1$s" - -#: worktree.c:852 -msgid "failed to set extensions.worktreeConfig setting" -msgstr "無法設定 extensions.worktreeConfig 設定" - -#: wrapper.c:161 -#, c-format -msgid "could not setenv '%s'" -msgstr "無法 setenv '%s'" - -#: wrapper.c:213 -#, c-format -msgid "unable to create '%s'" -msgstr "不能建立 '%s'" - -#: wrapper.c:215 wrapper.c:385 -#, c-format -msgid "could not open '%s' for reading and writing" -msgstr "無法開啟 '%s' 進行讀寫" - -#: wrapper.c:416 wrapper.c:683 -#, c-format -msgid "unable to access '%s'" -msgstr "不能存取 '%s'" - -#: wrapper.c:691 -msgid "unable to get current working directory" -msgstr "不能取得目前工作目錄" - -#: wt-status.c:158 -msgid "Unmerged paths:" -msgstr "未合併的路徑：" - -# 譯者：請維持前導空格 -#: wt-status.c:187 wt-status.c:219 -msgid " (use \"git restore --staged <file>...\" to unstage)" -msgstr " （使用 \"git restore --staged <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:190 wt-status.c:222 -#, c-format -msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" -msgstr " （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:193 wt-status.c:225 -msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " （使用 \"git rm --cached <檔案>...\" 以取消暫存）" - -# 譯者：請維持前導空格 -#: wt-status.c:197 -msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " （使用 \"git add <檔案>...\" 標記解決方案）" - -# 譯者：請維持前導空格 -#: wt-status.c:199 wt-status.c:203 -msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" - -# 譯者：請維持前導空格 -#: wt-status.c:201 -msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" - -#: wt-status.c:211 wt-status.c:1140 -msgid "Changes to be committed:" -msgstr "要提交的變更：" - -#: wt-status.c:234 wt-status.c:1149 -msgid "Changes not staged for commit:" -msgstr "尚未暫存以備提交的變更：" - -# 譯者：請維持前導空格 -#: wt-status.c:238 -msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " （使用 \"git add <檔案>...\" 更新要提交的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:240 -msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " （使用 \"git add/rm <檔案>...\" 更新要提交的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:241 -msgid "" -" (use \"git restore <file>...\" to discard changes in working directory)" -msgstr " （使用 \"git restore <檔案>...\" 捨棄工作區的改動）" - -# 譯者：請維持前導空格 -#: wt-status.c:243 -msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " （提交或捨棄子模組中未追蹤或修改的內容）" - -# 譯者：請維持前導空格 -#: wt-status.c:254 -#, c-format -msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " （使用 \"git %s <檔案>...\" 以包含要提交的內容）" - -#: wt-status.c:266 -msgid "both deleted:" -msgstr "雙方刪除：" - -#: wt-status.c:268 -msgid "added by us:" -msgstr "由我們新增：" - -#: wt-status.c:270 -msgid "deleted by them:" -msgstr "由他們刪除：" - -#: wt-status.c:272 -msgid "added by them:" -msgstr "由他們新增：" - -#: wt-status.c:274 -msgid "deleted by us:" -msgstr "由我們刪除：" - -#: wt-status.c:276 -msgid "both added:" -msgstr "雙方新增：" - -#: wt-status.c:278 -msgid "both modified:" -msgstr "雙方修改：" - -#: wt-status.c:288 -msgid "new file:" -msgstr "新檔案：" - -#: wt-status.c:290 -msgid "copied:" -msgstr "複製：" - -#: wt-status.c:292 -msgid "deleted:" -msgstr "刪除：" - -#: wt-status.c:294 -msgid "modified:" -msgstr "修改：" - -#: wt-status.c:296 -msgid "renamed:" -msgstr "重新命名：" - -#: wt-status.c:298 -msgid "typechange:" -msgstr "類型變更：" - -#: wt-status.c:300 -msgid "unknown:" -msgstr "未知：" - -#: wt-status.c:302 -msgid "unmerged:" -msgstr "未合併：" - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:382 -msgid "new commits, " -msgstr "新提交, " - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:384 -msgid "modified content, " -msgstr "修改的內容, " - -# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 -#: wt-status.c:386 -msgid "untracked content, " -msgstr "未追蹤的內容, " - -#: wt-status.c:973 -#, c-format -msgid "Your stash currently has %d entry" -msgid_plural "Your stash currently has %d entries" -msgstr[0] "您的儲藏區目前有 %d 條紀錄" - -#: wt-status.c:1004 -msgid "Submodules changed but not updated:" -msgstr "子模組已修改但尚未更新：" - -#: wt-status.c:1006 -msgid "Submodule changes to be committed:" -msgstr "要提交的子模組變更：" - -#: wt-status.c:1088 -msgid "" -"Do not modify or remove the line above.\n" -"Everything below it will be ignored." -msgstr "" -"不要改動或刪除上面的一行。\n" -"其下所有內容都將被忽略。" - -#: wt-status.c:1180 -#, c-format -msgid "" -"\n" -"It took %.2f seconds to compute the branch ahead/behind values.\n" -"You can use '--no-ahead-behind' to avoid this.\n" -msgstr "" -"\n" -"花了 %.2f 秒才計算出分支的領先/落後範圍。\n" -"為避免，您可以使用 '--no-ahead-behind'。\n" - -#: wt-status.c:1210 -msgid "You have unmerged paths." -msgstr "您有尚未合併的路徑。" - -# 譯者：請維持前導空格 -#: wt-status.c:1213 -msgid " (fix conflicts and run \"git commit\")" -msgstr " （解決衝突並執行 \"git commit\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1215 -msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " （使用 \"git merge --abort\" 終止合併）" - -#: wt-status.c:1219 -msgid "All conflicts fixed but you are still merging." -msgstr "所有衝突已解決但您仍處於合併中。" - -# 譯者：請維持前導空格 -#: wt-status.c:1222 -msgid " (use \"git commit\" to conclude merge)" -msgstr " （使用 \"git commit\" 結束合併）" - -#: wt-status.c:1233 -msgid "You are in the middle of an am session." -msgstr "您正處於 am 動作過程中。" - -#: wt-status.c:1236 -msgid "The current patch is empty." -msgstr "目前的修補檔為空。" - -# 譯者：請維持前導空格 -#: wt-status.c:1241 -msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " （解決衝突，然後執行 \"git am --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1243 -msgid " (use \"git am --skip\" to skip this patch)" -msgstr " （使用 \"git am --skip\" 略過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1246 -msgid "" -" (use \"git am --allow-empty\" to record this patch as an empty commit)" -msgstr " （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）" - -# 譯者：請維持前導空格 -#: wt-status.c:1248 -msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " （使用 \"git am --abort\" 復原原有分支）" - -#: wt-status.c:1381 -msgid "git-rebase-todo is missing." -msgstr "git-rebase-todo 遺失。" - -#: wt-status.c:1383 -msgid "No commands done." -msgstr "沒有指令被執行。" - -#: wt-status.c:1386 -#, c-format -msgid "Last command done (%<PRIuMAX> command done):" -msgid_plural "Last commands done (%<PRIuMAX> commands done):" -msgstr[0] "上次完成的命令（完成 %<PRIuMAX> 條指令）：" - -#: wt-status.c:1397 -#, c-format -msgid " (see more in file %s)" -msgstr " （更多參見檔案 %s）" - -#: wt-status.c:1402 -msgid "No commands remaining." -msgstr "未剩下任何指令。" - -#: wt-status.c:1405 -#, c-format -msgid "Next command to do (%<PRIuMAX> remaining command):" -msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" -msgstr[0] "接下來要執行的命令（剩餘 %<PRIuMAX> 條命令）：" - -# 譯者：請維持前導空格 -#: wt-status.c:1413 -msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" - -#: wt-status.c:1425 -#, c-format -msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" - -#: wt-status.c:1430 -msgid "You are currently rebasing." -msgstr "您在執行重定基底動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1443 -msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1445 -msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1447 -msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" - -# 譯者：請維持前導空格 -#: wt-status.c:1454 -msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" - -#: wt-status.c:1458 -#, c-format -msgid "" -"You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" - -#: wt-status.c:1463 -msgid "You are currently splitting a commit during a rebase." -msgstr "您在執行重定基底動作時分割提交。" - -# 譯者：請維持前導空格 -#: wt-status.c:1466 -msgid " (Once your working directory is clean, run \"git rebase --continue\")" -msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" - -#: wt-status.c:1470 -#, c-format -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" - -#: wt-status.c:1475 -msgid "You are currently editing a commit during a rebase." -msgstr "您在執行重定基底動作時編輯提交。" - -# 譯者：請維持前導空格 -#: wt-status.c:1478 -msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " （使用 \"git commit --amend\" 修補目前提交）" - -# 譯者：請維持前導空格 -#: wt-status.c:1480 -msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" - -#: wt-status.c:1491 -msgid "Cherry-pick currently in progress." -msgstr "揀選動作正在進行中。" - -#: wt-status.c:1494 -#, c-format -msgid "You are currently cherry-picking commit %s." -msgstr "您在執行揀選提交 %s 的動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1501 -msgid " (fix conflicts and run \"git cherry-pick --continue\")" -msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1504 -msgid " (run \"git cherry-pick --continue\" to continue)" -msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" - -# 譯者：請維持前導空格 -#: wt-status.c:1507 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1509 -msgid " (use \"git cherry-pick --skip\" to skip this patch)" -msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1511 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" - -#: wt-status.c:1521 -msgid "Revert currently in progress." -msgstr "還原動作正在進行中。" - -#: wt-status.c:1524 -#, c-format -msgid "You are currently reverting commit %s." -msgstr "您在執行反轉提交 %s 的動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1530 -msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " （解決衝突並執行 \"git revert --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1533 -msgid " (run \"git revert --continue\" to continue)" -msgstr " （執行 \"git revert --continue\" 以繼續）" - -# 譯者：請維持前導空格 -#: wt-status.c:1536 -msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" - -# 譯者：請維持前導空格 -#: wt-status.c:1538 -msgid " (use \"git revert --skip\" to skip this patch)" -msgstr " （使用 \"git revert --skip\" 略過此修補檔）" - -# 譯者：請維持前導空格 -#: wt-status.c:1540 -msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" - -#: wt-status.c:1550 -#, c-format -msgid "You are currently bisecting, started from branch '%s'." -msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" - -#: wt-status.c:1554 -msgid "You are currently bisecting." -msgstr "您在執行二分搜尋動作。" - -# 譯者：請維持前導空格 -#: wt-status.c:1557 -msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " （使用 \"git bisect reset\" 簽出原有分支）" - -#: wt-status.c:1568 -msgid "You are in a sparse checkout." -msgstr "您正在稀疏簽出的工作區中。" - -#: wt-status.c:1571 -#, c-format -msgid "You are in a sparse checkout with %d%% of tracked files present." -msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" - -#: wt-status.c:1815 -msgid "On branch " -msgstr "位於分支 " - -#: wt-status.c:1822 -msgid "interactive rebase in progress; onto " -msgstr "互動式重定基底動作正在進行中；至 " - -#: wt-status.c:1824 -msgid "rebase in progress; onto " -msgstr "重定基底動作正在進行中；至 " - -#: wt-status.c:1829 -msgid "HEAD detached at " -msgstr "開頭指標分離於 " - -#: wt-status.c:1831 -msgid "HEAD detached from " -msgstr "開頭指標分離自 " - -#: wt-status.c:1834 -msgid "Not currently on any branch." -msgstr "目前不在任何分支上。" - -#: wt-status.c:1851 -msgid "Initial commit" -msgstr "初始提交" - -#: wt-status.c:1852 -msgid "No commits yet" -msgstr "尚無提交" - -#: wt-status.c:1866 -msgid "Untracked files" -msgstr "未追蹤的檔案" - -#: wt-status.c:1868 -msgid "Ignored files" -msgstr "忽略的檔案" - -#: wt-status.c:1872 -#, c-format -msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." -msgstr "" -"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" -"但您需要小心不要忘了新增新檔案（參見 'git help status'）。" - -#: wt-status.c:1878 -#, c-format -msgid "Untracked files not listed%s" -msgstr "未追蹤的檔案沒有列出%s" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1880 -msgid " (use -u option to show untracked files)" -msgstr " （使用 -u 參數顯示未追蹤的檔案）" - -#: wt-status.c:1886 -msgid "No changes" -msgstr "沒有修改" - -#: wt-status.c:1891 -#, c-format -msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" - -#: wt-status.c:1895 -#, c-format -msgid "no changes added to commit\n" -msgstr "修改尚未加入提交\n" - -#: wt-status.c:1899 -#, c-format -msgid "" -"nothing added to commit but untracked files present (use \"git add\" to " -"track)\n" -msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" - -#: wt-status.c:1903 -#, c-format -msgid "nothing added to commit but untracked files present\n" -msgstr "提交為空，但是存在尚未追蹤的檔案\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1907 -#, c-format -msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" - -#: wt-status.c:1911 wt-status.c:1917 -#, c-format -msgid "nothing to commit\n" -msgstr "無檔案要提交\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1914 -#, c-format -msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" - -# 譯者：中文字串拼接，可刪除前導空格 -#: wt-status.c:1919 -#, c-format -msgid "nothing to commit, working tree clean\n" -msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" - -#: wt-status.c:2024 -msgid "No commits yet on " -msgstr "尚無提交在 " - -#: wt-status.c:2028 -msgid "HEAD (no branch)" -msgstr "HEAD（非分支）" - -#: wt-status.c:2059 -msgid "different" -msgstr "不同" - -# 譯者：請維持句尾空格 -#: wt-status.c:2061 wt-status.c:2069 -msgid "behind " -msgstr "落後 " - -#: wt-status.c:2064 wt-status.c:2067 -msgid "ahead " -msgstr "領先 " - -#. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2605 -#, c-format -msgid "cannot %s: You have unstaged changes." -msgstr "不能%s：您有未暫存的變更。" - -#: wt-status.c:2611 -msgid "additionally, your index contains uncommitted changes." -msgstr "另外，您的索引中包含未提交的變更。" - -#: wt-status.c:2613 -#, c-format -msgid "cannot %s: Your index contains uncommitted changes." -msgstr "不能%s：您的索引中包含未提交的變更。" - -#: compat/simple-ipc/ipc-unix-socket.c:205 -msgid "could not send IPC command" -msgstr "無法傳送 IPC 命令" - -#: compat/simple-ipc/ipc-unix-socket.c:212 -msgid "could not read IPC response" -msgstr "無法讀取 IPC 回應" - -#: compat/simple-ipc/ipc-unix-socket.c:892 -#, c-format -msgid "could not start accept_thread '%s'" -msgstr "無法啟動 accept_thread “%s”" - -#: compat/simple-ipc/ipc-unix-socket.c:904 -#, c-format -msgid "could not start worker[0] for '%s'" -msgstr "無法啟動「%s」的 worker[0]" - -#: compat/precompose_utf8.c:58 builtin/clone.c:353 -#, c-format -msgid "failed to unlink '%s'" -msgstr "刪除 '%s' 失敗" - -#: compat/fsmonitor/fsm-listen-darwin.c:355 -msgid "Unable to create FSEventStream." -msgstr "無法建立 FSEventStream。" - -#: compat/fsmonitor/fsm-listen-darwin.c:403 -msgid "Failed to start the FSEventStream" -msgstr "無法啟動 FSEventStream" - -#: builtin/add.c:26 +#: builtin/add.c msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<選項>] [--] <路徑規格>..." -#: builtin/add.c:63 +#: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" msgstr "無法 chmod %cx ‘%s’" -#: builtin/add.c:105 +#: builtin/add.c #, c-format msgid "unexpected diff status %c" msgstr "意外的差異狀態 %c" -#: builtin/add.c:110 builtin/commit.c:299 +#: builtin/add.c builtin/commit.c msgid "updating files failed" msgstr "更新檔案失敗" -#: builtin/add.c:120 +#: builtin/add.c #, c-format msgid "remove '%s'\n" msgstr "刪除 '%s'\n" -#: builtin/add.c:204 +#: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "重新整理索引之後尚未被暫存的變更：" -#: builtin/add.c:312 builtin/rev-parse.c:993 +#: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" msgstr "不能讀取索引" -#: builtin/add.c:325 +#: builtin/add.c msgid "Could not write patch" msgstr "不能生成修補檔" -#: builtin/add.c:328 +#: builtin/add.c msgid "editing patch failed" msgstr "編輯修補檔失敗" -#: builtin/add.c:331 +#: builtin/add.c #, c-format msgid "Could not stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/add.c:333 +#: builtin/add.c msgid "Empty patch. Aborted." msgstr "空修補檔。異常終止。" -#: builtin/add.c:339 +#: builtin/add.c #, c-format msgid "Could not apply '%s'" msgstr "不能套用 '%s'" -#: builtin/add.c:347 +#: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n" -#: builtin/add.c:367 builtin/clean.c:927 builtin/fetch.c:175 builtin/mv.c:124 -#: builtin/prune-packed.c:14 builtin/pull.c:208 builtin/push.c:550 -#: builtin/remote.c:1454 builtin/rm.c:244 builtin/send-pack.c:194 +#: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c msgid "dry run" msgstr "測試執行" -#: builtin/add.c:368 builtin/check-ignore.c:22 builtin/commit.c:1483 -#: builtin/count-objects.c:98 builtin/fsck.c:789 builtin/log.c:2338 -#: builtin/mv.c:123 builtin/read-tree.c:120 +#: builtin/add.c builtin/check-ignore.c builtin/commit.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c msgid "be verbose" msgstr "詳細輸出" -#: builtin/add.c:370 +#: builtin/add.c msgid "interactive picking" msgstr "互動式揀選" -#: builtin/add.c:371 builtin/checkout.c:1599 builtin/reset.c:417 +#: builtin/add.c builtin/checkout.c builtin/reset.c msgid "select hunks interactively" msgstr "互動式挑選資料區塊" -#: builtin/add.c:372 +#: builtin/add.c msgid "edit current diff and apply" msgstr "編輯目前差異並套用" -#: builtin/add.c:373 +#: builtin/add.c msgid "allow adding otherwise ignored files" msgstr "允許新增忽略的檔案" -#: builtin/add.c:374 +#: builtin/add.c msgid "update tracked files" msgstr "更新已追蹤的檔案" -#: builtin/add.c:375 +#: builtin/add.c msgid "renormalize EOL of tracked files (implies -u)" msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號" -#: builtin/add.c:376 +#: builtin/add.c msgid "record only the fact that the path will be added later" msgstr "只記錄，該路徑稍後再新增" -#: builtin/add.c:377 +#: builtin/add.c msgid "add changes from all tracked and untracked files" msgstr "新增所有改變的已追蹤檔案和未追蹤檔案" -#: builtin/add.c:380 +#: builtin/add.c msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作區中移除的路徑（和 --no-all 相同）" -#: builtin/add.c:382 +#: builtin/add.c msgid "don't add, only refresh the index" msgstr "不新增，只重新整理索引" -#: builtin/add.c:383 +#: builtin/add.c msgid "just skip files which cannot be added because of errors" msgstr "略過因發生錯誤不能新增的檔案" -#: builtin/add.c:384 +#: builtin/add.c msgid "check if - even missing - files are ignored in dry run" msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略" -#: builtin/add.c:385 builtin/mv.c:128 builtin/rm.c:251 +#: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" msgstr "允許更新稀疏簽出 cone 外的項目" -#: builtin/add.c:387 builtin/update-index.c:1023 +#: builtin/add.c builtin/update-index.c msgid "override the executable bit of the listed files" msgstr "覆蓋列表裡檔案的可執行位" -#: builtin/add.c:389 +#: builtin/add.c msgid "warn when adding an embedded repository" msgstr "建立一個嵌入式版本庫時給予警告" -#: builtin/add.c:407 +#: builtin/add.c #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -10548,12 +2170,12 @@ msgstr "" "\n" "參見 \"git help submodule\" 取得更多訊息。" -#: builtin/add.c:436 +#: builtin/add.c #, c-format msgid "adding embedded git repository: %s" msgstr "正在新增嵌入式 git 版本庫：%s" -#: builtin/add.c:456 +#: builtin/add.c msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -10563,27 +2185,27 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:471 +#: builtin/add.c msgid "adding files failed" msgstr "新增檔案失敗" -#: builtin/add.c:534 +#: builtin/add.c #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x" -#: builtin/add.c:555 builtin/checkout.c:1770 builtin/commit.c:365 -#: builtin/reset.c:436 builtin/rm.c:275 builtin/stash.c:1702 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "「%s」和路徑規格引數不得同時使用" -#: builtin/add.c:566 +#: builtin/add.c #, c-format msgid "Nothing specified, nothing added.\n" msgstr "沒有指定檔案，也沒有檔案被新增。\n" -#: builtin/add.c:568 +#: builtin/add.c msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10593,106 +2215,150 @@ msgstr "" "如要關閉此訊息，請執行\n" "\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:393 +#: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c +#: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c +#: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c +#: rerere.c submodule.c +msgid "index file corrupt" +msgstr "索引檔案損壞" + +#: builtin/am.c builtin/mailinfo.c mailinfo.c +#, c-format +msgid "bad action '%s' for '%s'" +msgstr "「%s」動作對「%s」無效" + +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c +#: sequencer.c setup.c +#, c-format +msgid "invalid value for '%s': '%s'" +msgstr "「%s」的值無效：「%s」" + +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#, c-format +msgid "could not read '%s'" +msgstr "不能讀取 '%s'" + +#: builtin/am.c msgid "could not parse author script" msgstr "不能解析作者腳本" -#: builtin/am.c:483 +#: builtin/am.c builtin/replace.c commit.c sequencer.c +#, c-format +msgid "could not parse %s" +msgstr "不能解析 %s" + +#: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 掛鉤刪除" -#: builtin/am.c:525 +#: builtin/am.c #, c-format msgid "Malformed input line: '%s'." msgstr "非法的輸入行：'%s'。" -#: builtin/am.c:563 +#: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" -#: builtin/am.c:589 +#: builtin/am.c msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c:777 +#: builtin/am.c builtin/rebase.c sequencer.c wrapper.c +#, c-format +msgid "could not open '%s' for reading" +msgstr "無法開啟 '%s' 進行讀取" + +#: builtin/am.c builtin/rebase.c strbuf.c wrapper.c +#, c-format +msgid "could not open '%s' for writing" +msgstr "無法開啟 '%s' 進行寫入" + +#: builtin/am.c #, c-format msgid "could not parse patch '%s'" msgstr "無法解析修補檔 '%s'" -#: builtin/am.c:842 +#: builtin/am.c msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一個 StGIT 修補檔佇列被套用" -#: builtin/am.c:890 +#: builtin/am.c msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c:895 builtin/am.c:907 +#: builtin/am.c msgid "invalid Date line" msgstr "無效的日期行" -#: builtin/am.c:902 +#: builtin/am.c msgid "invalid timezone offset" msgstr "無效的時區位移值" -#: builtin/am.c:995 +#: builtin/am.c msgid "Patch format detection failed." msgstr "修補檔格式偵測失敗。" -#: builtin/am.c:1000 builtin/clone.c:306 +#: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" msgstr "建立目錄 '%s' 失敗" -#: builtin/am.c:1005 +#: builtin/am.c msgid "Failed to split patches." msgstr "分割修補檔失敗。" -#: builtin/am.c:1154 +#: builtin/am.c #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "當您解決這一問題，執行 \"%s --continue\"。" -#: builtin/am.c:1155 +#: builtin/am.c #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要略過這一修補檔，則執行 \"%s --skip\"。" -#: builtin/am.c:1160 +#: builtin/am.c #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgstr "若要將空白修補檔錄製為空白提交，請執行「%s --allow-empty」。" -#: builtin/am.c:1162 +#: builtin/am.c #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。" -#: builtin/am.c:1257 +#: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "修補檔使用 format=flowed 格式傳送，行尾的空格可能會遺失。" -#: builtin/am.c:1345 +#: builtin/am.c #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺少作者行" -#: builtin/am.c:1348 +#: builtin/am.c #, c-format msgid "invalid ident line: %.*s" msgstr "無效的身份標記：%.*s" -#: builtin/am.c:1567 +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c +#, c-format +msgid "unable to parse commit %s" +msgstr "不能解析提交 %s" + +#: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本庫缺乏必要的資料物件以進行三方合併。" -#: builtin/am.c:1569 +#: builtin/am.c msgid "Using index info to reconstruct a base tree..." msgstr "使用索引來重建一個（三方合併的）基礎目錄樹..." -#: builtin/am.c:1588 +#: builtin/am.c msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -10700,24 +2366,33 @@ msgstr "" "您是否曾手動編輯過您的修補檔？\n" "無法套用修補檔到索引中的資料物件上。" -#: builtin/am.c:1594 +#: builtin/am.c msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基礎版本上修補及進行三方合併..." -#: builtin/am.c:1620 +#: builtin/am.c msgid "Failed to merge in the changes." msgstr "無法合併變更。" -#: builtin/am.c:1652 +#: builtin/am.c builtin/merge.c sequencer.c +msgid "git write-tree failed to write a tree" +msgstr "git write-tree 無法寫入樹狀物件" + +#: builtin/am.c msgid "applying to an empty history" msgstr "正套用到一個空歷史上" -#: builtin/am.c:1704 builtin/am.c:1708 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c +#: t/helper/test-fast-rebase.c +msgid "failed to write commit object" +msgstr "寫提交物件失敗" + +#: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" -#: builtin/am.c:1726 +#: builtin/am.c msgid "Commit Body is:" msgstr "提交內容為：" @@ -10726,57 +2401,57 @@ msgstr "提交內容為：" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1736 +#: builtin/am.c #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： " -#: builtin/am.c:1782 builtin/commit.c:410 +#: builtin/am.c builtin/commit.c msgid "unable to write index file" msgstr "無法寫入索引檔案" -#: builtin/am.c:1786 +#: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "髒索引：不能套用修補檔（髒檔案：%s）" -#: builtin/am.c:1828 +#: builtin/am.c #, c-format msgid "Skipping: %.*s" msgstr "略過：%.*s" -#: builtin/am.c:1833 +#: builtin/am.c #, c-format msgid "Creating an empty commit: %.*s" msgstr "建立空白提交：%.*s" -#: builtin/am.c:1837 +#: builtin/am.c msgid "Patch is empty." msgstr "修補檔為空。" -#: builtin/am.c:1848 builtin/am.c:1917 +#: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" -#: builtin/am.c:1865 +#: builtin/am.c msgid "No changes -- Patch already applied." msgstr "沒有變更——修補檔已經套用過。" -#: builtin/am.c:1871 +#: builtin/am.c #, c-format msgid "Patch failed at %s %.*s" msgstr "打修補檔失敗於 %s %.*s" -#: builtin/am.c:1875 +#: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔" -#: builtin/am.c:1921 +#: builtin/am.c msgid "No changes - recorded it as an empty commit." msgstr "沒有變更 － 將其錄製為空白提交。" -#: builtin/am.c:1923 +#: builtin/am.c msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -10786,7 +2461,7 @@ msgstr "" "如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n" "您也許想要略過這個修補檔。" -#: builtin/am.c:1931 +#: builtin/am.c msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -10797,174 +2472,175 @@ msgstr "" "您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n" "你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。" -#: builtin/am.c:2039 builtin/am.c:2043 builtin/am.c:2055 builtin/reset.c:455 -#: builtin/reset.c:463 +#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c +#: rerere.c +msgid "unable to write new index file" +msgstr "無法寫新的索引檔案" + +#: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "不能解析物件 '%s'。" -#: builtin/am.c:2091 builtin/am.c:2167 +#: builtin/am.c msgid "failed to clean index" msgstr "清空索引失敗" -#: builtin/am.c:2135 +#: builtin/am.c msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD" -#: builtin/am.c:2292 +#: builtin/am.c builtin/bisect--helper.c worktree.c +#, c-format +msgid "failed to read '%s'" +msgstr "讀取 '%s' 失敗" + +#: builtin/am.c #, c-format msgid "options '%s=%s' and '%s=%s' cannot be used together" msgstr "「%s=%s」和「%s=%s」選項不得同時使用" -#: builtin/am.c:2323 +#: builtin/am.c msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2324 +#: builtin/am.c msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<選項>] (--continue | --skip | --abort)" -#: builtin/am.c:2330 +#: builtin/am.c msgid "run interactively" msgstr "以互動式方式執行" -#: builtin/am.c:2332 +#: builtin/am.c msgid "historical option -- no-op" msgstr "老的參數 —— 無作用" -#: builtin/am.c:2334 +#: builtin/am.c msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允許使用三方合併" -#: builtin/am.c:2335 builtin/init-db.c:547 builtin/prune-packed.c:16 -#: builtin/repack.c:646 builtin/stash.c:946 +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c msgid "be quiet" msgstr "靜默模式" -#: builtin/am.c:2337 +#: builtin/am.c msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交說明結尾加入 Signed-off-by" -#: builtin/am.c:2340 +#: builtin/am.c msgid "recode into utf8 (default)" msgstr "使用 utf8 字元集（預設）" -#: builtin/am.c:2342 +#: builtin/am.c msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -k 參數" -#: builtin/am.c:2344 +#: builtin/am.c msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -b 參數" -#: builtin/am.c:2346 +#: builtin/am.c msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 傳遞 -m 參數" -#: builtin/am.c:2348 +#: builtin/am.c msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數" -#: builtin/am.c:2351 +#: builtin/am.c msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定" -#: builtin/am.c:2354 +#: builtin/am.c msgid "strip everything before a scissors line" msgstr "捨棄裁切線前的所有內容" -#: builtin/am.c:2356 +#: builtin/am.c msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳遞" -#: builtin/am.c:2359 builtin/am.c:2362 builtin/am.c:2365 builtin/am.c:2368 -#: builtin/am.c:2371 builtin/am.c:2374 builtin/am.c:2377 builtin/am.c:2380 -#: builtin/am.c:2386 +#: builtin/am.c msgid "pass it through git-apply" msgstr "傳遞給 git-apply" -#: builtin/am.c:2376 builtin/commit.c:1514 builtin/fmt-merge-msg.c:18 -#: builtin/fmt-merge-msg.c:21 builtin/grep.c:920 builtin/merge.c:263 -#: builtin/pull.c:142 builtin/pull.c:204 builtin/pull.c:221 -#: builtin/rebase.c:1074 builtin/repack.c:657 builtin/repack.c:661 -#: builtin/repack.c:663 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:446 parse-options.h:159 parse-options.h:180 -#: parse-options.h:348 +#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c +#: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c +#: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h msgid "n" msgstr "n" -#: builtin/am.c:2382 builtin/branch.c:695 builtin/bugreport.c:109 -#: builtin/cat-file.c:848 builtin/cat-file.c:852 builtin/cat-file.c:856 -#: builtin/for-each-ref.c:41 builtin/ls-tree.c:357 builtin/replace.c:555 -#: builtin/tag.c:480 builtin/verify-tag.c:38 +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/for-each-ref.c builtin/ls-tree.c builtin/replace.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "格式" -#: builtin/am.c:2383 +#: builtin/am.c msgid "format the patch(es) are in" msgstr "修補檔的格式" -#: builtin/am.c:2389 +#: builtin/am.c msgid "override error message when patch failure occurs" msgstr "打修補檔失敗時顯示的錯誤訊息" -#: builtin/am.c:2391 +#: builtin/am.c msgid "continue applying patches after resolving a conflict" msgstr "衝突解決後繼續套用修補檔" -#: builtin/am.c:2394 +#: builtin/am.c msgid "synonyms for --continue" msgstr "和 --continue 同義" -#: builtin/am.c:2397 +#: builtin/am.c msgid "skip the current patch" msgstr "略過目前修補檔" -#: builtin/am.c:2400 +#: builtin/am.c msgid "restore the original branch and abort the patching operation" msgstr "還原原始分支並中止修補動作" -#: builtin/am.c:2403 +#: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" msgstr "終止修補動作但保持 HEAD 不變" -#: builtin/am.c:2407 +#: builtin/am.c msgid "show the patch being applied" msgstr "顯示正在套用的修補檔" -#: builtin/am.c:2411 +#: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "將空白修補檔錄製為空白提交" -#: builtin/am.c:2415 +#: builtin/am.c msgid "lie about committer date" msgstr "將作者日期作為提交日期" -#: builtin/am.c:2417 +#: builtin/am.c msgid "use current timestamp for author date" msgstr "用目前時間作為作者日期" -#: builtin/am.c:2419 builtin/commit-tree.c:118 builtin/commit.c:1642 -#: builtin/merge.c:302 builtin/pull.c:179 builtin/rebase.c:1127 -#: builtin/revert.c:117 builtin/tag.c:461 +#: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c +#: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" msgstr "key-id" -#: builtin/am.c:2420 builtin/rebase.c:1128 +#: builtin/am.c builtin/rebase.c msgid "GPG-sign commits" msgstr "使用 GPG 簽名提交" -#: builtin/am.c:2423 +#: builtin/am.c msgid "how to handle empty patches" msgstr "空白修補檔的處理方式" -#: builtin/am.c:2426 +#: builtin/am.c msgid "(internal use for git-rebase)" msgstr "（內部使用，用於 git-rebase）" -#: builtin/am.c:2444 +#: builtin/am.c msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -10972,16 +2648,16 @@ msgstr "" "參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n" "請不要再使用它了。" -#: builtin/am.c:2451 +#: builtin/am.c msgid "failed to read the index" msgstr "讀取索引失敗" -#: builtin/am.c:2466 +#: builtin/am.c #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。" -#: builtin/am.c:2490 +#: builtin/am.c #, c-format msgid "" "Stray %s directory found.\n" @@ -10990,48 +2666,48 @@ msgstr "" "發現了錯誤的 %s 目錄。\n" "使用 \"git am --abort\" 刪除它。" -#: builtin/am.c:2496 +#: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." msgstr "解決動作未進行，我們不會繼續。" -#: builtin/am.c:2506 +#: builtin/am.c msgid "interactive mode requires patches on the command line" msgstr "互動式模式需要指令列上提供修補檔" -#: builtin/apply.c:8 +#: builtin/apply.c msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<選項>] [<修補檔>...]" -#: builtin/archive.c:18 +#: builtin/archive.c contrib/scalar/scalar.c msgid "could not redirect output" msgstr "不能重定向輸出" -#: builtin/archive.c:35 +#: builtin/archive.c msgid "git archive: Remote with no URL" msgstr "git archive：未提供遠端 URL" -#: builtin/archive.c:59 +#: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，卻得到 flush 包" -#: builtin/archive.c:62 +#: builtin/archive.c #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" -#: builtin/archive.c:63 +#: builtin/archive.c msgid "git archive: protocol error" msgstr "git archive：協定錯誤" -#: builtin/archive.c:67 +#: builtin/archive.c msgid "git archive: expected a flush" msgstr "git archive：應有一個 flush 包" -#: builtin/bisect--helper.c:24 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<提交>]" -#: builtin/bisect--helper.c:26 +#: builtin/bisect--helper.c msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -11040,97 +2716,97 @@ msgstr "" "git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}" "=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]" -#: builtin/bisect--helper.c:29 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]" -#: builtin/bisect--helper.c:31 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-replay <filename>" msgstr "git bisect--helper --bisect-replay <檔名>" -#: builtin/bisect--helper.c:32 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]" -#: builtin/bisect--helper.c:34 +#: builtin/bisect--helper.c msgid "git bisect--helper --bisect-run <cmd>..." msgstr "git bisect--helper --bisect-run <cmd>..." -#: builtin/bisect--helper.c:109 +#: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案" -#: builtin/bisect--helper.c:116 +#: builtin/bisect--helper.c #, c-format msgid "could not write to file '%s'" msgstr "無法寫入 '%s' 檔案" -#: builtin/bisect--helper.c:154 +#: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' for reading" msgstr "無法開啟「%s」檔案進行讀取" -#: builtin/bisect--helper.c:170 +#: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一個有效的術語" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用內建指令 '%s' 作為術語" -#: builtin/bisect--helper.c:184 +#: builtin/bisect--helper.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改術語 '%s' 的含義" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c msgid "please use two different terms" msgstr "請使用兩個不同的術語" -#: builtin/bisect--helper.c:210 +#: builtin/bisect--helper.c #, c-format msgid "We are not bisecting.\n" msgstr "我們沒有在二分搜尋。\n" -#: builtin/bisect--helper.c:218 +#: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一個有效的提交" -#: builtin/bisect--helper.c:227 +#: builtin/bisect--helper.c #, 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:271 +#: builtin/bisect--helper.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "壞的 bisect_write 參數：%s" -#: builtin/bisect--helper.c:276 +#: builtin/bisect--helper.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "無法取得版本 '%s' 的物件 ID" -#: builtin/bisect--helper.c:288 +#: builtin/bisect--helper.c #, c-format msgid "couldn't open the file '%s'" msgstr "無法開啟檔案 '%s'" -#: builtin/bisect--helper.c:314 +#: builtin/bisect--helper.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中" -#: builtin/bisect--helper.c:341 +#: builtin/bisect--helper.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -11139,7 +2815,7 @@ msgstr "" "您需要給我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" -#: builtin/bisect--helper.c:345 +#: builtin/bisect--helper.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -11150,7 +2826,7 @@ msgstr "" "然後需要提供我至少一個 %s 和一個 %s 版本。\n" "為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。" -#: builtin/bisect--helper.c:365 +#: builtin/bisect--helper.c #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一個 %s 提交的情況下二分搜尋" @@ -11160,22 +2836,36 @@ msgstr "在只有一個 %s 提交的情況下二分搜尋" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:373 +#: builtin/bisect--helper.c msgid "Are you sure [Y/n]? " msgstr "您確認嗎[Y/n]？ " -#: builtin/bisect--helper.c:434 +#: builtin/bisect--helper.c +msgid "status: waiting for both good and bad commits\n" +msgstr "狀態：正在等待好和壞的提交\n" + +#: builtin/bisect--helper.c +#, c-format +msgid "status: waiting for bad commit, %d good commit known\n" +msgid_plural "status: waiting for bad commit, %d good commits known\n" +msgstr[0] "狀態：正在等待壞的提交，已知有 %d 個好的提交\n" + +#: builtin/bisect--helper.c +msgid "status: waiting for good commit(s), bad commit known\n" +msgstr "狀態：正在等待好的提交，已知有壞的提交\n" + +#: builtin/bisect--helper.c msgid "no terms defined" msgstr "未定義術語" -#: builtin/bisect--helper.c:437 +#: builtin/bisect--helper.c #, 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:447 +#: builtin/bisect--helper.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -11184,52 +2874,52 @@ msgstr "" "指令 'git bisect terms' 的參數 %s 無效。\n" "支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。" -#: builtin/bisect--helper.c:514 builtin/bisect--helper.c:1038 +#: builtin/bisect--helper.c msgid "revision walk setup failed\n" msgstr "版本遍歷設定失敗\n" -#: builtin/bisect--helper.c:536 +#: builtin/bisect--helper.c #, c-format msgid "could not open '%s' for appending" msgstr "無法開啟 '%s' 進行附加" -#: builtin/bisect--helper.c:655 builtin/bisect--helper.c:668 +#: builtin/bisect--helper.c msgid "'' is not a valid term" msgstr "'' 不是一個有效的術語" -#: builtin/bisect--helper.c:678 +#: builtin/bisect--helper.c #, c-format msgid "unrecognized option: '%s'" msgstr "未識別的選項：'%s'" -#: builtin/bisect--helper.c:682 +#: builtin/bisect--helper.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起來不是一個有效的版本" -#: builtin/bisect--helper.c:713 +#: builtin/bisect--helper.c msgid "bad HEAD - I need a HEAD" msgstr "壞的 HEAD - 我需要一個 HEAD" -#: builtin/bisect--helper.c:728 +#: builtin/bisect--helper.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。" -#: builtin/bisect--helper.c:749 +#: builtin/bisect--helper.c msgid "won't bisect on cg-seek'ed tree" msgstr "不會在做了 cg-seek 的樹上做二分搜尋" -#: builtin/bisect--helper.c:752 +#: builtin/bisect--helper.c msgid "bad HEAD - strange symbolic ref" msgstr "壞的 HEAD - 奇怪的符號引用" -#: builtin/bisect--helper.c:772 +#: builtin/bisect--helper.c #, c-format msgid "invalid ref: '%s'" msgstr "無效的引用：'%s'" -#: builtin/bisect--helper.c:830 +#: builtin/bisect--helper.c msgid "You need to start by \"git bisect start\"\n" msgstr "您需要執行 \"git bisect start\" 來開始\n" @@ -11238,87 +2928,87 @@ msgstr "您需要執行 \"git bisect start\" 來開始\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:841 +#: builtin/bisect--helper.c msgid "Do you want me to do it for you [Y/n]? " msgstr "您想讓我為您這樣做嗎[Y/n]？ " -#: builtin/bisect--helper.c:859 +#: builtin/bisect--helper.c msgid "Please call `--bisect-state` with at least one argument" msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" -#: builtin/bisect--helper.c:872 +#: builtin/bisect--helper.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能有一個參數。" -#: builtin/bisect--helper.c:884 builtin/bisect--helper.c:897 +#: builtin/bisect--helper.c #, c-format msgid "Bad rev input: %s" msgstr "<修訂版> 輸入格式錯誤：%s" -#: builtin/bisect--helper.c:904 +#: builtin/bisect--helper.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "修訂版輸入有誤（不是提交）：%s" -#: builtin/bisect--helper.c:936 +#: builtin/bisect--helper.c msgid "We are not bisecting." msgstr "我們沒有在二分搜尋。" -#: builtin/bisect--helper.c:986 +#: builtin/bisect--helper.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "「%s」？？您在說什麼？" -#: builtin/bisect--helper.c:998 +#: builtin/bisect--helper.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "無法讀取「%s」檔案來重放" -#: builtin/bisect--helper.c:1120 builtin/bisect--helper.c:1152 +#: builtin/bisect--helper.c #, c-format msgid "running %s\n" msgstr "正在執行 %s\n" -#: builtin/bisect--helper.c:1145 builtin/bisect--helper.c:1335 +#: builtin/bisect--helper.c msgid "bisect run failed: no command provided." msgstr "二分搜尋執行失敗：沒有提供指令。" -#: builtin/bisect--helper.c:1166 +#: builtin/bisect--helper.c #, c-format msgid "unable to verify '%s' on good revision" msgstr "無法在正確修訂版上驗證「%s」" -#: builtin/bisect--helper.c:1172 +#: builtin/bisect--helper.c #, c-format msgid "bogus exit code %d for good revision" msgstr "正確修訂版回傳偽造的錯誤代碼 %d" -#: builtin/bisect--helper.c:1180 +#: builtin/bisect--helper.c #, c-format msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" msgstr "二分搜尋執行失敗：「%2$s」返回的離開碼 %1$d 小於 0 或 >= 128" -#: builtin/bisect--helper.c:1195 +#: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' for writing" msgstr "無法開啟「%s」檔案進行寫入" -#: builtin/bisect--helper.c:1213 +#: builtin/bisect--helper.c msgid "bisect run cannot continue any more" msgstr "二分搜尋不能繼續執行" -#: builtin/bisect--helper.c:1215 +#: builtin/bisect--helper.c #, c-format msgid "bisect run success" msgstr "二分搜尋執行成功" -#: builtin/bisect--helper.c:1218 +#: builtin/bisect--helper.c #, c-format msgid "bisect found first bad commit" msgstr "二分搜尋發現到第一個有問題的提交" -#: builtin/bisect--helper.c:1221 +#: builtin/bisect--helper.c #, c-format msgid "" "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " @@ -11326,218 +3016,215 @@ msgid "" msgstr "" "二分搜尋執行失敗：'git bisect--helper --bisect-state %s' 以錯誤代碼 %d 離開" -#: builtin/bisect--helper.c:1253 +#: builtin/bisect--helper.c msgid "reset the bisection state" msgstr "清除二分搜尋狀態" -#: builtin/bisect--helper.c:1255 +#: builtin/bisect--helper.c msgid "check whether bad or good terms exist" msgstr "檢查壞的或好的術語是否存在" -#: builtin/bisect--helper.c:1257 +#: builtin/bisect--helper.c msgid "print out the bisect terms" msgstr "列印二分搜尋術語" -#: builtin/bisect--helper.c:1259 +#: builtin/bisect--helper.c msgid "start the bisect session" msgstr "啟動二分搜尋過程" -#: builtin/bisect--helper.c:1261 +#: builtin/bisect--helper.c msgid "find the next bisection commit" msgstr "尋找下一個二分搜尋提交" -#: builtin/bisect--helper.c:1263 +#: builtin/bisect--helper.c msgid "mark the state of ref (or refs)" msgstr "標記 ref (或 refs) 的狀態" -#: builtin/bisect--helper.c:1265 +#: builtin/bisect--helper.c msgid "list the bisection steps so far" msgstr "列出迄今的二分搜尋步驟" -#: builtin/bisect--helper.c:1267 +#: builtin/bisect--helper.c msgid "replay the bisection process from the given file" msgstr "從指定檔案重放二分搜尋過程" -#: builtin/bisect--helper.c:1269 +#: builtin/bisect--helper.c msgid "skip some commits for checkout" msgstr "略過要簽出的部分提交" -#: builtin/bisect--helper.c:1271 +#: builtin/bisect--helper.c msgid "visualize the bisection" msgstr "視覺化二分搜尋過程" -#: builtin/bisect--helper.c:1273 +#: builtin/bisect--helper.c msgid "use <cmd>... to automatically bisect" msgstr "使用 <cmd>... 自動進行二分搜尋" -#: builtin/bisect--helper.c:1275 +#: builtin/bisect--helper.c msgid "no log for BISECT_WRITE" msgstr "BISECT_WRITE 無日誌" -#: builtin/bisect--helper.c:1290 +#: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 無需參數或者需要一個提交" -#: builtin/bisect--helper.c:1295 +#: builtin/bisect--helper.c msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 個參數" -#: builtin/bisect--helper.c:1304 +#: builtin/bisect--helper.c msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 個引數" -#: builtin/bisect--helper.c:1315 +#: builtin/bisect--helper.c msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 個引數" -#: builtin/bisect--helper.c:1320 +#: builtin/bisect--helper.c msgid "no logfile given" msgstr "未提供日誌檔案" -#: builtin/blame.c:32 +#: builtin/blame.c msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>" -#: builtin/blame.c:37 +#: builtin/blame.c msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中" -#: builtin/blame.c:406 +#: builtin/blame.c #, c-format msgid "expecting a color: %s" msgstr "期望一個顏色：%s" -#: builtin/blame.c:413 +#: builtin/blame.c msgid "must end with a color" msgstr "必須以一個顏色結尾" -#: builtin/blame.c:842 +#: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" -#: builtin/blame.c:864 +#: builtin/blame.c msgid "show blame entries as we find them, incrementally" msgstr "增量式顯示發現的 blame 條目" -#: builtin/blame.c:865 +#: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" msgstr "不要顯示邊界提交的物件名稱（預設值: off）" -#: builtin/blame.c:866 +#: builtin/blame.c msgid "do not treat root commits as boundaries (Default: off)" msgstr "不將根提交看作邊界（預設值：off）" -#: builtin/blame.c:867 +#: builtin/blame.c msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c:868 builtin/checkout.c:1554 builtin/clone.c:98 -#: builtin/commit-graph.c:75 builtin/commit-graph.c:228 builtin/fetch.c:181 -#: builtin/merge.c:301 builtin/multi-pack-index.c:103 -#: builtin/multi-pack-index.c:154 builtin/multi-pack-index.c:180 -#: builtin/multi-pack-index.c:208 builtin/pull.c:120 builtin/push.c:566 -#: builtin/remote.c:683 builtin/send-pack.c:202 +#: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c +#: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "強制顯示進度報告" -#: builtin/blame.c:869 +#: builtin/blame.c msgid "show output score for blame entries" msgstr "顯示判斷 blame 條目位移的得分診斷訊息" -#: builtin/blame.c:870 +#: builtin/blame.c msgid "show original filename (Default: auto)" msgstr "顯示原始檔案名稱（預設值：auto）" -#: builtin/blame.c:871 +#: builtin/blame.c msgid "show original linenumber (Default: off)" msgstr "顯示原始檔案名稱（預設值：off）" -#: builtin/blame.c:872 +#: builtin/blame.c msgid "show in a format designed for machine consumption" msgstr "顯示成適合機器讀取的格式" -#: builtin/blame.c:873 +#: builtin/blame.c msgid "show porcelain format with per-line commit information" msgstr "顯示每一列適合機器的提交說明" -#: builtin/blame.c:874 +#: builtin/blame.c msgid "use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）" -#: builtin/blame.c:875 +#: builtin/blame.c msgid "show raw timestamp (Default: off)" msgstr "顯示原始時間戳（預設值：off）" -#: builtin/blame.c:876 +#: builtin/blame.c msgid "show long commit SHA1 (Default: off)" msgstr "顯示較長的 SHA1 提交編號（預設值：off）" -#: builtin/blame.c:877 +#: builtin/blame.c msgid "suppress author name and timestamp (Default: off)" msgstr "隱藏作者名字及時間戳（預設值：off）" -#: builtin/blame.c:878 +#: builtin/blame.c msgid "show author email instead of name (Default: off)" msgstr "顯示作者信箱而非名稱（預設值：off）" -#: builtin/blame.c:879 +#: builtin/blame.c msgid "ignore whitespace differences" msgstr "忽略空白差異" -#: builtin/blame.c:880 builtin/log.c:1857 +#: builtin/blame.c builtin/log.c msgid "rev" msgstr "版本" -#: builtin/blame.c:880 +#: builtin/blame.c msgid "ignore <rev> when blaming" msgstr "在執行 blame 動作時忽略 <修訂版>" -#: builtin/blame.c:881 +#: builtin/blame.c msgid "ignore revisions from <file>" msgstr "忽略 <檔案> 中的修訂版" -#: builtin/blame.c:882 +#: builtin/blame.c msgid "color redundant metadata from previous line differently" msgstr "使用顏色間隔輸出與前一行不同的重複中介資料" -#: builtin/blame.c:883 +#: builtin/blame.c msgid "color lines by age" msgstr "依據時間著色" -#: builtin/blame.c:884 +#: builtin/blame.c msgid "spend extra cycles to find better match" msgstr "循環更多次以找到更佳符合" -#: builtin/blame.c:885 +#: builtin/blame.c msgid "use revisions from <file> instead of calling git-rev-list" msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list" -#: builtin/blame.c:886 +#: builtin/blame.c msgid "use <file>'s contents as the final image" msgstr "將 <檔案> 的內容當成是最終 image" -#: builtin/blame.c:887 builtin/blame.c:888 +#: builtin/blame.c msgid "score" msgstr "得分" -#: builtin/blame.c:887 +#: builtin/blame.c msgid "find line copies within and across files" msgstr "找到檔案內及跨檔案的複製列" -#: builtin/blame.c:888 +#: builtin/blame.c msgid "find line movements within and across files" msgstr "找到檔案內及跨檔案的移動列" -#: builtin/blame.c:889 +#: builtin/blame.c msgid "range" msgstr "range" -#: builtin/blame.c:890 +#: builtin/blame.c msgid "process only line range <start>,<end> or function :<funcname>" msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數" -#: builtin/blame.c:949 +#: builtin/blame.c msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" @@ -11549,56 +3236,56 @@ msgstr "--progress 不能跟 --incremental 或 porcelain 格式同時使用" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:1000 +#: builtin/blame.c msgid "4 years, 11 months ago" msgstr "4 年 11 個月前" -#: builtin/blame.c:1116 +#: builtin/blame.c #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "檔案 %s 只有 %lu 行" -#: builtin/blame.c:1161 +#: builtin/blame.c msgid "Blaming lines" msgstr "追蹤程式碼行" -#: builtin/branch.c:29 +#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<選項>] [-r | -a] [--merged] [--no-merged]" -#: builtin/branch.c:30 +#: builtin/branch.c msgid "" "git branch [<options>] [-f] [--recurse-submodules] <branch-name> [<start-" "point>]" msgstr "git branch [<選項>] [-f] [--recurse-submodules] <分支名> [<起始點>]" -#: builtin/branch.c:31 +#: builtin/branch.c msgid "git branch [<options>] [-l] [<pattern>...]" msgstr "git branch [<選項>] [-l] [<模式>...]" -#: builtin/branch.c:32 +#: builtin/branch.c msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<選項>] [-r] (-d | -D) <分支名>..." -#: builtin/branch.c:33 +#: builtin/branch.c msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<選項>] (-m | -M) [<舊分支>] <新分支>" -#: builtin/branch.c:34 +#: builtin/branch.c msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<選項>] (-c | -C) [<老分支>] <新分支>" -#: builtin/branch.c:35 +#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<選項>] [-r | -a] [--points-at]" -#: builtin/branch.c:36 +#: builtin/branch.c msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<選項>] [-r | -a] [--format]" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:165 +#: builtin/branch.c #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -11608,7 +3295,7 @@ msgstr "" " '%s'，但未合併到 HEAD。" # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長 -#: builtin/branch.c:169 +#: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -11617,12 +3304,12 @@ msgstr "" "並未刪除分支 '%s'， 雖然它已經合併到 HEAD，\n" " 然而卻尚未被合併到分支 '%s' 。" -#: builtin/branch.c:183 +#: builtin/branch.c #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "無法查詢 '%s' 指向的提交物件" -#: builtin/branch.c:187 +#: builtin/branch.c #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -11631,111 +3318,111 @@ msgstr "" "分支 '%s' 沒有完全合併。\n" "如果您確認要刪除它，執行 'git branch -D %s'。" -#: builtin/branch.c:200 +#: builtin/branch.c msgid "Update of config-file failed" msgstr "更新設定檔案失敗" -#: builtin/branch.c:235 +#: builtin/branch.c msgid "cannot use -a with -d" msgstr "不能將 -a 和 -d 同時使用" -#: builtin/branch.c:242 +#: builtin/branch.c msgid "Couldn't look up commit object for HEAD" msgstr "無法查詢 HEAD 指向的提交物件" -#: builtin/branch.c:259 +#: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "無法刪除在「%2$s」簽出的「%1$s」分支" -#: builtin/branch.c:274 +#: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到遠端追蹤分支 '%s'。" -#: builtin/branch.c:275 +#: builtin/branch.c #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未發現。" -#: builtin/branch.c:306 +#: builtin/branch.c #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n" -#: builtin/branch.c:307 +#: builtin/branch.c #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已刪除分支 %s（曾為 %s）。\n" -#: builtin/branch.c:457 builtin/tag.c:64 +#: builtin/branch.c builtin/tag.c msgid "unable to parse format string" msgstr "不能解析格式化字串" -#: builtin/branch.c:488 +#: builtin/branch.c msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" -#: builtin/branch.c:494 +#: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" -#: builtin/branch.c:509 +#: builtin/branch.c #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被重定基底到 %s" -#: builtin/branch.c:513 +#: builtin/branch.c #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分搜尋於 %s" -#: builtin/branch.c:530 +#: builtin/branch.c msgid "cannot copy the current branch while not on any." msgstr "無法複製目前分支因為不處於任何分支上。" -#: builtin/branch.c:532 +#: builtin/branch.c msgid "cannot rename the current branch while not on any." msgstr "無法重新命名目前分支因為不處於任何分支上。" -#: builtin/branch.c:543 +#: builtin/branch.c #, c-format msgid "Invalid branch name: '%s'" msgstr "無效的分支名：'%s'" -#: builtin/branch.c:572 +#: builtin/branch.c msgid "Branch rename failed" msgstr "分支重新命名失敗" -#: builtin/branch.c:574 +#: builtin/branch.c msgid "Branch copy failed" msgstr "分支複製失敗" -#: builtin/branch.c:578 +#: builtin/branch.c #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已為錯誤命名的分支 '%s' 建立了一個副本" -#: builtin/branch.c:581 +#: builtin/branch.c #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已將錯誤命名的分支 '%s' 重新命名" -#: builtin/branch.c:587 +#: builtin/branch.c #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重新命名為 %s，但 HEAD 沒有更新！" -#: builtin/branch.c:596 +#: builtin/branch.c msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重新命名，但更新設定檔案失敗" -#: builtin/branch.c:598 +#: builtin/branch.c msgid "Branch is copied, but update of config-file failed" msgstr "分支已複製，但更新設定檔案失敗" -#: builtin/branch.c:614 +#: builtin/branch.c #, c-format msgid "" "Please edit the description for the branch\n" @@ -11746,221 +3433,222 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被過濾。\n" -#: builtin/branch.c:651 +#: builtin/branch.c msgid "Generic options" msgstr "通用選項" -#: builtin/branch.c:653 +#: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支" -#: builtin/branch.c:654 +#: builtin/branch.c msgid "suppress informational messages" msgstr "不顯示訊息" -#: builtin/branch.c:656 builtin/checkout.c:1571 -#: builtin/submodule--helper.c:3077 +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "設定分支追蹤設定" -#: builtin/branch.c:659 +#: builtin/branch.c msgid "do not use" msgstr "不要使用" -#: builtin/branch.c:661 +#: builtin/branch.c msgid "upstream" msgstr "上游" -#: builtin/branch.c:661 +#: builtin/branch.c msgid "change the upstream info" msgstr "改變上游訊息" -#: builtin/branch.c:662 +#: builtin/branch.c msgid "unset the upstream info" msgstr "取消上游資訊設定" -#: builtin/branch.c:663 +#: builtin/branch.c msgid "use colored output" msgstr "使用彩色輸出" -#: builtin/branch.c:664 +#: builtin/branch.c msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c:666 builtin/branch.c:668 +#: builtin/branch.c msgid "print only branches that contain the commit" msgstr "只列印包含該提交的分支" -#: builtin/branch.c:667 builtin/branch.c:669 +#: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "只列印不包含該提交的分支" -#: builtin/branch.c:672 +#: builtin/branch.c msgid "Specific git-branch actions:" msgstr "具體的 git-branch 動作：" -#: builtin/branch.c:673 +#: builtin/branch.c msgid "list both remote-tracking and local branches" msgstr "列出遠端追蹤及本機分支" -#: builtin/branch.c:675 +#: builtin/branch.c msgid "delete fully merged branch" msgstr "刪除完全合併的分支" -#: builtin/branch.c:676 +#: builtin/branch.c msgid "delete branch (even if not merged)" msgstr "刪除分支（即使沒有合併）" -#: builtin/branch.c:677 +#: builtin/branch.c msgid "move/rename a branch and its reflog" msgstr "移動/重新命名一個分支，以及它的引用日誌" -#: builtin/branch.c:678 +#: builtin/branch.c msgid "move/rename a branch, even if target exists" msgstr "移動/重新命名一個分支，即使目標已存在" -#: builtin/branch.c:679 +#: builtin/branch.c msgid "copy a branch and its reflog" msgstr "複製分支及其引用日誌" -#: builtin/branch.c:680 +#: builtin/branch.c msgid "copy a branch, even if target exists" msgstr "複製一個分支，即使目標已存在" -#: builtin/branch.c:681 +#: builtin/branch.c msgid "list branch names" msgstr "列出分支名" -#: builtin/branch.c:682 +#: builtin/branch.c msgid "show current branch name" msgstr "顯示目前分支名" -#: builtin/branch.c:683 builtin/submodule--helper.c:3075 +#: builtin/branch.c builtin/submodule--helper.c msgid "create the branch's reflog" msgstr "建立分支的引用日誌" -#: builtin/branch.c:685 +#: builtin/branch.c msgid "edit the description for the branch" msgstr "標記分支的描述" -#: builtin/branch.c:686 +#: builtin/branch.c msgid "force creation, move/rename, deletion" msgstr "強制建立、移動/重新命名、刪除" -#: builtin/branch.c:687 +#: builtin/branch.c msgid "print only branches that are merged" msgstr "只列印已經合併的分支" -#: builtin/branch.c:688 +#: builtin/branch.c msgid "print only branches that are not merged" msgstr "只列印尚未合併的分支" -#: builtin/branch.c:689 +#: builtin/branch.c msgid "list branches in columns" msgstr "以列的方式顯示分支" -#: builtin/branch.c:691 builtin/for-each-ref.c:45 builtin/notes.c:413 -#: builtin/notes.c:416 builtin/notes.c:579 builtin/notes.c:582 -#: builtin/tag.c:476 +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "物件" -#: builtin/branch.c:692 +#: builtin/branch.c msgid "print only branches of the object" msgstr "只列印指向該物件的分支" -#: builtin/branch.c:693 builtin/for-each-ref.c:51 builtin/tag.c:483 +#: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" msgstr "排序和過濾屬於大小寫不敏感" -#: builtin/branch.c:694 builtin/ls-files.c:667 +#: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/branch.c:695 builtin/for-each-ref.c:41 builtin/ls-tree.c:358 -#: builtin/tag.c:481 builtin/verify-tag.c:38 +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-tree.c builtin/tag.c +#: builtin/verify-tag.c msgid "format to use for the output" msgstr "輸出格式" -#: builtin/branch.c:718 builtin/clone.c:684 +#: builtin/branch.c builtin/submodule--helper.c submodule.c +msgid "Failed to resolve HEAD as a valid ref." +msgstr "無法將 HEAD 解析為有效引用。" + +#: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" msgstr "HEAD 沒有位於 /refs/heads 之下！" -#: builtin/branch.c:739 +#: builtin/branch.c msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" "有 --recurse-submodules 的分支只能在啟用 submodule.propagateBranches 時使用" -#: builtin/branch.c:741 +#: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用來建立分支" -#: builtin/branch.c:770 builtin/branch.c:826 builtin/branch.c:835 +#: builtin/branch.c msgid "branch name required" msgstr "必須提供分支名" -#: builtin/branch.c:802 +#: builtin/branch.c msgid "Cannot give description to detached HEAD" msgstr "不能向分離開頭指標提供描述" -#: builtin/branch.c:807 +#: builtin/branch.c msgid "cannot edit description of more than one branch" msgstr "不能為一個以上的分支編輯描述" -#: builtin/branch.c:814 +#: builtin/branch.c #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚無提交。" -#: builtin/branch.c:817 +#: builtin/branch.c #, c-format msgid "No branch named '%s'." msgstr "沒有分支 '%s'。" -#: builtin/branch.c:832 +#: builtin/branch.c msgid "too many branches for a copy operation" msgstr "為複製動作提供了太多的分支名" -#: builtin/branch.c:841 +#: builtin/branch.c msgid "too many arguments for a rename operation" msgstr "為重新命名動作提供了太多的參數" -#: builtin/branch.c:846 +#: builtin/branch.c msgid "too many arguments to set new upstream" msgstr "為設定新上游提供了太多的參數" -#: builtin/branch.c:850 +#: builtin/branch.c #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "無法設定 HEAD 的上游為 %s，因為 HEAD 沒有指向任何分支。" -#: builtin/branch.c:853 builtin/branch.c:873 +#: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "沒有此分支 '%s'" -#: builtin/branch.c:857 +#: builtin/branch.c #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" -#: builtin/branch.c:867 +#: builtin/branch.c msgid "too many arguments to unset upstream" msgstr "為取消上游設定動作提供了太多的參數" -#: builtin/branch.c:871 +#: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。" -#: builtin/branch.c:877 +#: builtin/branch.c #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 沒有上游訊息" -#: builtin/branch.c:890 +#: builtin/branch.c msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11968,39 +3656,39 @@ msgstr "" "'git branch' 的 -a 和 -r 選項不帶一個分支名。\n" "您是否想要使用：-a|-r --list <模式>？" -#: builtin/branch.c:894 +#: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" "不再支援選項 '--set-upstream'。請使用 '--track' 或 '--set-upstream-to'。" -#: builtin/bugreport.c:16 +#: builtin/bugreport.c msgid "git version:\n" msgstr "git 版本：\n" -#: builtin/bugreport.c:22 +#: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() 失敗，錯誤：「%s」(%d)\n" -#: builtin/bugreport.c:32 +#: builtin/bugreport.c msgid "compiler info: " msgstr "編譯器資訊： " -#: builtin/bugreport.c:35 +#: builtin/bugreport.c msgid "libc info: " msgstr "libc 資訊： " -#: builtin/bugreport.c:49 +#: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" msgstr "不是從 git 版本庫執行 - 沒有可顯示的掛鉤\n" -#: builtin/bugreport.c:62 +#: builtin/bugreport.c msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]" msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格式>]" -#: builtin/bugreport.c:69 +#: builtin/bugreport.c msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" @@ -12034,144 +3722,149 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c:108 +#: builtin/bugreport.c msgid "specify a destination for the bugreport file" msgstr "請指定 bugreport 檔案的目的地" -#: builtin/bugreport.c:110 +#: builtin/bugreport.c msgid "specify a strftime format suffix for the filename" msgstr "請指定檔案名稱的 strftime 格式後綴" -#: builtin/bugreport.c:132 +#: builtin/bugreport.c #, c-format msgid "could not create leading directories for '%s'" msgstr "無法建立 '%s' 的前置目錄" -#: builtin/bugreport.c:139 +#: builtin/bugreport.c msgid "System Info" msgstr "系統資訊" -#: builtin/bugreport.c:142 +#: builtin/bugreport.c msgid "Enabled Hooks" msgstr "啟用的掛鉤" -#: builtin/bugreport.c:149 +#: builtin/bugreport.c #, c-format msgid "unable to write to %s" msgstr "無法寫入 %s" -#: builtin/bugreport.c:159 +#: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" msgstr "已在「%s」建立新報告。\n" -#: builtin/bundle.c:15 builtin/bundle.c:23 +#: builtin/bundle.c 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 +#: builtin/bundle.c msgid "git bundle verify [<options>] <file>" msgstr "git bundle verify [<選項>] <檔案>" -#: builtin/bundle.c:17 builtin/bundle.c:33 +#: builtin/bundle.c msgid "git bundle list-heads <file> [<refname>...]" msgstr "git bundle list-heads <檔案> [<引用名稱>...]" -#: builtin/bundle.c:18 builtin/bundle.c:38 +#: builtin/bundle.c msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <檔案> [<引用名稱>...]" -#: builtin/bundle.c:65 builtin/pack-objects.c:3899 +#: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "不顯示進度表" -#: builtin/bundle.c:67 builtin/bundle.c:168 builtin/pack-objects.c:3901 +#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "顯示進度表" -#: builtin/bundle.c:69 builtin/pack-objects.c:3903 +#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter during object writing phase" msgstr "在物件寫入階段顯示進度表" -#: builtin/bundle.c:72 builtin/pack-objects.c:3906 +#: builtin/bundle.c builtin/pack-objects.c msgid "similar to --all-progress when progress meter is shown" msgstr "當進度表顯示時類似於 --all-progress" -#: builtin/bundle.c:74 +#: builtin/bundle.c msgid "specify bundle format version" msgstr "指定套件的格式版本" -#: builtin/bundle.c:94 +#: builtin/bundle.c msgid "Need a repository to create a bundle." msgstr "需要版本庫來建立套件。" -#: builtin/bundle.c:108 +#: builtin/bundle.c msgid "do not show bundle details" msgstr "不顯示套件詳細資訊" -#: builtin/bundle.c:127 +#: builtin/bundle.c #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" -#: builtin/bundle.c:183 +#: builtin/bundle.c msgid "Need a repository to unbundle." msgstr "需要版本庫才能拆分套件。" -#: builtin/bundle.c:186 +#: builtin/bundle.c msgid "Unbundling objects" msgstr "正在解包物件" -#: builtin/bundle.c:220 builtin/remote.c:1758 +#: builtin/bundle.c builtin/remote.c #, c-format msgid "Unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/cat-file.c:568 +#: builtin/cat-file.c merge-recursive.c +#, c-format +msgid "cannot read object %s '%s'" +msgstr "不能讀取物件 %s '%s'" + +#: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "排清功能只能用於 --buffer 模式" -#: builtin/cat-file.c:612 +#: builtin/cat-file.c msgid "empty command in input" msgstr "輸入中沒有命令" -#: builtin/cat-file.c:614 +#: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" msgstr "命令前空格：「%s」" -#: builtin/cat-file.c:623 +#: builtin/cat-file.c #, c-format msgid "%s requires arguments" msgstr "%s 需要引數" -#: builtin/cat-file.c:628 +#: builtin/cat-file.c #, c-format msgid "%s takes no arguments" msgstr "%s 不取引數" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c #, c-format msgid "unknown command: '%s'" msgstr "未知命令：「%s」" -#: builtin/cat-file.c:795 +#: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "只能指定一個批次處理選項" -#: builtin/cat-file.c:824 +#: builtin/cat-file.c msgid "git cat-file <type> <object>" msgstr "git cat-file <type> <object>" -#: builtin/cat-file.c:825 +#: builtin/cat-file.c msgid "git cat-file (-e | -p) <object>" msgstr "git cat-file (-e | -p) <object>" -#: builtin/cat-file.c:826 +#: builtin/cat-file.c msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>" msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>" -#: builtin/cat-file.c:827 +#: builtin/cat-file.c msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" @@ -12183,7 +3876,7 @@ msgstr "" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters]" -#: builtin/cat-file.c:830 +#: builtin/cat-file.c msgid "" "git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" @@ -12191,376 +3884,368 @@ msgstr "" "git cat-file (--textconv | --filters)\n" " [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]" -#: builtin/cat-file.c:836 +#: builtin/cat-file.c msgid "Check object existence or emit object contents" msgstr "檢查物件的存在狀態，或輸出物件內容" -#: builtin/cat-file.c:838 +#: builtin/cat-file.c msgid "check if <object> exists" msgstr "檢查 <object> 是否存在" -#: builtin/cat-file.c:839 +#: builtin/cat-file.c msgid "pretty-print <object> content" msgstr "美化輸出 <object> 的內容" -#: builtin/cat-file.c:841 +#: builtin/cat-file.c msgid "Emit [broken] object attributes" msgstr "輸出 [損壞的] 物件屬性" -#: builtin/cat-file.c:842 +#: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "顯示物件類型（可以是 “blob”、“tree”、“commit”、“tag” 等其中一個）" -#: builtin/cat-file.c:843 +#: builtin/cat-file.c msgid "show object size" msgstr "顯示物件大小" -#: builtin/cat-file.c:845 +#: builtin/cat-file.c msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允許 -s 和 -t 對損壞的物件生效" -#: builtin/cat-file.c:847 +#: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批次處理 stdin 上請求的物件（或 --batch-all-objects）" -#: builtin/cat-file.c:849 +#: builtin/cat-file.c msgid "show full <object> or <rev> contents" msgstr "顯示完整的 <object> 或 <rev> 內容" -#: builtin/cat-file.c:853 +#: builtin/cat-file.c msgid "like --batch, but don't emit <contents>" msgstr "類似 --batch 但不輸出 <contents>" -#: builtin/cat-file.c:857 +#: builtin/cat-file.c msgid "read commands from stdin" msgstr "從標準輸入讀取命令" -#: builtin/cat-file.c:861 +#: builtin/cat-file.c msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "傳入 --batch[-check]：忽略標準輸入，批次處理所有已知物件" -#: builtin/cat-file.c:863 +#: builtin/cat-file.c msgid "Change or optimize batch output" msgstr "變更或最佳化批次處理的輸出" -#: builtin/cat-file.c:864 +#: builtin/cat-file.c msgid "buffer --batch output" msgstr "緩衝 --batch 的輸出" -#: builtin/cat-file.c:866 +#: builtin/cat-file.c msgid "follow in-tree symlinks" msgstr "追蹤樹中的符號連結" -#: builtin/cat-file.c:868 +#: builtin/cat-file.c msgid "do not order objects before emitting them" msgstr "不要在輸出物件前排序" -#: builtin/cat-file.c:870 +#: builtin/cat-file.c msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "轉換或過濾後輸出物件（blob 或樹）（單獨或批次處理）" -#: builtin/cat-file.c:872 +#: builtin/cat-file.c msgid "run textconv on object's content" msgstr "在物件內容執行 textconv" -#: builtin/cat-file.c:874 +#: builtin/cat-file.c msgid "run filters on object's content" msgstr "在物件內容執行過濾器" -#: builtin/cat-file.c:875 +#: builtin/cat-file.c msgid "blob|tree" msgstr "blob|tree" -#: builtin/cat-file.c:876 +#: builtin/cat-file.c msgid "use a <path> for (--textconv | --filters); Not with 'batch'" msgstr "請在 (--textconv | --filters) 使用 <path>，而非 “batch”" -#: builtin/cat-file.c:894 +#: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "「%s=<%s>」需要「%s」或「%s」" -#: builtin/cat-file.c:896 +#: builtin/cat-file.c msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c:903 builtin/cat-file.c:906 builtin/cat-file.c:909 +#: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "「%s」需要批次處理模式" -#: builtin/cat-file.c:921 +#: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "「-%c」與批次處理模式不相容" -#: builtin/cat-file.c:924 +#: builtin/cat-file.c msgid "batch modes take no arguments" msgstr "批次處理模式不取引數" -#: builtin/cat-file.c:932 builtin/cat-file.c:935 +#: builtin/cat-file.c #, c-format msgid "<rev> required with '%s'" msgstr "<rev> 需要搭配「%s」" -#: builtin/cat-file.c:938 +#: builtin/cat-file.c #, c-format msgid "<object> required with '-%c'" msgstr "<object> 需要搭配「-%c」" -#: builtin/cat-file.c:943 builtin/notes.c:374 builtin/notes.c:429 -#: builtin/notes.c:507 builtin/notes.c:519 builtin/notes.c:596 -#: builtin/notes.c:663 builtin/notes.c:813 builtin/notes.c:965 -#: builtin/notes.c:987 builtin/prune-packed.c:25 builtin/receive-pack.c:2489 -#: builtin/tag.c:592 +#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c +#: builtin/receive-pack.c builtin/tag.c msgid "too many arguments" msgstr "太多參數" -#: builtin/cat-file.c:947 +#: builtin/cat-file.c #, c-format msgid "only two arguments allowed in <type> <object> mode, not %d" msgstr "只允許在 <type> <object> 模式傳入兩個引數，但傳了 %d 個" -#: builtin/check-attr.c:13 +#: builtin/check-attr.c msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑名>..." -#: builtin/check-attr.c:14 +#: builtin/check-attr.c msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]" -#: builtin/check-attr.c:21 +#: builtin/check-attr.c msgid "report all attributes set on file" msgstr "報告設定在檔案上的所有屬性" -#: builtin/check-attr.c:22 +#: builtin/check-attr.c msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:101 +#: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" msgstr "從標準輸入讀出檔案名" -#: builtin/check-attr.c:25 builtin/check-ignore.c:27 +#: builtin/check-attr.c builtin/check-ignore.c msgid "terminate input and output records by a NUL character" msgstr "輸入和輸出的紀錄使用 NUL 字元終結" -#: builtin/check-ignore.c:21 builtin/checkout.c:1550 builtin/gc.c:550 -#: builtin/worktree.c:565 +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "不顯示進度報告" -#: builtin/check-ignore.c:29 +#: builtin/check-ignore.c msgid "show non-matching input paths" msgstr "顯示未符合的輸入路徑" -#: builtin/check-ignore.c:31 +#: builtin/check-ignore.c msgid "ignore index when checking" msgstr "檢查時忽略索引" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" msgstr "不能同時指定路徑及 --stdin 參數" -#: builtin/check-ignore.c:168 +#: builtin/check-ignore.c msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 參數共用才有意義" -#: builtin/check-ignore.c:170 +#: builtin/check-ignore.c msgid "no path specified" msgstr "未指定路徑" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" msgstr "參數 --quiet 只在提供一個路徑名時有效" -#: builtin/check-ignore.c:176 +#: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" msgstr "不能同時提供 --quiet 和 --verbose 參數" -#: builtin/check-ignore.c:179 +#: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 選項只在使用 --verbose 時有效" -#: builtin/check-mailmap.c:9 +#: builtin/check-mailmap.c msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<選項>] <聯繫位址>..." -#: builtin/check-mailmap.c:14 +#: builtin/check-mailmap.c msgid "also read contacts from stdin" msgstr "還從標準輸入讀取聯繫位址" -#: builtin/check-mailmap.c:25 +#: builtin/check-mailmap.c #, c-format msgid "unable to parse contact: %s" msgstr "不能解析聯繫位址：%s" -#: builtin/check-mailmap.c:48 +#: builtin/check-mailmap.c msgid "no contacts specified" msgstr "未指定聯繫位址" -#: builtin/checkout--worker.c:110 +#: builtin/checkout--worker.c msgid "git checkout--worker [<options>]" msgstr "git checkout--worker [<選項>]" -#: builtin/checkout--worker.c:118 builtin/checkout-index.c:235 -#: builtin/column.c:31 builtin/column.c:32 builtin/submodule--helper.c:1878 -#: builtin/submodule--helper.c:1881 builtin/submodule--helper.c:1889 -#: builtin/submodule--helper.c:2716 builtin/worktree.c:563 -#: builtin/worktree.c:808 +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c +#: builtin/submodule--helper.c builtin/worktree.c msgid "string" msgstr "字串" -#: builtin/checkout--worker.c:119 builtin/checkout-index.c:236 +#: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend <string>" msgstr "在建立檔案時，在前面加上 <字串>" -#: builtin/checkout-index.c:184 +#: builtin/checkout-index.c msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<選項>] [--] [<檔案>...]" -#: builtin/checkout-index.c:201 +#: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" msgstr "索引值應該取值 1 到 3 或者 all" -#: builtin/checkout-index.c:219 +#: builtin/checkout-index.c msgid "check out all files in the index" msgstr "簽出索引區的所有檔案" -#: builtin/checkout-index.c:221 +#: builtin/checkout-index.c msgid "do not skip files with skip-worktree set" msgstr "設定 skip-worktree 時不略過檔案" -#: builtin/checkout-index.c:222 +#: builtin/checkout-index.c msgid "force overwrite of existing files" msgstr "強制覆蓋現有的檔案" -#: builtin/checkout-index.c:224 +#: builtin/checkout-index.c msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的檔案都沒有警告" -#: builtin/checkout-index.c:226 +#: builtin/checkout-index.c msgid "don't checkout new files" msgstr "不簽出新檔案" -#: builtin/checkout-index.c:228 +#: builtin/checkout-index.c msgid "update stat information in the index file" msgstr "更新索引中檔案的狀態訊息" -#: builtin/checkout-index.c:232 +#: builtin/checkout-index.c msgid "read list of paths from the standard input" msgstr "從標準輸入讀取路徑列表" -#: builtin/checkout-index.c:234 +#: builtin/checkout-index.c msgid "write the content to temporary files" msgstr "將內容寫入暫存檔" -#: builtin/checkout-index.c:238 +#: builtin/checkout-index.c msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c:34 +#: builtin/checkout.c msgid "git checkout [<options>] <branch>" msgstr "git checkout [<選項>] <分支>" -#: builtin/checkout.c:35 +#: builtin/checkout.c msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<選項>] [<分支>] -- <檔案>..." -#: builtin/checkout.c:40 +#: builtin/checkout.c msgid "git switch [<options>] [<branch>]" msgstr "git switch [<選項>] [<分支>]" -#: builtin/checkout.c:45 +#: builtin/checkout.c msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<選項>] [--source=<分支>] <檔案>..." -#: builtin/checkout.c:199 builtin/checkout.c:238 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "路徑 '%s' 沒有我們的版本" -#: builtin/checkout.c:201 builtin/checkout.c:240 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "路徑 '%s' 沒有他們的版本" -#: builtin/checkout.c:217 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路徑 '%s' 沒有全部必需的版本" -#: builtin/checkout.c:271 +#: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" msgstr "路徑 '%s' 沒有必需的版本" -#: builtin/checkout.c:291 +#: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：無法合併" -#: builtin/checkout.c:307 +#: builtin/checkout.c #, c-format msgid "Unable to add merge result for '%s'" msgstr "無法為 '%s' 新增合併結果" -#: builtin/checkout.c:424 +#: builtin/checkout.c #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新建立了 %d 個合併衝突" -#: builtin/checkout.c:429 +#: builtin/checkout.c #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "從 %2$s 更新了 %1$d 個路徑" -#: builtin/checkout.c:436 +#: builtin/checkout.c #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "從索引區更新了 %d 個路徑" -#: builtin/checkout.c:459 builtin/checkout.c:462 builtin/checkout.c:465 -#: builtin/checkout.c:469 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路徑時使用" -#: builtin/checkout.c:479 +#: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同時更新路徑並切換到分支'%s'。" -#: builtin/checkout.c:483 +#: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都沒有指定" -#: builtin/checkout.c:487 +#: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 時，必須使用 '%1$s'" -#: builtin/checkout.c:492 builtin/checkout.c:497 +#: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" -#: builtin/checkout.c:571 builtin/checkout.c:578 +#: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "路徑 '%s' 未合併" -#: builtin/checkout.c:753 +#: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/checkout.c:809 +#: builtin/checkout.c #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -12569,51 +4254,51 @@ msgstr "" "不能繼續，下列檔案有暫存的修改：\n" "%s" -#: builtin/checkout.c:902 +#: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能對 '%s' 執行 reflog 動作：%s\n" -#: builtin/checkout.c:947 +#: builtin/checkout.c msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c:951 builtin/clone.c:615 t/helper/test-fast-rebase.c:203 +#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c msgid "unable to update HEAD" msgstr "不能更新 HEAD" -#: builtin/checkout.c:955 +#: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" msgstr "重設分支 '%s'\n" -#: builtin/checkout.c:958 +#: builtin/checkout.c #, c-format msgid "Already on '%s'\n" msgstr "已經位於 '%s'\n" -#: builtin/checkout.c:962 +#: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切換並重設分支 '%s'\n" -#: builtin/checkout.c:964 builtin/checkout.c:1398 +#: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切換到一個新分支 '%s'\n" -#: builtin/checkout.c:966 +#: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" msgstr "切換到分支 '%s'\n" # 譯者：請維持前導空格 -#: builtin/checkout.c:1017 +#: builtin/checkout.c #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 個。\n" -#: builtin/checkout.c:1023 +#: builtin/checkout.c #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -12630,7 +4315,7 @@ msgstr[0] "" "\n" "%s\n" -#: builtin/checkout.c:1042 +#: builtin/checkout.c #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -12651,19 +4336,19 @@ msgstr[0] "" " git branch <新分支名> %s\n" "\n" -#: builtin/checkout.c:1077 +#: builtin/checkout.c msgid "internal error in revision walk" msgstr "在版本遍歷時遇到內部錯誤" -#: builtin/checkout.c:1081 +#: builtin/checkout.c msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:1124 builtin/checkout.c:1393 +#: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "您位於一個尚未初始化的分支" -#: builtin/checkout.c:1206 +#: builtin/checkout.c #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -12672,7 +4357,7 @@ msgstr "" "'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n" "請使用 --（和可選的 --no-guess）來消除歧義" -#: builtin/checkout.c:1213 +#: builtin/checkout.c msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -12691,56 +4376,56 @@ msgstr "" "如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n" "版本庫名，可以在設定中設定 checkout.defaultRemote=origin。" -#: builtin/checkout.c:1223 +#: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 符合多個 (%d) 遠端追蹤分支" -#: builtin/checkout.c:1289 +#: builtin/checkout.c msgid "only one reference expected" msgstr "預期只有一個引用" -#: builtin/checkout.c:1306 +#: builtin/checkout.c #, c-format msgid "only one reference expected, %d given." msgstr "應只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c:1352 builtin/worktree.c:338 builtin/worktree.c:508 +#: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c:1365 builtin/checkout.c:1744 +#: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一個樹：%s" -#: builtin/checkout.c:1413 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一個分支，得到標籤 '%s'" -#: builtin/checkout.c:1415 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一個分支，得到遠端分支 '%s'" -#: builtin/checkout.c:1417 builtin/checkout.c:1426 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一個分支，得到 '%s'" -#: builtin/checkout.c:1420 +#: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一個分支，得到提交 '%s'" -#: builtin/checkout.c:1429 +#: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "若您想要分離提交的 HEAD，請傳入 --detach 選項重試。" -#: builtin/checkout.c:1442 +#: builtin/checkout.c msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -12748,7 +4433,7 @@ msgstr "" "不能在合併時切換分支\n" "考慮使用 \"git merge --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1446 +#: builtin/checkout.c msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -12756,7 +4441,7 @@ msgstr "" "不能在 am 工作階段期間切換分支\n" "考慮使用 \"git am --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1450 +#: builtin/checkout.c msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -12764,7 +4449,7 @@ msgstr "" "不能在重定基底時切換分支\n" "考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1454 +#: builtin/checkout.c msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -12772,7 +4457,7 @@ msgstr "" "不能在揀選時切換分支\n" "考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1458 +#: builtin/checkout.c msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -12780,235 +4465,236 @@ msgstr "" "不能在還原時切換分支\n" "考慮使用 \"git revert --quit\" 或 \"git worktree add\"。" -#: builtin/checkout.c:1462 +#: builtin/checkout.c msgid "you are switching branch while bisecting" msgstr "您在執行二分搜尋時切換分支" -#: builtin/checkout.c:1469 +#: builtin/checkout.c msgid "paths cannot be used with switching branches" msgstr "路徑不能和切換分支同時使用" -#: builtin/checkout.c:1472 builtin/checkout.c:1476 builtin/checkout.c:1480 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切換分支同時使用" -#: builtin/checkout.c:1484 builtin/checkout.c:1487 builtin/checkout.c:1490 -#: builtin/checkout.c:1495 builtin/checkout.c:1500 +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同時使用" -#: builtin/checkout.c:1497 +#: builtin/checkout.c #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' 不帶 <起始點>" -#: builtin/checkout.c:1505 +#: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切換分支到一個非提交 '%s'" -#: builtin/checkout.c:1512 +#: builtin/checkout.c msgid "missing branch or commit argument" msgstr "缺少分支或提交參數" -#: builtin/checkout.c:1555 +#: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "和新的分支執行三方合併" -#: builtin/checkout.c:1556 builtin/log.c:1844 parse-options.h:354 +#: builtin/checkout.c builtin/log.c parse-options.h msgid "style" msgstr "風格" -#: builtin/checkout.c:1557 +#: builtin/checkout.c msgid "conflict style (merge, diff3, or zdiff3)" msgstr "衝突輸出風格（merge、diff3 或 zdiff3）" -#: builtin/checkout.c:1569 builtin/worktree.c:560 +#: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" msgstr "HEAD 從指定的提交分離" -#: builtin/checkout.c:1574 +#: builtin/checkout.c msgid "force checkout (throw away local modifications)" msgstr "強制簽出（捨棄本機修改）" -#: builtin/checkout.c:1576 +#: builtin/checkout.c msgid "new-branch" msgstr "新分支" -#: builtin/checkout.c:1576 +#: builtin/checkout.c msgid "new unparented branch" msgstr "新的沒有父提交的分支" -#: builtin/checkout.c:1578 builtin/merge.c:305 +#: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" msgstr "更新忽略的檔案（預設）" -#: builtin/checkout.c:1581 +#: builtin/checkout.c msgid "do not check if another worktree is holding the given ref" msgstr "不檢查指定的引用是否被其他工作區所占用" -#: builtin/checkout.c:1594 +#: builtin/checkout.c msgid "checkout our version for unmerged files" msgstr "對尚未合併的檔案簽出我們的版本" -#: builtin/checkout.c:1597 +#: builtin/checkout.c msgid "checkout their version for unmerged files" msgstr "對尚未合併的檔案簽出他們的版本" -#: builtin/checkout.c:1601 +#: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" msgstr "對路徑不做稀疏簽出的限制" -#: builtin/checkout.c:1659 +#: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "「-%c」、「-%c」和「%s」選項不得同時使用" -#: builtin/checkout.c:1700 +#: builtin/checkout.c msgid "--track needs a branch name" msgstr "--track 需要一個分支名" -#: builtin/checkout.c:1705 +#: builtin/checkout.c #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名稱，請嘗試 -%c" -#: builtin/checkout.c:1737 +#: builtin/checkout.c #, c-format msgid "could not resolve %s" msgstr "無法解析 %s" -#: builtin/checkout.c:1753 +#: builtin/checkout.c msgid "invalid path specification" msgstr "無效的路徑規格" -#: builtin/checkout.c:1760 +#: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'" -#: builtin/checkout.c:1764 +#: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路徑參數 '%s'" -#: builtin/checkout.c:1789 +#: builtin/checkout.c msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。" -#: builtin/checkout.c:1794 +#: builtin/checkout.c msgid "you must specify path(s) to restore" msgstr "您必須指定一個要復原的路徑" -#: builtin/checkout.c:1819 builtin/checkout.c:1821 builtin/checkout.c:1873 -#: builtin/checkout.c:1875 builtin/clone.c:130 builtin/remote.c:171 -#: builtin/remote.c:173 builtin/submodule--helper.c:3038 -#: builtin/submodule--helper.c:3371 builtin/worktree.c:556 -#: builtin/worktree.c:558 +#: builtin/checkout.c builtin/clone.c builtin/remote.c +#: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "分支" -#: builtin/checkout.c:1820 +#: builtin/checkout.c msgid "create and checkout a new branch" msgstr "建立並簽出一個新的分支" -#: builtin/checkout.c:1822 +#: builtin/checkout.c msgid "create/reset and checkout a branch" msgstr "建立/重設並簽出一個分支" -#: builtin/checkout.c:1823 +#: builtin/checkout.c msgid "create reflog for new branch" msgstr "為新的分支建立引用日誌" -#: builtin/checkout.c:1825 +#: builtin/checkout.c msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "二次猜測 'git checkout <無此分支>'（預設）" -#: builtin/checkout.c:1826 +#: builtin/checkout.c msgid "use overlay mode (default)" msgstr "使用疊加模式（預設）" -#: builtin/checkout.c:1874 +#: builtin/checkout.c msgid "create and switch to a new branch" msgstr "建立並切換一個新分支" -#: builtin/checkout.c:1876 +#: builtin/checkout.c msgid "create/reset and switch to a branch" msgstr "建立/重設並切換一個分支" -#: builtin/checkout.c:1878 +#: builtin/checkout.c msgid "second guess 'git switch <no-such-branch>'" msgstr "二次猜測 'git switch <無此分支>'" -#: builtin/checkout.c:1880 +#: builtin/checkout.c msgid "throw away local modifications" msgstr "捨棄本機修改" -#: builtin/checkout.c:1916 +#: builtin/checkout.c msgid "which tree-ish to checkout from" msgstr "要簽出哪一個樹" -#: builtin/checkout.c:1918 +#: builtin/checkout.c msgid "restore the index" msgstr "復原索引" -#: builtin/checkout.c:1920 +#: builtin/checkout.c msgid "restore the working tree (default)" msgstr "復原工作區（預設）" -#: builtin/checkout.c:1922 +#: builtin/checkout.c msgid "ignore unmerged entries" msgstr "忽略未合併條目" -#: builtin/checkout.c:1923 +#: builtin/checkout.c msgid "use overlay mode" msgstr "使用疊加模式" -#: builtin/clean.c:29 +#: builtin/clean.c msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路徑>..." -#: builtin/clean.c:33 +#: builtin/clean.c #, c-format msgid "Removing %s\n" msgstr "正刪除 %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c #, c-format msgid "Would remove %s\n" msgstr "將刪除 %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c #, c-format msgid "Skipping repository %s\n" msgstr "忽略版本庫 %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c #, c-format msgid "Would skip repository %s\n" msgstr "將忽略版本庫 %s\n" -#: builtin/clean.c:38 +#: builtin/clean.c midx.c +#, c-format +msgid "failed to remove %s" +msgstr "刪除 %s 失敗" + +#: builtin/clean.c #, c-format msgid "could not lstat %s\n" msgstr "不能對 %s 呼叫 lstat\n" -#: builtin/clean.c:39 +#: builtin/clean.c msgid "Refusing to remove current working directory\n" msgstr "拒絕移除目前工作目錄\n" -#: builtin/clean.c:40 +#: builtin/clean.c msgid "Would refuse to remove current working directory\n" msgstr "會拒絕移除目前的工作目錄\n" -#: builtin/clean.c:326 git-add--interactive.perl:593 +#: builtin/clean.c git-add--interactive.perl #, c-format msgid "" "Prompt help:\n" @@ -13021,7 +4707,7 @@ msgstr "" "foo - 透過唯一前綴選擇一個選項\n" " - （空）什麼也不選擇\n" -#: builtin/clean.c:330 git-add--interactive.perl:602 +#: builtin/clean.c git-add--interactive.perl #, c-format msgid "" "Prompt help:\n" @@ -13042,33 +4728,32 @@ msgstr "" "* - 選擇所有選項\n" " - （空）結束選擇\n" -#: builtin/clean.c:545 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c git-add--interactive.perl #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" -#: builtin/clean.c:685 +#: builtin/clean.c #, c-format msgid "Input ignore patterns>> " msgstr "輸入範本以排除條目>> " -#: builtin/clean.c:719 +#: builtin/clean.c #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：無法找到和 %s 符合的條目" -#: builtin/clean.c:740 +#: builtin/clean.c msgid "Select items to delete" msgstr "選擇要刪除的條目" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:781 +#: builtin/clean.c #, c-format msgid "Remove %s [y/N]? " msgstr "移除 %s [y/N]？ " -#: builtin/clean.c:812 +#: builtin/clean.c msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -13086,274 +4771,272 @@ msgstr "" "help - 顯示本協助\n" "? - 顯示如何在提示符下選擇的協助" -#: builtin/clean.c:848 +#: builtin/clean.c msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "將刪除如下條目：" -#: builtin/clean.c:864 +#: builtin/clean.c msgid "No more files to clean, exiting." msgstr "沒有要清理的檔案，離開。" -#: builtin/clean.c:926 +#: builtin/clean.c msgid "do not print names of files removed" msgstr "不列印刪除檔案的名稱" -#: builtin/clean.c:928 +#: builtin/clean.c msgid "force" msgstr "強制" -#: builtin/clean.c:929 +#: builtin/clean.c msgid "interactive cleaning" msgstr "互動式清除" -#: builtin/clean.c:931 +#: builtin/clean.c msgid "remove whole directories" msgstr "刪除整個目錄" -#: builtin/clean.c:932 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:938 builtin/log.c:185 builtin/log.c:187 -#: builtin/ls-files.c:651 builtin/name-rev.c:585 builtin/name-rev.c:587 -#: builtin/show-ref.c:179 +#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c +#: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c msgid "pattern" msgstr "模式" -#: builtin/clean.c:933 +#: builtin/clean.c msgid "add <pattern> to ignore rules" msgstr "新增 <模式> 到忽略規則" -#: builtin/clean.c:934 +#: builtin/clean.c msgid "remove ignored files, too" msgstr "也刪除忽略的檔案" -#: builtin/clean.c:936 +#: builtin/clean.c msgid "remove only ignored files" msgstr "只刪除忽略的檔案" -#: builtin/clean.c:951 +#: builtin/clean.c msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 設定為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:954 +#: builtin/clean.c msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 預設為 true 且未提供 -i、-n 或 -f 選項，拒絕執行清理動作" -#: builtin/clean.c:966 +#: builtin/clean.c msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同時使用" -#: builtin/clone.c:47 +#: builtin/clone.c msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/clone.c:100 +#: builtin/clone.c msgid "don't clone shallow repository" msgstr "不要複製淺版本庫" -#: builtin/clone.c:102 +#: builtin/clone.c msgid "don't create a checkout" msgstr "不建立一個簽出" -#: builtin/clone.c:103 builtin/clone.c:105 builtin/init-db.c:542 +#: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "建立一個純版本庫" -#: builtin/clone.c:107 +#: builtin/clone.c msgid "create a mirror repository (implies bare)" msgstr "建立一個鏡像版本庫（也是純版本庫）" -#: builtin/clone.c:109 +#: builtin/clone.c msgid "to clone from a local repository" msgstr "從本機版本庫複製" -#: builtin/clone.c:111 +#: builtin/clone.c msgid "don't use local hardlinks, always copy" msgstr "不使用本機硬連結，始終複製" -#: builtin/clone.c:113 +#: builtin/clone.c msgid "setup as shared repository" msgstr "設定為共享版本庫" -#: builtin/clone.c:115 +#: builtin/clone.c msgid "pathspec" msgstr "路徑規格" -#: builtin/clone.c:115 +#: builtin/clone.c msgid "initialize submodules in the clone" msgstr "在複製時初始化子模組" -#: builtin/clone.c:119 +#: builtin/clone.c msgid "number of submodules cloned in parallel" msgstr "並行複製的子模組數" -#: builtin/clone.c:120 builtin/init-db.c:539 +#: builtin/clone.c builtin/init-db.c msgid "template-directory" msgstr "範本目錄" -#: builtin/clone.c:121 builtin/init-db.c:540 +#: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" msgstr "範本目錄將被使用" -#: builtin/clone.c:123 builtin/clone.c:125 builtin/submodule--helper.c:1885 -#: builtin/submodule--helper.c:2719 builtin/submodule--helper.c:3378 +#: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "引用版本庫" -#: builtin/clone.c:127 builtin/submodule--helper.c:1887 -#: builtin/submodule--helper.c:2721 +#: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "僅在複製時參考 --reference 指向的本機版本庫" -#: builtin/clone.c:128 builtin/column.c:27 builtin/fmt-merge-msg.c:27 -#: builtin/init-db.c:550 builtin/merge-file.c:48 builtin/merge.c:290 -#: builtin/pack-objects.c:3967 builtin/repack.c:669 -#: builtin/submodule--helper.c:3380 t/helper/test-simple-ipc.c:595 -#: t/helper/test-simple-ipc.c:597 +#: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c +#: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c +#: builtin/submodule--helper.c t/helper/test-simple-ipc.c msgid "name" msgstr "名稱" -#: builtin/clone.c:129 +#: builtin/clone.c msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游" -#: builtin/clone.c:131 +#: builtin/clone.c msgid "checkout <branch> instead of the remote's HEAD" msgstr "簽出 <分支> 而不是遠端 HEAD" -#: builtin/clone.c:133 +#: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "遠端 git-upload-pack 路徑" -#: builtin/clone.c:134 builtin/fetch.c:182 builtin/grep.c:877 -#: builtin/pull.c:212 +#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c msgid "depth" msgstr "深度" -#: builtin/clone.c:135 +#: builtin/clone.c msgid "create a shallow clone of that depth" msgstr "建立一個指定深度的淺複製" -#: builtin/clone.c:136 builtin/fetch.c:184 builtin/pack-objects.c:3956 -#: builtin/pull.c:215 +#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c msgid "time" msgstr "時間" -#: builtin/clone.c:137 +#: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "建立從指定時間到現在的淺複製" -#: builtin/clone.c:138 builtin/fetch.c:186 builtin/fetch.c:212 -#: builtin/pull.c:218 builtin/pull.c:243 builtin/rebase.c:1050 +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c msgid "revision" msgstr "修訂版" -#: builtin/clone.c:139 builtin/fetch.c:187 builtin/pull.c:219 +#: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding rev" msgstr "取得更多淺複製的過去歷史記錄，除了特定版本" -#: builtin/clone.c:141 builtin/submodule--helper.c:1897 -#: builtin/submodule--helper.c:2735 +#: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "只複製一個分支、HEAD 或 --branch" -#: builtin/clone.c:143 +#: builtin/clone.c msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要複製任何標籤，之後取得也不要追蹤這些標籤" -#: builtin/clone.c:145 +#: builtin/clone.c msgid "any cloned submodules will be shallow" msgstr "子模組將以淺下載模式複製" -#: builtin/clone.c:146 builtin/init-db.c:548 +#: builtin/clone.c builtin/init-db.c msgid "gitdir" msgstr "git目錄" -#: builtin/clone.c:147 builtin/init-db.c:549 +#: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" msgstr "git目錄和工作區分離" -#: builtin/clone.c:148 +#: builtin/clone.c msgid "key=value" msgstr "key=value" -#: builtin/clone.c:149 +#: builtin/clone.c msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77 -#: builtin/pull.c:234 builtin/push.c:575 builtin/send-pack.c:200 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "server-specific" msgstr "server-specific" -#: builtin/clone.c:151 builtin/fetch.c:207 builtin/ls-remote.c:77 -#: builtin/pull.c:235 builtin/push.c:575 builtin/send-pack.c:201 +#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c +#: builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "傳輸選項" -#: builtin/clone.c:152 builtin/fetch.c:208 builtin/pull.c:238 -#: builtin/push.c:576 +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c msgid "use IPv4 addresses only" msgstr "只使用 IPv4 位址" -#: builtin/clone.c:154 builtin/fetch.c:210 builtin/pull.c:241 -#: builtin/push.c:578 +#: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c msgid "use IPv6 addresses only" msgstr "只使用 IPv6 位址" -#: builtin/clone.c:158 +#: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "將部分複製過濾器套用至子模組" -#: builtin/clone.c:160 +#: builtin/clone.c msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何複製的子模組都將使用它們的遠端追蹤分支" -#: builtin/clone.c:162 +#: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案" -#: builtin/clone.c:237 +#: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為 '%s' 新增一個備用：%s\n" -#: builtin/clone.c:310 +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c +#, c-format +msgid "failed to stat '%s'" +msgstr "對 '%s' 呼叫 stat 失敗" + +#: builtin/clone.c #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一個目錄" -#: builtin/clone.c:328 +#: builtin/clone.c #, c-format msgid "failed to start iterator over '%s'" msgstr "無法在 '%s' 上啟動疊代器" -#: builtin/clone.c:359 +#: builtin/clone.c compat/precompose_utf8.c +#, c-format +msgid "failed to unlink '%s'" +msgstr "刪除 '%s' 失敗" + +#: builtin/clone.c #, c-format msgid "failed to create link '%s'" msgstr "建立連結 '%s' 失敗" -#: builtin/clone.c:363 +#: builtin/clone.c #, c-format msgid "failed to copy file to '%s'" msgstr "複製檔案至 '%s' 失敗" -#: builtin/clone.c:368 +#: builtin/clone.c #, c-format msgid "failed to iterate over '%s'" msgstr "無法在 '%s' 上疊代" -#: builtin/clone.c:395 +#: builtin/clone.c #, c-format msgid "done.\n" msgstr "完成。\n" -#: builtin/clone.c:409 +#: builtin/clone.c msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -13363,191 +5046,198 @@ msgstr "" "您可以透過 'git status' 檢查哪些已被簽出，然後使用指令\n" "'git restore --source=HEAD :/' 重試\n" -#: builtin/clone.c:486 +#: builtin/clone.c #, c-format msgid "Could not find remote branch %s to clone." msgstr "找不到要複製的遠端分支 %s。" -#: builtin/clone.c:603 +#: builtin/clone.c fetch-pack.c +msgid "remote did not send all necessary objects" +msgstr "遠端沒有傳送所有必需的物件" + +#: builtin/clone.c #, c-format msgid "unable to update %s" msgstr "不能更新 %s" -#: builtin/clone.c:651 +#: builtin/clone.c msgid "failed to initialize sparse-checkout" msgstr "無法初始化稀疏簽出" -#: builtin/clone.c:674 +#: builtin/clone.c msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n" -#: builtin/clone.c:709 +#: builtin/clone.c msgid "unable to checkout working tree" msgstr "不能簽出工作區" -#: builtin/clone.c:793 +#: builtin/clone.c msgid "unable to write parameters to config file" msgstr "無法將參數寫入設定檔案" -#: builtin/clone.c:856 +#: builtin/clone.c msgid "cannot repack to clean up" msgstr "無法執行 repack 來清理" -#: builtin/clone.c:858 +#: builtin/clone.c msgid "cannot unlink temporary alternates file" msgstr "無法刪除暫時的 alternates 檔案" -#: builtin/clone.c:901 +#: builtin/clone.c msgid "Too many arguments." msgstr "太多參數。" -#: builtin/clone.c:905 contrib/scalar/scalar.c:413 +#: builtin/clone.c contrib/scalar/scalar.c msgid "You must specify a repository to clone." msgstr "您必須指定要複製的版本庫。" -#: builtin/clone.c:918 +#: builtin/clone.c #, c-format msgid "options '%s' and '%s %s' cannot be used together" msgstr "「%s」和「%s %s」選項不得同時使用" -#: builtin/clone.c:935 +#: builtin/clone.c #, c-format msgid "repository '%s' does not exist" msgstr "版本庫 '%s' 不存在" -#: builtin/clone.c:939 builtin/fetch.c:2176 +#: builtin/clone.c builtin/fetch.c #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一個正數" -#: builtin/clone.c:949 +#: builtin/clone.c #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目的地路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:955 +#: builtin/clone.c #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" -#: builtin/clone.c:969 +#: builtin/clone.c #, c-format msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c:984 builtin/clone.c:1005 builtin/difftool.c:256 -#: builtin/log.c:2037 builtin/worktree.c:350 builtin/worktree.c:382 +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "不能為 '%s' 建立先導目錄" -#: builtin/clone.c:989 +#: builtin/clone.c #, c-format msgid "could not create work tree dir '%s'" msgstr "不能建立工作區目錄 '%s'" -#: builtin/clone.c:1009 +#: builtin/clone.c #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "複製到純版本庫 '%s'...\n" -#: builtin/clone.c:1011 +#: builtin/clone.c #, c-format msgid "Cloning into '%s'...\n" msgstr "正複製到 '%s'...\n" -#: builtin/clone.c:1040 +#: builtin/clone.c msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c:1116 builtin/remote.c:201 builtin/remote.c:721 +#: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" -#: builtin/clone.c:1157 +#: builtin/clone.c msgid "--depth is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --depth。請改用 file:// 通訊協定。" -#: builtin/clone.c:1159 +#: builtin/clone.c msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --shallow-since。請改用 file:// 協定。" -#: builtin/clone.c:1161 +#: builtin/clone.c msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// 協定。" -#: builtin/clone.c:1163 +#: builtin/clone.c msgid "--filter is ignored in local clones; use file:// instead." msgstr "本機複製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c:1168 +#: builtin/clone.c fetch-pack.c +msgid "source repository is shallow, reject to clone." +msgstr "來源版本庫是淺版本庫 (shallow)。拒絕複製。" + +#: builtin/clone.c msgid "source repository is shallow, ignoring --local" msgstr "來源版本庫是淺複製，忽略 --local" -#: builtin/clone.c:1173 +#: builtin/clone.c msgid "--local is ignored" msgstr "--local 被忽略" -#: builtin/clone.c:1185 +#: builtin/clone.c msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件複製" -#: builtin/clone.c:1265 builtin/clone.c:1324 +#: builtin/clone.c msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" -#: builtin/clone.c:1277 builtin/clone.c:1289 +#: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "遠端分支 %s 在上游 %s 未發現" -#: builtin/clone.c:1292 +#: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "您複製的版本庫似乎是空的。" -#: builtin/column.c:10 +#: builtin/column.c msgid "git column [<options>]" msgstr "git column [<選項>]" -#: builtin/column.c:27 +#: builtin/column.c msgid "lookup config vars" msgstr "尋找設定變數" -#: builtin/column.c:28 builtin/column.c:29 +#: builtin/column.c msgid "layout to use" msgstr "要使用的配置" -#: builtin/column.c:30 +#: builtin/column.c msgid "maximum width" msgstr "最大寬度" -#: builtin/column.c:31 +#: builtin/column.c msgid "padding space on left border" msgstr "左邊框的填充空間" -#: builtin/column.c:32 +#: builtin/column.c msgid "padding space on right border" msgstr "右邊框的填充空間" -#: builtin/column.c:33 +#: builtin/column.c msgid "padding space between columns" msgstr "兩直行之間的填充空間" -#: builtin/column.c:51 +#: builtin/column.c msgid "--command must be the first argument" msgstr "--command 必須是第一個參數" -#: builtin/commit-graph.c:13 +#: builtin/commit-graph.c 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:16 +#: builtin/commit-graph.c msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" @@ -13557,92 +5247,97 @@ msgstr "" "split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-" "paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>" -#: builtin/commit-graph.c:51 builtin/fetch.c:196 builtin/log.c:1813 +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c msgid "dir" msgstr "目錄" -#: builtin/commit-graph.c:52 +#: builtin/commit-graph.c msgid "the object directory to store the graph" msgstr "儲存圖形的物件目錄" -#: builtin/commit-graph.c:73 +#: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交圖形被分割，只驗證頭一個檔案" -#: builtin/commit-graph.c:100 +#: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" msgstr "無法開啟提交圖形 '%s'" -#: builtin/commit-graph.c:137 +#: builtin/commit-graph.c #, c-format msgid "unrecognized --split argument, %s" msgstr "無法識別的 --split 參數，%s" -#: builtin/commit-graph.c:150 +#: builtin/commit-graph.c #, c-format msgid "unexpected non-hex object ID: %s" msgstr "非期望的非十六進位物件 ID：%s" -#: builtin/commit-graph.c:155 +#: builtin/commit-graph.c #, c-format msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c:205 +#: builtin/commit-graph.c parse-options-cb.c +#, c-format +msgid "option `%s' expects a numerical value" +msgstr "選項 `%s' 期望一個數字值" + +#: builtin/commit-graph.c msgid "start walk at all refs" msgstr "開始遍歷所有引用" -#: builtin/commit-graph.c:207 +#: builtin/commit-graph.c msgid "scan pack-indexes listed by stdin for commits" msgstr "從標準輸入中的包索引檔案列表中掃描提交" -#: builtin/commit-graph.c:209 +#: builtin/commit-graph.c msgid "start walk at commits listed by stdin" msgstr "從標準輸入中的提交開始掃描" -#: builtin/commit-graph.c:211 +#: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 檔案中已有所有提交" -#: builtin/commit-graph.c:213 +#: builtin/commit-graph.c msgid "enable computation for changed paths" msgstr "啟用已變更路徑的計算" -#: builtin/commit-graph.c:215 +#: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" msgstr "允許寫一個增量提交圖形檔案" -#: builtin/commit-graph.c:219 +#: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本分割提交圖形中的最大提交數" -#: builtin/commit-graph.c:221 +#: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" msgstr "一個分割提交圖形的兩個級別之間的最大比率" -#: builtin/commit-graph.c:223 +#: builtin/commit-graph.c msgid "only expire files older than a given date-time" msgstr "只將舊於指定日期與時間的檔案設為過期" -#: builtin/commit-graph.c:225 +#: builtin/commit-graph.c msgid "maximum number of changed-path Bloom filters to compute" msgstr "變更路徑的布隆過濾器要計算的最大量" -#: builtin/commit-graph.c:251 +#: builtin/commit-graph.c msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs" -#: builtin/commit-graph.c:282 +#: builtin/commit-graph.c msgid "Collecting commits from input" msgstr "正在從輸入收集提交" -#: builtin/commit-graph.c:328 builtin/multi-pack-index.c:259 +#: builtin/commit-graph.c builtin/multi-pack-index.c #, c-format msgid "unrecognized subcommand: %s" msgstr "未識別的子指令：%s" -#: builtin/commit-tree.c:18 +#: builtin/commit-tree.c msgid "" "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F " "<file>)...] <tree>" @@ -13650,70 +5345,69 @@ msgstr "" "git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <檔案" ">)...] <樹>" -#: builtin/commit-tree.c:31 +#: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" msgstr "忽略重複的父提交 %s" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:134 builtin/log.c:590 +#: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" -#: builtin/commit-tree.c:94 +#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree：無法讀取 '%s'" -#: builtin/commit-tree.c:96 +#: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree：無法關閉 '%s'" -#: builtin/commit-tree.c:109 +#: builtin/commit-tree.c msgid "parent" msgstr "父提交" -#: builtin/commit-tree.c:110 +#: builtin/commit-tree.c msgid "id of a parent commit object" msgstr "父提交物件 ID" -#: builtin/commit-tree.c:112 builtin/commit.c:1626 builtin/merge.c:284 -#: builtin/notes.c:407 builtin/notes.c:573 builtin/stash.c:1666 -#: builtin/tag.c:455 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c msgid "message" msgstr "訊息" -#: builtin/commit-tree.c:113 builtin/commit.c:1626 +#: builtin/commit-tree.c builtin/commit.c msgid "commit message" msgstr "提交說明" -#: builtin/commit-tree.c:116 +#: builtin/commit-tree.c msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c:119 builtin/commit.c:1643 builtin/merge.c:303 -#: builtin/pull.c:180 builtin/revert.c:118 +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "GPG sign commit" msgstr "GPG 提交簽名" -#: builtin/commit-tree.c:131 +#: builtin/commit-tree.c msgid "must give exactly one tree" msgstr "必須精確地提供一個樹" -#: builtin/commit-tree.c:138 +#: builtin/commit-tree.c msgid "git commit-tree: failed to read" msgstr "git commit-tree：讀取失敗" -#: builtin/commit.c:43 +#: builtin/commit.c msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<選項>] [--] <路徑規格>..." -#: builtin/commit.c:48 +#: builtin/commit.c msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<選項>] [--] <路徑規格>..." -#: builtin/commit.c:53 +#: builtin/commit.c msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -13722,7 +5416,7 @@ msgstr "" "您要修補最近的提交，但這麼做會讓它成為空提交。您可以重複您的指令並帶上\n" "--allow-empty 選項，或者您可用指令 \"git reset HEAD^\" 整個刪除該提交。\n" -#: builtin/commit.c:58 +#: builtin/commit.c msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -13736,15 +5430,15 @@ msgstr "" " git commit --allow-empty\n" "\n" -#: builtin/commit.c:65 +#: builtin/commit.c msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "否則，請使用 'git rebase --skip'\n" -#: builtin/commit.c:68 +#: builtin/commit.c msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "否則，請使用 'git cherry-pick --skip'\n" -#: builtin/commit.c:71 +#: builtin/commit.c msgid "" "and then use:\n" "\n" @@ -13765,111 +5459,121 @@ msgstr "" " git cherry-pick --skip\n" "\n" -#: builtin/commit.c:326 +#: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "解包 HEAD 樹狀物件失敗" -#: builtin/commit.c:376 +#: builtin/commit.c msgid "No paths with --include/--only does not make sense." msgstr "參數 --include/--only 不跟路徑沒有意義。" -#: builtin/commit.c:388 +#: builtin/commit.c msgid "unable to create temporary index" msgstr "不能建立暫時索引" -#: builtin/commit.c:397 +#: builtin/commit.c msgid "interactive add failed" msgstr "互動式新增失敗" -#: builtin/commit.c:412 +#: builtin/commit.c msgid "unable to update temporary index" msgstr "無法更新暫時索引" -#: builtin/commit.c:414 +#: builtin/commit.c msgid "Failed to update main cache tree" msgstr "不能更新樹的主快取" -#: builtin/commit.c:439 builtin/commit.c:462 builtin/commit.c:510 +#: builtin/commit.c msgid "unable to write new_index file" msgstr "無法寫 new_index 檔案" -#: builtin/commit.c:491 +#: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "在合併過程中不能做部分提交。" -#: builtin/commit.c:493 +#: builtin/commit.c msgid "cannot do a partial commit during a cherry-pick." msgstr "在揀選過程中不能做部分提交。" -#: builtin/commit.c:495 +#: builtin/commit.c msgid "cannot do a partial commit during a rebase." msgstr "在重定基底過程中不能做部分提交。" -#: builtin/commit.c:503 +#: builtin/commit.c msgid "cannot read the index" msgstr "無法讀取索引" -#: builtin/commit.c:522 +#: builtin/commit.c msgid "unable to write temporary index file" msgstr "無法寫暫時索引檔案" -#: builtin/commit.c:620 +#: builtin/commit.c #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者訊息" -#: builtin/commit.c:622 +#: builtin/commit.c #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式錯誤的作者訊息" -#: builtin/commit.c:641 +#: builtin/commit.c msgid "malformed --author parameter" msgstr "格式錯誤的 --author 參數" -#: builtin/commit.c:694 +#: builtin/commit.c ident.c +#, c-format +msgid "invalid date format: %s" +msgstr "無效的日期格式：%s" + +#: builtin/commit.c msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c:750 builtin/commit.c:784 builtin/commit.c:1170 +#: builtin/commit.c #, c-format msgid "could not lookup commit %s" msgstr "不能查詢提交 %s" -#: builtin/commit.c:762 builtin/shortlog.c:417 +#: builtin/commit.c builtin/shortlog.c #, c-format msgid "(reading log message from standard input)\n" msgstr "（正從標準輸入中讀取日誌訊息）\n" -#: builtin/commit.c:764 +#: builtin/commit.c msgid "could not read log from standard input" msgstr "不能從標準輸入中讀取日誌訊息" -#: builtin/commit.c:768 +#: builtin/commit.c #, c-format msgid "could not read log file '%s'" msgstr "不能讀取日誌檔案 '%s'" -#: builtin/commit.c:805 +#: builtin/commit.c #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "「%s」和「%s:%s」選項不得同時使用" -#: builtin/commit.c:817 builtin/commit.c:833 +#: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "不能讀取 SQUASH_MSG" -#: builtin/commit.c:824 +#: builtin/commit.c msgid "could not read MERGE_MSG" msgstr "不能讀取 MERGE_MSG" -#: builtin/commit.c:884 +#: builtin/commit.c bundle.c rerere.c sequencer.c +#, c-format +msgid "could not open '%s'" +msgstr "不能開啟 '%s'" + +#: builtin/commit.c msgid "could not write commit template" msgstr "不能寫提交範本" -#: builtin/commit.c:897 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13878,7 +5582,7 @@ msgstr "" "請輸入描述您變更的提交訊息。\n" "開頭是「%c」的行皆會忽略。\n" -#: builtin/commit.c:899 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13887,7 +5591,7 @@ msgstr "" "請輸入描述您變更的提交訊息。開頭是「%c」\n" "的行皆會忽略。提交訊息空白則取消本次提交作業。\n" -#: builtin/commit.c:903 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13896,7 +5600,7 @@ msgstr "" "請輸入描述您變更的提交訊息。會保留開頭是「%c」\n" "的行，但也可以自己移除掉這些行。\n" -#: builtin/commit.c:907 +#: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -13907,7 +5611,7 @@ msgstr "" "「%c」的行，但也可以自己移除掉這些行。\n" "提交訊息空白則取消本次提交作業。\n" -#: builtin/commit.c:919 +#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a merge.\n" @@ -13921,7 +5625,7 @@ msgstr "" "\tgit update-ref -d MERGE_HEAD\n" "後重試。\n" -#: builtin/commit.c:924 +#: builtin/commit.c msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" @@ -13936,147 +5640,144 @@ msgstr "" "後重試。\n" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:951 +#: builtin/commit.c #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:959 +#: builtin/commit.c #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#: builtin/commit.c:966 +#: builtin/commit.c #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" -#: builtin/commit.c:984 +#: builtin/commit.c msgid "Cannot read index" msgstr "無法讀取索引" -#: builtin/commit.c:1029 +#: builtin/commit.c msgid "unable to pass trailers to --trailers" msgstr "無法將尾部署名傳遞至 --trailers" -#: builtin/commit.c:1069 +#: builtin/commit.c msgid "Error building trees" msgstr "無法建立樹狀物件" -#: builtin/commit.c:1083 builtin/tag.c:317 +#: builtin/commit.c builtin/tag.c #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "請使用 -m 或 -F 選項提供提交說明。\n" -#: builtin/commit.c:1128 +#: builtin/commit.c #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者中找到符合" -#: builtin/commit.c:1142 +#: builtin/commit.c #, c-format msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c:1160 builtin/commit.c:1450 +#: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" -#: builtin/commit.c:1231 +#: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." msgstr "正在合併中——不能重新輸入。" -#: builtin/commit.c:1233 +#: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "正在揀選中——不能重新輸入。" -#: builtin/commit.c:1236 +#: builtin/commit.c #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "「%s」的改寫選項和「%s」路徑不得同時使用" -#: builtin/commit.c:1238 +#: builtin/commit.c #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "「%s」的改寫選項和「%s」不得同時使用" -#: builtin/commit.c:1263 +#: builtin/commit.c msgid "You have nothing to amend." msgstr "您沒有可修補的提交。" -#: builtin/commit.c:1266 +#: builtin/commit.c msgid "You are in the middle of a merge -- cannot amend." msgstr "您正處於一個合併過程中 -- 無法修補提交。" -#: builtin/commit.c:1268 +#: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正處於一個揀選過程中 -- 無法修補提交。" -#: builtin/commit.c:1270 +#: builtin/commit.c msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正處於重定基底的過程中 -- 無法修訂。" -#: builtin/commit.c:1290 +#: builtin/commit.c msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同時使用。" -#: builtin/commit.c:1337 +#: builtin/commit.c #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知選項：--fixup=%s:%s" -#: builtin/commit.c:1354 +#: builtin/commit.c #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c:1485 builtin/commit.c:1654 +#: builtin/commit.c msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c:1487 builtin/commit.c:1656 +#: builtin/commit.c msgid "show branch information" msgstr "顯示分支訊息" -#: builtin/commit.c:1489 +#: builtin/commit.c msgid "show stash information" msgstr "顯示儲藏區訊息" -#: builtin/commit.c:1491 builtin/commit.c:1658 +#: builtin/commit.c msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" -#: builtin/commit.c:1493 +#: builtin/commit.c msgid "version" msgstr "版本" -#: builtin/commit.c:1493 builtin/commit.c:1660 builtin/push.c:551 -#: builtin/worktree.c:765 +#: builtin/commit.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c:1496 builtin/commit.c:1662 +#: builtin/commit.c msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設）" -#: builtin/commit.c:1499 builtin/commit.c:1665 +#: builtin/commit.c msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c:1501 builtin/commit.c:1505 builtin/commit.c:1668 -#: builtin/fast-export.c:1172 builtin/fast-export.c:1175 -#: builtin/fast-export.c:1178 builtin/rebase.c:1139 parse-options.h:368 +#: builtin/commit.c builtin/fast-export.c builtin/rebase.c parse-options.h msgid "mode" msgstr "模式" -#: builtin/commit.c:1502 builtin/commit.c:1668 +#: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" -#: builtin/commit.c:1506 +#: builtin/commit.c msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -14084,201 +5785,204 @@ msgstr "" "顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值：" "traditional）" -#: builtin/commit.c:1508 parse-options.h:197 +#: builtin/commit.c parse-options.h msgid "when" msgstr "何時" -#: builtin/commit.c:1509 +#: builtin/commit.c msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）" -#: builtin/commit.c:1511 +#: builtin/commit.c msgid "list untracked files in columns" msgstr "以列的方式顯示未追蹤的檔案" -#: builtin/commit.c:1512 +#: builtin/commit.c msgid "do not detect renames" msgstr "不檢測重新命名" -#: builtin/commit.c:1514 +#: builtin/commit.c msgid "detect renames, optionally set similarity index" msgstr "檢測重新命名，可以設定索引相似度" -#: builtin/commit.c:1537 +#: builtin/commit.c msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支援已忽略和未追蹤檔案參數的組合" -#: builtin/commit.c:1619 +#: builtin/commit.c msgid "suppress summary after successful commit" msgstr "提交成功後不顯示概述訊息" -#: builtin/commit.c:1620 +#: builtin/commit.c msgid "show diff in commit message template" msgstr "在提交說明範本裡顯示差異" -#: builtin/commit.c:1622 +#: builtin/commit.c msgid "Commit message options" msgstr "提交說明選項" -#: builtin/commit.c:1623 builtin/merge.c:288 builtin/tag.c:457 +#: builtin/commit.c builtin/merge.c builtin/tag.c msgid "read message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit.c:1624 +#: builtin/commit.c msgid "author" msgstr "作者" -#: builtin/commit.c:1624 +#: builtin/commit.c msgid "override author for commit" msgstr "提交時覆蓋作者" -#: builtin/commit.c:1625 builtin/gc.c:551 +#: builtin/commit.c builtin/gc.c msgid "date" msgstr "日期" -#: builtin/commit.c:1625 +#: builtin/commit.c msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c:1627 builtin/commit.c:1628 builtin/commit.c:1634 -#: parse-options.h:360 ref-filter.h:89 +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" -#: builtin/commit.c:1627 +#: builtin/commit.c msgid "reuse and edit message from specified commit" msgstr "重用並編輯指定提交的提交說明" -#: builtin/commit.c:1628 +#: builtin/commit.c msgid "reuse message from specified commit" msgstr "重用指定提交的提交說明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate <commit>. #. -#: builtin/commit.c:1633 +#: builtin/commit.c msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]commit" -#: builtin/commit.c:1633 +#: builtin/commit.c msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用 autosquash 格式化後的說明來 fixup 或是 amend/reword 指定提交" -#: builtin/commit.c:1634 +#: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" -#: builtin/commit.c:1635 +#: builtin/commit.c msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c:1636 builtin/interpret-trailers.c:111 +#: builtin/commit.c builtin/interpret-trailers.c msgid "trailer" msgstr "尾部署名" -#: builtin/commit.c:1636 +#: builtin/commit.c msgid "add custom trailer(s)" msgstr "加入自訂尾部署名" -#: builtin/commit.c:1637 builtin/log.c:1788 builtin/merge.c:306 -#: builtin/pull.c:146 builtin/revert.c:110 +#: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "在結尾加入 Signed-off-by" -#: builtin/commit.c:1638 +#: builtin/commit.c msgid "use specified template file" msgstr "使用指定的範本檔案" -#: builtin/commit.c:1639 +#: builtin/commit.c msgid "force edit of commit" msgstr "強制編輯提交" -#: builtin/commit.c:1641 +#: builtin/commit.c msgid "include status in commit message template" msgstr "在提交說明範本裡包含狀態訊息" -#: builtin/commit.c:1646 +#: builtin/commit.c msgid "Commit contents options" msgstr "提交內容選項" -#: builtin/commit.c:1647 +#: builtin/commit.c msgid "commit all changed files" msgstr "提交所有改動的檔案" -#: builtin/commit.c:1648 +#: builtin/commit.c msgid "add specified files to index for commit" msgstr "新增指定的檔案到索引區等待提交" -#: builtin/commit.c:1649 +#: builtin/commit.c msgid "interactively add files" msgstr "互動式新增檔案" -#: builtin/commit.c:1650 +#: builtin/commit.c msgid "interactively add changes" msgstr "互動式新增變更" -#: builtin/commit.c:1651 +#: builtin/commit.c msgid "commit only specified files" msgstr "只提交指定的檔案" -#: builtin/commit.c:1652 +#: builtin/commit.c msgid "bypass pre-commit and commit-msg hooks" msgstr "繞過 pre-commit 和 commit-msg 掛鉤" -#: builtin/commit.c:1653 +#: builtin/commit.c msgid "show what would be committed" msgstr "顯示將要提交的內容" -#: builtin/commit.c:1666 +#: builtin/commit.c msgid "amend previous commit" msgstr "修改先前的提交" -#: builtin/commit.c:1667 +#: builtin/commit.c msgid "bypass post-rewrite hook" msgstr "繞過 post-rewrite 掛鉤" -#: builtin/commit.c:1674 +#: builtin/commit.c msgid "ok to record an empty change" msgstr "允許一個空提交" -#: builtin/commit.c:1676 +#: builtin/commit.c msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c:1752 +#: builtin/commit.c sequencer.c +msgid "could not parse HEAD commit" +msgstr "不能解析 HEAD 提交" + +#: builtin/commit.c #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "損壞的 MERGE_HEAD 檔案（%s）" -#: builtin/commit.c:1759 +#: builtin/commit.c msgid "could not read MERGE_MODE" msgstr "不能讀取 MERGE_MODE" -#: builtin/commit.c:1780 +#: builtin/commit.c #, c-format msgid "could not read commit message: %s" msgstr "不能讀取提交說明：%s" -#: builtin/commit.c:1787 +#: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "終止提交因為提交說明為空。\n" -#: builtin/commit.c:1792 +#: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "終止提交；您未更改來自範本的提交說明。\n" -#: builtin/commit.c:1803 +#: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "提交說明內文空白，中止提交作業。\n" -#: builtin/commit.c:1839 +#: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -14287,227 +5991,232 @@ msgstr "" "版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n" "磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。" -#: builtin/config.c:11 +#: builtin/config.c msgid "git config [<options>]" msgstr "git config [<選項>]" -#: builtin/config.c:109 builtin/env--helper.c:27 +#: builtin/config.c builtin/env--helper.c #, c-format msgid "unrecognized --type argument, %s" msgstr "無法識別的 --type 參數，%s" -#: builtin/config.c:121 +#: builtin/config.c msgid "only one type at a time" msgstr "一次只能一個類型" -#: builtin/config.c:130 +#: builtin/config.c msgid "Config file location" msgstr "設定檔案位置" -#: builtin/config.c:131 +#: builtin/config.c msgid "use global config file" msgstr "使用全域設定檔案" -#: builtin/config.c:132 +#: builtin/config.c msgid "use system config file" msgstr "使用系統級設定檔案" -#: builtin/config.c:133 +#: builtin/config.c msgid "use repository config file" msgstr "使用版本庫級設定檔案" -#: builtin/config.c:134 +#: builtin/config.c msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c:135 +#: builtin/config.c msgid "use given config file" msgstr "使用指定的設定檔案" -#: builtin/config.c:136 +#: builtin/config.c msgid "blob-id" msgstr "資料物件 ID" -#: builtin/config.c:136 +#: builtin/config.c msgid "read config from given blob object" msgstr "從提供的資料物件讀取設定" -#: builtin/config.c:137 +#: builtin/config.c msgid "Action" msgstr "動作" -#: builtin/config.c:138 +#: builtin/config.c msgid "get value: name [value-pattern]" msgstr "取得值：name [value-pattern]" -#: builtin/config.c:139 +#: builtin/config.c msgid "get all values: key [value-pattern]" msgstr "取得所有值：key [value-pattern]" -#: builtin/config.c:140 +#: builtin/config.c msgid "get values for regexp: name-regex [value-pattern]" msgstr "根據常規表示式取得值：name-regex [value-pattern]" -#: builtin/config.c:141 +#: builtin/config.c msgid "get value specific for the URL: section[.var] URL" msgstr "獲得 URL 取值：section[.var] URL" -#: builtin/config.c:142 +#: builtin/config.c msgid "replace all matching variables: name value [value-pattern]" msgstr "取代所有符合的變數：name value [value-pattern]" -#: builtin/config.c:143 +#: builtin/config.c msgid "add a new variable: name value" msgstr "新增一個新的變數：name value" -#: builtin/config.c:144 +#: builtin/config.c msgid "remove a variable: name [value-pattern]" msgstr "移除一個變數：name [value-pattern]" -#: builtin/config.c:145 +#: builtin/config.c msgid "remove all matches: name [value-pattern]" msgstr "移除所有符合項目：name [value-pattern]" -#: builtin/config.c:146 +#: builtin/config.c msgid "rename section: old-name new-name" msgstr "重新命名小節：old-name new-name" -#: builtin/config.c:147 +#: builtin/config.c msgid "remove a section: name" msgstr "刪除一個小節：name" -#: builtin/config.c:148 +#: builtin/config.c msgid "list all" msgstr "全部列出" -#: builtin/config.c:149 +#: builtin/config.c msgid "use string equality when comparing values to 'value-pattern'" msgstr "比較「value-pattern」的值時，使用字串相等比較" -#: builtin/config.c:150 +#: builtin/config.c msgid "open an editor" msgstr "開啟一個編輯器" -#: builtin/config.c:151 +#: builtin/config.c msgid "find the color configured: slot [default]" msgstr "獲得設定的顏色：設定 [預設]" -#: builtin/config.c:152 +#: builtin/config.c msgid "find the color setting: slot [stdout-is-tty]" msgstr "獲得顏色設定：設定 [stdout-is-tty]" -#: builtin/config.c:153 +#: builtin/config.c msgid "Type" msgstr "類型" -#: builtin/config.c:154 builtin/env--helper.c:42 builtin/hash-object.c:97 +#: builtin/config.c builtin/env--helper.c builtin/hash-object.c msgid "type" msgstr "類型" -#: builtin/config.c:154 builtin/env--helper.c:43 +#: builtin/config.c builtin/env--helper.c msgid "value is given this type" msgstr "取值為該類型" -#: builtin/config.c:155 +#: builtin/config.c msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:156 +#: builtin/config.c msgid "value is decimal number" msgstr "值是十進位數" -#: builtin/config.c:157 +#: builtin/config.c msgid "value is --bool or --int" msgstr "值是 --bool or --int" -#: builtin/config.c:158 +#: builtin/config.c msgid "value is --bool or string" msgstr "值是 --bool 或 string" -#: builtin/config.c:159 +#: builtin/config.c msgid "value is a path (file or directory name)" msgstr "值是一個路徑（檔案或目錄名）" -#: builtin/config.c:160 +#: builtin/config.c msgid "value is an expiry date" msgstr "值是一個到期日期" -#: builtin/config.c:161 +#: builtin/config.c msgid "Other" msgstr "其它" -#: builtin/config.c:162 +#: builtin/config.c msgid "terminate values with NUL byte" msgstr "終止值是 NUL 位元組" -#: builtin/config.c:163 +#: builtin/config.c msgid "show variable names only" msgstr "只顯示變數名" -#: builtin/config.c:164 +#: builtin/config.c msgid "respect include directives on lookup" msgstr "查詢時參照 include 指令遞迴尋找" -#: builtin/config.c:165 +#: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）" -#: builtin/config.c:166 +#: builtin/config.c msgid "show scope of config (worktree, local, global, system, command)" msgstr "" "顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指" "令 command)" -#: builtin/config.c:167 builtin/env--helper.c:45 +#: builtin/config.c builtin/env--helper.c msgid "value" msgstr "取值" -#: builtin/config.c:167 +#: builtin/config.c msgid "with --get, use default value when missing entry" msgstr "使用 --get 但未指定參數時所使用的預設值" -#: builtin/config.c:181 +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "錯誤的參數個數，應該為 %d 個" -#: builtin/config.c:183 +#: builtin/config.c #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" -#: builtin/config.c:339 +#: builtin/config.c #, c-format msgid "invalid key pattern: %s" msgstr "無效鍵名模式：%s" -#: builtin/config.c:377 +#: builtin/config.c config.c +#, c-format +msgid "invalid pattern: %s" +msgstr "無效模式：%s" + +#: builtin/config.c #, c-format msgid "failed to format default config value: %s" msgstr "格式化預設設定值失敗：%s" -#: builtin/config.c:441 +#: builtin/config.c #, c-format msgid "cannot parse color '%s'" msgstr "無法解析顏色 '%s'" -#: builtin/config.c:483 +#: builtin/config.c msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c:536 builtin/config.c:833 +#: builtin/config.c msgid "not in a git directory" msgstr "不在 git 版本庫中" -#: builtin/config.c:539 +#: builtin/config.c msgid "writing to stdin is not supported" msgstr "不支援寫到標準輸入" -#: builtin/config.c:542 +#: builtin/config.c msgid "writing config blobs is not supported" msgstr "不支援寫到設定資料物件" -#: builtin/config.c:627 +#: builtin/config.c #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -14522,27 +6231,27 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:652 +#: builtin/config.c msgid "only one config file at a time" msgstr "一次只能有一個設定檔案" -#: builtin/config.c:658 +#: builtin/config.c msgid "--local can only be used inside a git repository" msgstr "--local 只能在一個版本庫內使用" -#: builtin/config.c:660 +#: builtin/config.c msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在一個版本庫內使用" -#: builtin/config.c:662 +#: builtin/config.c msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c:684 +#: builtin/config.c msgid "$HOME not set" msgstr "$HOME 未設定" -#: builtin/config.c:708 +#: builtin/config.c msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -14551,55 +6260,55 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c:743 +#: builtin/config.c msgid "--get-color and variable type are incoherent" msgstr "--get-color 和變數類型不相容" -#: builtin/config.c:748 +#: builtin/config.c msgid "only one action at a time" msgstr "一次只能有一個動作" -#: builtin/config.c:761 +#: builtin/config.c msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 僅適用於 --list 或 --get-regexp" -#: builtin/config.c:767 +#: builtin/config.c msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list" -#: builtin/config.c:773 +#: builtin/config.c msgid "--default is only applicable to --get" msgstr "--default 僅適用於 --get" -#: builtin/config.c:806 +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" -#: builtin/config.c:822 +#: builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c:825 +#: builtin/config.c msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" -#: builtin/config.c:835 +#: builtin/config.c msgid "editing stdin is not supported" msgstr "不支援編輯標準輸入" -#: builtin/config.c:837 +#: builtin/config.c msgid "editing blobs is not supported" msgstr "不支援編輯資料物件" -#: builtin/config.c:851 +#: builtin/config.c #, c-format msgid "cannot create configuration file %s" msgstr "不能建立設定檔案 %s" -#: builtin/config.c:864 +#: builtin/config.c #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -14608,16 +6317,16 @@ msgstr "" "無法用一個值覆蓋多個值\n" " 使用一個常規表示式、--add 或 --replace-all 來修改 %s。" -#: builtin/config.c:943 builtin/config.c:954 +#: builtin/config.c #, c-format msgid "no such section: %s" msgstr "無此小節：%s" -#: builtin/count-objects.c:100 +#: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "以使用者可讀的格式顯示大小" -#: builtin/credential-cache--daemon.c:227 +#: builtin/credential-cache--daemon.c #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" @@ -14630,69 +6339,69 @@ msgstr "" "\n" "\tchmod 0700 %s" -#: builtin/credential-cache--daemon.c:276 +#: builtin/credential-cache--daemon.c msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" -#: builtin/credential-cache--daemon.c:316 +#: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -#: builtin/credential-cache.c:180 +#: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 無法使用；缺少 unix socket 支援" -#: builtin/credential-store.c:66 +#: builtin/credential-store.c #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖" -#: builtin/describe.c:26 +#: builtin/describe.c msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<選項>] [<提交號>...]" -#: builtin/describe.c:27 +#: builtin/describe.c msgid "git describe [<options>] --dirty" msgstr "git describe [<選項>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c msgid "head" msgstr "HEAD" -#: builtin/describe.c:63 +#: builtin/describe.c msgid "lightweight" msgstr "輕量級的" -#: builtin/describe.c:63 +#: builtin/describe.c msgid "annotated" msgstr "附註的" -#: builtin/describe.c:277 +#: builtin/describe.c #, c-format msgid "annotated tag %s not available" msgstr "附註標籤 %s 無效" -#: builtin/describe.c:281 +#: builtin/describe.c #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "「%s」標籤在外部被認為是「%s」" -#: builtin/describe.c:328 +#: builtin/describe.c #, c-format msgid "no tag exactly matches '%s'" msgstr "沒有標籤準確符合 '%s'" -#: builtin/describe.c:330 +#: builtin/describe.c #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n" -#: builtin/describe.c:397 +#: builtin/describe.c #, c-format msgid "finished search at %s\n" msgstr "完成搜尋 %s\n" -#: builtin/describe.c:424 +#: builtin/describe.c #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -14701,7 +6410,7 @@ msgstr "" "沒有附註標籤能描述 '%s'。\n" "然而，存在未附註標籤：嘗試 --tags。" -#: builtin/describe.c:428 +#: builtin/describe.c #, c-format msgid "" "No tags can describe '%s'.\n" @@ -14710,12 +6419,12 @@ msgstr "" "沒有標籤能描述 '%s'。\n" "嘗試 --always，或者建立一些標籤。" -#: builtin/describe.c:458 +#: builtin/describe.c #, c-format msgid "traversed %lu commits\n" msgstr "已遍歷 %lu 個提交\n" -#: builtin/describe.c:461 +#: builtin/describe.c #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -14724,149 +6433,149 @@ msgstr "" "發現多於 %i 個標籤，列出最近的 %i 個\n" "在 %s 放棄搜尋\n" -#: builtin/describe.c:529 +#: builtin/describe.c #, c-format msgid "describe %s\n" msgstr "描述 %s\n" -#: builtin/describe.c:532 +#: builtin/describe.c #, c-format msgid "Not a valid object name %s" msgstr "不是一個有效的物件名 %s" -#: builtin/describe.c:540 +#: builtin/describe.c #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是資料物件" -#: builtin/describe.c:554 +#: builtin/describe.c msgid "find the tag that comes after the commit" msgstr "尋找該提交之後的標籤" -#: builtin/describe.c:555 +#: builtin/describe.c msgid "debug search strategy on stderr" msgstr "在標準錯誤上除錯搜尋策略" -#: builtin/describe.c:556 +#: builtin/describe.c msgid "use any ref" msgstr "使用任意引用" -#: builtin/describe.c:557 +#: builtin/describe.c msgid "use any tag, even unannotated" msgstr "使用任意標籤，即使未附帶備註" -#: builtin/describe.c:558 +#: builtin/describe.c msgid "always use long format" msgstr "始終使用長提交號格式" -#: builtin/describe.c:559 +#: builtin/describe.c msgid "only follow first parent" msgstr "只跟隨第一個父提交" -#: builtin/describe.c:562 +#: builtin/describe.c msgid "only output exact matches" msgstr "只輸出精確符合" -#: builtin/describe.c:564 +#: builtin/describe.c msgid "consider <n> most recent tags (default: 10)" msgstr "考慮最近 <n> 個標籤（預設值：10）" -#: builtin/describe.c:566 +#: builtin/describe.c msgid "only consider tags matching <pattern>" msgstr "只考慮符合 <模式> 的標籤" -#: builtin/describe.c:568 +#: builtin/describe.c msgid "do not consider tags matching <pattern>" msgstr "不考慮符合 <模式> 的標籤" -#: builtin/describe.c:570 builtin/name-rev.c:595 +#: builtin/describe.c builtin/name-rev.c msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c:571 builtin/describe.c:574 +#: builtin/describe.c msgid "mark" msgstr "標記" -#: builtin/describe.c:572 +#: builtin/describe.c msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）" -#: builtin/describe.c:575 +#: builtin/describe.c msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "對於損壞的工作區，追加 <標記>（預設值：”-broken\"）" -#: builtin/describe.c:622 +#: builtin/describe.c msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c:673 builtin/describe.c:675 +#: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "「%s」選項和提交號不得同時使用" -#: builtin/diff-tree.c:157 +#: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base 只對 2 個以上的提交有用" -#: builtin/diff.c:92 +#: builtin/diff.c #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一個正規檔案或符號連結" -#: builtin/diff.c:259 +#: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "無效選項：%s" -#: builtin/diff.c:376 +#: builtin/diff.c #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c:491 +#: builtin/diff.c msgid "Not a git repository" msgstr "不是一個 git 版本庫" -#: builtin/diff.c:537 builtin/grep.c:700 +#: builtin/diff.c builtin/grep.c #, c-format msgid "invalid object '%s' given." msgstr "提供了無效物件 '%s'。" -#: builtin/diff.c:548 +#: builtin/diff.c #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超過兩個資料物件：'%s'" -#: builtin/diff.c:553 +#: builtin/diff.c #, c-format msgid "unhandled object '%s' given." msgstr "無法處理的物件 '%s'。" -#: builtin/diff.c:587 +#: builtin/diff.c #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多個合併基底，使用 %s" -#: builtin/difftool.c:31 +#: builtin/difftool.c msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<選項>] [<提交> [<提交>]] [--] [<路徑>...]" -#: builtin/difftool.c:287 +#: builtin/difftool.c #, c-format msgid "could not read symlink %s" msgstr "無法讀取符號連結 %s" -#: builtin/difftool.c:289 +#: builtin/difftool.c #, c-format msgid "could not read symlink file %s" msgstr "無法讀取符號連結檔案 %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c #, c-format msgid "could not read object %s for symlink %s" msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s" -#: builtin/difftool.c:421 +#: builtin/difftool.c msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." @@ -14874,444 +6583,452 @@ msgstr "" "不支援在目錄比較模式（'-d' 和 '--dir-diff'）中\n" "採用組合差異格式（'-c' 和 '--cc'）。" -#: builtin/difftool.c:626 +#: builtin/difftool.c #, c-format msgid "both files modified: '%s' and '%s'." msgstr "兩個檔案都被修改：'%s' 和 '%s'。" -#: builtin/difftool.c:628 +#: builtin/difftool.c msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c:639 +#: builtin/difftool.c sequencer.c +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "不能複製 '%s' 至 '%s'" + +#: builtin/difftool.c #, c-format msgid "temporary files exist in '%s'." msgstr "暫存檔存在於 '%s'。" -#: builtin/difftool.c:640 +#: builtin/difftool.c msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者復原它們。" -#: builtin/difftool.c:645 +#: builtin/difftool.c #, c-format msgid "failed: %d" msgstr "失敗：%d" -#: builtin/difftool.c:690 +#: builtin/difftool.c msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" -#: builtin/difftool.c:692 +#: builtin/difftool.c msgid "perform a full-directory diff" msgstr "執行一個全目錄差異比較" -#: builtin/difftool.c:694 +#: builtin/difftool.c msgid "do not prompt before launching a diff tool" msgstr "啟動差異比較工具之前不提示" -#: builtin/difftool.c:699 +#: builtin/difftool.c msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符號連結" -#: builtin/difftool.c:700 +#: builtin/difftool.c msgid "tool" msgstr "工具" -#: builtin/difftool.c:701 +#: builtin/difftool.c msgid "use the specified diff tool" msgstr "使用指定的差異比較工具" -#: builtin/difftool.c:703 +#: builtin/difftool.c msgid "print a list of diff tools that may be used with `--tool`" msgstr "顯示可以用在 `--tool` 參數後的差異工具列表" -#: builtin/difftool.c:706 +#: builtin/difftool.c msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開" -#: builtin/difftool.c:709 +#: builtin/difftool.c msgid "specify a custom command for viewing diffs" msgstr "指定一個用於檢視差異的自訂指令" -#: builtin/difftool.c:710 +#: builtin/difftool.c msgid "passed to `diff`" msgstr "傳遞給 `diff`" -#: builtin/difftool.c:726 +#: builtin/difftool.c msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作區或者 --no-index" -#: builtin/difftool.c:745 +#: builtin/difftool.c msgid "no <tool> given for --tool=<tool>" msgstr "沒有為 --tool=<工具> 參數提供 <工具>" -#: builtin/difftool.c:752 +#: builtin/difftool.c msgid "no <cmd> given for --extcmd=<cmd>" msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>" -#: builtin/env--helper.c:6 +#: builtin/env--helper.c msgid "git env--helper --type=[bool|ulong] <options> <env-var>" msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>" -#: builtin/env--helper.c:46 +#: builtin/env--helper.c msgid "default for git_env_*(...) to fall back on" msgstr "git_env_*(...) 的預設值" -#: builtin/env--helper.c:48 +#: builtin/env--helper.c msgid "be quiet only use git_env_*() value as exit code" msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼" -#: builtin/env--helper.c:67 +#: builtin/env--helper.c #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」" -#: builtin/env--helper.c:82 +#: builtin/env--helper.c #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not `" "%s`" msgstr "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」" -#: builtin/fast-export.c:29 +#: builtin/fast-export.c msgid "git fast-export [<rev-list-opts>]" msgstr "git fast-export [<rev-list-opts>]" -#: builtin/fast-export.c:843 +#: builtin/fast-export.c msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。" -#: builtin/fast-export.c:1152 +#: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 的鍵不能空白" -#: builtin/fast-export.c:1171 +#: builtin/fast-export.c msgid "show progress after <n> objects" msgstr "在 <n> 個物件之後顯示進度" -#: builtin/fast-export.c:1173 +#: builtin/fast-export.c msgid "select handling of signed tags" msgstr "選擇如何處理簽名標籤" -#: builtin/fast-export.c:1176 +#: builtin/fast-export.c msgid "select handling of tags that tag filtered objects" msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式" -#: builtin/fast-export.c:1179 +#: builtin/fast-export.c msgid "select handling of commit messages in an alternate encoding" msgstr "選擇使用備用編碼處理提交說明" -#: builtin/fast-export.c:1182 +#: builtin/fast-export.c msgid "dump marks to this file" msgstr "把標記傾印到這個檔案" -#: builtin/fast-export.c:1184 +#: builtin/fast-export.c msgid "import marks from this file" msgstr "從這個檔案匯入標記" -#: builtin/fast-export.c:1188 +#: builtin/fast-export.c msgid "import marks from this file if it exists" msgstr "如果這個檔案存在，則從檔案匯入標記" -#: builtin/fast-export.c:1190 +#: builtin/fast-export.c msgid "fake a tagger when tags lack one" msgstr "當標籤缺少標記者欄位時假裝有一個" -#: builtin/fast-export.c:1192 +#: builtin/fast-export.c msgid "output full tree for each commit" msgstr "每次提交都輸出整棵樹" -#: builtin/fast-export.c:1194 +#: builtin/fast-export.c msgid "use the done feature to terminate the stream" msgstr "使用 done 功能終止串流" -#: builtin/fast-export.c:1195 +#: builtin/fast-export.c msgid "skip output of blob data" msgstr "略過資料物件資料的輸出" -#: builtin/fast-export.c:1196 builtin/log.c:1860 +#: builtin/fast-export.c builtin/log.c msgid "refspec" msgstr "引用規格" -#: builtin/fast-export.c:1197 +#: builtin/fast-export.c msgid "apply refspec to exported refs" msgstr "對匯出的引用套用引用規格" -#: builtin/fast-export.c:1198 +#: builtin/fast-export.c msgid "anonymize output" msgstr "匿名輸出" -#: builtin/fast-export.c:1199 +#: builtin/fast-export.c msgid "from:to" msgstr "from:to" -#: builtin/fast-export.c:1200 +#: builtin/fast-export.c msgid "convert <from> to <to> in anonymized output" msgstr "在匿名輸出中將 <from> 轉換為 <to>" -#: builtin/fast-export.c:1203 +#: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" msgstr "依物件 ID 引用不在 fast-export 串流中的父物件" -#: builtin/fast-export.c:1205 +#: builtin/fast-export.c msgid "show original object ids of blobs/commits" msgstr "顯示資料物件及提交的原始物件 ID" -#: builtin/fast-export.c:1207 +#: builtin/fast-export.c msgid "label tags with mark ids" msgstr "為包含標記 ID 的標籤打上標記" -#: builtin/fast-import.c:3097 +#: builtin/fast-import.c #, c-format msgid "Missing from marks for submodule '%s'" msgstr "「%s」子模組缺少 from 標記" -#: builtin/fast-import.c:3099 +#: builtin/fast-import.c #, c-format msgid "Missing to marks for submodule '%s'" msgstr "「%s」子模組缺少 to 標記" -#: builtin/fast-import.c:3234 +#: builtin/fast-import.c #, c-format msgid "Expected 'mark' command, got %s" msgstr "預期 'mark' 指令，得到 %s" -#: builtin/fast-import.c:3239 +#: builtin/fast-import.c #, c-format msgid "Expected 'to' command, got %s" msgstr "預期 'to' 指令，得到 %s" -#: builtin/fast-import.c:3331 +#: builtin/fast-import.c msgid "Expected format name:filename for submodule rewrite option" msgstr "期望子模組 rewrite 選項的格式是 name:filename" -#: builtin/fast-import.c:3386 +#: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能" -#: builtin/fetch-pack.c:246 +#: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" msgstr "已建立鎖定檔案，但尚未回報：%s" -#: builtin/fetch.c:36 +#: builtin/fetch.c msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/fetch.c:37 +#: builtin/fetch.c msgid "git fetch [<options>] <group>" msgstr "git fetch [<選項>] <組>" -#: builtin/fetch.c:38 +#: builtin/fetch.c msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]" -#: builtin/fetch.c:39 +#: builtin/fetch.c msgid "git fetch --all [<options>]" msgstr "git fetch --all [<選項>]" -#: builtin/fetch.c:124 +#: builtin/fetch.c msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能為負數" -#: builtin/fetch.c:147 builtin/pull.c:189 +#: builtin/fetch.c builtin/pull.c msgid "fetch from all remotes" msgstr "從所有的遠端抓取" -#: builtin/fetch.c:149 builtin/pull.c:249 +#: builtin/fetch.c builtin/pull.c msgid "set upstream for git pull/fetch" msgstr "為 git pull/fetch 設定上游" -#: builtin/fetch.c:151 builtin/pull.c:192 +#: builtin/fetch.c builtin/pull.c msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它" -#: builtin/fetch.c:153 +#: builtin/fetch.c msgid "use atomic transaction to update references" msgstr "使用 atomic 事務更新引用" -#: builtin/fetch.c:155 builtin/pull.c:195 +#: builtin/fetch.c builtin/pull.c msgid "path to upload pack on remote end" msgstr "上傳包到遠端的路徑" -#: builtin/fetch.c:156 +#: builtin/fetch.c msgid "force overwrite of local reference" msgstr "強制覆蓋本機引用" -#: builtin/fetch.c:158 +#: builtin/fetch.c msgid "fetch from multiple remotes" msgstr "從多個遠端抓取" -#: builtin/fetch.c:160 builtin/pull.c:199 +#: builtin/fetch.c builtin/pull.c msgid "fetch all tags and associated objects" msgstr "抓取所有的標籤和關聯物件" -#: builtin/fetch.c:162 +#: builtin/fetch.c msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何標籤(--no-tags)" -#: builtin/fetch.c:164 +#: builtin/fetch.c msgid "number of submodules fetched in parallel" msgstr "並行取得的子模組數量" -#: builtin/fetch.c:166 +#: builtin/fetch.c msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用規格 (refspec) 以便將所有引用 (refs) 放置在 refs/prefetch/ 中" -#: builtin/fetch.c:168 builtin/pull.c:202 +#: builtin/fetch.c builtin/pull.c msgid "prune remote-tracking branches no longer on remote" msgstr "清除遠端已經不存在的分支的追蹤分支" -#: builtin/fetch.c:170 +#: builtin/fetch.c msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c:171 builtin/fetch.c:199 builtin/pull.c:123 +#: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:172 +#: builtin/fetch.c msgid "control recursive fetching of submodules" msgstr "控制子模組的遞迴抓取" -#: builtin/fetch.c:177 +#: builtin/fetch.c msgid "write fetched references to the FETCH_HEAD file" msgstr "將取得的引用寫入 FETCH_HEAD 檔案" -#: builtin/fetch.c:178 builtin/pull.c:210 +#: builtin/fetch.c builtin/pull.c msgid "keep downloaded pack" msgstr "保持下載包" -#: builtin/fetch.c:180 +#: builtin/fetch.c msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c:183 builtin/fetch.c:189 builtin/pull.c:213 -#: builtin/pull.c:222 +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "取得淺複製的更多過去歷史記錄" -#: builtin/fetch.c:185 builtin/pull.c:216 +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow repository based on time" msgstr "基於時間來深化淺複製的歷史" -#: builtin/fetch.c:191 builtin/pull.c:225 +#: builtin/fetch.c builtin/pull.c msgid "convert to a complete repository" msgstr "轉換為一個完整的版本庫" -#: builtin/fetch.c:194 +#: builtin/fetch.c msgid "re-fetch without negotiating common commits" msgstr "重新抓取而不協商共同提交" -#: builtin/fetch.c:197 +#: builtin/fetch.c msgid "prepend this to submodule path output" msgstr "在子模組路徑輸出的前面加上此目錄" -#: builtin/fetch.c:200 +#: builtin/fetch.c msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）" -#: builtin/fetch.c:204 builtin/pull.c:228 +#: builtin/fetch.c builtin/pull.c msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" -#: builtin/fetch.c:205 builtin/pull.c:230 +#: builtin/fetch.c builtin/pull.c msgid "refmap" msgstr "引用映射" -#: builtin/fetch.c:206 builtin/pull.c:231 +#: builtin/fetch.c builtin/pull.c msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c:213 builtin/pull.c:244 +#: builtin/fetch.c builtin/pull.c msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" -#: builtin/fetch.c:215 +#: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" -msgstr "不取得包檔案，而是輸出協商的祖先提交" +msgstr "不取得 packfile，而是輸出協商的祖先提交" -#: builtin/fetch.c:218 builtin/fetch.c:220 +#: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" -#: builtin/fetch.c:222 builtin/pull.c:247 +#: builtin/fetch.c builtin/pull.c msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上檢查強制更新" -#: builtin/fetch.c:224 +#: builtin/fetch.c msgid "write the commit-graph after fetching" msgstr "抓取後寫入分支圖" -#: builtin/fetch.c:226 +#: builtin/fetch.c msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用規格" -#: builtin/fetch.c:618 +#: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "找不到遠端 HEAD 引用" -#: builtin/fetch.c:893 +#: builtin/fetch.c #, c-format msgid "object %s not found" msgstr "物件 %s 未發現" -#: builtin/fetch.c:897 +#: builtin/fetch.c msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:909 builtin/fetch.c:927 builtin/fetch.c:999 +#: builtin/fetch.c msgid "[rejected]" msgstr "[已拒絕]" -#: builtin/fetch.c:911 +#: builtin/fetch.c msgid "can't fetch in current branch" msgstr "目前分支下不能執行取得動作" -#: builtin/fetch.c:912 +#: builtin/fetch.c msgid "checked out in another worktree" msgstr "已在其他工作區簽出" -#: builtin/fetch.c:922 +#: builtin/fetch.c msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c:923 builtin/fetch.c:960 builtin/fetch.c:982 -#: builtin/fetch.c:994 +#: builtin/fetch.c msgid "unable to update local ref" msgstr "不能更新本機引用" -#: builtin/fetch.c:927 +#: builtin/fetch.c msgid "would clobber existing tag" msgstr "會破壞現有的標籤" -#: builtin/fetch.c:949 +#: builtin/fetch.c msgid "[new tag]" msgstr "[新標籤]" -#: builtin/fetch.c:952 +#: builtin/fetch.c msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:955 +#: builtin/fetch.c msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:994 +#: builtin/fetch.c msgid "forced update" msgstr "強制更新" -#: builtin/fetch.c:999 +#: builtin/fetch.c msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c:1102 +#: builtin/fetch.c builtin/grep.c sequencer.c +#, c-format +msgid "cannot open '%s'" +msgstr "不能開啟 '%s'" + +#: builtin/fetch.c 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" @@ -15321,7 +7038,7 @@ msgstr "" "要重新啟用，請使用「--show-forced-updates」選項，或執行\n" "「git config fetch.showForcedUpdates true」" -#: builtin/fetch.c:1106 +#: builtin/fetch.c #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" @@ -15332,22 +7049,22 @@ msgstr "" "花了 %.2f 秒檢查強制更新。您可以使用「--no-show-forced-updates」\n" "或執行「git config fetch.showForcedUpdates false」避免此項檢查\n" -#: builtin/fetch.c:1136 +#: builtin/fetch.c #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未傳送所有必需的物件\n" -#: builtin/fetch.c:1156 +#: builtin/fetch.c #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "已拒絕 %s，不允許更新淺複製" -#: builtin/fetch.c:1259 builtin/fetch.c:1418 +#: builtin/fetch.c #, c-format msgid "From %.*s\n" msgstr "來自 %.*s\n" -#: builtin/fetch.c:1269 +#: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -15357,50 +7074,55 @@ msgstr "" " 'git remote prune %s' 來刪除舊的、有衝突的分支" # 譯者：請維持前導空格 -#: builtin/fetch.c:1377 +#: builtin/fetch.c #, c-format msgid " (%s will become dangling)" msgstr " （%s 將成為懸空狀態）" # 譯者：請維持前導空格 -#: builtin/fetch.c:1378 +#: builtin/fetch.c #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成為懸空狀態）" -#: builtin/fetch.c:1421 +#: builtin/fetch.c msgid "[deleted]" msgstr "[已刪除]" -#: builtin/fetch.c:1422 builtin/remote.c:1153 +#: builtin/fetch.c builtin/remote.c msgid "(none)" msgstr "（無）" -#: builtin/fetch.c:1446 +#: builtin/fetch.c #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "拒絕取得在「%2$s」簽出的「%1$s」分支" -#: builtin/fetch.c:1466 +#: builtin/fetch.c #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "選項「%s」的值「%s」對 %s 無效" -#: builtin/fetch.c:1469 +#: builtin/fetch.c #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "選項「%s」被 %s 忽略\n" -#: builtin/fetch.c:1496 +#: builtin/fetch.c object-file.c +#, c-format +msgid "%s is not a valid object" +msgstr "%s 不是一個有效的物件" + +#: builtin/fetch.c #, c-format msgid "the object %s does not exist" msgstr "%s 物件不存在" -#: builtin/fetch.c:1748 +#: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" msgstr "檢測到多分支，和 --set-upstream 不相容" -#: builtin/fetch.c:1760 +#: builtin/fetch.c #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " @@ -15408,19 +7130,19 @@ msgid "" msgstr "" "無法將 HEAD 的上游從「%2$s」設定為「%1$s」，因為 HEAD 沒有指向任何分支。" -#: builtin/fetch.c:1773 +#: builtin/fetch.c msgid "not setting upstream for a remote remote-tracking branch" msgstr "沒有為一個遠端追蹤分支設定上游" -#: builtin/fetch.c:1775 +#: builtin/fetch.c msgid "not setting upstream for a remote tag" msgstr "沒有為一個遠端標籤設定上游" -#: builtin/fetch.c:1777 +#: builtin/fetch.c msgid "unknown branch type" msgstr "未知的分支類型" -#: builtin/fetch.c:1779 +#: builtin/fetch.c msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" @@ -15428,22 +7150,22 @@ msgstr "" "找不到來源分支。\n" "您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c:1904 builtin/fetch.c:1967 +#: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c:1914 builtin/fetch.c:1969 +#: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "不能取得 %s" -#: builtin/fetch.c:1926 +#: builtin/fetch.c #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "無法取得 '%s'（離開碼：%d）\n" -#: builtin/fetch.c:2030 +#: builtin/fetch.c msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" @@ -15451,192 +7173,192 @@ msgstr "" "未指定遠端版本庫。請指定用以取得新修訂版本之\n" "來源 URL 或者遠端版本庫名稱" -#: builtin/fetch.c:2066 +#: builtin/fetch.c msgid "you need to specify a tag name" msgstr "您需要指定標籤名稱" -#: builtin/fetch.c:2156 +#: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*" -#: builtin/fetch.c:2160 +#: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" -#: builtin/fetch.c:2169 +#: builtin/fetch.c msgid "--unshallow on a complete repository does not make sense" msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義" -#: builtin/fetch.c:2186 +#: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能帶一個版本庫參數" -#: builtin/fetch.c:2188 +#: builtin/fetch.c msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c:2197 +#: builtin/fetch.c #, c-format msgid "no such remote or remote group: %s" msgstr "無此遠端或遠端群組：%s" -#: builtin/fetch.c:2205 +#: builtin/fetch.c msgid "fetching a group and specifying refspecs does not make sense" msgstr "取得群組並指定引用規格無意義" -#: builtin/fetch.c:2221 +#: builtin/fetch.c msgid "must supply remote when using --negotiate-only" msgstr "使用 --negotiate-only 時必須提供遠端" -#: builtin/fetch.c:2226 +#: builtin/fetch.c msgid "protocol does not support --negotiate-only, exiting" msgstr "通訊協定不支援 --negotiate-only。結束" -#: builtin/fetch.c:2246 +#: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以將 --filter 用於在 extensions.partialclone 中設定的遠端版本庫" -#: builtin/fetch.c:2250 +#: builtin/fetch.c msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 只能在擷取 (fetch) 一個遠端時使用" -#: builtin/fetch.c:2254 +#: builtin/fetch.c msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 只能在取得一個遠端時使用" -#: builtin/fmt-merge-msg.c:7 +#: builtin/fmt-merge-msg.c 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:19 +#: builtin/fmt-merge-msg.c msgid "populate log with at most <n> entries from shortlog" msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明" -#: builtin/fmt-merge-msg.c:22 +#: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" msgstr "參數 --log 的別名（已棄用）" -#: builtin/fmt-merge-msg.c:25 +#: builtin/fmt-merge-msg.c msgid "text" msgstr "文字" -#: builtin/fmt-merge-msg.c:26 +#: builtin/fmt-merge-msg.c msgid "use <text> as start of message" msgstr "使用 <文字> 作為提交說明的開始" -#: builtin/fmt-merge-msg.c:28 +#: builtin/fmt-merge-msg.c msgid "use <name> instead of the real target branch" msgstr "使用 <名稱> 而非實際目的地分支" -#: builtin/fmt-merge-msg.c:29 +#: builtin/fmt-merge-msg.c msgid "file to read from" msgstr "從檔案中讀取" -#: builtin/for-each-ref.c:10 +#: builtin/for-each-ref.c msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<選項>] [<模式>]" -#: builtin/for-each-ref.c:11 +#: builtin/for-each-ref.c msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <物件>]" -#: builtin/for-each-ref.c:12 +#: builtin/for-each-ref.c msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]" msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" -#: builtin/for-each-ref.c:13 +#: builtin/for-each-ref.c msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" -#: builtin/for-each-ref.c:31 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "引用占位符適用於 shells" -#: builtin/for-each-ref.c:33 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" msgstr "引用占位符適用於 perl" -#: builtin/for-each-ref.c:35 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for python" msgstr "引用占位符適用於 python" -#: builtin/for-each-ref.c:37 +#: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" msgstr "引用占位符適用於 Tcl" -#: builtin/for-each-ref.c:40 +#: builtin/for-each-ref.c msgid "show only <n> matched refs" msgstr "只顯示 <n> 個符合的引用" -#: builtin/for-each-ref.c:42 builtin/tag.c:482 +#: builtin/for-each-ref.c builtin/tag.c msgid "respect format colors" msgstr "遵照格式中的顏色輸出" -#: builtin/for-each-ref.c:45 +#: builtin/for-each-ref.c msgid "print only refs which points at the given object" msgstr "只列印指向提供物件的引用" -#: builtin/for-each-ref.c:47 +#: builtin/for-each-ref.c msgid "print only refs that are merged" msgstr "只列印已經合併的引用" -#: builtin/for-each-ref.c:48 +#: builtin/for-each-ref.c msgid "print only refs that are not merged" msgstr "只列印沒有合併的引用" -#: builtin/for-each-ref.c:49 +#: builtin/for-each-ref.c msgid "print only refs which contain the commit" msgstr "只列印包含該提交的引用" -#: builtin/for-each-ref.c:50 +#: builtin/for-each-ref.c msgid "print only refs which don't contain the commit" msgstr "只列印不包含該提交的引用" -#: builtin/for-each-repo.c:9 +#: builtin/for-each-repo.c msgid "git for-each-repo --config=<config> <command-args>" msgstr "git for-each-repo --config=<設定> <命令引數>" -#: builtin/for-each-repo.c:34 +#: builtin/for-each-repo.c msgid "config" msgstr "config" -#: builtin/for-each-repo.c:35 +#: builtin/for-each-repo.c msgid "config key storing a list of repository paths" msgstr "儲存版本庫路徑清單的設定鍵" -#: builtin/for-each-repo.c:43 +#: builtin/for-each-repo.c msgid "missing --config=<config>" msgstr "缺少 --config=<設定>" -#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129 +#: builtin/fsck.c msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:78 builtin/fsck.c:100 +#: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:94 +#: builtin/fsck.c #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c:124 builtin/fsck.c:127 +#: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" -#: builtin/fsck.c:136 +#: builtin/fsck.c msgid "wrong object type in link" msgstr "連結中錯誤的物件類型" -#: builtin/fsck.c:152 +#: builtin/fsck.c #, c-format msgid "" "broken link from %7s %s\n" @@ -15645,357 +7367,380 @@ msgstr "" "損壞的連結來自於 %7s %s\n" " 到 %7s %s" -#: builtin/fsck.c:264 +#: builtin/fsck.c builtin/prune.c connected.c +msgid "Checking connectivity" +msgstr "正在檢查連通性" + +#: builtin/fsck.c #, c-format msgid "missing %s %s" msgstr "缺少 %s %s" -#: builtin/fsck.c:291 +#: builtin/fsck.c #, c-format msgid "unreachable %s %s" msgstr "無法取得 %s %s" -#: builtin/fsck.c:311 +#: builtin/fsck.c #, c-format msgid "dangling %s %s" msgstr "懸空 %s %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c msgid "could not create lost-found" msgstr "不能建立 lost-found" -#: builtin/fsck.c:332 +#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c +#: sequencer.c +#, c-format +msgid "could not write '%s'" +msgstr "不能寫入 '%s'" + +#: builtin/fsck.c #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" -#: builtin/fsck.c:349 +#: builtin/fsck.c #, c-format msgid "Checking %s" msgstr "正在檢查 %s" -#: builtin/fsck.c:387 +#: builtin/fsck.c #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在檢查連通性（%d 個物件）" -#: builtin/fsck.c:406 +#: builtin/fsck.c #, c-format msgid "Checking %s %s" msgstr "正在檢查 %s %s" -#: builtin/fsck.c:411 +#: builtin/fsck.c msgid "broken links" msgstr "損壞的連結" -#: builtin/fsck.c:420 +#: builtin/fsck.c #, c-format msgid "root %s" msgstr "根 %s" -#: builtin/fsck.c:428 +#: builtin/fsck.c #, c-format msgid "tagged %s %s (%s) in %s" msgstr "已標記 %s %s (%s) 於 %s" -#: builtin/fsck.c:457 +#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing" msgstr "%s：物件損壞或遺失" -#: builtin/fsck.c:482 +#: builtin/fsck.c #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：無效的引用日誌條目 %s" -#: builtin/fsck.c:496 +#: builtin/fsck.c #, c-format msgid "Checking reflog %s->%s" msgstr "正在檢查引用日誌 %s->%s" -#: builtin/fsck.c:530 +#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：無效的 sha1 指標 %s" -#: builtin/fsck.c:537 +#: builtin/fsck.c #, c-format msgid "%s: not a commit" msgstr "%s：不是一個提交" -#: builtin/fsck.c:591 +#: builtin/fsck.c msgid "notice: No default references" msgstr "注意：無預設引用" -#: builtin/fsck.c:621 +#: builtin/fsck.c #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s：雜湊路徑 (hash-path) 不符，找到的位置：%s" -#: builtin/fsck.c:624 +#: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：物件損壞或遺失：%s" -#: builtin/fsck.c:628 +#: builtin/fsck.c #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s：物件屬於「%s」未知類型：%s" -#: builtin/fsck.c:645 +#: builtin/fsck.c #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析物件：%s" -#: builtin/fsck.c:665 +#: builtin/fsck.c #, c-format msgid "bad sha1 file: %s" msgstr "壞的 sha1 檔案：%s" -#: builtin/fsck.c:686 +#: builtin/fsck.c msgid "Checking object directory" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:689 +#: builtin/fsck.c msgid "Checking object directories" msgstr "正在檢查物件目錄" -#: builtin/fsck.c:705 +#: builtin/fsck.c #, c-format msgid "Checking %s link" msgstr "正在檢查 %s 連結" -#: builtin/fsck.c:710 builtin/index-pack.c:862 +#: builtin/fsck.c builtin/index-pack.c #, c-format msgid "invalid %s" msgstr "無效的 %s" -#: builtin/fsck.c:717 +#: builtin/fsck.c #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的東西（%s）" -#: builtin/fsck.c:723 +#: builtin/fsck.c #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分離開頭指標的指向不存在" -#: builtin/fsck.c:727 +#: builtin/fsck.c #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一個尚未誕生的分支（%s）" -#: builtin/fsck.c:739 +#: builtin/fsck.c msgid "Checking cache tree" msgstr "正在檢查快取樹" -#: builtin/fsck.c:744 +#: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中無效的 sha1 指標" -#: builtin/fsck.c:753 +#: builtin/fsck.c msgid "non-tree in cache-tree" msgstr "cache-tree 中非樹狀物件" -#: builtin/fsck.c:784 +#: builtin/fsck.c msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<選項>] [<物件>...]" -#: builtin/fsck.c:790 +#: builtin/fsck.c msgid "show unreachable objects" msgstr "顯示無法取得的物件" -#: builtin/fsck.c:791 +#: builtin/fsck.c msgid "show dangling objects" msgstr "顯示懸空的物件" -#: builtin/fsck.c:792 +#: builtin/fsck.c msgid "report tags" msgstr "報告標籤" -#: builtin/fsck.c:793 +#: builtin/fsck.c msgid "report root nodes" msgstr "報告根節點" -#: builtin/fsck.c:794 +#: builtin/fsck.c msgid "make index objects head nodes" msgstr "將索引亦作為檢查的頭節點" -#: builtin/fsck.c:795 +#: builtin/fsck.c msgid "make reflogs head nodes (default)" msgstr "將引用日誌作為檢查的 HEAD 節點（預設）" -#: builtin/fsck.c:796 +#: builtin/fsck.c msgid "also consider packs and alternate objects" msgstr "也考慮包和備用物件" -#: builtin/fsck.c:797 +#: builtin/fsck.c msgid "check only connectivity" msgstr "僅檢查連通性" -#: builtin/fsck.c:798 builtin/mktag.c:75 +#: builtin/fsck.c builtin/mktag.c msgid "enable more strict checking" msgstr "啟用更嚴格的檢查" -#: builtin/fsck.c:800 +#: builtin/fsck.c msgid "write dangling objects in .git/lost-found" msgstr "將懸空物件寫入 .git/lost-found 中" -#: builtin/fsck.c:801 builtin/prune.c:146 +#: builtin/fsck.c builtin/prune.c msgid "show progress" msgstr "顯示進度" -#: builtin/fsck.c:802 +#: builtin/fsck.c msgid "show verbose names for reachable objects" msgstr "顯示可以取得物件的詳細名稱" -#: builtin/fsck.c:862 builtin/index-pack.c:261 +#: builtin/fsck.c builtin/index-pack.c msgid "Checking objects" msgstr "正在檢查物件" -#: builtin/fsck.c:890 +#: builtin/fsck.c #, c-format msgid "%s: object missing" msgstr "%s：物件缺少" -#: builtin/fsck.c:901 +#: builtin/fsck.c #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "無效的參數：期望 sha1，得到 '%s'" -#: builtin/fsmonitor--daemon.c:13 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start [<options>]" msgstr "git fsmonitor--daemon start [<options>]" -#: builtin/fsmonitor--daemon.c:14 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon run [<options>]" msgstr "git fsmonitor--daemon run [<options>]" -#: builtin/fsmonitor--daemon.c:15 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon stop" msgstr "git fsmonitor--daemon stop" -#: builtin/fsmonitor--daemon.c:16 +#: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon status" msgstr "git fsmonitor--daemon status" -#: builtin/fsmonitor--daemon.c:38 builtin/fsmonitor--daemon.c:47 +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" -#: builtin/fsmonitor--daemon.c:57 +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' not bool or int: %d" msgstr "「%s」的數值不是布林值或整數：%d" -#: builtin/fsmonitor--daemon.c:99 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在監控「%s」\n" -#: builtin/fsmonitor--daemon.c:104 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon 未在監控「%s」\n" -#: builtin/fsmonitor--daemon.c:170 +#: builtin/fsmonitor--daemon.c #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "無法建立 fsmonitor cookie「%s」" -#: builtin/fsmonitor--daemon.c:753 +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor：cookie_result '%d' != SEEN" -#: builtin/fsmonitor--daemon.c:1187 +#: builtin/fsmonitor--daemon.c #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "無法在「%s」啟動 IPC 執行緒集區" -#: builtin/fsmonitor--daemon.c:1199 +#: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor listener thread" msgstr "無法啟動 fsmonitor 監聽執行緒" -#: builtin/fsmonitor--daemon.c:1297 +#: builtin/fsmonitor--daemon.c +msgid "could not start fsmonitor health thread" +msgstr "無法啟動 fsmonitor 健康監聽執行緒" + +#: builtin/fsmonitor--daemon.c msgid "could not initialize listener thread" msgstr "無法初始化監聽執行緒" -#: builtin/fsmonitor--daemon.c:1328 builtin/fsmonitor--daemon.c:1383 +#: builtin/fsmonitor--daemon.c +msgid "could not initialize health thread" +msgstr "無法初始化健康監聽執行緒" + +#: builtin/fsmonitor--daemon.c +#, c-format +msgid "could not cd home '%s'" +msgstr "無法 cd home '%s'" + +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已在執行「%s」" -#: builtin/fsmonitor--daemon.c:1332 +#: builtin/fsmonitor--daemon.c #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "正在「%s」執行 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c:1387 +#: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "正在「%s」啟動 fsmonitor-daemon\n" -#: builtin/fsmonitor--daemon.c:1413 +#: builtin/fsmonitor--daemon.c msgid "daemon failed to start" msgstr "無法啟動守護程式" -#: builtin/fsmonitor--daemon.c:1416 +#: builtin/fsmonitor--daemon.c msgid "daemon not online yet" msgstr "守護程式尚未上線" -#: builtin/fsmonitor--daemon.c:1419 +#: builtin/fsmonitor--daemon.c msgid "daemon terminated" msgstr "守護程式已終止" -#: builtin/fsmonitor--daemon.c:1429 +#: builtin/fsmonitor--daemon.c msgid "detach from console" msgstr "從主控台分離" -#: builtin/fsmonitor--daemon.c:1432 +#: builtin/fsmonitor--daemon.c msgid "use <n> ipc worker threads" msgstr "使用 <n> 個 IPC 工作執行緒" -#: builtin/fsmonitor--daemon.c:1435 +#: builtin/fsmonitor--daemon.c msgid "max seconds to wait for background daemon startup" msgstr "要等待背景守護程式啟動的最長秒數" -#: builtin/fsmonitor--daemon.c:1449 +#: builtin/fsmonitor--daemon.c #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "無效的「ipc-threads」數值（%d）" -#: builtin/fsmonitor--daemon.c:1464 +#: builtin/fsmonitor--daemon.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "未處理的子命令「%s」" -#: builtin/fsmonitor--daemon.c:1477 +#: builtin/fsmonitor--daemon.c msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon 不支援本平台" -#: builtin/gc.c:39 +#: builtin/gc.c msgid "git gc [<options>]" msgstr "git gc [<選項>]" -#: builtin/gc.c:93 +#: builtin/gc.c #, c-format msgid "Failed to fstat %s: %s" msgstr "對 %s 呼叫 fstat 失敗：%s" -#: builtin/gc.c:129 +#: builtin/gc.c #, c-format msgid "failed to parse '%s' value '%s'" msgstr "無法解析 '%s' 值 '%s'" -#: builtin/gc.c:488 builtin/init-db.c:57 +#: builtin/gc.c builtin/init-db.c #, c-format msgid "cannot stat '%s'" msgstr "不能對 '%s' 呼叫 stat" -#: builtin/gc.c:504 +#: builtin/gc.c #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -16009,272 +7754,280 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:552 +#: builtin/gc.c msgid "prune unreferenced objects" msgstr "清除未引用的物件" -#: builtin/gc.c:554 +#: builtin/gc.c +msgid "pack unreferenced objects separately" +msgstr "獨立封裝無參照物件" + +#: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "更徹底（增加執行時間）" -#: builtin/gc.c:555 +#: builtin/gc.c msgid "enable auto-gc mode" msgstr "啟用自動垃圾回收模式" -#: builtin/gc.c:558 +#: builtin/gc.c msgid "force running gc even if there may be another gc running" msgstr "強制執行 gc 即使另外一個 gc 正在執行" -#: builtin/gc.c:561 +#: builtin/gc.c msgid "repack all other packs except the largest pack" -msgstr "除了最大的包之外，對所有其它包檔案重新打包" +msgstr "除了最大的包之外，對所有其它包重新打包" -#: builtin/gc.c:577 +#: builtin/gc.c #, c-format -msgid "failed to parse gc.logexpiry value %s" -msgstr "解析 gc.logexpiry 的值 %s 失敗" +msgid "failed to parse gc.logExpiry value %s" +msgstr "無法解析 gc.logExpiry 的值 %s" -#: builtin/gc.c:588 +#: builtin/gc.c #, c-format msgid "failed to parse prune expiry value %s" msgstr "解析清除期限值 %s 失敗" -#: builtin/gc.c:608 +#: builtin/gc.c #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自動在後台執行版本庫打包以求最佳性能。\n" -#: builtin/gc.c:610 +#: builtin/gc.c #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自動打包版本庫以求最佳性能。\n" -#: builtin/gc.c:611 +#: builtin/gc.c #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手動維護參見 \"git help gc\"。\n" -#: builtin/gc.c:652 +#: builtin/gc.c #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）" -#: builtin/gc.c:707 +#: builtin/gc.c msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多無法取得的鬆散物件，執行「git prune」刪除它們。" -#: builtin/gc.c:717 +#: builtin/gc.c msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]" -#: builtin/gc.c:747 +#: builtin/gc.c msgid "--no-schedule is not allowed" msgstr "不允許 --no-schedule" -#: builtin/gc.c:752 +#: builtin/gc.c #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "無法識別的 --schedule 引數 '%s'" -#: builtin/gc.c:870 +#: builtin/gc.c msgid "failed to write commit-graph" msgstr "無法寫入提交圖形" -#: builtin/gc.c:906 +#: builtin/gc.c msgid "failed to prefetch remotes" msgstr "無法預先取得遠端" -#: builtin/gc.c:1022 +#: builtin/gc.c msgid "failed to start 'git pack-objects' process" msgstr "無法啟動 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1039 +#: builtin/gc.c msgid "failed to finish 'git pack-objects' process" msgstr "無法完成 ‘git pack-objects’ 處理程序" -#: builtin/gc.c:1090 +#: builtin/gc.c msgid "failed to write multi-pack-index" msgstr "無法寫入多包索引" -#: builtin/gc.c:1106 +#: builtin/gc.c msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失敗" -#: builtin/gc.c:1165 +#: builtin/gc.c msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失敗" -#: builtin/gc.c:1174 +#: builtin/gc.c msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用" -#: builtin/gc.c:1278 +#: builtin/gc.c #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "已存在 '%s' 鎖定檔案，略過維護" -#: builtin/gc.c:1308 +#: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "作業 '%s' 失敗" -#: builtin/gc.c:1390 +#: builtin/gc.c #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 非有效作業" -#: builtin/gc.c:1395 +#: builtin/gc.c #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c:1410 +#: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" -#: builtin/gc.c:1411 +#: builtin/gc.c msgid "frequency" msgstr "frequency" -#: builtin/gc.c:1412 +#: builtin/gc.c msgid "run tasks based on frequency" msgstr "依據頻率執行工作" -#: builtin/gc.c:1415 +#: builtin/gc.c msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c:1416 +#: builtin/gc.c msgid "task" msgstr "作業" -#: builtin/gc.c:1417 +#: builtin/gc.c msgid "run a specific task" msgstr "執行指定作業" -#: builtin/gc.c:1434 +#: builtin/gc.c msgid "use at most one of --auto and --schedule=<frequency>" msgstr "--auto 和 --schedule=<頻率> 請任選一" -#: builtin/gc.c:1477 +#: builtin/gc.c msgid "failed to run 'git config'" msgstr "無法執行 ‘git config’" -#: builtin/gc.c:1629 +#: builtin/gc.c #, c-format msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c:1656 builtin/gc.c:1694 +#: builtin/gc.c msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c:1769 builtin/gc.c:2237 +#: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" -#: builtin/gc.c:1796 +#: builtin/gc.c #, c-format msgid "failed to bootstrap service %s" msgstr "無法啟動載入 %s 服務" -#: builtin/gc.c:1889 +#: builtin/gc.c msgid "failed to create temp xml file" msgstr "無法建立暫存 XML 檔案" -#: builtin/gc.c:1979 +#: builtin/gc.c msgid "failed to start schtasks" msgstr "無法啟動 schtasks" -#: builtin/gc.c:2063 +#: builtin/gc.c msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”" -#: builtin/gc.c:2080 +#: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”" -#: builtin/gc.c:2084 +#: builtin/gc.c msgid "failed to open stdin of 'crontab'" msgstr "無法開啟 ‘crontab’ 的標準輸入" -#: builtin/gc.c:2126 +#: builtin/gc.c msgid "'crontab' died" msgstr "“crontab” 結束運作" -#: builtin/gc.c:2191 +#: builtin/gc.c msgid "failed to start systemctl" msgstr "無法啟動 systemctl" -#: builtin/gc.c:2201 +#: builtin/gc.c msgid "failed to run systemctl" msgstr "無法執行 systemctl" -#: builtin/gc.c:2210 builtin/gc.c:2215 builtin/worktree.c:63 -#: builtin/worktree.c:1024 +#: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c:2395 +#: builtin/gc.c rerere.c +#, c-format +msgid "failed to flush '%s'" +msgstr "排清 '%s' 失敗" + +#: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "無法識別的 --scheduler 引數 '%s'" -#: builtin/gc.c:2420 +#: builtin/gc.c msgid "neither systemd timers nor crontab are available" msgstr "不支援 systemd 計時器或 crontab" -#: builtin/gc.c:2435 +#: builtin/gc.c #, c-format msgid "%s scheduler is not available" msgstr "無法使用 %s 排程器" -#: builtin/gc.c:2449 +#: builtin/gc.c msgid "another process is scheduling background maintenance" msgstr "其他處理程序正在排定背景維護工作" -#: builtin/gc.c:2471 +#: builtin/gc.c msgid "git maintenance start [--scheduler=<scheduler>]" msgstr "git maintenance start [--scheduler=<scheduler>]" -#: builtin/gc.c:2480 +#: builtin/gc.c msgid "scheduler" msgstr "scheduler" -#: builtin/gc.c:2481 +#: builtin/gc.c msgid "scheduler to trigger git maintenance run" msgstr "要觸發 git maintenance run 的排程器" -#: builtin/gc.c:2495 +#: builtin/gc.c msgid "failed to add repo to global config" msgstr "無法將版本庫加至全域設定" -#: builtin/gc.c:2504 +#: builtin/gc.c msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <子命令> [<選項>]" -#: builtin/gc.c:2523 +#: builtin/gc.c #, c-format msgid "invalid subcommand: %s" msgstr "無效子命令：%s" -#: builtin/grep.c:32 +#: builtin/grep.c msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<選項>] [-e] <模式> [<版本>...] [[--] <路徑>...]" -#: builtin/grep.c:241 +#: builtin/grep.c #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：無法建立執行緒：%s" -#: builtin/grep.c:295 +#: builtin/grep.c #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" @@ -16283,255 +8036,254 @@ msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:303 builtin/index-pack.c:1587 builtin/index-pack.c:1791 -#: builtin/pack-objects.c:3150 +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" -#: builtin/grep.c:490 builtin/grep.c:619 builtin/grep.c:659 +#: builtin/grep.c #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹（%s）" -#: builtin/grep.c:674 +#: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" msgstr "無法抓取來自於 %s 類型的物件" -#: builtin/grep.c:754 +#: builtin/grep.c #, c-format msgid "switch `%c' expects a numerical value" msgstr "開關 `%c' 期望一個數字值" -#: builtin/grep.c:852 +#: builtin/grep.c msgid "search in index instead of in the work tree" msgstr "在索引區搜尋而不是在工作區" -#: builtin/grep.c:854 +#: builtin/grep.c msgid "find in contents not managed by git" msgstr "在未被 git 管理的內容中尋找" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/grep.c:856 +#: builtin/grep.c msgid "search in both tracked and untracked files" msgstr "在追蹤和未追蹤的檔案中搜尋" -#: builtin/grep.c:858 +#: builtin/grep.c msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的檔案" -#: builtin/grep.c:860 +#: builtin/grep.c msgid "recursively search in each submodule" msgstr "在每一個子模組中遞迴搜尋" -#: builtin/grep.c:863 +#: builtin/grep.c msgid "show non-matching lines" msgstr "顯示未符合的行" -#: builtin/grep.c:865 +#: builtin/grep.c msgid "case insensitive matching" msgstr "不區分大小寫符合" -#: builtin/grep.c:867 +#: builtin/grep.c msgid "match patterns only at word boundaries" msgstr "只在單詞邊界符合模式" -#: builtin/grep.c:869 +#: builtin/grep.c msgid "process binary files as text" msgstr "把二進位檔案當做文字處理" -#: builtin/grep.c:871 +#: builtin/grep.c msgid "don't match patterns in binary files" msgstr "不在二進位檔案中符合模式" -#: builtin/grep.c:874 +#: builtin/grep.c msgid "process binary files with textconv filters" msgstr "用 textconv 過濾器處理二進位檔案" -#: builtin/grep.c:876 +#: builtin/grep.c msgid "search in subdirectories (default)" msgstr "在子目錄中尋找（預設）" -#: builtin/grep.c:878 +#: builtin/grep.c msgid "descend at most <depth> levels" msgstr "最多以指定的深度向下尋找" -#: builtin/grep.c:882 +#: builtin/grep.c msgid "use extended POSIX regular expressions" msgstr "使用延伸的 POSIX 常規表示式" -#: builtin/grep.c:885 +#: builtin/grep.c msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 常規表示式（預設）" -#: builtin/grep.c:888 +#: builtin/grep.c msgid "interpret patterns as fixed strings" msgstr "把模式解析為固定的字串" -#: builtin/grep.c:891 +#: builtin/grep.c msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 相容的常規表示式" -#: builtin/grep.c:894 +#: builtin/grep.c msgid "show line numbers" msgstr "顯示行號" -#: builtin/grep.c:895 +#: builtin/grep.c msgid "show column number of first match" msgstr "顯示第一個符合的列號" -#: builtin/grep.c:896 +#: builtin/grep.c msgid "don't show filenames" msgstr "不顯示檔案名" -#: builtin/grep.c:897 +#: builtin/grep.c msgid "show filenames" msgstr "顯示檔案名" -#: builtin/grep.c:899 +#: builtin/grep.c msgid "show filenames relative to top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/grep.c:901 +#: builtin/grep.c msgid "show only filenames instead of matching lines" msgstr "只顯示檔案名而不顯示符合的行" -#: builtin/grep.c:903 +#: builtin/grep.c msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同義" -#: builtin/grep.c:906 +#: builtin/grep.c msgid "show only the names of files without match" msgstr "只顯示未符合的檔案名" -#: builtin/grep.c:908 +#: builtin/grep.c msgid "print NUL after filenames" msgstr "在檔案名後輸出 NUL 字元" -#: builtin/grep.c:911 +#: builtin/grep.c msgid "show only matching parts of a line" msgstr "只顯示行中的符合的部分" -#: builtin/grep.c:913 +#: builtin/grep.c msgid "show the number of matches instead of matching lines" msgstr "顯示總符合行數，而不顯示符合的行" -#: builtin/grep.c:914 +#: builtin/grep.c msgid "highlight matches" msgstr "高亮顯示符合項" -#: builtin/grep.c:916 +#: builtin/grep.c msgid "print empty line between matches from different files" msgstr "在不同檔案的符合項之間列印空行" -#: builtin/grep.c:918 +#: builtin/grep.c msgid "show filename only once above matches from same file" msgstr "只在同一檔案的符合項的上面顯示一次檔案名" -#: builtin/grep.c:921 +#: builtin/grep.c msgid "show <n> context lines before and after matches" msgstr "顯示符合項前後的 <n> 行上下文" -#: builtin/grep.c:924 +#: builtin/grep.c msgid "show <n> context lines before matches" msgstr "顯示符合項前 <n> 行上下文" -#: builtin/grep.c:926 +#: builtin/grep.c msgid "show <n> context lines after matches" msgstr "顯示符合項後 <n> 行上下文" -#: builtin/grep.c:928 +#: builtin/grep.c msgid "use <n> worker threads" msgstr "使用 <n> 個工作執行緒" -#: builtin/grep.c:929 +#: builtin/grep.c msgid "shortcut for -C NUM" msgstr "快捷鍵 -C 數字" -#: builtin/grep.c:932 +#: builtin/grep.c msgid "show a line with the function name before matches" msgstr "在符合的前面顯示一行函數名" -#: builtin/grep.c:934 +#: builtin/grep.c msgid "show the surrounding function" msgstr "顯示所在函數的前後內容" -#: builtin/grep.c:937 +#: builtin/grep.c msgid "read patterns from file" msgstr "從檔案讀取模式" -#: builtin/grep.c:939 +#: builtin/grep.c msgid "match <pattern>" msgstr "符合 <模式>" -#: builtin/grep.c:941 +#: builtin/grep.c msgid "combine patterns specified with -e" msgstr "組合用 -e 參數設定的模式" -#: builtin/grep.c:953 +#: builtin/grep.c msgid "indicate hit with exit status without output" msgstr "不輸出，而用離開碼標記命中狀態" -#: builtin/grep.c:955 +#: builtin/grep.c msgid "show only matches from files that match all patterns" msgstr "只顯示符合所有模式的檔案中的符合" -#: builtin/grep.c:958 +#: builtin/grep.c msgid "pager" msgstr "分頁" -#: builtin/grep.c:958 +#: builtin/grep.c msgid "show matching files in the pager" msgstr "分頁顯示符合的檔案" -#: builtin/grep.c:962 +#: builtin/grep.c msgid "allow calling of grep(1) (ignored by this build)" msgstr "允許呼叫 grep(1)（本次組建忽略）" -#: builtin/grep.c:1028 +#: builtin/grep.c msgid "no pattern given" msgstr "未提供符合模式" -#: builtin/grep.c:1064 +#: builtin/grep.c msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同時使用" -#: builtin/grep.c:1072 +#: builtin/grep.c #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" -#: builtin/grep.c:1102 +#: builtin/grep.c msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支援與 --recurse-submodules 一起使用" -#: builtin/grep.c:1106 +#: builtin/grep.c msgid "invalid option combination, ignoring --threads" msgstr "無效的選項組合，忽略 --threads" -#: builtin/grep.c:1109 builtin/pack-objects.c:4084 +#: builtin/grep.c builtin/pack-objects.c msgid "no threads support, ignoring --threads" msgstr "沒有執行緒支援，忽略 --threads" -#: builtin/grep.c:1112 builtin/index-pack.c:1584 builtin/pack-objects.c:3147 +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的執行緒數無效（%d）" -#: builtin/grep.c:1146 +#: builtin/grep.c msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 僅用於工作區" -#: builtin/grep.c:1179 +#: builtin/grep.c msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用於已追蹤內容" -#: builtin/grep.c:1187 +#: builtin/grep.c msgid "both --cached and trees are given" msgstr "同時給出了 --cached 和樹狀物件" -#: builtin/hash-object.c:83 +#: builtin/hash-object.c msgid "" "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] " "[--] <file>..." @@ -16539,99 +8291,99 @@ msgstr "" "git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] " "[--] <檔案>..." -#: builtin/hash-object.c:97 +#: builtin/hash-object.c msgid "object type" msgstr "物件類型" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c msgid "write the object into the object database" msgstr "將物件寫入物件資料庫" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c msgid "read the object from stdin" msgstr "從標準輸入讀取物件" -#: builtin/hash-object.c:102 +#: builtin/hash-object.c msgid "store file as is without filters" msgstr "原樣儲存檔案不使用過濾器" -#: builtin/hash-object.c:103 +#: builtin/hash-object.c msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允許對任意隨機垃圾資料做散列來建立損壞的物件以便除錯 Git" -#: builtin/hash-object.c:104 +#: builtin/hash-object.c msgid "process file as it were from this path" msgstr "處理檔案並假設其來自於此路徑" -#: builtin/help.c:57 +#: builtin/help.c msgid "print all available commands" msgstr "列印所有可用的指令" -#: builtin/help.c:60 +#: builtin/help.c msgid "show external commands in --all" msgstr "在 --all 顯示外部命令" -#: builtin/help.c:61 +#: builtin/help.c msgid "show aliases in --all" msgstr "在 --all 顯示別名" -#: builtin/help.c:62 +#: builtin/help.c msgid "exclude guides" msgstr "排除嚮導" -#: builtin/help.c:63 +#: builtin/help.c msgid "show man page" msgstr "顯示 man 手冊" -#: builtin/help.c:64 +#: builtin/help.c msgid "show manual in web browser" msgstr "在 web 瀏覽器中顯示手冊" -#: builtin/help.c:66 +#: builtin/help.c msgid "show info page" msgstr "顯示 info 手冊" -#: builtin/help.c:68 +#: builtin/help.c msgid "print command description" msgstr "列印指令描述" -#: builtin/help.c:70 +#: builtin/help.c msgid "print list of useful guides" msgstr "顯示有用的指南列表" -#: builtin/help.c:72 +#: builtin/help.c msgid "print all configuration variable names" msgstr "列印所有設定變數名稱" -#: builtin/help.c:84 +#: builtin/help.c msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<command>]" -#: builtin/help.c:201 +#: builtin/help.c #, c-format msgid "unrecognized help format '%s'" msgstr "無法識別的協助格式 '%s'" -#: builtin/help.c:227 +#: builtin/help.c msgid "Failed to start emacsclient." msgstr "無法啟動 emacsclient。" -#: builtin/help.c:240 +#: builtin/help.c msgid "Failed to parse emacsclient version." msgstr "無法解析 emacsclient 版本。" -#: builtin/help.c:248 +#: builtin/help.c #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:266 builtin/help.c:288 builtin/help.c:298 builtin/help.c:306 +#: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" -#: builtin/help.c:344 +#: builtin/help.c #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -16640,7 +8392,7 @@ msgstr "" "'%s'：不支援的 man 手冊檢視器的路徑。\n" "請使用 'man.<工具>.cmd'。" -#: builtin/help.c:356 +#: builtin/help.c #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -16649,416 +8401,413 @@ msgstr "" "'%s': 支援的 man 手冊檢視器指令。\n" "請使用 'man.<工具>.path'。" -#: builtin/help.c:471 +#: builtin/help.c #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 檢視器。" -#: builtin/help.c:487 +#: builtin/help.c msgid "no man viewer handled the request" msgstr "沒有 man 檢視器處理此請求" -#: builtin/help.c:494 +#: builtin/help.c msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c:555 builtin/help.c:566 git.c:348 +#: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" -#: builtin/help.c:569 git.c:380 +#: builtin/help.c git.c #, c-format msgid "bad alias.%s string: %s" msgstr "壞的 alias.%s 字串：%s" -#: builtin/help.c:611 +#: builtin/help.c #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "「%s」選項不取非選項的引數" -#: builtin/help.c:631 +#: builtin/help.c msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用" -#: builtin/help.c:643 builtin/help.c:671 +#: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:666 +#: builtin/help.c msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" -#: builtin/hook.c:10 +#: builtin/hook.c msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" msgstr "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]" -#: builtin/hook.c:30 +#: builtin/hook.c msgid "silently ignore missing requested <hook-name>" msgstr "靜默忽略不存在而請求的 <hook-name>" -#: builtin/index-pack.c:221 +#: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" msgstr "%s 的物件類型不符合" -#: builtin/index-pack.c:241 +#: builtin/index-pack.c #, c-format msgid "did not receive expected object %s" msgstr "未能取得預期的物件 %s" -#: builtin/index-pack.c:244 +#: builtin/index-pack.c #, c-format msgid "object %s: expected type %s, found %s" msgstr "物件 %s：應為類型 %s，卻是 %s" -#: builtin/index-pack.c:294 +#: builtin/index-pack.c #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "無法填充 %d 位元組" -#: builtin/index-pack.c:304 +#: builtin/index-pack.c msgid "early EOF" msgstr "過早的檔案結束符（EOF）" -#: builtin/index-pack.c:305 +#: builtin/index-pack.c msgid "read error on input" msgstr "輸入上的讀錯誤" -#: builtin/index-pack.c:317 +#: builtin/index-pack.c msgid "used more bytes than were available" msgstr "用掉了超過可用的位元組" -#: builtin/index-pack.c:324 builtin/pack-objects.c:754 +#: builtin/index-pack.c builtin/pack-objects.c msgid "pack too large for current definition of off_t" msgstr "包太大超過了目前 off_t 的定義" -#: builtin/index-pack.c:329 +#: builtin/index-pack.c #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "包超過了最大允許大小 (%s)" -#: builtin/index-pack.c:362 +#: builtin/index-pack.c msgid "pack signature mismatch" msgstr "包簽名不符合" -#: builtin/index-pack.c:364 +#: builtin/index-pack.c #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "不支援包版本 %<PRIu32>" -#: builtin/index-pack.c:380 +#: builtin/index-pack.c #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包中有錯誤的物件位於位移量 %<PRIuMAX>：%s" -#: builtin/index-pack.c:485 +#: builtin/index-pack.c #, c-format msgid "inflate returned %d" msgstr "解壓縮返回 %d" -#: builtin/index-pack.c:534 +#: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" -#: builtin/index-pack.c:542 +#: builtin/index-pack.c msgid "delta base offset is out of bound" msgstr "delta 基準位移越界" -#: builtin/index-pack.c:550 +#: builtin/index-pack.c #, c-format msgid "unknown object type %d" msgstr "未知物件類型 %d" -#: builtin/index-pack.c:581 +#: builtin/index-pack.c msgid "cannot pread pack file" msgstr "無法讀取包檔案" -#: builtin/index-pack.c:583 +#: builtin/index-pack.c #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包檔案過早結束，缺少 %<PRIuMAX> 位元組" -#: builtin/index-pack.c:609 +#: builtin/index-pack.c msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c:754 builtin/index-pack.c:760 builtin/index-pack.c:784 -#: builtin/index-pack.c:823 builtin/index-pack.c:832 +#: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" -#: builtin/index-pack.c:757 builtin/pack-objects.c:290 -#: builtin/pack-objects.c:350 builtin/pack-objects.c:456 +#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to read %s" msgstr "不能讀 %s" -#: builtin/index-pack.c:821 +#: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" msgstr "不能讀取現存物件訊息 %s" -#: builtin/index-pack.c:829 +#: builtin/index-pack.c #, c-format msgid "cannot read existing object %s" msgstr "不能讀取現存物件 %s" -#: builtin/index-pack.c:843 +#: builtin/index-pack.c #, c-format msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c:846 builtin/index-pack.c:865 +#: builtin/index-pack.c msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" -#: builtin/index-pack.c:867 +#: builtin/index-pack.c #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c:928 builtin/index-pack.c:975 +#: builtin/index-pack.c msgid "failed to apply delta" msgstr "套用 delta 失敗" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c msgid "Receiving objects" msgstr "接收物件中" -#: builtin/index-pack.c:1161 +#: builtin/index-pack.c msgid "Indexing objects" msgstr "索引物件中" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c msgid "pack is corrupted (SHA1 mismatch)" msgstr "包衝突（SHA1 不符合）" -#: builtin/index-pack.c:1200 +#: builtin/index-pack.c msgid "cannot fstat packfile" msgstr "不能對 packfile 呼叫 fstat" -#: builtin/index-pack.c:1203 +#: builtin/index-pack.c msgid "pack has junk at the end" msgstr "包的結尾有垃圾資料" -#: builtin/index-pack.c:1215 +#: builtin/index-pack.c msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的問題" -#: builtin/index-pack.c:1238 +#: builtin/index-pack.c msgid "Resolving deltas" msgstr "處理 delta 中" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2913 +#: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" -#: builtin/index-pack.c:1282 +#: builtin/index-pack.c msgid "confusion beyond insanity" msgstr "不可理喻" -#: builtin/index-pack.c:1288 +#: builtin/index-pack.c #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 個本機物件" -#: builtin/index-pack.c:1300 +#: builtin/index-pack.c #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）" -#: builtin/index-pack.c:1304 +#: builtin/index-pack.c #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 個未解決的 delta" -#: builtin/index-pack.c:1328 +#: builtin/index-pack.c #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能壓縮附加物件（%d）" -#: builtin/index-pack.c:1423 +#: builtin/index-pack.c #, c-format msgid "local object %s is corrupt" msgstr "本機物件 %s 已損壞" -#: builtin/index-pack.c:1445 +#: builtin/index-pack.c #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "packfile 名稱「%s」的結尾不是「.%s」" -#: builtin/index-pack.c:1469 +#: builtin/index-pack.c #, c-format msgid "cannot write %s file '%s'" msgstr "無法寫入 %s 檔案 '%s'" -#: builtin/index-pack.c:1477 +#: builtin/index-pack.c #, c-format msgid "cannot close written %s file '%s'" msgstr "無法關閉已寫入的 %s 檔案 '%s'" -#: builtin/index-pack.c:1494 +#: builtin/index-pack.c #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "無法將「*.%s」暫存檔的檔名更改為「%s」" -#: builtin/index-pack.c:1519 +#: builtin/index-pack.c msgid "error while closing pack file" msgstr "關閉包檔案時發生錯誤" -#: builtin/index-pack.c:1578 builtin/pack-objects.c:3158 +#: builtin/index-pack.c builtin/pack-objects.c #, c-format -msgid "bad pack.indexversion=%<PRIu32>" -msgstr "壞的 pack.indexversion=%<PRIu32>" +msgid "bad pack.indexVersion=%<PRIu32>" +msgstr "無效的 pack.indexVersion=%<PRIu32>" -#: builtin/index-pack.c:1648 +#: builtin/index-pack.c #, c-format msgid "Cannot open existing pack file '%s'" msgstr "無法開啟現有包檔案 '%s'" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "無法為 %s 開啟包索引檔案" -#: builtin/index-pack.c:1698 +#: builtin/index-pack.c #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 個物件" -#: builtin/index-pack.c:1705 +#: builtin/index-pack.c #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "鏈長 = %d: %lu 物件" -#: builtin/index-pack.c:1748 +#: builtin/index-pack.c msgid "Cannot come back to cwd" msgstr "無法返回目前工作目錄" -#: builtin/index-pack.c:1802 builtin/index-pack.c:1805 -#: builtin/index-pack.c:1825 builtin/index-pack.c:1829 +#: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c:1835 builtin/init-db.c:379 builtin/init-db.c:614 +#: builtin/index-pack.c builtin/init-db.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" -#: builtin/index-pack.c:1856 +#: builtin/index-pack.c msgid "--stdin requires a git repository" msgstr "--stdin 需要一個 git 版本庫" -#: builtin/index-pack.c:1873 +#: builtin/index-pack.c msgid "--verify with no packfile name given" msgstr "--verify 沒有提供 packfile 名稱參數" -#: builtin/index-pack.c:1939 builtin/unpack-objects.c:584 +#: builtin/index-pack.c builtin/unpack-objects.c msgid "fsck error in pack objects" msgstr "在打包物件中 fsck 檢查發生錯誤" -#: builtin/init-db.c:63 +#: builtin/init-db.c #, c-format msgid "cannot stat template '%s'" msgstr "不能對範本 '%s' 呼叫 stat" -#: builtin/init-db.c:68 +#: builtin/init-db.c #, c-format msgid "cannot opendir '%s'" msgstr "不能開啟目錄 '%s'" -#: builtin/init-db.c:80 +#: builtin/init-db.c #, c-format msgid "cannot readlink '%s'" msgstr "不能讀取連結 '%s'" -#: builtin/init-db.c:82 +#: builtin/init-db.c #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 建立符號連結" -#: builtin/init-db.c:88 +#: builtin/init-db.c #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能複製 '%s' 至 '%s'" -#: builtin/init-db.c:92 +#: builtin/init-db.c #, c-format msgid "ignoring template %s" msgstr "忽略範本 %s" -#: builtin/init-db.c:123 +#: builtin/init-db.c #, c-format msgid "templates not found in %s" msgstr "沒有在 %s 中找到範本" -#: builtin/init-db.c:138 +#: builtin/init-db.c #, c-format msgid "not copying templates from '%s': %s" msgstr "沒有從 '%s' 複製範本：%s" -#: builtin/init-db.c:263 +#: builtin/init-db.c #, c-format msgid "invalid initial branch name: '%s'" msgstr "無效的初始分支名稱：'%s'" -#: builtin/init-db.c:354 +#: builtin/init-db.c #, c-format msgid "unable to handle file type %d" msgstr "不能處理 %d 類型的檔案" -#: builtin/init-db.c:357 +#: builtin/init-db.c #, c-format msgid "unable to move %s to %s" msgstr "不能移動 %s 至 %s" -#: builtin/init-db.c:373 +#: builtin/init-db.c msgid "attempt to reinitialize repository with different hash" msgstr "嘗試以不同的雜湊值重新初始化版本庫" -#: builtin/init-db.c:397 builtin/init-db.c:400 +#: builtin/init-db.c #, c-format msgid "%s already exists" msgstr "%s 已經存在" -#: builtin/init-db.c:432 +#: builtin/init-db.c #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init: 忽略 --initial-branch=%s" -#: builtin/init-db.c:463 +#: builtin/init-db.c #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:464 +#: builtin/init-db.c #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "重新初始化已存在的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:469 +#: builtin/init-db.c #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 版本庫於 %s%s\n" -#: builtin/init-db.c:518 +#: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" @@ -17066,53 +8815,53 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] " "[<目錄>]" -#: builtin/init-db.c:544 +#: builtin/init-db.c msgid "permissions" msgstr "權限" -#: builtin/init-db.c:545 +#: builtin/init-db.c msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本庫是多個使用者之間共享的" -#: builtin/init-db.c:551 +#: builtin/init-db.c msgid "override the name of the initial branch" msgstr "覆蓋初始分支的名稱" -#: builtin/init-db.c:552 builtin/verify-pack.c:74 +#: builtin/init-db.c builtin/verify-pack.c msgid "hash" msgstr "雜湊" -#: builtin/init-db.c:553 builtin/show-index.c:22 builtin/verify-pack.c:75 +#: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c:591 builtin/init-db.c:596 +#: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c:600 builtin/init-db.c:655 +#: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" -#: builtin/init-db.c:627 +#: builtin/init-db.c #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "不允許 %s（或 --work-tree=<目錄>）而沒有指定 %s（或 --git-dir=<目錄>）" -#: builtin/init-db.c:679 +#: builtin/init-db.c #, c-format msgid "Cannot access work tree '%s'" msgstr "不能存取工作區 '%s'" -#: builtin/init-db.c:684 +#: builtin/init-db.c msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 與純版本庫不相容" -#: builtin/interpret-trailers.c:16 +#: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" @@ -17120,184 +8869,192 @@ msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <鍵>[(=|:)<值" ">])...] [<檔案>...]" -#: builtin/interpret-trailers.c:95 +#: builtin/interpret-trailers.c msgid "edit files in place" msgstr "在原位編輯檔案" -#: builtin/interpret-trailers.c:96 +#: builtin/interpret-trailers.c msgid "trim empty trailers" msgstr "刪除空的尾部署名" -#: builtin/interpret-trailers.c:99 +#: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "在哪裡放置新的尾部署名" -#: builtin/interpret-trailers.c:101 +#: builtin/interpret-trailers.c msgid "action if trailer already exists" msgstr "當尾部署名已經存在時所採取的動作" -#: builtin/interpret-trailers.c:103 +#: builtin/interpret-trailers.c msgid "action if trailer is missing" msgstr "當尾部署名缺少時所採取的動作" -#: builtin/interpret-trailers.c:105 +#: builtin/interpret-trailers.c msgid "output only the trailers" msgstr "只輸出尾部署名" -#: builtin/interpret-trailers.c:106 +#: builtin/interpret-trailers.c msgid "do not apply config rules" msgstr "不要套用組態設定規則" -#: builtin/interpret-trailers.c:107 +#: builtin/interpret-trailers.c msgid "join whitespace-continued values" msgstr "連線空白折行的值" -#: builtin/interpret-trailers.c:108 +#: builtin/interpret-trailers.c msgid "set parsing options" msgstr "設定解析選項" -#: builtin/interpret-trailers.c:110 +#: builtin/interpret-trailers.c msgid "do not treat --- specially" msgstr "不要對 --- 特殊處理" -#: builtin/interpret-trailers.c:112 +#: builtin/interpret-trailers.c msgid "trailer(s) to add" msgstr "要新增的尾部署名" -#: builtin/interpret-trailers.c:123 +#: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同時使用沒有意義" -#: builtin/interpret-trailers.c:133 +#: builtin/interpret-trailers.c msgid "no input file given for in-place editing" msgstr "沒有給出要原位編輯的檔案" -#: builtin/log.c:60 +#: builtin/log.c msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/log.c:61 +#: builtin/log.c msgid "git show [<options>] <object>..." msgstr "git show [<選項>] <物件>..." -#: builtin/log.c:114 +#: builtin/log.c #, c-format msgid "invalid --decorate option: %s" msgstr "無效的 --decorate 選項：%s" -#: builtin/log.c:181 +#: builtin/log.c diff.c +msgid "suppress diff output" +msgstr "不顯示差異輸出" + +#: builtin/log.c msgid "show source" msgstr "顯示來源" -#: builtin/log.c:182 +#: builtin/log.c msgid "use mail map file" msgstr "使用信件映射檔案" -#: builtin/log.c:185 +#: builtin/log.c msgid "only decorate refs that match <pattern>" msgstr "只修飾與 <模式> 符合的引用" -#: builtin/log.c:187 +#: builtin/log.c msgid "do not decorate refs that match <pattern>" msgstr "不修飾和 <模式> 符合的引用" -#: builtin/log.c:188 +#: builtin/log.c msgid "decorate options" msgstr "修飾選項" -#: builtin/log.c:191 +#: builtin/log.c msgid "" "trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "追蹤 <開始>,<結束> 範圍中橫列或 <檔案> 中> :<函數名稱> 的變化史" -#: builtin/log.c:214 +#: builtin/log.c builtin/shortlog.c bundle.c +#, c-format +msgid "unrecognized argument: %s" +msgstr "無法識別的參數：%s" + +#: builtin/log.c msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用" -#: builtin/log.c:322 +#: builtin/log.c #, c-format msgid "Final output: %d %s\n" msgstr "最終輸出：%d %s\n" -#: builtin/log.c:429 +#: builtin/log.c msgid "unable to create temporary object directory" msgstr "無法建立暫存物件目錄" -#: builtin/log.c:599 +#: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c:614 builtin/log.c:706 +#: builtin/log.c #, c-format msgid "could not read object %s" msgstr "不能讀取物件 %s" -#: builtin/log.c:731 +#: builtin/log.c #, c-format msgid "unknown type: %d" msgstr "未知類型：%d" -#: builtin/log.c:880 +#: builtin/log.c #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：從描述產生附函的模式無效" -#: builtin/log.c:887 +#: builtin/log.c msgid "format.headers without value" msgstr "format.headers 沒有值" -#: builtin/log.c:1016 +#: builtin/log.c #, c-format msgid "cannot open patch file %s" msgstr "無法開啟修補檔案 %s" -#: builtin/log.c:1033 +#: builtin/log.c msgid "need exactly one range" msgstr "只需要一個範圍" -#: builtin/log.c:1043 +#: builtin/log.c msgid "not a range" msgstr "不是一個範圍" -#: builtin/log.c:1207 +#: builtin/log.c msgid "cover letter needs email format" msgstr "附函需要信件位址格式" -#: builtin/log.c:1213 +#: builtin/log.c msgid "failed to create cover-letter file" msgstr "無法建立附函檔案" -#: builtin/log.c:1300 +#: builtin/log.c #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:1327 +#: builtin/log.c msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" -#: builtin/log.c:1385 +#: builtin/log.c msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c:1536 builtin/log.c:2369 builtin/log.c:2371 builtin/log.c:2383 +#: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c:1547 builtin/replace.c:58 builtin/replace.c:207 -#: builtin/replace.c:210 +#: builtin/log.c builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" -#: builtin/log.c:1556 +#: builtin/log.c msgid "could not find exact merge base" msgstr "不能找到準確的合併基礎" -#: builtin/log.c:1566 +#: builtin/log.c 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" @@ -17307,394 +9064,399 @@ msgstr "" "git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n" "參數 --base=<基礎提交> 手動指定一個基礎提交" -#: builtin/log.c:1589 +#: builtin/log.c msgid "failed to find exact merge base" msgstr "無法找到準確的合併基礎" -#: builtin/log.c:1606 +#: builtin/log.c msgid "base commit should be the ancestor of revision list" msgstr "基礎提交應該是版本列表的祖先" -#: builtin/log.c:1616 +#: builtin/log.c msgid "base commit shouldn't be in revision list" msgstr "基礎提交不應該出現在版本列表中" -#: builtin/log.c:1674 +#: builtin/log.c msgid "cannot get patch id" msgstr "無法得到修補檔 id" -#: builtin/log.c:1737 +#: builtin/log.c msgid "failed to infer range-diff origin of current series" msgstr "無法推斷目前系列的 range-diff 起點" -#: builtin/log.c:1739 +#: builtin/log.c #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "將 '%s' 當作目前系列的 range-diff 起點" -#: builtin/log.c:1783 +#: builtin/log.c msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一個修補檔" -#: builtin/log.c:1786 +#: builtin/log.c msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多個修補檔" -#: builtin/log.c:1790 +#: builtin/log.c msgid "print patches to standard out" msgstr "列印修補檔到標準輸出" -#: builtin/log.c:1792 +#: builtin/log.c msgid "generate a cover letter" msgstr "生成一封附函" -#: builtin/log.c:1794 +#: builtin/log.c msgid "use simple number sequence for output file names" msgstr "使用簡單的數字序列作為輸出檔案名" -#: builtin/log.c:1795 +#: builtin/log.c msgid "sfx" msgstr "後綴" -#: builtin/log.c:1796 +#: builtin/log.c msgid "use <sfx> instead of '.patch'" msgstr "使用 <後綴> 代替 '.patch'" -#: builtin/log.c:1798 +#: builtin/log.c msgid "start numbering patches at <n> instead of 1" msgstr "修補檔以 <n> 開始編號，而不是1" -#: builtin/log.c:1799 +#: builtin/log.c msgid "reroll-count" msgstr "reroll-count" -#: builtin/log.c:1800 +#: builtin/log.c msgid "mark the series as Nth re-roll" msgstr "標記修補檔系列是第幾次重製" -#: builtin/log.c:1802 +#: builtin/log.c msgid "max length of output filename" msgstr "輸出檔名的最大長度" -#: builtin/log.c:1804 +#: builtin/log.c msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" -#: builtin/log.c:1807 +#: builtin/log.c msgid "cover-from-description-mode" msgstr "從描述產生附函的模式" -#: builtin/log.c:1808 +#: builtin/log.c msgid "generate parts of a cover letter based on a branch's description" msgstr "基於分支描述產生部分附函" -#: builtin/log.c:1810 +#: builtin/log.c msgid "use [<prefix>] instead of [PATCH]" msgstr "使用 [<前綴>] 代替 [PATCH]" -#: builtin/log.c:1813 +#: builtin/log.c msgid "store resulting files in <dir>" msgstr "把結果檔案儲存在 <目錄>" -#: builtin/log.c:1816 +#: builtin/log.c msgid "don't strip/add [PATCH]" msgstr "不刪除/新增 [PATCH]" -#: builtin/log.c:1819 +#: builtin/log.c msgid "don't output binary diffs" msgstr "不輸出二進位差異" -#: builtin/log.c:1821 +#: builtin/log.c msgid "output all-zero hash in From header" msgstr "在 From 標頭訊息中輸出全為零的雜湊值" -#: builtin/log.c:1823 +#: builtin/log.c msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的修補檔" -#: builtin/log.c:1825 +#: builtin/log.c msgid "show patch format instead of default (patch + stat)" msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）" -#: builtin/log.c:1827 +#: builtin/log.c msgid "Messaging" msgstr "信件傳送" -#: builtin/log.c:1828 +#: builtin/log.c msgid "header" msgstr "header" -#: builtin/log.c:1829 +#: builtin/log.c msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c:1830 builtin/log.c:1831 +#: builtin/log.c msgid "email" msgstr "信件位址" -#: builtin/log.c:1830 +#: builtin/log.c msgid "add To: header" msgstr "新增收件人" -#: builtin/log.c:1831 +#: builtin/log.c msgid "add Cc: header" msgstr "新增抄送" -#: builtin/log.c:1832 +#: builtin/log.c msgid "ident" msgstr "標記" -#: builtin/log.c:1833 +#: builtin/log.c msgid "set From address to <ident> (or committer ident if absent)" msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）" -#: builtin/log.c:1835 +#: builtin/log.c msgid "message-id" msgstr "信件標記" -#: builtin/log.c:1836 +#: builtin/log.c msgid "make first mail a reply to <message-id>" msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c:1837 builtin/log.c:1840 +#: builtin/log.c msgid "boundary" msgstr "邊界" -#: builtin/log.c:1838 +#: builtin/log.c msgid "attach the patch" msgstr "附件方式新增修補檔" -#: builtin/log.c:1841 +#: builtin/log.c msgid "inline the patch" msgstr "內聯顯示修補檔" -#: builtin/log.c:1845 +#: builtin/log.c msgid "enable message threading, styles: shallow, deep" msgstr "啟用信件線索，風格：淺，深" -#: builtin/log.c:1847 +#: builtin/log.c msgid "signature" msgstr "簽名" -#: builtin/log.c:1848 +#: builtin/log.c msgid "add a signature" msgstr "新增一個簽名" -#: builtin/log.c:1849 +#: builtin/log.c msgid "base-commit" msgstr "基礎提交" -#: builtin/log.c:1850 +#: builtin/log.c msgid "add prerequisite tree info to the patch series" msgstr "為修補檔列表新增前置樹訊息" -#: builtin/log.c:1853 +#: builtin/log.c msgid "add a signature from a file" msgstr "從檔案新增一個簽名" -#: builtin/log.c:1854 +#: builtin/log.c msgid "don't print the patch filenames" msgstr "不要列印修補檔檔案名" -#: builtin/log.c:1856 +#: builtin/log.c msgid "show progress while generating patches" msgstr "在生成修補檔時顯示進度" -#: builtin/log.c:1858 +#: builtin/log.c msgid "show changes against <rev> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <rev> 的差異" -#: builtin/log.c:1861 +#: builtin/log.c msgid "show changes against <refspec> in cover letter or single patch" msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異" -#: builtin/log.c:1863 builtin/range-diff.c:28 +#: builtin/log.c builtin/range-diff.c msgid "percentage by which creation is weighted" msgstr "建立權重的百分比" -#: builtin/log.c:1953 +#: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "包含無效的身份標記：%s" -#: builtin/log.c:1978 +#: builtin/log.c msgid "--name-only does not make sense" msgstr "--name-only 無意義" -#: builtin/log.c:1980 +#: builtin/log.c msgid "--name-status does not make sense" msgstr "--name-status 無意義" -#: builtin/log.c:1982 +#: builtin/log.c msgid "--check does not make sense" msgstr "--check 無意義" -#: builtin/log.c:1984 +#: builtin/log.c msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 無意義" -#: builtin/log.c:2129 +#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c +#, c-format +msgid "could not create directory '%s'" +msgstr "不能建立目錄 '%s'" + +#: builtin/log.c msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2133 +#: builtin/log.c msgid "Interdiff:" msgstr "版本間差異：" -#: builtin/log.c:2134 +#: builtin/log.c #, c-format msgid "Interdiff against v%d:" msgstr "對 v%d 的版本差異：" -#: builtin/log.c:2144 +#: builtin/log.c msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或單一修補檔" -#: builtin/log.c:2152 +#: builtin/log.c msgid "Range-diff:" msgstr "範圍差異：" -#: builtin/log.c:2153 +#: builtin/log.c #, c-format msgid "Range-diff against v%d:" msgstr "對 v%d 的範圍差異：" -#: builtin/log.c:2164 +#: builtin/log.c #, c-format msgid "unable to read signature file '%s'" msgstr "無法讀取簽名檔案 '%s'" -#: builtin/log.c:2200 +#: builtin/log.c msgid "Generating patches" msgstr "生成修補檔" -#: builtin/log.c:2244 +#: builtin/log.c msgid "failed to create output files" msgstr "無法建立輸出檔案" -#: builtin/log.c:2304 +#: builtin/log.c msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]" -#: builtin/log.c:2358 +#: builtin/log.c #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到追蹤的遠端分支，請手動指定 <上游>。\n" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<選項>] [<檔案>...]" -#: builtin/ls-files.c:618 +#: builtin/ls-files.c msgid "separate paths with the NUL character" msgstr "用 NUL 字元分隔路徑" -#: builtin/ls-files.c:620 +#: builtin/ls-files.c msgid "identify the file status with tags" msgstr "用標籤標記檔案的狀態" -#: builtin/ls-files.c:622 +#: builtin/ls-files.c msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小寫字母表示 '假設未改變的' 檔案" -#: builtin/ls-files.c:624 +#: builtin/ls-files.c msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小寫字母表示 'fsmonitor clean' 檔案" -#: builtin/ls-files.c:626 +#: builtin/ls-files.c msgid "show cached files in the output (default)" msgstr "顯示快取的檔案（預設）" -#: builtin/ls-files.c:628 +#: builtin/ls-files.c msgid "show deleted files in the output" msgstr "顯示已刪除的檔案" -#: builtin/ls-files.c:630 +#: builtin/ls-files.c msgid "show modified files in the output" msgstr "顯示已修改的檔案" -#: builtin/ls-files.c:632 +#: builtin/ls-files.c msgid "show other files in the output" msgstr "顯示其它檔案" -#: builtin/ls-files.c:634 +#: builtin/ls-files.c msgid "show ignored files in the output" msgstr "顯示忽略的檔案" -#: builtin/ls-files.c:637 +#: builtin/ls-files.c msgid "show staged contents' object name in the output" msgstr "顯示暫存區內容的物件名稱" -#: builtin/ls-files.c:639 +#: builtin/ls-files.c msgid "show files on the filesystem that need to be removed" msgstr "顯示檔案系統需要刪除的檔案" -#: builtin/ls-files.c:641 +#: builtin/ls-files.c msgid "show 'other' directories' names only" msgstr "只顯示「其他」目錄的名稱" -#: builtin/ls-files.c:643 +#: builtin/ls-files.c msgid "show line endings of files" msgstr "顯示檔案換行符號格式" -#: builtin/ls-files.c:645 +#: builtin/ls-files.c msgid "don't show empty directories" msgstr "不顯示空目錄" -#: builtin/ls-files.c:648 +#: builtin/ls-files.c msgid "show unmerged files in the output" msgstr "顯示未合併的檔案" -#: builtin/ls-files.c:650 +#: builtin/ls-files.c msgid "show resolve-undo information" msgstr "顯示 resolve-undo 訊息" -#: builtin/ls-files.c:652 +#: builtin/ls-files.c msgid "skip files matching pattern" msgstr "符合排除檔案的模式" -#: builtin/ls-files.c:655 +#: builtin/ls-files.c msgid "read exclude patterns from <file>" msgstr "從 <檔案> 讀取排除模式 (pattern)" -#: builtin/ls-files.c:658 +#: builtin/ls-files.c msgid "read additional per-directory exclude patterns in <file>" msgstr "從 <檔案> 讀取額外的每個目錄的排除模式" -#: builtin/ls-files.c:660 +#: builtin/ls-files.c msgid "add the standard git exclusions" msgstr "新增標準的 git 排除" -#: builtin/ls-files.c:664 +#: builtin/ls-files.c msgid "make the output relative to the project top directory" msgstr "顯示相對於頂級目錄的檔案名" -#: builtin/ls-files.c:669 +#: builtin/ls-files.c msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <檔案> 都不在索引區，視為錯誤" -#: builtin/ls-files.c:670 +#: builtin/ls-files.c msgid "tree-ish" msgstr "樹或提交" -#: builtin/ls-files.c:671 +#: builtin/ls-files.c msgid "pretend that paths removed since <tree-ish> are still present" msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在" -#: builtin/ls-files.c:673 +#: builtin/ls-files.c msgid "show debugging data" msgstr "顯示除錯資料" -#: builtin/ls-files.c:675 +#: builtin/ls-files.c msgid "suppress duplicate entries" msgstr "不顯示重複項目" -#: builtin/ls-files.c:677 +#: builtin/ls-files.c msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在時顯示稀疏目錄" -#: builtin/ls-remote.c:9 +#: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" @@ -17704,205 +9466,205 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<版本庫> [<引用>...]]" -#: builtin/ls-remote.c:60 +#: builtin/ls-remote.c msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1131 +#: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 +#: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "遠端主機上的 git-upload-pack 路徑" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c msgid "limit to tags" msgstr "僅限於標籤" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c msgid "limit to heads" msgstr "僅限於分支" -#: builtin/ls-remote.c:68 +#: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "不顯示已解析的標籤" -#: builtin/ls-remote.c:70 +#: builtin/ls-remote.c msgid "take url.<base>.insteadOf into account" msgstr "參考 url.<base>.insteadOf 設定" -#: builtin/ls-remote.c:73 +#: builtin/ls-remote.c msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到符合的引用則以離開碼2離開" -#: builtin/ls-remote.c:76 +#: builtin/ls-remote.c msgid "show underlying ref in addition to the object pointed by it" msgstr "除了顯示指向的物件外，顯示指向的引用名" -#: builtin/ls-tree.c:36 +#: builtin/ls-tree.c msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<選項>] <樹或提交> [<路徑>...]" -#: builtin/ls-tree.c:54 +#: builtin/ls-tree.c #, c-format msgid "could not get object info about '%s'" msgstr "無法取得「%s」相關的物件資訊" -#: builtin/ls-tree.c:79 +#: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "無效的 ls-tree 格式：「%s」元素的開頭不是「(」" -#: builtin/ls-tree.c:83 +#: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: element '%s' does not end in ')'" msgstr "無效的 ls-tree 格式：「%s」元素的結尾不是「)」" -#: builtin/ls-tree.c:109 +#: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: %%%.*s" msgstr "無效的 ls-tree 格式：%%%.*s" -#: builtin/ls-tree.c:336 +#: builtin/ls-tree.c msgid "only show trees" msgstr "只顯示樹" -#: builtin/ls-tree.c:338 +#: builtin/ls-tree.c msgid "recurse into subtrees" msgstr "遞迴到子樹" -#: builtin/ls-tree.c:340 +#: builtin/ls-tree.c msgid "show trees when recursing" msgstr "當遞迴時顯示樹" -#: builtin/ls-tree.c:343 +#: builtin/ls-tree.c msgid "terminate entries with NUL byte" msgstr "條目以 NUL 字元終止" -#: builtin/ls-tree.c:344 +#: builtin/ls-tree.c msgid "include object size" msgstr "包括物件大小" -#: builtin/ls-tree.c:346 builtin/ls-tree.c:348 +#: builtin/ls-tree.c msgid "list only filenames" msgstr "只列出檔案名" -#: builtin/ls-tree.c:350 +#: builtin/ls-tree.c msgid "list only objects" msgstr "只列出物件" -#: builtin/ls-tree.c:353 +#: builtin/ls-tree.c msgid "use full path names" msgstr "使用檔案的全路徑" -#: builtin/ls-tree.c:355 +#: builtin/ls-tree.c msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整個樹；不僅僅目前目錄（隱含 --full-name）" -#: builtin/ls-tree.c:391 +#: builtin/ls-tree.c msgid "--format can't be combined with other format-altering options" msgstr "--format 不能與其他修改格式的選項結合使用" #. TRANSLATORS: keep <> in "<" mail ">" info. -#: builtin/mailinfo.c:14 +#: builtin/mailinfo.c msgid "git mailinfo [<options>] <msg> <patch> < mail >info" msgstr "git mailinfo [<選項>] <訊息> <修補檔> < mail >info" -#: builtin/mailinfo.c:58 +#: builtin/mailinfo.c msgid "keep subject" msgstr "保留主旨" -#: builtin/mailinfo.c:60 +#: builtin/mailinfo.c msgid "keep non patch brackets in subject" msgstr "保留主旨中不是 PATCH 的方括號" -#: builtin/mailinfo.c:62 +#: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" msgstr "複製 Message-ID 至提交說明末尾" -#: builtin/mailinfo.c:64 +#: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" msgstr "重新將中介資料編碼為 i18n.commitEncoding 的設定值" -#: builtin/mailinfo.c:67 +#: builtin/mailinfo.c msgid "disable charset re-coding of metadata" msgstr "停用中介資料的字元重新編碼功能" -#: builtin/mailinfo.c:69 +#: builtin/mailinfo.c msgid "encoding" msgstr "編碼" -#: builtin/mailinfo.c:70 +#: builtin/mailinfo.c msgid "re-code metadata to this encoding" msgstr "重新將中介資料編碼為這個編碼方式" -#: builtin/mailinfo.c:72 +#: builtin/mailinfo.c msgid "use scissors" msgstr "使用剪刀標記" -#: builtin/mailinfo.c:73 +#: builtin/mailinfo.c msgid "<action>" msgstr "<動作>" -#: builtin/mailinfo.c:74 +#: builtin/mailinfo.c msgid "action when quoted CR is found" msgstr "當找到可列印 CR 字元時所要採取的行為" -#: builtin/mailinfo.c:77 +#: builtin/mailinfo.c msgid "use headers in message's body" msgstr "在訊息內文中使用標頭" -#: builtin/mailsplit.c:227 +#: builtin/mailsplit.c msgid "reading patches from stdin/tty..." msgstr "正在從標準輸入或 tty 讀取修補檔內容⋯⋯" -#: builtin/mailsplit.c:242 +#: builtin/mailsplit.c #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" -#: builtin/merge-base.c:32 +#: builtin/merge-base.c msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <提交> <提交>..." -#: builtin/merge-base.c:33 +#: builtin/merge-base.c msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <提交>..." -#: builtin/merge-base.c:34 +#: builtin/merge-base.c msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <提交>..." -#: builtin/merge-base.c:35 +#: builtin/merge-base.c msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <提交> <提交>" -#: builtin/merge-base.c:36 +#: builtin/merge-base.c msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<提交>]" -#: builtin/merge-base.c:144 +#: builtin/merge-base.c msgid "output all common ancestors" msgstr "輸出所有共同的祖先" -#: builtin/merge-base.c:146 +#: builtin/merge-base.c msgid "find ancestors for a single n-way merge" msgstr "尋找一個多路合併的祖先提交" -#: builtin/merge-base.c:148 +#: builtin/merge-base.c msgid "list revs not reachable from others" msgstr "顯示不能被其他存取到的版本" -#: builtin/merge-base.c:150 +#: builtin/merge-base.c msgid "is the first one ancestor of the other?" msgstr "第一個是其他的祖先提交嗎？" -#: builtin/merge-base.c:152 +#: builtin/merge-base.c msgid "find where <commit> forked from reflog of <ref>" msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處" -#: builtin/merge-file.c:9 +#: builtin/merge-file.c msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" @@ -17910,253 +9672,261 @@ msgstr "" "git merge-file [<選項>] [-L <檔案1> [-L <初始> [-L <名字2>]]] <檔案1> <初始文" "件> <檔案2>" -#: builtin/merge-file.c:35 +#: builtin/merge-file.c msgid "send results to standard output" msgstr "將結果傳送到標準輸出" -#: builtin/merge-file.c:36 +#: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "使用基於 diff3 的合併" -#: builtin/merge-file.c:37 +#: builtin/merge-file.c msgid "use a zealous diff3 based merge" msgstr "使用基於 zealous diff3 的合併" -#: builtin/merge-file.c:39 +#: builtin/merge-file.c msgid "for conflicts, use our version" msgstr "如果衝突，使用我們的版本" -#: builtin/merge-file.c:41 +#: builtin/merge-file.c msgid "for conflicts, use their version" msgstr "如果衝突，使用他們的版本" -#: builtin/merge-file.c:43 +#: builtin/merge-file.c msgid "for conflicts, use a union version" msgstr "如果衝突，使用聯合版本" -#: builtin/merge-file.c:46 +#: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果衝突，使用指定長度的標記" -#: builtin/merge-file.c:47 +#: builtin/merge-file.c msgid "do not warn about conflicts" msgstr "不要警告衝突" -#: builtin/merge-file.c:49 +#: builtin/merge-file.c msgid "set labels for file1/orig-file/file2" msgstr "為 檔案1/初始檔案/檔案2 設定標籤" -#: builtin/merge-recursive.c:47 +#: builtin/merge-recursive.c #, c-format msgid "unknown option %s" msgstr "未知選項 %s" -#: builtin/merge-recursive.c:53 +#: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" msgstr "不能解析物件 '%s'" -#: builtin/merge-recursive.c:57 +#: builtin/merge-recursive.c #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" -#: builtin/merge-recursive.c:65 +#: builtin/merge-recursive.c msgid "not handling anything other than two heads merge." msgstr "不能處理兩個頭合併之外的任何動作。" -#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 +#: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "無法解析引用 '%s'" -#: builtin/merge-recursive.c:82 +#: builtin/merge-recursive.c #, c-format msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge.c:59 +#: builtin/merge.c msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<選項>] [<提交>...]" -#: builtin/merge.c:125 +#: builtin/merge.c msgid "switch `m' requires a value" msgstr "開關 `m' 需要一個值" -#: builtin/merge.c:148 +#: builtin/merge.c #, c-format msgid "option `%s' requires a value" msgstr "選項 `%s' 需要一個值" -#: builtin/merge.c:201 +#: builtin/merge.c #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合併策略 '%s'。\n" -#: builtin/merge.c:202 +#: builtin/merge.c #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" -#: builtin/merge.c:207 +#: builtin/merge.c #, c-format msgid "Available custom strategies are:" msgstr "可用的自訂策略有：" -#: builtin/merge.c:258 builtin/pull.c:134 +#: builtin/merge.c builtin/pull.c msgid "do not show a diffstat at the end of the merge" msgstr "在合併的最後不顯示差異統計" -#: builtin/merge.c:261 builtin/pull.c:137 +#: builtin/merge.c builtin/pull.c msgid "show a diffstat at the end of the merge" msgstr "在合併的最後顯示差異統計" -#: builtin/merge.c:262 builtin/pull.c:140 +#: builtin/merge.c builtin/pull.c msgid "(synonym to --stat)" msgstr "（和 --stat 同義）" -#: builtin/merge.c:264 builtin/pull.c:143 +#: builtin/merge.c builtin/pull.c msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在合併提交說明中新增（最多 <n> 條）精簡提交記錄" -#: builtin/merge.c:267 builtin/pull.c:149 +#: builtin/merge.c builtin/pull.c msgid "create a single commit instead of doing a merge" msgstr "建立一個單獨的提交而不是做一次合併" -#: builtin/merge.c:269 builtin/pull.c:152 +#: builtin/merge.c builtin/pull.c msgid "perform a commit if the merge succeeds (default)" msgstr "如果合併成功，執行一次提交（預設）" -#: builtin/merge.c:271 builtin/pull.c:155 +#: builtin/merge.c builtin/pull.c msgid "edit message before committing" msgstr "在提交前編輯提交說明" -#: builtin/merge.c:273 +#: builtin/merge.c msgid "allow fast-forward (default)" msgstr "允許快轉（預設）" -#: builtin/merge.c:275 builtin/pull.c:162 +#: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" msgstr "如果不能快轉就放棄合併" -#: builtin/merge.c:279 builtin/pull.c:168 +#: builtin/merge.c builtin/pull.c msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c:280 builtin/notes.c:785 builtin/pull.c:172 -#: builtin/rebase.c:1145 builtin/revert.c:114 +#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c +#: builtin/revert.c msgid "strategy" msgstr "策略" -#: builtin/merge.c:281 builtin/pull.c:173 +#: builtin/merge.c builtin/pull.c msgid "merge strategy to use" msgstr "要使用的合併策略" -#: builtin/merge.c:282 builtin/pull.c:176 +#: builtin/merge.c builtin/pull.c msgid "option=value" msgstr "option=value" -#: builtin/merge.c:283 builtin/pull.c:177 +#: builtin/merge.c builtin/pull.c msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge.c:285 +#: builtin/merge.c msgid "merge commit message (for a non-fast-forward merge)" msgstr "合併的提交說明（針對非快轉式合併）" -#: builtin/merge.c:291 +#: builtin/merge.c msgid "use <name> instead of the real target" msgstr "使用 <名稱> 而非實際目的地" -#: builtin/merge.c:294 +#: builtin/merge.c msgid "abort the current in-progress merge" msgstr "放棄目前正在進行的合併" # -#: builtin/merge.c:296 +#: builtin/merge.c msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作區" -#: builtin/merge.c:298 +#: builtin/merge.c msgid "continue the current in-progress merge" msgstr "繼續目前正在進行的合併" -#: builtin/merge.c:300 builtin/pull.c:184 +#: builtin/merge.c builtin/pull.c msgid "allow merging unrelated histories" msgstr "允許合並不相關的歷史" -#: builtin/merge.c:307 +#: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤" -#: builtin/merge.c:323 +#: builtin/merge.c msgid "could not run stash." msgstr "不能執行儲藏。" -#: builtin/merge.c:328 +#: builtin/merge.c msgid "stash failed" msgstr "儲藏失敗" -#: builtin/merge.c:333 +#: builtin/merge.c #, c-format msgid "not a valid object: %s" msgstr "不是一個有效物件：%s" -#: builtin/merge.c:355 builtin/merge.c:372 +#: builtin/merge.c msgid "read-tree failed" msgstr "讀取樹失敗" # 譯者：請維持前導空格 -#: builtin/merge.c:403 +#: builtin/merge.c msgid "Already up to date. (nothing to squash)" msgstr "已經是最新的。（無需壓縮 (squash)）" -#: builtin/merge.c:417 +#: builtin/merge.c merge-ort-wrappers.c merge-recursive.c +msgid "Already up to date." +msgstr "已經是最新的。" + +#: builtin/merge.c #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "壓縮提交 -- 未更新 HEAD\n" -#: builtin/merge.c:467 +#: builtin/merge.c #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "無合併訊息 -- 未更新 HEAD\n" -#: builtin/merge.c:517 +#: builtin/merge.c #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 沒有指向一個提交" -#: builtin/merge.c:605 +#: builtin/merge.c #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:732 +#: builtin/merge.c builtin/stash.c merge-recursive.c +msgid "Unable to write index." +msgstr "不能寫入索引。" + +#: builtin/merge.c msgid "Not handling anything other than two heads merge." msgstr "未處理兩個頭合併之外的任何動作。" -#: builtin/merge.c:745 +#: builtin/merge.c #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge.c:764 t/helper/test-fast-rebase.c:223 +#: builtin/merge.c t/helper/test-fast-rebase.c #, c-format msgid "unable to write %s" msgstr "不能寫 %s" -#: builtin/merge.c:816 +#: builtin/merge.c #, c-format msgid "Could not read from '%s'" msgstr "不能從 '%s' 讀取" -#: builtin/merge.c:825 +#: builtin/merge.c #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合並，使用 'git commit' 完成此次合併。\n" -#: builtin/merge.c:831 +#: builtin/merge.c msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -18166,83 +9936,88 @@ msgstr "" "合併到主題分支。\n" "\n" -#: builtin/merge.c:836 +#: builtin/merge.c msgid "An empty message aborts the commit.\n" msgstr "空的提交說明會終止提交。\n" -#: builtin/merge.c:839 +#: builtin/merge.c #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n" -#: builtin/merge.c:900 +#: builtin/merge.c msgid "Empty commit message." msgstr "空提交說明。" -#: builtin/merge.c:915 +#: builtin/merge.c #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:976 +#: builtin/merge.c #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n" -#: builtin/merge.c:1015 +#: builtin/merge.c msgid "No current branch." msgstr "沒有目前分支。" -#: builtin/merge.c:1017 +#: builtin/merge.c msgid "No remote for the current branch." msgstr "目前分支沒有對應的遠端版本庫。" -#: builtin/merge.c:1019 +#: builtin/merge.c msgid "No default upstream defined for the current branch." msgstr "目前分支沒有定義預設的上游分支。" -#: builtin/merge.c:1024 +#: builtin/merge.c #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" -#: builtin/merge.c:1081 +#: builtin/merge.c #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c:1183 +#: builtin/merge.c read-cache.c strbuf.c wrapper.c +#, c-format +msgid "could not close '%s'" +msgstr "不能關閉 '%s'" + +#: builtin/merge.c #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合併：%s" -#: builtin/merge.c:1217 +#: builtin/merge.c msgid "not something we can merge" msgstr "不能合併" -#: builtin/merge.c:1330 +#: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort 不帶參數" -#: builtin/merge.c:1334 +#: builtin/merge.c msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1352 +#: builtin/merge.c msgid "--quit expects no arguments" msgstr "--quit 不帶參數" -#: builtin/merge.c:1365 +#: builtin/merge.c msgid "--continue expects no arguments" msgstr "--continue 不帶參數" -#: builtin/merge.c:1369 +#: builtin/merge.c msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。" -#: builtin/merge.c:1385 +#: builtin/merge.c msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18250,7 +10025,7 @@ msgstr "" "您尚未結束您的合併（存在 MERGE_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1392 +#: builtin/merge.c msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -18258,130 +10033,134 @@ msgstr "" "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n" "請在合併前先提交您的修改。" -#: builtin/merge.c:1395 +#: builtin/merge.c msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1427 +#: builtin/merge.c msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交並且 merge.defaultToUpstream 未設定。" -#: builtin/merge.c:1444 +#: builtin/merge.c msgid "Squash commit into empty head not supported yet" msgstr "尚不支援到空分支的壓縮提交" -#: builtin/merge.c:1446 +#: builtin/merge.c msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快轉式提交沒有意義" -#: builtin/merge.c:1451 +#: builtin/merge.c #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合併" -#: builtin/merge.c:1453 +#: builtin/merge.c msgid "Can merge only exactly one commit into empty head" msgstr "只能將一個提交合並到空分支上" -#: builtin/merge.c:1540 +#: builtin/merge.c msgid "refusing to merge unrelated histories" msgstr "拒絕合併無關的歷史" -#: builtin/merge.c:1559 +#: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1606 +#: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "嘗試非常小的索引內合併...\n" -#: builtin/merge.c:1613 +#: builtin/merge.c #, c-format msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c:1671 builtin/merge.c:1737 +#: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" -#: builtin/merge.c:1675 +#: builtin/merge.c #, c-format msgid "Trying merge strategy %s...\n" msgstr "嘗試合併策略 %s...\n" -#: builtin/merge.c:1727 +#: builtin/merge.c #, c-format msgid "No merge strategy handled the merge.\n" msgstr "沒有合併策略處理此合併。\n" -#: builtin/merge.c:1729 +#: builtin/merge.c #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合併失敗。\n" -#: builtin/merge.c:1739 +#: builtin/merge.c #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略，準備自行解決。\n" -#: builtin/merge.c:1753 +#: builtin/merge.c #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自動合併進展順利，按要求在提交前停止\n" -#: builtin/mktag.c:27 +#: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "警告：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c:38 +#: builtin/mktag.c #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "錯誤：標籤輸入未通過 fsck：%s" -#: builtin/mktag.c:41 +#: builtin/mktag.c #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式" -#: builtin/mktag.c:56 +#: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" msgstr "無法讀取有標籤的物件「%s」" -#: builtin/mktag.c:59 +#: builtin/mktag.c #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "「%s」已標為「%s」，但卻是「%s」類型" -#: builtin/mktag.c:97 +#: builtin/mktag.c imap-send.c trailer.c +msgid "could not read from stdin" +msgstr "不能自標準輸入讀取" + +#: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查" -#: builtin/mktag.c:100 +#: builtin/mktag.c msgid "tag on stdin did not refer to a valid object" msgstr "標準輸入上的標籤指向的不是有效物件" -#: builtin/mktag.c:103 builtin/tag.c:243 +#: builtin/mktag.c builtin/tag.c msgid "unable to write tag file" msgstr "無法寫標籤檔案" -#: builtin/mktree.c:154 +#: builtin/mktree.c msgid "input is NUL terminated" msgstr "輸入以 NUL 字元終止" -#: builtin/mktree.c:155 builtin/write-tree.c:26 +#: builtin/mktree.c builtin/write-tree.c msgid "allow missing objects" msgstr "允許遺失的物件" -#: builtin/mktree.c:156 +#: builtin/mktree.c msgid "allow creation of more than one tree" msgstr "允許建立一個以上的樹" -#: builtin/multi-pack-index.c:10 +#: builtin/multi-pack-index.c msgid "" "git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-" "snapshot=<path>]" @@ -18389,197 +10168,201 @@ msgstr "" "git multi-pack-index [<選項>] write [--preferred-pack=<包>] [--refs-" "snapshot=<路徑>]" -#: builtin/multi-pack-index.c:14 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] verify" msgstr "git multi-pack-index [<選項>] verify" -#: builtin/multi-pack-index.c:17 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] expire" msgstr "git multi-pack-index [<選項>] expire" -#: builtin/multi-pack-index.c:20 +#: builtin/multi-pack-index.c msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]" msgstr "git multi-pack-index [<選項>] repack [--batch-size=<大小>]" -#: builtin/multi-pack-index.c:57 +#: builtin/multi-pack-index.c +msgid "directory" +msgstr "目錄" + +#: builtin/multi-pack-index.c msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成對 packfile 和包索引的物件目錄" -#: builtin/multi-pack-index.c:98 +#: builtin/multi-pack-index.c msgid "preferred-pack" msgstr "偏好包" -#: builtin/multi-pack-index.c:99 +#: builtin/multi-pack-index.c msgid "pack for reuse when computing a multi-pack bitmap" msgstr "計算多包位圖時要重複使用的包" -#: builtin/multi-pack-index.c:100 +#: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "寫入多包位圖" -#: builtin/multi-pack-index.c:105 +#: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "寫入只包含指定索引的多包索引" -#: builtin/multi-pack-index.c:107 +#: builtin/multi-pack-index.c msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" -#: builtin/multi-pack-index.c:206 +#: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中" -#: builtin/mv.c:18 +#: builtin/mv.c msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<選項>] <來源>... <目的地>" -#: builtin/mv.c:83 +#: builtin/mv.c #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目錄 %s 在索引中並且不是子模組？" -#: builtin/mv.c:85 +#: builtin/mv.c msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" -#: builtin/mv.c:103 +#: builtin/mv.c #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" -#: builtin/mv.c:125 +#: builtin/mv.c msgid "force move/rename even if target exists" msgstr "強制移動/重指令，即使目標存在" -#: builtin/mv.c:127 +#: builtin/mv.c msgid "skip move/rename errors" msgstr "略過移動/重新命名錯誤" -#: builtin/mv.c:172 +#: builtin/mv.c #, c-format msgid "destination '%s' is not a directory" msgstr "目的地「%s」不是目錄" -#: builtin/mv.c:184 +#: builtin/mv.c #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c:190 +#: builtin/mv.c msgid "bad source" msgstr "來源損壞" -#: builtin/mv.c:193 +#: builtin/mv.c msgid "can not move directory into itself" msgstr "不能將目錄移動到自身" -#: builtin/mv.c:196 +#: builtin/mv.c msgid "cannot move directory over file" msgstr "不能將目錄移動到檔案" -#: builtin/mv.c:205 +#: builtin/mv.c msgid "source directory is empty" msgstr "來源目錄空白" -#: builtin/mv.c:231 +#: builtin/mv.c msgid "not under version control" msgstr "不在版本控制之下" -#: builtin/mv.c:233 +#: builtin/mv.c msgid "conflicted" msgstr "衝突" -#: builtin/mv.c:236 +#: builtin/mv.c msgid "destination exists" msgstr "目的地已存在" -#: builtin/mv.c:244 +#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" -#: builtin/mv.c:247 +#: builtin/mv.c msgid "Cannot overwrite" msgstr "不能覆蓋" -#: builtin/mv.c:250 +#: builtin/mv.c msgid "multiple sources for the same target" msgstr "同一目標具有多個來源" -#: builtin/mv.c:252 +#: builtin/mv.c msgid "destination directory does not exist" msgstr "找不到目的地目錄" -#: builtin/mv.c:280 +#: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，來源=%s，目的地=%s" -#: builtin/mv.c:308 +#: builtin/mv.c #, c-format msgid "Renaming %s to %s\n" msgstr "重新命名 %s 至 %s\n" -#: builtin/mv.c:314 builtin/remote.c:812 builtin/repack.c:861 +#: builtin/mv.c builtin/remote.c builtin/repack.c #, c-format msgid "renaming '%s' failed" msgstr "重新命名 '%s' 失敗" -#: builtin/name-rev.c:524 +#: builtin/name-rev.c msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<選項>] <提交>..." -#: builtin/name-rev.c:525 +#: builtin/name-rev.c msgid "git name-rev [<options>] --all" msgstr "git name-rev [<選項>] --all" -#: builtin/name-rev.c:526 +#: builtin/name-rev.c msgid "git name-rev [<options>] --annotate-stdin" msgstr "git name-rev [<options>] --annotate-stdin" -#: builtin/name-rev.c:583 +#: builtin/name-rev.c msgid "print only ref-based names (no object names)" msgstr "只輸出基於引用的名稱 (沒有物件名稱)" -#: builtin/name-rev.c:584 +#: builtin/name-rev.c msgid "only use tags to name the commits" msgstr "只使用標籤來命名提交" -#: builtin/name-rev.c:586 +#: builtin/name-rev.c msgid "only use refs matching <pattern>" msgstr "只使用和 <模式> 相符合的引用" -#: builtin/name-rev.c:588 +#: builtin/name-rev.c msgid "ignore refs matching <pattern>" msgstr "忽略和 <模式> 相符合的引用" -#: builtin/name-rev.c:590 +#: builtin/name-rev.c msgid "list all commits reachable from all refs" msgstr "列出可以從所有引用存取的提交" -#: builtin/name-rev.c:591 -msgid "deprecated: use annotate-stdin instead" -msgstr "已取代：請改用 annotate-stdin" +#: builtin/name-rev.c +msgid "deprecated: use --annotate-stdin instead" +msgstr "已廢棄：請改用 --annotate-stdin" -#: builtin/name-rev.c:592 +#: builtin/name-rev.c msgid "annotate text from stdin" msgstr "註解從標準輸入收到的文字" -#: builtin/name-rev.c:593 +#: builtin/name-rev.c msgid "allow to print `undefined` names (default)" msgstr "允許列印 `未定義` 的名稱（預設）" -#: builtin/name-rev.c:599 +#: builtin/name-rev.c msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" -#: builtin/notes.c:28 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <註解引用>] [list [<物件>]]" -#: builtin/notes.c:29 +#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" @@ -18587,11 +10370,11 @@ msgstr "" "git notes [--ref <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> " "| (-c | -C) <物件>] [<物件>]" -#: builtin/notes.c:30 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <註解引用>] copy [-f] <來源物件> <目標物件>" -#: builtin/notes.c:31 +#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" @@ -18599,138 +10382,136 @@ msgstr "" "git notes [--ref <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | " "(-c | -C) <物件>] [<物件>]" -#: builtin/notes.c:32 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <註解引用>] edit [--allow-empty] [<物件>]" -#: builtin/notes.c:33 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <註解引用>] show [<物件>]" -#: builtin/notes.c:34 +#: builtin/notes.c msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>" -#: builtin/notes.c:37 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <註解引用>] remove [<物件>...]" -#: builtin/notes.c:38 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] prune [-n] [-v]" msgstr "git notes [--ref <註解引用>] prune [-n] [-v]" -#: builtin/notes.c:39 +#: builtin/notes.c msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <註解引用>] get-ref" -#: builtin/notes.c:44 +#: builtin/notes.c msgid "git notes [list [<object>]]" msgstr "git notes [list [<物件>]]" -#: builtin/notes.c:49 +#: builtin/notes.c msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<選項>] [<物件>]" -#: builtin/notes.c:54 +#: builtin/notes.c msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<選項>] <來源物件> <目標物件>" -#: builtin/notes.c:55 +#: builtin/notes.c msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<來源物件> <目標物件>]..." -#: builtin/notes.c:60 +#: builtin/notes.c msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<選項>] [<物件>]" -#: builtin/notes.c:65 +#: builtin/notes.c msgid "git notes edit [<object>]" msgstr "git notes edit [<物件>]" -#: builtin/notes.c:70 +#: builtin/notes.c msgid "git notes show [<object>]" msgstr "git notes show [<物件>]" -#: builtin/notes.c:75 +#: builtin/notes.c msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<選項>] <註解引用>" -#: builtin/notes.c:76 +#: builtin/notes.c msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<選項>]" -#: builtin/notes.c:77 +#: builtin/notes.c msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<選項>]" -#: builtin/notes.c:82 +#: builtin/notes.c msgid "git notes remove [<object>]" msgstr "git notes remove [<物件>]" -#: builtin/notes.c:87 +#: builtin/notes.c msgid "git notes prune [<options>]" msgstr "git notes prune [<選項>]" -#: builtin/notes.c:97 +#: builtin/notes.c msgid "Write/edit the notes for the following object:" msgstr "為下面的物件寫/編輯說明：" -#: builtin/notes.c:149 +#: builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能為物件 '%s' 開始 'show'" -#: builtin/notes.c:153 +#: builtin/notes.c msgid "could not read 'show' output" msgstr "不能讀取 'show' 的輸出" -#: builtin/notes.c:161 +#: builtin/notes.c #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "無法為物件 '%s' 完成 'show'" -#: builtin/notes.c:194 +#: builtin/notes.c msgid "please supply the note contents using either -m or -F option" msgstr "請透過 -m 或 -F 選項為註解提供內容" -#: builtin/notes.c:203 +#: builtin/notes.c msgid "unable to write note object" msgstr "不能寫註解物件" -#: builtin/notes.c:206 +#: builtin/notes.c #, c-format msgid "the note contents have been left in %s" msgstr "註解內容被留在 %s 中" -#: builtin/notes.c:240 builtin/tag.c:582 +#: builtin/notes.c builtin/tag.c #, c-format msgid "could not open or read '%s'" msgstr "不能開啟或讀取 '%s'" -#: builtin/notes.c:261 builtin/notes.c:311 builtin/notes.c:313 -#: builtin/notes.c:381 builtin/notes.c:436 builtin/notes.c:524 -#: builtin/notes.c:529 builtin/notes.c:608 builtin/notes.c:670 +#: builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" -#: builtin/notes.c:263 +#: builtin/notes.c #, c-format msgid "failed to read object '%s'." msgstr "讀取物件 '%s' 失敗。" -#: builtin/notes.c:266 +#: builtin/notes.c #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能從非資料物件 '%s' 中讀取註解資料。" -#: builtin/notes.c:307 +#: builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" -#: builtin/notes.c:322 +#: builtin/notes.c #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "從 '%s' 複製註解到 '%s' 時失敗" @@ -18738,82 +10519,82 @@ msgstr "從 '%s' 複製註解到 '%s' 時失敗" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. -#: builtin/notes.c:354 +#: builtin/notes.c #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" -#: builtin/notes.c:387 builtin/notes.c:676 +#: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "未發現物件 %s 的註解。" -#: builtin/notes.c:408 builtin/notes.c:574 +#: builtin/notes.c msgid "note contents as a string" msgstr "註解內容作為一個字串" -#: builtin/notes.c:411 builtin/notes.c:577 +#: builtin/notes.c msgid "note contents in a file" msgstr "註解內容到一個檔案中" -#: builtin/notes.c:414 builtin/notes.c:580 +#: builtin/notes.c msgid "reuse and edit specified note object" msgstr "重用和編輯指定的註解物件" -#: builtin/notes.c:417 builtin/notes.c:583 +#: builtin/notes.c msgid "reuse specified note object" msgstr "重用指定的註解物件" -#: builtin/notes.c:420 builtin/notes.c:586 +#: builtin/notes.c msgid "allow storing empty note" msgstr "允許儲存空白備註" -#: builtin/notes.c:421 builtin/notes.c:494 +#: builtin/notes.c msgid "replace existing notes" msgstr "取代已存在的註解" -#: builtin/notes.c:446 +#: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c:461 builtin/notes.c:542 +#: builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c:473 builtin/notes.c:635 builtin/notes.c:904 +#: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" -#: builtin/notes.c:495 +#: builtin/notes.c msgid "read objects from stdin" msgstr "從標準輸入讀取物件" -#: builtin/notes.c:497 +#: builtin/notes.c msgid "load rewriting config for <command> (implies --stdin)" msgstr "重新載入 <命令> 的設定（隱含 --stdin）" -#: builtin/notes.c:515 +#: builtin/notes.c msgid "too few arguments" msgstr "太少參數" -#: builtin/notes.c:536 +#: builtin/notes.c #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能複製註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c:548 +#: builtin/notes.c #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "來源物件 %s 缺少註解。不能複製。" -#: builtin/notes.c:601 +#: builtin/notes.c #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -18822,97 +10603,97 @@ msgstr "" "子指令 'edit' 的選項 -m/-F/-c/-C 已棄用。\n" "請換用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:696 +#: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗" -#: builtin/notes.c:698 +#: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_REF" msgstr "刪除引用 NOTES_MERGE_REF 失敗" -#: builtin/notes.c:700 +#: builtin/notes.c msgid "failed to remove 'git notes merge' worktree" msgstr "刪除 'git notes merge' 工作區失敗" -#: builtin/notes.c:720 +#: builtin/notes.c msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "讀取引用 NOTES_MERGE_PARTIAL 失敗" -#: builtin/notes.c:722 +#: builtin/notes.c msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "無法從 NOTES_MERGE_PARTIAL 中找到提交。" -#: builtin/notes.c:724 +#: builtin/notes.c msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "無法從 NOTES_MERGE_PARTIAL 中解析提交。" -#: builtin/notes.c:737 +#: builtin/notes.c msgid "failed to resolve NOTES_MERGE_REF" msgstr "解析 NOTES_MERGE_REF 失敗" -#: builtin/notes.c:740 +#: builtin/notes.c msgid "failed to finalize notes merge" msgstr "無法完成註解合併" -#: builtin/notes.c:766 +#: builtin/notes.c #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的註解合併策略 %s" -#: builtin/notes.c:782 +#: builtin/notes.c msgid "General options" msgstr "通用選項" -#: builtin/notes.c:784 +#: builtin/notes.c msgid "Merge options" msgstr "合併選項" -#: builtin/notes.c:786 +#: builtin/notes.c msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解決註解衝突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:788 +#: builtin/notes.c msgid "Committing unmerged notes" msgstr "提交未合併的註解" -#: builtin/notes.c:790 +#: builtin/notes.c msgid "finalize notes merge by committing unmerged notes" msgstr "透過提交未合併的註解來完成註解合併" -#: builtin/notes.c:792 +#: builtin/notes.c msgid "Aborting notes merge resolution" msgstr "中止註解合併的方案" -#: builtin/notes.c:794 +#: builtin/notes.c msgid "abort notes merge" msgstr "中止註解合併" -#: builtin/notes.c:805 +#: builtin/notes.c msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" -#: builtin/notes.c:810 +#: builtin/notes.c msgid "must specify a notes ref to merge" msgstr "必須指定一個註解引用來合併" -#: builtin/notes.c:834 +#: builtin/notes.c #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" -#: builtin/notes.c:874 +#: builtin/notes.c #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位於 %2$s 的一個到 %1$s 中的註解合併正在執行中" -#: builtin/notes.c:878 +#: builtin/notes.c #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "無法儲存連結到目前的註解引用（%s）" -#: builtin/notes.c:880 +#: builtin/notes.c #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -18922,56 +10703,56 @@ msgstr "" "自動合併說明失敗。修改 %s 中的衝突並且使用指令 'git notes merge --commit' 提" "交結果，或者使用指令 'git notes merge --abort' 終止合併。\n" -#: builtin/notes.c:899 builtin/tag.c:595 +#: builtin/notes.c builtin/tag.c #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" -#: builtin/notes.c:902 +#: builtin/notes.c #, c-format msgid "Object %s has no note\n" msgstr "物件 %s 沒有註解\n" -#: builtin/notes.c:914 +#: builtin/notes.c msgid "attempt to remove non-existent note is not an error" msgstr "嘗試刪除不存在的註解不是一個錯誤" -#: builtin/notes.c:917 +#: builtin/notes.c msgid "read object names from the standard input" msgstr "從標準輸入讀取物件名稱" -#: builtin/notes.c:956 builtin/prune.c:144 builtin/worktree.c:148 +#: builtin/notes.c builtin/prune.c builtin/worktree.c msgid "do not remove, show only" msgstr "不刪除，只顯示" -#: builtin/notes.c:957 +#: builtin/notes.c msgid "report pruned notes" msgstr "回報剪除的註解" -#: builtin/notes.c:1000 +#: builtin/notes.c msgid "notes-ref" msgstr "註解引用" -#: builtin/notes.c:1001 +#: builtin/notes.c msgid "use notes from <notes-ref>" msgstr "從 <註解引用> 使用註解" -#: builtin/notes.c:1036 builtin/stash.c:1802 +#: builtin/notes.c builtin/stash.c #, c-format msgid "unknown subcommand: %s" msgstr "未知子指令：%s" -#: builtin/pack-objects.c:182 +#: builtin/pack-objects.c msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<選項>...] [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:183 +#: builtin/pack-objects.c msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<選項>...] <前綴名稱> [< <引用列表> | < <物件列表>]" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " @@ -18979,110 +10760,124 @@ msgid "" msgstr "" "write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量" -#: builtin/pack-objects.c:578 +#: builtin/pack-objects.c #, c-format msgid "bad packed object CRC for %s" msgstr "%s 錯的包物件 CRC" -#: builtin/pack-objects.c:589 +#: builtin/pack-objects.c #, c-format msgid "corrupt packed object for %s" msgstr "%s 損壞的包物件" -#: builtin/pack-objects.c:720 +#: builtin/pack-objects.c #, c-format msgid "recursive delta detected for object %s" msgstr "發現物件 %s 遞迴 delta" -#: builtin/pack-objects.c:939 +#: builtin/pack-objects.c #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "排序了 %u 個物件，預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1034 +#: builtin/pack-objects.c #, c-format msgid "expected object at offset %<PRIuMAX> in pack %s" msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件" -#: builtin/pack-objects.c:1158 +#: builtin/pack-objects.c msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個" -#: builtin/pack-objects.c:1171 +#: builtin/pack-objects.c msgid "Writing objects" msgstr "寫入物件中" -#: builtin/pack-objects.c:1243 builtin/update-index.c:90 +#: builtin/pack-objects.c builtin/update-index.c #, c-format msgid "failed to stat %s" msgstr "對 %s 呼叫 stat 失敗" -#: builtin/pack-objects.c:1276 +#: builtin/pack-objects.c object-file.c +#, c-format +msgid "failed utime() on %s" +msgstr "在 %s 上呼叫 utime() 失敗" + +#: builtin/pack-objects.c msgid "failed to write bitmap index" msgstr "無法寫入位圖索引" -#: builtin/pack-objects.c:1302 +#: builtin/pack-objects.c #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個" -#: builtin/pack-objects.c:1544 +#: builtin/pack-objects.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "停用 bitmap 寫入，因為一些物件將不會被打包" -#: builtin/pack-objects.c:1992 +#: builtin/pack-objects.c #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 壓縮中 delta 基準位移越界" -#: builtin/pack-objects.c:2001 +#: builtin/pack-objects.c #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基準位移越界" -#: builtin/pack-objects.c:2282 +#: builtin/pack-objects.c msgid "Counting objects" msgstr "物件計數中" -#: builtin/pack-objects.c:2447 +#: builtin/pack-objects.c pack-bitmap.c +#, c-format +msgid "unable to get size of %s" +msgstr "不能得到 %s 的大小" + +#: builtin/pack-objects.c #, c-format msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c:2517 builtin/pack-objects.c:2533 -#: builtin/pack-objects.c:2543 +#: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c:2520 builtin/pack-objects.c:2547 +#: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）" -#: builtin/pack-objects.c:2557 +#: builtin/pack-objects.c msgid "suboptimal pack - out of memory" msgstr "次優（suboptimal）打包 - 記憶體不足" -#: builtin/pack-objects.c:2872 +#: builtin/pack-objects.c #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 個執行緒進行壓縮" -#: builtin/pack-objects.c:3011 +#: builtin/pack-objects.c #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "無法為標籤 %s 壓縮物件" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c commit-graph.c +#, c-format +msgid "unable to get type of object %s" +msgstr "無法獲得物件 %s 類型" + +#: builtin/pack-objects.c msgid "Compressing objects" msgstr "壓縮物件中" -#: builtin/pack-objects.c:3103 +#: builtin/pack-objects.c msgid "inconsistency with delta count" msgstr "不一致的差異計數" -#: builtin/pack-objects.c:3182 +#: builtin/pack-objects.c #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -19091,24 +10886,40 @@ msgstr "" "uploadpack.blobpackfileuri 的值格式必須為 '<object-hash> <pack-hash> " "<uri>' (收到 '%s')" -#: builtin/pack-objects.c:3185 +#: builtin/pack-objects.c #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')" -#: builtin/pack-objects.c:3220 +#: builtin/pack-objects.c #, c-format msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c:3348 builtin/pack-objects.c:3359 -#: builtin/pack-objects.c:3373 +#: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" -#: builtin/pack-objects.c:3416 +#: builtin/pack-objects.c +#, c-format +msgid "packfile %s cannot be accessed" +msgstr "無法存取封包檔案 %s" + +#: builtin/pack-objects.c +msgid "Enumerating cruft objects" +msgstr "正在枚舉廢棄物件" + +#: builtin/pack-objects.c +msgid "unable to add cruft objects" +msgstr "無法加入廢棄物件" + +#: builtin/pack-objects.c +msgid "Traversing cruft objects" +msgstr "正在遍歷廢棄物件" + +#: builtin/pack-objects.c #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -19117,7 +10928,7 @@ msgstr "" "預期邊界物件（edge object）ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c #, c-format msgid "" "expected object ID, got garbage:\n" @@ -19126,238 +10937,267 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c:3540 builtin/pack-objects.c:3627 +#: builtin/pack-objects.c reachable.c +msgid "could not load cruft pack .mtimes" +msgstr "無法載入廢棄封包 .mtimes" + +#: builtin/pack-objects.c msgid "cannot open pack index" msgstr "無法開啟包檔案索引" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c #, c-format msgid "loose object at %s could not be examined" msgstr "無法檢查 %s 處的鬆散物件" -#: builtin/pack-objects.c:3635 +#: builtin/pack-objects.c msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c:3763 +#: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "不是一個版本 '%s'" -#: builtin/pack-objects.c:3766 builtin/rev-parse.c:1061 +#: builtin/pack-objects.c builtin/rev-parse.c #, c-format msgid "bad revision '%s'" msgstr "壞的版本 '%s'" -#: builtin/pack-objects.c:3794 +#: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "無法新增最近的物件" -#: builtin/pack-objects.c:3847 +#: builtin/pack-objects.c #, c-format msgid "unsupported index version %s" msgstr "不支援的索引版本 %s" -#: builtin/pack-objects.c:3851 +#: builtin/pack-objects.c #, c-format msgid "bad index version '%s'" msgstr "壞的索引版本 '%s'" -#: builtin/pack-objects.c:3907 +#: builtin/pack-objects.c msgid "<version>[,<offset>]" msgstr "<版本>[,<位移>]" -#: builtin/pack-objects.c:3908 +#: builtin/pack-objects.c msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本來寫包索引檔案" -#: builtin/pack-objects.c:3911 +#: builtin/pack-objects.c msgid "maximum size of each output pack file" msgstr "每個輸出包的最大尺寸" -#: builtin/pack-objects.c:3913 +#: builtin/pack-objects.c msgid "ignore borrowed objects from alternate object store" msgstr "忽略從備用物件儲存裡借用物件" -#: builtin/pack-objects.c:3915 +#: builtin/pack-objects.c msgid "ignore packed objects" msgstr "忽略包物件" -#: builtin/pack-objects.c:3917 +#: builtin/pack-objects.c msgid "limit pack window by objects" msgstr "限制打包視窗的物件數" -#: builtin/pack-objects.c:3919 +#: builtin/pack-objects.c msgid "limit pack window by memory in addition to object limit" msgstr "除物件數量限制外設定打包視窗的記憶體限制" -#: builtin/pack-objects.c:3921 +#: builtin/pack-objects.c msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允許的 delta 鏈的最大長度" -#: builtin/pack-objects.c:3923 +#: builtin/pack-objects.c msgid "reuse existing deltas" msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:3925 +#: builtin/pack-objects.c msgid "reuse existing objects" msgstr "重用已存在的物件" -#: builtin/pack-objects.c:3927 +#: builtin/pack-objects.c msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 物件" -#: builtin/pack-objects.c:3929 +#: builtin/pack-objects.c msgid "use threads when searching for best delta matches" msgstr "使用執行緒查詢最佳 delta 符合" -#: builtin/pack-objects.c:3931 +#: builtin/pack-objects.c msgid "do not create an empty pack output" msgstr "不建立空的包輸出" -#: builtin/pack-objects.c:3933 +#: builtin/pack-objects.c msgid "read revision arguments from standard input" msgstr "從標準輸入讀取版本號參數" -#: builtin/pack-objects.c:3935 +#: builtin/pack-objects.c msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的物件" -#: builtin/pack-objects.c:3938 +#: builtin/pack-objects.c msgid "include objects reachable from any reference" msgstr "包括可以從任何引用存取到的物件" -#: builtin/pack-objects.c:3941 +#: builtin/pack-objects.c msgid "include objects referred by reflog entries" msgstr "包括被引用日誌引用到的物件" -#: builtin/pack-objects.c:3944 +#: builtin/pack-objects.c msgid "include objects referred to by the index" msgstr "包括被索引引用到的物件" -#: builtin/pack-objects.c:3947 +#: builtin/pack-objects.c msgid "read packs from stdin" msgstr "從標準輸入中讀取包" -#: builtin/pack-objects.c:3949 +#: builtin/pack-objects.c msgid "output pack to stdout" msgstr "輸出包到標準輸出" -#: builtin/pack-objects.c:3951 +#: builtin/pack-objects.c msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包物件的標籤物件" -#: builtin/pack-objects.c:3953 +#: builtin/pack-objects.c msgid "keep unreachable objects" msgstr "維持無法取得的物件" -#: builtin/pack-objects.c:3955 +#: builtin/pack-objects.c msgid "pack loose unreachable objects" msgstr "打包鬆散的無法取得物件" -#: builtin/pack-objects.c:3957 +#: builtin/pack-objects.c msgid "unpack unreachable objects newer than <time>" msgstr "將比提供 <時間> 新的無法存取的物件解包" -#: builtin/pack-objects.c:3960 +#: builtin/pack-objects.c +msgid "create a cruft pack" +msgstr "建立廢棄封包" + +#: builtin/pack-objects.c +msgid "expire cruft objects older than <time>" +msgstr "將早於 <time> 的廢棄物件設為過期" + +#: builtin/pack-objects.c msgid "use the sparse reachability algorithm" msgstr "使用稀疏可以取得性演算法" -#: builtin/pack-objects.c:3962 +#: builtin/pack-objects.c msgid "create thin packs" msgstr "建立精簡包" -#: builtin/pack-objects.c:3964 +#: builtin/pack-objects.c msgid "create packs suitable for shallow fetches" msgstr "建立適合淺複製版本庫取得的包" -#: builtin/pack-objects.c:3966 +#: builtin/pack-objects.c msgid "ignore packs that have companion .keep file" msgstr "忽略配有 .keep 檔案的包" -#: builtin/pack-objects.c:3968 +#: builtin/pack-objects.c msgid "ignore this pack" msgstr "忽略該 pack" -#: builtin/pack-objects.c:3970 +#: builtin/pack-objects.c msgid "pack compression level" msgstr "打包壓縮級別" -#: builtin/pack-objects.c:3972 +#: builtin/pack-objects.c msgid "do not hide commits by grafts" msgstr "顯示被移植隱藏的提交" -#: builtin/pack-objects.c:3974 +#: builtin/pack-objects.c msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度" -#: builtin/pack-objects.c:3976 +#: builtin/pack-objects.c msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的同時建立 bitmap 索引" -#: builtin/pack-objects.c:3980 +#: builtin/pack-objects.c msgid "write a bitmap index if possible" msgstr "如果可能，寫 bitmap 索引" -#: builtin/pack-objects.c:3984 +#: builtin/pack-objects.c msgid "handling for missing objects" msgstr "處理遺失的物件" -#: builtin/pack-objects.c:3987 +#: builtin/pack-objects.c msgid "do not pack objects in promisor packfiles" msgstr "不要打包 promisor packfile 中的物件" -#: builtin/pack-objects.c:3989 +#: builtin/pack-objects.c msgid "respect islands during delta compression" msgstr "在差異壓縮時尊重資料島" -#: builtin/pack-objects.c:3991 +#: builtin/pack-objects.c msgid "protocol" msgstr "通訊協定" -#: builtin/pack-objects.c:3992 +#: builtin/pack-objects.c msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri" -#: builtin/pack-objects.c:4027 +#: builtin/pack-objects.c #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增量鏈深度 %d 太深了，強制為 %d" -#: builtin/pack-objects.c:4032 +#: builtin/pack-objects.c #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d" -#: builtin/pack-objects.c:4088 +#: builtin/pack-objects.c config.c +#, c-format +msgid "bad pack compression level %d" +msgstr "錯誤的打包壓縮級別 %d" + +#: builtin/pack-objects.c msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案" -#: builtin/pack-objects.c:4090 +#: builtin/pack-objects.c msgid "minimum pack size limit is 1 MiB" msgstr "最小的包檔案大小是 1 MiB" -#: builtin/pack-objects.c:4095 +#: builtin/pack-objects.c msgid "--thin cannot be used to build an indexable pack" msgstr "--thin 不能用於建立一個可索引包" -#: builtin/pack-objects.c:4104 +#: builtin/pack-objects.c msgid "cannot use --filter without --stdout" msgstr "不能在沒有 --stdout 的情況下使用 --filter" -#: builtin/pack-objects.c:4106 +#: builtin/pack-objects.c msgid "cannot use --filter with --stdin-packs" msgstr "無法將 --filter 及 --stdin-packs 結合使用" -#: builtin/pack-objects.c:4110 +#: builtin/pack-objects.c msgid "cannot use internal rev list with --stdin-packs" msgstr "無法將內部版本清單與 --stdin-packs 結合使用" -#: builtin/pack-objects.c:4169 +#: builtin/pack-objects.c +msgid "cannot use internal rev list with --cruft" +msgstr "無法透過 --cruft 使用內部修訂清單" + +#: builtin/pack-objects.c +msgid "cannot use --stdin-packs with --cruft" +msgstr "無法將 --stdin-packs 與 --cruft 組合使用" + +#: builtin/pack-objects.c +msgid "cannot use --max-pack-size with --cruft" +msgstr "無法將 --max-pack-size 與 --cruft 組合使用" + +#: builtin/pack-objects.c msgid "Enumerating objects" msgstr "枚舉物件" -#: builtin/pack-objects.c:4210 +#: builtin/pack-objects.c #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -19366,7 +11206,7 @@ msgstr "" "總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 " "%<PRIu32>" -#: builtin/pack-redundant.c:601 +#: builtin/pack-redundant.c msgid "" "'git pack-redundant' is nominated for removal.\n" "If you still use this command, please add an extra\n" @@ -19380,96 +11220,96 @@ msgstr "" "<git@vger.kernel.org> 讓我們知道您還在使用。\n" "感謝。\n" -#: builtin/pack-refs.c:8 +#: builtin/pack-refs.c msgid "git pack-refs [<options>]" msgstr "git pack-refs [<選項>]" -#: builtin/pack-refs.c:16 +#: builtin/pack-refs.c msgid "pack everything" msgstr "打包一切" -#: builtin/pack-refs.c:17 +#: builtin/pack-refs.c msgid "prune loose refs (default)" msgstr "剪除鬆散引用（預設）" -#: builtin/prune.c:14 +#: builtin/prune.c msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]" -#: builtin/prune.c:145 +#: builtin/prune.c msgid "report pruned objects" msgstr "回報剪除的物件" -#: builtin/prune.c:148 +#: builtin/prune.c msgid "expire objects older than <time>" msgstr "使早於提供時間的物件過期" -#: builtin/prune.c:150 +#: builtin/prune.c msgid "limit traversal to objects outside promisor packfiles" msgstr "限制遍歷 promisor packfile 以外的物件" -#: builtin/prune.c:163 +#: builtin/prune.c msgid "cannot prune in a precious-objects repo" msgstr "不能在珍品版本庫中執行剪除動作" -#: builtin/pull.c:67 +#: builtin/pull.c msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/pull.c:124 +#: builtin/pull.c msgid "control for recursive fetching of submodules" msgstr "控制子模組的遞迴取得" -#: builtin/pull.c:128 +#: builtin/pull.c msgid "Options related to merging" msgstr "和合併相關的選項" -#: builtin/pull.c:131 +#: builtin/pull.c msgid "incorporate changes by rebasing rather than merging" msgstr "使用重定基底動作取代合併動作以套用修改" -#: builtin/pull.c:159 builtin/revert.c:126 +#: builtin/pull.c builtin/revert.c msgid "allow fast-forward" msgstr "允許快轉式" -#: builtin/pull.c:165 +#: builtin/pull.c msgid "control use of pre-merge-commit and commit-msg hooks" msgstr "控制 pre-merge-commit 和 commit-msg 掛鉤的使用" -#: builtin/pull.c:171 parse-options.h:371 +#: builtin/pull.c parse-options.h msgid "automatically stash/stash pop before and after" msgstr "在動作前後執行自動儲藏和彈出儲藏" -#: builtin/pull.c:187 +#: builtin/pull.c msgid "Options related to fetching" msgstr "和取得相關的參數" -#: builtin/pull.c:197 +#: builtin/pull.c msgid "force overwrite of local branch" msgstr "強制覆蓋本機分支" -#: builtin/pull.c:205 +#: builtin/pull.c msgid "number of submodules pulled in parallel" msgstr "並行拉取的子模組數量" -#: builtin/pull.c:449 +#: builtin/pull.c msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。" -#: builtin/pull.c:451 +#: builtin/pull.c msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您剛剛取得到的引用中沒有合併動作的候選。" -#: builtin/pull.c:452 +#: builtin/pull.c msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "這通常表示您有提供萬用字元引用規格，但遠端沒有符合項目。" -#: builtin/pull.c:455 +#: builtin/pull.c #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -19479,42 +11319,40 @@ msgstr "" "您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n" "分支預設的遠端版本庫，您必須在指令列中指定一個分支名。" -#: builtin/pull.c:460 builtin/rebase.c:978 +#: builtin/pull.c builtin/rebase.c msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c:462 builtin/pull.c:477 +#: builtin/pull.c msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c:464 builtin/pull.c:479 +#: builtin/pull.c msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c:465 builtin/pull.c:480 +#: builtin/pull.c msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c:467 builtin/pull.c:473 builtin/pull.c:482 -#: builtin/rebase.c:984 +#: builtin/pull.c builtin/rebase.c msgid "<remote>" msgstr "<遠端>" -#: builtin/pull.c:467 builtin/pull.c:482 builtin/pull.c:487 -#: contrib/scalar/scalar.c:374 +#: builtin/pull.c contrib/scalar/scalar.c msgid "<branch>" msgstr "<分支>" -#: builtin/pull.c:475 builtin/rebase.c:976 +#: builtin/pull.c builtin/rebase.c msgid "There is no tracking information for the current branch." msgstr "目前分支沒有追蹤訊息。" -#: builtin/pull.c:484 +#: builtin/pull.c msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想要為此分支建立追蹤訊息，您可以執行：" -#: builtin/pull.c:489 +#: builtin/pull.c #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -19523,16 +11361,16 @@ msgstr "" "您的設定中指定要合併遠端的引用 '%s'，\n" "但是沒有取得到這個引用。" -#: builtin/pull.c:600 +#: builtin/pull.c #, c-format msgid "unable to access commit %s" msgstr "無法存取提交 %s" -#: builtin/pull.c:908 +#: builtin/pull.c msgid "ignoring --verify-signatures for rebase" msgstr "為重定基底動作忽略 --verify-signatures" -#: builtin/pull.c:969 +#: builtin/pull.c msgid "" "You have divergent branches and need to specify how to reconcile them.\n" "You can do so by running one of the following commands sometime before\n" @@ -19561,19 +11399,19 @@ msgstr "" "pull 命令時傳遞 --rebase、--no-rebase 或 --ff-only 覆蓋\n" "設定的預設值。\n" -#: builtin/pull.c:1047 +#: builtin/pull.c msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未誕生的分支，變更新增至索引。" -#: builtin/pull.c:1051 +#: builtin/pull.c msgid "pull with rebase" msgstr "重定基底式拉取" -#: builtin/pull.c:1052 +#: builtin/pull.c msgid "please commit or stash them." msgstr "請提交或儲藏它們。" -#: builtin/pull.c:1077 +#: builtin/pull.c #, c-format msgid "" "fetch updated the current branch head.\n" @@ -19583,7 +11421,7 @@ msgstr "" "fetch 更新了目前的分支。快轉您的工作區\n" "至提交 %s。" -#: builtin/pull.c:1083 +#: builtin/pull.c #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -19600,47 +11438,59 @@ msgstr "" "$ git reset --hard\n" "復原之前的狀態。" -#: builtin/pull.c:1098 +#: builtin/pull.c msgid "Cannot merge multiple branches into empty head." msgstr "無法將多個分支合併到空分支。" -#: builtin/pull.c:1103 +#: builtin/pull.c msgid "Cannot rebase onto multiple branches." msgstr "無法重定基底到多個分支。" -#: builtin/pull.c:1105 +#: builtin/pull.c msgid "Cannot fast-forward to multiple branches." msgstr "無法快轉至多個分支。" -#: builtin/pull.c:1120 +#: builtin/pull.c msgid "Need to specify how to reconcile divergent branches." msgstr "需要指定如何調和偏離的分支。" -#: builtin/pull.c:1134 +#: builtin/pull.c msgid "cannot rebase with locally recorded submodule modifications" msgstr "本機子模組中有修改，無法重定基底" -#: builtin/push.c:19 +#: builtin/push.c msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]" -#: builtin/push.c:111 +#: builtin/push.c msgid "tag shorthand without <tag>" msgstr "標籤後面未提供 <標籤> 參數" -#: builtin/push.c:119 +#: builtin/push.c msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受簡單的目標引用名" -#: builtin/push.c:164 +#: builtin/push.c msgid "" "\n" -"To choose either option permanently, see push.default in 'git help config'." +"To choose either option permanently, see push.default in 'git help config'.\n" msgstr "" "\n" -"為了永久地選擇任一選項，參見 'git help config' 中的 push.default。" +"若要永久選擇某個選項，請參閱 “git help config” 中的 push.default。\n" -#: builtin/push.c:167 +#: builtin/push.c +msgid "" +"\n" +"To avoid automatically configuring upstream branches when their name\n" +"doesn't match the local branch, see option 'simple' of branch." +"autoSetupMerge\n" +"in 'git help config'.\n" +msgstr "" +"\n" +"為了避免自動在上游分支的名稱與本機不符時，設定上游的分支，請參閱\n" +"“git help config” 中 branch.autoSetupMerge 的 “simple” 選項。\n" + +#: builtin/push.c #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -19652,19 +11502,19 @@ msgid "" "To push to the branch of the same name on the remote, use\n" "\n" " git push %s HEAD\n" -"%s" +"%s%s" msgstr "" -"您目前分支的上游分支和您目前分支名不符合，為推送到遠端的上游分支，\n" -"使用\n" +"您目前分支的上游分支，和您目前分支的名稱不符。如要推送到遠端的\n" +"上游分支，請使用\n" "\n" " git push %s HEAD:%s\n" "\n" -"為推送至遠端同名分支，使用\n" +"為推送至遠端上的同名分支，請使用\n" "\n" " git push %s HEAD\n" -"%s" +"%s%s" -#: builtin/push.c:182 +#: builtin/push.c #, c-format msgid "" "You are not currently on a branch.\n" @@ -19678,30 +11528,42 @@ msgstr "" "\n" " git push %s HEAD:<遠端分支名字>\n" -#: builtin/push.c:191 +#: builtin/push.c +msgid "" +"\n" +"To have this happen automatically for branches without a tracking\n" +"upstream, see 'push.autoSetupRemote' in 'git help config'.\n" +msgstr "" +"\n" +"若要使沒有追蹤上游的分支自動配置，請參閱 “git help config” 中的\n" +"“push.autoSetupRemote”。\n" + +#: builtin/push.c #, c-format msgid "" "The current branch %s has no upstream branch.\n" "To push the current branch and set the remote as upstream, use\n" "\n" " git push --set-upstream %s %s\n" +"%s" msgstr "" -"目前分支 %s 沒有對應的上游分支。\n" -"為推送目前分支並建立與遠端上游的追蹤，使用\n" +"目前分支 %s 沒有上游分支。\n" +"若要推送目前的分支，並將遠端設為上游，請使用\n" "\n" " git push --set-upstream %s %s\n" +"%s" -#: builtin/push.c:199 +#: builtin/push.c #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "目前分支 %s 有多個上游分支，拒絕推送。" -#: builtin/push.c:217 +#: builtin/push.c msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您沒有為推送指定任何引用規格，並且 push.default 為 \"nothing\"。" -#: builtin/push.c:243 +#: builtin/push.c #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -19711,7 +11573,7 @@ msgstr "" "您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n" "而沒有告訴我要推送什麼、更新哪個遠端分支。" -#: builtin/push.c:258 +#: builtin/push.c msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -19722,7 +11584,7 @@ msgstr "" "再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:264 +#: builtin/push.c 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" @@ -19733,7 +11595,7 @@ msgstr "" "簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n" "'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:270 +#: builtin/push.c 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" @@ -19746,11 +11608,11 @@ msgstr "" "（如 'git pull ...'）。\n" "詳見 'git push --help' 中的 'Note about fast-forwards' 小節。" -#: builtin/push.c:277 +#: builtin/push.c msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒絕，因為該標籤在遠端已經存在。" -#: builtin/push.c:280 +#: builtin/push.c 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" @@ -19759,7 +11621,7 @@ msgstr "" "如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n" "也不能更新遠端引用讓其指向一個非提交物件。\n" -#: builtin/push.c:285 +#: builtin/push.c msgid "" "Updates were rejected because the tip of the remote-tracking\n" "branch has been updated since the last checkout. You may want\n" @@ -19770,99 +11632,103 @@ msgstr "" "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n" "最後才強制更新。\n" -#: builtin/push.c:355 +#: builtin/push.c #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:362 +#: builtin/push.c #, c-format msgid "failed to push some refs to '%s'" msgstr "推送一些引用到 '%s' 失敗" -#: builtin/push.c:544 builtin/submodule--helper.c:3377 +#: builtin/push.c builtin/send-pack.c submodule-config.c +#, c-format +msgid "invalid value for '%s'" +msgstr "「%s」的值無效" + +#: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "版本庫" -#: builtin/push.c:545 builtin/send-pack.c:193 +#: builtin/push.c builtin/send-pack.c msgid "push all refs" msgstr "推送所有引用" -#: builtin/push.c:546 builtin/send-pack.c:195 +#: builtin/push.c builtin/send-pack.c msgid "mirror all refs" msgstr "鏡像所有引用" -#: builtin/push.c:548 +#: builtin/push.c msgid "delete refs" msgstr "刪除引用" -#: builtin/push.c:549 +#: builtin/push.c msgid "push tags (can't be used with --all or --mirror)" msgstr "推送標籤（不能使用 --all or --mirror）" -#: builtin/push.c:552 builtin/send-pack.c:196 +#: builtin/push.c builtin/send-pack.c msgid "force updates" msgstr "強制更新" -#: builtin/push.c:553 builtin/send-pack.c:208 +#: builtin/push.c builtin/send-pack.c msgid "<refname>:<expect>" msgstr "<引用名>:<期望值>" -#: builtin/push.c:554 builtin/send-pack.c:209 +#: builtin/push.c builtin/send-pack.c msgid "require old value of ref to be at this value" msgstr "要求引用舊的取值為設定值" -#: builtin/push.c:557 builtin/send-pack.c:212 +#: builtin/push.c builtin/send-pack.c msgid "require remote updates to be integrated locally" msgstr "需要將遠端更新整合進本地" -#: builtin/push.c:560 +#: builtin/push.c msgid "control recursive pushing of submodules" msgstr "控制子模組的遞迴推送" -#: builtin/push.c:561 builtin/send-pack.c:203 +#: builtin/push.c builtin/send-pack.c msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:190 -#: builtin/send-pack.c:191 +#: builtin/push.c builtin/send-pack.c msgid "receive pack program" msgstr "接收包程式" -#: builtin/push.c:564 +#: builtin/push.c msgid "set upstream for git pull/status" msgstr "設定 git pull/status 的上游" -#: builtin/push.c:567 +#: builtin/push.c msgid "prune locally removed refs" msgstr "剪除本機刪除的引用" -#: builtin/push.c:569 +#: builtin/push.c msgid "bypass pre-push hook" msgstr "繞過 pre-push 掛鉤" -#: builtin/push.c:570 +#: builtin/push.c msgid "push missing but relevant tags" msgstr "推送缺少但有關的標籤" -#: builtin/push.c:572 builtin/send-pack.c:197 +#: builtin/push.c builtin/send-pack.c msgid "GPG sign the push" msgstr "用 GPG 為推送簽名" -#: builtin/push.c:574 builtin/send-pack.c:204 +#: builtin/push.c builtin/send-pack.c msgid "request atomic transaction on remote side" msgstr "需要遠端支援 atomic 事務" -#: builtin/push.c:594 +#: builtin/push.c msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用沒有意義" -#: builtin/push.c:614 +#: builtin/push.c #, c-format msgid "bad repository '%s'" msgstr "壞的版本庫 '%s'" -#: builtin/push.c:615 +#: builtin/push.c msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -19883,64 +11749,64 @@ msgstr "" "\n" " git push <名稱>\n" -#: builtin/push.c:632 +#: builtin/push.c msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用規格同時使用" -#: builtin/push.c:638 +#: builtin/push.c msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" -#: builtin/push.c:648 +#: builtin/push.c msgid "push options must not have new line characters" msgstr "推送選項不能有換行符號" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "git range-diff [<選項>] <old-base>..<old-tip> <new-base>..<new-tip>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<選項>] <old-tip>...<new-tip>" -#: builtin/range-diff.c:11 +#: builtin/range-diff.c msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>" -#: builtin/range-diff.c:30 +#: builtin/range-diff.c msgid "use simple diff colors" msgstr "使用簡單差異顏色" -#: builtin/range-diff.c:32 +#: builtin/range-diff.c msgid "notes" msgstr "註解" -#: builtin/range-diff.c:32 +#: builtin/range-diff.c msgid "passed to 'git log'" msgstr "傳遞給 'git log'" -#: builtin/range-diff.c:35 +#: builtin/range-diff.c msgid "only emit output related to the first range" msgstr "只發出跟第一個範圍相關的輸出" -#: builtin/range-diff.c:37 +#: builtin/range-diff.c msgid "only emit output related to the second range" msgstr "只發出跟第二個範圍相關的輸出" -#: builtin/range-diff.c:60 builtin/range-diff.c:64 +#: builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" msgstr "不是提交範圍：「%s」" -#: builtin/range-diff.c:74 +#: builtin/range-diff.c msgid "single arg format must be symmetric range" msgstr "單個參數格式必須是對稱範圍（即包含...）" -#: builtin/range-diff.c:89 +#: builtin/range-diff.c msgid "need two commit ranges" msgstr "需要兩個提交範圍" -#: builtin/read-tree.c:41 +#: builtin/read-tree.c msgid "" "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) " "[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-" @@ -19950,79 +11816,79 @@ msgstr "" "u | -i]] [--no-sparse-checkout] [--index-output=<檔案>] (--empty | <樹狀物件" "1> [<樹狀物件2> [<樹狀物件3>]])" -#: builtin/read-tree.c:116 +#: builtin/read-tree.c msgid "write resulting index to <file>" msgstr "將索引結果寫入 <檔案>" -#: builtin/read-tree.c:119 +#: builtin/read-tree.c msgid "only empty the index" msgstr "只是清空索引" -#: builtin/read-tree.c:121 +#: builtin/read-tree.c msgid "Merging" msgstr "合併" -#: builtin/read-tree.c:123 +#: builtin/read-tree.c msgid "perform a merge in addition to a read" msgstr "讀取之餘再執行一個合併" -#: builtin/read-tree.c:125 +#: builtin/read-tree.c msgid "3-way merge if no file level merging required" msgstr "如果沒有檔案級合併需要，執行三方合併" -#: builtin/read-tree.c:127 +#: builtin/read-tree.c msgid "3-way merge in presence of adds and removes" msgstr "存在新增和刪除時，也執行三方合併" -#: builtin/read-tree.c:129 +#: builtin/read-tree.c msgid "same as -m, but discard unmerged entries" msgstr "類似於 -m，但捨棄未合併的條目" -#: builtin/read-tree.c:130 +#: builtin/read-tree.c msgid "<subdirectory>/" msgstr "<子目錄>/" -#: builtin/read-tree.c:131 +#: builtin/read-tree.c msgid "read the tree into the index under <subdirectory>/" msgstr "讀取樹狀物件到索引的 <子目錄>/ 下" -#: builtin/read-tree.c:134 +#: builtin/read-tree.c msgid "update working tree with merge result" msgstr "用合併的結果更新工作區" -#: builtin/read-tree.c:136 +#: builtin/read-tree.c msgid "gitignore" msgstr "gitignore" -#: builtin/read-tree.c:137 +#: builtin/read-tree.c msgid "allow explicitly ignored files to be overwritten" msgstr "允許忽略檔案中設定的檔案可以被覆蓋" -#: builtin/read-tree.c:140 +#: builtin/read-tree.c msgid "don't check the working tree after merging" msgstr "合併後不檢查工作區" -#: builtin/read-tree.c:141 +#: builtin/read-tree.c msgid "don't update the index or the work tree" msgstr "不更新索引區和工作區" -#: builtin/read-tree.c:143 +#: builtin/read-tree.c msgid "skip applying sparse checkout filter" msgstr "略過套用稀疏簽出過濾器" -#: builtin/read-tree.c:145 +#: builtin/read-tree.c msgid "debug unpack-trees" msgstr "除錯 unpack-trees" -#: builtin/read-tree.c:149 +#: builtin/read-tree.c msgid "suppress feedback messages" msgstr "抑制回饋訊息" -#: builtin/read-tree.c:190 +#: builtin/read-tree.c msgid "You need to resolve your current index first" msgstr "您需要先解決目前索引的衝突" -#: builtin/rebase.c:36 +#: builtin/rebase.c msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " "[<upstream> [<branch>]]" @@ -20030,50 +11896,60 @@ msgstr "" "git rebase [-i] [options] [--exec <命令>] [--onto <新基礎> | --keep-base] [<" "上游> [<分支>]]" -#: builtin/rebase.c:38 +#: builtin/rebase.c msgid "" "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]" msgstr "" "git rebase [-i] [選項] [--exec <命令>] [--onto <新基礎>] --root [<分支>]" -#: builtin/rebase.c:231 +#: builtin/rebase.c sequencer.c +#, c-format +msgid "could not read '%s'." +msgstr "不能讀取 '%s'。" + +#: builtin/rebase.c #, c-format msgid "could not create temporary %s" msgstr "無法建立暫時的 %s" -#: builtin/rebase.c:237 +#: builtin/rebase.c msgid "could not mark as interactive" msgstr "無法標記為互動式" -#: builtin/rebase.c:290 +#: builtin/rebase.c msgid "could not generate todo list" msgstr "無法生成待辦列表" -#: builtin/rebase.c:332 +#: builtin/rebase.c msgid "a base commit must be provided with --upstream or --onto" msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交" -#: builtin/rebase.c:391 +#: builtin/rebase.c #, c-format msgid "%s requires the merge backend" msgstr "%s 需要合併後端" -#: builtin/rebase.c:433 +#: builtin/rebase.c #, c-format msgid "could not get 'onto': '%s'" msgstr "無法取得 'onto'：'%s'" -#: builtin/rebase.c:450 +#: builtin/rebase.c #, c-format msgid "invalid orig-head: '%s'" msgstr "無效的原始 head：'%s'" -#: builtin/rebase.c:475 +#: builtin/rebase.c #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c:600 +#: builtin/rebase.c builtin/rm.c sequencer.c +#, c-format +msgid "could not remove '%s'" +msgstr "無法刪除 '%s'" + +#: builtin/rebase.c msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -20086,7 +11962,7 @@ msgstr "" "\"git rebase --skip\" 指令略過這個提交。如果想要終止執行並回到\n" "\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。" -#: builtin/rebase.c:685 +#: builtin/rebase.c #, c-format msgid "" "\n" @@ -20104,19 +11980,19 @@ msgstr "" "\n" "因此 git 無法對其重定基底。" -#: builtin/rebase.c:836 +#: builtin/rebase.c #, c-format msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c:952 +#: builtin/rebase.c #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" "\"." msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。" -#: builtin/rebase.c:970 +#: builtin/rebase.c #, c-format msgid "" "%s\n" @@ -20133,7 +12009,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:986 +#: builtin/rebase.c #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -20146,180 +12022,196 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1016 +#: builtin/rebase.c msgid "exec commands cannot contain newlines" msgstr "exec 指令不能包含換行符號" -#: builtin/rebase.c:1020 +#: builtin/rebase.c msgid "empty exec command" msgstr "空的 exec 指令" -#: builtin/rebase.c:1051 +#: builtin/rebase.c msgid "rebase onto given branch instead of upstream" msgstr "重定基底到提供的分支而非上游" -#: builtin/rebase.c:1053 +#: builtin/rebase.c msgid "use the merge-base of upstream and branch as the current base" msgstr "使用上游和分支的合併基礎做為目前基礎" -#: builtin/rebase.c:1055 +#: builtin/rebase.c msgid "allow pre-rebase hook to run" msgstr "允許執行 pre-rebase 掛鉤" -#: builtin/rebase.c:1057 +#: builtin/rebase.c msgid "be quiet. implies --no-stat" msgstr "安靜。暗示 --no-stat" -#: builtin/rebase.c:1060 +#: builtin/rebase.c msgid "display a diffstat of what changed upstream" msgstr "顯示上游變化的差異統計" -#: builtin/rebase.c:1063 +#: builtin/rebase.c msgid "do not show diffstat of what changed upstream" msgstr "不顯示上游變化的差異統計" -#: builtin/rebase.c:1066 +#: builtin/rebase.c msgid "add a Signed-off-by trailer to each commit" msgstr "在每個提交結尾加入 Signed-off-by" -#: builtin/rebase.c:1069 +#: builtin/rebase.c msgid "make committer date match author date" msgstr "使提交日期與製作日期相符合" -#: builtin/rebase.c:1071 +#: builtin/rebase.c msgid "ignore author date and use current date" msgstr "忽略製作日期而使用日前日期" -#: builtin/rebase.c:1073 +#: builtin/rebase.c msgid "synonym of --reset-author-date" msgstr "和 --reset-author-date 同義" -#: builtin/rebase.c:1075 builtin/rebase.c:1079 +#: builtin/rebase.c msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" -#: builtin/rebase.c:1077 +#: builtin/rebase.c msgid "ignore changes in whitespace" msgstr "忽略空白字元中的變更" -#: builtin/rebase.c:1081 builtin/rebase.c:1084 +#: builtin/rebase.c msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" -#: builtin/rebase.c:1086 +#: builtin/rebase.c msgid "continue" msgstr "繼續" -#: builtin/rebase.c:1089 +#: builtin/rebase.c msgid "skip current patch and continue" msgstr "略過目前修補檔並繼續" # 譯者：請維持前導空格 -#: builtin/rebase.c:1091 +#: builtin/rebase.c msgid "abort and check out the original branch" msgstr "終止並簽出原有分支" -#: builtin/rebase.c:1094 +#: builtin/rebase.c msgid "abort but keep HEAD where it is" msgstr "終止但保持 HEAD 不變" -#: builtin/rebase.c:1095 +#: builtin/rebase.c msgid "edit the todo list during an interactive rebase" msgstr "在互動式重定基底中編輯待辦列表" -#: builtin/rebase.c:1098 +#: builtin/rebase.c msgid "show the patch file being applied or merged" msgstr "顯示正在套用或合併的修補檔案" -#: builtin/rebase.c:1101 +#: builtin/rebase.c msgid "use apply strategies to rebase" msgstr "使用套用策略進行重定基底" -#: builtin/rebase.c:1105 +#: builtin/rebase.c msgid "use merging strategies to rebase" msgstr "使用合併策略進行重定基底" -#: builtin/rebase.c:1109 +#: builtin/rebase.c msgid "let the user edit the list of commits to rebase" msgstr "讓使用者編輯要重定基底的提交列表" -#: builtin/rebase.c:1113 -msgid "(DEPRECATED) try to recreate merges instead of ignoring them" -msgstr "（已棄用）嘗試重建合併提交而非忽略它們" +#: builtin/rebase.c +msgid "(REMOVED) was: try to recreate merges instead of ignoring them" +msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併" -#: builtin/rebase.c:1118 +#: builtin/rebase.c msgid "how to handle commits that become empty" msgstr "處理空白提交的方式" -#: builtin/rebase.c:1121 +#: builtin/rebase.c msgid "keep commits which start empty" msgstr "保留開頭是空白的提交" -#: builtin/rebase.c:1125 +#: builtin/rebase.c msgid "move commits that begin with squash!/fixup! under -i" msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交" -#: builtin/rebase.c:1132 +#: builtin/rebase.c msgid "add exec lines after each commit of the editable list" msgstr "可編輯列表的每一個提交下面增加一行 exec" -#: builtin/rebase.c:1136 +#: builtin/rebase.c msgid "allow rebasing commits with empty messages" msgstr "允許針對空提交說明的提交重定基底" -#: builtin/rebase.c:1140 +#: builtin/rebase.c msgid "try to rebase merges instead of skipping them" msgstr "嘗試對合併提交重定基底而不是忽略它們" -#: builtin/rebase.c:1143 +#: builtin/rebase.c msgid "use 'merge-base --fork-point' to refine upstream" msgstr "使用 'merge-base --fork-point' 來最佳化上游" -#: builtin/rebase.c:1145 +#: builtin/rebase.c msgid "use the given merge strategy" msgstr "使用提供的合併策略" -#: builtin/rebase.c:1147 builtin/revert.c:115 +#: builtin/rebase.c builtin/revert.c msgid "option" msgstr "選項" -#: builtin/rebase.c:1148 +#: builtin/rebase.c msgid "pass the argument through to the merge strategy" msgstr "將參數傳遞給合併策略" -#: builtin/rebase.c:1151 +#: builtin/rebase.c msgid "rebase all reachable commits up to the root(s)" msgstr "將所有可以取得的提交重定基底到根提交" -#: builtin/rebase.c:1154 +#: builtin/rebase.c msgid "automatically re-schedule any `exec` that fails" msgstr "自動重新安排任何失敗的 `exec`" -#: builtin/rebase.c:1156 +#: builtin/rebase.c msgid "apply all changes, even those already present upstream" msgstr "即使已提供上游，仍套用所有變更" -#: builtin/rebase.c:1177 +#: builtin/rebase.c msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "看起來 'git am' 正在執行中。無法重定基底。" -#: builtin/rebase.c:1208 -msgid "--preserve-merges was replaced by --rebase-merges" -msgstr "--preserve-merges 已經被 --rebase-merges 取代" +#: builtin/rebase.c +msgid "" +"`rebase --preserve-merges` (-p) is no longer supported.\n" +"Use `git rebase --abort` to terminate current rebase.\n" +"Or downgrade to v2.33, or earlier, to complete the rebase." +msgstr "" +"`rebase --preserve-merges` (-p) 已不受支援。\n" +"請使用 `git rebase --abort` 終止目前的重定基底動作。\n" +"或者是降級到 v2.33 或更早版本，以完成本重定基底動作。" -#: builtin/rebase.c:1230 +#: builtin/rebase.c +msgid "" +"--preserve-merges was replaced by --rebase-merges\n" +"Note: Your `pull.rebase` configuration may also be set to 'preserve',\n" +"which is no longer supported; use 'merges' instead" +msgstr "" +"--preserve-merges 已被 --rebase-merges 取代\n" +"註：您的 `pull.rebase` 設定可能也被設定為不受支援的 “preserve”；\n" +"請改用 “merges”" + +#: builtin/rebase.c msgid "No rebase in progress?" msgstr "沒有正在進行的重定基底？" -#: builtin/rebase.c:1234 +#: builtin/rebase.c msgid "The --edit-todo action can only be used during interactive rebase." msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。" -#: builtin/rebase.c:1257 t/helper/test-fast-rebase.c:122 +#: builtin/rebase.c t/helper/test-fast-rebase.c msgid "Cannot read HEAD" msgstr "不能讀取 HEAD" -#: builtin/rebase.c:1269 +#: builtin/rebase.c msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -20327,16 +12219,16 @@ msgstr "" "您必須編輯所有的合併衝突，然後透過 git add\n" "指令將它們標記為已解決" -#: builtin/rebase.c:1287 +#: builtin/rebase.c msgid "could not discard worktree changes" msgstr "無法捨棄工作區變更" -#: builtin/rebase.c:1308 +#: builtin/rebase.c #, c-format msgid "could not move back to %s" msgstr "無法移回 %s" -#: builtin/rebase.c:1354 +#: builtin/rebase.c #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -20355,126 +12247,125 @@ msgstr "" "\t%s\n" "然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n" -#: builtin/rebase.c:1382 +#: builtin/rebase.c msgid "switch `C' expects a numerical value" msgstr "開關 `C' 期望一個數字值" -#: builtin/rebase.c:1424 +#: builtin/rebase.c #, c-format msgid "Unknown mode: %s" msgstr "未知模式：%s" -#: builtin/rebase.c:1463 +#: builtin/rebase.c msgid "--strategy requires --merge or --interactive" msgstr "--strategy 需要 --merge 或 --interactive" -#: builtin/rebase.c:1492 +#: builtin/rebase.c msgid "apply options and merge options cannot be used together" msgstr "套用選項與合併選項不得同時使用" -#: builtin/rebase.c:1505 +#: builtin/rebase.c #, c-format msgid "Unknown rebase backend: %s" msgstr "未知 rebase 後端：%s" -#: builtin/rebase.c:1534 +#: builtin/rebase.c msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive" -#: builtin/rebase.c:1565 +#: builtin/rebase.c #, c-format msgid "invalid upstream '%s'" msgstr "無效的上游 '%s'" -#: builtin/rebase.c:1571 +#: builtin/rebase.c msgid "Could not create new root commit" msgstr "不能建立新的根提交" -#: builtin/rebase.c:1597 +#: builtin/rebase.c +#, c-format +msgid "no such branch/commit '%s'" +msgstr "沒有此分支/提交 '%s'" + +#: builtin/rebase.c builtin/submodule--helper.c +#, c-format +msgid "No such ref: %s" +msgstr "沒有這樣的引用：%s" + +#: builtin/rebase.c +msgid "Could not resolve HEAD to a revision" +msgstr "無法將 HEAD 解析為一個版本" + +#: builtin/rebase.c #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "'%s'：只需要與分支的一個合併基礎" -#: builtin/rebase.c:1600 +#: builtin/rebase.c #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s'：只需要一個合併基礎" -#: builtin/rebase.c:1609 +#: builtin/rebase.c #, c-format msgid "Does not point to a valid commit '%s'" msgstr "沒有指向一個有效的提交 '%s'" -#: builtin/rebase.c:1636 -#, c-format -msgid "no such branch/commit '%s'" -msgstr "沒有此分支/提交 '%s'" - -#: builtin/rebase.c:1647 builtin/submodule--helper.c:43 -#: builtin/submodule--helper.c:2477 -#, c-format -msgid "No such ref: %s" -msgstr "沒有這樣的引用：%s" - -#: builtin/rebase.c:1658 -msgid "Could not resolve HEAD to a revision" -msgstr "無法將 HEAD 解析為一個版本" - -#: builtin/rebase.c:1679 +#: builtin/rebase.c msgid "Please commit or stash them." msgstr "請提交或儲藏修改。" -#: builtin/rebase.c:1714 +#: builtin/rebase.c msgid "HEAD is up to date." msgstr "HEAD 是最新的。" -#: builtin/rebase.c:1716 +#: builtin/rebase.c #, c-format msgid "Current branch %s is up to date.\n" msgstr "目前分支 %s 是最新的。\n" -#: builtin/rebase.c:1724 +#: builtin/rebase.c msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的，強制重定基底。" -#: builtin/rebase.c:1726 +#: builtin/rebase.c #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "目前分支 %s 是最新的，強制重定基底。\n" -#: builtin/rebase.c:1734 +#: builtin/rebase.c msgid "The pre-rebase hook refused to rebase." msgstr "pre-rebase 掛鉤拒絕了重定基底動作。" -#: builtin/rebase.c:1741 +#: builtin/rebase.c #, c-format msgid "Changes to %s:\n" msgstr "到 %s 的變更：\n" -#: builtin/rebase.c:1744 +#: builtin/rebase.c #, c-format msgid "Changes from %s to %s:\n" msgstr "從 %s 到 %s 的變更：\n" -#: builtin/rebase.c:1769 +#: builtin/rebase.c #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "首先，還原開頭指標以便在其上重放您的工作...\n" -#: builtin/rebase.c:1781 +#: builtin/rebase.c msgid "Could not detach HEAD" msgstr "無法分離開頭指標" -#: builtin/rebase.c:1790 +#: builtin/rebase.c #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "快轉 %s 到 %s。\n" -#: builtin/receive-pack.c:35 +#: builtin/receive-pack.c msgid "git receive-pack <git-dir>" msgstr "git receive-pack <版本庫目錄>" -#: builtin/receive-pack.c:1263 +#: builtin/receive-pack.c msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -20500,7 +12391,7 @@ msgstr "" "若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n" "設定變數為 'refuse'。" -#: builtin/receive-pack.c:1283 +#: builtin/receive-pack.c msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -20519,19 +12410,19 @@ msgstr "" "\n" "若要封鎖此訊息，您可以設定它為 'refuse'。" -#: builtin/receive-pack.c:2476 +#: builtin/receive-pack.c msgid "quiet" msgstr "靜默模式" -#: builtin/receive-pack.c:2491 +#: builtin/receive-pack.c msgid "you must specify a directory" msgstr "您必須指定目錄" -#: builtin/reflog.c:9 +#: builtin/reflog.c msgid "git reflog [show] [<log-options>] [<ref>]" msgstr "git reflog [show] [<log-options>] [<ref>]" -#: builtin/reflog.c:12 +#: builtin/reflog.c msgid "" "git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n" " [--rewrite] [--updateref] [--stale-fix]\n" @@ -20543,7 +12434,7 @@ msgstr "" " [--dry-run | -n] [--verbose] [--all [--single-worktree] | " "<refs>...]" -#: builtin/reflog.c:17 +#: builtin/reflog.c msgid "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." @@ -20551,78 +12442,78 @@ msgstr "" "git reflog delete [--rewrite] [--updateref]\n" " [--dry-run | -n] [--verbose] <ref>@{<specifier>}..." -#: builtin/reflog.c:21 +#: builtin/reflog.c msgid "git reflog exists <ref>" msgstr "git reflog exists <引用>" -#: builtin/reflog.c:197 builtin/reflog.c:211 +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%s」的時間戳「%s」無效" -#: builtin/reflog.c:240 builtin/reflog.c:359 +#: builtin/reflog.c msgid "do not actually prune any entries" msgstr "不實際剪除任何項目" -#: builtin/reflog.c:243 builtin/reflog.c:362 +#: builtin/reflog.c msgid "" "rewrite the old SHA1 with the new SHA1 of the entry that now precedes it" msgstr "將舊的 SHA1 重寫為現在比它早的新 SHA1" -#: builtin/reflog.c:246 builtin/reflog.c:365 +#: builtin/reflog.c msgid "update the reference to the value of the top reflog entry" msgstr "更新引用至首個引用日誌項目的值" -#: builtin/reflog.c:248 builtin/reflog.c:367 +#: builtin/reflog.c msgid "print extra information on screen" msgstr "在螢幕上輸出額外資訊" -#: builtin/reflog.c:249 builtin/reflog.c:253 +#: builtin/reflog.c msgid "timestamp" msgstr "時間戳" -#: builtin/reflog.c:250 +#: builtin/reflog.c msgid "prune entries older than the specified time" msgstr "剪除舊於指定時間的項目" -#: builtin/reflog.c:254 +#: builtin/reflog.c msgid "" "prune entries older than <time> that are not reachable from the current tip " "of the branch" msgstr "剪除早於 <time> 且不能從分支目前開頭到達的項目" -#: builtin/reflog.c:258 +#: builtin/reflog.c msgid "prune any reflog entries that point to broken commits" msgstr "剪除任何指向損壞提交的引用日誌項目" -#: builtin/reflog.c:259 +#: builtin/reflog.c msgid "process the reflogs of all references" msgstr "處理所有引用的 reflog" -#: builtin/reflog.c:261 +#: builtin/reflog.c msgid "limits processing to reflogs from the current worktree only" msgstr "限制只處理目前工作區的引用日誌" -#: builtin/reflog.c:294 +#: builtin/reflog.c #, c-format msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c:338 +#: builtin/reflog.c #, c-format msgid "%s points nowhere!" msgstr "%s 指向不存在！" -#: builtin/reflog.c:374 +#: builtin/reflog.c msgid "no reflog specified to delete" msgstr "未指定要刪除的引用日誌" -#: builtin/reflog.c:396 +#: builtin/reflog.c #, c-format msgid "invalid ref format: %s" msgstr "無效的引用格式：%s" -#: builtin/remote.c:19 +#: builtin/remote.c msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -20630,86 +12521,86 @@ msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <名稱> <位址>" -#: builtin/remote.c:20 builtin/remote.c:40 +#: builtin/remote.c msgid "git remote rename [--[no-]progress] <old> <new>" msgstr "git remote rename [--[no-]progress] <old> <new>" -#: builtin/remote.c:21 builtin/remote.c:45 +#: builtin/remote.c msgid "git remote remove <name>" msgstr "git remote remove <名稱>" -#: builtin/remote.c:22 builtin/remote.c:50 +#: builtin/remote.c msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" -#: builtin/remote.c:23 +#: builtin/remote.c msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <名稱>" -#: builtin/remote.c:24 +#: builtin/remote.c msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <名稱>" -#: builtin/remote.c:25 +#: builtin/remote.c msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)...]" -#: builtin/remote.c:26 +#: builtin/remote.c msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <名稱> <分支>..." -#: builtin/remote.c:27 builtin/remote.c:76 +#: builtin/remote.c msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <名稱>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" -#: builtin/remote.c:29 builtin/remote.c:82 +#: builtin/remote.c msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <名稱> <新的位址>" -#: builtin/remote.c:30 builtin/remote.c:83 +#: builtin/remote.c msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <名稱> <位址>" -#: builtin/remote.c:35 +#: builtin/remote.c msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<選項>] <名稱> <位址>" -#: builtin/remote.c:55 +#: builtin/remote.c msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <名稱> <分支>..." -#: builtin/remote.c:56 +#: builtin/remote.c msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <名稱> <分支>..." -#: builtin/remote.c:61 +#: builtin/remote.c msgid "git remote show [<options>] <name>" msgstr "git remote show [<選項>] <名稱>" -#: builtin/remote.c:66 +#: builtin/remote.c msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<選項>] <名稱>" -#: builtin/remote.c:71 +#: builtin/remote.c msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<選項>] [<組> | <遠端>]..." -#: builtin/remote.c:100 +#: builtin/remote.c #, c-format msgid "Updating %s" msgstr "更新 %s 中" -#: builtin/remote.c:102 +#: builtin/remote.c #, c-format msgid "Could not fetch %s" msgstr "不能取得 %s" -#: builtin/remote.c:132 +#: builtin/remote.c msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -20717,77 +12608,87 @@ msgstr "" "--mirror 選項危險且過時，請使用 --mirror=fetch\n" "\t 或 --mirror=push" -#: builtin/remote.c:149 +#: builtin/remote.c #, c-format msgid "unknown mirror argument: %s" msgstr "未知的鏡像參數：%s" -#: builtin/remote.c:165 +#: builtin/remote.c msgid "fetch the remote branches" msgstr "抓取遠端的分支" -#: builtin/remote.c:167 +#: builtin/remote.c msgid "import all tags and associated objects when fetching" msgstr "抓取時匯入所有的標籤和關聯物件" -#: builtin/remote.c:170 +#: builtin/remote.c msgid "or do not fetch any tag at all (--no-tags)" msgstr "或不抓取任何標籤（--no-tags）" -#: builtin/remote.c:172 +#: builtin/remote.c msgid "branch(es) to track" msgstr "追蹤的分支" -#: builtin/remote.c:173 +#: builtin/remote.c msgid "master branch" msgstr "master 分支" -#: builtin/remote.c:175 +#: builtin/remote.c msgid "set up remote as a mirror to push to or fetch from" msgstr "把遠端設定為用以推送或抓取的鏡像" -#: builtin/remote.c:187 +#: builtin/remote.c msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" -#: builtin/remote.c:189 +#: builtin/remote.c msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c:196 builtin/remote.c:716 +#: builtin/remote.c #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" -#: builtin/remote.c:241 +#: builtin/remote.c #, c-format msgid "Could not setup master '%s'" msgstr "無法設定 master '%s'" -#: builtin/remote.c:323 +#: builtin/remote.c trailer.c +#, c-format +msgid "more than one %s" +msgstr "多於一個 %s" + +#: builtin/remote.c #, c-format msgid "unhandled branch.%s.rebase=%s; assuming 'true'" msgstr "branch.%s.rebase=%s 未處理。假設成 'true'" -#: builtin/remote.c:367 +#: builtin/remote.c #, c-format msgid "Could not get fetch map for refspec %s" msgstr "無法得到引用規格 %s 的取得列表" -#: builtin/remote.c:461 builtin/remote.c:469 +#: builtin/remote.c msgid "(matching)" msgstr "（符合）" -#: builtin/remote.c:473 +#: builtin/remote.c msgid "(delete)" msgstr "（刪除）" -#: builtin/remote.c:664 +#: builtin/remote.c #, c-format msgid "could not set '%s'" msgstr "無法設定 '%s'" -#: builtin/remote.c:669 +#: builtin/remote.c config.c +#, c-format +msgid "could not unset '%s'" +msgstr "不能取消設定 '%s'" + +#: builtin/remote.c #, c-format msgid "" "The %s configuration remote.pushDefault in:\n" @@ -20798,17 +12699,17 @@ msgstr "" "\t%s:%d\n" "現命名成不存在的遠端分支 '%s'" -#: builtin/remote.c:707 builtin/remote.c:866 builtin/remote.c:973 +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" -#: builtin/remote.c:726 +#: builtin/remote.c #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "不能重新命名設定小節 '%s' 到 '%s'" -#: builtin/remote.c:746 +#: builtin/remote.c #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -20819,21 +12720,21 @@ msgstr "" "\t%s\n" "\t如果必要請手動更新設定。" -#: builtin/remote.c:783 +#: builtin/remote.c msgid "Renaming remote references" msgstr "正在重新命名遠端引用" -#: builtin/remote.c:794 +#: builtin/remote.c #, c-format msgid "deleting '%s' failed" msgstr "刪除 '%s' 失敗" -#: builtin/remote.c:832 +#: builtin/remote.c #, c-format msgid "creating '%s' failed" msgstr "建立 '%s' 失敗" -#: builtin/remote.c:912 +#: builtin/remote.c msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -20842,118 +12743,118 @@ msgid_plural "" "to delete them, use:" msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用：" -#: builtin/remote.c:926 +#: builtin/remote.c #, c-format msgid "Could not remove config section '%s'" msgstr "不能移除設定小節 '%s'" -#: builtin/remote.c:1034 +#: builtin/remote.c #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的（下一次取得將儲存於 remotes/%s）" -#: builtin/remote.c:1037 +#: builtin/remote.c msgid " tracked" msgstr " 已追蹤" -#: builtin/remote.c:1039 +#: builtin/remote.c msgid " stale (use 'git remote prune' to remove)" msgstr " 過時（使用 'git remote prune' 移除）" -#: builtin/remote.c:1041 +#: builtin/remote.c msgid " ???" msgstr " ???" -#: builtin/remote.c:1082 +#: builtin/remote.c #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支" -#: builtin/remote.c:1091 +#: builtin/remote.c #, c-format msgid "rebases interactively onto remote %s" msgstr "互動式重定基底到遠端 %s" -#: builtin/remote.c:1093 +#: builtin/remote.c #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "互動式重定基底（含合併提交）到遠端 %s" -#: builtin/remote.c:1096 +#: builtin/remote.c #, c-format msgid "rebases onto remote %s" msgstr "重定基底到遠端 %s" -#: builtin/remote.c:1100 +#: builtin/remote.c #, c-format msgid " merges with remote %s" msgstr " 與遠端 %s 合併" -#: builtin/remote.c:1103 +#: builtin/remote.c #, c-format msgid "merges with remote %s" msgstr "與遠端 %s 合併" -#: builtin/remote.c:1106 +#: builtin/remote.c #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以及和遠端 %s\n" -#: builtin/remote.c:1149 +#: builtin/remote.c msgid "create" msgstr "建立" -#: builtin/remote.c:1152 +#: builtin/remote.c msgid "delete" msgstr "刪除" -#: builtin/remote.c:1156 +#: builtin/remote.c msgid "up to date" msgstr "最新" -#: builtin/remote.c:1159 +#: builtin/remote.c msgid "fast-forwardable" msgstr "可快轉" -#: builtin/remote.c:1162 +#: builtin/remote.c msgid "local out of date" msgstr "本機已過時" -#: builtin/remote.c:1169 +#: builtin/remote.c #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 強制推送至 %-*s (%s)" -#: builtin/remote.c:1172 +#: builtin/remote.c #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推送至 %-*s (%s)" -#: builtin/remote.c:1176 +#: builtin/remote.c #, c-format msgid " %-*s forces to %s" msgstr " %-*s 強制推送至 %s" -#: builtin/remote.c:1179 +#: builtin/remote.c #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" -#: builtin/remote.c:1247 +#: builtin/remote.c msgid "do not query remotes" msgstr "不查詢遠端" -#: builtin/remote.c:1268 +#: builtin/remote.c #, c-format msgid "* remote %s" msgstr "* 遠端 %s" -#: builtin/remote.c:1269 +#: builtin/remote.c #, c-format msgid " Fetch URL: %s" msgstr " 取得位址：%s" -#: builtin/remote.c:1270 builtin/remote.c:1286 builtin/remote.c:1423 +#: builtin/remote.c msgid "(no URL)" msgstr "(無 URL)" @@ -20961,359 +12862,372 @@ msgstr "(無 URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1284 builtin/remote.c:1286 +#: builtin/remote.c #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" -#: builtin/remote.c:1288 builtin/remote.c:1290 builtin/remote.c:1292 +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1288 +#: builtin/remote.c msgid "(not queried)" msgstr "（未查詢）" -#: builtin/remote.c:1290 +#: builtin/remote.c msgid "(unknown)" msgstr "（未知）" -#: builtin/remote.c:1294 +#: builtin/remote.c #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n" -#: builtin/remote.c:1306 +#: builtin/remote.c #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c:1309 builtin/remote.c:1335 +#: builtin/remote.c msgid " (status not queried)" msgstr " （狀態未查詢）" -#: builtin/remote.c:1318 +#: builtin/remote.c msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 為 'git pull' 設定的本機分支：" -#: builtin/remote.c:1326 +#: builtin/remote.c msgid " Local refs will be mirrored by 'git push'" msgstr " 本機引用將在 'git push' 時被鏡像" -#: builtin/remote.c:1332 +#: builtin/remote.c #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 為 'git push' 設定的本機引用%s：" -#: builtin/remote.c:1353 +#: builtin/remote.c msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1355 +#: builtin/remote.c msgid "delete refs/remotes/<name>/HEAD" msgstr "刪除 refs/remotes/<名稱>/HEAD" -#: builtin/remote.c:1369 +#: builtin/remote.c msgid "Cannot determine remote HEAD" msgstr "無法確定遠端 HEAD" -#: builtin/remote.c:1371 +#: builtin/remote.c msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令：" -#: builtin/remote.c:1381 +#: builtin/remote.c #, c-format msgid "Could not delete %s" msgstr "無法刪除 %s" -#: builtin/remote.c:1389 +#: builtin/remote.c #, c-format msgid "Not a valid ref: %s" msgstr "不是一個有效引用：%s" -#: builtin/remote.c:1391 +#: builtin/remote.c #, c-format msgid "Could not setup %s" msgstr "不能設定 %s" # 譯者：請維持前導空格 -#: builtin/remote.c:1409 +#: builtin/remote.c #, c-format msgid " %s will become dangling!" msgstr " %s 將成為懸空狀態！" # 譯者：請維持前導空格 -#: builtin/remote.c:1410 +#: builtin/remote.c #, c-format msgid " %s has become dangling!" msgstr " %s 已成為懸空狀態！" -#: builtin/remote.c:1419 +#: builtin/remote.c #, c-format msgid "Pruning %s" msgstr "修剪 %s" -#: builtin/remote.c:1420 +#: builtin/remote.c #, c-format msgid "URL: %s" msgstr "URL：%s" -#: builtin/remote.c:1436 +#: builtin/remote.c #, c-format msgid " * [would prune] %s" msgstr " * [將剪除] %s" -#: builtin/remote.c:1439 +#: builtin/remote.c #, c-format msgid " * [pruned] %s" msgstr " * [已剪除] %s" -#: builtin/remote.c:1484 +#: builtin/remote.c msgid "prune remotes after fetching" msgstr "抓取後剪除遠端" -#: builtin/remote.c:1548 builtin/remote.c:1604 builtin/remote.c:1674 +#: builtin/remote.c #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" -#: builtin/remote.c:1566 +#: builtin/remote.c msgid "add branch" msgstr "新增分支" -#: builtin/remote.c:1573 +#: builtin/remote.c msgid "no remote specified" msgstr "未指定遠端" -#: builtin/remote.c:1590 +#: builtin/remote.c msgid "query push URLs rather than fetch URLs" msgstr "查詢推送 URL 位址，而非取得 URL 位址" -#: builtin/remote.c:1592 +#: builtin/remote.c msgid "return all URLs" msgstr "返回所有 URL 位址" -#: builtin/remote.c:1622 +#: builtin/remote.c #, c-format msgid "no URLs configured for remote '%s'" msgstr "沒有給遠端版本庫 '%s' 設定 URL" -#: builtin/remote.c:1648 +#: builtin/remote.c msgid "manipulate push URLs" msgstr "動作推送 URLS" -#: builtin/remote.c:1650 +#: builtin/remote.c msgid "add URL" msgstr "新增 URL" -#: builtin/remote.c:1652 +#: builtin/remote.c msgid "delete URLs" msgstr "刪除 URL" -#: builtin/remote.c:1659 +#: builtin/remote.c msgid "--add --delete doesn't make sense" msgstr "--add --delete 無意義" -#: builtin/remote.c:1700 +#: builtin/remote.c #, c-format msgid "Invalid old URL pattern: %s" msgstr "無效的舊 URL 符合範本：%s" -#: builtin/remote.c:1708 +#: builtin/remote.c #, c-format msgid "No such URL found: %s" msgstr "未找到此 URL：%s" -#: builtin/remote.c:1710 +#: builtin/remote.c msgid "Will not delete all non-push URLs" msgstr "將不會刪除所有非推送 URL 位址" -#: builtin/remote.c:1727 +#: builtin/remote.c msgid "be verbose; must be placed before a subcommand" msgstr "詳細輸出；必須置於子指令之前" -#: builtin/repack.c:29 +#: builtin/repack.c msgid "git repack [<options>]" msgstr "git repack [<選項>]" -#: builtin/repack.c:34 +#: builtin/repack.c msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" -"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +"--no-write-bitmap-index or disable the pack.writeBitmaps configuration." msgstr "" -"增量 repack 和 bitmap 索引不相容。 使用 --no-write-bitmap-index\n" -"或停用 pack.writebitmaps 設定。" +"增量 repack 和 bitmap 索引不相容。請使用 --no-write-bitmap-index\n" +"或停用 pack.writeBitmaps 設定。" -#: builtin/repack.c:206 +#: builtin/repack.c msgid "could not start pack-objects to repack promisor objects" msgstr "無法開始 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:280 builtin/repack.c:824 +#: builtin/repack.c msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。" -#: builtin/repack.c:304 +#: builtin/repack.c msgid "could not finish pack-objects to repack promisor objects" msgstr "無法完成 pack-objects 來重新打包 promisor 物件" -#: builtin/repack.c:319 +#: builtin/repack.c #, c-format msgid "cannot open index for %s" msgstr "無法開啟 %s 的索引" -#: builtin/repack.c:378 +#: builtin/repack.c #, c-format msgid "pack %s too large to consider in geometric progression" msgstr "%s 包太大，以致不能在等比數列中考慮" -#: builtin/repack.c:411 builtin/repack.c:418 builtin/repack.c:423 +#: builtin/repack.c #, c-format msgid "pack %s too large to roll up" msgstr "%s 包太大，以致不能縮合" -#: builtin/repack.c:503 +#: builtin/repack.c #, c-format msgid "could not open tempfile %s for writing" msgstr "無法開啟 '%s' 暫存檔進行寫入" -#: builtin/repack.c:521 +#: builtin/repack.c msgid "could not close refs snapshot tempfile" msgstr "無法關閉 refs 的快照暫存檔" -#: builtin/repack.c:634 +#: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" -#: builtin/repack.c:636 +#: builtin/repack.c msgid "same as -a, and turn unreachable objects loose" msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" -#: builtin/repack.c:639 +#: builtin/repack.c +msgid "same as -a, pack unreachable cruft objects separately" +msgstr "和 -a 相同，會獨立封裝無法存取的廢棄物件" + +#: builtin/repack.c +msgid "approxidate" +msgstr "近似日期" + +#: builtin/repack.c +msgid "with -C, expire objects older than this" +msgstr "搭配 -C 會將早於此的物件設為過期" + +#: builtin/repack.c msgid "remove redundant packs, and run git-prune-packed" msgstr "刪除多餘的包，然後執行 git-prune-packed" -#: builtin/repack.c:641 +#: builtin/repack.c msgid "pass --no-reuse-delta to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta" -#: builtin/repack.c:643 +#: builtin/repack.c msgid "pass --no-reuse-object to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object" -#: builtin/repack.c:645 +#: builtin/repack.c msgid "do not run git-update-server-info" msgstr "不執行 git-update-server-info" -#: builtin/repack.c:648 +#: builtin/repack.c msgid "pass --local to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --local" -#: builtin/repack.c:650 +#: builtin/repack.c msgid "write bitmap index" msgstr "寫 bitmap 索引" -#: builtin/repack.c:652 +#: builtin/repack.c msgid "pass --delta-islands to git-pack-objects" msgstr "向 git-pack-objects 傳遞參數 --delta-islands" -#: builtin/repack.c:653 -msgid "approxidate" -msgstr "近似日期" - -#: builtin/repack.c:654 +#: builtin/repack.c msgid "with -A, do not loosen objects older than this" msgstr "使用 -A，不要將早於提供時間的物件過期" -#: builtin/repack.c:656 +#: builtin/repack.c msgid "with -a, repack unreachable objects" msgstr "使用 -a ，重新對無法取得物件打包" -#: builtin/repack.c:658 +#: builtin/repack.c msgid "size of the window used for delta compression" msgstr "用於增量壓縮的視窗值" -#: builtin/repack.c:659 builtin/repack.c:665 +#: builtin/repack.c msgid "bytes" msgstr "位元組" -#: builtin/repack.c:660 +#: builtin/repack.c msgid "same as the above, but limit memory size instead of entries count" msgstr "和上面的相似，但限制記憶體大小而非條目數" -#: builtin/repack.c:662 +#: builtin/repack.c msgid "limits the maximum delta depth" msgstr "限制最大增量深度" -#: builtin/repack.c:664 +#: builtin/repack.c msgid "limits the maximum number of threads" msgstr "限制最大執行緒數" -#: builtin/repack.c:666 +#: builtin/repack.c msgid "maximum size of each packfile" msgstr "每個 packfile 的最大尺寸" -#: builtin/repack.c:668 +#: builtin/repack.c msgid "repack objects in packs marked with .keep" msgstr "對標記為 .keep 的包中的物件重新打包" -#: builtin/repack.c:670 +#: builtin/repack.c msgid "do not repack this pack" -msgstr "不要對該包檔案重新打包" +msgstr "不要對該封包重新打包" -#: builtin/repack.c:672 +#: builtin/repack.c msgid "find a geometric progression with factor <N>" msgstr "尋找因數是 <N> 的等比數列" -#: builtin/repack.c:674 +#: builtin/repack.c msgid "write a multi-pack index of the resulting packs" msgstr "寫入結果包的多包索引" -#: builtin/repack.c:684 +#: builtin/repack.c msgid "cannot delete packs in a precious-objects repo" -msgstr "不能刪除珍品版本庫中的打包檔案" +msgstr "不能刪除珍品版本庫中的封包" -#: builtin/repack.c:833 +#: builtin/repack.c msgid "Nothing new to pack." msgstr "沒有新的要打包。" -#: builtin/repack.c:863 +#: builtin/repack.c +#, c-format +msgid "pack prefix %s does not begin with objdir %s" +msgstr "封包前綴 %s 不以 objdir %s 開頭" + +#: builtin/repack.c #, c-format msgid "missing required file: %s" msgstr "缺少必要檔案：%s" -#: builtin/repack.c:865 +#: builtin/repack.c #, c-format msgid "could not unlink: %s" msgstr "無法取消連結：%s" -#: builtin/replace.c:22 +#: builtin/replace.c msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <物件> <取代物>" -#: builtin/replace.c:23 +#: builtin/replace.c msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <物件>" -#: builtin/replace.c:24 +#: builtin/replace.c msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <提交> [<父提交>...]" -#: builtin/replace.c:26 +#: builtin/replace.c msgid "git replace -d <object>..." msgstr "git replace -d <物件>..." -#: builtin/replace.c:27 +#: builtin/replace.c msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<格式>] [-l [<模式>]]" -#: builtin/replace.c:90 +#: builtin/replace.c #, c-format msgid "" "invalid replace format '%s'\n" @@ -21322,27 +13236,27 @@ msgstr "" "無效的取代格式 '%s'\n" "有效的格式有 'short'、'medium' 和 'long'" -#: builtin/replace.c:125 +#: builtin/replace.c #, c-format msgid "replace ref '%s' not found" msgstr "未發現取代引用 '%s'" -#: builtin/replace.c:141 +#: builtin/replace.c #, c-format msgid "Deleted replace ref '%s'" msgstr "已刪除取代引用 '%s'" -#: builtin/replace.c:153 +#: builtin/replace.c #, c-format msgid "'%s' is not a valid ref name" msgstr "'%s' 不是一個有效的引用名" -#: builtin/replace.c:158 +#: builtin/replace.c #, c-format msgid "replace ref '%s' already exists" msgstr "取代引用 '%s' 已經存在" -#: builtin/replace.c:178 +#: builtin/replace.c #, c-format msgid "" "Objects must be of the same type.\n" @@ -21353,106 +13267,106 @@ msgstr "" "'%s' 指向 '%s' 類型的取代物件\n" "而 '%s' 指向 '%s' 類型的取代物件。" -#: builtin/replace.c:229 +#: builtin/replace.c #, c-format msgid "unable to open %s for writing" msgstr "無法為寫入開啟 %s" -#: builtin/replace.c:242 +#: builtin/replace.c msgid "cat-file reported failure" msgstr "cat-file 報告失敗" -#: builtin/replace.c:258 +#: builtin/replace.c #, c-format msgid "unable to open %s for reading" msgstr "無法為讀取開啟 %s" -#: builtin/replace.c:271 +#: builtin/replace.c msgid "unable to spawn mktree" msgstr "無法啟動 mktree" -#: builtin/replace.c:275 +#: builtin/replace.c msgid "unable to read from mktree" msgstr "無法從 mktree 讀取" -#: builtin/replace.c:284 +#: builtin/replace.c msgid "mktree reported failure" msgstr "mktree 報告失敗" -#: builtin/replace.c:288 +#: builtin/replace.c msgid "mktree did not return an object name" msgstr "mktree 沒有返回一個物件名" -#: builtin/replace.c:297 +#: builtin/replace.c #, c-format msgid "unable to fstat %s" msgstr "無法對 %s 執行 fstat" -#: builtin/replace.c:302 +#: builtin/replace.c msgid "unable to write object to database" msgstr "無法向資料庫寫入物件" -#: builtin/replace.c:325 +#: builtin/replace.c #, c-format msgid "unable to get object type for %s" msgstr "無法得到 %s 的物件類型" -#: builtin/replace.c:341 +#: builtin/replace.c msgid "editing object file failed" msgstr "編輯物件檔案失敗" -#: builtin/replace.c:350 +#: builtin/replace.c #, c-format msgid "new object is the same as the old one: '%s'" msgstr "新物件和舊物件相同：'%s'" -#: builtin/replace.c:383 +#: builtin/replace.c #, c-format msgid "could not parse %s as a commit" msgstr "無法將 %s 解析為一個提交" -#: builtin/replace.c:415 +#: builtin/replace.c #, c-format msgid "bad mergetag in commit '%s'" msgstr "提交 '%s' 中含有損壞的合併標籤" -#: builtin/replace.c:417 +#: builtin/replace.c #, c-format msgid "malformed mergetag in commit '%s'" msgstr "提交 '%s' 中含有格式錯誤的合併標籤" -#: builtin/replace.c:429 +#: builtin/replace.c #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始提交 '%s' 包含已經捨棄的合併標籤 '%s'，使用 --edit 代替 --graft" -#: builtin/replace.c:468 +#: builtin/replace.c #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "原始提交 '%s' 中有一個 gpg 簽名" -#: builtin/replace.c:469 +#: builtin/replace.c msgid "the signature will be removed in the replacement commit!" msgstr "在取代的提交中簽名將被移除！" -#: builtin/replace.c:479 +#: builtin/replace.c #, c-format msgid "could not write replacement commit for: '%s'" msgstr "不能為 '%s' 寫取代提交" -#: builtin/replace.c:487 +#: builtin/replace.c #, c-format msgid "graft for '%s' unnecessary" msgstr "對 '%s' 移植沒有必要" -#: builtin/replace.c:491 +#: builtin/replace.c #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "新提交和舊的一樣：'%s'" -#: builtin/replace.c:526 +#: builtin/replace.c #, c-format msgid "" "could not convert the following graft(s):\n" @@ -21461,214 +13375,213 @@ msgstr "" "不能轉換下列移植：\n" "%s" -#: builtin/replace.c:547 +#: builtin/replace.c msgid "list replace refs" msgstr "列出取代的引用" -#: builtin/replace.c:548 +#: builtin/replace.c msgid "delete replace refs" msgstr "刪除取代的引用" -#: builtin/replace.c:549 +#: builtin/replace.c msgid "edit existing object" msgstr "編輯現存的物件" -#: builtin/replace.c:550 +#: builtin/replace.c msgid "change a commit's parents" msgstr "修改一個提交的父提交" -#: builtin/replace.c:551 +#: builtin/replace.c msgid "convert existing graft file" msgstr "轉換現存的移植檔案" -#: builtin/replace.c:552 +#: builtin/replace.c msgid "replace the ref if it exists" msgstr "如果存在則取代引用" -#: builtin/replace.c:554 +#: builtin/replace.c msgid "do not pretty-print contents for --edit" msgstr "不要為 --edit 動作美觀顯示內容" -#: builtin/replace.c:555 +#: builtin/replace.c msgid "use this format" msgstr "使用此格式" -#: builtin/replace.c:568 +#: builtin/replace.c msgid "--format cannot be used when not listing" msgstr "不列出時不能使用 --format" -#: builtin/replace.c:576 +#: builtin/replace.c msgid "-f only makes sense when writing a replacement" msgstr "只有寫一個取代時 -f 才有意義" -#: builtin/replace.c:580 +#: builtin/replace.c msgid "--raw only makes sense with --edit" msgstr "--raw 只有和 --edit 共用才有意義" -#: builtin/replace.c:586 +#: builtin/replace.c msgid "-d needs at least one argument" msgstr "-d 需要至少一個參數" -#: builtin/replace.c:592 +#: builtin/replace.c msgid "bad number of arguments" msgstr "錯誤的參數個數" -#: builtin/replace.c:598 +#: builtin/replace.c msgid "-e needs exactly one argument" msgstr "-e 需要且僅需要一個參數" -#: builtin/replace.c:604 +#: builtin/replace.c msgid "-g needs at least one argument" msgstr "-g 需要至少一個參數" -#: builtin/replace.c:610 +#: builtin/replace.c msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file 不帶參數" -#: builtin/replace.c:616 +#: builtin/replace.c msgid "only one pattern can be given with -l" msgstr "只能為 -l 提供一個模式" -#: builtin/rerere.c:13 +#: builtin/rerere.c msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]" -#: builtin/rerere.c:58 +#: builtin/rerere.c msgid "register clean resolutions in index" msgstr "在索引中註冊乾淨的解決方案" -#: builtin/rerere.c:77 +#: builtin/rerere.c msgid "'git rerere forget' without paths is deprecated" msgstr "沒有路徑的 'git rerere forget' 已經過時" -#: builtin/rerere.c:111 +#: builtin/rerere.c #, c-format msgid "unable to generate diff for '%s'" msgstr "無法為 '%s' 生成差異" -#: builtin/reset.c:33 +#: builtin/reset.c msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" -#: builtin/reset.c:34 +#: builtin/reset.c msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." msgstr "git reset [-q] [<樹或提交>] [--] <路徑規格>..." -#: builtin/reset.c:35 +#: builtin/reset.c 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:36 +#: builtin/reset.c msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" msgstr "git reset --patch [<樹或提交>] [--] [<路徑規格>...]" -#: builtin/reset.c:42 +#: builtin/reset.c msgid "mixed" msgstr "混雜" -#: builtin/reset.c:42 +#: builtin/reset.c msgid "soft" msgstr "軟性" -#: builtin/reset.c:42 +#: builtin/reset.c msgid "hard" msgstr "硬性" -#: builtin/reset.c:42 +#: builtin/reset.c msgid "merge" msgstr "合併" -#: builtin/reset.c:42 +#: builtin/reset.c msgid "keep" msgstr "保持" -#: builtin/reset.c:90 +#: builtin/reset.c msgid "You do not have a valid HEAD." msgstr "您沒有一個有效的 HEAD。" -#: builtin/reset.c:92 +#: builtin/reset.c msgid "Failed to find tree of HEAD." msgstr "無法找到 HEAD 指向的樹。" -#: builtin/reset.c:98 +#: builtin/reset.c #, c-format msgid "Failed to find tree of %s." msgstr "無法找到 %s 指向的樹。" -#: builtin/reset.c:123 +#: builtin/reset.c #, c-format msgid "HEAD is now at %s" msgstr "HEAD 現在位於 %s" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:304 +#: builtin/reset.c #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c:402 builtin/stash.c:606 builtin/stash.c:669 -#: builtin/stash.c:693 +#: builtin/reset.c builtin/stash.c msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" -#: builtin/reset.c:404 +#: builtin/reset.c msgid "skip refreshing the index after reset" msgstr "重設後略過重新整理索引的步驟" -#: builtin/reset.c:406 +#: builtin/reset.c msgid "reset HEAD and index" msgstr "重設 HEAD 和索引" -#: builtin/reset.c:407 +#: builtin/reset.c msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c:409 builtin/reset.c:411 +#: builtin/reset.c msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" -#: builtin/reset.c:413 +#: builtin/reset.c msgid "reset HEAD but keep local changes" msgstr "重設 HEAD 但儲存本機變更" -#: builtin/reset.c:419 +#: builtin/reset.c msgid "record only the fact that removed paths will be added later" msgstr "將刪除的路徑標記為稍後新增" -#: builtin/reset.c:452 +#: builtin/reset.c #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "無法將 '%s' 解析為一個有效的版本。" -#: builtin/reset.c:460 +#: builtin/reset.c #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "無法將 '%s' 解析為一個有效的樹狀物件。" -#: builtin/reset.c:479 +#: builtin/reset.c msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:481 +#: builtin/reset.c #, c-format msgid "Cannot do %s reset with paths." msgstr "不能帶路徑進行%s重設。" # 譯者：漢字之間無空格，故刪除%s前後空格 -#: builtin/reset.c:496 +#: builtin/reset.c #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能對純版本庫進行%s重設" -#: builtin/reset.c:527 +#: builtin/reset.c msgid "Unstaged changes after reset:" msgstr "重設後取消暫存的變更：" -#: builtin/reset.c:530 +#: builtin/reset.c #, c-format msgid "" "It took %.2f seconds to refresh the index after reset. You can use\n" @@ -21677,53 +13590,58 @@ msgstr "" "重設後花費 %.2f 秒重新整理索引。\n" "您可以使用「--no-refresh」避開本步驟。" -#: builtin/reset.c:547 +#: builtin/reset.c #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重設索引檔案至版本 '%s'。" -#: builtin/reset.c:552 +#: builtin/reset.c msgid "Could not write new index file." msgstr "不能寫入新的索引檔案。" -#: builtin/rev-list.c:659 +#: builtin/rev-list.c pack-bitmap.c +#, c-format +msgid "unable to get disk usage of %s" +msgstr "無法取得 %s 的磁碟用量" + +#: builtin/rev-list.c msgid "rev-list does not support display of notes" msgstr "rev-list 不支援顯示註解" -#: builtin/rev-list.c:664 +#: builtin/rev-list.c #, c-format msgid "marked counting and '%s' cannot be used together" msgstr "標記計數 (marked counting) 與「%s」不得同時使用" -#: builtin/rev-parse.c:409 +#: builtin/rev-parse.c msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<選項>] -- [<參數>...]" -#: builtin/rev-parse.c:414 +#: builtin/rev-parse.c msgid "keep the `--` passed as an arg" msgstr "保持 `--` 作為一個參數傳遞" -#: builtin/rev-parse.c:416 +#: builtin/rev-parse.c msgid "stop parsing after the first non-option argument" msgstr "遇到第一個非選項參數後停止解析" -#: builtin/rev-parse.c:419 +#: builtin/rev-parse.c msgid "output in stuck long form" msgstr "以固定長格式輸出" -#: builtin/rev-parse.c:438 +#: builtin/rev-parse.c msgid "premature end of input" msgstr "輸入過早到達結尾" -#: builtin/rev-parse.c:442 +#: builtin/rev-parse.c msgid "no usage string given before the `--' separator" msgstr "「--」分隔符號前未提供用法字串" -#: builtin/rev-parse.c:548 +#: builtin/rev-parse.c msgid "Needed a single revision" msgstr "需要一個修訂版本" -#: builtin/rev-parse.c:552 +#: builtin/rev-parse.c msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -21737,145 +13655,153 @@ msgstr "" "\n" "初次使用時執行 \"git rev-parse --parseopt -h\" 來獲得更多訊息。" -#: builtin/rev-parse.c:712 +#: builtin/rev-parse.c msgid "--resolve-git-dir requires an argument" msgstr "--resolve-git-dir 需要 1 個引數" -#: builtin/rev-parse.c:715 +#: builtin/rev-parse.c #, c-format msgid "not a gitdir '%s'" msgstr "'%s' 不是 git 目錄" -#: builtin/rev-parse.c:739 +#: builtin/rev-parse.c msgid "--git-path requires an argument" msgstr "--git-path 需要 1 個引數" -#: builtin/rev-parse.c:749 +#: builtin/rev-parse.c msgid "-n requires an argument" msgstr "-n 需要 1 個引數" -#: builtin/rev-parse.c:763 +#: builtin/rev-parse.c msgid "--path-format requires an argument" msgstr "--path-format 需要 1 個引數" -#: builtin/rev-parse.c:769 +#: builtin/rev-parse.c #, c-format msgid "unknown argument to --path-format: %s" msgstr "傳入 --path-format 的引數未知：%s" -#: builtin/rev-parse.c:776 +#: builtin/rev-parse.c msgid "--default requires an argument" msgstr "--default 需要 1 個引數" -#: builtin/rev-parse.c:782 +#: builtin/rev-parse.c msgid "--prefix requires an argument" msgstr "--prefix 需要 1 個引數" -#: builtin/rev-parse.c:851 +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --abbrev-ref: %s" msgstr "--abbrev-ref 的模式未知：%s" -#: builtin/rev-parse.c:1023 +#: builtin/rev-parse.c setup.c +msgid "this operation must be run in a work tree" +msgstr "該動作必須在一個工作區中執行" + +#: builtin/rev-parse.c #, c-format msgid "unknown mode for --show-object-format: %s" msgstr "--show-object-format 的模式未知：%s" -#: builtin/revert.c:24 +#: builtin/revert.c msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<選項>] <提交號>..." -#: builtin/revert.c:25 +#: builtin/revert.c msgid "git revert <subcommand>" msgstr "git revert <子指令>" -#: builtin/revert.c:30 +#: builtin/revert.c msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<選項>] <提交號>..." -#: builtin/revert.c:31 +#: builtin/revert.c msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <子指令>" -#: builtin/revert.c:72 +#: builtin/revert.c #, c-format msgid "option `%s' expects a number greater than zero" msgstr "選項 `%s' 期望一個大於零的數字" -#: builtin/revert.c:92 +#: builtin/revert.c #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 同時使用" -#: builtin/revert.c:102 +#: builtin/revert.c msgid "end revert or cherry-pick sequence" msgstr "終止反轉或揀選動作" -#: builtin/revert.c:103 +#: builtin/revert.c msgid "resume revert or cherry-pick sequence" msgstr "繼續反轉或揀選動作" -#: builtin/revert.c:104 +#: builtin/revert.c msgid "cancel revert or cherry-pick sequence" msgstr "取消反轉或揀選動作" -#: builtin/revert.c:105 +#: builtin/revert.c msgid "skip current commit and continue" msgstr "略過目前提交並繼續" -#: builtin/revert.c:107 +#: builtin/revert.c msgid "don't automatically commit" msgstr "不要自動提交" -#: builtin/revert.c:108 +#: builtin/revert.c msgid "edit the commit message" msgstr "編輯提交說明" -#: builtin/revert.c:111 +#: builtin/revert.c msgid "parent-number" msgstr "父編號" -#: builtin/revert.c:112 +#: builtin/revert.c msgid "select mainline parent" msgstr "選擇主幹父提交編號" -#: builtin/revert.c:114 +#: builtin/revert.c msgid "merge strategy" msgstr "合併策略" -#: builtin/revert.c:116 +#: builtin/revert.c msgid "option for merge strategy" msgstr "合併策略的選項" -#: builtin/revert.c:125 +#: builtin/revert.c msgid "append commit name" msgstr "追加提交名稱" -#: builtin/revert.c:127 +#: builtin/revert.c msgid "preserve initially empty commits" msgstr "保留初始化的空提交" -#: builtin/revert.c:128 +#: builtin/revert.c msgid "allow commits with empty messages" msgstr "允許提交說明為空" -#: builtin/revert.c:129 +#: builtin/revert.c msgid "keep redundant, empty commits" msgstr "保持多餘的、空的提交" -#: builtin/revert.c:241 +#: builtin/revert.c +msgid "use the 'reference' format to refer to commits" +msgstr "請使用 “reference” 格式參考提交" + +#: builtin/revert.c msgid "revert failed" msgstr "還原失敗" -#: builtin/revert.c:254 +#: builtin/revert.c msgid "cherry-pick failed" msgstr "揀選失敗" -#: builtin/rm.c:20 +#: builtin/rm.c msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<選項>] [--] <檔案>..." -#: builtin/rm.c:208 +#: builtin/rm.c msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -21884,7 +13810,7 @@ msgid_plural "" "file and the HEAD:" msgstr[0] "如下檔案其暫存的內容和工作區及 HEAD 中的都不一樣：" -#: builtin/rm.c:213 +#: builtin/rm.c msgid "" "\n" "(use -f to force removal)" @@ -21892,12 +13818,12 @@ msgstr "" "\n" "（使用 -f 強制刪除）" -#: builtin/rm.c:217 +#: builtin/rm.c msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列檔案有暫存在索引的變更：" -#: builtin/rm.c:221 builtin/rm.c:230 +#: builtin/rm.c msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -21905,50 +13831,50 @@ msgstr "" "\n" "（使用 --cached 保留本機檔案，或用 -f 強制刪除）" -#: builtin/rm.c:227 +#: builtin/rm.c msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下檔案有本機修改：" -#: builtin/rm.c:245 +#: builtin/rm.c msgid "do not list removed files" msgstr "不列出刪除的檔案" -#: builtin/rm.c:246 +#: builtin/rm.c msgid "only remove from the index" msgstr "只從索引區刪除" -#: builtin/rm.c:247 +#: builtin/rm.c msgid "override the up-to-date check" msgstr "忽略檔案更新狀態檢查" -#: builtin/rm.c:248 +#: builtin/rm.c msgid "allow recursive removal" msgstr "允許遞迴刪除" -#: builtin/rm.c:250 +#: builtin/rm.c msgid "exit with a zero status even if nothing matched" msgstr "即使沒有符合，也以零狀態離開" -#: builtin/rm.c:285 +#: builtin/rm.c msgid "No pathspec was given. Which files should I remove?" msgstr "沒有提供路徑規格。我該移除哪個檔案？" -#: builtin/rm.c:315 +#: builtin/rm.c msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "請將您的修改暫存到 .gitmodules 中或儲藏後再繼續" -#: builtin/rm.c:337 +#: builtin/rm.c #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 選項不會遞迴刪除 '%s'" -#: builtin/rm.c:385 +#: builtin/rm.c #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能刪除 %s" -#: builtin/send-pack.c:20 +#: builtin/send-pack.c msgid "" "git send-pack [--mirror] [--dry-run] [--force]\n" " [--receive-pack=<git-receive-pack>]\n" @@ -21960,80 +13886,80 @@ msgstr "" " [--verbose] [--thin] [--atomic]\n" " [<主機>:]<目錄> (--all | <引用>...)" -#: builtin/send-pack.c:192 +#: builtin/send-pack.c msgid "remote name" msgstr "遠端名稱" -#: builtin/send-pack.c:205 +#: builtin/send-pack.c msgid "use stateless RPC protocol" msgstr "使用無狀態的 RPC 協定" -#: builtin/send-pack.c:206 +#: builtin/send-pack.c msgid "read refs from stdin" msgstr "從標準輸入讀取引用" -#: builtin/send-pack.c:207 +#: builtin/send-pack.c msgid "print status from remote helper" msgstr "列印來自遠端 helper 的狀態" -#: builtin/shortlog.c:16 +#: builtin/shortlog.c msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<選項>] [<版本範圍>] [[--] <路徑>...]" -#: builtin/shortlog.c:17 +#: builtin/shortlog.c msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<選項>]" -#: builtin/shortlog.c:123 +#: builtin/shortlog.c msgid "using multiple --group options with stdin is not supported" msgstr "不支援在標準輸入使用多個 --group 選項" -#: builtin/shortlog.c:133 +#: builtin/shortlog.c msgid "using --group=trailer with stdin is not supported" msgstr "不支援在標準輸入使用 --group=trailer" -#: builtin/shortlog.c:323 +#: builtin/shortlog.c #, c-format msgid "unknown group type: %s" msgstr "未知群組類型：%s" -#: builtin/shortlog.c:351 +#: builtin/shortlog.c msgid "group by committer rather than author" msgstr "依提交者而非作者分組" -#: builtin/shortlog.c:354 +#: builtin/shortlog.c msgid "sort output according to the number of commits per author" msgstr "根據每個作者的提交數量排序" -#: builtin/shortlog.c:356 +#: builtin/shortlog.c msgid "suppress commit descriptions, only provides commit count" msgstr "隱藏提交說明，只提供提交數量" -#: builtin/shortlog.c:358 +#: builtin/shortlog.c msgid "show the email address of each author" msgstr "顯示每個作者的電子信件位址" -#: builtin/shortlog.c:359 +#: builtin/shortlog.c msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:360 +#: builtin/shortlog.c msgid "linewrap output" msgstr "折行輸出" -#: builtin/shortlog.c:362 +#: builtin/shortlog.c msgid "field" msgstr "欄位" -#: builtin/shortlog.c:363 +#: builtin/shortlog.c msgid "group by field" msgstr "依欄位分組" -#: builtin/shortlog.c:395 +#: builtin/shortlog.c msgid "too many arguments given outside repository" msgstr "版本庫外執行提供了太多的參數" -#: builtin/show-branch.c:14 +#: builtin/show-branch.c msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" " [--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -22046,129 +13972,129 @@ msgstr "" " [--no-name | --sha1-name] [--topics] [(<版本> | <萬用字元" ">)...]" -#: builtin/show-branch.c:18 +#: builtin/show-branch.c msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]" -#: builtin/show-branch.c:396 +#: builtin/show-branch.c #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %s，無法處理 %d 個以上的引用" -#: builtin/show-branch.c:548 +#: builtin/show-branch.c #, c-format msgid "no matching refs with %s" msgstr "沒有和 %s 符合的引用" -#: builtin/show-branch.c:645 +#: builtin/show-branch.c msgid "show remote-tracking and local branches" msgstr "顯示遠端追蹤的和本機的分支" -#: builtin/show-branch.c:647 +#: builtin/show-branch.c msgid "show remote-tracking branches" msgstr "顯示遠端追蹤的分支" -#: builtin/show-branch.c:649 +#: builtin/show-branch.c msgid "color '*!+-' corresponding to the branch" msgstr "著色 '*!+-' 到相應的分支" -#: builtin/show-branch.c:651 +#: builtin/show-branch.c msgid "show <n> more commits after the common ancestor" msgstr "顯示共同祖先後的 <n> 個提交" -#: builtin/show-branch.c:653 +#: builtin/show-branch.c msgid "synonym to more=-1" msgstr "和 more=-1 同義" -#: builtin/show-branch.c:654 +#: builtin/show-branch.c msgid "suppress naming strings" msgstr "不顯示字串命名" -#: builtin/show-branch.c:656 +#: builtin/show-branch.c msgid "include the current branch" msgstr "包括目前分支" -#: builtin/show-branch.c:658 +#: builtin/show-branch.c msgid "name commits with their object names" msgstr "以物件名字命名提交" -#: builtin/show-branch.c:660 +#: builtin/show-branch.c msgid "show possible merge bases" msgstr "顯示可能合併的基礎" -#: builtin/show-branch.c:662 +#: builtin/show-branch.c msgid "show refs unreachable from any other ref" msgstr "顯示沒有任何引用的的引用" -#: builtin/show-branch.c:664 +#: builtin/show-branch.c msgid "show commits in topological order" msgstr "以拓撲順序顯示提交" -#: builtin/show-branch.c:667 +#: builtin/show-branch.c msgid "show only commits not on the first branch" msgstr "只顯示不在第一個分支上的提交" -#: builtin/show-branch.c:669 +#: builtin/show-branch.c msgid "show merges reachable from only one tip" msgstr "顯示僅一個分支可存取的合併提交" -#: builtin/show-branch.c:671 +#: builtin/show-branch.c msgid "topologically sort, maintaining date order where possible" msgstr "拓撲方式排序，並儘可能地保持日期順序" -#: builtin/show-branch.c:674 +#: builtin/show-branch.c msgid "<n>[,<base>]" msgstr "<n>[,<base>]" -#: builtin/show-branch.c:675 +#: builtin/show-branch.c msgid "show <n> most recent ref-log entries starting at base" msgstr "顯示從起始點開始的 <n> 條最近的引用日誌記錄" -#: builtin/show-branch.c:735 +#: builtin/show-branch.c msgid "no branches given, and HEAD is not valid" msgstr "未提供分支，且 HEAD 無效" -#: builtin/show-branch.c:738 +#: builtin/show-branch.c msgid "--reflog option needs one branch name" msgstr "選項 --reflog 需要一個分支名" -#: builtin/show-branch.c:741 +#: builtin/show-branch.c #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "一次只能顯示 %d 個條目。" -#: builtin/show-branch.c:745 +#: builtin/show-branch.c #, c-format msgid "no such ref %s" msgstr "無此引用 %s" -#: builtin/show-branch.c:831 +#: builtin/show-branch.c #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "不能處理 %d 個以上的版本。" -#: builtin/show-branch.c:835 +#: builtin/show-branch.c #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' 不是一個有效的引用。" -#: builtin/show-branch.c:838 +#: builtin/show-branch.c #, c-format msgid "cannot find commit %s (%s)" msgstr "不能找到提交 %s（%s）" -#: builtin/show-index.c:21 +#: builtin/show-index.c msgid "hash-algorithm" msgstr "雜湊算法" -#: builtin/show-index.c:31 +#: builtin/show-index.c msgid "Unknown hash algorithm" msgstr "未知的雜湊算法" -#: builtin/show-ref.c:12 +#: builtin/show-ref.c msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" @@ -22176,126 +14102,129 @@ msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]" -#: builtin/show-ref.c:13 +#: builtin/show-ref.c msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模式>]" -#: builtin/show-ref.c:162 +#: builtin/show-ref.c msgid "only show tags (can be combined with heads)" msgstr "只顯示標籤（可以和頭共用）" -#: builtin/show-ref.c:163 +#: builtin/show-ref.c msgid "only show heads (can be combined with tags)" msgstr "只顯示頭（可以和標籤共用）" -#: builtin/show-ref.c:164 +#: builtin/show-ref.c msgid "stricter reference checking, requires exact ref path" msgstr "更嚴格的引用檢測，需要精確的引用路徑" -#: builtin/show-ref.c:167 builtin/show-ref.c:169 +#: builtin/show-ref.c msgid "show the HEAD reference, even if it would be filtered out" msgstr "顯示 HEAD 引用，即使被過濾掉" -#: builtin/show-ref.c:171 +#: builtin/show-ref.c msgid "dereference tags into object IDs" msgstr "轉換標籤到物件 ID" -#: builtin/show-ref.c:173 +#: builtin/show-ref.c msgid "only show SHA1 hash using <n> digits" msgstr "只顯示使用 <n> 個數字的 SHA1 雜湊" -#: builtin/show-ref.c:177 +#: builtin/show-ref.c msgid "do not print results to stdout (useful with --verify)" msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）" -#: builtin/show-ref.c:179 +#: builtin/show-ref.c msgid "show refs from stdin that aren't in local repository" msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用" -#: builtin/sparse-checkout.c:23 +#: builtin/sparse-checkout.c msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <選項>" -#: builtin/sparse-checkout.c:61 +#: builtin/sparse-checkout.c msgid "this worktree is not sparse" msgstr "這不是稀疏工作區" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）" -#: builtin/sparse-checkout.c:177 +#: builtin/sparse-checkout.c #, c-format msgid "" "directory '%s' contains untracked files, but is not in the sparse-checkout " "cone" msgstr "「%s」目錄有未追蹤的檔案，但不在稀疏提交的 cone 中" -#: builtin/sparse-checkout.c:185 +#: builtin/sparse-checkout.c #, c-format msgid "failed to remove directory '%s'" msgstr "無法移除 '%s' 目錄" -#: builtin/sparse-checkout.c:327 +#: builtin/sparse-checkout.c msgid "failed to create directory for sparse-checkout file" msgstr "無法建立稀疏簽出檔案的目錄" -#: builtin/sparse-checkout.c:366 +#: builtin/sparse-checkout.c msgid "failed to initialize worktree config" msgstr "無法初始化工作區組態" -#: builtin/sparse-checkout.c:411 +#: builtin/sparse-checkout.c msgid "failed to modify sparse-index config" msgstr "無法修改稀疏索引設定" -#: builtin/sparse-checkout.c:441 builtin/sparse-checkout.c:793 -#: builtin/sparse-checkout.c:847 +#: builtin/sparse-checkout.c msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" -#: builtin/sparse-checkout.c:443 builtin/sparse-checkout.c:795 -#: builtin/sparse-checkout.c:849 +#: builtin/sparse-checkout.c msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" -#: builtin/sparse-checkout.c:479 +#: builtin/sparse-checkout.c commit-graph.c midx.c +#, c-format +msgid "unable to create leading directories of %s" +msgstr "不能為 %s 建立先導目錄" + +#: builtin/sparse-checkout.c #, c-format msgid "failed to open '%s'" msgstr "無法開啟「%s」" -#: builtin/sparse-checkout.c:531 +#: builtin/sparse-checkout.c #, c-format msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c:560 +#: builtin/sparse-checkout.c #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c:615 builtin/sparse-checkout.c:643 +#: builtin/sparse-checkout.c msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏簽出樣式" -#: builtin/sparse-checkout.c:619 +#: builtin/sparse-checkout.c msgid "existing sparse-checkout patterns do not use cone mode" msgstr "現有的稀疏簽出樣式不使用 cone 模式" -#: builtin/sparse-checkout.c:707 +#: builtin/sparse-checkout.c msgid "please run from the toplevel directory in non-cone mode" msgstr "請從上層目錄，以非 cone 模式執行" -#: builtin/sparse-checkout.c:712 +#: builtin/sparse-checkout.c msgid "specify directories rather than patterns (no leading slash)" msgstr "指定目錄而非模式（沒有前置斜線）" -#: builtin/sparse-checkout.c:714 +#: builtin/sparse-checkout.c msgid "" "specify directories rather than patterns. If your directory starts with a " "'!', pass --skip-checks" msgstr "指定目錄而非模式。若您的目錄是以「!」開頭，請傳入 --skip-checks" -#: builtin/sparse-checkout.c:716 +#: builtin/sparse-checkout.c msgid "" "specify directories rather than patterns. If your directory really has any " "of '*?[]\\' in it, pass --skip-checks" @@ -22303,14 +14232,14 @@ msgstr "" "指定目錄而非模式。若您的目錄名稱真的包含「*?[]\\」其中一個，請傳入 --skip-" "checks" -#: builtin/sparse-checkout.c:732 +#: builtin/sparse-checkout.c #, c-format msgid "" "'%s' is not a directory; to treat it as a directory anyway, rerun with --" "skip-checks" msgstr "「%s」不是目錄。若要仍將其視作目錄，請重新傳入 --skip-checks 執行" -#: builtin/sparse-checkout.c:734 +#: builtin/sparse-checkout.c #, c-format msgid "" "pass a leading slash before paths such as '%s' if you want a single file " @@ -22319,24 +14248,24 @@ msgstr "" "若您想要單一檔案，請在目錄前打上斜線，如「%s」（見 git-sparse-checkout 手冊" "〈NON-CONE PROBLEMS〉一節）。" -#: builtin/sparse-checkout.c:739 +#: builtin/sparse-checkout.c msgid "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" msgstr "git sparse-checkout add [--skip-checks] (--stdin | <patterns>)" -#: builtin/sparse-checkout.c:752 builtin/sparse-checkout.c:797 +#: builtin/sparse-checkout.c msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查" -#: builtin/sparse-checkout.c:755 builtin/sparse-checkout.c:800 +#: builtin/sparse-checkout.c msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" -#: builtin/sparse-checkout.c:760 +#: builtin/sparse-checkout.c msgid "no sparse-checkout to add to" msgstr "沒有要加入之稀疏簽出" -#: builtin/sparse-checkout.c:775 +#: builtin/sparse-checkout.c msgid "" "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " "(--stdin | <patterns>)" @@ -22344,35 +14273,35 @@ msgstr "" "git sparse-checkout set [--[no-]cone] [--[no-]sparse-index] [--skip-checks] " "(--stdin | <patterns>)" -#: builtin/sparse-checkout.c:854 +#: builtin/sparse-checkout.c msgid "must be in a sparse-checkout to reapply sparsity patterns" msgstr "必須在稀疏提交才能重新套用稀疏樣式 (sparsity pattern)" -#: builtin/sparse-checkout.c:914 +#: builtin/sparse-checkout.c msgid "error while refreshing working directory" msgstr "重新整理工作目錄時發生錯誤" -#: builtin/stash.c:24 builtin/stash.c:40 +#: builtin/stash.c msgid "git stash list [<options>]" msgstr "git stash list [<選項>]" -#: builtin/stash.c:25 builtin/stash.c:45 +#: builtin/stash.c msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<選項>] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:50 +#: builtin/stash.c msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" -#: builtin/stash.c:27 +#: builtin/stash.c msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:28 builtin/stash.c:65 +#: builtin/stash.c msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <分支名> [<stash>]" -#: builtin/stash.c:30 +#: builtin/stash.c msgid "" "git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" "quiet]\n" @@ -22386,7 +14315,7 @@ msgstr "" " [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n" " [--] [<路徑規格>...]]" -#: builtin/stash.c:34 +#: builtin/stash.c msgid "" "git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--" "quiet]\n" @@ -22396,19 +14325,19 @@ msgstr "" "quiet]\n" " [-u|--include-untracked] [-a|--all] [<訊息>]" -#: builtin/stash.c:55 +#: builtin/stash.c msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:60 +#: builtin/stash.c msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:75 +#: builtin/stash.c msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>" -#: builtin/stash.c:80 +#: builtin/stash.c msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" @@ -22418,7 +14347,7 @@ msgstr "" " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n" " [--] [<路徑規格>...]]" -#: builtin/stash.c:87 +#: builtin/stash.c msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -22426,30 +14355,30 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<消息>]" -#: builtin/stash.c:130 +#: builtin/stash.c #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' 不像是一個儲藏提交" -#: builtin/stash.c:150 +#: builtin/stash.c #, c-format msgid "Too many revisions specified:%s" msgstr "指定了太多的版本：%s" -#: builtin/stash.c:164 +#: builtin/stash.c msgid "No stash entries found." msgstr "未發現儲藏條目。" -#: builtin/stash.c:178 +#: builtin/stash.c #, c-format msgid "%s is not a valid reference" msgstr "%s 不是一個有效的引用名" -#: builtin/stash.c:227 +#: builtin/stash.c msgid "git stash clear with arguments is unimplemented" msgstr "尚未實作傳入參數的 git stash clear" -#: builtin/stash.c:447 +#: builtin/stash.c #, c-format msgid "" "WARNING: Untracked file in way of tracked file! Renaming\n" @@ -22460,226 +14389,220 @@ msgstr "" " %s -> %s\n" " 以騰出空間留給追蹤檔案。\n" -#: builtin/stash.c:508 +#: builtin/stash.c msgid "cannot apply a stash in the middle of a merge" msgstr "無法在合併過程套用儲藏" -#: builtin/stash.c:519 +#: builtin/stash.c #, c-format msgid "could not generate diff %s^!." msgstr "無法生成差異 %s^!." -#: builtin/stash.c:526 +#: builtin/stash.c msgid "conflicts in index. Try without --index." msgstr "索引中有衝突。請試試看不用 --index。" -#: builtin/stash.c:532 +#: builtin/stash.c msgid "could not save index tree" msgstr "不能儲存索引樹" -#: builtin/stash.c:552 +#: builtin/stash.c #, c-format msgid "Merging %s with %s" msgstr "正在合併 %s 和 %s" -#: builtin/stash.c:562 +#: builtin/stash.c msgid "Index was not unstashed." msgstr "索引未從儲藏中復原。" -#: builtin/stash.c:576 +#: builtin/stash.c msgid "could not restore untracked files from stash" msgstr "無法從儲藏條目中復原未追蹤檔案" -#: builtin/stash.c:608 builtin/stash.c:695 +#: builtin/stash.c msgid "attempt to recreate the index" msgstr "嘗試重建索引" -#: builtin/stash.c:641 +#: builtin/stash.c #, c-format msgid "Dropped %s (%s)" msgstr "捨棄了 %s（%s）" -#: builtin/stash.c:644 +#: builtin/stash.c #, c-format msgid "%s: Could not drop stash entry" msgstr "%s：無法捨棄儲藏條目" -#: builtin/stash.c:657 +#: builtin/stash.c #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' 不是一個儲藏引用" -#: builtin/stash.c:707 +#: builtin/stash.c msgid "The stash entry is kept in case you need it again." msgstr "儲藏條目被保留以備您再次需要。" -#: builtin/stash.c:730 +#: builtin/stash.c msgid "No branch name specified" msgstr "未指定分支名" -#: builtin/stash.c:809 +#: builtin/stash.c msgid "failed to parse tree" msgstr "無法解析樹" -#: builtin/stash.c:820 +#: builtin/stash.c msgid "failed to unpack trees" msgstr "無法解包樹" -#: builtin/stash.c:840 +#: builtin/stash.c msgid "include untracked files in the stash" msgstr "在儲藏區包含未追蹤檔案" -#: builtin/stash.c:843 +#: builtin/stash.c msgid "only show untracked files in the stash" msgstr "只在儲藏區顯示未追蹤檔案" -#: builtin/stash.c:930 builtin/stash.c:967 +#: builtin/stash.c #, c-format msgid "Cannot update %s with %s" msgstr "無法用 %2$s 更新 %1$s" -#: builtin/stash.c:948 builtin/stash.c:1667 builtin/stash.c:1739 +#: builtin/stash.c msgid "stash message" msgstr "儲藏說明" -#: builtin/stash.c:958 +#: builtin/stash.c msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" 需要一個 <提交> 參數" -#: builtin/stash.c:1143 +#: builtin/stash.c msgid "No staged changes" msgstr "無暫存變更" -#: builtin/stash.c:1204 +#: builtin/stash.c msgid "No changes selected" msgstr "沒有選擇變更" -#: builtin/stash.c:1304 +#: builtin/stash.c msgid "You do not have the initial commit yet" msgstr "您尚未建立初始提交" -#: builtin/stash.c:1331 +#: builtin/stash.c msgid "Cannot save the current index state" msgstr "無法儲存目前索引狀態" -#: builtin/stash.c:1340 +#: builtin/stash.c msgid "Cannot save the untracked files" msgstr "無法儲存未追蹤檔案" -#: builtin/stash.c:1351 builtin/stash.c:1370 +#: builtin/stash.c msgid "Cannot save the current worktree state" msgstr "無法儲存目前工作區狀態" -#: builtin/stash.c:1361 +#: builtin/stash.c msgid "Cannot save the current staged state" msgstr "無法儲存目前暫存狀態" -#: builtin/stash.c:1398 +#: builtin/stash.c msgid "Cannot record working tree state" msgstr "不能記錄工作區狀態" -#: builtin/stash.c:1447 +#: builtin/stash.c msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all" -#: builtin/stash.c:1458 +#: builtin/stash.c msgid "Can't use --staged and --include-untracked or --all at the same time" msgstr "--staged 和 --include-untracked 或 --all 不得同時使用" -#: builtin/stash.c:1476 +#: builtin/stash.c msgid "Did you forget to 'git add'?" msgstr "您是否忘了執行 'git add'？" -#: builtin/stash.c:1491 +#: builtin/stash.c msgid "No local changes to save" msgstr "沒有要儲存的本機修改" -#: builtin/stash.c:1498 +#: builtin/stash.c msgid "Cannot initialize stash" msgstr "無法初始化儲藏" -#: builtin/stash.c:1513 +#: builtin/stash.c msgid "Cannot save the current status" msgstr "無法儲存目前狀態" -#: builtin/stash.c:1518 +#: builtin/stash.c #, c-format msgid "Saved working directory and index state %s" msgstr "儲存工作目錄和索引狀態 %s" -#: builtin/stash.c:1615 +#: builtin/stash.c msgid "Cannot remove worktree changes" msgstr "無法刪除工作區變更" -#: builtin/stash.c:1656 builtin/stash.c:1728 +#: builtin/stash.c msgid "keep index" msgstr "保持索引" -#: builtin/stash.c:1658 builtin/stash.c:1730 +#: builtin/stash.c msgid "stash staged changes only" msgstr "只儲藏暫存變更" -#: builtin/stash.c:1660 builtin/stash.c:1732 +#: builtin/stash.c msgid "stash in patch mode" msgstr "以修補檔模式儲藏" -#: builtin/stash.c:1661 builtin/stash.c:1733 +#: builtin/stash.c msgid "quiet mode" msgstr "靜默模式" -#: builtin/stash.c:1663 builtin/stash.c:1735 +#: builtin/stash.c msgid "include untracked files in stash" msgstr "儲藏中包含未追蹤檔案" -#: builtin/stash.c:1665 builtin/stash.c:1737 +#: builtin/stash.c msgid "include ignore files" msgstr "包含忽略的檔案" -#: builtin/stripspace.c:37 +#: builtin/stripspace.c msgid "skip and remove all lines starting with comment character" msgstr "略過和移除所有的備註行" -#: builtin/stripspace.c:40 +#: builtin/stripspace.c msgid "prepend comment character and space to each line" msgstr "為每一行的行首新增備註符和空格" -#: builtin/submodule--helper.c:50 builtin/submodule--helper.c:2486 +#: builtin/submodule--helper.c #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一個完整的引用名稱，卻得到 %s" -#: builtin/submodule--helper.c:103 -#, c-format -msgid "cannot strip one component off url '%s'" -msgstr "無法從 url '%s' 剝離一個元件" - -#: builtin/submodule--helper.c:213 +#: builtin/submodule--helper.c #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。" -#: builtin/submodule--helper.c:413 builtin/submodule--helper.c:1873 +#: builtin/submodule--helper.c msgid "alternative anchor for relative paths" msgstr "相對路徑的替代錨記（anchor）" -#: builtin/submodule--helper.c:418 +#: builtin/submodule--helper.c msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]" -#: builtin/submodule--helper.c:476 builtin/submodule--helper.c:617 -#: builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules 中未找到子模組 '%s' 的 url" -#: builtin/submodule--helper.c:528 +#: builtin/submodule--helper.c #, c-format msgid "Entering '%s'\n" msgstr "進入 '%s'\n" -#: builtin/submodule--helper.c:531 +#: builtin/submodule--helper.c #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -22688,7 +14611,7 @@ msgstr "" "對 %s 執行 run_command 返回非零值。\n" "." -#: builtin/submodule--helper.c:553 +#: builtin/submodule--helper.c #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -22698,158 +14621,157 @@ msgstr "" "在遞迴 %s 的子模組執行 run_command 時返回非零值。\n" "." -#: builtin/submodule--helper.c:569 +#: builtin/submodule--helper.c msgid "suppress output of entering each submodule command" msgstr "隱藏每個子模組進入命令的輸出" -#: builtin/submodule--helper.c:571 builtin/submodule--helper.c:876 -#: builtin/submodule--helper.c:1458 +#: builtin/submodule--helper.c msgid "recurse into nested submodules" msgstr "遞迴進入嵌套子模組中" -#: builtin/submodule--helper.c:576 +#: builtin/submodule--helper.c msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>" -#: builtin/submodule--helper.c:654 +#: builtin/submodule--helper.c #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊 url" -#: builtin/submodule--helper.c:658 +#: builtin/submodule--helper.c #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "子模組 '%s'（%s）已對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:668 +#: builtin/submodule--helper.c #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "警告：建議子模組 '%s' 使用指令更新模式\n" -#: builtin/submodule--helper.c:675 +#: builtin/submodule--helper.c #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "無法為子模組 '%s' 註冊更新模式" -#: builtin/submodule--helper.c:697 +#: builtin/submodule--helper.c msgid "suppress output for initializing a submodule" msgstr "隱藏初始化子模組的輸出" -#: builtin/submodule--helper.c:702 +#: builtin/submodule--helper.c msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<選項>] [<路徑>]" -#: builtin/submodule--helper.c:775 builtin/submodule--helper.c:910 +#: builtin/submodule--helper.c #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules 中沒有發現路徑 '%s' 的子模組映射" -#: builtin/submodule--helper.c:823 +#: builtin/submodule--helper.c #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "無法解析子模組 '%s' 的 HEAD 引用" -#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1428 +#: builtin/submodule--helper.c #, c-format msgid "failed to recurse into submodule '%s'" msgstr "遞迴子模組 '%s' 失敗" -#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1595 +#: builtin/submodule--helper.c msgid "suppress submodule status output" msgstr "隱藏子模組的狀態輸出" -#: builtin/submodule--helper.c:875 +#: builtin/submodule--helper.c msgid "" "use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交" -#: builtin/submodule--helper.c:881 +#: builtin/submodule--helper.c msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]" -#: builtin/submodule--helper.c:905 +#: builtin/submodule--helper.c msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路徑>" -#: builtin/submodule--helper.c:977 +#: builtin/submodule--helper.c #, c-format msgid "* %s %s(blob)->%s(submodule)" msgstr "* %s %s(blob)->%s(submodule)" -#: builtin/submodule--helper.c:980 +#: builtin/submodule--helper.c #, c-format msgid "* %s %s(submodule)->%s(blob)" msgstr "* %s %s(submodule)->%s(blob)" -#: builtin/submodule--helper.c:993 +#: builtin/submodule--helper.c #, c-format msgid "%s" msgstr "%s" -#: builtin/submodule--helper.c:1043 +#: builtin/submodule--helper.c #, c-format msgid "couldn't hash object from '%s'" msgstr "無法雜湊來自 '%s' 的物件" -#: builtin/submodule--helper.c:1047 +#: builtin/submodule--helper.c #, c-format msgid "unexpected mode %o\n" msgstr "非預期的模式 %o\n" -#: builtin/submodule--helper.c:1288 +#: builtin/submodule--helper.c msgid "use the commit stored in the index instead of the submodule HEAD" msgstr "使用儲存在索引中的提交而非子模組 HEAD" -#: builtin/submodule--helper.c:1290 +#: builtin/submodule--helper.c msgid "compare the commit in the index with that in the submodule HEAD" msgstr "比較索引中提交與子模組 HEAD 提交的差異" -#: builtin/submodule--helper.c:1292 +#: builtin/submodule--helper.c msgid "skip submodules with 'ignore_config' value set to 'all'" msgstr "'ignore_config' 值設為 'all' 時略過子模組" -#: builtin/submodule--helper.c:1294 +#: builtin/submodule--helper.c msgid "limit the summary size" msgstr "限制摘要大小" -#: builtin/submodule--helper.c:1299 +#: builtin/submodule--helper.c msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]" msgstr "git submodule--helper summary [<選項>] [<提交>] [--] [<路徑>]" -#: builtin/submodule--helper.c:1323 +#: builtin/submodule--helper.c msgid "could not fetch a revision for HEAD" msgstr "無法取得 HEAD 的版本" -#: builtin/submodule--helper.c:1384 +#: builtin/submodule--helper.c #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "為 '%s' 同步子模組 url\n" -#: builtin/submodule--helper.c:1390 +#: builtin/submodule--helper.c #, c-format msgid "failed to register url for submodule path '%s'" msgstr "無法為子模組路徑 '%s' 註冊 url" -#: builtin/submodule--helper.c:1399 +#: builtin/submodule--helper.c #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "無法得到子模組 '%s' 的預設遠端關聯" -#: builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c #, c-format msgid "failed to update remote for submodule '%s'" msgstr "無法為子模組 '%s' 更新遠端關聯" -#: builtin/submodule--helper.c:1456 +#: builtin/submodule--helper.c msgid "suppress output of synchronizing submodule url" msgstr "隱藏子模組 URL 同步的輸出" -#: builtin/submodule--helper.c:1463 +#: builtin/submodule--helper.c msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]" -#: builtin/submodule--helper.c:1513 +#: builtin/submodule--helper.c #, c-format msgid "" "Submodule work tree '%s' contains a .git directory. This will be replaced " @@ -22857,52 +14779,52 @@ msgid "" msgstr "" "子模組工作區「%s」內有 .git 目錄。使用 absorbgitdirs 會將其替換為 .git 檔案。" -#: builtin/submodule--helper.c:1530 +#: builtin/submodule--helper.c #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "子模組工作區 '%s' 包含本機修改；使用 '-f' 捨棄它們" -#: builtin/submodule--helper.c:1538 +#: builtin/submodule--helper.c #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目錄 '%s'\n" -#: builtin/submodule--helper.c:1540 +#: builtin/submodule--helper.c #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "無法移除子模組工作區 '%s'\n" -#: builtin/submodule--helper.c:1551 +#: builtin/submodule--helper.c #, c-format msgid "could not create empty submodule directory %s" msgstr "不能建立空的子模組目錄 %s" -#: builtin/submodule--helper.c:1567 +#: builtin/submodule--helper.c #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "子模組 '%s'（%s）未對路徑 '%s' 註冊\n" -#: builtin/submodule--helper.c:1596 +#: builtin/submodule--helper.c msgid "remove submodule working trees even if they contain local changes" msgstr "即使有本機變更仍移除子模組的工作區" -#: builtin/submodule--helper.c:1597 +#: builtin/submodule--helper.c msgid "unregister all submodules" msgstr "取消註冊所有子模組" -#: builtin/submodule--helper.c:1602 +#: builtin/submodule--helper.c msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]" -#: builtin/submodule--helper.c:1616 +#: builtin/submodule--helper.c msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'" -#: builtin/submodule--helper.c:1665 +#: builtin/submodule--helper.c 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" @@ -22914,71 +14836,66 @@ msgstr "" "以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n" "而非 '--reference' 複製。" -#: builtin/submodule--helper.c:1710 builtin/submodule--helper.c:1713 +#: builtin/submodule--helper.c #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "子模組 '%s' 不能新增版本庫備選：%s" -#: builtin/submodule--helper.c:1749 +#: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'" -#: builtin/submodule--helper.c:1756 +#: builtin/submodule--helper.c #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "不能識別 submodule.alternateLocation 的取值 '%s'" -#: builtin/submodule--helper.c:1781 +#: builtin/submodule--helper.c #, c-format msgid "refusing to create/use '%s' in another submodule's git dir" msgstr "拒絕在其他子模組的 git 路徑建立／使用「%s」" -#: builtin/submodule--helper.c:1826 +#: builtin/submodule--helper.c #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "無法複製 '%s' 到子模組路徑 '%s'" -#: builtin/submodule--helper.c:1831 +#: builtin/submodule--helper.c #, c-format msgid "directory not empty: '%s'" msgstr "目錄不是空的：「%s」" -#: builtin/submodule--helper.c:1843 +#: builtin/submodule--helper.c #, c-format msgid "could not get submodule directory for '%s'" msgstr "無法得到 '%s' 的子模組目錄" -#: builtin/submodule--helper.c:1876 +#: builtin/submodule--helper.c msgid "where the new submodule will be cloned to" msgstr "新的子模組將要複製的路徑" -#: builtin/submodule--helper.c:1879 +#: builtin/submodule--helper.c msgid "name of the new submodule" msgstr "新子模組的名稱" -#: builtin/submodule--helper.c:1882 +#: builtin/submodule--helper.c msgid "url where to clone the submodule from" msgstr "複製子模組的 url 位址" -#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:3383 +#: builtin/submodule--helper.c msgid "depth for shallow clones" msgstr "淺複製的深度" -#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2731 -#: builtin/submodule--helper.c:3376 +#: builtin/submodule--helper.c msgid "force cloning progress" msgstr "強制顯示複製進度" -#: builtin/submodule--helper.c:1895 builtin/submodule--helper.c:2733 +#: builtin/submodule--helper.c msgid "disallow cloning into non-empty directory" msgstr "不允許複製至非空白目錄" -#: builtin/submodule--helper.c:1903 -#| msgid "" -#| "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -#| "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--" -#| "filter <filter-spec>]--url <url> --path <path>" +#: builtin/submodule--helper.c msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " @@ -22988,178 +14905,178 @@ msgstr "" "<repository>] [--name <name>] [--depth <depth>] [--single-branch] [--filter " "<filter-spec>] --url <url> --path <path>" -#: builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "子模組 '%2$s' 的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:1947 +#: builtin/submodule--helper.c #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "為子模組 '%2$s' 設定的更新模式 '%1$s' 無效" -#: builtin/submodule--helper.c:2041 +#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s' not initialized" msgstr "子模組 '%s' 尚未初始化" -#: builtin/submodule--helper.c:2045 +#: builtin/submodule--helper.c msgid "Maybe you want to use 'update --init'?" msgstr "也許您想要執行 'update --init'？" -#: builtin/submodule--helper.c:2075 +#: builtin/submodule--helper.c #, c-format msgid "Skipping unmerged submodule %s" msgstr "略過未合併的子模組 %s" -#: builtin/submodule--helper.c:2104 +#: builtin/submodule--helper.c #, c-format msgid "Skipping submodule '%s'" msgstr "略過子模組 '%s'" -#: builtin/submodule--helper.c:2257 +#: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "複製 '%s' 失敗。已排程重試作業" -#: builtin/submodule--helper.c:2268 +#: builtin/submodule--helper.c #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次嘗試複製 '%s' 失敗，中止作業" -#: builtin/submodule--helper.c:2371 +#: builtin/submodule--helper.c #, c-format msgid "Unable to checkout '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑簽出「%1$s」" -#: builtin/submodule--helper.c:2375 +#: builtin/submodule--helper.c #, c-format msgid "Unable to rebase '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑重定「%1$s」的基底" -#: builtin/submodule--helper.c:2379 +#: builtin/submodule--helper.c #, c-format msgid "Unable to merge '%s' in submodule path '%s'" msgstr "無法在「%2$s」子模組路徑合併「%1$s」" -#: builtin/submodule--helper.c:2383 +#: builtin/submodule--helper.c #, c-format msgid "Execution of '%s %s' failed in submodule path '%s'" msgstr "「%s %s」在「%s」子模組路徑執行失敗" -#: builtin/submodule--helper.c:2402 +#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': checked out '%s'\n" msgstr "子模組路徑「%s」：已簽出「%s」\n" -#: builtin/submodule--helper.c:2406 +#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': rebased into '%s'\n" msgstr "子模組路徑「%s」：已重定基底至「%s」\n" -#: builtin/submodule--helper.c:2410 +#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': merged in '%s'\n" msgstr "子模組路徑「%s」：已在「%s」合併\n" -#: builtin/submodule--helper.c:2414 +#: builtin/submodule--helper.c #, c-format msgid "Submodule path '%s': '%s %s'\n" msgstr "子模組路徑「%s」：「%s %s」\n" -#: builtin/submodule--helper.c:2438 +#: builtin/submodule--helper.c #, c-format msgid "Unable to fetch in submodule path '%s'; trying to directly fetch %s:" msgstr "無法在子模組路徑 「%s」中取得。嘗試直接取得 %s：" -#: builtin/submodule--helper.c:2447 +#: builtin/submodule--helper.c #, c-format msgid "" "Fetched in submodule path '%s', but it did not contain %s. Direct fetching " "of that commit failed." msgstr "已經取得「%s」子模組路徑，這個路徑卻未包含「%s」。直接取得該提交失敗。" -#: builtin/submodule--helper.c:2481 +#: builtin/submodule--helper.c #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "子模組（%s）的分支設定為繼承上級專案的分支，但是上級專案不在任何分支上" -#: builtin/submodule--helper.c:2499 +#: builtin/submodule--helper.c #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "無法獲得子模組 '%s' 的版本庫句柄" -#: builtin/submodule--helper.c:2588 +#: builtin/submodule--helper.c #, c-format msgid "Unable to find current revision in submodule path '%s'" msgstr "無法在子模組路徑「%s」中尋找目前的修訂版本" -#: builtin/submodule--helper.c:2599 +#: builtin/submodule--helper.c #, c-format msgid "Unable to fetch in submodule path '%s'" msgstr "無法在子模組路徑「%s」中抓取" -#: builtin/submodule--helper.c:2604 +#: builtin/submodule--helper.c #, c-format msgid "Unable to find %s revision in submodule path '%s'" msgstr "無法在子模組路徑「%s」中尋找 %s 修訂版本" -#: builtin/submodule--helper.c:2640 +#: builtin/submodule--helper.c #, c-format msgid "Failed to recurse into submodule path '%s'" msgstr "無法遞迴子模組路徑「%s」" -#: builtin/submodule--helper.c:2699 +#: builtin/submodule--helper.c msgid "force checkout updates" msgstr "強制簽出更新" -#: builtin/submodule--helper.c:2701 +#: builtin/submodule--helper.c msgid "initialize uninitialized submodules before update" msgstr "在更新前，初始化尚未進行初始化的子模組" -#: builtin/submodule--helper.c:2703 +#: builtin/submodule--helper.c msgid "use SHA-1 of submodule's remote tracking branch" msgstr "使用子模組遠端追蹤分支的 SHA-1" -#: builtin/submodule--helper.c:2705 +#: builtin/submodule--helper.c msgid "traverse submodules recursively" msgstr "遞迴遍歷子模組" -#: builtin/submodule--helper.c:2707 +#: builtin/submodule--helper.c msgid "don't fetch new objects from the remote site" msgstr "不從遠端站台取得新物件" -#: builtin/submodule--helper.c:2710 builtin/submodule--helper.c:2892 +#: builtin/submodule--helper.c msgid "path into the working tree" msgstr "到工作區的路徑" -#: builtin/submodule--helper.c:2713 +#: builtin/submodule--helper.c msgid "path into the working tree, across nested submodule boundaries" msgstr "工作區中的路徑，遞迴嵌套子模組" -#: builtin/submodule--helper.c:2717 +#: builtin/submodule--helper.c msgid "rebase, merge, checkout or none" msgstr "rebase、merge、checkout 或 none" -#: builtin/submodule--helper.c:2723 +#: builtin/submodule--helper.c msgid "create a shallow clone truncated to the specified number of revisions" msgstr "建立一個縮減至指定版本數的淺複製" -#: builtin/submodule--helper.c:2726 +#: builtin/submodule--helper.c msgid "parallel jobs" msgstr "並行任務" -#: builtin/submodule--helper.c:2728 +#: builtin/submodule--helper.c msgid "whether the initial clone should follow the shallow recommendation" msgstr "初始複製是否應該遵循建議的淺複製選項" -#: builtin/submodule--helper.c:2729 +#: builtin/submodule--helper.c msgid "don't print cloning progress" msgstr "不要輸出複製進度" -#: builtin/submodule--helper.c:2741 +#: builtin/submodule--helper.c msgid "" "git submodule [--quiet] update [--init [--filter=<filter-spec>]] [--remote] " "[-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-" @@ -23171,85 +15088,81 @@ msgstr "" "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] " "[--] [<path>...]" -#: builtin/submodule--helper.c:2767 +#: builtin/submodule--helper.c msgid "bad value for update parameter" msgstr "update 參數取值錯誤" -#: builtin/submodule--helper.c:2893 +#: builtin/submodule--helper.c msgid "recurse into submodules" msgstr "在子模組中遞迴" -#: builtin/submodule--helper.c:2899 +#: builtin/submodule--helper.c msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<選項>] [<路徑>...]" -#: builtin/submodule--helper.c:2955 +#: builtin/submodule--helper.c msgid "check if it is safe to write to the .gitmodules file" msgstr "檢查寫入 .gitmodules 檔案是否安全" -#: builtin/submodule--helper.c:2958 +#: builtin/submodule--helper.c msgid "unset the config in the .gitmodules file" msgstr "取消 .gitmodules 檔案中的設定" -#: builtin/submodule--helper.c:2963 +#: builtin/submodule--helper.c msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <名稱> [<值>]" -#: builtin/submodule--helper.c:2964 +#: builtin/submodule--helper.c msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <名稱>" -#: builtin/submodule--helper.c:2984 builtin/submodule--helper.c:3238 -#: builtin/submodule--helper.c:3395 +#: builtin/submodule--helper.c msgid "please make sure that the .gitmodules file is in the working tree" msgstr "請確認 .gitmodules 檔案在工作區裡" -#: builtin/submodule--helper.c:3000 +#: builtin/submodule--helper.c msgid "suppress output for setting url of a submodule" msgstr "隱藏子模組設定 URL 的輸出" -#: builtin/submodule--helper.c:3004 +#: builtin/submodule--helper.c msgid "git submodule--helper set-url [--quiet] <path> <newurl>" msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>" -#: builtin/submodule--helper.c:3037 +#: builtin/submodule--helper.c msgid "set the default tracking branch to master" msgstr "將預設的追蹤分支設為 master" -#: builtin/submodule--helper.c:3039 +#: builtin/submodule--helper.c msgid "set the default tracking branch" msgstr "設定預設追蹤分支" -#: builtin/submodule--helper.c:3043 +#: builtin/submodule--helper.c msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>" -#: builtin/submodule--helper.c:3044 +#: builtin/submodule--helper.c msgid "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" msgstr "" "git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>" -#: builtin/submodule--helper.c:3051 +#: builtin/submodule--helper.c msgid "--branch or --default required" msgstr "需要 --branch 或 --default" -#: builtin/submodule--helper.c:3072 builtin/submodule--helper.c:3375 +#: builtin/submodule--helper.c msgid "print only error messages" msgstr "只輸出錯誤訊息" -#: builtin/submodule--helper.c:3073 +#: builtin/submodule--helper.c msgid "force creation" msgstr "強制建立" -#: builtin/submodule--helper.c:3081 +#: builtin/submodule--helper.c msgid "show whether the branch would be created" msgstr "顯示分支是否會被建立" -#: builtin/submodule--helper.c:3085 -#| msgid "" -#| "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" -#| "quiet] [-t|--track] [-n|--dry-run] <name> <start_oid> <start_name>" +#: builtin/submodule--helper.c msgid "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" @@ -23257,27 +15170,27 @@ msgstr "" "git submodule--helper create-branch [-f|--force] [--create-reflog] [-q|--" "quiet] [-t|--track] [-n|--dry-run] <name> <start-oid> <start-name>" -#: builtin/submodule--helper.c:3097 +#: builtin/submodule--helper.c #, c-format msgid "creating branch '%s'" msgstr "建立分支「%s」" -#: builtin/submodule--helper.c:3155 +#: builtin/submodule--helper.c #, c-format msgid "Adding existing repo at '%s' to the index\n" msgstr "正在將位於 '%s' 的現有版本庫加入至索引\n" -#: builtin/submodule--helper.c:3158 +#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists and is not a valid git repo" msgstr "「%s」已存在，且不是有效的 git 版本庫" -#: builtin/submodule--helper.c:3171 +#: builtin/submodule--helper.c #, c-format msgid "A git directory for '%s' is found locally with remote(s):\n" msgstr "在本機找到「%s」Git 目錄，與其對應的遠端版本庫：\n" -#: builtin/submodule--helper.c:3178 +#: builtin/submodule--helper.c #, c-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -23292,112 +15205,116 @@ msgstr "" "請使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n" "假如您不太懂意思，請使用 '--name' 選項輸入其他名稱。" -#: builtin/submodule--helper.c:3190 +#: builtin/submodule--helper.c #, c-format msgid "Reactivating local git directory for submodule '%s'\n" msgstr "正在重新啟用「%s」子模組的本機 Git 目錄\n" -#: builtin/submodule--helper.c:3227 +#: builtin/submodule--helper.c #, c-format msgid "unable to checkout submodule '%s'" msgstr "無法簽出「%s」子模組" -#: builtin/submodule--helper.c:3266 +#: builtin/submodule--helper.c #, c-format msgid "Failed to add submodule '%s'" msgstr "無法加入子模組「%s」" -#: builtin/submodule--helper.c:3270 builtin/submodule--helper.c:3275 -#: builtin/submodule--helper.c:3283 +#: builtin/submodule--helper.c #, c-format msgid "Failed to register submodule '%s'" msgstr "無法註冊子模組「%s」" -#: builtin/submodule--helper.c:3339 +#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists in the index" msgstr "「%s」已在索引中" -#: builtin/submodule--helper.c:3342 +#: builtin/submodule--helper.c #, c-format msgid "'%s' already exists in the index and is not a submodule" msgstr "「%s」已在索引中，且不是子模組" -#: builtin/submodule--helper.c:3372 +#: builtin/submodule--helper.c read-cache.c +#, c-format +msgid "'%s' does not have a commit checked out" +msgstr "'%s' 沒有簽出一個提交" + +#: builtin/submodule--helper.c msgid "branch of repository to add as submodule" msgstr "要加入為子模組的版本庫分支" -#: builtin/submodule--helper.c:3373 +#: builtin/submodule--helper.c msgid "allow adding an otherwise ignored submodule path" msgstr "允許加入忽略的子模組路徑" -#: builtin/submodule--helper.c:3379 +#: builtin/submodule--helper.c msgid "borrow the objects from reference repositories" msgstr "從引用的版本庫借用物件" -#: builtin/submodule--helper.c:3381 +#: builtin/submodule--helper.c msgid "" -"sets the submodule’s name to the given string instead of defaulting to its " +"sets the submodule's name to the given string instead of defaulting to its " "path" -msgstr "將子模組名稱設定為指定字串，而非預設的路徑名稱" +msgstr "將子模組的名稱設為指定字串，而非預設為其路徑" -#: builtin/submodule--helper.c:3388 +#: builtin/submodule--helper.c msgid "git submodule--helper add [<options>] [--] <repository> [<path>]" msgstr "git submodule--helper add [<選項>] [--] <版本庫> [<路徑>]" -#: builtin/submodule--helper.c:3416 +#: builtin/submodule--helper.c msgid "Relative path can only be used from the toplevel of the working tree" msgstr "只能在工作區的頂級目錄中使用相對路徑" -#: builtin/submodule--helper.c:3425 +#: builtin/submodule--helper.c #, c-format msgid "repo URL: '%s' must be absolute or begin with ./|../" msgstr "版本庫 URL：「%s」必須是絕對路徑，或開頭是 ./|../" -#: builtin/submodule--helper.c:3460 +#: builtin/submodule--helper.c #, c-format msgid "'%s' is not a valid submodule name" msgstr "「%s」不是有效的子模組名稱" -#: builtin/submodule--helper.c:3520 git.c:453 git.c:729 +#: builtin/submodule--helper.c git.c #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s 不支援 --super-prefix" -#: builtin/submodule--helper.c:3526 +#: builtin/submodule--helper.c #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' 不是一個有效的 submodule--helper 子指令" -#: builtin/symbolic-ref.c:8 +#: builtin/symbolic-ref.c msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<選項>] <名稱> [<引用>]" -#: builtin/symbolic-ref.c:9 +#: builtin/symbolic-ref.c msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <名稱>" -#: builtin/symbolic-ref.c:42 +#: builtin/symbolic-ref.c msgid "suppress error message for non-symbolic (detached) refs" msgstr "不顯示非符號（分離的）引用的錯誤訊息" -#: builtin/symbolic-ref.c:43 +#: builtin/symbolic-ref.c msgid "delete symbolic ref" msgstr "刪除符號引用" -#: builtin/symbolic-ref.c:44 +#: builtin/symbolic-ref.c msgid "shorten ref output" msgstr "縮短引用輸出" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 +#: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason" msgstr "原因" -#: builtin/symbolic-ref.c:45 builtin/update-ref.c:505 +#: builtin/symbolic-ref.c builtin/update-ref.c msgid "reason of the update" msgstr "更新的原因" -#: builtin/tag.c:26 +#: builtin/tag.c msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n" " <tagname> [<head>]" @@ -23405,11 +15322,11 @@ msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <檔案>]\n" " <標籤名> [<head>]" -#: builtin/tag.c:28 +#: builtin/tag.c msgid "git tag -d <tagname>..." msgstr "git tag -d <標籤名>..." -#: builtin/tag.c:29 +#: builtin/tag.c msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" @@ -23420,21 +15337,21 @@ msgstr "" "at <物件>]\n" " [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]" -#: builtin/tag.c:31 +#: builtin/tag.c msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<格式>] <標籤名>..." -#: builtin/tag.c:101 +#: builtin/tag.c #, c-format msgid "tag '%s' not found." msgstr "未發現標籤 '%s'。" -#: builtin/tag.c:136 +#: builtin/tag.c #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已刪除標籤 '%s'（曾為 %s）\n" -#: builtin/tag.c:171 +#: builtin/tag.c #, c-format msgid "" "\n" @@ -23447,7 +15364,7 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被忽略。\n" -#: builtin/tag.c:175 +#: builtin/tag.c #, c-format msgid "" "\n" @@ -23461,11 +15378,11 @@ msgstr "" " %s\n" "以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n" -#: builtin/tag.c:241 +#: builtin/tag.c msgid "unable to sign the tag" msgstr "無法簽署標籤" -#: builtin/tag.c:259 +#: builtin/tag.c #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -23478,324 +15395,329 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:275 +#: builtin/tag.c msgid "bad object type." msgstr "壞的物件類型。" -#: builtin/tag.c:326 +#: builtin/tag.c msgid "no tag message?" msgstr "無標籤說明？" -#: builtin/tag.c:333 +#: builtin/tag.c #, c-format msgid "The tag message has been left in %s\n" msgstr "標籤說明被保留在 %s\n" -#: builtin/tag.c:445 +#: builtin/tag.c msgid "list tag names" msgstr "列出標籤名稱" -#: builtin/tag.c:447 +#: builtin/tag.c msgid "print <n> lines of each tag message" msgstr "每個標籤訊息列印 <n> 行" -#: builtin/tag.c:449 +#: builtin/tag.c msgid "delete tags" msgstr "刪除標籤" -#: builtin/tag.c:450 +#: builtin/tag.c msgid "verify tags" msgstr "驗證標籤" -#: builtin/tag.c:452 +#: builtin/tag.c msgid "Tag creation options" msgstr "標籤建立選項" -#: builtin/tag.c:454 +#: builtin/tag.c msgid "annotated tag, needs a message" msgstr "附註標籤，需要一個說明" -#: builtin/tag.c:456 +#: builtin/tag.c msgid "tag message" msgstr "標籤說明" -#: builtin/tag.c:458 +#: builtin/tag.c msgid "force edit of tag message" msgstr "強制編輯標籤說明" -#: builtin/tag.c:459 +#: builtin/tag.c msgid "annotated and GPG-signed tag" msgstr "附註並附加 GPG 簽名的標籤" -#: builtin/tag.c:462 +#: builtin/tag.c msgid "use another key to sign the tag" msgstr "使用另外的私鑰簽名該標籤" -#: builtin/tag.c:463 +#: builtin/tag.c msgid "replace the tag if exists" msgstr "如果存在，取代現有的標籤" -#: builtin/tag.c:464 builtin/update-ref.c:511 +#: builtin/tag.c builtin/update-ref.c msgid "create a reflog" msgstr "建立引用日誌" -#: builtin/tag.c:466 +#: builtin/tag.c msgid "Tag listing options" msgstr "標籤列表選項" -#: builtin/tag.c:467 +#: builtin/tag.c msgid "show tag list in columns" msgstr "以列的方式顯示標籤列表" -#: builtin/tag.c:468 builtin/tag.c:470 +#: builtin/tag.c msgid "print only tags that contain the commit" msgstr "只列印包含該提交的標籤" -#: builtin/tag.c:469 builtin/tag.c:471 +#: builtin/tag.c msgid "print only tags that don't contain the commit" msgstr "只列印不包含該提交的標籤" -#: builtin/tag.c:472 +#: builtin/tag.c msgid "print only tags that are merged" msgstr "只列印已經合併的標籤" -#: builtin/tag.c:473 +#: builtin/tag.c msgid "print only tags that are not merged" msgstr "只列印尚未合併的標籤" -#: builtin/tag.c:477 +#: builtin/tag.c msgid "print only tags of the object" msgstr "只列印指向該物件的標籤" -#: builtin/tag.c:559 +#: builtin/tag.c #, c-format msgid "the '%s' option is only allowed in list mode" msgstr "「%s」選項只能在列表顯示模式使用" -#: builtin/tag.c:598 +#: builtin/tag.c #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一個有效的標籤名稱。" -#: builtin/tag.c:603 +#: builtin/tag.c #, c-format msgid "tag '%s' already exists" msgstr "標籤 '%s' 已存在" -#: builtin/tag.c:634 +#: builtin/tag.c sequencer.c +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "無效的清理模式 %s" + +#: builtin/tag.c #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新標籤 '%s'（曾為 %s）\n" -#: builtin/unpack-objects.c:95 +#: builtin/unpack-objects.c msgid "pack exceeds maximum allowed size" msgstr "包超過了最大允許值" -#: builtin/unpack-objects.c:504 +#: builtin/unpack-objects.c msgid "Unpacking objects" msgstr "展開物件中" -#: builtin/update-index.c:84 +#: builtin/update-index.c #, c-format msgid "failed to create directory %s" msgstr "建立目錄 %s 失敗" -#: builtin/update-index.c:106 +#: builtin/update-index.c #, c-format msgid "failed to delete file %s" msgstr "刪除檔案 %s 失敗" -#: builtin/update-index.c:113 builtin/update-index.c:219 +#: builtin/update-index.c #, c-format msgid "failed to delete directory %s" msgstr "刪除目錄 %s 失敗" -#: builtin/update-index.c:138 +#: builtin/update-index.c #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' 中測試 mtime " -#: builtin/update-index.c:152 +#: builtin/update-index.c msgid "directory stat info does not change after adding a new file" msgstr "新增一個新檔案後，目錄的狀態訊息未改變" -#: builtin/update-index.c:165 +#: builtin/update-index.c msgid "directory stat info does not change after adding a new directory" msgstr "新增一個新目錄後，目錄的狀態訊息未改變" -#: builtin/update-index.c:178 +#: builtin/update-index.c msgid "directory stat info changes after updating a file" msgstr "更新一個檔案後，目錄的狀態訊息被修改" -#: builtin/update-index.c:189 +#: builtin/update-index.c msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在子目錄中新增檔案後，目錄的狀態訊息被修改" -#: builtin/update-index.c:200 +#: builtin/update-index.c msgid "directory stat info does not change after deleting a file" msgstr "刪除一個檔案後，目錄的狀態訊息未改變" -#: builtin/update-index.c:213 +#: builtin/update-index.c msgid "directory stat info does not change after deleting a directory" msgstr "刪除一個目錄後，目錄的狀態訊息未改變" -#: builtin/update-index.c:220 +#: builtin/update-index.c msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<選項>] [--] [<檔案>...]" -#: builtin/update-index.c:993 +#: builtin/update-index.c msgid "continue refresh even when index needs update" msgstr "當索引需要更新時繼續重新整理" -#: builtin/update-index.c:996 +#: builtin/update-index.c msgid "refresh: ignore submodules" msgstr "重新整理：忽略子模組" -#: builtin/update-index.c:999 +#: builtin/update-index.c msgid "do not ignore new files" msgstr "不忽略新的檔案" -#: builtin/update-index.c:1001 +#: builtin/update-index.c msgid "let files replace directories and vice-versa" msgstr "讓檔案取代目錄（反之亦然）" -#: builtin/update-index.c:1003 +#: builtin/update-index.c msgid "notice files missing from worktree" msgstr "通知檔案從工作區遺失" -#: builtin/update-index.c:1005 +#: builtin/update-index.c msgid "refresh even if index contains unmerged entries" msgstr "即使索引區包含未合併的條目也執行重新整理" -#: builtin/update-index.c:1008 +#: builtin/update-index.c msgid "refresh stat information" msgstr "重新整理統計訊息" -#: builtin/update-index.c:1012 +#: builtin/update-index.c msgid "like --refresh, but ignore assume-unchanged setting" msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定" -#: builtin/update-index.c:1016 +#: builtin/update-index.c msgid "<mode>,<object>,<path>" msgstr "<存取模式>,<物件>,<路徑>" -#: builtin/update-index.c:1017 +#: builtin/update-index.c msgid "add the specified entry to the index" msgstr "新增指定的條目到索引區" -#: builtin/update-index.c:1027 +#: builtin/update-index.c msgid "mark files as \"not changing\"" msgstr "把檔案標記為 \"沒有變更\"" -#: builtin/update-index.c:1030 +#: builtin/update-index.c msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:1033 +#: builtin/update-index.c msgid "mark files as \"index-only\"" msgstr "把檔案標記為 \"僅索引\"" -#: builtin/update-index.c:1036 +#: builtin/update-index.c msgid "clear skip-worktree bit" msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:1039 +#: builtin/update-index.c msgid "do not touch index-only entries" msgstr "不要建立只有索引的項目" -#: builtin/update-index.c:1041 +#: builtin/update-index.c msgid "add to index only; do not add content to object database" msgstr "只新增到索引區；不新增物件到物件庫" -#: builtin/update-index.c:1043 +#: builtin/update-index.c msgid "remove named paths even if present in worktree" msgstr "即使存在工作區裡，也刪除路徑" -#: builtin/update-index.c:1045 +#: builtin/update-index.c msgid "with --stdin: input lines are terminated by null bytes" msgstr "攜帶 --stdin：輸入的行以 null 字元終止" -#: builtin/update-index.c:1047 +#: builtin/update-index.c msgid "read list of paths to be updated from standard input" msgstr "從標準輸入中讀取需要更新的路徑列表" -#: builtin/update-index.c:1051 +#: builtin/update-index.c msgid "add entries from standard input to the index" msgstr "從標準輸入新增條目到索引區" -#: builtin/update-index.c:1055 +#: builtin/update-index.c msgid "repopulate stages #2 and #3 for the listed paths" msgstr "為指定檔案重新生成第2和第3暫存區" -#: builtin/update-index.c:1059 +#: builtin/update-index.c msgid "only update entries that differ from HEAD" msgstr "只更新與 HEAD 不同的條目" -#: builtin/update-index.c:1063 +#: builtin/update-index.c msgid "ignore files missing from worktree" msgstr "忽略工作區遺失的檔案" -#: builtin/update-index.c:1066 +#: builtin/update-index.c msgid "report actions to standard output" msgstr "在標準輸出顯示動作" -#: builtin/update-index.c:1068 +#: builtin/update-index.c msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘記儲存的未解決的衝突" -#: builtin/update-index.c:1072 +#: builtin/update-index.c msgid "write index in this format" msgstr "以這種格式寫入索引區" -#: builtin/update-index.c:1074 +#: builtin/update-index.c msgid "enable or disable split index" msgstr "啟用或停用索引分割" -#: builtin/update-index.c:1076 +#: builtin/update-index.c msgid "enable/disable untracked cache" msgstr "啟用/停用對未追蹤檔案的快取" -#: builtin/update-index.c:1078 +#: builtin/update-index.c msgid "test if the filesystem supports untracked cache" msgstr "測試檔案系統是否支援未追蹤檔案快取" -#: builtin/update-index.c:1080 +#: builtin/update-index.c msgid "enable untracked cache without testing the filesystem" msgstr "無需檢測檔案系統，啟用對未追蹤檔案的快取" -#: builtin/update-index.c:1082 +#: builtin/update-index.c msgid "write out the index even if is not flagged as changed" msgstr "即使沒有被標記為已更改，也要寫出索引" -#: builtin/update-index.c:1084 +#: builtin/update-index.c msgid "enable or disable file system monitor" msgstr "啟用或停用檔案系統監控" -#: builtin/update-index.c:1086 +#: builtin/update-index.c msgid "mark files as fsmonitor valid" msgstr "標記檔案為 fsmonitor 有效" -#: builtin/update-index.c:1089 +#: builtin/update-index.c msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效位" -#: builtin/update-index.c:1195 +#: builtin/update-index.c msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "core.splitIndex 被設定為 false。如果您確定要啟用索引分割，請移除或修改" -#: builtin/update-index.c:1204 +#: builtin/update-index.c msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "core.splitIndex 被設定為 true。如果您確定要停用索引分割，請移除或修改" -#: builtin/update-index.c:1216 +#: builtin/update-index.c msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -23803,11 +15725,11 @@ msgstr "" "core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或" "修改" -#: builtin/update-index.c:1220 +#: builtin/update-index.c msgid "Untracked cache disabled" msgstr "快取未追蹤檔案被停用" -#: builtin/update-index.c:1228 +#: builtin/update-index.c msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -23815,168 +15737,168 @@ msgstr "" "core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或" "修改" -#: builtin/update-index.c:1232 +#: builtin/update-index.c #, c-format msgid "Untracked cache enabled for '%s'" msgstr "快取未追蹤檔案在 '%s' 啟用" -#: builtin/update-index.c:1241 +#: builtin/update-index.c msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未設定；如果想要啟用 fsmonitor 請設定該選項" -#: builtin/update-index.c:1246 +#: builtin/update-index.c msgid "fsmonitor enabled" msgstr "fsmonitor 被啟用" -#: builtin/update-index.c:1250 +#: builtin/update-index.c msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項" -#: builtin/update-index.c:1254 +#: builtin/update-index.c msgid "fsmonitor disabled" msgstr "fsmonitor 被停用" -#: builtin/update-ref.c:10 +#: builtin/update-ref.c msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<選項>] -d <引用名> [<舊值>]" -#: builtin/update-ref.c:11 +#: builtin/update-ref.c msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<選項>] <引用名> <新值> [<舊值>]" -#: builtin/update-ref.c:12 +#: builtin/update-ref.c msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<選項>] --stdin [-z]" -#: builtin/update-ref.c:506 +#: builtin/update-ref.c msgid "delete the reference" msgstr "刪除引用" -#: builtin/update-ref.c:508 +#: builtin/update-ref.c msgid "update <refname> not the one it points to" msgstr "更新 <引用名> 本身而不是它指向的引用" -#: builtin/update-ref.c:509 +#: builtin/update-ref.c msgid "stdin has NUL-terminated arguments" msgstr "標準輸入有以 NUL 字元終止的參數" -#: builtin/update-ref.c:510 +#: builtin/update-ref.c msgid "read updates from stdin" msgstr "從標準輸入讀取更新" -#: builtin/update-server-info.c:15 +#: builtin/update-server-info.c msgid "update the info files from scratch" msgstr "從頭開始更新檔案訊息" -#: builtin/upload-pack.c:11 +#: builtin/upload-pack.c msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<選項>] <目錄>" -#: builtin/upload-pack.c:24 t/helper/test-serve-v2.c:17 +#: builtin/upload-pack.c t/helper/test-serve-v2.c msgid "quit after a single request/response exchange" msgstr "在一次單獨的請求/回應之後離開" -#: builtin/upload-pack.c:26 +#: builtin/upload-pack.c msgid "serve up the info/refs for git-http-backend" msgstr "為 git-http-backend 提供 info/refs" -#: builtin/upload-pack.c:29 +#: builtin/upload-pack.c msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "如果 <目錄> 不是一個 Git 目錄，不要嘗試 <目錄>/.git/" -#: builtin/upload-pack.c:31 +#: builtin/upload-pack.c msgid "interrupt transfer after <n> seconds of inactivity" msgstr "不活動 <n> 秒鐘後終止傳輸" -#: builtin/verify-commit.c:19 +#: builtin/verify-commit.c msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <提交>..." -#: builtin/verify-commit.c:68 +#: builtin/verify-commit.c msgid "print commit contents" msgstr "列印提交內容" -#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 +#: builtin/verify-commit.c builtin/verify-tag.c msgid "print raw gpg status output" msgstr "列印原始 gpg 狀態輸出" -#: builtin/verify-pack.c:59 +#: builtin/verify-pack.c msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." -#: builtin/verify-pack.c:70 +#: builtin/verify-pack.c msgid "verbose" msgstr "詳細輸出" -#: builtin/verify-pack.c:72 +#: builtin/verify-pack.c msgid "show statistics only" msgstr "只顯示統計" -#: builtin/verify-tag.c:18 +#: builtin/verify-tag.c msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <標籤>..." -#: builtin/verify-tag.c:36 +#: builtin/verify-tag.c msgid "print tag contents" msgstr "列印標籤內容" -#: builtin/worktree.c:19 +#: builtin/worktree.c msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<選項>] <路徑> [<提交>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c msgid "git worktree list [<options>]" msgstr "git worktree list [<選項>]" -#: builtin/worktree.c:21 +#: builtin/worktree.c msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<選項>] <路徑>" -#: builtin/worktree.c:22 +#: builtin/worktree.c msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作區> <新路徑>" -#: builtin/worktree.c:23 +#: builtin/worktree.c msgid "git worktree prune [<options>]" msgstr "git worktree prune [<選項>]" -#: builtin/worktree.c:24 +#: builtin/worktree.c msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<選項>] <工作區>" -#: builtin/worktree.c:25 +#: builtin/worktree.c msgid "git worktree repair [<path>...]" msgstr "git worktree repair [<路徑>...]" -#: builtin/worktree.c:26 +#: builtin/worktree.c msgid "git worktree unlock <path>" msgstr "git worktree unlock <路徑>" -#: builtin/worktree.c:76 +#: builtin/worktree.c #, c-format msgid "Removing %s/%s: %s" msgstr "移除 %s/%s: %s" -#: builtin/worktree.c:149 +#: builtin/worktree.c msgid "report pruned working trees" msgstr "報告剪除的工作區" -#: builtin/worktree.c:151 +#: builtin/worktree.c msgid "expire working trees older than <time>" msgstr "將早於 <時間> 的工作區過期" -#: builtin/worktree.c:221 +#: builtin/worktree.c #, c-format msgid "'%s' already exists" msgstr "'%s' 已經存在" -#: builtin/worktree.c:230 +#: builtin/worktree.c #, c-format msgid "unusable worktree destination '%s'" msgstr "無法使用的工作目錄目的地「%s」" -#: builtin/worktree.c:235 +#: builtin/worktree.c #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -23985,7 +15907,7 @@ msgstr "" "「%s」是個遺失但被鎖定的工作區；\n" "使用「%s -f -f」覆蓋，或「unlock」和「prune」或「remove」清除" -#: builtin/worktree.c:237 +#: builtin/worktree.c #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -23994,146 +15916,150 @@ msgstr "" "「%s」是個遺失但已註冊的工作區；\n" "使用「%s -f」覆蓋，或「prune」或「remove」清除" -#: builtin/worktree.c:248 +#: builtin/worktree.c #, c-format msgid "failed to copy '%s' to '%s'; sparse-checkout may not work correctly" msgstr "無法將「%s」複製到「%s」；稀疏簽出可能無法正常運作" -#: builtin/worktree.c:268 +#: builtin/worktree.c #, c-format msgid "failed to copy worktree config from '%s' to '%s'" msgstr "無法將工作區組態從「%s」複製到「%s」" -#: builtin/worktree.c:280 builtin/worktree.c:285 +#: builtin/worktree.c #, c-format msgid "failed to unset '%s' in '%s'" msgstr "無法取消「%2$s」中「%1$s」的設定" -#: builtin/worktree.c:356 +#: builtin/worktree.c #, c-format msgid "could not create directory of '%s'" msgstr "不能建立目錄 '%s'" -#: builtin/worktree.c:378 +#: builtin/worktree.c msgid "initializing" msgstr "正在初始化" -#: builtin/worktree.c:492 builtin/worktree.c:498 +#: builtin/worktree.c #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "準備工作區（新分支 '%s'）" -#: builtin/worktree.c:494 +#: builtin/worktree.c #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "準備工作區（重設分支 '%s'，之前為 %s）" -#: builtin/worktree.c:503 +#: builtin/worktree.c #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "準備工作區（簽出 '%s'）" -#: builtin/worktree.c:509 +#: builtin/worktree.c #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "準備工作區（分離開頭指標 %s）" -#: builtin/worktree.c:554 +#: builtin/worktree.c msgid "checkout <branch> even if already checked out in other worktree" msgstr "簽出 <分支>，即使已經被簽出到其它工作區" -#: builtin/worktree.c:557 +#: builtin/worktree.c msgid "create a new branch" msgstr "建立一個新分支" -#: builtin/worktree.c:559 +#: builtin/worktree.c msgid "create or reset a branch" msgstr "建立或重設一個分支" -#: builtin/worktree.c:561 +#: builtin/worktree.c msgid "populate the new working tree" msgstr "生成新的工作區" -#: builtin/worktree.c:562 +#: builtin/worktree.c msgid "keep the new working tree locked" msgstr "鎖定新工作區" -#: builtin/worktree.c:564 builtin/worktree.c:809 +#: builtin/worktree.c msgid "reason for locking" msgstr "鎖定原因" -#: builtin/worktree.c:567 +#: builtin/worktree.c msgid "set up tracking mode (see git-branch(1))" msgstr "設定追蹤模式（參見 git-branch(1)）" -#: builtin/worktree.c:570 +#: builtin/worktree.c msgid "try to match the new branch name with a remote-tracking branch" msgstr "嘗試為新分支名符合一個遠端追蹤分支" -#: builtin/worktree.c:584 +#: builtin/worktree.c diff.c parse-options.c +#, c-format +msgid "options '%s', '%s', and '%s' cannot be used together" +msgstr "「%s」、「%s」和「%s」選項不得同時使用" + +#: builtin/worktree.c msgid "added with --lock" msgstr "已使用 --lock 加入" -#: builtin/worktree.c:646 +#: builtin/worktree.c msgid "--[no-]track can only be used if a new branch is created" msgstr "只能在建立新分支時使用 --[no-]track 選項" -#: builtin/worktree.c:766 +#: builtin/worktree.c msgid "show extended annotations and reasons, if available" msgstr "如果有則顯示延伸的註釋和原因" -#: builtin/worktree.c:768 +#: builtin/worktree.c msgid "add 'prunable' annotation to worktrees older than <time>" msgstr "對舊於 <時間> 的工作區加上 ‘prunable’ 標示" -#: builtin/worktree.c:770 +#: builtin/worktree.c msgid "terminate records with a NUL character" msgstr "以一個 NUL 字元終止記錄" -#: builtin/worktree.c:821 builtin/worktree.c:854 builtin/worktree.c:928 -#: builtin/worktree.c:1052 +#: builtin/worktree.c #, c-format msgid "'%s' is not a working tree" msgstr "'%s' 不是一個工作區" -#: builtin/worktree.c:823 builtin/worktree.c:856 +#: builtin/worktree.c msgid "The main working tree cannot be locked or unlocked" msgstr "主工作區無法被加鎖或解鎖" -#: builtin/worktree.c:828 +#: builtin/worktree.c #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被鎖定，原因：%s" -#: builtin/worktree.c:830 +#: builtin/worktree.c #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被鎖定" -#: builtin/worktree.c:858 +#: builtin/worktree.c #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被鎖定" -#: builtin/worktree.c:899 +#: builtin/worktree.c msgid "working trees containing submodules cannot be moved or removed" msgstr "不能移動或刪除包含子模組的工作區" -#: builtin/worktree.c:907 +#: builtin/worktree.c msgid "force move even if worktree is dirty or locked" msgstr "強制移動，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:930 builtin/worktree.c:1054 +#: builtin/worktree.c #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一個主工作區" -#: builtin/worktree.c:935 +#: builtin/worktree.c #, c-format msgid "could not figure out destination name from '%s'" msgstr "無法從 '%s' 算出目的地名稱" -#: builtin/worktree.c:948 +#: builtin/worktree.c #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -24142,7 +16068,7 @@ msgstr "" "無法移動一個鎖定的工作區，鎖定原因：%s\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:950 +#: builtin/worktree.c msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -24150,36 +16076,36 @@ msgstr "" "無法移動一個鎖定的工作區，\n" "使用 'move -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:953 +#: builtin/worktree.c #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "驗證失敗，無法移動工作區：%s" -#: builtin/worktree.c:958 +#: builtin/worktree.c #, c-format msgid "failed to move '%s' to '%s'" msgstr "移動 '%s' 到 '%s' 失敗" -#: builtin/worktree.c:1004 +#: builtin/worktree.c #, c-format msgid "failed to run 'git status' on '%s'" msgstr "在 '%s' 中執行 'git status' 失敗" -#: builtin/worktree.c:1008 +#: builtin/worktree.c #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除" -#: builtin/worktree.c:1013 +#: builtin/worktree.c #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d" -#: builtin/worktree.c:1036 +#: builtin/worktree.c msgid "force removal even if worktree is dirty or locked" msgstr "強制刪除，即使工作區是髒的或已鎖定" -#: builtin/worktree.c:1059 +#: builtin/worktree.c #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -24188,7 +16114,7 @@ msgstr "" "無法刪除一個鎖定的工作區，鎖定原因：%s\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:1061 +#: builtin/worktree.c msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -24196,1502 +16122,9829 @@ msgstr "" "無法刪除一個鎖定的工作區，\n" "使用 'remove -f -f' 覆蓋或先解鎖" -#: builtin/worktree.c:1064 +#: builtin/worktree.c #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "驗證失敗，無法刪除工作區：%s" -#: builtin/worktree.c:1088 +#: builtin/worktree.c #, c-format msgid "repair: %s: %s" msgstr "修復：%s：%s" -#: builtin/worktree.c:1091 +#: builtin/worktree.c #, c-format msgid "error: %s: %s" msgstr "錯誤：%s：%s" -#: builtin/write-tree.c:15 +#: builtin/write-tree.c msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<前綴>/]" -#: builtin/write-tree.c:28 +#: builtin/write-tree.c msgid "<prefix>/" msgstr "<前綴>/" -#: builtin/write-tree.c:29 +#: builtin/write-tree.c msgid "write tree object for a subdirectory <prefix>" msgstr "將 <前綴> 子目錄內容寫到一個樹狀物件" -#: builtin/write-tree.c:31 +#: builtin/write-tree.c msgid "only useful for debugging" msgstr "只對除錯有用" -#: git.c:28 -msgid "" -"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" -" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" -" <command> [<args>]" -msgstr "" -"git [--version] [--help] [-C <路徑>] [-c <名稱>=<數值>]\n" -" [--exec-path[=<路徑>]] [--html-path] [--man-path] [--info-path]\n" -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" -"bare]\n" -" [--git-dir=<路徑>] [--work-tree=<路徑>] [--namespace=<名稱>]\n" -" [--super-prefix=<路徑>] [--config-env=<名稱>=<環境變數>]\n" -" <命令> [<引數>]" - -#: git.c:36 -msgid "" -"'git help -a' and 'git help -g' list available subcommands and some\n" -"concept guides. See 'git help <command>' or 'git help <concept>'\n" -"to read about a specific subcommand or concept.\n" -"See 'git help git' for an overview of the system." -msgstr "" -"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n" -"檢視 'git help <命令>' 或 'git help <概念>' 以取得提供子指令或概念\n" -"說明。\n" -"有關系統概述，檢視 'git help git'。" - -#: git.c:188 git.c:216 git.c:300 -#, c-format -msgid "no directory given for '%s' option\n" -msgstr "未傳入目錄至「%s」選項\n" - -#: git.c:202 -#, c-format -msgid "no namespace given for --namespace\n" -msgstr "沒有為 --namespace 提供命名空間\n" - -#: git.c:230 -#, c-format -msgid "no prefix given for --super-prefix\n" -msgstr "沒有為 --super-prefix 提供前綴\n" - -#: git.c:252 -#, c-format -msgid "-c expects a configuration string\n" -msgstr "應為 -c 提供一個設定字串\n" - -#: git.c:260 -#, c-format -msgid "no config key given for --config-env\n" -msgstr "未傳入設定鍵至 --config-env\n" - -#: git.c:326 -#, c-format -msgid "unknown option: %s\n" -msgstr "未知選項：%s\n" - -#: git.c:375 -#, c-format -msgid "while expanding alias '%s': '%s'" -msgstr "在展開別名 '%s' 時：'%s'" - -#: git.c:384 -#, c-format -msgid "" -"alias '%s' changes environment variables.\n" -"You can use '!git' in the alias to do this" -msgstr "" -"別名 '%s' 修改環境變數。您可以使用在別名中\n" -"使用 '!git'" - -#: git.c:391 -#, c-format -msgid "empty alias for %s" -msgstr "%s 的空別名" - -#: git.c:394 -#, c-format -msgid "recursive alias: %s" -msgstr "遞迴的別名：%s" - -#: git.c:480 -msgid "write failure on standard output" -msgstr "在標準輸出寫入失敗" - -#: git.c:482 -msgid "unknown write failure on standard output" -msgstr "到標準輸出的未知寫入錯誤" - -#: git.c:484 -msgid "close failed on standard output" -msgstr "標準輸出關閉失敗" - -#: git.c:838 -#, c-format -msgid "alias loop detected: expansion of '%s' does not terminate:%s" -msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s" - -#: git.c:888 -#, c-format -msgid "cannot handle %s as a builtin" -msgstr "不能作為內建指令處理 %s" - -#: git.c:901 -#, c-format -msgid "" -"usage: %s\n" -"\n" -msgstr "" -"用法：%s\n" -"\n" - -#: git.c:921 -#, c-format -msgid "expansion of alias '%s' failed; '%s' is not a git command\n" -msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" - -#: git.c:933 -#, c-format -msgid "failed to run command '%s': %s\n" -msgstr "執行指令 '%s' 失敗：%s\n" - -#: http-fetch.c:128 -#, c-format -msgid "argument to --packfile must be a valid hash (got '%s')" -msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" - -#: http-fetch.c:138 -msgid "not a git repository" -msgstr "不是一個 git 版本庫" - -#: t/helper/test-fast-rebase.c:141 -msgid "unhandled options" -msgstr "未處理選項" - -#: t/helper/test-fast-rebase.c:146 -msgid "error preparing revisions" -msgstr "準備修訂版本時發生錯誤" - -#: t/helper/test-reach.c:154 -#, c-format -msgid "commit %s is not marked reachable" -msgstr "提交 %s 沒有標記為可以取得" - -#: t/helper/test-reach.c:164 -msgid "too many commits marked reachable" -msgstr "太多提交標記為可以取得" - -#: t/helper/test-serve-v2.c:7 -msgid "test-tool serve-v2 [<options>]" -msgstr "test-tool serve-v2 [<選項>]" - -#: t/helper/test-serve-v2.c:19 -msgid "exit immediately after advertising capabilities" -msgstr "對能力廣告之後立即離開" - -#: t/helper/test-simple-ipc.c:581 -msgid "test-helper simple-ipc is-active [<name>] [<options>]" -msgstr "test-helper simple-ipc is-active [<name>] [<options>]" - -#: t/helper/test-simple-ipc.c:582 -msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" -msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]" - -#: t/helper/test-simple-ipc.c:583 -msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" -msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" - -#: t/helper/test-simple-ipc.c:584 -msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" -msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" - -#: t/helper/test-simple-ipc.c:585 -msgid "test-helper simple-ipc send [<name>] [<token>]" -msgstr "test-helper simple-ipc send [<name>] [<token>]" - -#: t/helper/test-simple-ipc.c:586 -msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" -msgstr "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" - -#: t/helper/test-simple-ipc.c:587 -msgid "" -"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " -"[<batchsize>]" -msgstr "" -"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " -"[<batchsize>]" - -#: t/helper/test-simple-ipc.c:595 -msgid "name or pathname of unix domain socket" -msgstr "Unix 網域通訊端的名稱或路徑名稱" - -#: t/helper/test-simple-ipc.c:597 -msgid "named-pipe name" -msgstr "有命名管道的名稱" - -#: t/helper/test-simple-ipc.c:599 -msgid "number of threads in server thread pool" -msgstr "伺服器執行緒集區的執行緒數量" - -#: t/helper/test-simple-ipc.c:600 -msgid "seconds to wait for daemon to start or stop" -msgstr "要等待守護程式啟動或停止多久（秒）" - -#: t/helper/test-simple-ipc.c:602 -msgid "number of bytes" -msgstr "位元組數" - -#: t/helper/test-simple-ipc.c:603 -msgid "number of requests per thread" -msgstr "每個執行緒的請求數" - -#: t/helper/test-simple-ipc.c:605 -msgid "byte" -msgstr "位元組" - -#: t/helper/test-simple-ipc.c:605 -msgid "ballast character" -msgstr "穩定 (ballast) 字元" - -#: t/helper/test-simple-ipc.c:606 -msgid "token" -msgstr "代符" - -#: t/helper/test-simple-ipc.c:606 -msgid "command token to send to the server" -msgstr "要傳送至伺服器的命令代符" - -#: http.c:350 -#, c-format -msgid "negative value for http.postbuffer; defaulting to %d" -msgstr "http.postbuffer 為負值，預設為 %d" - -#: http.c:371 -msgid "Delegation control is not supported with cURL < 7.22.0" -msgstr "不支援委託控制，因為 cURL < 7.22.0" - -#: http.c:380 -msgid "Public key pinning not supported with cURL < 7.39.0" -msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0" - -#: http.c:812 -msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" -msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0" - -#: http.c:1016 -#, c-format -msgid "Unsupported SSL backend '%s'. Supported SSL backends:" -msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" - -#: http.c:1023 -#, c-format -msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" -msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端" - -#: http.c:1027 -#, c-format -msgid "Could not set SSL backend to '%s': already set" -msgstr "無法將 SSL 後端設定為 '%s'：已經設定" - -#: http.c:1876 -#, c-format -msgid "" -"unable to update url base from redirection:\n" -" asked for: %s\n" -" redirect: %s" -msgstr "" -"不能更新重定向的 url base：\n" -" 請求：%s\n" -" 重定向：%s" - -#: remote-curl.c:184 -#, c-format -msgid "invalid quoting in push-option value: '%s'" -msgstr "在 push-option 取值中無效的引號：'%s'" - -#: remote-curl.c:308 -#, c-format -msgid "%sinfo/refs not valid: is this a git repository?" -msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？" - -#: remote-curl.c:409 -msgid "invalid server response; expected service, got flush packet" -msgstr "無效的服務端回應。預期服務，得到 flush 包" - -#: remote-curl.c:440 -#, c-format -msgid "invalid server response; got '%s'" -msgstr "無效的服務端回應，得到 '%s'" - -#: remote-curl.c:500 -#, c-format -msgid "repository '%s' not found" -msgstr "版本庫 '%s' 未找到" - -#: remote-curl.c:504 -#, c-format -msgid "Authentication failed for '%s'" -msgstr "'%s' 身份驗證失敗" - -#: remote-curl.c:508 -#, c-format -msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" -msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s" - -#: remote-curl.c:512 -#, c-format -msgid "unable to access '%s': %s" -msgstr "無法存取 '%s'：%s" - -#: remote-curl.c:518 +#: bundle.c #, c-format -msgid "redirecting to %s" -msgstr "重定向到 %s" - -#: remote-curl.c:649 -msgid "shouldn't have EOF when not gentle on EOF" -msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" - -#: remote-curl.c:661 -msgid "remote server sent unexpected response end packet" -msgstr "遠端伺服器傳送了非預期的回應結束封包" - -#: remote-curl.c:730 -msgid "unable to rewind rpc post data - try increasing http.postBuffer" -msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" +msgid "unrecognized bundle hash algorithm: %s" +msgstr "無法識別的套件雜湊演算法：%s" -#: remote-curl.c:759 +#: bundle.c #, c-format -msgid "remote-curl: bad line length character: %.4s" -msgstr "remote-curl: 錯誤的行長度字串：%.4s" - -#: remote-curl.c:761 -msgid "remote-curl: unexpected response end packet" -msgstr "remote-curl: 非預期的回應結束封包" +msgid "unknown capability '%s'" +msgstr "未知功能 '%s'" -#: remote-curl.c:837 +#: bundle.c #, c-format -msgid "RPC failed; %s" -msgstr "RPC 失敗。%s" - -#: remote-curl.c:877 -msgid "cannot handle pushes this big" -msgstr "不能處理這麼大的推送" +msgid "'%s' does not look like a v2 or v3 bundle file" +msgstr "'%s' 不像是一個 v2 或 v3 版本的套件檔案" -#: remote-curl.c:990 +#: bundle.c #, c-format -msgid "cannot deflate request; zlib deflate error %d" -msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" +msgid "unrecognized header: %s%s (%d)" +msgstr "無法識別的包頭：%s%s (%d)" -#: remote-curl.c:994 -#, c-format -msgid "cannot deflate request; zlib end error %d" -msgstr "不能壓縮請求，zlib 結束錯誤 %d" +#: bundle.c +msgid "Repository lacks these prerequisite commits:" +msgstr "版本庫中缺少這些必備的提交：" -#: remote-curl.c:1044 -#, c-format -msgid "%d bytes of length header were received" -msgstr "收到了 %d 位元組長度的標頭" +#: bundle.c +msgid "need a repository to verify a bundle" +msgstr "需要版本庫驗證套件" -#: remote-curl.c:1046 +#: bundle.c #, c-format -msgid "%d bytes of body are still expected" -msgstr "預期仍要有 %d 位元組的本文 (body)" - -#: remote-curl.c:1135 -msgid "dumb http transport does not support shallow capabilities" -msgstr "啞 http 傳輸不支援 shallow 能力" - -#: remote-curl.c:1150 -msgid "fetch failed." -msgstr "取得失敗。" - -#: remote-curl.c:1198 -msgid "cannot fetch by sha1 over smart http" -msgstr "無法透過智慧 HTTP 取得 sha1" +msgid "The bundle contains this ref:" +msgid_plural "The bundle contains these %<PRIuMAX> refs:" +msgstr[0] "這個套件含有這 %<PRIuMAX> 個引用：" -#: remote-curl.c:1242 remote-curl.c:1248 -#, c-format -msgid "protocol error: expected sha/ref, got '%s'" -msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" +#: bundle.c +msgid "The bundle records a complete history." +msgstr "這個套件記錄完整歷史紀錄。" -#: remote-curl.c:1260 remote-curl.c:1378 +#: bundle.c #, c-format -msgid "http transport does not support %s" -msgstr "http 傳輸協定不支援 %s" - -#: remote-curl.c:1296 -msgid "git-http-push failed" -msgstr "git-http-push 失敗" - -#: remote-curl.c:1485 -msgid "remote-curl: usage: git remote-curl <remote> [<url>]" -msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" - -#: remote-curl.c:1517 -msgid "remote-curl: error reading command stream from git" -msgstr "remote-curl：錯誤讀取來自 git 的指令流" - -#: remote-curl.c:1524 -msgid "remote-curl: fetch attempted without a local repo" -msgstr "remote-curl：嘗試沒有本機版本庫下取得" +msgid "The bundle requires this ref:" +msgid_plural "The bundle requires these %<PRIuMAX> refs:" +msgstr[0] "這個套件需要這 %<PRIuMAX> 個引用：" -#: remote-curl.c:1565 -#, c-format -msgid "remote-curl: unknown command '%s' from git" -msgstr "remote-curl：未知的來自 git 的指令 '%s'" +#: bundle.c +msgid "unable to dup bundle descriptor" +msgstr "無法複製套件描述符" -#: contrib/scalar/scalar.c:49 -msgid "need a working directory" -msgstr "需要工作目錄" +#: bundle.c +msgid "Could not spawn pack-objects" +msgstr "不能生成 pack-objects 進程" -#: contrib/scalar/scalar.c:86 -msgid "could not find enlistment root" -msgstr "找不到編列名單的根目錄" +#: bundle.c +msgid "pack-objects died" +msgstr "pack-objects 終止" -#: contrib/scalar/scalar.c:89 contrib/scalar/scalar.c:350 -#: contrib/scalar/scalar.c:435 contrib/scalar/scalar.c:578 +#: bundle.c #, c-format -msgid "could not switch to '%s'" -msgstr "無法切換至「%s」" +msgid "ref '%s' is excluded by the rev-list options" +msgstr "引用 '%s' 被 rev-list 選項排除" -#: contrib/scalar/scalar.c:179 +#: bundle.c #, c-format -msgid "could not configure %s=%s" -msgstr "無法設定 %s=%s" - -#: contrib/scalar/scalar.c:197 -msgid "could not configure log.excludeDecoration" -msgstr "無法設定 log.excludeDecoration" - -#: contrib/scalar/scalar.c:218 -msgid "Scalar enlistments require a worktree" -msgstr "純量編列名單需要工作目錄" +msgid "unsupported bundle version %d" +msgstr "不支援的套件版本 %d" -#: contrib/scalar/scalar.c:310 +#: bundle.c #, c-format -msgid "remote HEAD is not a branch: '%.*s'" -msgstr "遠端 HEAD 不是分支：「%.*s」" - -#: contrib/scalar/scalar.c:316 -msgid "failed to get default branch name from remote; using local default" -msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱" - -#: contrib/scalar/scalar.c:329 -msgid "failed to get default branch name" -msgstr "無法取得預設分支名稱" - -#: contrib/scalar/scalar.c:340 -msgid "failed to unregister repository" -msgstr "無法取消註冊版本庫" - -#: contrib/scalar/scalar.c:355 -msgid "failed to delete enlistment directory" -msgstr "無法刪除編列名單目錄" - -#: contrib/scalar/scalar.c:375 -msgid "branch to checkout after clone" -msgstr "複製後要簽出的分支" - -#: contrib/scalar/scalar.c:377 -msgid "when cloning, create full working directory" -msgstr "複製時建立完整的工作目錄" - -#: contrib/scalar/scalar.c:379 -msgid "only download metadata for the branch that will be checked out" -msgstr "只下載會簽出的分支中介資料" - -#: contrib/scalar/scalar.c:384 -msgid "scalar clone [<options>] [--] <repo> [<dir>]" -msgstr "scalar clone [<options>] [--] <repo> [<dir>]" +msgid "cannot write bundle version %d with algorithm %s" +msgstr "無法寫入 %2$s 演算法的套件版本 %1$d" -#: contrib/scalar/scalar.c:409 -#, c-format -msgid "cannot deduce worktree name from '%s'" -msgstr "無法從「%s」推論工作區名稱" +#: bundle.c +msgid "Refusing to create empty bundle." +msgstr "不能建立空套件。" -#: contrib/scalar/scalar.c:418 +#: bundle.c #, c-format -msgid "directory '%s' exists already" -msgstr "「%s」目錄已經存在" +msgid "cannot create '%s'" +msgstr "不能建立 '%s'" -#: contrib/scalar/scalar.c:445 -#, c-format -msgid "failed to get default branch for '%s'" -msgstr "無法取得「%s」的預設分支" +#: bundle.c +msgid "index-pack died" +msgstr "index-pack 終止" -#: contrib/scalar/scalar.c:456 -#, c-format -msgid "could not configure remote in '%s'" -msgstr "無法設定「%s」中的遠端" +#: chunk-format.c +msgid "terminating chunk id appears earlier than expected" +msgstr "終止區塊 id 出現的時間早於預期" -#: contrib/scalar/scalar.c:465 +#: chunk-format.c #, c-format -msgid "could not configure '%s'" -msgstr "無法設定「%s」" - -#: contrib/scalar/scalar.c:468 -msgid "partial clone failed; attempting full clone" -msgstr "部分複製失敗。嘗試完整複製" - -#: contrib/scalar/scalar.c:472 -msgid "could not configure for full clone" -msgstr "無法設定完整複製" - -#: contrib/scalar/scalar.c:504 -msgid "`scalar list` does not take arguments" -msgstr "`scalar list` 未取引數" - -#: contrib/scalar/scalar.c:517 -msgid "scalar register [<enlistment>]" -msgstr "scalar register [<enlistment>]" - -#: contrib/scalar/scalar.c:544 -msgid "reconfigure all registered enlistments" -msgstr "重新設定所有註冊的編列名單" - -#: contrib/scalar/scalar.c:548 -msgid "scalar reconfigure [--all | <enlistment>]" -msgstr "scalar reconfigure [--all | <enlistment>]" - -#: contrib/scalar/scalar.c:566 -msgid "--all or <enlistment>, but not both" -msgstr "--all 或 <enlistment> 但不能傳入兩者" +msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>" +msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>" -#: contrib/scalar/scalar.c:581 +#: chunk-format.c #, c-format -msgid "git repository gone in '%s'" -msgstr "git 版本庫在「%s」遺失" - -#: contrib/scalar/scalar.c:621 -msgid "" -"scalar run <task> [<enlistment>]\n" -"Tasks:\n" -msgstr "" -"scalar run <task> [<enlistment>]\n" -"作業：\n" +msgid "duplicate chunk ID %<PRIx32> found" +msgstr "找到重複的區塊 ID %<PRIx32>" -#: contrib/scalar/scalar.c:639 +#: chunk-format.c #, c-format -msgid "no such task: '%s'" -msgstr "無此作業：「%s」" - -#: contrib/scalar/scalar.c:689 -msgid "scalar unregister [<enlistment>]" -msgstr "scalar unregister [<enlistment>]" - -#: contrib/scalar/scalar.c:736 -msgid "scalar delete <enlistment>" -msgstr "scalar delete <enlistment>" - -#: contrib/scalar/scalar.c:751 -msgid "refusing to delete current working directory" -msgstr "拒絕刪除目前工作目錄" - -#: contrib/scalar/scalar.c:766 -msgid "include Git version" -msgstr "包含 Git 版本" - -#: contrib/scalar/scalar.c:768 -msgid "include Git's build options" -msgstr "包含 Git 組建選項" - -#: contrib/scalar/scalar.c:772 -msgid "scalar verbose [-v | --verbose] [--build-options]" -msgstr "scalar verbose [-v | --verbose] [--build-options]" +msgid "final chunk has non-zero id %<PRIx32>" +msgstr "最終區塊有非零 ID %<PRIx32>" -#: contrib/scalar/scalar.c:813 -msgid "-C requires a <directory>" -msgstr "-C 需要 <directory>" +#: chunk-format.c +msgid "invalid hash version" +msgstr "無效的雜湊版本" -#: contrib/scalar/scalar.c:815 +#: color.c #, c-format -msgid "could not change to '%s'" -msgstr "無法更改為「%s」" - -#: contrib/scalar/scalar.c:821 -msgid "-c requires a <key>=<value> argument" -msgstr "-c 需要 <key>=<value> 引數" - -#: contrib/scalar/scalar.c:839 -msgid "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"Commands:\n" -msgstr "" -"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" -"\n" -"命令：\n" - -#: compat/compiler.h:26 -msgid "no compiler information available\n" -msgstr "沒有可用的編譯器資訊\n" - -#: compat/compiler.h:38 -msgid "no libc information available\n" -msgstr "沒有可用的 libc 資訊\n" - -#: list-objects-filter-options.h:126 -msgid "args" -msgstr "參數" - -#: list-objects-filter-options.h:127 -msgid "object filtering" -msgstr "物件過濾" - -#: parse-options.h:188 -msgid "expiry-date" -msgstr "到期時間" - -#: parse-options.h:202 -msgid "no-op (backward compatibility)" -msgstr "空動作（向後相容）" - -#: parse-options.h:341 -msgid "be more verbose" -msgstr "更加詳細" - -#: parse-options.h:343 -msgid "be more quiet" -msgstr "更加安靜" - -#: parse-options.h:349 -msgid "use <n> digits to display object names" -msgstr "用 <n> 位數字顯示物件名稱" - -#: parse-options.h:368 -msgid "how to strip spaces and #comments from message" -msgstr "設定如何刪除提交說明裡的空格和 #備註" - -#: parse-options.h:369 -msgid "read pathspec from file" -msgstr "從檔案讀取 <路徑規格>" - -#: parse-options.h:370 -msgid "" -"with --pathspec-from-file, pathspec elements are separated with NUL character" -msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" - -#: ref-filter.h:98 -msgid "key" -msgstr "key" - -#: ref-filter.h:98 -msgid "field name to sort on" -msgstr "排序的欄位名" - -#: rerere.h:44 -msgid "update the index with reused conflict resolution if possible" -msgstr "如果可能，重用衝突解決更新索引" +msgid "invalid color value: %.*s" +msgstr "無效的顏色值：%.*s" -#: command-list.h:50 +#: command-list.h msgid "Add file contents to the index" msgstr "新增檔案內容至索引" -#: command-list.h:51 +#: command-list.h msgid "Apply a series of patches from a mailbox" msgstr "套用信箱格式的系列修補檔" -#: command-list.h:52 +#: command-list.h msgid "Annotate file lines with commit information" msgstr "使用提交說明備註檔案行" -#: command-list.h:53 +#: command-list.h msgid "Apply a patch to files and/or to the index" msgstr "套用一個修補檔到檔案和/或索引區" -#: command-list.h:54 +#: command-list.h msgid "Import a GNU Arch repository into Git" msgstr "將一個 GNU Arch 版本庫匯入到 Git" -#: command-list.h:55 +#: command-list.h msgid "Create an archive of files from a named tree" msgstr "基於命名過的樹建立檔案封存" -#: command-list.h:56 +#: command-list.h msgid "Use binary search to find the commit that introduced a bug" msgstr "透過二分搜尋定位引入 bug 的提交" -#: command-list.h:57 +#: command-list.h msgid "Show what revision and author last modified each line of a file" msgstr "顯示檔案每一行最後修改的版本和修改者" -#: command-list.h:58 +#: command-list.h msgid "List, create, or delete branches" msgstr "列出、建立或刪除分支" -#: command-list.h:59 +#: command-list.h msgid "Collect information for user to file a bug report" msgstr "幫使用者收集要遞送臭蟲報告的資訊" -#: command-list.h:60 +#: command-list.h msgid "Move objects and refs by archive" msgstr "透過歸檔移動物件和引用" -#: command-list.h:61 +#: command-list.h msgid "Provide content or type and size information for repository objects" msgstr "提供版本庫物件的內容、類型或大小" -#: command-list.h:62 +#: command-list.h msgid "Display gitattributes information" msgstr "顯示 gitattributes 訊息" -#: command-list.h:63 +#: command-list.h msgid "Debug gitignore / exclude files" msgstr "除錯 gitignore / exclude 檔案" -#: command-list.h:64 +#: command-list.h msgid "Show canonical names and email addresses of contacts" msgstr "顯示聯絡人的規範名稱和電子信件" -#: command-list.h:65 +#: command-list.h msgid "Ensures that a reference name is well formed" msgstr "確保引用名稱格式正確" -#: command-list.h:66 +#: command-list.h msgid "Switch branches or restore working tree files" msgstr "切換分支或復原工作區檔案" -#: command-list.h:67 +#: command-list.h msgid "Copy files from the index to the working tree" msgstr "從索引複製檔案到工作區" -#: command-list.h:68 +#: command-list.h msgid "Find commits yet to be applied to upstream" msgstr "尋找尚未套用到上游的提交" -#: command-list.h:69 +#: command-list.h msgid "Apply the changes introduced by some existing commits" msgstr "套用一些現存提交引入的修改" -#: command-list.h:70 +#: command-list.h msgid "Graphical alternative to git-commit" msgstr "git-commit 的圖形替代介面" -#: command-list.h:71 +#: command-list.h msgid "Remove untracked files from the working tree" msgstr "從工作區中刪除未追蹤檔案" -#: command-list.h:72 +#: command-list.h msgid "Clone a repository into a new directory" msgstr "複製版本庫至新目錄" -#: command-list.h:73 +#: command-list.h msgid "Display data in columns" msgstr "以列的方式顯示資料" -#: command-list.h:74 +#: command-list.h msgid "Record changes to the repository" msgstr "記錄變更到版本庫" -#: command-list.h:75 +#: command-list.h msgid "Write and verify Git commit-graph files" msgstr "寫入和驗證 Git 提交圖檔案" -#: command-list.h:76 +#: command-list.h msgid "Create a new commit object" msgstr "建立一個新的提交物件" -#: command-list.h:77 +#: command-list.h msgid "Get and set repository or global options" msgstr "取得和設定版本庫或者全域選項" -#: command-list.h:78 +#: command-list.h msgid "Count unpacked number of objects and their disk consumption" msgstr "計算未打包物件的數量和磁碟空間占用" -#: command-list.h:79 +#: command-list.h msgid "Retrieve and store user credentials" msgstr "檢索和儲存使用者密碼" -#: command-list.h:80 +#: command-list.h msgid "Helper to temporarily store passwords in memory" msgstr "在記憶體中暫時儲存密碼的協助工具" -#: command-list.h:81 +#: command-list.h msgid "Helper to store credentials on disk" msgstr "在磁碟儲存密碼的協助工具" -#: command-list.h:82 +#: command-list.h msgid "Export a single commit to a CVS checkout" msgstr "將一個提交匯出到 CVS 簽出中" -#: command-list.h:83 +#: command-list.h msgid "Salvage your data out of another SCM people love to hate" msgstr "從另外一個人們愛恨的設定管理系統中拯救你的資料" -#: command-list.h:84 +#: command-list.h msgid "A CVS server emulator for Git" msgstr "Git 的一個 CVS 服務模擬器" -#: command-list.h:85 +#: command-list.h msgid "A really simple server for Git repositories" msgstr "一個非常簡單的 Git 版本庫伺服器" -#: command-list.h:86 +#: command-list.h msgid "Give an object a human readable name based on an available ref" msgstr "基於一個現存的引用為一個物件起一個可讀的名稱" -#: command-list.h:87 +#: command-list.h msgid "Show changes between commits, commit and working tree, etc" msgstr "顯示提交之間、提交和工作區之間等的差異" -#: command-list.h:88 +#: command-list.h msgid "Compares files in the working tree and the index" msgstr "比較工作區和索引區中的檔案" -#: command-list.h:89 +#: command-list.h msgid "Compare a tree to the working tree or index" msgstr "將一個樹和工作區或索引做比較" -#: command-list.h:90 +#: command-list.h msgid "Compares the content and mode of blobs found via two tree objects" msgstr "比較兩個樹狀物件的檔案內容和模式" -#: command-list.h:91 +#: command-list.h msgid "Show changes using common diff tools" msgstr "使用常見的差異工具顯示更改" -#: command-list.h:92 +#: command-list.h msgid "Git data exporter" msgstr "Git 資料匯出器" -#: command-list.h:93 +#: command-list.h msgid "Backend for fast Git data importers" msgstr "Git 快速資料匯入器後端" -#: command-list.h:94 +#: command-list.h msgid "Download objects and refs from another repository" msgstr "從另外一個版本庫下載物件和引用" -#: command-list.h:95 +#: command-list.h msgid "Receive missing objects from another repository" msgstr "從另一個版本庫取得缺少的物件" -#: command-list.h:96 +#: command-list.h msgid "Rewrite branches" msgstr "重寫分支" -#: command-list.h:97 +#: command-list.h msgid "Produce a merge commit message" msgstr "生成一個合併提交說明" -#: command-list.h:98 +#: command-list.h msgid "Output information on each ref" msgstr "對每一個引用輸出訊息" -#: command-list.h:99 +#: command-list.h msgid "Run a Git command on a list of repositories" msgstr "在列表中的版本庫中執行 Git 命令" -#: command-list.h:100 +#: command-list.h msgid "Prepare patches for e-mail submission" msgstr "準備電子信件提交的修補檔" -#: command-list.h:101 +#: command-list.h msgid "Verifies the connectivity and validity of the objects in the database" msgstr "驗證版本庫中物件的連通性和有效性" -#: command-list.h:102 +#: command-list.h msgid "Cleanup unnecessary files and optimize the local repository" msgstr "清除不必要的檔案和最佳化本機版本庫" -#: command-list.h:103 +#: command-list.h msgid "Extract commit ID from an archive created using git-archive" msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID" -#: command-list.h:104 +#: command-list.h msgid "Print lines matching a pattern" msgstr "輸出和模式符合的行" -#: command-list.h:105 +#: command-list.h msgid "A portable graphical interface to Git" msgstr "一個便攜的 Git 圖形用戶端" -#: command-list.h:106 +#: command-list.h msgid "Compute object ID and optionally creates a blob from a file" msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件" -#: command-list.h:107 +#: command-list.h msgid "Display help information about Git" msgstr "顯示 Git 的說明訊息" -#: command-list.h:108 +#: command-list.h msgid "Run git hooks" msgstr "執行 git 掛鉤" -#: command-list.h:109 +#: command-list.h msgid "Server side implementation of Git over HTTP" msgstr "Git HTTP 協定的服務端實現" -#: command-list.h:110 +#: command-list.h msgid "Download from a remote Git repository via HTTP" msgstr "通過 HTTP 從遠端 Git 版本庫下載" -#: command-list.h:111 +#: command-list.h msgid "Push objects over HTTP/DAV to another repository" msgstr "通過 HTTP/DAV 推送物件另一個版本庫" -#: command-list.h:112 +#: command-list.h msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾" -#: command-list.h:113 +#: command-list.h msgid "Build pack index file for an existing packed archive" msgstr "從一個現存的包存檔檔案建立包索引" -#: command-list.h:114 +#: command-list.h msgid "Create an empty Git repository or reinitialize an existing one" msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫" -#: command-list.h:115 +#: command-list.h msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb 中即時瀏覽您的工作版本庫" -#: command-list.h:116 +#: command-list.h msgid "Add or parse structured information in commit messages" msgstr "新增或解析提交說明中的結構化訊息" -#: command-list.h:117 +#: command-list.h msgid "Show commit logs" msgstr "顯示提交日誌" -#: command-list.h:118 +#: command-list.h msgid "Show information about files in the index and the working tree" msgstr "顯示索引和工作區中檔案的訊息" -#: command-list.h:119 +#: command-list.h msgid "List references in a remote repository" msgstr "顯示一個遠端版本庫的引用" -#: command-list.h:120 +#: command-list.h msgid "List the contents of a tree object" msgstr "顯示一個樹狀物件的內容" -#: command-list.h:121 +#: command-list.h msgid "Extracts patch and authorship from a single e-mail message" msgstr "從單個電子信件中擷取修補檔和作者身份" -#: command-list.h:122 +#: command-list.h msgid "Simple UNIX mbox splitter program" msgstr "簡單的 UNIX mbox 信箱切分程式" -#: command-list.h:123 +#: command-list.h msgid "Run tasks to optimize Git repository data" msgstr "執行用來最佳化 Git 版本庫資料的作業" -#: command-list.h:124 +#: command-list.h msgid "Join two or more development histories together" msgstr "合併兩個或更多開發歷史" -#: command-list.h:125 +#: command-list.h msgid "Find as good common ancestors as possible for a merge" msgstr "為了合併尋找儘可能好的公共祖先提交" -#: command-list.h:126 +#: command-list.h msgid "Run a three-way file merge" msgstr "執行一個三路檔案合併" -#: command-list.h:127 +#: command-list.h msgid "Run a merge for files needing merging" msgstr "對於需要合併的檔案執行合併" -#: command-list.h:128 +#: command-list.h msgid "The standard helper program to use with git-merge-index" msgstr "與 git-merge-index 一起使用的標準嚮導程式" -#: command-list.h:129 +#: command-list.h msgid "Show three-way merge without touching index" msgstr "顯示三路合併而不動索引" -#: command-list.h:130 +#: command-list.h msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "執行合併衝突解決工具以解決合併衝突" -#: command-list.h:131 +#: command-list.h msgid "Creates a tag object with extra validation" msgstr "建立有額外驗證的標籤物件" -#: command-list.h:132 +#: command-list.h msgid "Build a tree-object from ls-tree formatted text" msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件" -#: command-list.h:133 +#: command-list.h msgid "Write and verify multi-pack-indexes" msgstr "寫入和驗證多包索引" -#: command-list.h:134 +#: command-list.h msgid "Move or rename a file, a directory, or a symlink" msgstr "移動或重新命名一個檔案、目錄或符號連結" # 尋找提供版本的符號名稱 -#: command-list.h:135 +#: command-list.h msgid "Find symbolic names for given revs" msgstr "尋找提供版本的符號名稱" -#: command-list.h:136 +#: command-list.h msgid "Add or inspect object notes" msgstr "新增或檢查物件備註" -#: command-list.h:137 +#: command-list.h msgid "Import from and submit to Perforce repositories" msgstr "匯入和提交到 Perforce 版本庫中" -#: command-list.h:138 +#: command-list.h msgid "Create a packed archive of objects" msgstr "建立物件的存檔包" -#: command-list.h:139 +#: command-list.h msgid "Find redundant pack files" msgstr "尋找冗餘的包檔案" -#: command-list.h:140 +#: command-list.h msgid "Pack heads and tags for efficient repository access" msgstr "打包頭和標籤以實現高效的版本庫存取" -#: command-list.h:141 +#: command-list.h msgid "Compute unique ID for a patch" msgstr "計算一個修補檔的唯一 ID" -#: command-list.h:142 +#: command-list.h msgid "Prune all unreachable objects from the object database" msgstr "剪除物件庫中所有無法取得的物件" -#: command-list.h:143 +#: command-list.h msgid "Remove extra objects that are already in pack files" msgstr "刪除已經在包檔案中的多餘物件" -#: command-list.h:144 +#: command-list.h msgid "Fetch from and integrate with another repository or a local branch" msgstr "取得並整合另外的版本庫或一個本機分支" -#: command-list.h:145 +#: command-list.h msgid "Update remote refs along with associated objects" msgstr "更新遠端引用和相關的物件" -#: command-list.h:146 +#: command-list.h msgid "Applies a quilt patchset onto the current branch" msgstr "將一個 quilt 修補檔集合套用到目前分支" -#: command-list.h:147 +#: command-list.h msgid "Compare two commit ranges (e.g. two versions of a branch)" msgstr "比較兩個提交範圍（如一個分支的兩個版本）" -#: command-list.h:148 +#: command-list.h msgid "Reads tree information into the index" msgstr "將樹訊息讀取到索引" -#: command-list.h:149 +#: command-list.h msgid "Reapply commits on top of another base tip" msgstr "在另一個分支上重新套用提交" -#: command-list.h:150 +#: command-list.h msgid "Receive what is pushed into the repository" msgstr "接收推送到版本庫中的物件" -#: command-list.h:151 +#: command-list.h msgid "Manage reflog information" msgstr "管理 reflog 訊息" -#: command-list.h:152 +#: command-list.h msgid "Manage set of tracked repositories" msgstr "管理已追蹤版本庫" -#: command-list.h:153 +#: command-list.h msgid "Pack unpacked objects in a repository" msgstr "打包版本庫中未打包物件" -#: command-list.h:154 +#: command-list.h msgid "Create, list, delete refs to replace objects" msgstr "建立、列出、刪除物件取代引用" -#: command-list.h:155 +#: command-list.h msgid "Generates a summary of pending changes" msgstr "生成待定更改的摘要" -#: command-list.h:156 +#: command-list.h msgid "Reuse recorded resolution of conflicted merges" msgstr "重用衝突合併的解決方案記錄" -#: command-list.h:157 +#: command-list.h msgid "Reset current HEAD to the specified state" msgstr "重設目前 HEAD 到指定狀態" -#: command-list.h:158 +#: command-list.h msgid "Restore working tree files" msgstr "復原工作區檔案" -#: command-list.h:159 +#: command-list.h msgid "Lists commit objects in reverse chronological order" msgstr "按時間順序列出提交物件" -#: command-list.h:160 +#: command-list.h msgid "Pick out and massage parameters" msgstr "選出並處理參數" -#: command-list.h:161 +#: command-list.h msgid "Revert some existing commits" msgstr "還原一些現存提交" -#: command-list.h:162 +#: command-list.h msgid "Remove files from the working tree and from the index" msgstr "從工作區和索引中刪除檔案" -#: command-list.h:163 +#: command-list.h msgid "Send a collection of patches as emails" msgstr "透過電子信件傳送一組修補檔" -#: command-list.h:164 +#: command-list.h msgid "Push objects over Git protocol to another repository" msgstr "使用 Git 協定推送物件到另一個版本庫" -#: command-list.h:165 +#: command-list.h msgid "Git's i18n setup code for shell scripts" msgstr "為 shell 腳本準備的 Git 國際化設定程式碼" -#: command-list.h:166 +#: command-list.h msgid "Common Git shell script setup code" msgstr "常用的 Git shell 腳本設定程式碼" -#: command-list.h:167 +#: command-list.h msgid "Restricted login shell for Git-only SSH access" msgstr "只允許 Git SSH 存取的受限登入shell" -#: command-list.h:168 +#: command-list.h msgid "Summarize 'git log' output" msgstr "'git log' 輸出摘要" -#: command-list.h:169 +#: command-list.h msgid "Show various types of objects" msgstr "顯示各種類型的物件" -#: command-list.h:170 +#: command-list.h msgid "Show branches and their commits" msgstr "顯示分支和提交" -#: command-list.h:171 +#: command-list.h msgid "Show packed archive index" msgstr "顯示打包歸檔索引" -#: command-list.h:172 +#: command-list.h msgid "List references in a local repository" msgstr "顯示本機版本庫中的引用" # 譯者：中文字串拼接，可刪除前導空格 -#: command-list.h:173 +#: command-list.h msgid "Reduce your working tree to a subset of tracked files" msgstr "將工作區限縮至只包含追蹤檔案的子集" -#: command-list.h:174 +#: command-list.h msgid "Add file contents to the staging area" msgstr "將檔案內容新增到索引" -#: command-list.h:175 +#: command-list.h msgid "Stash the changes in a dirty working directory away" msgstr "儲藏髒工作區中的修改" -#: command-list.h:176 +#: command-list.h msgid "Show the working tree status" msgstr "顯示工作區狀態" -#: command-list.h:177 +#: command-list.h msgid "Remove unnecessary whitespace" msgstr "刪除不必要的空白字元" -#: command-list.h:178 +#: command-list.h msgid "Initialize, update or inspect submodules" msgstr "初始化、更新或檢查子模組" -#: command-list.h:179 +#: command-list.h msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subversion 版本庫和 Git 之間的雙向動作" -#: command-list.h:180 +#: command-list.h msgid "Switch branches" msgstr "切換分支" -#: command-list.h:181 +#: command-list.h msgid "Read, modify and delete symbolic refs" msgstr "讀取、修改和刪除符號引用" -#: command-list.h:182 +#: command-list.h msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件" -#: command-list.h:183 +#: command-list.h msgid "Creates a temporary file with a blob's contents" msgstr "用資料物件的內容建立暫存檔" -#: command-list.h:184 +#: command-list.h msgid "Unpack objects from a packed archive" msgstr "從打包檔案中解壓縮物件" -#: command-list.h:185 +#: command-list.h msgid "Register file contents in the working tree to the index" msgstr "將工作區的檔案內容註冊到索引" -#: command-list.h:186 +#: command-list.h msgid "Update the object name stored in a ref safely" msgstr "安全地更新儲存於引用中的物件名稱" -#: command-list.h:187 +#: command-list.h msgid "Update auxiliary info file to help dumb servers" msgstr "更新輔助訊息檔案以協助啞協定服務" -#: command-list.h:188 +#: command-list.h msgid "Send archive back to git-archive" msgstr "將存檔傳送回 git-archive" -#: command-list.h:189 +#: command-list.h msgid "Send objects packed back to git-fetch-pack" msgstr "將物件壓縮包傳送回 git-fetch-pack" -#: command-list.h:190 +#: command-list.h msgid "Show a Git logical variable" msgstr "顯示 Git 邏輯變數" -#: command-list.h:191 +#: command-list.h msgid "Check the GPG signature of commits" msgstr "檢查 GPG 提交簽名" -#: command-list.h:192 +#: command-list.h msgid "Validate packed Git archive files" msgstr "驗證打包的 Git 封存檔案" -#: command-list.h:193 +#: command-list.h msgid "Check the GPG signature of tags" msgstr "檢查標籤的 GPG 簽名" -#: command-list.h:194 +#: command-list.h msgid "Show logs with difference each commit introduces" msgstr "顯示每一個提交引入的差異日誌" -#: command-list.h:195 +#: command-list.h msgid "Manage multiple working trees" msgstr "管理多個工作區" -#: command-list.h:196 +#: command-list.h msgid "Create a tree object from the current index" msgstr "從目前索引建立一個樹狀物件" -#: command-list.h:197 +#: command-list.h msgid "Defining attributes per path" msgstr "定義路徑的屬性" -#: command-list.h:198 +#: command-list.h msgid "Git command-line interface and conventions" msgstr "Git 指令列介面和約定" -#: command-list.h:199 +#: command-list.h msgid "A Git core tutorial for developers" msgstr "面向開發人員的 Git 核心教學" -#: command-list.h:200 +#: command-list.h msgid "Providing usernames and passwords to Git" msgstr "將使用者名稱及密碼提供給 Git" -#: command-list.h:201 +#: command-list.h msgid "Git for CVS users" msgstr "適合 CVS 使用者的 Git 協助" -#: command-list.h:202 +#: command-list.h msgid "Tweaking diff output" msgstr "調整差異輸出" -#: command-list.h:203 +#: command-list.h msgid "A useful minimum set of commands for Everyday Git" msgstr "每一天 Git 的一組有用的最小指令集合" -#: command-list.h:204 +#: command-list.h msgid "Frequently asked questions about using Git" msgstr "Git 使用的常見問題" -#: command-list.h:205 +#: command-list.h msgid "A Git Glossary" msgstr "Git 詞彙表" -#: command-list.h:206 +#: command-list.h msgid "Hooks used by Git" msgstr "Git 使用的掛鉤" -#: command-list.h:207 +#: command-list.h msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未追蹤檔案" -#: command-list.h:208 +#: command-list.h msgid "The Git repository browser" msgstr "Git 版本庫瀏覽器" -#: command-list.h:209 +#: command-list.h msgid "Map author/committer names and/or E-Mail addresses" msgstr "映射作者或提交者的名稱和（或）電子信箱地址" -#: command-list.h:210 +#: command-list.h msgid "Defining submodule properties" msgstr "定義子模組屬性" -#: command-list.h:211 +#: command-list.h msgid "Git namespaces" msgstr "Git 名字空間" -#: command-list.h:212 +#: command-list.h msgid "Helper programs to interact with remote repositories" msgstr "用來與遠端版本庫互動的協助工具" -#: command-list.h:213 +#: command-list.h msgid "Git Repository Layout" msgstr "Git 版本庫配置" -#: command-list.h:214 +#: command-list.h msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本範圍" -#: command-list.h:215 +#: command-list.h msgid "Mounting one repository inside another" msgstr "在某個版本庫掛載某個版本庫" -#: command-list.h:216 +#: command-list.h msgid "A tutorial introduction to Git" msgstr "一個 Git 教學" -#: command-list.h:217 +#: command-list.h msgid "A tutorial introduction to Git: part two" msgstr "一個 Git 教學：第二部分" -#: command-list.h:218 +#: command-list.h msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web 介面（Git 版本庫的 web 前端）" -#: command-list.h:219 +#: command-list.h msgid "An overview of recommended workflows with Git" msgstr "Git 推薦的工作流概覽" -#: git-merge-octopus.sh:46 +#: commit-graph.c +msgid "commit-graph file is too small" +msgstr "提交圖形檔案太小" + +#: commit-graph.c +#, c-format +msgid "commit-graph signature %X does not match signature %X" +msgstr "提交圖形簽名 %X 和簽名 %X 不符合" + +#: commit-graph.c +#, c-format +msgid "commit-graph version %X does not match version %X" +msgstr "提交圖形版本 %X 和版本 %X 不符合" + +#: commit-graph.c +#, c-format +msgid "commit-graph hash version %X does not match version %X" +msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合" + +#: commit-graph.c +#, c-format +msgid "commit-graph file is too small to hold %u chunks" +msgstr "commit-graph 檔案不夠放置 %u 個區塊" + +#: commit-graph.c +msgid "commit-graph has no base graphs chunk" +msgstr "提交圖形沒有基礎圖形區塊" + +#: commit-graph.c +msgid "commit-graph chain does not match" +msgstr "提交圖形鏈不符合" + +#: commit-graph.c +#, c-format +msgid "invalid commit-graph chain: line '%s' not a hash" +msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值" + +#: commit-graph.c +msgid "unable to find all commit-graph files" +msgstr "無法找到所有提交圖形檔案" + +#: commit-graph.c +msgid "invalid commit position. commit-graph is likely corrupt" +msgstr "無效的提交位置。提交圖形可能已損壞" + +#: commit-graph.c +#, c-format +msgid "could not find commit %s" +msgstr "無法找到提交 %s" + +#: commit-graph.c +msgid "commit-graph requires overflow generation data but has none" +msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料" + +#: commit-graph.c +msgid "Loading known commits in commit graph" +msgstr "正在載入提交圖中的已知提交" + +#: commit-graph.c +msgid "Expanding reachable commits in commit graph" +msgstr "正在展開提交圖中的可以取得的提交" + +#: commit-graph.c +msgid "Clearing commit marks in commit graph" +msgstr "正在清除提交圖中的提交標記" + +#: commit-graph.c +msgid "Computing commit graph topological levels" +msgstr "正在計算提交圖拓樸級別" + +#: commit-graph.c +msgid "Computing commit graph generation numbers" +msgstr "正在計算提交圖世代數字" + +#: commit-graph.c +msgid "Computing commit changed paths Bloom filters" +msgstr "正在計算提交變更路徑的布隆過濾器" + +#: commit-graph.c +msgid "Collecting referenced commits" +msgstr "正在收集引用提交" + +#: commit-graph.c +#, c-format +msgid "Finding commits for commit graph in %<PRIuMAX> pack" +msgid_plural "Finding commits for commit graph in %<PRIuMAX> packs" +msgstr[0] "正在從 %<PRIuMAX> 個包中尋找提交圖的提交" + +#: commit-graph.c +#, c-format +msgid "error adding pack %s" +msgstr "新增包 %s 發生錯誤" + +#: commit-graph.c +#, c-format +msgid "error opening index for %s" +msgstr "為 %s 開啟索引發生錯誤" + +#: commit-graph.c +msgid "Finding commits for commit graph among packed objects" +msgstr "正在打包物件中尋找提交圖的提交" + +#: commit-graph.c +msgid "Finding extra edges in commit graph" +msgstr "正在尋找提交圖中額外的邊" + +#: commit-graph.c +msgid "failed to write correct number of base graph ids" +msgstr "無法寫入正確數量的基礎圖形 ID" + +#: commit-graph.c +msgid "unable to create temporary graph layer" +msgstr "無法建立暫時的圖形層" + +#: commit-graph.c +#, c-format +msgid "unable to adjust shared permissions for '%s'" +msgstr "無法調整「%s」的共用權限" + +#: commit-graph.c +#, c-format +msgid "Writing out commit graph in %d pass" +msgid_plural "Writing out commit graph in %d passes" +msgstr[0] "正在用 %d 步寫出提交圖" + +#: commit-graph.c +msgid "unable to open commit-graph chain file" +msgstr "無法開啟提交圖形鏈檔案" + +#: commit-graph.c +msgid "failed to rename base commit-graph file" +msgstr "無法重新命名基礎提交圖形檔案" + +#: commit-graph.c +msgid "failed to rename temporary commit-graph file" +msgstr "無法重新命名暫時提交圖形檔案" + +#: commit-graph.c +msgid "Scanning merged commits" +msgstr "正在掃描合併提交" + +#: commit-graph.c +msgid "Merging commit-graph" +msgstr "正在合併提交圖形" + +#: commit-graph.c +msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" +msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用" + +#: commit-graph.c +msgid "too many commits to write graph" +msgstr "提交太多不能畫圖" + +#: commit-graph.c +msgid "the commit-graph file has incorrect checksum and is likely corrupt" +msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞" + +#: commit-graph.c +#, c-format +msgid "commit-graph has incorrect OID order: %s then %s" +msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s" + +#: commit-graph.c +#, c-format +msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" +msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u" + +#: commit-graph.c +#, c-format +msgid "failed to parse commit %s from commit-graph" +msgstr "無法從提交圖形中解析提交 %s" + +#: commit-graph.c +msgid "Verifying commits in commit graph" +msgstr "正在驗證提交圖中的提交" + +#: commit-graph.c +#, c-format +msgid "failed to parse commit %s from object database for commit-graph" +msgstr "無法從提交圖形的物件庫中解析提交 %s" + +#: commit-graph.c +#, c-format +msgid "root tree OID for commit %s in commit-graph is %s != %s" +msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s" + +#: commit-graph.c +#, c-format +msgid "commit-graph parent list for commit %s is too long" +msgstr "提交 %s 的提交圖形父提交列表太長了" + +#: commit-graph.c +#, c-format +msgid "commit-graph parent for %s is %s != %s" +msgstr "%s 的提交圖形父提交是 %s != %s" + +#: commit-graph.c +#, c-format +msgid "commit-graph parent list for commit %s terminates early" +msgstr "提交 %s 的提交圖形父提交列表過早終止" + +#: commit-graph.c +#, c-format +msgid "" +"commit-graph has generation number zero for commit %s, but non-zero elsewhere" +msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零" + +#: commit-graph.c +#, c-format +msgid "" +"commit-graph has non-zero generation number for commit %s, but zero elsewhere" +msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零" + +#: commit-graph.c +#, c-format +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代" + +#: commit-graph.c +#, c-format +msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" +msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>" + +#: commit.c +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s 不是一個提交！" + +#: commit.c +msgid "" +"Support for <GIT_DIR>/info/grafts is deprecated\n" +"and will be removed in a future Git version.\n" +"\n" +"Please use \"git replace --convert-graft-file\"\n" +"to convert the grafts into replace refs.\n" +"\n" +"Turn this message off by running\n" +"\"git config advice.graftFileDeprecated false\"" +msgstr "" +"對 <GIT_DIR>/info/grafts 的支援已被棄用，並將在\n" +"未來的Git版本中被移除。\n" +"\n" +"請使用 \"git replace --convert-graft-file\" 將\n" +"grafts 轉換為取代引用。\n" +"\n" +"設定 \"git config advice.graftFileDeprecated false\"\n" +"可關閉本消息" + +#: commit.c +#, c-format +msgid "Commit %s has an untrusted GPG signature, allegedly by %s." +msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。" + +#: commit.c +#, c-format +msgid "Commit %s has a bad GPG signature allegedly by %s." +msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。" + +#: commit.c +#, c-format +msgid "Commit %s does not have a GPG signature." +msgstr "提交 %s 沒有 GPG 簽名。" + +#: commit.c +#, c-format +msgid "Commit %s has a good GPG signature by %s\n" +msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n" + +#: commit.c +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" +"variable i18n.commitEncoding to the encoding your project uses.\n" +msgstr "" +"警告：提交說明不符合 UTF-8。\n" +"您能會想在修正訊息後修補提交，或者是將組態變數 i18n.commitencoding\n" +"設為您專案使用的的編碼方式。\n" + +#: compat/compiler.h +msgid "no compiler information available\n" +msgstr "沒有可用的編譯器資訊\n" + +#: compat/compiler.h +msgid "no libc information available\n" +msgstr "沒有可用的 libc 資訊\n" + +#: compat/fsmonitor/fsm-health-win32.c +#, c-format +msgid "[GLE %ld] health thread could not open '%ls'" +msgstr "[GLE %ld] 健康監聽執行緒無法開啟 “%ls”" + +#: compat/fsmonitor/fsm-health-win32.c +#, c-format +msgid "[GLE %ld] health thread getting BHFI for '%ls'" +msgstr "[GLE %ld] 健康監聽執行緒取得 “%ls” 的 BHFI" + +#: compat/fsmonitor/fsm-health-win32.c compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "could not convert to wide characters: '%s'" +msgstr "無法轉換至較寬字元：“%s”" + +#: compat/fsmonitor/fsm-health-win32.c +#, c-format +msgid "BHFI changed '%ls'" +msgstr "BHFI 更改了 “%ls”" + +#: compat/fsmonitor/fsm-health-win32.c +#, c-format +msgid "unhandled case in 'has_worktree_moved': %d" +msgstr "“has_worktree_moved” 中有未處置的情況：%d" + +#: compat/fsmonitor/fsm-health-win32.c +#, c-format +msgid "health thread wait failed [GLE %ld]" +msgstr "健康監聽執行緒等待失敗 [GLE %ld]" + +#: compat/fsmonitor/fsm-listen-darwin.c +msgid "Unable to create FSEventStream." +msgstr "無法建立 FSEventStream。" + +#: compat/fsmonitor/fsm-listen-darwin.c +msgid "Failed to start the FSEventStream" +msgstr "無法啟動 FSEventStream" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "[GLE %ld] could not convert path to UTF-8: '%.*ls'" +msgstr "[GLE %ld] 無法將路徑轉換為 UTF-8：「%.*ls」" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "[GLE %ld] could not watch '%s'" +msgstr "[GLE %ld] 無法監聽 “%s”" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "[GLE %ld] could not get longname of '%s'" +msgstr "[GLE %ld] 無法取得 “%s” 的 longname" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "ReadDirectoryChangedW failed on '%s' [GLE %ld]" +msgstr "在 “%s” 上呼叫 ReadDirectoryChangedW 失敗 [GLE %ld]" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "GetOverlappedResult failed on '%s' [GLE %ld]" +msgstr "在 “%s” 上呼叫 GetOverlappedResult 失敗 [GLE %ld]" + +#: compat/fsmonitor/fsm-listen-win32.c +#, c-format +msgid "could not read directory changes [GLE %ld]" +msgstr "無法讀取目錄變化 [GLE %ld]" + +#: compat/mingw.c +#, c-format +msgid "failed to copy SID (%ld)" +msgstr "無法複製 SID (%ld)" + +#: compat/mingw.c +#, c-format +msgid "failed to get owner for '%s' (%ld)" +msgstr "無法取得 “%s” 的所有者 (%ld)" + +#: compat/obstack.c +msgid "memory exhausted" +msgstr "記憶體耗盡" + +#: compat/regex/regcomp.c +msgid "Success" +msgstr "成功" + +#: compat/regex/regcomp.c +msgid "No match" +msgstr "無符合" + +#: compat/regex/regcomp.c +msgid "Invalid regular expression" +msgstr "無效的常規表示式" + +#: compat/regex/regcomp.c +msgid "Invalid collation character" +msgstr "無效的定序字元" + +#: compat/regex/regcomp.c +msgid "Invalid character class name" +msgstr "字元類別名稱無效" + +#: compat/regex/regcomp.c +msgid "Trailing backslash" +msgstr "結尾反斜線" + +#: compat/regex/regcomp.c +msgid "Invalid back reference" +msgstr "反向引用無效" + +#: compat/regex/regcomp.c +msgid "Unmatched [ or [^" +msgstr "沒有對應的 [ 或 [^" + +#: compat/regex/regcomp.c +msgid "Unmatched ( or \\(" +msgstr "沒有對應的 ( 或 \\(" + +#: compat/regex/regcomp.c +msgid "Unmatched \\{" +msgstr "沒有對應的 \\{" + +#: compat/regex/regcomp.c +msgid "Invalid content of \\{\\}" +msgstr "\\{\\} 的內容無效" + +#: compat/regex/regcomp.c +msgid "Invalid range end" +msgstr "範圍結尾無效" + +#: compat/regex/regcomp.c +msgid "Memory exhausted" +msgstr "記憶體耗盡" + +#: compat/regex/regcomp.c +msgid "Invalid preceding regular expression" +msgstr "無效的前置常規表示式" + +#: compat/regex/regcomp.c +msgid "Premature end of regular expression" +msgstr "常規表示式太早結束" + +#: compat/regex/regcomp.c +msgid "Regular expression too big" +msgstr "常規表示式太長" + +#: compat/regex/regcomp.c +msgid "Unmatched ) or \\)" +msgstr "沒有對應的 ) 或 \\)" + +#: compat/regex/regcomp.c +msgid "No previous regular expression" +msgstr "沒有先前的常規表示式" + +#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c +msgid "could not send IPC command" +msgstr "無法傳送 IPC 命令" + +#: compat/simple-ipc/ipc-unix-socket.c compat/simple-ipc/ipc-win32.c +msgid "could not read IPC response" +msgstr "無法讀取 IPC 回應" + +#: compat/simple-ipc/ipc-unix-socket.c +#, c-format +msgid "could not start accept_thread '%s'" +msgstr "無法啟動 accept_thread “%s”" + +#: compat/simple-ipc/ipc-unix-socket.c +#, c-format +msgid "could not start worker[0] for '%s'" +msgstr "無法啟動「%s」的 worker[0]" + +#: compat/simple-ipc/ipc-win32.c +#, c-format +msgid "ConnectNamedPipe failed for '%s' (%lu)" +msgstr "對 “%s” 進行 ConnectNamedPipe 失敗 (%lu)" + +#: compat/simple-ipc/ipc-win32.c +#, c-format +msgid "could not create fd from pipe for '%s'" +msgstr "無法為 “%s” 從管道建立 fd" + +#: compat/simple-ipc/ipc-win32.c +#, c-format +msgid "could not start thread[0] for '%s'" +msgstr "無法為 “%s” 啟動 thread[0]" + +#: compat/simple-ipc/ipc-win32.c +#, c-format +msgid "wait for hEvent failed for '%s'" +msgstr "等待 “%s” 的 hEvent 失敗" + +#: compat/terminal.c +msgid "cannot resume in the background, please use 'fg' to resume" +msgstr "無法在背景繼續；請使用 “fg” 繼續" + +#: compat/terminal.c +msgid "cannot restore terminal settings" +msgstr "無法復原終端機設定" + +#: config.c +#, c-format +msgid "" +"exceeded maximum include depth (%d) while including\n" +"\t%s\n" +"from\n" +"\t%s\n" +"This might be due to circular includes." +msgstr "" +"超過了最大包含深度（%1$d），當從\n" +"\t%3$s\n" +"包含\n" +"\t%2$s\n" +"這可能是因為循環包含。" + +#: config.c +#, c-format +msgid "could not expand include path '%s'" +msgstr "無法展開包含路徑 '%s'" + +#: config.c +msgid "relative config includes must come from files" +msgstr "相對路徑的設定檔案引用必須來自於檔案" + +#: config.c +msgid "relative config include conditionals must come from files" +msgstr "相對路徑的設定檔案條件引用必須來自於檔案" + +#: config.c +msgid "" +"remote URLs cannot be configured in file directly or indirectly included by " +"includeIf.hasconfig:remote.*.url" +msgstr "" +"無法在檔案設定遠端 URL，無論是直接或間接透過 includeIf.hasconfig:remote.*." +"url 引入" + +#: config.c +#, c-format +msgid "invalid config format: %s" +msgstr "無效的設定檔格式：%s" + +#: config.c +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "缺少「%.*s」組態設定的環境變數名稱" + +#: config.c +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "缺少環境變數「%s」（於「%.*s」組態設定）" + +#: config.c +#, c-format +msgid "key does not contain a section: %s" +msgstr "鍵名沒有包含一個小節名稱：%s" + +#: config.c +#, c-format +msgid "key does not contain variable name: %s" +msgstr "鍵名沒有包含變數名：%s" + +#: config.c sequencer.c +#, c-format +msgid "invalid key: %s" +msgstr "無效鍵名：%s" + +#: config.c +#, c-format +msgid "invalid key (newline): %s" +msgstr "無效鍵名（有換行符號）：%s" + +#: config.c +msgid "empty config key" +msgstr "空白設定鍵" + +#: config.c +#, c-format +msgid "bogus config parameter: %s" +msgstr "偽設定參數：%s" + +#: config.c +#, c-format +msgid "bogus format in %s" +msgstr "%s 中格式錯誤" + +#: config.c +#, c-format +msgid "bogus count in %s" +msgstr "%s 中有偽計數" + +#: config.c +#, c-format +msgid "too many entries in %s" +msgstr "%s 中的項目過多" + +#: config.c +#, c-format +msgid "missing config key %s" +msgstr "缺少 %s 設定鍵" + +#: config.c +#, c-format +msgid "missing config value %s" +msgstr "缺少 %s 設定值" + +#: config.c +#, c-format +msgid "bad config line %d in blob %s" +msgstr "資料物件 %2$s 中錯誤的設定行 %1$d" + +#: config.c +#, c-format +msgid "bad config line %d in file %s" +msgstr "檔案 %2$s 中錯誤的設定行 %1$d" + +#: config.c +#, c-format +msgid "bad config line %d in standard input" +msgstr "標準輸入中錯誤的設定行 %d" + +#: config.c +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d" + +#: config.c +#, c-format +msgid "bad config line %d in command line %s" +msgstr "指令列 %2$s 中錯誤的設定行 %1$d" + +#: config.c +#, c-format +msgid "bad config line %d in %s" +msgstr "在 %2$s 中錯誤的設定行 %1$d" + +#: config.c +msgid "out of range" +msgstr "超出範圍" + +#: config.c +msgid "invalid unit" +msgstr "無效的單位" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "資料物件 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "檔案 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "標準輸入中設定變數 '%2$s' 錯誤的取值 '%1$s'：%3$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "子模組資料 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "指令列 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" + +#: config.c +#, c-format +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "在 %3$s 中設定變數 '%2$s' 錯誤的取值 '%1$s'：%4$s" + +#: config.c +#, c-format +msgid "invalid value for variable %s" +msgstr "%s 變數的值無效" + +#: config.c +#, c-format +msgid "ignoring unknown core.fsync component '%s'" +msgstr "忽略未知的 core.fsync 組件「%s」" + +#: config.c +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "「%2$s」的「%1$s」布林設定值無效" + +#: config.c +#, c-format +msgid "failed to expand user dir in: '%s'" +msgstr "無法展開使用者目錄於：’%s’" + +#: config.c +#, c-format +msgid "'%s' for '%s' is not a valid timestamp" +msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳" + +#: config.c +#, c-format +msgid "abbrev length out of range: %d" +msgstr "縮寫長度超出範圍：%d" + +#: config.c +#, c-format +msgid "bad zlib compression level %d" +msgstr "錯誤的 zlib 壓縮級別 %d" + +#: config.c +msgid "core.commentChar should only be one character" +msgstr "core.commentChar 應該是一個字元" + +#: config.c +#, c-format +msgid "ignoring unknown core.fsyncMethod value '%s'" +msgstr "忽略未知的 core.fsyncMethod 值「%s」" + +#: config.c +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead" +msgstr "core.fsyncObjectFiles 已被取代。請改用 core.fsync" + +#: config.c +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "無效的物件建立模式：%s" + +#: config.c +#, c-format +msgid "malformed value for %s" +msgstr "%s 的取值格式錯誤" + +#: config.c +#, c-format +msgid "malformed value for %s: %s" +msgstr "%s 的取值格式錯誤：%s" + +#: config.c +msgid "must be one of nothing, matching, simple, upstream or current" +msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current" + +#: config.c +#, c-format +msgid "unable to load config blob object '%s'" +msgstr "無法從資料物件 '%s' 載入設定" + +#: config.c +#, c-format +msgid "reference '%s' does not point to a blob" +msgstr "引用 '%s' 沒有指向一個資料物件" + +#: config.c +#, c-format +msgid "unable to resolve config blob '%s'" +msgstr "不能解析設定物件 '%s'" + +#: config.c +#, c-format +msgid "failed to parse %s" +msgstr "解析 %s 失敗" + +#: config.c +msgid "unable to parse command-line config" +msgstr "無法解析指令列中的設定" + +#: config.c +msgid "unknown error occurred while reading the configuration files" +msgstr "在讀取設定檔案時遇到未知錯誤" + +#: config.c +#, c-format +msgid "Invalid %s: '%s'" +msgstr "無效 %s：'%s'" + +#: config.c +#, c-format +msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" +msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間" + +#: config.c +#, c-format +msgid "unable to parse '%s' from command-line config" +msgstr "無法解析指令列設定中的 '%s'" + +#: config.c +#, c-format +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'" + +#: config.c +#, c-format +msgid "invalid section name '%s'" +msgstr "無效的小節名稱 '%s'" + +#: config.c +#, c-format +msgid "%s has multiple values" +msgstr "%s 有多個取值" + +#: config.c +#, c-format +msgid "failed to write new configuration file %s" +msgstr "寫入新的設定檔案 %s 失敗" + +#: config.c +#, c-format +msgid "could not lock config file %s" +msgstr "不能鎖定設定檔案 %s" + +#: config.c +#, c-format +msgid "opening %s" +msgstr "開啟 %s" + +#: config.c +#, c-format +msgid "invalid config file %s" +msgstr "無效的設定檔案 %s" + +#: config.c +#, c-format +msgid "fstat on %s failed" +msgstr "對 %s 呼叫 fstat 失敗" + +#: config.c +#, c-format +msgid "unable to mmap '%s'%s" +msgstr "無法 mmap '%s'%s" + +#: config.c +#, c-format +msgid "chmod on %s failed" +msgstr "對 %s 呼叫 chmod 失敗" + +#: config.c +#, c-format +msgid "could not write config file %s" +msgstr "不能寫入設定檔案 %s" + +#: config.c +#, c-format +msgid "could not set '%s' to '%s'" +msgstr "不能設定 '%s' 為 '%s'" + +#: config.c +#, c-format +msgid "invalid section name: %s" +msgstr "無效的小節名稱：%s" + +#: config.c +#, c-format +msgid "missing value for '%s'" +msgstr "%s 的取值缺少" + +#: connect.c +msgid "the remote end hung up upon initial contact" +msgstr "遠端在初始連線時即掛斷" + +#: connect.c +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"無法讀取遠端版本庫。\n" +"\n" +"請確認您有正確的存取權限並且版本庫存在。" + +#: connect.c +#, c-format +msgid "server doesn't support '%s'" +msgstr "伺服器不支援 '%s'" + +#: connect.c +#, c-format +msgid "server doesn't support feature '%s'" +msgstr "伺服器不支援特性 '%s'" + +#: connect.c +msgid "expected flush after capabilities" +msgstr "在能力之後應為一個 flush 包" + +#: connect.c +#, c-format +msgid "ignoring capabilities after first line '%s'" +msgstr "忽略第一行 '%s' 之後的能力欄位" + +#: connect.c +msgid "protocol error: unexpected capabilities^{}" +msgstr "協定錯誤：意外的 capabilities^{}" + +#: connect.c +#, c-format +msgid "protocol error: expected shallow sha-1, got '%s'" +msgstr "協定錯誤：預期淺複製 sha-1，卻得到 '%s'" + +#: connect.c +msgid "repository on the other end cannot be shallow" +msgstr "另一端的版本庫不能是淺複製版本庫" + +#: connect.c +msgid "invalid packet" +msgstr "無效封包" + +#: connect.c +#, c-format +msgid "protocol error: unexpected '%s'" +msgstr "協定錯誤：意外的 '%s'" + +#: connect.c +#, c-format +msgid "unknown object format '%s' specified by server" +msgstr "伺服器指定的「%s」物件格式無效" + +#: connect.c +#, c-format +msgid "invalid ls-refs response: %s" +msgstr "無效的 ls-refs 回應：%s" + +#: connect.c +msgid "expected flush after ref listing" +msgstr "在引用列表之後應該有一個 flush 包" + +#: connect.c +msgid "expected response end packet after ref listing" +msgstr "在引用列表後預期要有回應結束封包" + +#: connect.c +#, c-format +msgid "protocol '%s' is not supported" +msgstr "不支援 '%s' 協定" + +#: connect.c +msgid "unable to set SO_KEEPALIVE on socket" +msgstr "無法為 socket 設定 SO_KEEPALIVE" + +#: connect.c +#, c-format +msgid "Looking up %s ... " +msgstr "尋找 %s ... " + +#: connect.c +#, c-format +msgid "unable to look up %s (port %s) (%s)" +msgstr "無法尋找 %s（埠 %s）（%s）" + +#. TRANSLATORS: this is the end of "Looking up %s ... " +#: connect.c +#, c-format +msgid "" +"done.\n" +"Connecting to %s (port %s) ... " +msgstr "" +"完成。\n" +"連線到 %s（埠 %s）... " + +#: connect.c +#, c-format +msgid "" +"unable to connect to %s:\n" +"%s" +msgstr "" +"無法連線到 %s：\n" +"%s" + +#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " +#: connect.c +msgid "done." +msgstr "完成。" + +#: connect.c +#, c-format +msgid "unable to look up %s (%s)" +msgstr "無法尋找 %s（%s）" + +#: connect.c +#, c-format +msgid "unknown port %s" +msgstr "未知埠 %s" + +#: connect.c +#, c-format +msgid "strange hostname '%s' blocked" +msgstr "已阻止奇怪的主機名稱 '%s'" + +#: connect.c +#, c-format +msgid "strange port '%s' blocked" +msgstr "已阻止奇怪的埠號 '%s'" + +#: connect.c +#, c-format +msgid "cannot start proxy %s" +msgstr "不能啟動代理 %s" + +#: connect.c +msgid "no path specified; see 'git help pull' for valid url syntax" +msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法" + +#: connect.c +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "git:// 主機名稱和版本庫路徑中不能有換行" + +#: connect.c +msgid "ssh variant 'simple' does not support -4" +msgstr "ssh 變體 'simple' 不支援 -4" + +#: connect.c +msgid "ssh variant 'simple' does not support -6" +msgstr "ssh 變體 'simple' 不支援 -6" + +#: connect.c +msgid "ssh variant 'simple' does not support setting port" +msgstr "ssh 變體 'simple' 不支援設定埠" + +#: connect.c +#, c-format +msgid "strange pathname '%s' blocked" +msgstr "已阻止奇怪的路徑名 '%s'" + +#: connect.c +msgid "unable to fork" +msgstr "無法 fork" + +#: connected.c +msgid "Could not run 'git rev-list'" +msgstr "不能執行 'git rev-list'" + +#: connected.c +msgid "failed write to rev-list" +msgstr "寫入 rev-list 失敗" + +#: connected.c +msgid "failed to close rev-list's stdin" +msgstr "關閉 rev-list 的標準輸入失敗" + +#: contrib/scalar/scalar.c worktree.c +#, c-format +msgid "'%s' does not exist" +msgstr "'%s' 不存在" + +#: contrib/scalar/scalar.c +msgid "need a working directory" +msgstr "需要工作目錄" + +#: contrib/scalar/scalar.c +msgid "could not find enlistment root" +msgstr "找不到編列名單的根目錄" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not switch to '%s'" +msgstr "無法切換至「%s」" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not configure %s=%s" +msgstr "無法設定 %s=%s" + +#: contrib/scalar/scalar.c +msgid "could not configure log.excludeDecoration" +msgstr "無法設定 log.excludeDecoration" + +#: contrib/scalar/scalar.c +msgid "Scalar enlistments require a worktree" +msgstr "純量編列名單需要工作目錄" + +#: contrib/scalar/scalar.c dir.c +#, c-format +msgid "could not open directory '%s'" +msgstr "不能開啟目錄 '%s'" + +#: contrib/scalar/scalar.c +#, c-format +msgid "skipping '%s', which is neither file nor directory" +msgstr "略過 “%s”，其非檔案或目錄" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not determine free disk size for '%s'" +msgstr "無法判斷 “%s” 的剩餘磁碟大小" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not get info for '%s'" +msgstr "無法取得 “%s” 的資訊" + +#: contrib/scalar/scalar.c +#, c-format +msgid "remote HEAD is not a branch: '%.*s'" +msgstr "遠端 HEAD 不是分支：「%.*s」" + +#: contrib/scalar/scalar.c +msgid "failed to get default branch name from remote; using local default" +msgstr "無法從遠端取得預設分支名稱。改用本機預設名稱" + +#: contrib/scalar/scalar.c +msgid "failed to get default branch name" +msgstr "無法取得預設分支名稱" + +#: contrib/scalar/scalar.c +msgid "failed to unregister repository" +msgstr "無法取消註冊版本庫" + +#: contrib/scalar/scalar.c +msgid "failed to delete enlistment directory" +msgstr "無法刪除編列名單目錄" + +#: contrib/scalar/scalar.c +msgid "branch to checkout after clone" +msgstr "複製後要簽出的分支" + +#: contrib/scalar/scalar.c +msgid "when cloning, create full working directory" +msgstr "複製時建立完整的工作目錄" + +#: contrib/scalar/scalar.c +msgid "only download metadata for the branch that will be checked out" +msgstr "只下載會簽出的分支中介資料" + +#: contrib/scalar/scalar.c +msgid "scalar clone [<options>] [--] <repo> [<dir>]" +msgstr "scalar clone [<options>] [--] <repo> [<dir>]" + +#: contrib/scalar/scalar.c +#, c-format +msgid "cannot deduce worktree name from '%s'" +msgstr "無法從「%s」推論工作區名稱" + +#: contrib/scalar/scalar.c +#, c-format +msgid "directory '%s' exists already" +msgstr "「%s」目錄已經存在" + +#: contrib/scalar/scalar.c +#, c-format +msgid "failed to get default branch for '%s'" +msgstr "無法取得「%s」的預設分支" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not configure remote in '%s'" +msgstr "無法設定「%s」中的遠端" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not configure '%s'" +msgstr "無法設定「%s」" + +#: contrib/scalar/scalar.c +msgid "partial clone failed; attempting full clone" +msgstr "部分複製失敗。嘗試完整複製" + +#: contrib/scalar/scalar.c +msgid "could not configure for full clone" +msgstr "無法設定完整複製" + +#: contrib/scalar/scalar.c +msgid "scalar diagnose [<enlistment>]" +msgstr "scalar diagnose [<enlistment>]" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not create directory for '%s'" +msgstr "無法建立 “%s” 的目錄" + +#: contrib/scalar/scalar.c +msgid "could not duplicate stdout" +msgstr "無法複製 stdout" + +#: contrib/scalar/scalar.c +msgid "failed to write archive" +msgstr "無法寫入封存" + +#: contrib/scalar/scalar.c +msgid "`scalar list` does not take arguments" +msgstr "`scalar list` 未取引數" + +#: contrib/scalar/scalar.c +msgid "scalar register [<enlistment>]" +msgstr "scalar register [<enlistment>]" + +#: contrib/scalar/scalar.c +msgid "reconfigure all registered enlistments" +msgstr "重新設定所有註冊的編列名單" + +#: contrib/scalar/scalar.c +msgid "scalar reconfigure [--all | <enlistment>]" +msgstr "scalar reconfigure [--all | <enlistment>]" + +#: contrib/scalar/scalar.c +msgid "--all or <enlistment>, but not both" +msgstr "--all 或 <enlistment> 但不能傳入兩者" + +#: contrib/scalar/scalar.c +#, c-format +msgid "git repository gone in '%s'" +msgstr "git 版本庫在「%s」遺失" + +#: contrib/scalar/scalar.c +msgid "" +"scalar run <task> [<enlistment>]\n" +"Tasks:\n" +msgstr "" +"scalar run <task> [<enlistment>]\n" +"作業：\n" + +#: contrib/scalar/scalar.c +#, c-format +msgid "no such task: '%s'" +msgstr "無此作業：「%s」" + +#: contrib/scalar/scalar.c +msgid "scalar unregister [<enlistment>]" +msgstr "scalar unregister [<enlistment>]" + +#: contrib/scalar/scalar.c +msgid "scalar delete <enlistment>" +msgstr "scalar delete <enlistment>" + +#: contrib/scalar/scalar.c +msgid "refusing to delete current working directory" +msgstr "拒絕刪除目前工作目錄" + +#: contrib/scalar/scalar.c +msgid "include Git version" +msgstr "包含 Git 版本" + +#: contrib/scalar/scalar.c +msgid "include Git's build options" +msgstr "包含 Git 組建選項" + +#: contrib/scalar/scalar.c +msgid "scalar verbose [-v | --verbose] [--build-options]" +msgstr "scalar verbose [-v | --verbose] [--build-options]" + +#: contrib/scalar/scalar.c +msgid "-C requires a <directory>" +msgstr "-C 需要 <directory>" + +#: contrib/scalar/scalar.c +#, c-format +msgid "could not change to '%s'" +msgstr "無法更改為「%s」" + +#: contrib/scalar/scalar.c +msgid "-c requires a <key>=<value> argument" +msgstr "-c 需要 <key>=<value> 引數" + +#: contrib/scalar/scalar.c +msgid "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"Commands:\n" +msgstr "" +"scalar [-C <directory>] [-c <key>=<value>] <command> [<options>]\n" +"\n" +"命令：\n" + +#: convert.c +#, c-format +msgid "illegal crlf_action %d" +msgstr "非法的 crlf_action %d" + +#: convert.c +#, c-format +msgid "CRLF would be replaced by LF in %s" +msgstr "%s 中的 CRLF 將被 LF 取代" + +#: convert.c +#, c-format +msgid "" +"in the working copy of '%s', CRLF will be replaced by LF the next time Git " +"touches it" +msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 LF 取代 CRLF" + +#: convert.c +#, c-format +msgid "LF would be replaced by CRLF in %s" +msgstr "檔案 %s 中的 LF 將被 CRLF 取代" + +#: convert.c +#, c-format +msgid "" +"in the working copy of '%s', LF will be replaced by CRLF the next time Git " +"touches it" +msgstr "在 “%s” 的工作複本中，下次 Git 接觸到時會用 CRLF 取代 LF" + +#: convert.c +#, c-format +msgid "BOM is prohibited in '%s' if encoded as %s" +msgstr "如果使用 %2$s 編碼，禁止在 '%1$s' 中使用 BOM" + +#: convert.c +#, c-format +msgid "" +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." +msgstr "檔案 '%s' 包含位元組順序標記（BOM）。請使用 UTF-%.*s 作為工作區編碼。" + +#: convert.c +#, c-format +msgid "BOM is required in '%s' if encoded as %s" +msgstr "如果編碼為 %2$s，需要在 '%1$s' 中使用 BOM" + +#: convert.c +#, c-format +msgid "" +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" +"%sLE (depending on the byte order) as working-tree-encoding." +msgstr "" +"檔案 '%s' 缺少一個位元組順序標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（取決於" +"字節序）作為工作區編碼。" + +#: convert.c +#, c-format +msgid "failed to encode '%s' from %s to %s" +msgstr "無法對 '%s' 進行從 %s 到 %s 的編碼" + +#: convert.c +#, c-format +msgid "encoding '%s' from %s to %s and back is not the same" +msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致" + +#: convert.c +#, c-format +msgid "cannot fork to run external filter '%s'" +msgstr "不能 fork 以執行外部過濾器 '%s'" + +#: convert.c +#, c-format +msgid "cannot feed the input to external filter '%s'" +msgstr "不能將輸入傳遞給外部過濾器 '%s'" + +#: convert.c +#, c-format +msgid "external filter '%s' failed %d" +msgstr "外部過濾器 '%s' 失敗碼 %d" + +#: convert.c +#, c-format +msgid "read from external filter '%s' failed" +msgstr "從外部過濾器 '%s' 讀取失敗" + +#: convert.c +#, c-format +msgid "external filter '%s' failed" +msgstr "外部過濾器 '%s' 失敗" + +#: convert.c +msgid "unexpected filter type" +msgstr "意外的過濾類型" + +#: convert.c +msgid "path name too long for external filter" +msgstr "外部過濾器的路徑名太長" + +#: convert.c +#, c-format +msgid "" +"external filter '%s' is not available anymore although not all paths have " +"been filtered" +msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾" + +#: convert.c +msgid "true/false are no valid working-tree-encodings" +msgstr "true/false 不是有效的工作區編碼" + +#: convert.c +#, c-format +msgid "%s: clean filter '%s' failed" +msgstr "%s：clean 過濾器 '%s' 失敗" + +#: convert.c +#, c-format +msgid "%s: smudge filter %s failed" +msgstr "%s：smudge 過濾器 %s 失敗" + +#: credential.c +#, c-format +msgid "skipping credential lookup for key: credential.%s" +msgstr "略過鍵的憑證查詢：credential.%s" + +#: credential.c +msgid "refusing to work with credential missing host field" +msgstr "拒絕使用缺少主機欄位的憑證" + +#: credential.c +msgid "refusing to work with credential missing protocol field" +msgstr "拒絕使用缺少通訊協定欄位的憑證" + +#: credential.c +#, c-format +msgid "url contains a newline in its %s component: %s" +msgstr "URL 的 %s 部分有換行：%s" + +#: credential.c +#, c-format +msgid "url has no scheme: %s" +msgstr "URL 沒有 Scheme：%s" + +#: credential.c +#, c-format +msgid "credential url cannot be parsed: %s" +msgstr "無法解析憑證 URL：%s" + +#: date.c +msgid "in the future" +msgstr "在將來" + +#: date.c +#, c-format +msgid "%<PRIuMAX> second ago" +msgid_plural "%<PRIuMAX> seconds ago" +msgstr[0] "%<PRIuMAX> 秒鐘前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> minute ago" +msgid_plural "%<PRIuMAX> minutes ago" +msgstr[0] "%<PRIuMAX> 分鐘前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> hour ago" +msgid_plural "%<PRIuMAX> hours ago" +msgstr[0] "%<PRIuMAX> 小時前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> day ago" +msgid_plural "%<PRIuMAX> days ago" +msgstr[0] "%<PRIuMAX> 天前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> week ago" +msgid_plural "%<PRIuMAX> weeks ago" +msgstr[0] "%<PRIuMAX> 周前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> month ago" +msgid_plural "%<PRIuMAX> months ago" +msgstr[0] "%<PRIuMAX> 個月前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> year" +msgid_plural "%<PRIuMAX> years" +msgstr[0] "%<PRIuMAX> 年" + +#. TRANSLATORS: "%s" is "<n> years" +#: date.c +#, c-format +msgid "%s, %<PRIuMAX> month ago" +msgid_plural "%s, %<PRIuMAX> months ago" +msgstr[0] "%s %<PRIuMAX> 個月前" + +#: date.c +#, c-format +msgid "%<PRIuMAX> year ago" +msgid_plural "%<PRIuMAX> years ago" +msgstr[0] "%<PRIuMAX> 年前" + +#: delta-islands.c +msgid "Propagating island marks" +msgstr "正在傳播資料島標記" + +#: delta-islands.c +#, c-format +msgid "bad tree object %s" +msgstr "壞的樹狀物件 %s" + +#: delta-islands.c +#, c-format +msgid "failed to load island regex for '%s': %s" +msgstr "未能載入 '%s' 的資料島常規表示式：%s" + +#: delta-islands.c +#, c-format +msgid "island regex from config has too many capture groups (max=%d)" +msgstr "來自 config 的資料島常規表示式有太多的擷取群組（最多 %d 個）" + +#: delta-islands.c +#, c-format +msgid "Marked %d islands, done.\n" +msgstr "已標記 %d 個資料島，結束。\n" + +#: diff-lib.c +msgid "--merge-base does not work with ranges" +msgstr "--merge-base 跟範圍無法搭配運作" + +#: diff-lib.c +msgid "--merge-base only works with commits" +msgstr "--merge-base 只能跟提交搭配才能運作" + +#: diff-lib.c +msgid "unable to get HEAD" +msgstr "不能取得 HEAD" + +#: diff-lib.c +msgid "no merge base found" +msgstr "找不到合併基底" + +#: diff-lib.c +msgid "multiple merge bases found" +msgstr "找到多個合併基底" + +#: diff-no-index.c +msgid "git diff --no-index [<options>] <path> <path>" +msgstr "git diff --no-index [<選項>] <路徑> <路徑>" + +#: diff-no-index.c +msgid "" +"Not a git repository. Use --no-index to compare two paths outside a working " +"tree" +msgstr "不是一個 git 版本庫。使用 --no-index 比較工作區之外的兩個路徑" + +# 譯者：請維持前導空格 +#: diff.c +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " 無法解析 dirstat 截止（cut-off）百分比 '%s'\n" + +# 譯者：請維持前導空格 +#: diff.c +#, c-format +msgid " Unknown dirstat parameter '%s'\n" +msgstr " 未知的 dirstat 參數 '%s'\n" + +#: diff.c +msgid "" +"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " +"'dimmed-zebra', 'plain'" +msgstr "" +"移動的顏色設定必須是 'no'、'default'、'blocks'、'zebra'、'dimmed-" +"zebra'、'plain'" + +#: diff.c +#, c-format +msgid "" +"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " +"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" +msgstr "" +"未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" +"space-at-eol'、'ignore-all-space'、'allow-indentation-change'" + +#: diff.c +msgid "" +"color-moved-ws: allow-indentation-change cannot be combined with other " +"whitespace modes" +msgstr "color-moved-ws：allow-indentation-change 不能與其它空白字元模式共用" + +#: diff.c +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "設定變數 'diff.submodule' 未知的取值：'%s'" + +#: diff.c +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"發現設定變數 'diff.dirstat' 中的錯誤：\n" +"%s" + +#: diff.c +#, c-format +msgid "external diff died, stopping at %s" +msgstr "外部 diff 離開，停止在 %s" + +#: diff.c parse-options.c +#, c-format +msgid "options '%s', '%s', '%s', and '%s' cannot be used together" +msgstr "「%s」、「%s」、「%s」和「%s」選項不得同時使用" + +#: diff.c +#, c-format +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'" +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」" + +#: diff.c +#, c-format +msgid "" +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'" +msgstr "「%s」和「%s」選項不得同時使用，請使用「%s」搭配「%s」、「%s」" + +#: diff.c +msgid "--follow requires exactly one pathspec" +msgstr "--follow 明確要求只跟一個路徑規格" + +#: diff.c +#, c-format +msgid "invalid --stat value: %s" +msgstr "無效的 --stat 值：%s" + +#: diff.c parse-options.c +#, c-format +msgid "%s expects a numerical value" +msgstr "%s 期望一個數字值" + +#: diff.c +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"無法解析 --dirstat/-X 選項的參數：\n" +"%s" + +#: diff.c +#, c-format +msgid "unknown change class '%c' in --diff-filter=%s" +msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'" + +#: diff.c +#, c-format +msgid "unknown value after ws-error-highlight=%.*s" +msgstr "ws-error-highlight=%.*s 之後未知的值" + +#: diff.c +#, c-format +msgid "unable to resolve '%s'" +msgstr "不能解析 '%s'" + +#: diff.c +#, c-format +msgid "%s expects <n>/<m> form" +msgstr "%s 期望 <n>/<m> 格式" + +#: diff.c +#, c-format +msgid "%s expects a character, got '%s'" +msgstr "%s 期望一個字元，得到 '%s'" + +#: diff.c +#, c-format +msgid "bad --color-moved argument: %s" +msgstr "壞的 --color-moved 參數：%s" + +#: diff.c +#, c-format +msgid "invalid mode '%s' in --color-moved-ws" +msgstr "--color-moved-ws 中的無效模式 '%s'" + +#: diff.c +msgid "" +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " +"\"histogram\"" +msgstr "" +"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" + +#: diff.c +#, c-format +msgid "invalid argument to %s" +msgstr "%s 的參數無效" + +#: diff.c +#, c-format +msgid "invalid regex given to -I: '%s'" +msgstr "傳入 -I 的常規表示式無效：「%s」" + +#: diff.c +#, c-format +msgid "failed to parse --submodule option parameter: '%s'" +msgstr "無法解析 --submodule 選項的參數：'%s'" + +#: diff.c +#, c-format +msgid "bad --word-diff argument: %s" +msgstr "壞的 --word-diff 參數：%s" + +#: diff.c +msgid "Diff output format options" +msgstr "差異輸出格式化選項" + +#: diff.c +msgid "generate patch" +msgstr "生成修補檔" + +#: diff.c +msgid "<n>" +msgstr "<n>" + +#: diff.c +msgid "generate diffs with <n> lines context" +msgstr "生成含 <n> 行上下文的差異" + +#: diff.c +msgid "generate the diff in raw format" +msgstr "生成原始格式的差異" + +#: diff.c +msgid "synonym for '-p --raw'" +msgstr "和 '-p --raw' 同義" + +#: diff.c +msgid "synonym for '-p --stat'" +msgstr "和 '-p --stat' 同義" + +#: diff.c +msgid "machine friendly --stat" +msgstr "機器友好的 --stat" + +#: diff.c +msgid "output only the last line of --stat" +msgstr "只輸出 --stat 的最後一行" + +#: diff.c +msgid "<param1,param2>..." +msgstr "<參數1,參數2>..." + +#: diff.c +msgid "" +"output the distribution of relative amount of changes for each sub-directory" +msgstr "輸出每個子目錄相對變更的分布" + +#: diff.c +msgid "synonym for --dirstat=cumulative" +msgstr "和 --dirstat=cumulative 同義" + +#: diff.c +msgid "synonym for --dirstat=files,param1,param2..." +msgstr "是 --dirstat=files,param1,param2... 的同義詞" + +#: diff.c +msgid "warn if changes introduce conflict markers or whitespace errors" +msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告" + +#: diff.c +msgid "condensed summary such as creations, renames and mode changes" +msgstr "精簡摘要，例如建立、重新命名和模式變更" + +#: diff.c +msgid "show only names of changed files" +msgstr "只顯示變更檔案的檔案名" + +#: diff.c +msgid "show only names and status of changed files" +msgstr "只顯示變更檔案的檔案名和狀態" + +#: diff.c +msgid "<width>[,<name-width>[,<count>]]" +msgstr "<寬度>[,<檔案名寬度>[,<次數>]]" + +#: diff.c +msgid "generate diffstat" +msgstr "生成差異統計（diffstat）" + +#: diff.c +msgid "<width>" +msgstr "<寬度>" + +#: diff.c +msgid "generate diffstat with a given width" +msgstr "使用提供的長度生成差異統計" + +#: diff.c +msgid "generate diffstat with a given name width" +msgstr "使用提供的檔案名長度生成差異統計" + +#: diff.c +msgid "generate diffstat with a given graph width" +msgstr "使用提供的圖形長度生成差異統計" + +#: diff.c +msgid "<count>" +msgstr "<次數>" + +#: diff.c +msgid "generate diffstat with limited lines" +msgstr "生成有限行數的差異統計" + +#: diff.c +msgid "generate compact summary in diffstat" +msgstr "生成差異統計的簡潔摘要" + +#: diff.c +msgid "output a binary diff that can be applied" +msgstr "輸出一個可以套用的二進位差異" + +#: diff.c +msgid "show full pre- and post-image object names on the \"index\" lines" +msgstr "在 \"index\" 行顯示完整的前後物件名稱" + +#: diff.c +msgid "show colored diff" +msgstr "顯示帶顏色的差異" + +#: diff.c +msgid "<kind>" +msgstr "<類型>" + +#: diff.c +msgid "" +"highlight whitespace errors in the 'context', 'old' or 'new' lines in the " +"diff" +msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元" + +#: diff.c +msgid "" +"do not munge pathnames and use NULs as output field terminators in --raw or " +"--numstat" +msgstr "" +"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔" +"符" + +#: diff.c +msgid "<prefix>" +msgstr "<前綴>" + +#: diff.c +msgid "show the given source prefix instead of \"a/\"" +msgstr "顯示提供的來源前綴，而非 \"a/\"" + +#: diff.c +msgid "show the given destination prefix instead of \"b/\"" +msgstr "顯示提供的目的地前綴取代 \"b/\"" + +#: diff.c +msgid "prepend an additional prefix to every line of output" +msgstr "輸出的每一行附加前綴" + +#: diff.c +msgid "do not show any source or destination prefix" +msgstr "不顯示任何來源和目的地前綴" + +#: diff.c +msgid "show context between diff hunks up to the specified number of lines" +msgstr "顯示指定行數的差異區塊間的上下文" + +#: diff.c +msgid "<char>" +msgstr "<字元>" + +#: diff.c +msgid "specify the character to indicate a new line instead of '+'" +msgstr "指定一個字元取代 '+' 來表示新的一行" + +#: diff.c +msgid "specify the character to indicate an old line instead of '-'" +msgstr "指定一個字元取代 '-' 來表示舊的一行" + +#: diff.c +msgid "specify the character to indicate a context instead of ' '" +msgstr "指定一個字元取代 ' ' 來表示一行上下文" + +#: diff.c +msgid "Diff rename options" +msgstr "差異重新命名選項" + +#: diff.c +msgid "<n>[/<m>]" +msgstr "<n>[/<m>]" + +#: diff.c +msgid "break complete rewrite changes into pairs of delete and create" +msgstr "將完全重寫的變更打破為成對的刪除和建立" + +#: diff.c +msgid "detect renames" +msgstr "檢測重新命名" + +#: diff.c +msgid "omit the preimage for deletes" +msgstr "省略刪除變更的差異輸出" + +#: diff.c +msgid "detect copies" +msgstr "檢測複製" + +#: diff.c +msgid "use unmodified files as source to find copies" +msgstr "使用未修改的檔案做為發現拷貝的來源" + +#: diff.c +msgid "disable rename detection" +msgstr "停用重新命名偵測" + +#: diff.c +msgid "use empty blobs as rename source" +msgstr "使用空的資料物件做為重新命名的來源" + +#: diff.c +msgid "continue listing the history of a file beyond renames" +msgstr "繼續列出檔案重新命名以外的歷史記錄" + +#: diff.c +msgid "" +"prevent rename/copy detection if the number of rename/copy targets exceeds " +"given limit" +msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測" + +#: diff.c +msgid "Diff algorithm options" +msgstr "差異演算法選項" + +#: diff.c +msgid "produce the smallest possible diff" +msgstr "生成儘可能小的差異" + +#: diff.c +msgid "ignore whitespace when comparing lines" +msgstr "行比較時忽略空白字元" + +#: diff.c +msgid "ignore changes in amount of whitespace" +msgstr "忽略空白字元的變更" + +#: diff.c +msgid "ignore changes in whitespace at EOL" +msgstr "忽略行尾的空白字元變更" + +#: diff.c +msgid "ignore carrier-return at the end of line" +msgstr "忽略行尾的Enter符（CR）" + +#: diff.c +msgid "ignore changes whose lines are all blank" +msgstr "忽略整行都是空白的變更" + +#: diff.c +msgid "<regex>" +msgstr "<正則>" + +#: diff.c +msgid "ignore changes whose all lines match <regex>" +msgstr "忽略整行符合 <regex> 的變更" + +#: diff.c +msgid "heuristic to shift diff hunk boundaries for easy reading" +msgstr "啟發式轉換差異邊界以便閱讀" + +#: diff.c +msgid "generate diff using the \"patience diff\" algorithm" +msgstr "使用 \"patience diff\" 演算法生成差異" + +#: diff.c +msgid "generate diff using the \"histogram diff\" algorithm" +msgstr "使用 \"histogram diff\" 演算法生成差異" + +#: diff.c +msgid "<algorithm>" +msgstr "<演算法>" + +#: diff.c +msgid "choose a diff algorithm" +msgstr "選擇一個差異演算法" + +#: diff.c +msgid "<text>" +msgstr "<文字>" + +#: diff.c +msgid "generate diff using the \"anchored diff\" algorithm" +msgstr "使用 \"anchored diff\" 演算法生成差異" + +#: diff.c +msgid "<mode>" +msgstr "<模式>" + +#: diff.c +msgid "show word diff, using <mode> to delimit changed words" +msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞" + +#: diff.c +msgid "use <regex> to decide what a word is" +msgstr "使用 <常規表示式> 確定何為一個詞" + +#: diff.c +msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" +msgstr "相當於 --word-diff=color --word-diff-regex=<正則>" + +#: diff.c +msgid "moved lines of code are colored differently" +msgstr "移動的程式碼行用不同方式著色" + +#: diff.c +msgid "how white spaces are ignored in --color-moved" +msgstr "在 --color-moved 下如何忽略空白字元" + +#: diff.c +msgid "Other diff options" +msgstr "其它差異選項" + +#: diff.c +msgid "when run from subdir, exclude changes outside and show relative paths" +msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑" + +#: diff.c +msgid "treat all files as text" +msgstr "把所有檔案當做文字處理" + +#: diff.c +msgid "swap two inputs, reverse the diff" +msgstr "交換兩個輸入，反轉差異" + +#: diff.c +msgid "exit with 1 if there were differences, 0 otherwise" +msgstr "有差異時離開碼為 1，否則為 0" + +#: diff.c +msgid "disable all output of the program" +msgstr "停用本程式的所有輸出" + +#: diff.c +msgid "allow an external diff helper to be executed" +msgstr "允許執行一個外部的差異協助工具" + +#: diff.c +msgid "run external text conversion filters when comparing binary files" +msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器" + +#: diff.c +msgid "<when>" +msgstr "<何時>" + +#: diff.c +msgid "ignore changes to submodules in the diff generation" +msgstr "在生成差異時，忽略子模組的更改" + +#: diff.c +msgid "<format>" +msgstr "<格式>" + +#: diff.c +msgid "specify how differences in submodules are shown" +msgstr "指定子模組的差異如何顯示" + +#: diff.c +msgid "hide 'git add -N' entries from the index" +msgstr "隱藏索引中 'git add -N' 條目" + +#: diff.c +msgid "treat 'git add -N' entries as real in the index" +msgstr "將索引中 'git add -N' 條目當做真實的" + +#: diff.c +msgid "<string>" +msgstr "<字串>" + +#: diff.c +msgid "" +"look for differences that change the number of occurrences of the specified " +"string" +msgstr "尋找改變了指定字串出現次數的差異" + +#: diff.c +msgid "" +"look for differences that change the number of occurrences of the specified " +"regex" +msgstr "尋找改變指定正則符合出現次數的差異" + +#: diff.c +msgid "show all changes in the changeset with -S or -G" +msgstr "顯示使用 -S 或 -G 的變更集的所有變更" + +#: diff.c +msgid "treat <string> in -S as extended POSIX regular expression" +msgstr "將 -S 的 <string> 當做延伸 POSIX 常規表示式" + +#: diff.c +msgid "control the order in which files appear in the output" +msgstr "控制輸出中的檔案顯示順序" + +#: diff.c +msgid "<path>" +msgstr "<路徑>" + +#: diff.c +msgid "show the change in the specified path first" +msgstr "先顯示指定路徑的變更" + +#: diff.c +msgid "skip the output to the specified path" +msgstr "略過輸出至指定路徑" + +#: diff.c +msgid "<object-id>" +msgstr "<物件 ID>" + +#: diff.c +msgid "" +"look for differences that change the number of occurrences of the specified " +"object" +msgstr "尋找改變指定物件出現次數的差異" + +#: diff.c +msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" +msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" + +#: diff.c +msgid "select files by diff type" +msgstr "透過差異類型選擇檔案" + +#: diff.c +msgid "<file>" +msgstr "<檔案>" + +#: diff.c +msgid "output to a specific file" +msgstr "輸出至指定檔案" + +#: diff.c +msgid "exhaustive rename detection was skipped due to too many files." +msgstr "因為檔案太多，已略過詳細重新命名偵測。" + +#: diff.c +msgid "only found copies from modified paths due to too many files." +msgstr "因為檔案太多，只在修改的路徑中尋找複製。" + +#: diff.c +#, c-format +msgid "" +"you may want to set your %s variable to at least %d and retry the command." +msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。" + +#: diffcore-order.c +#, c-format +msgid "failed to read orderfile '%s'" +msgstr "讀取排序檔案 '%s' 失敗" + +#: diffcore-rename.c +msgid "Performing inexact rename detection" +msgstr "正在進行非精確的重新命名偵測" + +#: diffcore-rotate.c +#, c-format +msgid "No such path '%s' in the diff" +msgstr "diff 中沒有「%s」路徑" + +#: dir.c +#, c-format +msgid "pathspec '%s' did not match any file(s) known to git" +msgstr "路徑規格 '%s' 未符合任何 git 已知檔案" + +#: dir.c +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "無法識別樣式：「%s」" + +#: dir.c +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "無法識別反向模式：「%s」" + +#: dir.c +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複" + +#: dir.c +msgid "disabling cone pattern matching" +msgstr "停用 cone 樣式符合模式" + +#: dir.c +#, c-format +msgid "cannot use %s as an exclude file" +msgstr "不能將 %s 用作排除檔案" + +#: dir.c +msgid "failed to get kernel name and information" +msgstr "無法獲得核心名稱和訊息" + +#: dir.c +msgid "untracked cache is disabled on this system or location" +msgstr "快取未追蹤檔案在本系統或位置中被停用" + +#: dir.c +msgid "" +"No directory name could be guessed.\n" +"Please specify a directory on the command line" +msgstr "" +"無法猜到目錄名。\n" +"請在指令列指定一個目錄" + +#: dir.c +#, c-format +msgid "index file corrupt in repo %s" +msgstr "版本庫 %s 中的索引檔案損壞" + +#: dir.c +#, c-format +msgid "could not create directories for %s" +msgstr "不能為 %s 建立目錄" + +#: dir.c +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "不能從 '%s' 遷移 git 目錄到 '%s'" + +#: editor.c +#, c-format +msgid "hint: Waiting for your editor to close the file...%c" +msgstr "提示：等待您的編輯器關閉檔案...%c" + +#: entry.c +msgid "Filtering content" +msgstr "過濾內容" + +#: entry.c +#, c-format +msgid "could not stat file '%s'" +msgstr "不能對檔案 '%s' 呼叫 stat" + +#: environment.c +#, c-format +msgid "bad git namespace path \"%s\"" +msgstr "錯誤的 git 名字空間路徑 \"%s\"" + +#: exec-cmd.c +#, c-format +msgid "too many args to run %s" +msgstr "執行 %s 的參數太多" + +#: fetch-pack.c +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack：應為 shallow 列表" + +#: fetch-pack.c +msgid "git fetch-pack: expected a flush packet after shallow list" +msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包" + +#: fetch-pack.c +msgid "git fetch-pack: expected ACK/NAK, got a flush packet" +msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包" + +#: fetch-pack.c +#, c-format +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'" + +#: fetch-pack.c +msgid "unable to write to remote" +msgstr "無法寫到遠端" + +#: fetch-pack.c +#, c-format +msgid "invalid shallow line: %s" +msgstr "無效的 shallow 訊息：%s" + +#: fetch-pack.c +#, c-format +msgid "invalid unshallow line: %s" +msgstr "無效的 unshallow 訊息：%s" + +#: fetch-pack.c +#, c-format +msgid "object not found: %s" +msgstr "物件未找到：%s" + +#: fetch-pack.c +#, c-format +msgid "error in object: %s" +msgstr "物件中發生錯誤：%s" + +#: fetch-pack.c +#, c-format +msgid "no shallow found: %s" +msgstr "未發現 shallow：%s" + +#: fetch-pack.c +#, c-format +msgid "expected shallow/unshallow, got %s" +msgstr "應為 shallow/unshallow，卻得到 %s" + +#: fetch-pack.c +#, c-format +msgid "got %s %d %s" +msgstr "得到 %s %d %s" + +#: fetch-pack.c +#, c-format +msgid "invalid commit %s" +msgstr "無效提交 %s" + +#: fetch-pack.c +msgid "giving up" +msgstr "放棄" + +#: fetch-pack.c progress.h +msgid "done" +msgstr "完成" + +#: fetch-pack.c +#, c-format +msgid "got %s (%d) %s" +msgstr "得到 %s (%d) %s" + +#: fetch-pack.c +#, c-format +msgid "Marking %s as complete" +msgstr "標記 %s 為完成" + +#: fetch-pack.c +#, c-format +msgid "already have %s (%s)" +msgstr "已經有 %s（%s）" + +#: fetch-pack.c +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack：無法衍生 sideband 多路輸出" + +#: fetch-pack.c +msgid "protocol error: bad pack header" +msgstr "協定錯誤：壞的包頭" + +#: fetch-pack.c +#, c-format +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack：無法 fork %s 處理程序" + +#: fetch-pack.c +msgid "fetch-pack: invalid index-pack output" +msgstr "fetch-pack：無效的 index-pack 輸出" + +#: fetch-pack.c +#, c-format +msgid "%s failed" +msgstr "%s 失敗" + +#: fetch-pack.c +msgid "error in sideband demultiplexer" +msgstr "sideband 多路輸出發生錯誤" + +#: fetch-pack.c +#, c-format +msgid "Server version is %.*s" +msgstr "伺服器版本 %.*s" + +#: fetch-pack.c +#, c-format +msgid "Server supports %s" +msgstr "伺服器支援 %s" + +#: fetch-pack.c +msgid "Server does not support shallow clients" +msgstr "伺服器不支援 shallow 用戶端" + +#: fetch-pack.c +msgid "Server does not support --shallow-since" +msgstr "伺服器不支援 --shallow-since" + +#: fetch-pack.c +msgid "Server does not support --shallow-exclude" +msgstr "伺服器不支援 --shallow-exclude" + +#: fetch-pack.c +msgid "Server does not support --deepen" +msgstr "伺服器不支援 --deepen" + +#: fetch-pack.c +msgid "Server does not support this repository's object format" +msgstr "伺服器不支援此版本庫的物件格式" + +#: fetch-pack.c +msgid "no common commits" +msgstr "沒有共同的提交" + +#: fetch-pack.c +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack：取得失敗。" + +#: fetch-pack.c +#, c-format +msgid "mismatched algorithms: client %s; server %s" +msgstr "算法不一致：用戶端 %s；伺服器 %s" + +#: fetch-pack.c +#, c-format +msgid "the server does not support algorithm '%s'" +msgstr "伺服器不支援「%s」算法" + +#: fetch-pack.c +msgid "Server does not support shallow requests" +msgstr "伺服器不支援 shallow 請求" + +#: fetch-pack.c +msgid "Server supports filter" +msgstr "伺服器支援 filter" + +#: fetch-pack.c +msgid "unable to write request to remote" +msgstr "無法將請求寫到遠端" + +#: fetch-pack.c +#, c-format +msgid "expected '%s', received '%s'" +msgstr "預期 '%s'，得到 '%s'" + +#: fetch-pack.c +#, c-format +msgid "expected '%s'" +msgstr "預期 “%s”" + +#: fetch-pack.c +#, c-format +msgid "unexpected acknowledgment line: '%s'" +msgstr "意外的確認行：'%s'" + +#: fetch-pack.c +#, c-format +msgid "error processing acks: %d" +msgstr "處理 ack 發生錯誤：%d" + +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. +#: fetch-pack.c +#, c-format +msgid "expected packfile to be sent after '%s'" +msgstr "預期在 「%s」後傳送 packfile" + +#. TRANSLATORS: The parameter will be 'ready', a protocol +#. keyword. +#. +#: fetch-pack.c +#, c-format +msgid "expected no other sections to be sent after no '%s'" +msgstr "預期在沒有「%s」後不傳送其他區段" + +#: fetch-pack.c +#, c-format +msgid "error processing shallow info: %d" +msgstr "處理淺複製訊息發生錯誤：%d" + +#: fetch-pack.c +#, c-format +msgid "expected wanted-ref, got '%s'" +msgstr "預期 wanted-ref，得到 '%s'" + +#: fetch-pack.c +#, c-format +msgid "unexpected wanted-ref: '%s'" +msgstr "意外的 wanted-ref：'%s'" + +#: fetch-pack.c +#, c-format +msgid "error processing wanted refs: %d" +msgstr "處理要取得的引用發生錯誤：%d" + +#: fetch-pack.c +msgid "git fetch-pack: expected response end packet" +msgstr "git fetch-pack: 預期要有回應結束封包" + +#: fetch-pack.c +msgid "no matching remote head" +msgstr "沒有符合的遠端分支" + +#: fetch-pack.c +msgid "unexpected 'ready' from remote" +msgstr "從遠端收到非預期的 ‘ready’" + +#: fetch-pack.c +#, c-format +msgid "no such remote ref %s" +msgstr "沒有這樣的遠端引用 %s" + +#: fetch-pack.c +#, c-format +msgid "Server does not allow request for unadvertised object %s" +msgstr "伺服器不允許請求未公開的物件 %s" + +#: fsmonitor-ipc.c +#, c-format +msgid "fsmonitor_ipc__send_query: invalid path '%s'" +msgstr "fsmonitor_ipc__send_query：路徑「%s」無效" + +#: fsmonitor-ipc.c +#, c-format +msgid "fsmonitor_ipc__send_query: unspecified error on '%s'" +msgstr "fsmonitor_ipc__send_query：「%s」上有未指定的錯誤" + +#: fsmonitor-ipc.c +msgid "fsmonitor--daemon is not running" +msgstr "fsmonitor--daemon 未在運作" + +#: fsmonitor-ipc.c +#, c-format +msgid "could not send '%s' command to fsmonitor--daemon" +msgstr "無法將「%s」命令傳送到 fsmonitor--daemon" + +#: fsmonitor-settings.c +#, c-format +msgid "bare repository '%s' is incompatible with fsmonitor" +msgstr "純版本庫 “%s” 與 fsmonitor 不相容" + +#: fsmonitor-settings.c +#, c-format +msgid "repository '%s' is incompatible with fsmonitor due to errors" +msgstr "版本庫 “%s” 因錯誤而與 fsmonitor 不相容" + +#: fsmonitor-settings.c +#, c-format +msgid "remote repository '%s' is incompatible with fsmonitor" +msgstr "遠端版本庫 “%s” 與 fsmonitor 不相容" + +#: fsmonitor-settings.c +#, c-format +msgid "virtual repository '%s' is incompatible with fsmonitor" +msgstr "虛擬版本庫 “%s” 與 fsmonitor 不相容" + +#: fsmonitor-settings.c +#, c-format +msgid "" +"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets" +msgstr "版本庫 “%s” 因缺少 Unix 通訊端而與 fsmonitor 不相容" + +#: git.c +msgid "" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" +" <command> [<args>]" +msgstr "" +"git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n" +" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" +"bare]\n" +" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" +" <command> [<args>]" + +#: git.c +msgid "" +"'git help -a' and 'git help -g' list available subcommands and some\n" +"concept guides. See 'git help <command>' or 'git help <concept>'\n" +"to read about a specific subcommand or concept.\n" +"See 'git help git' for an overview of the system." +msgstr "" +"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n" +"檢視 'git help <命令>' 或 'git help <概念>' 以取得提供子指令或概念\n" +"說明。\n" +"有關系統概述，檢視 'git help git'。" + +#: git.c help.c +#, c-format +msgid "unsupported command listing type '%s'" +msgstr "不支援的指令列表類型 '%s'" + +#: git.c +#, c-format +msgid "no directory given for '%s' option\n" +msgstr "未傳入目錄至「%s」選項\n" + +#: git.c +#, c-format +msgid "no namespace given for --namespace\n" +msgstr "沒有為 --namespace 提供命名空間\n" + +#: git.c +#, c-format +msgid "no prefix given for --super-prefix\n" +msgstr "沒有為 --super-prefix 提供前綴\n" + +#: git.c +#, c-format +msgid "-c expects a configuration string\n" +msgstr "應為 -c 提供一個設定字串\n" + +#: git.c +#, c-format +msgid "no config key given for --config-env\n" +msgstr "未傳入設定鍵至 --config-env\n" + +#: git.c +#, c-format +msgid "unknown option: %s\n" +msgstr "未知選項：%s\n" + +#: git.c +#, c-format +msgid "while expanding alias '%s': '%s'" +msgstr "在展開別名 '%s' 時：'%s'" + +#: git.c +#, c-format +msgid "" +"alias '%s' changes environment variables.\n" +"You can use '!git' in the alias to do this" +msgstr "" +"別名 '%s' 修改環境變數。您可以使用在別名中\n" +"使用 '!git'" + +#: git.c +#, c-format +msgid "empty alias for %s" +msgstr "%s 的空別名" + +#: git.c +#, c-format +msgid "recursive alias: %s" +msgstr "遞迴的別名：%s" + +#: git.c +msgid "write failure on standard output" +msgstr "在標準輸出寫入失敗" + +#: git.c +msgid "unknown write failure on standard output" +msgstr "到標準輸出的未知寫入錯誤" + +#: git.c +msgid "close failed on standard output" +msgstr "標準輸出關閉失敗" + +#: git.c +#, c-format +msgid "alias loop detected: expansion of '%s' does not terminate:%s" +msgstr "偵測到別名循環：展開後的「%s」無窮無盡：%s" + +#: git.c +#, c-format +msgid "cannot handle %s as a builtin" +msgstr "不能作為內建指令處理 %s" + +#: git.c +#, c-format +msgid "" +"usage: %s\n" +"\n" +msgstr "" +"用法：%s\n" +"\n" + +#: git.c +#, c-format +msgid "expansion of alias '%s' failed; '%s' is not a git command\n" +msgstr "展開別名指令 '%s' 失敗，'%s' 不是一個 git 指令\n" + +#: git.c +#, c-format +msgid "failed to run command '%s': %s\n" +msgstr "執行指令 '%s' 失敗：%s\n" + +#: gpg-interface.c +msgid "could not create temporary file" +msgstr "不能建立暫存檔" + +#: gpg-interface.c +#, c-format +msgid "failed writing detached signature to '%s'" +msgstr "無法將分離式簽名寫入 '%s'" + +#: gpg-interface.c +msgid "" +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " +"signature verification" +msgstr "SSH 簽名驗證需要設定 gpg.ssh.allowedSignersFile，簽名檔案也要存在" + +#: gpg-interface.c +msgid "" +"ssh-keygen -Y find-principals/verify is needed for ssh signature " +"verification (available in openssh version 8.2p1+)" +msgstr "" +"SSH 簽名驗證需要 ssh-keygen -Y find-principals/verify（可以在 openssh 8.2p1+ " +"版本使用）" + +#: gpg-interface.c +#, c-format +msgid "ssh signing revocation file configured but not found: %s" +msgstr "有設定 SSH 簽名廢止檔案，但找不到檔案本體：%s" + +#: gpg-interface.c +#, c-format +msgid "bad/incompatible signature '%s'" +msgstr "簽名「%s」損壞或者不相容" + +#: gpg-interface.c +#, c-format +msgid "failed to get the ssh fingerprint for key '%s'" +msgstr "無法取得「%s」金鑰的 SSH 指紋" + +#: gpg-interface.c +msgid "" +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" +msgstr "需要設定 user.signingkey 或 gpg.ssh.defaultKeyCommand 任一" + +#: gpg-interface.c +#, c-format +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s" +msgstr "gpg.ssh.defaultKeyCommand 執行成功，但沒回傳按鍵：%s %s" + +#: gpg-interface.c +#, c-format +msgid "gpg.ssh.defaultKeyCommand failed: %s %s" +msgstr "gpg.ssh.defaultKeyCommand 執行失敗：%s %s" + +#: gpg-interface.c +msgid "gpg failed to sign the data" +msgstr "gpg 無法為資料簽名" + +#: gpg-interface.c +msgid "user.signingKey needs to be set for ssh signing" +msgstr "需要設定 user.signingKey 才能進行 SSH 簽名" + +#: gpg-interface.c +#, c-format +msgid "failed writing ssh signing key to '%s'" +msgstr "無法將 SSH 簽名金鑰寫入「%s」" + +#: gpg-interface.c +#, c-format +msgid "failed writing ssh signing key buffer to '%s'" +msgstr "無法將 SSH 簽名金鑰緩衝區寫入「%s」" + +#: gpg-interface.c +msgid "" +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version " +"8.2p1+)" +msgstr "SSH 簽名需要 ssh-keygen -Y sign（可以在 openssh 8.2p1+ 版本使用）" + +#: gpg-interface.c +#, c-format +msgid "failed reading ssh signing data buffer from '%s'" +msgstr "無法從「%s」讀取 SSH 簽名資料緩衝區" + +#: graph.c +#, c-format +msgid "ignored invalid color '%.*s' in log.graphColors" +msgstr "已忽略 log.graphColors 中無效的 “%.*s” 色彩" + +#: grep.c +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此" +"功能" + +#: grep.c +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s'：無法讀取 %s" + +#: grep.c +#, c-format +msgid "'%s': short read" +msgstr "'%s'：讀取不完整" + +#: help.c +msgid "start a working area (see also: git help tutorial)" +msgstr "開始一個工作區（參見：git help tutorial）" + +#: help.c +msgid "work on the current change (see also: git help everyday)" +msgstr "在目前變更上工作（參見：git help everyday）" + +#: help.c +msgid "examine the history and state (see also: git help revisions)" +msgstr "檢查歷史和狀態（參見：git help revisions）" + +#: help.c +msgid "grow, mark and tweak your common history" +msgstr "擴展、標記和調校您的歷史記錄" + +#: help.c +msgid "collaborate (see also: git help workflows)" +msgstr "協同（參見：git help workflows）" + +#: help.c +msgid "Main Porcelain Commands" +msgstr "主要的上層指令" + +#: help.c +msgid "Ancillary Commands / Manipulators" +msgstr "輔助指令/動作者" + +#: help.c +msgid "Ancillary Commands / Interrogators" +msgstr "輔助指令/詢問者" + +#: help.c +msgid "Interacting with Others" +msgstr "與其它系統互動" + +#: help.c +msgid "Low-level Commands / Manipulators" +msgstr "低級指令/動作者" + +#: help.c +msgid "Low-level Commands / Interrogators" +msgstr "低級指令/詢問者" + +#: help.c +msgid "Low-level Commands / Syncing Repositories" +msgstr "低級指令 / 同步版本庫" + +#: help.c +msgid "Low-level Commands / Internal Helpers" +msgstr "低級指令/內部協助工具" + +#: help.c +#, c-format +msgid "available git commands in '%s'" +msgstr "在 '%s' 下可用的 git 指令" + +#: help.c +msgid "git commands available from elsewhere on your $PATH" +msgstr "在 $PATH 路徑中的其他地方可用的 git 指令" + +#: help.c +msgid "These are common Git commands used in various situations:" +msgstr "這些是各種場合常見的 Git 指令：" + +#: help.c +msgid "The Git concept guides are:" +msgstr "Git 概念嚮導有：" + +#: help.c +msgid "External commands" +msgstr "外部指令" + +#: help.c +msgid "Command aliases" +msgstr "指令別名" + +#: help.c +msgid "See 'git help <command>' to read about a specific subcommand" +msgstr "執行 'git help <command>' 來檢視特定子指令" + +#: help.c +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "" +"'%s' 像是一個 git 指令，但卻無法執行。\n" +"可能是 git-%s 受損？" + +#: help.c +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。" + +#: help.c +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "唉呀，您的系統中未發現 Git 指令。" + +#: help.c +#, c-format +msgid "WARNING: You called a Git command named '%s', which does not exist." +msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。" + +#: help.c +#, c-format +msgid "Continuing under the assumption that you meant '%s'." +msgstr "假定你想要的是 '%s' 並繼續。" + +#: help.c +#, c-format +msgid "Run '%s' instead [y/N]? " +msgstr "改執行「%s」[y/N]？ " + +#: help.c +#, c-format +msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." +msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。" + +#: help.c +msgid "" +"\n" +"The most similar command is" +msgid_plural "" +"\n" +"The most similar commands are" +msgstr[0] "" +"\n" +"最類似的指令有" + +#: help.c +msgid "git version [<options>]" +msgstr "git version [<選項>]" + +#: help.c +#, c-format +msgid "%s: %s - %s" +msgstr "%s：%s - %s" + +#: help.c +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"您指的是這個嗎？" + +#: hook.c +#, c-format +msgid "" +"The '%s' hook was ignored because it's not set as executable.\n" +"You can disable this warning with `git config advice.ignoredHook false`." +msgstr "" +"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n" +"設定 `git config advice.ignoredHook false` 來關閉這條警告。" + +#: hook.c +#, c-format +msgid "Couldn't start hook '%s'\n" +msgstr "無法啟動「%s」掛鉤\n" + +#: http-fetch.c +#, c-format +msgid "argument to --packfile must be a valid hash (got '%s')" +msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')" + +#: http-fetch.c +msgid "not a git repository" +msgstr "不是一個 git 版本庫" + +#: http.c +#, c-format +msgid "negative value for http.postBuffer; defaulting to %d" +msgstr "http.postBuffer 為負值，預設為 %d" + +#: http.c +msgid "Delegation control is not supported with cURL < 7.22.0" +msgstr "不支援委託控制，因為 cURL < 7.22.0" + +#: http.c +msgid "Public key pinning not supported with cURL < 7.39.0" +msgstr "不支援公鑰檔案鎖定，因為 cURL < 7.39.0" + +#: http.c +msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" +msgstr "不支援 CURLSSLOPT_NO_REVOKE，因為 cURL < 7.44.0" + +#: http.c +#, c-format +msgid "Unsupported SSL backend '%s'. Supported SSL backends:" +msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端：" + +#: http.c +#, c-format +msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" +msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端" + +#: http.c +#, c-format +msgid "Could not set SSL backend to '%s': already set" +msgstr "無法將 SSL 後端設定為 '%s'：已經設定" + +#: http.c +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"不能更新重定向的 url base：\n" +" 請求：%s\n" +" 重定向：%s" + +#: ident.c +msgid "Author identity unknown\n" +msgstr "作者身分未知\n" + +#: ident.c +msgid "Committer identity unknown\n" +msgstr "提交者身分未知\n" + +#: ident.c +msgid "" +"\n" +"*** Please tell me who you are.\n" +"\n" +"Run\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"to set your account's default identity.\n" +"Omit --global to set the identity only in this repository.\n" +"\n" +msgstr "" +"\n" +"*** 請告訴我你是誰。\n" +"\n" +"執行\n" +"\n" +" git config --global user.email \"you@example.com\"\n" +" git config --global user.name \"Your Name\"\n" +"\n" +"來設定您帳號的預設身份標記。\n" +"若只要在這個版本庫設定身份標記，請省略 --global 參數。\n" +"\n" + +#: ident.c +msgid "no email was given and auto-detection is disabled" +msgstr "未提供信件位址且自動偵測被停用" + +#: ident.c +#, c-format +msgid "unable to auto-detect email address (got '%s')" +msgstr "無法自動偵測信件位址（得到 '%s'）" + +#: ident.c +msgid "no name was given and auto-detection is disabled" +msgstr "未提供姓名且自動偵測被停用" + +#: ident.c +#, c-format +msgid "unable to auto-detect name (got '%s')" +msgstr "無法自動偵測姓名（得到 '%s'）" + +#: ident.c +#, c-format +msgid "empty ident name (for <%s>) not allowed" +msgstr "不允許空的姓名（對於 <%s>）" + +#: ident.c +#, c-format +msgid "name consists only of disallowed characters: %s" +msgstr "姓名中僅包含停用字元：%s" + +#: list-objects-filter-options.c +msgid "expected 'tree:<depth>'" +msgstr "期望 'tree:<深度>'" + +#: list-objects-filter-options.c +msgid "sparse:path filters support has been dropped" +msgstr "sparse:path 過濾器支援已被刪除" + +#: list-objects-filter-options.c +#, c-format +msgid "'%s' for 'object:type=<type>' is not a valid object type" +msgstr "“object:type=<type>” 的 “%s” 不是有效的物件格式" + +#: list-objects-filter-options.c +#, c-format +msgid "invalid filter-spec '%s'" +msgstr "無效的過濾器規格 '%s'" + +#: list-objects-filter-options.c +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'" + +#: list-objects-filter-options.c +msgid "expected something after combine:" +msgstr "期望在組合後有一些東西：" + +#: list-objects-filter-options.c +msgid "multiple filter-specs cannot be combined" +msgstr "不能混用多種過濾規格" + +#: list-objects-filter-options.c +msgid "unable to upgrade repository format to support partial clone" +msgstr "無法升級版本庫格式，以致不支援部分複製" + +#: list-objects-filter-options.h +msgid "args" +msgstr "參數" + +#: list-objects-filter-options.h +msgid "object filtering" +msgstr "物件過濾" + +#: list-objects-filter.c +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "不能存取 '%s' 中的稀疏資料物件" + +#: list-objects-filter.c +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "無法解析 %s 中的稀疏過濾器資料" + +#: list-objects.c +#, c-format +msgid "entry '%s' in tree %s has tree mode, but is not a tree" +msgstr "樹 %2$s 中的條目 '%1$s' 具有樹的屬性，但不是一個樹狀物件" + +#: list-objects.c +#, c-format +msgid "entry '%s' in tree %s has blob mode, but is not a blob" +msgstr "樹 %2$s 中的條目 '%1$s' 具有資料物件的屬性，但不是一個資料物件" + +#: list-objects.c +#, c-format +msgid "unable to load root tree for commit %s" +msgstr "無法為提交 %s 載入根樹" + +#: lockfile.c +#, c-format +msgid "" +"Unable to create '%s.lock': %s.\n" +"\n" +"Another git process seems to be running in this repository, e.g.\n" +"an editor opened by 'git commit'. Please make sure all processes\n" +"are terminated then try again. If it still fails, a git process\n" +"may have crashed in this repository earlier:\n" +"remove the file manually to continue." +msgstr "" +"無法建立 '%s.lock'：%s。\n" +"\n" +"這個版本庫似乎有另一個 git 處理程序在執行，\n" +"例如「git commit」命令開啟的編輯器。\n" +"請確認所有處理程序都已經終止後再重試一次。如果錯誤沒有消失，\n" +"有可能是之前在這個版本庫執行的 git 處理程序當掉了。\n" +"如果是這樣，請自行刪除這個檔案再繼續。" + +#: lockfile.c +#, c-format +msgid "Unable to create '%s.lock': %s" +msgstr "不能建立 '%s.lock'：%s" + +#: ls-refs.c +#, c-format +msgid "unexpected line: '%s'" +msgstr "遇到非預期橫列：「%s」" + +#: ls-refs.c +msgid "expected flush after ls-refs arguments" +msgstr "在 ls-refs 引數之後應該有一個 flush 包" + +#: mailinfo.c +msgid "quoted CRLF detected" +msgstr "偵測到由可列印字元 (quoted) 所組成的 CRLF" + +#: merge-ort-wrappers.c merge-recursive.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"您對下列檔案的本機修改將被合併動作覆蓋：\n" +" %s" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "無法合併子模組 %s （沒有簽出）" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "無法合併子模組 %s（提交不存在）" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "無法合併子模組 %s （提交未跟隨合併基礎）" + +#: merge-ort.c +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "注意：正在將 %s 子模組快轉到 %s" + +#: merge-ort.c +#, c-format +msgid "Failed to merge submodule %s" +msgstr "無法合併 %s 子模組" + +#: merge-ort.c +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"無法合併 %s 子模組，但有找到一個可行的合併方案：\n" +"%s\n" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"正確的話，就能直接加進索引，例如執行下述命令：\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"接受本建議。\n" + +#: merge-ort.c +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n" +"%s" + +#: merge-ort.c merge-recursive.c +msgid "Failed to execute internal merge" +msgstr "無法執行內部合併" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "Unable to add %s to database" +msgstr "不能新增 %s 至物件庫" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "Auto-merging %s" +msgstr "自動合併 %s" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑" +"放在：%s。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這" +"些路徑放置於此：%s" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" +"衝突（分割的目錄重新命名）：未知 %s 重新命名的位置。它被重新命名為多個其他目" +"錄，但沒有目的地取得過半檔案。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "警告：避免套用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。" + +#: merge-ort.c merge-recursive.c +#, 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。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將" +"其移動到 %5$s。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移" +"動到 %s。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s " +"中，建議將其移動到 %5$s。" + +#: merge-ort.c +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"衝突（重新命名/重新命名）：%1$s 已重新命名為 %3$s 中的 %2$s 和 %5$s 中的 " +"%4$s。" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" +"衝突（重新命名陷入相撞）：%s -> %s 這個重新命名有內容衝突並與其他路徑相撞，可" +"能會因此出現巢狀衝突標記。" + +#: merge-ort.c +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"衝突（重新命名/刪除）：%1$s 已重新命名為 %3$s 中的 %2$s 卻在 %4$s 中被刪除。" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "cannot read object %s" +msgstr "不能讀取物件 %s" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "object %s is not a blob" +msgstr "物件 %s 不是一個資料物件" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "衝突（檔案/目錄）：目錄佔住 %2$s 中 %1$s 的位置。改移動到 %3$s。" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed both " +"of them so each can be recorded somewhere." +msgstr "" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名這兩個來源，這樣就可以分" +"別記錄這兩方檔案。" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed one " +"of them so each can be recorded somewhere." +msgstr "" +"衝突（類型有異）：兩方的 %s 類型皆不同。已經重新命名其中一個來源，這樣就可以" +"分別記錄這兩方檔案。" + +#: merge-ort.c merge-recursive.c +msgid "content" +msgstr "內容" + +#: merge-ort.c merge-recursive.c +msgid "add/add" +msgstr "新增/新增" + +#: merge-ort.c merge-recursive.c +msgid "submodule" +msgstr "子模組" + +#: merge-ort.c merge-recursive.c +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "衝突（%s）：合併衝突於 %s" + +#: merge-ort.c +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"衝突（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹" +"上。" + +#: merge-ort.c +#, c-format +msgid "" +"Note: %s not up to date and in way of checking out conflicted version; old " +"copy renamed to %s" +msgstr "註：%s 不是最新且干擾到簽出衝突版本。已將舊拷貝重新命名至 %s" + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "%s, %s, %s 樹的合併資訊收集失敗" + +#: merge-recursive.c +msgid "(bad commit)\n" +msgstr "（壞提交）\n" + +#: merge-recursive.c +#, c-format +msgid "add_cacheinfo failed for path '%s'; merge aborting." +msgstr "add_cacheinfo 對路徑 '%s' 執行失敗，合併終止。" + +#: merge-recursive.c +#, c-format +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." +msgstr "add_cacheinfo 無法重新整理路徑 '%s'，合併終止。" + +#: merge-recursive.c +#, c-format +msgid "failed to create path '%s'%s" +msgstr "建立路徑 '%s'%s 失敗" + +#: merge-recursive.c +#, c-format +msgid "Removing %s to make room for subdirectory\n" +msgstr "刪除 %s 以便為子目錄留出空間\n" + +#: merge-recursive.c +msgid ": perhaps a D/F conflict?" +msgstr "：可能是一個目錄/檔案衝突？" + +#: merge-recursive.c +#, c-format +msgid "refusing to lose untracked file at '%s'" +msgstr "拒絕捨棄 '%s' 中的未追蹤檔案" + +#: merge-recursive.c +#, c-format +msgid "blob expected for %s '%s'" +msgstr "%s '%s' 應為資料物件" + +#: merge-recursive.c +#, c-format +msgid "failed to open '%s': %s" +msgstr "開啟 '%s' 失敗：%s" + +#: merge-recursive.c +#, c-format +msgid "failed to symlink '%s': %s" +msgstr "建立符號連結 '%s' 失敗：%s" + +#: merge-recursive.c +#, c-format +msgid "do not know what to do with %06o %s '%s'" +msgstr "不知道如何處理 %06o %s '%s'" + +#: merge-recursive.c +#, c-format +msgid "Fast-forwarding submodule %s to the following commit:" +msgstr "子模組 %s 快轉到如下提交：" + +#: merge-recursive.c +#, c-format +msgid "Fast-forwarding submodule %s" +msgstr "快轉子模組 %s" + +#: merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (merge following commits not found)" +msgstr "無法合併子模組 %s （沒發現合併跟隨的提交）" + +#: merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (not fast-forward)" +msgstr "無法合併子模組 %s（非快轉）" + +#: merge-recursive.c +msgid "Found a possible merge resolution for the submodule:\n" +msgstr "找到子模組的一個可能的合併方案：\n" + +#: merge-recursive.c +#, c-format +msgid "Failed to merge submodule %s (multiple merges found)" +msgstr "無法合併子模組 %s （發現多個合併）" + +#: merge-recursive.c +#, c-format +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." +msgstr "錯誤：拒絕遺失未追蹤檔案 '%s'，而是寫入 %s。" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" +"本被保留。" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree." +msgstr "" +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " +"%7$s 版本被保留。" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版" +"本保留在 %8$s 中。" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " +"left in tree at %s." +msgstr "" +"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " +"%7$s 版本保留在 %9$s 中。" + +#: merge-recursive.c +msgid "rename" +msgstr "重新命名" + +#: merge-recursive.c +msgid "renamed" +msgstr "重新命名" + +#: merge-recursive.c +#, c-format +msgid "Refusing to lose dirty file at %s" +msgstr "拒絕遺失髒檔案 '%s'" + +#: merge-recursive.c +#, c-format +msgid "Refusing to lose untracked file at %s, even though it's in the way." +msgstr "拒絕在 '%s' 處失去未追蹤檔案，即使它存在於重新命名中。" + +#: merge-recursive.c +#, c-format +msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" +msgstr "" +"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s" + +#: merge-recursive.c +#, c-format +msgid "%s is a directory in %s adding as %s instead" +msgstr "%s 是 %s 中的一個目錄而已 %s 為名被新增" + +#: merge-recursive.c +#, c-format +msgid "Refusing to lose untracked file at %s; adding as %s instead" +msgstr "拒絕遺失未追蹤檔案 '%s'，而是新增為 %s" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"衝突（重新命名/重新命名）：在分支 \"%3$s\" 中重新命名 \"%1$s\"->\"%2$s\"，在" +"分支 \"%6$s\" 中重新命名 \"%4$s\"->\"%5$s\"%7$s" + +#: merge-recursive.c +msgid " (left unresolved)" +msgstr " （留下未解決）" + +#: merge-recursive.c +#, c-format +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgstr "" +"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 " +"%4$s->%5$s" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to place %s because " +"directory %s was renamed to multiple other directories, with no destination " +"getting a majority of the files." +msgstr "" +"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到" +"多個其它目錄，沒有目錄包含大部分檔案。" + +#: merge-recursive.c +#, c-format +msgid "" +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" +">%s in %s" +msgstr "" +"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新" +"命名目錄 %4$s->%5$s" + +#: merge-recursive.c +msgid "modify" +msgstr "修改" + +#: merge-recursive.c +msgid "modified" +msgstr "修改" + +#: merge-recursive.c +#, c-format +msgid "Skipped %s (merged same as existing)" +msgstr "略過 %s（已經做過相同合併）" + +#: merge-recursive.c +#, c-format +msgid "Adding as %s instead" +msgstr "而是以 %s 為名新增" + +#: merge-recursive.c +#, c-format +msgid "Removing %s" +msgstr "刪除 %s" + +#: merge-recursive.c +msgid "file/directory" +msgstr "檔案/目錄" + +#: merge-recursive.c +msgid "directory/file" +msgstr "目錄/檔案" + +#: merge-recursive.c +#, 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 +#, c-format +msgid "Adding %s" +msgstr "新增 %s" + +#: merge-recursive.c +#, c-format +msgid "CONFLICT (add/add): Merge conflict in %s" +msgstr "衝突（add/add）：合併衝突於 %s" + +#: merge-recursive.c +#, c-format +msgid "merging of trees %s and %s failed" +msgstr "無法合併樹 %s 和 %s" + +#: merge-recursive.c +msgid "Merging:" +msgstr "合併：" + +#: merge-recursive.c +#, c-format +msgid "found %u common ancestor:" +msgid_plural "found %u common ancestors:" +msgstr[0] "發現 %u 個共同祖先：" + +#: merge-recursive.c +msgid "merge returned no commit" +msgstr "合併未返回提交" + +#: merge-recursive.c +#, c-format +msgid "Could not parse object '%s'" +msgstr "不能解析物件 '%s'" + +#: merge.c +msgid "failed to read the cache" +msgstr "讀取快取失敗" + +#: midx.c +msgid "multi-pack-index OID fanout is of the wrong size" +msgstr "多包索引的物件 ID fanout 大小錯誤" + +#: midx.c +#, c-format +msgid "multi-pack-index file %s is too small" +msgstr "多包索引檔案 %s 太小" + +#: midx.c +#, c-format +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" +msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合" + +#: midx.c +#, c-format +msgid "multi-pack-index version %d not recognized" +msgstr "multi-pack-index 版本 %d 不能被識別" + +#: midx.c +#, c-format +msgid "multi-pack-index hash version %u does not match version %u" +msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合" + +#: midx.c +msgid "multi-pack-index missing required pack-name chunk" +msgstr "多包索引缺少必需的包名區塊" + +#: midx.c +msgid "multi-pack-index missing required OID fanout chunk" +msgstr "多包索引缺少必需的物件 ID fanout 區塊" + +#: midx.c +msgid "multi-pack-index missing required OID lookup chunk" +msgstr "多包索引缺少必需的物件 ID 查詢區塊" + +#: midx.c +msgid "multi-pack-index missing required object offsets chunk" +msgstr "多包索引缺少必需的物件位移區塊" + +#: midx.c +#, c-format +msgid "multi-pack-index pack names out of order: '%s' before '%s'" +msgstr "多包索引包名無序：'%s' 在 '%s' 之前" + +#: midx.c +#, c-format +msgid "bad pack-int-id: %u (%u total packs)" +msgstr "錯的 pack-int-id：%u（共有 %u 個包）" + +#: midx.c +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" +msgstr "多包索引儲存一個64位位移，但是 off_t 太小" + +#: midx.c +#, c-format +msgid "failed to add packfile '%s'" +msgstr "新增 packfile '%s' 失敗" + +#: midx.c +#, c-format +msgid "failed to open pack-index '%s'" +msgstr "開啟包索引 '%s' 失敗" + +#: midx.c +#, c-format +msgid "failed to locate object %d in packfile" +msgstr "在 packfile 中定位物件 %d 失敗" + +#: midx.c +msgid "cannot store reverse index file" +msgstr "無法儲存倒排索引檔案" + +#: midx.c +#, c-format +msgid "could not parse line: %s" +msgstr "無法解析橫列：%s" + +#: midx.c +#, c-format +msgid "malformed line: %s" +msgstr "橫列格式錯誤：%s" + +#: midx.c +msgid "ignoring existing multi-pack-index; checksum mismatch" +msgstr "忽略現有的多包索引：總和檢查碼不符" + +#: midx.c +msgid "could not load pack" +msgstr "無法載入包" + +#: midx.c +#, c-format +msgid "could not open index for %s" +msgstr "無法開啟 %s 的索引" + +#: midx.c +msgid "Adding packfiles to multi-pack-index" +msgstr "正在新增 packfile 至多包索引" + +#: midx.c +#, c-format +msgid "unknown preferred pack: '%s'" +msgstr "未知偏好包：「%s」" + +#: midx.c +#, c-format +msgid "cannot select preferred pack %s with no objects" +msgstr "無法選取偏好，沒有物件的 %s 包" + +#: midx.c +#, c-format +msgid "did not see pack-file %s to drop" +msgstr "沒有看到要捨棄的 packfile %s" + +#: midx.c +#, c-format +msgid "preferred pack '%s' is expired" +msgstr "偏好包「%s」已經過期" + +#: midx.c +msgid "no pack files to index." +msgstr "沒有要索引的 pack 檔案。" + +#: midx.c +msgid "refusing to write multi-pack .bitmap without any objects" +msgstr "拒絕寫入無任何物件的多包 .bitmap" + +#: midx.c +msgid "could not write multi-pack bitmap" +msgstr "無法寫入多包位圖" + +#: midx.c +msgid "could not write multi-pack-index" +msgstr "無法寫入多包索引" + +#: midx.c +#, c-format +msgid "failed to clear multi-pack-index at %s" +msgstr "清理位於 %s 的多包索引失敗" + +#: midx.c +msgid "multi-pack-index file exists, but failed to parse" +msgstr "有 multi-pack-index 檔案，但無法解析" + +#: midx.c +msgid "incorrect checksum" +msgstr "總和檢查碼不正確" + +#: midx.c +msgid "Looking for referenced packfiles" +msgstr "正在尋找引用的 packfile" + +#: midx.c +#, c-format +msgid "" +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" +msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" + +#: midx.c +msgid "the midx contains no oid" +msgstr "midx 沒有 oid" + +#: midx.c +msgid "Verifying OID order in multi-pack-index" +msgstr "正在驗證多包索引中的物件 ID 順序" + +#: midx.c +#, c-format +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" +msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]" + +#: midx.c +msgid "Sorting objects by packfile" +msgstr "透過 packfile 為物件排序" + +#: midx.c +msgid "Verifying object offsets" +msgstr "正在驗證物件位移" + +#: midx.c +#, c-format +msgid "failed to load pack entry for oid[%d] = %s" +msgstr "為 oid[%d] = %s 載入包條目失敗" + +#: midx.c +#, c-format +msgid "failed to load pack-index for packfile %s" +msgstr "為 packfile %s 載入包索引失敗" + +#: midx.c +#, c-format +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" +msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>" + +#: midx.c +msgid "Counting referenced objects" +msgstr "正在計算引用物件" + +#: midx.c +msgid "Finding and deleting unreferenced packfiles" +msgstr "正在尋找並刪除沒有引用的 packfile" + +#: midx.c +msgid "could not start pack-objects" +msgstr "不能開始 pack-objects" + +#: midx.c +msgid "could not finish pack-objects" +msgstr "不能結束 pack-objects" + +#: name-hash.c +#, c-format +msgid "unable to create lazy_dir thread: %s" +msgstr "不能建立 lazy_dir 執行緒：%s" + +#: name-hash.c +#, c-format +msgid "unable to create lazy_name thread: %s" +msgstr "不能建立 lazy_name 執行緒：%s" + +#: name-hash.c +#, c-format +msgid "unable to join lazy_name thread: %s" +msgstr "不能加入 lazy_name 執行緒：%s" + +#: notes-merge.c +#, c-format +msgid "" +"You have not concluded your previous notes merge (%s exists).\n" +"Please, use 'git notes merge --commit' or 'git notes merge --abort' to " +"commit/abort the previous merge before you start a new notes merge." +msgstr "" +"您的前一次備註合併尚未結束（存在 %s）。\n" +"在開始一個新的備註合併之前，請使用 'git notes merge --commit' 或者 'git " +"notes merge --abort' 來提交/終止前一次合併。" + +#: notes-merge.c +#, c-format +msgid "You have not concluded your notes merge (%s exists)." +msgstr "您尚未結束備註合併（存在 %s）。" + +#: notes-utils.c +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "不能提交未初始化/未引用的註解樹" + +#: notes-utils.c +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "壞的 notes.rewriteMode 值：'%s'" + +#: notes-utils.c +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "拒絕向 %s（在 refs/notes/ 之外）寫入註解" + +#. TRANSLATORS: The first %s is the name of +#. the environment variable, the second %s is +#. its value. +#. +#: notes-utils.c +#, c-format +msgid "Bad %s value: '%s'" +msgstr "壞的 %s 值：'%s'" + +#: object-file.c +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates" + +#: object-file.c +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "無法規範化備用物件路徑：%s" + +#: object-file.c +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s：忽略備用物件庫，嵌套太深" + +#: object-file.c +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "無法規範化物件目錄: %s" + +#: object-file.c +msgid "unable to fdopen alternates lockfile" +msgstr "無法 fdopen 取代鎖檔案" + +#: object-file.c +msgid "unable to read alternates file" +msgstr "無法讀取替代檔案" + +#: object-file.c +msgid "unable to move new alternates file into place" +msgstr "無法將新的替代檔案移動到位" + +#: object-file.c +#, c-format +msgid "path '%s' does not exist" +msgstr "路徑 '%s' 不存在" + +#: object-file.c +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "尚不支援將引用版本庫 '%s' 作為一個連結簽出。" + +#: object-file.c +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "引用版本庫 '%s' 不是一個本機版本庫。" + +#: object-file.c +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "引用版本庫 '%s' 是一個淺複製" + +#: object-file.c +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "引用版本庫 '%s' 已被移植" + +#: object-file.c +#, c-format +msgid "could not find object directory matching %s" +msgstr "找不到符合 %s 的物件目錄" + +#: object-file.c +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "解析備用引用時無效的行：%s" + +#: object-file.c +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>" + +#: object-file.c +#, c-format +msgid "mmap failed%s" +msgstr "mmap 失敗%s" + +#: object-file.c +#, c-format +msgid "object file %s is empty" +msgstr "物件檔案 %s 為空" + +#: object-file.c +#, c-format +msgid "corrupt loose object '%s'" +msgstr "損壞的鬆散物件 '%s'" + +#: object-file.c +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "鬆散物件 '%s' 後面有垃圾資料" + +#: object-file.c +#, c-format +msgid "unable to parse %s header" +msgstr "無法解析 %s 頭部" + +#: object-file.c +msgid "invalid object type" +msgstr "無效的物件類型" + +#: object-file.c +#, c-format +msgid "unable to unpack %s header" +msgstr "無法解開 %s 頭部" + +#: object-file.c +#, c-format +msgid "header for %s too long, exceeds %d bytes" +msgstr "%s 的標頭過長，超出 %d 位元組" + +#: object-file.c +#, c-format +msgid "failed to read object %s" +msgstr "讀取物件 %s 失敗" + +#: object-file.c +#, c-format +msgid "replacement %s not found for %s" +msgstr "找不到 %2$s 的替代 %1$s" + +#: object-file.c +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "鬆散物件 %s（儲存在 %s）已損壞" + +#: object-file.c +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "打包物件 %s（儲存在 %s）已損壞" + +#: object-file.c +#, c-format +msgid "unable to write file %s" +msgstr "無法寫檔案 %s" + +#: object-file.c +#, c-format +msgid "unable to set permission to '%s'" +msgstr "無法為 '%s' 設定權限" + +#: object-file.c +msgid "file write error" +msgstr "檔案寫錯誤" + +#: object-file.c +msgid "error when closing loose object file" +msgstr "關閉鬆散物件檔案時發生錯誤" + +#: object-file.c +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件" + +#: object-file.c +msgid "unable to create temporary file" +msgstr "無法建立暫存檔" + +#: object-file.c +msgid "unable to write loose object file" +msgstr "不能寫鬆散物件檔案" + +#: object-file.c +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "不能壓縮新物件 %s（%d）" + +#: object-file.c +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）" + +#: object-file.c +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "被 %s 的不穩定物件來源資料混淆" + +#: object-file.c +#, c-format +msgid "cannot read object for %s" +msgstr "不能讀取物件 %s" + +#: object-file.c +msgid "corrupt commit" +msgstr "損壞的提交" + +#: object-file.c +msgid "corrupt tag" +msgstr "損壞的標籤" + +#: object-file.c +#, c-format +msgid "read error while indexing %s" +msgstr "索引 %s 時讀取錯誤" + +#: object-file.c +#, c-format +msgid "short read while indexing %s" +msgstr "索引 %s 時讀入不完整" + +#: object-file.c +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s：插入資料庫失敗" + +#: object-file.c +#, c-format +msgid "%s: unsupported file type" +msgstr "%s：不支援的檔案類型" + +#: object-file.c +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s 不是一個有效的 '%s' 物件" + +#: object-file.c +#, c-format +msgid "unable to open %s" +msgstr "不能開啟 %s" + +#: object-file.c +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "%s 的雜湊值不符合（預期 %s）" + +#: object-file.c +#, c-format +msgid "unable to mmap %s" +msgstr "不能 mmap %s" + +#: object-file.c +#, c-format +msgid "unable to unpack header of %s" +msgstr "無法解壓縮 %s 的頭部" + +#: object-file.c +#, c-format +msgid "unable to parse header of %s" +msgstr "無法解析 %s 的頭部" + +#: object-file.c +#, c-format +msgid "unable to unpack contents of %s" +msgstr "無法解壓縮 %s 的內容" + +#. TRANSLATORS: This is a line of ambiguous object +#. output shown when we cannot look up or parse the +#. object in question. E.g. "deadbeef [bad object]". +#. +#: object-name.c +#, c-format +msgid "%s [bad object]" +msgstr "%s [無效物件]" + +#. TRANSLATORS: This is a line of ambiguous commit +#. object output. E.g.: +#. * +#. "deadbeef commit 2021-01-01 - Some Commit Message" +#. +#: object-name.c +#, c-format +msgid "%s commit %s - %s" +msgstr "%s 提交 %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output. E.g.: +#. * +#. "deadbeef tag 2022-01-01 - Some Tag Message" +#. * +#. The second argument is the YYYY-MM-DD found +#. in the tag. +#. * +#. The third argument is the "tag" string +#. from object.c. +#. +#: object-name.c +#, c-format +msgid "%s tag %s - %s" +msgstr "%s 標籤 %s - %s" + +#. TRANSLATORS: This is a line of ambiguous +#. tag object output where we couldn't parse +#. the tag itself. E.g.: +#. * +#. "deadbeef [bad tag, could not parse it]" +#. +#: object-name.c +#, c-format +msgid "%s [bad tag, could not parse it]" +msgstr "%s [無效標籤，無法解析]" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef tree". +#. +#: object-name.c +#, c-format +msgid "%s tree" +msgstr "%s 樹" + +#. TRANSLATORS: This is a line of ambiguous <type> +#. object output. E.g. "deadbeef blob". +#. +#: object-name.c +#, c-format +msgid "%s blob" +msgstr "%s blob" + +#: object-name.c +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "短物件 ID %s 存在歧義" + +#. TRANSLATORS: The argument is the list of ambiguous +#. objects composed in show_ambiguous_object(). See +#. its "TRANSLATORS" comments for details. +#. +#: object-name.c +#, c-format +msgid "" +"The candidates are:\n" +"%s" +msgstr "" +"候選物件有：\n" +"%s" + +#: object-name.c +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git 通常不會建立以 40 個十六進位字元結尾的引用，\n" +"因為當您只提供 40 個十六進位字元時，其將被忽略。\n" +"這些引用可能被意外建立。例如：\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"當「$br」因為某些原因空白時，會建立出 40 位十六進位的引用。\n" +"請檢查這些引用，並視需要刪除。執行\n" +"「git config advice.objectNameWarning false」命令以關閉本訊息通知" + +#: object-name.c +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "'%.*s' 的日誌只能回到 %s" + +#: object-name.c +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "'%.*s' 的日誌只有 %d 個項目" + +#: object-name.c +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'" + +#: object-name.c +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"'%s' 路徑存在，但不是 '%s'\n" +"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？" + +#: object-name.c +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "'%s' 路徑不存在於 '%.*s'" + +#: object-name.c +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"'%s' 路徑在索引，但不在 %d 暫存區\n" +"提示：你在說 ':%d:%s' 嗎？" + +#: object-name.c +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"'%s' 路徑在索引，但不是 '%s'\n" +"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？" + +#: object-name.c +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "磁碟上存在 '%s' 路徑，但不在索引中" + +#: object-name.c +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)" + +#: object-name.c +msgid "relative path syntax can't be used outside working tree" +msgstr "相對路徑與法不能用在工作區外" + +#: object-name.c +#, c-format +msgid "<object>:<path> required, only <object> '%s' given" +msgstr "需要指定 <object>:<path>，卻只指定 <object>「%s」" + +#: object-name.c +#, c-format +msgid "invalid object name '%.*s'." +msgstr "'%.*s' 物件名稱無效。" + +#: object.c +#, c-format +msgid "invalid object type \"%s\"" +msgstr "無效的物件類型 \"%s\"" + +#: object.c +#, c-format +msgid "object %s is a %s, not a %s" +msgstr "物件 %s 是一個 %s，不是一個 %s" + +#: object.c +#, c-format +msgid "object %s has unknown type id %d" +msgstr "物件 %s 有未知的類型 id %d" + +#: object.c +#, c-format +msgid "unable to parse object: %s" +msgstr "不能解析物件：%s" + +#: object.c +#, c-format +msgid "hash mismatch %s" +msgstr "雜湊值與 %s 不符合" + +#: pack-bitmap.c +msgid "multi-pack bitmap is missing required reverse index" +msgstr "多包位圖缺少需要的反向索引" + +#: pack-bitmap.c +#, c-format +msgid "could not open pack %s" +msgstr "無法開啟封包 %s" + +#: pack-bitmap.c +#, c-format +msgid "preferred pack (%s) is invalid" +msgstr "偏好的封包 (%s) 無效" + +#: pack-bitmap.c +#, c-format +msgid "could not find %s in pack %s at offset %<PRIuMAX>" +msgstr "找不到 %2$s 包，偏移位置 %3$<PRIuMAX> 的 %1$s" + +#: pack-mtimes.c +#, c-format +msgid "mtimes file %s is too small" +msgstr "mtimes 檔案 %s 太小" + +#: pack-mtimes.c +#, c-format +msgid "mtimes file %s has unknown signature" +msgstr "mtimes 檔案 %s 有無效簽章" + +#: pack-mtimes.c +#, c-format +msgid "mtimes file %s has unsupported version %<PRIu32>" +msgstr "mtimes 檔案 %s 有不支援的版本 %<PRIu32>" + +#: pack-mtimes.c +#, c-format +msgid "mtimes file %s has unsupported hash id %<PRIu32>" +msgstr "mtimes 檔案 %s 有不支援的 hash ID %<PRIu32>" + +#: pack-mtimes.c +#, c-format +msgid "mtimes file %s is corrupt" +msgstr "mtimes 檔案 %s 損壞" + +#: pack-revindex.c +#, c-format +msgid "reverse-index file %s is too small" +msgstr "%s 倒排索引檔案過小" + +#: pack-revindex.c +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "%s 倒排索引檔案損壞" + +#: pack-revindex.c +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "%s 倒排索引檔案有未知簽章" + +#: pack-revindex.c +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>" + +#: pack-revindex.c +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>" + +#: pack-write.c +msgid "cannot both write and verify reverse index" +msgstr "無法同時寫入和驗證倒排索引" + +#: pack-write.c +#, c-format +msgid "could not stat: %s" +msgstr "無法 stat：%s" + +#: pack-write.c +#, c-format +msgid "failed to make %s readable" +msgstr "無法讓 %s 能夠寫入" + +#: pack-write.c +#, c-format +msgid "could not write '%s' promisor file" +msgstr "無法寫入「%s」promisor 檔案" + +#: packfile.c +msgid "offset before end of packfile (broken .idx?)" +msgstr "位移量在 packfile 結束之前（損壞的 .idx？）" + +#: packfile.c +#, c-format +msgid "packfile %s cannot be mapped%s" +msgstr "packfile %s 無法映射%s" + +#: packfile.c +#, c-format +msgid "offset before start of pack index for %s (corrupt index?)" +msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）" + +#: packfile.c +#, c-format +msgid "offset beyond end of pack index for %s (truncated index?)" +msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）" + +#: parse-options-cb.c +#, c-format +msgid "malformed expiration date '%s'" +msgstr "格式錯誤的到期時間：'%s'" + +#: parse-options-cb.c +#, c-format +msgid "option `%s' expects \"always\", \"auto\", or \"never\"" +msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" + +#: parse-options-cb.c +#, c-format +msgid "malformed object name '%s'" +msgstr "格式錯誤的物件名 '%s'" + +#: parse-options-cb.c +#, c-format +msgid "option `%s' expects \"%s\" or \"%s\"" +msgstr "選項「%s」期望「%s」或「%s」" + +#: parse-options.c +#, c-format +msgid "%s requires a value" +msgstr "%s 需要一個值" + +#: parse-options.c +#, c-format +msgid "%s is incompatible with %s" +msgstr "%s 與 %s 不相容" + +#: parse-options.c +#, c-format +msgid "%s : incompatible with something else" +msgstr "%s：和其它的不相容" + +#: parse-options.c +#, c-format +msgid "%s takes no value" +msgstr "%s 不取值" + +#: parse-options.c +#, c-format +msgid "%s isn't available" +msgstr "%s 不可用" + +#: parse-options.c +#, c-format +msgid "%s expects a non-negative integer value with an optional k/m/g suffix" +msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴" + +#: parse-options.c +#, c-format +msgid "ambiguous option: %s (could be --%s%s or --%s%s)" +msgstr "有歧義的選項：%s（可以是 --%s%s 或 --%s%s）" + +#: parse-options.c +#, c-format +msgid "did you mean `--%s` (with two dashes)?" +msgstr "你的意思是 `--%s`（有兩個短線）嗎？" + +#: parse-options.c +#, c-format +msgid "alias of --%s" +msgstr "--%s 的別名" + +#: parse-options.c +#, c-format +msgid "unknown option `%s'" +msgstr "未知選項 `%s'" + +#: parse-options.c +#, c-format +msgid "unknown switch `%c'" +msgstr "未知開關 `%c'" + +#: parse-options.c +#, c-format +msgid "unknown non-ascii option in string: `%s'" +msgstr "字串中未知的非 ascii 字元選項：`%s'" + +#: parse-options.c +msgid "..." +msgstr "..." + +#: parse-options.c +#, c-format +msgid "usage: %s" +msgstr "用法：%s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation. +#. +#: parse-options.c +#, c-format +msgid " or: %s" +msgstr " 或：%s" + +#. TRANSLATORS: You should only need to translate this format +#. string if your language is a RTL language (e.g. Arabic, +#. Hebrew etc.), not if it's a LTR language (e.g. German, +#. Russian, Chinese etc.). +#. * +#. When a translated usage string has an embedded "\n" it's +#. because options have wrapped to the next line. The line +#. after the "\n" will then be padded to align with the +#. command name, such as N_("git cmd [opt]\n<8 +#. spaces>[opt2]"), where the 8 spaces are the same length as +#. "git cmd ". +#. * +#. This format string prints out that already-translated +#. line. The "%*s" is whitespace padding to account for the +#. padding at the start of the line that we add in this +#. function. The "%s" is a line in the (hopefully already +#. translated) N_() usage string, which contained embedded +#. newlines before we split it up. +#. +#: parse-options.c +#, c-format +msgid "%*s%s" +msgstr "%*s%s" + +# 譯者：為保證在輸出中對齊，注意調整句中空格！ +#: parse-options.c +#, c-format +msgid " %s" +msgstr " %s" + +#: parse-options.c +msgid "-NUM" +msgstr "-數字" + +#: parse-options.h +msgid "expiry-date" +msgstr "到期時間" + +#: parse-options.h +msgid "no-op (backward compatibility)" +msgstr "空動作（向後相容）" + +#: parse-options.h +msgid "be more verbose" +msgstr "更加詳細" + +#: parse-options.h +msgid "be more quiet" +msgstr "更加安靜" + +#: parse-options.h +msgid "use <n> digits to display object names" +msgstr "用 <n> 位數字顯示物件名稱" + +#: parse-options.h +msgid "how to strip spaces and #comments from message" +msgstr "設定如何刪除提交說明裡的空格和 #備註" + +#: parse-options.h +msgid "read pathspec from file" +msgstr "從檔案讀取 <路徑規格>" + +#: parse-options.h +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔" + +#: path.c +#, c-format +msgid "Could not make %s writable by group" +msgstr "不能設定 %s 為組可寫" + +#: pathspec.c +msgid "Escape character '\\' not allowed as last character in attr value" +msgstr "跳脫字元 '\\' 不能作為屬性值的最後一個字元" + +#: pathspec.c +msgid "Only one 'attr:' specification is allowed." +msgstr "只允許一個 'attr:' 規格。" + +#: pathspec.c +msgid "attr spec must not be empty" +msgstr "屬性規格不能為空" + +#: pathspec.c +#, c-format +msgid "invalid attribute name %s" +msgstr "無效的屬性名 %s" + +#: pathspec.c +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" +msgstr "全域的 'glob' 和 'noglob' 路徑規格設定不相容" + +#: pathspec.c +msgid "" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" +msgstr "全域的 'literal' 路徑規格設定和其它的全域路徑規格設定不相容" + +#: pathspec.c +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "路徑規格包含無效的神奇前綴" + +#: pathspec.c +#, c-format +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "在路徑規格 '%3$s' 中無效的神奇前綴 '%2$.*1$s'" + +#: pathspec.c +#, c-format +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "路徑規格 '%s' 的神奇前綴結尾少了一個 ')'" + +#: pathspec.c +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'" + +#: pathspec.c +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s：'literal' 和 'glob' 不相容" + +#: pathspec.c +#, c-format +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s：'%s' 在位於 '%s' 的版本庫之外" + +#: pathspec.c +#, c-format +msgid "'%s' (mnemonic: '%c')" +msgstr "'%s'（助記符：'%c'）" + +#: pathspec.c +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "%s：路徑規格神奇前綴不被此指令支援：%s" + +#: pathspec.c +#, c-format +msgid "pathspec '%s' is beyond a symbolic link" +msgstr "路徑規格 '%s' 位於符號連結中" + +#: pathspec.c +#, c-format +msgid "line is badly quoted: %s" +msgstr "某行不應該被括號括住：%s" + +#: pkt-line.c +msgid "unable to write flush packet" +msgstr "無法寫 flush 包" + +#: pkt-line.c +msgid "unable to write delim packet" +msgstr "無法寫 delim 包" + +#: pkt-line.c +msgid "unable to write response end packet" +msgstr "無法寫入回應結尾封包" + +#: pkt-line.c +msgid "flush packet write failed" +msgstr "flush 包寫錯誤" + +#: pkt-line.c +msgid "protocol error: impossibly long line" +msgstr "協定錯誤：不可能的長行" + +#: pkt-line.c +msgid "packet write with format failed" +msgstr "格式化包寫入錯誤" + +#: pkt-line.c +msgid "packet write failed - data exceeds max packet size" +msgstr "寫封包失敗：資料超過了包的最大長度" + +#: pkt-line.c +#, c-format +msgid "packet write failed: %s" +msgstr "封包寫入失敗：%s" + +#: pkt-line.c +msgid "read error" +msgstr "讀取錯誤" + +#: pkt-line.c +msgid "the remote end hung up unexpectedly" +msgstr "遠端意外掛斷了" + +#: pkt-line.c +#, c-format +msgid "protocol error: bad line length character: %.4s" +msgstr "協定錯誤：錯誤的行長度字串：%.4s" + +#: pkt-line.c +#, c-format +msgid "protocol error: bad line length %d" +msgstr "協定錯誤：錯誤的行長度 %d" + +#: pkt-line.c sideband.c +#, c-format +msgid "remote error: %s" +msgstr "遠端錯誤：%s" + +#: preload-index.c +msgid "Refreshing index" +msgstr "正在重新整理索引" + +#: preload-index.c +#, c-format +msgid "unable to create threaded lstat: %s" +msgstr "無法建立執行緒 lstat：%s" + +#: pretty.c +msgid "unable to parse --pretty format" +msgstr "不能解析 --pretty 格式" + +#: promisor-remote.c +msgid "promisor-remote: unable to fork off fetch subprocess" +msgstr "promisor-remote: 無法 fork fetch 子處理程序" + +#: promisor-remote.c +msgid "promisor-remote: could not write to fetch subprocess" +msgstr "promisor-remote: 無法寫入 fetch 子處理程序" + +#: promisor-remote.c +msgid "promisor-remote: could not close stdin to fetch subprocess" +msgstr "promisor-remote: 無法關閉 fetch 子處理程序的 stdin" + +#: promisor-remote.c +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "promisor 遠端名稱不能以 '/' 開始：%s" + +#: protocol-caps.c +msgid "object-info: expected flush after arguments" +msgstr "object-info：引數後預期要有 flush" + +#: prune-packed.c +msgid "Removing duplicate objects" +msgstr "正在刪除重複物件" + +#: range-diff.c +msgid "could not start `log`" +msgstr "不能啟動 `log`" + +#: range-diff.c +msgid "could not read `log` output" +msgstr "不能讀取 `log` 的輸出" + +#: range-diff.c sequencer.c +#, c-format +msgid "could not parse commit '%s'" +msgstr "不能解析提交 '%s'" + +#: range-diff.c +#, c-format +msgid "" +"could not parse first line of `log` output: did not start with 'commit ': " +"'%s'" +msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」" + +#: range-diff.c +#, c-format +msgid "could not parse git header '%.*s'" +msgstr "無法解析 git 頭 '%.*s'" + +#: range-diff.c +msgid "failed to generate diff" +msgstr "生成 diff 失敗" + +#: range-diff.c +#, c-format +msgid "could not parse log for '%s'" +msgstr "不能解析 '%s' 的日誌" + +#: read-cache.c +#, c-format +msgid "will not add file alias '%s' ('%s' already exists in index)" +msgstr "將不會新增檔案別名 '%s'（'%s' 已經存在於索引中）" + +#: read-cache.c +msgid "cannot create an empty blob in the object database" +msgstr "不能在物件資料庫中建立空的資料物件" + +#: read-cache.c +#, c-format +msgid "%s: can only add regular files, symbolic links or git-directories" +msgstr "%s：只能新增一般檔案、符號連結或 git 目錄" + +#: read-cache.c +#, c-format +msgid "unable to index file '%s'" +msgstr "無法索引檔案 '%s'" + +#: read-cache.c +#, c-format +msgid "unable to add '%s' to index" +msgstr "無法在索引中新增 '%s'" + +#: read-cache.c +#, c-format +msgid "unable to stat '%s'" +msgstr "無法對 %s 執行 stat" + +#: read-cache.c +#, c-format +msgid "'%s' appears as both a file and as a directory" +msgstr "'%s' 看起來既是檔案又是目錄" + +#: read-cache.c +msgid "Refresh index" +msgstr "重新整理索引" + +#: read-cache.c +#, c-format +msgid "" +"index.version set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"設定了 index.version，但是取值無效。\n" +"使用版本 %i" + +#: read-cache.c +#, c-format +msgid "" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" +msgstr "" +"設定了 GIT_INDEX_VERSION，但是取值無效。\n" +"使用版本 %i" + +#: read-cache.c +#, c-format +msgid "bad signature 0x%08x" +msgstr "壞的簽名 0x%08x" + +#: read-cache.c +#, c-format +msgid "bad index version %d" +msgstr "壞的索引版本 %d" + +#: read-cache.c +msgid "bad index file sha1 signature" +msgstr "壞的索引檔案 sha1 簽名" + +#: read-cache.c +#, c-format +msgid "index uses %.4s extension, which we do not understand" +msgstr "索引使用不被支援的 %.4s 副檔名" + +# +#: read-cache.c +#, c-format +msgid "ignoring %.4s extension" +msgstr "忽略 %.4s 副檔名" + +#: read-cache.c +#, c-format +msgid "unknown index entry format 0x%08x" +msgstr "未知的索引條目格式 0x%08x" + +#: read-cache.c +#, c-format +msgid "malformed name field in the index, near path '%s'" +msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位" + +#: read-cache.c +msgid "unordered stage entries in index" +msgstr "索引中有未排序的暫存條目" + +#: read-cache.c +#, c-format +msgid "multiple stage entries for merged file '%s'" +msgstr "合併檔案 '%s' 有多個暫存條目" + +#: read-cache.c +#, c-format +msgid "unordered stage entries for '%s'" +msgstr "'%s' 的未排序暫存條目" + +#: read-cache.c +#, c-format +msgid "unable to create load_cache_entries thread: %s" +msgstr "無法建立 load_cache_entries 執行緒：%s" + +#: read-cache.c +#, c-format +msgid "unable to join load_cache_entries thread: %s" +msgstr "無法加入 load_cache_entries 執行緒：%s" + +#: read-cache.c +#, c-format +msgid "%s: index file open failed" +msgstr "%s：開啟索引檔案失敗" + +#: read-cache.c +#, c-format +msgid "%s: cannot stat the open index" +msgstr "%s：不能對開啟的索引執行 stat 動作" + +#: read-cache.c +#, c-format +msgid "%s: index file smaller than expected" +msgstr "%s：索引檔案比預期的小" + +#: read-cache.c +#, c-format +msgid "%s: unable to map index file%s" +msgstr "%s：無法 map 索引檔案%s" + +#: read-cache.c +#, c-format +msgid "unable to create load_index_extensions thread: %s" +msgstr "無法建立 load_index_extensions 執行緒：%s" + +#: read-cache.c +#, c-format +msgid "unable to join load_index_extensions thread: %s" +msgstr "無法加入 load_index_extensions 執行緒：%s" + +#: read-cache.c +#, c-format +msgid "could not freshen shared index '%s'" +msgstr "無法重新整理共享索引 '%s'" + +#: read-cache.c +#, c-format +msgid "broken index, expect %s in %s, got %s" +msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s" + +#: read-cache.c +msgid "cannot write split index for a sparse index" +msgstr "無法寫入稀疏索引的索引分割" + +#: read-cache.c +msgid "failed to convert to a sparse-index" +msgstr "無法轉換成稀疏索引" + +#: read-cache.c +#, c-format +msgid "could not stat '%s'" +msgstr "不能對 '%s' 呼叫 stat" + +#: read-cache.c +#, c-format +msgid "unable to open git dir: %s" +msgstr "不能開啟 git 目錄：%s" + +#: read-cache.c +#, c-format +msgid "unable to unlink: %s" +msgstr "無法刪除：%s" + +#: read-cache.c +#, c-format +msgid "cannot fix permission bits on '%s'" +msgstr "不能修復 '%s' 的權限位" + +#: read-cache.c +#, c-format +msgid "%s: cannot drop to stage #0" +msgstr "%s：不能落到暫存區 #0" + +#: rebase-interactive.c +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"您可以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n" +"或者您可以用 'git rebase --abort' 終止重定基底。\n" + +#: rebase-interactive.c +#, c-format +msgid "" +"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." +msgstr "選項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。" + +#: rebase-interactive.c +msgid "" +"\n" +"Commands:\n" +"p, pick <commit> = use commit\n" +"r, reword <commit> = use commit, but edit the commit message\n" +"e, edit <commit> = use commit, but stop for amending\n" +"s, squash <commit> = use commit, but meld into previous commit\n" +"f, fixup [-C | -c] <commit> = like \"squash\" but keep only the previous\n" +" commit's log message, unless -C is used, in which case\n" +" keep only this commit's message; -c is same as -C but\n" +" opens the editor\n" +"x, exec <command> = run command (the rest of the line) using shell\n" +"b, break = stop here (continue rebase later with 'git rebase --continue')\n" +"d, drop <commit> = remove commit\n" +"l, label <label> = label current HEAD with a name\n" +"t, reset <label> = reset HEAD to a label\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". create a merge commit using the original merge commit's\n" +". message (or the oneline, if no original merge commit was\n" +". specified); use -c <commit> to reword the commit message\n" +"\n" +"These lines can be re-ordered; they are executed from top to bottom.\n" +msgstr "" +"\n" +"指令：\n" +"p, pick <提交> = 使用提交\n" +"r, reword <提交> = 使用提交，但編輯提交說明\n" +"e, edit <提交> = 使用提交，但不直接修補 (amend) \n" +"s, squash <提交> = 使用提交，但融合至上個提交\n" +"f, fixup [-C | -c] <提交> = 跟 “squash” 相似，但除非傳入「-C」\n" +" 否則只保留上一個提交的日誌訊息。傳入 -C 表示只保留這個\n" +" 提交的訊息；傳入 -c 與 -C 功能相同，但會開啟編輯器\n" +"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n" +"b, break = 在這停止（使用 'git rebase --continue' 繼續重定基底）\n" +"d, drop <提交> = 移除提交\n" +"l, label <標籤> = 為目前 HEAD 打上指定名字標籤\n" +"t, reset <標籤> = 重設 HEAD 到指定標籤\n" +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" +". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" +". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" +". -c <commit> 可以編輯提交說明。\n" +"\n" +"可以對這些行重新排序，會從上至下執行。\n" + +#: rebase-interactive.c +#, c-format +msgid "Rebase %s onto %s (%d command)" +msgid_plural "Rebase %s onto %s (%d commands)" +msgstr[0] "重定基底 %s 到 %s（%d 個提交）" + +#: rebase-interactive.c +msgid "" +"\n" +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n" +msgstr "" +"\n" +"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n" + +#: rebase-interactive.c +msgid "" +"\n" +"If you remove a line here THAT COMMIT WILL BE LOST.\n" +msgstr "" +"\n" +"如果您在這裡刪除一行，對應的提交將會遺失。\n" + +#: rebase-interactive.c +msgid "" +"\n" +"You are editing the todo file of an ongoing interactive rebase.\n" +"To continue rebase after editing, run:\n" +" git rebase --continue\n" +"\n" +msgstr "" +"\n" +"您正在修改進行中的互動式重定基底待辦列表。若要在編輯結束後繼續重定基底，\n" +"請執行：\n" +" git rebase --continue\n" +"\n" + +#: rebase-interactive.c +msgid "" +"\n" +"However, if you remove everything, the rebase will be aborted.\n" +"\n" +msgstr "" +"\n" +"然而，如果您刪除全部內容，重定基底動作將會終止。\n" +"\n" + +#: rebase-interactive.c +#, c-format +msgid "could not write '%s'." +msgstr "不能寫入 '%s'。" + +#: rebase-interactive.c +#, c-format +msgid "" +"Warning: some commits may have been dropped accidentally.\n" +"Dropped commits (newer to older):\n" +msgstr "" +"警告：一些提交可能被意外捨棄。\n" +"捨棄的提交（從新到舊）：\n" + +#: rebase-interactive.c +#, c-format +msgid "" +"To avoid this message, use \"drop\" to explicitly remove a commit.\n" +"\n" +"Use 'git config rebase.missingCommitsCheck' to change the level of " +"warnings.\n" +"The possible behaviours are: ignore, warn, error.\n" +"\n" +msgstr "" +"為避免這條訊息，使用 \"drop\" 指令顯式地刪除一個提交。\n" +"\n" +"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n" +"可選值有：ignore、warn、error。\n" +"\n" + +#: rebase.c +#, c-format +msgid "%s: 'preserve' superseded by 'merges'" +msgstr "%s：「preserve」已經改成「merges」" + +#: ref-filter.c wt-status.c +msgid "gone" +msgstr "遺失" + +#: ref-filter.c +#, c-format +msgid "ahead %d" +msgstr "領先 %d" + +#: ref-filter.c +#, c-format +msgid "behind %d" +msgstr "落後 %d" + +#: ref-filter.c +#, c-format +msgid "ahead %d, behind %d" +msgstr "領先 %d，落後 %d" + +#: ref-filter.c +#, c-format +msgid "expected format: %%(color:<color>)" +msgstr "期望的格式：%%(color:<顏色>)" + +#: ref-filter.c +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "無法識別的顏色：%%(color:%s)" + +#: ref-filter.c +#, c-format +msgid "Integer value expected refname:lstrip=%s" +msgstr "期望整數值 refname:lstrip=%s" + +#: ref-filter.c +#, c-format +msgid "Integer value expected refname:rstrip=%s" +msgstr "期望整數值 refname:rstrip=%s" + +#: ref-filter.c +#, c-format +msgid "unrecognized %%(%s) argument: %s" +msgstr "無法識別的 %%(%s) 參數：%s" + +#: ref-filter.c +#, c-format +msgid "%%(objecttype) does not take arguments" +msgstr "%%(objecttype) 不帶參數" + +#: ref-filter.c +#, c-format +msgid "%%(deltabase) does not take arguments" +msgstr "%%(deltabase) 不帶參數" + +#: ref-filter.c +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) 不帶參數" + +#: ref-filter.c +#, c-format +msgid "expected %%(trailers:key=<value>)" +msgstr "預期是 %%(trailers:key=<value>)" + +#: ref-filter.c +#, c-format +msgid "unknown %%(trailers) argument: %s" +msgstr "未知的 %%(trailers) 參數：%s" + +#: ref-filter.c +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "期望一個正數 contents:lines=%s" + +#: ref-filter.c +#, c-format +msgid "positive value expected '%s' in %%(%s)" +msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值" + +#: ref-filter.c +#, c-format +msgid "unrecognized email option: %s" +msgstr "無法識別的 email 選項：%s" + +#: ref-filter.c +#, c-format +msgid "expected format: %%(align:<width>,<position>)" +msgstr "期望的格式：%%(align:<寬度>,<位置>)" + +#: ref-filter.c +#, c-format +msgid "unrecognized position:%s" +msgstr "無法識別的位置：%s" + +#: ref-filter.c +#, c-format +msgid "unrecognized width:%s" +msgstr "無法識別的寬度：%s" + +#: ref-filter.c +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "元素 %%(align) 需要一個正數的寬度" + +#: ref-filter.c +#, c-format +msgid "%%(rest) does not take arguments" +msgstr "%%(rest) 未取引數" + +#: ref-filter.c +#, c-format +msgid "malformed field name: %.*s" +msgstr "格式錯誤的欄位名：%.*s" + +#: ref-filter.c +#, c-format +msgid "unknown field name: %.*s" +msgstr "未知的欄位名：%.*s" + +#: ref-filter.c +#, c-format +msgid "" +"not a git repository, but the field '%.*s' requires access to object data" +msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料" + +#: ref-filter.c +#, c-format +msgid "format: %%(%s) atom used without a %%(%s) atom" +msgstr "format：使用 %%(%s) 元素卻缺少 %%(%s) 元素" + +#: ref-filter.c +#, c-format +msgid "format: %%(then) atom used more than once" +msgstr "格式：%%(then) 元素用了多次" + +#: ref-filter.c +#, c-format +msgid "format: %%(then) atom used after %%(else)" +msgstr "格式：%%(then) 元素用在了 %%(else) 之後" + +#: ref-filter.c +#, c-format +msgid "format: %%(else) atom used more than once" +msgstr "格式：%%(else) 元素用了多次" + +#: ref-filter.c +#, c-format +msgid "format: %%(end) atom used without corresponding atom" +msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素" + +#: ref-filter.c +#, c-format +msgid "malformed format string %s" +msgstr "錯誤的格式化字串 %s" + +#: ref-filter.c +#, c-format +msgid "this command reject atom %%(%.*s)" +msgstr "本命令拒絕 atom %%(%.*s)" + +#: ref-filter.c +#, c-format +msgid "--format=%.*s cannot be used with --python, --shell, --tcl" +msgstr "--format=%.*s 不能和 --python、--shell、--tcl 一起使用" + +#: ref-filter.c +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "（無分支，重定 %s 的基底）" + +#: ref-filter.c +#, c-format +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "（無分支，重定 %s 分離開頭指標的基底）" + +#: ref-filter.c +#, c-format +msgid "(no branch, bisect started on %s)" +msgstr "（無分支，二分搜尋從 %s 開始）" + +#: ref-filter.c +#, c-format +msgid "(HEAD detached at %s)" +msgstr "（開頭指標分離於 %s）" + +#: ref-filter.c +#, c-format +msgid "(HEAD detached from %s)" +msgstr "（開頭指標分離自 %s）" + +#: ref-filter.c +msgid "(no branch)" +msgstr "（無分支）" + +#: ref-filter.c +#, c-format +msgid "missing object %s for %s" +msgstr "缺少 %2$s 的物件 %1$s" + +#: ref-filter.c +#, c-format +msgid "parse_object_buffer failed on %s for %s" +msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s" + +#: ref-filter.c +#, c-format +msgid "malformed object at '%s'" +msgstr "格式錯誤的物件 '%s'" + +#: ref-filter.c +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "忽略帶有錯誤名稱 %s 的引用" + +#: ref-filter.c refs.c +#, c-format +msgid "ignoring broken ref %s" +msgstr "忽略損壞的引用 %s" + +#: ref-filter.c +#, c-format +msgid "format: %%(end) atom missing" +msgstr "格式：缺少 %%(end) 元素" + +#: ref-filter.c +#, c-format +msgid "malformed object name %s" +msgstr "格式錯誤的物件名 %s" + +#: ref-filter.c +#, c-format +msgid "option `%s' must point to a commit" +msgstr "選項 `%s' 必須指向一個提交" + +#: ref-filter.h +msgid "key" +msgstr "key" + +#: ref-filter.h +msgid "field name to sort on" +msgstr "排序的欄位名" + +#: reflog.c +#, c-format +msgid "not a reflog: %s" +msgstr "不是引用日誌：%s" + +#: reflog.c +#, c-format +msgid "no reflog for '%s'" +msgstr "沒有 '%s' 的引用日誌" + +#: refs.c +#, c-format +msgid "%s does not point to a valid object!" +msgstr "%s 沒有指向一個有效的物件！" + +#: refs.c +#, c-format +msgid "" +"Using '%s' as the name for the initial branch. This default branch name\n" +"is subject to change. To configure the initial branch name to use in all\n" +"of your new repositories, which will suppress this warning, call:\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" +"'development'. The just-created branch can be renamed via this command:\n" +"\n" +"\tgit branch -m <name>\n" +msgstr "" +"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n" +"如果要設定所有新版本庫要使用的初始分支名稱，\n" +"請呼叫（會隱藏這個警告）：\n" +"\n" +"\tgit config --global init.defaultBranch <name>\n" +"\n" +"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n" +"“development”。剛建立的分支可以用這個命令重新命名：\n" +"\n" +"\tgit branch -m <name>\n" + +#: refs.c +#, c-format +msgid "could not retrieve `%s`" +msgstr "無法擷取「%s」" + +#: refs.c +#, c-format +msgid "invalid branch name: %s = %s" +msgstr "分支名稱無效：%s = %s" + +#: refs.c +#, c-format +msgid "ignoring dangling symref %s" +msgstr "忽略懸空符號引用 %s" + +#: refs.c +#, c-format +msgid "log for ref %s has gap after %s" +msgstr "引用 %s 的日誌在 %s 之後有缺口" + +#: refs.c +#, c-format +msgid "log for ref %s unexpectedly ended on %s" +msgstr "引用 %s 的日誌意外終止於 %s" + +#: refs.c +#, c-format +msgid "log for %s is empty" +msgstr "%s 的日誌為空" + +#: refs.c +#, c-format +msgid "refusing to update ref with bad name '%s'" +msgstr "拒絕更新有錯誤名稱 '%s' 的引用" + +#: refs.c +#, c-format +msgid "update_ref failed for ref '%s': %s" +msgstr "對引用 '%s' 執行 update_ref 失敗：%s" + +#: refs.c +#, c-format +msgid "multiple updates for ref '%s' not allowed" +msgstr "不允許對引用 '%s' 多次更新" + +#: refs.c +msgid "ref updates forbidden inside quarantine environment" +msgstr "在隔離環境中禁止更新引用" + +#: refs.c +msgid "ref updates aborted by hook" +msgstr "引用更新被掛鉤拒絕" + +#: refs.c +#, c-format +msgid "'%s' exists; cannot create '%s'" +msgstr "'%s' 已存在，無法建立 '%s'" + +#: refs.c +#, c-format +msgid "cannot process '%s' and '%s' at the same time" +msgstr "無法同時處理 '%s' 和 '%s'" + +#: refs/files-backend.c +#, c-format +msgid "could not remove reference %s" +msgstr "無法刪除引用 %s" + +#: refs/files-backend.c refs/packed-backend.c +#, c-format +msgid "could not delete reference %s: %s" +msgstr "無法刪除引用 %s：%s" + +#: refs/files-backend.c refs/packed-backend.c +#, c-format +msgid "could not delete references: %s" +msgstr "無法刪除引用：%s" + +#: refspec.c +#, c-format +msgid "invalid refspec '%s'" +msgstr "無效的引用規格：「%s」" + +#: remote-curl.c +#, c-format +msgid "invalid quoting in push-option value: '%s'" +msgstr "在 push-option 取值中無效的引號：'%s'" + +#: remote-curl.c +#, c-format +msgid "%sinfo/refs not valid: is this a git repository?" +msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？" + +#: remote-curl.c +msgid "invalid server response; expected service, got flush packet" +msgstr "無效的服務端回應。預期服務，得到 flush 包" + +#: remote-curl.c +#, c-format +msgid "invalid server response; got '%s'" +msgstr "無效的服務端回應，得到 '%s'" + +#: remote-curl.c +#, c-format +msgid "repository '%s' not found" +msgstr "版本庫 '%s' 未找到" + +#: remote-curl.c +#, c-format +msgid "Authentication failed for '%s'" +msgstr "'%s' 身份驗證失敗" + +#: remote-curl.c +#, c-format +msgid "unable to access '%s' with http.pinnedPubkey configuration: %s" +msgstr "無法依 http.pinnedPubkey 之設定存取「%s」：%s" + +#: remote-curl.c +#, c-format +msgid "unable to access '%s': %s" +msgstr "無法存取 '%s'：%s" + +#: remote-curl.c +#, c-format +msgid "redirecting to %s" +msgstr "重定向到 %s" + +#: remote-curl.c +msgid "shouldn't have EOF when not gentle on EOF" +msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符" + +#: remote-curl.c +msgid "remote server sent unexpected response end packet" +msgstr "遠端伺服器傳送了非預期的回應結束封包" + +#: remote-curl.c +msgid "unable to rewind rpc post data - try increasing http.postBuffer" +msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer" + +#: remote-curl.c +#, c-format +msgid "remote-curl: bad line length character: %.4s" +msgstr "remote-curl: 錯誤的行長度字串：%.4s" + +#: remote-curl.c +msgid "remote-curl: unexpected response end packet" +msgstr "remote-curl: 非預期的回應結束封包" + +#: remote-curl.c +#, c-format +msgid "RPC failed; %s" +msgstr "RPC 失敗。%s" + +#: remote-curl.c +msgid "cannot handle pushes this big" +msgstr "不能處理這麼大的推送" + +#: remote-curl.c +#, c-format +msgid "cannot deflate request; zlib deflate error %d" +msgstr "不能壓縮請求，zlib 壓縮錯誤 %d" + +#: remote-curl.c +#, c-format +msgid "cannot deflate request; zlib end error %d" +msgstr "不能壓縮請求，zlib 結束錯誤 %d" + +#: remote-curl.c +#, c-format +msgid "%d bytes of length header were received" +msgstr "收到了 %d 位元組長度的標頭" + +#: remote-curl.c +#, c-format +msgid "%d bytes of body are still expected" +msgstr "預期仍要有 %d 位元組的本文 (body)" + +#: remote-curl.c +msgid "dumb http transport does not support shallow capabilities" +msgstr "啞 http 傳輸不支援 shallow 能力" + +#: remote-curl.c +msgid "fetch failed." +msgstr "取得失敗。" + +#: remote-curl.c +msgid "cannot fetch by sha1 over smart http" +msgstr "無法透過智慧 HTTP 取得 sha1" + +#: remote-curl.c +#, c-format +msgid "protocol error: expected sha/ref, got '%s'" +msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'" + +#: remote-curl.c +#, c-format +msgid "http transport does not support %s" +msgstr "http 傳輸協定不支援 %s" + +#: remote-curl.c +msgid "git-http-push failed" +msgstr "git-http-push 失敗" + +#: remote-curl.c +msgid "remote-curl: usage: git remote-curl <remote> [<url>]" +msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]" + +#: remote-curl.c +msgid "remote-curl: error reading command stream from git" +msgstr "remote-curl：錯誤讀取來自 git 的指令流" + +#: remote-curl.c +msgid "remote-curl: fetch attempted without a local repo" +msgstr "remote-curl：嘗試沒有本機版本庫下取得" + +#: remote-curl.c +#, c-format +msgid "remote-curl: unknown command '%s' from git" +msgstr "remote-curl：未知的來自 git 的指令 '%s'" + +#: remote.c +#, c-format +msgid "config remote shorthand cannot begin with '/': %s" +msgstr "設定的遠端短名稱不能以 '/' 開始：%s" + +#: remote.c +msgid "more than one receivepack given, using the first" +msgstr "提供了一個以上的 receivepack，使用第一個" + +#: remote.c +msgid "more than one uploadpack given, using the first" +msgstr "提供了一個以上的 uploadpack，使用第一個" + +#: remote.c +#, c-format +msgid "unrecognized value transfer.credentialsInUrl: '%s'" +msgstr "數值 transfer.credentialsInUrl 無法識別：“%s”" + +#: remote.c +#, c-format +msgid "URL '%s' uses plaintext credentials" +msgstr "URL “%s” 使用明文憑證" + +#: remote.c +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "不能同時取得 %s 和 %s 至 %s" + +#: remote.c +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s 通常追蹤 %s，而非 %s" + +#: remote.c +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s 同時追蹤 %s 和 %s" + +#: remote.c +#, c-format +msgid "key '%s' of pattern had no '*'" +msgstr "模式的鍵 '%s' 沒有 '*'" + +#: remote.c +#, c-format +msgid "value '%s' of pattern has no '*'" +msgstr "模式的值 '%s' 沒有 '*'" + +#: remote.c +#, c-format +msgid "src refspec %s does not match any" +msgstr "來源引用規格 %s 沒有符合項目" + +#: remote.c +#, c-format +msgid "src refspec %s matches more than one" +msgstr "來源引用規格 %s 符合超過一個" + +#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push +#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is +#. the <src>. +#. +#: remote.c +#, c-format +msgid "" +"The destination you provided is not a full refname (i.e.,\n" +"starting with \"refs/\"). We tried to guess what you meant by:\n" +"\n" +"- Looking for a ref that matches '%s' on the remote side.\n" +"- Checking if the <src> being pushed ('%s')\n" +" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n" +" refs/{heads,tags}/ prefix on the remote side.\n" +"\n" +"Neither worked, so we gave up. You must fully qualify the ref." +msgstr "" +"您提供的目的地不是完整的引用名稱（即以「refs/」開頭）。\n" +"我們覺得您可能想要：\n" +"\n" +"- 在遠端查詢符合「%s」的引用。\n" +"- 檢查要推送的 <src>（'%s'）是不是在「refs/{heads,tags}/」中的引用。\n" +" 如果是，我們會在對應的遠端新增 refs/{heads,tags}/ 前綴。\n" +"\n" +"由於這些猜測都不正確，我們放棄了。您必須給出完整引用。" + +#: remote.c +#, c-format +msgid "" +"The <src> part of the refspec is a commit object.\n" +"Did you mean to create a new branch by pushing to\n" +"'%s:refs/heads/%s'?" +msgstr "" +"引用規格的 <src> 是個提交物件。\n" +"您是想透過推送至「%s:refs/heads/%s」\n" +"來建立新分支嗎？" + +#: remote.c +#, c-format +msgid "" +"The <src> part of the refspec is a tag object.\n" +"Did you mean to create a new tag by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用規格的 <src> 是個標籤物件。\n" +"您是想透過推送至「%s:refs/tags/%s」\n" +"來建立新標籤嗎？" + +#: remote.c +#, c-format +msgid "" +"The <src> part of the refspec is a tree object.\n" +"Did you mean to tag a new tree by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用規格的 <src> 是個樹狀物件。\n" +"您是想透過推送至「%s:refs/tags/%s」\n" +"為新樹狀物件貼上標籤嗎？" + +#: remote.c +#, c-format +msgid "" +"The <src> part of the refspec is a blob object.\n" +"Did you mean to tag a new blob by pushing to\n" +"'%s:refs/tags/%s'?" +msgstr "" +"引用規格的 <src> 是個資料 (blob) 物件。\n" +"您是想透過推送至「%s:refs/tags/%s」\n" +"為新資料物件貼上標籤嗎？" + +#: remote.c +#, c-format +msgid "%s cannot be resolved to branch" +msgstr "%s 無法被解析為分支" + +#: remote.c +#, c-format +msgid "unable to delete '%s': remote ref does not exist" +msgstr "無法刪除 '%s'：遠端引用不存在" + +#: remote.c +#, c-format +msgid "dst refspec %s matches more than one" +msgstr "目的地引用規格 %s 符合超過一個" + +#: remote.c +#, c-format +msgid "dst ref %s receives from more than one src" +msgstr "目的地引用 %s 接收超過一個來源" + +#: remote.c +msgid "HEAD does not point to a branch" +msgstr "HEAD 沒有指向一個分支" + +#: remote.c +#, c-format +msgid "no such branch: '%s'" +msgstr "沒有此分支：'%s'" + +#: remote.c +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "尚未給分支 '%s' 設定上游" + +#: remote.c +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支" + +#: remote.c +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" +msgstr "推送目的地 '%s' 至遠端 '%s' 沒有本機追蹤分支" + +#: remote.c +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "分支 '%s' 沒有設定要推送的遠端伺服器" + +#: remote.c +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "向 '%s' 推送引用規格未包含 '%s'" + +#: remote.c +msgid "push has no destination (push.default is 'nothing')" +msgstr "推送沒有目的地（push.default 是 'nothing'）" + +#: remote.c +msgid "cannot resolve 'simple' push to a single destination" +msgstr "無法解析 'simple' 推送至單獨目的地" + +#: remote.c +#, c-format +msgid "couldn't find remote ref %s" +msgstr "無法找到遠端引用 %s" + +#: remote.c +#, c-format +msgid "* Ignoring funny ref '%s' locally" +msgstr "* 在本機忽略可笑的引用 '%s'" + +#: remote.c +#, c-format +msgid "Your branch is based on '%s', but the upstream is gone.\n" +msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n" + +#: remote.c +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n" + +#: remote.c +#, c-format +msgid "Your branch is up to date with '%s'.\n" +msgstr "您的分支與上游分支 '%s' 一致。\n" + +#: remote.c +#, c-format +msgid "Your branch and '%s' refer to different commits.\n" +msgstr "您的分支和 '%s' 指向不同的提交。\n" + +#: remote.c +#, c-format +msgid " (use \"%s\" for details)\n" +msgstr " （使用 \"%s\" 檢視詳情）\n" + +#: remote.c +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n" + +#: remote.c +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " （使用 \"git push\" 來發布您的本機提交）\n" + +#: remote.c +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n" + +# 譯者：請維持前導空格 +#: remote.c +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " （使用 \"git pull\" 來更新您的本機分支）\n" + +#: remote.c +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +"您的分支和 '%s' 出現了偏離，\n" +"並且分別有 %d 和 %d 處不同的提交。\n" + +# 譯者：請維持前導空格 +#: remote.c +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " （使用 \"git pull\" 來合併遠端分支）\n" + +#: remote.c +#, c-format +msgid "cannot parse expected object name '%s'" +msgstr "無法解析期望的物件名 '%s'" + +#: remote.c +#, c-format +msgid "cannot strip one component off url '%s'" +msgstr "無法從 url '%s' 剝離一個元件" + +#: replace-object.c +#, c-format +msgid "bad replace ref name: %s" +msgstr "錯誤的取代引用名稱：%s" + +#: replace-object.c +#, c-format +msgid "duplicate replace ref: %s" +msgstr "重複的取代引用：%s" + +#: replace-object.c +#, c-format +msgid "replace depth too high for object %s" +msgstr "物件 %s 的取代層級太深" + +#: rerere.c +msgid "corrupt MERGE_RR" +msgstr "損壞的 MERGE_RR" + +#: rerere.c +msgid "unable to write rerere record" +msgstr "無法寫入 rerere 記錄" + +#: rerere.c +#, c-format +msgid "there were errors while writing '%s' (%s)" +msgstr "寫入 '%s' (%s) 時發生錯誤" + +#: rerere.c +#, c-format +msgid "could not parse conflict hunks in '%s'" +msgstr "不能解析 '%s' 中的衝突區塊" + +#: rerere.c +#, c-format +msgid "failed utime() on '%s'" +msgstr "在 '%s' 上呼叫 utime() 失敗" + +#: rerere.c +#, c-format +msgid "writing '%s' failed" +msgstr "寫入 '%s' 失敗" + +#: rerere.c +#, c-format +msgid "Staged '%s' using previous resolution." +msgstr "使用之前的解決方案暫存 '%s'。" + +#: rerere.c +#, c-format +msgid "Recorded resolution for '%s'." +msgstr "已記錄 '%s' 的解決方案。" + +#: rerere.c +#, c-format +msgid "Resolved '%s' using previous resolution." +msgstr "使用之前的解決方案解決 '%s'。" + +#: rerere.c +#, c-format +msgid "cannot unlink stray '%s'" +msgstr "不能刪除 stray '%s'" + +#: rerere.c +#, c-format +msgid "Recorded preimage for '%s'" +msgstr "為 '%s' 記錄 preimage" + +#: rerere.c +#, c-format +msgid "failed to update conflicted state in '%s'" +msgstr "更新 '%s' 中的衝突狀態失敗" + +#: rerere.c +#, c-format +msgid "no remembered resolution for '%s'" +msgstr "沒有為 '%s' 記憶的解決方案" + +#: rerere.c +#, c-format +msgid "cannot unlink '%s'" +msgstr "不能刪除 '%s'" + +#: rerere.c +#, c-format +msgid "Updated preimage for '%s'" +msgstr "已為 '%s' 更新 preimage" + +#: rerere.c +#, c-format +msgid "Forgot resolution for '%s'\n" +msgstr "忘記 '%s' 的解決方案\n" + +#: rerere.c +msgid "unable to open rr-cache directory" +msgstr "不能開啟 rr-cache 目錄" + +#: rerere.h +msgid "update the index with reused conflict resolution if possible" +msgstr "如果可能，重用衝突解決更新索引" + +#: reset.c +msgid "could not determine HEAD revision" +msgstr "不能確定 HEAD 版本" + +#: reset.c sequencer.c +#, c-format +msgid "failed to find tree of %s" +msgstr "無法找到 %s 指向的樹" + +#: revision.c +msgid "--unpacked=<packfile> no longer supported" +msgstr "--unpacked=<packfile> 已不受支援" + +#: revision.c +msgid "your current branch appears to be broken" +msgstr "您的目前分支好像被損壞" + +#: revision.c +#, c-format +msgid "your current branch '%s' does not have any commits yet" +msgstr "您的目前分支 '%s' 尚無任何提交" + +#: revision.c +msgid "object filtering requires --objects" +msgstr "物件過濾需要 --objects" + +#: revision.c +msgid "-L does not yet support diff formats besides -p and -s" +msgstr "-L 尚不支援 -p 和 -s 之外的差異格式" + +#: run-command.c +#, c-format +msgid "cannot create async thread: %s" +msgstr "不能建立 async 執行緒：%s" + +#: send-pack.c +msgid "unexpected flush packet while reading remote unpack status" +msgstr "讀取遠端解包狀態時收到意外的 flush 包" + +#: send-pack.c +#, c-format +msgid "unable to parse remote unpack status: %s" +msgstr "不能解析遠端解包狀態：%s" + +#: send-pack.c +#, c-format +msgid "remote unpack failed: %s" +msgstr "遠端解包失敗：%s" + +#: send-pack.c +msgid "failed to sign the push certificate" +msgstr "為推送證書籤名失敗" + +#: send-pack.c +msgid "send-pack: unable to fork off fetch subprocess" +msgstr "send-pack：無法 fork 一個 fetch 子處理程序" + +#: send-pack.c +msgid "push negotiation failed; proceeding anyway with push" +msgstr "push 協商失敗。繼續使用 push 處理" + +#: send-pack.c +msgid "the receiving end does not support this repository's hash algorithm" +msgstr "接收端不支援此版本庫的雜湊算法" + +#: send-pack.c +msgid "the receiving end does not support --signed push" +msgstr "接收端不支援 --signed 推送" + +#: send-pack.c +msgid "" +"not sending a push certificate since the receiving end does not support --" +"signed push" +msgstr "未傳送推送證書，因為接收端不支援 --signed 推送" + +#: send-pack.c +msgid "the receiving end does not support --atomic push" +msgstr "接收端不支援 --atomic 推送" + +#: send-pack.c +msgid "the receiving end does not support push options" +msgstr "接收端不支援推送選項" + +#: sequencer.c +#, c-format +msgid "invalid commit message cleanup mode '%s'" +msgstr "無效的提交說明清理模式 '%s'" + +#: sequencer.c +#, c-format +msgid "could not delete '%s'" +msgstr "無法刪除 '%s'" + +#: sequencer.c +msgid "revert" +msgstr "復原" + +#: sequencer.c +msgid "cherry-pick" +msgstr "摘取" + +#: sequencer.c +msgid "rebase" +msgstr "rebase" + +#: sequencer.c +#, c-format +msgid "unknown action: %d" +msgstr "未知動作：%d" + +#: sequencer.c +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" +"指令標記修正後的檔案" + +#: sequencer.c +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git cherry-pick --continue\".\n" +"You can instead skip this commit with \"git cherry-pick --skip\".\n" +"To abort and get back to the state before \"git cherry-pick\",\n" +"run \"git cherry-pick --abort\"." +msgstr "" +"解決衝突後，請使用\n" +"\"git add/rm <pathspec>\" 標記路徑，再執行\n" +"\"git cherry-pick --continue\"。\n" +"亦可以使用 \"git cherry-pick --skip\" 略過提交。\n" +"若要取消並返回 \"git cherry-pick\" 前的狀態，\n" +"請執行 \"git cherry-pick --abort\"。" + +#: sequencer.c +msgid "" +"After resolving the conflicts, mark them with\n" +"\"git add/rm <pathspec>\", then run\n" +"\"git revert --continue\".\n" +"You can instead skip this commit with \"git revert --skip\".\n" +"To abort and get back to the state before \"git revert\",\n" +"run \"git revert --abort\"." +msgstr "" +"解決衝突後，請使用\n" +"\"git add/rm <pathspec>\" 標記路徑，再執行\n" +"\"git revert --continue\"。\n" +"亦可以使用 \"git revert --skip\" 略過提交。\n" +"若要取消並返回 \"git revert\" 前的狀態，\n" +"請執行 \"git revert --abort\"。" + +#: sequencer.c +#, c-format +msgid "could not lock '%s'" +msgstr "不能鎖定 '%s'" + +#: sequencer.c strbuf.c wrapper.c +#, c-format +msgid "could not write to '%s'" +msgstr "不能寫入 '%s'" + +#: sequencer.c +#, c-format +msgid "could not write eol to '%s'" +msgstr "不能將換行符號寫入 '%s'" + +#: sequencer.c +#, c-format +msgid "failed to finalize '%s'" +msgstr "無法完成 '%s'" + +#: sequencer.c +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "您的本機修改將被%s覆蓋。" + +#: sequencer.c +msgid "commit your changes or stash them to proceed." +msgstr "提交您的修改或儲藏後再繼續。" + +#: sequencer.c +#, c-format +msgid "%s: fast-forward" +msgstr "%s：快轉" + +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. "rebase". +#. +#: sequencer.c +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s：無法寫入新索引檔案" + +#: sequencer.c +msgid "unable to update cache tree" +msgstr "不能更新快取樹" + +#: sequencer.c +msgid "could not resolve HEAD commit" +msgstr "不能解析 HEAD 提交" + +#: sequencer.c +#, c-format +msgid "no key present in '%.*s'" +msgstr "在 '%.*s' 中沒有 key" + +#: sequencer.c +#, c-format +msgid "unable to dequote value of '%s'" +msgstr "無法為 '%s' 的值去引號" + +#: sequencer.c +msgid "'GIT_AUTHOR_NAME' already given" +msgstr "已經給出 'GIT_AUTHOR_NAME'" + +#: sequencer.c +msgid "'GIT_AUTHOR_EMAIL' already given" +msgstr "已經給出 'GIT_AUTHOR_EMAIL'" + +#: sequencer.c +msgid "'GIT_AUTHOR_DATE' already given" +msgstr "已經給出 'GIT_AUTHOR_DATE'" + +#: sequencer.c +#, c-format +msgid "unknown variable '%s'" +msgstr "未知變數 '%s'" + +#: sequencer.c +msgid "missing 'GIT_AUTHOR_NAME'" +msgstr "缺少 'GIT_AUTHOR_NAME'" + +#: sequencer.c +msgid "missing 'GIT_AUTHOR_EMAIL'" +msgstr "缺少 'GIT_AUTHOR_EMAIL'" + +#: sequencer.c +msgid "missing 'GIT_AUTHOR_DATE'" +msgstr "缺少 'GIT_AUTHOR_DATE'" + +#: sequencer.c +#, c-format +msgid "" +"you have staged changes in your working tree\n" +"If these changes are meant to be squashed into the previous commit, run:\n" +"\n" +" git commit --amend %s\n" +"\n" +"If they are meant to go into a new commit, run:\n" +"\n" +" git commit %s\n" +"\n" +"In both cases, once you're done, continue with:\n" +"\n" +" git rebase --continue\n" +msgstr "" +"您的工作區中存在已暫存的修改\n" +"如果這些修改需要被併入前一個提交，執行：\n" +"\n" +" git commit --amend %s\n" +"\n" +"如果這些修改要形成一個新提交，執行：\n" +"\n" +" git commit %s\n" +"\n" +"無論哪種情況，當您完成提交，繼續執行：\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c +msgid "'prepare-commit-msg' hook failed" +msgstr "'prepare-commit-msg' 掛鉤失敗" + +#: sequencer.c +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly. Run the\n" +"following command and follow the instructions in your editor to edit\n" +"your configuration file:\n" +"\n" +" git config --global --edit\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n" +"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息。\n" +"執行如下指令，在編輯器中遵循指引編輯您的設定檔案：\n" +"\n" +" git config --global --edit\n" +"\n" +"設定完畢後，您可以使用下述指令，修正這個提交的提交者身份：\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"您的姓名和信件位址皆根據您的使用者名稱和主機名稱自動設定。\n" +"請檢查是否正確。您可以自行設定，這樣便不會再出現這個提示訊息：\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"設定完畢後，您可以使用下述指令，修正這個提交使用的提交者身份：\n" +"\n" +" git commit --amend --reset-author\n" + +#: sequencer.c +msgid "couldn't look up newly created commit" +msgstr "無法找到新建立的提交" + +#: sequencer.c +msgid "could not parse newly created commit" +msgstr "不能解析新建立的提交" + +#: sequencer.c +msgid "unable to resolve HEAD after creating commit" +msgstr "建立提交後，不能解析 HEAD" + +#: sequencer.c +msgid "detached HEAD" +msgstr "分離 HEAD" + +# 譯者：中文字串拼接，可刪除前導空格 +#: sequencer.c +msgid " (root-commit)" +msgstr " (根提交)" + +#: sequencer.c +msgid "could not parse HEAD" +msgstr "不能解析 HEAD" + +#: sequencer.c +#, c-format +msgid "HEAD %s is not a commit!" +msgstr "HEAD %s 不是一個提交！" + +#: sequencer.c +msgid "unable to parse commit author" +msgstr "不能解析提交作者" + +#: sequencer.c +#, c-format +msgid "unable to read commit message from '%s'" +msgstr "不能從 '%s' 讀取提交說明" + +#: sequencer.c +#, c-format +msgid "invalid author identity '%s'" +msgstr "無效的作者身分 '%s'" + +#: sequencer.c +msgid "corrupt author: missing date information" +msgstr "作者資訊損壞：缺少日期資訊" + +#: sequencer.c t/helper/test-fast-rebase.c +#, c-format +msgid "could not update %s" +msgstr "不能更新 %s" + +#: sequencer.c +#, c-format +msgid "could not parse commit %s" +msgstr "不能解析提交 %s" + +#: sequencer.c +#, c-format +msgid "could not parse parent commit %s" +msgstr "不能解析父提交 %s" + +#: sequencer.c +#, c-format +msgid "unknown command: %d" +msgstr "未知指令：%d" + +#: sequencer.c +msgid "This is the 1st commit message:" +msgstr "這是第一個提交說明：" + +#: sequencer.c +#, c-format +msgid "This is the commit message #%d:" +msgstr "這是提交說明 #%d：" + +#: sequencer.c +msgid "The 1st commit message will be skipped:" +msgstr "略過第 1 個提交說明：" + +#: sequencer.c +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "略過第 %d 個提交說明：" + +#: sequencer.c +#, c-format +msgid "This is a combination of %d commits." +msgstr "這是整合 %d 個提交的集合提交。" + +#: sequencer.c +#, c-format +msgid "cannot write '%s'" +msgstr "不能寫 '%s'" + +#: sequencer.c +msgid "need a HEAD to fixup" +msgstr "需要一個 HEAD 來修復" + +#: sequencer.c +msgid "could not read HEAD" +msgstr "不能讀取 HEAD" + +#: sequencer.c +msgid "could not read HEAD's commit message" +msgstr "不能讀取 HEAD 的提交說明" + +#: sequencer.c +#, c-format +msgid "could not read commit message of %s" +msgstr "不能讀取 %s 的提交說明" + +#: sequencer.c +msgid "your index file is unmerged." +msgstr "您的索引檔案未完成合併。" + +#: sequencer.c +msgid "cannot fixup root commit" +msgstr "不能修復根提交" + +#: sequencer.c +#, c-format +msgid "commit %s is a merge but no -m option was given." +msgstr "提交 %s 是一個合併提交但未提供 -m 選項。" + +#: sequencer.c +#, c-format +msgid "commit %s does not have parent %d" +msgstr "提交 %s 沒有第 %d 個父提交" + +#: sequencer.c +#, 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 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s：不能解析父提交 %s" + +#: sequencer.c +#, c-format +msgid "could not rename '%s' to '%s'" +msgstr "不能將 '%s' 重新命名為 '%s'" + +#: sequencer.c +#, c-format +msgid "could not revert %s... %s" +msgstr "不能還原 %s... %s" + +#: sequencer.c +#, c-format +msgid "could not apply %s... %s" +msgstr "不能套用 %s... %s" + +#: sequencer.c +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n" + +#: sequencer.c +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s：無法讀取索引" + +#: sequencer.c +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s：無法重新整理索引" + +#: sequencer.c +#, c-format +msgid "%s does not accept arguments: '%s'" +msgstr "%s 不接受參數：'%s'" + +#: sequencer.c +#, c-format +msgid "missing arguments for %s" +msgstr "缺少 %s 的參數" + +#: sequencer.c +#, c-format +msgid "could not parse '%s'" +msgstr "無法解析 '%s'" + +#: sequencer.c +#, c-format +msgid "invalid line %d: %.*s" +msgstr "無效行 %d：%.*s" + +#: sequencer.c +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "沒有父提交的情況下不能 '%s'" + +#: sequencer.c +msgid "cancelling a cherry picking in progress" +msgstr "正在取消一個進行中的揀選" + +#: sequencer.c +msgid "cancelling a revert in progress" +msgstr "正在取消一個進行中的還原" + +#: sequencer.c +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "請用 'git rebase --edit-todo' 來修改。" + +#: sequencer.c +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "不可用的指令清單：'%s'" + +#: sequencer.c +msgid "no commits parsed." +msgstr "沒有解析提交。" + +#: sequencer.c +msgid "cannot cherry-pick during a revert." +msgstr "不能在還原提交中執行揀選。" + +#: sequencer.c +msgid "cannot revert during a cherry-pick." +msgstr "不能在揀選中執行還原提交。" + +#: sequencer.c +msgid "unusable squash-onto" +msgstr "不可用的 squash-onto" + +#: sequencer.c +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "格式錯誤的選項清單：'%s'" + +#: sequencer.c +msgid "empty commit set passed" +msgstr "提供了空的提交集" + +#: sequencer.c +msgid "revert is already in progress" +msgstr "一個還原動作已在進行" + +#: sequencer.c +#, c-format +msgid "try \"git revert (--continue | %s--abort | --quit)\"" +msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\"" + +#: sequencer.c +msgid "cherry-pick is already in progress" +msgstr "揀選動作已在進行" + +#: sequencer.c +#, c-format +msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" +msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\"" + +#: sequencer.c +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "不能建立序列目錄 '%s'" + +#: sequencer.c +msgid "could not lock HEAD" +msgstr "不能鎖定 HEAD" + +#: sequencer.c +msgid "no cherry-pick or revert in progress" +msgstr "揀選或還原動作並未進行" + +#: sequencer.c +msgid "cannot resolve HEAD" +msgstr "不能解析 HEAD" + +#: sequencer.c +msgid "cannot abort from a branch yet to be born" +msgstr "不能從尚未建立的分支終止" + +#: sequencer.c +#, c-format +msgid "cannot read '%s': %s" +msgstr "不能讀取 '%s'：%s" + +#: sequencer.c +msgid "unexpected end of file" +msgstr "意外的檔案結束" + +#: sequencer.c +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞" + +#: sequencer.c +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" +msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！" + +#: sequencer.c +msgid "no revert in progress" +msgstr "沒有正在進行的還原" + +#: sequencer.c +msgid "no cherry-pick in progress" +msgstr "沒有正在進行的揀選" + +#: sequencer.c +msgid "failed to skip the commit" +msgstr "無法略過這個提交" + +#: sequencer.c +msgid "there is nothing to skip" +msgstr "沒有要略過的" + +#: sequencer.c +#, c-format +msgid "" +"have you committed already?\n" +"try \"git %s --continue\"" +msgstr "" +"您已經提交了嗎？\n" +"試試 \"git %s --continue\"" + +#: sequencer.c +msgid "cannot read HEAD" +msgstr "不能讀取 HEAD" + +#: sequencer.c +#, c-format +msgid "unable to copy '%s' to '%s'" +msgstr "無法複製 '%s' 至 '%s'" + +#: sequencer.c +#, c-format +msgid "" +"You can amend the commit now, with\n" +"\n" +" git commit --amend %s\n" +"\n" +"Once you are satisfied with your changes, run\n" +"\n" +" git rebase --continue\n" +msgstr "" +"您現在可以修補這個提交，使用\n" +"\n" +" git commit --amend %s\n" +"\n" +"當您對變更感到滿意，執行\n" +"\n" +" git rebase --continue\n" + +#: sequencer.c +#, c-format +msgid "Could not apply %s... %.*s" +msgstr "不能套用 %s... %.*s" + +#: sequencer.c +#, c-format +msgid "Could not merge %.*s" +msgstr "不能合併 %.*s" + +#: sequencer.c +#, c-format +msgid "Executing: %s\n" +msgstr "執行：%s\n" + +# 譯者：請維持前導空格 +#: sequencer.c +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"執行失敗：%s\n" +"%s您可以改正該問題，然後執行\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c +msgid "and made changes to the index and/or the working tree\n" +msgstr "並且修改索引和/或工作區\n" + +#: sequencer.c +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"執行成功：%s\n" +"但是在索引和/或工作區中存在變更\n" +"提交或儲藏修改，然後執行\n" +"\n" +" git rebase --continue\n" +"\n" + +#: sequencer.c +#, c-format +msgid "illegal label name: '%.*s'" +msgstr "非法的標籤名稱：'%.*s'" + +#: sequencer.c +msgid "writing fake root commit" +msgstr "寫偽根提交" + +#: sequencer.c +msgid "writing squash-onto" +msgstr "寫入 squash-onto" + +#: sequencer.c +#, c-format +msgid "could not resolve '%s'" +msgstr "無法解析 '%s'" + +#: sequencer.c +msgid "cannot merge without a current revision" +msgstr "沒有目前版本不能合併" + +#: sequencer.c +#, c-format +msgid "unable to parse '%.*s'" +msgstr "無法解析 '%.*s'" + +#: sequencer.c +#, c-format +msgid "nothing to merge: '%.*s'" +msgstr "無可用合併：'%.*s'" + +#: sequencer.c +msgid "octopus merge cannot be executed on top of a [new root]" +msgstr "章魚合並不能在一個新的根提交上執行" + +#: sequencer.c +#, c-format +msgid "could not get commit message of '%s'" +msgstr "不能取得 '%s' 的提交說明" + +#: sequencer.c +#, c-format +msgid "could not even attempt to merge '%.*s'" +msgstr "甚至不能嘗試合併 '%.*s'" + +#: sequencer.c +msgid "merge: Unable to write new index file" +msgstr "合併：無法寫入新索引檔案" + +#: sequencer.c +msgid "Cannot autostash" +msgstr "無法 autostash" + +#: sequencer.c +#, c-format +msgid "Unexpected stash response: '%s'" +msgstr "意外的 stash 回應：'%s'" + +#: sequencer.c +#, c-format +msgid "Could not create directory for '%s'" +msgstr "不能為 '%s' 建立目錄" + +#: sequencer.c +#, c-format +msgid "Created autostash: %s\n" +msgstr "建立了 autostash：%s\n" + +#: sequencer.c +msgid "could not reset --hard" +msgstr "無法 reset --hard" + +#: sequencer.c +#, c-format +msgid "Applied autostash.\n" +msgstr "已套用 autostash。\n" + +#: sequencer.c +#, c-format +msgid "cannot store %s" +msgstr "不能儲存 %s" + +#: sequencer.c +#, c-format +msgid "" +"%s\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"%s\n" +"您的修改安全地儲存在儲藏區中。\n" +"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" + +#: sequencer.c +msgid "Applying autostash resulted in conflicts." +msgstr "因套用自動儲藏而導致衝突。" + +#: sequencer.c +msgid "Autostash exists; creating a new stash entry." +msgstr "已有自動儲藏；建立新儲藏項目。" + +#: sequencer.c +msgid "could not detach HEAD" +msgstr "不能分離開頭指標" + +#: sequencer.c +#, c-format +msgid "Stopped at HEAD\n" +msgstr "停止在 HEAD\n" + +#: sequencer.c +#, c-format +msgid "Stopped at %s\n" +msgstr "停止在 %s\n" + +#: sequencer.c +#, c-format +msgid "" +"Could not execute the todo command\n" +"\n" +" %.*s\n" +"It has been rescheduled; To edit the command before continuing, please\n" +"edit the todo list first:\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" +msgstr "" +"無法執行待辦指令\n" +"\n" +" %.*s\n" +"已被重新安排，在繼續之前編輯指令，請先編輯待辦列表：\n" +"\n" +" git rebase --edit-todo\n" +" git rebase --continue\n" + +#: sequencer.c +#, c-format +msgid "Rebasing (%d/%d)%s" +msgstr "正在重定基底 (%d/%d)%s" + +#: sequencer.c +#, c-format +msgid "Stopped at %s... %.*s\n" +msgstr "停止在 %s... %.*s\n" + +#: sequencer.c +#, c-format +msgid "unknown command %d" +msgstr "未知指令 %d" + +#: sequencer.c +msgid "could not read orig-head" +msgstr "不能讀取 orig-head" + +#: sequencer.c +msgid "could not read 'onto'" +msgstr "不能讀取 'onto'" + +#: sequencer.c +#, c-format +msgid "could not update HEAD to %s" +msgstr "不能更新 HEAD 為 %s" + +#: sequencer.c +#, c-format +msgid "Successfully rebased and updated %s.\n" +msgstr "成功重定基底並更新 %s。\n" + +#: sequencer.c +msgid "cannot rebase: You have unstaged changes." +msgstr "不能重定基底：您有未暫存的變更。" + +#: sequencer.c +msgid "cannot amend non-existing commit" +msgstr "不能修補不存在的提交" + +#: sequencer.c +#, c-format +msgid "invalid file: '%s'" +msgstr "無效檔案：'%s'" + +#: sequencer.c +#, c-format +msgid "invalid contents: '%s'" +msgstr "無效內容：'%s'" + +#: sequencer.c +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。" + +#: sequencer.c +#, c-format +msgid "could not write file: '%s'" +msgstr "不能寫入檔案：'%s'" + +#: sequencer.c +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "不能刪除 CHERRY_PICK_HEAD" + +#: sequencer.c +msgid "could not commit staged changes." +msgstr "不能提交暫存的修改。" + +#: sequencer.c +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s：不能揀選一個%s" + +#: sequencer.c +#, c-format +msgid "%s: bad revision" +msgstr "%s：錯誤的版本" + +#: sequencer.c +msgid "can't revert as initial commit" +msgstr "不能作為初始提交還原提交" + +#: sequencer.c +#, c-format +msgid "skipped previously applied commit %s" +msgstr "已略過先前套用的 %s 提交" + +#: sequencer.c +msgid "use --reapply-cherry-picks to include skipped commits" +msgstr "使用 --reapply-cherry-picks 以包含略過提交" + +#: sequencer.c +msgid "make_script: unhandled options" +msgstr "make_script：有未能處理的選項" + +#: sequencer.c +msgid "make_script: error preparing revisions" +msgstr "make_script：準備版本時錯誤" + +#: sequencer.c +msgid "nothing to do" +msgstr "無事可做" + +#: sequencer.c +msgid "could not skip unnecessary pick commands" +msgstr "無法略過不必要的揀選" + +#: sequencer.c +msgid "the script was already rearranged." +msgstr "腳本已經重新編排。" + +#: setup.c +#, c-format +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' 在位於 '%s' 的版本庫之外" + +#: setup.c +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git <command> -- <path>...' to specify paths that do not exist locally." +msgstr "" +"%s：工作區中無此路徑。\n" +"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。" + +#: setup.c +#, c-format +msgid "" +"ambiguous argument '%s': unknown revision or path not in the working tree.\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n" +"使用 '--' 來分隔版本和路徑，例如：\n" +"'git <命令> [<版本>...] -- [<檔案>...]'" + +#: setup.c +#, c-format +msgid "option '%s' must come before non-option arguments" +msgstr "選項 '%s' 必須在其他非選項參數之前" + +#: setup.c +#, c-format +msgid "" +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git <command> [<revision>...] -- [<file>...]'" +msgstr "" +"有歧義的參數 '%s'：可同時是版本和檔案\n" +"使用 '--' 來分隔版本和路徑，例如：\n" +"'git <命令> [<版本>...] -- [<檔案>...]'" + +#: setup.c +msgid "unable to set up work tree using invalid config" +msgstr "無法使用無效設定來建立工作區" + +#: setup.c +#, c-format +msgid "Expected git repo version <= %d, found %d" +msgstr "期望 git 版本庫版本 <= %d，卻得到 %d" + +#: setup.c +msgid "unknown repository extension found:" +msgid_plural "unknown repository extensions found:" +msgstr[0] "找到未知的儲存庫擴充元件：" + +#: setup.c +msgid "repo version is 0, but v1-only extension found:" +msgid_plural "repo version is 0, but v1-only extensions found:" +msgstr[0] "repo 版本是 0 (v0)，但找到只支援 v1 的擴充元件：" + +#: setup.c +#, c-format +msgid "error opening '%s'" +msgstr "開啟 '%s' 發生錯誤" + +#: setup.c +#, c-format +msgid "too large to be a .git file: '%s'" +msgstr "檔案太大，無法作為 .git 檔案：'%s'" + +#: setup.c +#, c-format +msgid "error reading %s" +msgstr "讀取 %s 發生錯誤" + +#: setup.c +#, c-format +msgid "invalid gitfile format: %s" +msgstr "無效的 gitfile 格式：%s" + +#: setup.c +#, c-format +msgid "no path in gitfile: %s" +msgstr "在 gitfile 中沒有路徑：%s" + +#: setup.c +#, c-format +msgid "not a git repository: %s" +msgstr "不是一個 git 版本庫：%s" + +#: setup.c +#, c-format +msgid "'$%s' too big" +msgstr "'$%s' 太大" + +#: setup.c +#, c-format +msgid "not a git repository: '%s'" +msgstr "不是一個 git 版本庫：'%s'" + +#: setup.c +#, c-format +msgid "cannot chdir to '%s'" +msgstr "不能切換目錄到 '%s'" + +#: setup.c +msgid "cannot come back to cwd" +msgstr "無法返回目前工作目錄" + +#: setup.c +#, c-format +msgid "failed to stat '%*s%s%s'" +msgstr "取得 '%*s%s%s' 狀態（stat）失敗" + +#: setup.c +msgid "Unable to read current working directory" +msgstr "不能讀取目前工作目錄" + +#: setup.c +#, c-format +msgid "cannot change to '%s'" +msgstr "不能切換到 '%s'" + +#: setup.c +#, c-format +msgid "not a git repository (or any of the parent directories): %s" +msgstr "不是一個 git 版本庫（或者任何父目錄）：%s" + +#: setup.c +#, c-format +msgid "" +"not a git repository (or any parent up to mount point %s)\n" +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." +msgstr "" +"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n" +"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。" + +#: setup.c +#, c-format +msgid "" +"unsafe repository ('%s' is owned by someone else)\n" +"To add an exception for this directory, call:\n" +"\n" +"\tgit config --global --add safe.directory %s" +msgstr "" +"不安全版本庫（「%s」由其他人所有）\n" +"若要放行本目錄，請呼叫：\n" +"\n" +"\tgit config --global --add safe.directory %s" + +#: setup.c +#, c-format +msgid "" +"problem with core.sharedRepository filemode value (0%.3o).\n" +"The owner of files must always have read and write permissions." +msgstr "" +"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n" +"檔案所有者必須始終擁有讀寫權限。" + +#: setup.c +msgid "fork failed" +msgstr "fork 失敗" + +#: setup.c +msgid "setsid failed" +msgstr "setsid 失敗" + +#: sparse-index.c +#, c-format +msgid "index entry is a directory, but not sparse (%08x)" +msgstr "索引項目是資料夾，但不是稀疏資料夾（%08x）" + +#: split-index.c +msgid "cannot use split index with a sparse index" +msgstr "無法在稀疏索引使用索引分割" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte +#: strbuf.c +#, c-format +msgid "%u.%2.2u GiB" +msgstr "%u.%2.2u GiB" + +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second +#: strbuf.c +#, c-format +msgid "%u.%2.2u GiB/s" +msgstr "%u.%2.2u GiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte +#: strbuf.c +#, c-format +msgid "%u.%2.2u MiB" +msgstr "%u.%2.2u MiB" + +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second +#: strbuf.c +#, c-format +msgid "%u.%2.2u MiB/s" +msgstr "%u.%2.2u MiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte +#: strbuf.c +#, c-format +msgid "%u.%2.2u KiB" +msgstr "%u.%2.2u KiB" + +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second +#: strbuf.c +#, c-format +msgid "%u.%2.2u KiB/s" +msgstr "%u.%2.2u KiB/s" + +#. TRANSLATORS: IEC 80000-13:2008 byte +#: strbuf.c +#, c-format +msgid "%u byte" +msgid_plural "%u bytes" +msgstr[0] "%u 位元組" + +#. TRANSLATORS: IEC 80000-13:2008 byte/second +#: strbuf.c +#, c-format +msgid "%u byte/s" +msgid_plural "%u bytes/s" +msgstr[0] "%u 位元組/秒" + +#: strbuf.c +#, c-format +msgid "could not edit '%s'" +msgstr "無法編輯 '%s'" + +#: submodule-config.c +#, c-format +msgid "ignoring suspicious submodule name: %s" +msgstr "忽略可疑的子模組名稱：%s" + +#: submodule-config.c +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "submodule.fetchJobs 不允許為負值" + +#: submodule-config.c +#, c-format +msgid "ignoring '%s' which may be interpreted as a command-line option: %s" +msgstr "忽略可能被解析為指令列選項的 '%s'：%s" + +#: submodule-config.c +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "不能更新 .gitmodules 條目 %s" + +#: submodule.c +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "無法修改未合併的 .gitmodules，先解決合併衝突" + +#: submodule.c +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "無法在 .gitmodules 中找到 path=%s 的小節" + +#: submodule.c +#, c-format +msgid "Could not remove .gitmodules entry for %s" +msgstr "無法移除 %s 的 .gitmodules 條目" + +#: submodule.c +msgid "staging updated .gitmodules failed" +msgstr "將更新後 .gitmodules 新增暫存區失敗" + +#: submodule.c +#, c-format +msgid "in unpopulated submodule '%s'" +msgstr "位於未簽出的子模組 '%s'" + +#: submodule.c +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "路徑規格 '%s' 在子模組 '%.*s' 中" + +#: submodule.c +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "無效 --ignore-submodules 參數：%s" + +#: submodule.c +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。略過。" + +#: submodule.c +#, c-format +msgid "submodule entry '%s' (%s) is a %s, not a commit" +msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交" + +#: submodule.c +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令" + +#: submodule.c +#, c-format +msgid "process for submodule '%s' failed" +msgstr "處理 '%s' 子模組失敗" + +#: submodule.c +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "正在推送 '%s' 子模組\n" + +#: submodule.c +#, c-format +msgid "Unable to push submodule '%s'\n" +msgstr "無法推送 '%s' 子模組\n" + +#: submodule.c +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "正在抓取 %s%s 子模組\n" + +#: submodule.c +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "無法存取子模組 '%s'\n" + +#: submodule.c +#, c-format +msgid "Could not access submodule '%s' at commit %s\n" +msgstr "無法存取 %2$s 提交的子模組「%1$s」\n" + +#: submodule.c +#, c-format +msgid "Fetching submodule %s%s at commit %s\n" +msgstr "正在抓取 %3$s 提交的 %1$s%2$s 子模組\n" + +#: submodule.c +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"抓取子模組時發生錯誤：\n" +"%s" + +#: submodule.c +#, c-format +msgid "'%s' not recognized as a git repository" +msgstr "無法將 '%s' 識別為一個 git 版本庫" + +#: submodule.c +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "無法在 %s 子模組執行 'git status --porcelain=2'" + +#: submodule.c +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "%s 子模組執行 'git status --porcelain=2' 失敗" + +#: submodule.c +#, c-format +msgid "could not start 'git status' in submodule '%s'" +msgstr "無法在子模組 '%s' 中啟動 'git status'" + +#: submodule.c +#, c-format +msgid "could not run 'git status' in submodule '%s'" +msgstr "無法在子模組 '%s' 中執行 'git status'" + +#: submodule.c +#, c-format +msgid "Could not unset core.worktree setting in submodule '%s'" +msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定" + +#: submodule.c +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "無法遞迴子模組路徑 '%s'" + +#: submodule.c +msgid "could not reset submodule index" +msgstr "無法重設子模組的索引" + +#: submodule.c +#, c-format +msgid "submodule '%s' has dirty index" +msgstr "子模組 '%s' 中有髒索引" + +#: submodule.c +#, c-format +msgid "Submodule '%s' could not be updated." +msgstr "子模組 '%s' 無法被更新。" + +#: submodule.c +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中" + +#: submodule.c +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir" + +#: submodule.c +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "不能查詢子模組 '%s' 的名稱" + +#: submodule.c +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "拒絕移動「%s」至現存 git 目錄" + +#: submodule.c +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"將 '%s%s' 的 git 目錄從\n" +"'%s' 遷移至\n" +"'%s'\n" + +#: submodule.c +msgid "could not start ls-files in .." +msgstr "無法在 .. 中啟動 ls-files" + +#: submodule.c +#, c-format +msgid "ls-tree returned unexpected return code %d" +msgstr "ls-tree 返回未知返回值 %d" + +#: symlinks.c +#, c-format +msgid "failed to lstat '%s'" +msgstr "無法 lstat “%s”" + +#: t/helper/test-fast-rebase.c +msgid "unhandled options" +msgstr "未處理選項" + +#: t/helper/test-fast-rebase.c +msgid "error preparing revisions" +msgstr "準備修訂版本時發生錯誤" + +#: t/helper/test-reach.c +#, c-format +msgid "commit %s is not marked reachable" +msgstr "提交 %s 沒有標記為可以取得" + +#: t/helper/test-reach.c +msgid "too many commits marked reachable" +msgstr "太多提交標記為可以取得" + +#: t/helper/test-serve-v2.c +msgid "test-tool serve-v2 [<options>]" +msgstr "test-tool serve-v2 [<選項>]" + +#: t/helper/test-serve-v2.c +msgid "exit immediately after advertising capabilities" +msgstr "對能力廣告之後立即離開" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc is-active [<name>] [<options>]" +msgstr "test-helper simple-ipc is-active [<name>] [<options>]" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc run-daemon [<name>] [<threads>]" +msgstr "test-helper simple-ipc run-daemon [<name>] [<threads>]" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" +msgstr "test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" +msgstr "test-helper simple-ipc stop-daemon [<name>] [<max-wait>]" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc send [<name>] [<token>]" +msgstr "test-helper simple-ipc send [<name>] [<token>]" + +#: t/helper/test-simple-ipc.c +msgid "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" +msgstr "test-helper simple-ipc sendbytes [<name>] [<bytecount>] [<byte>]" + +#: t/helper/test-simple-ipc.c +msgid "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" +msgstr "" +"test-helper simple-ipc multiple [<name>] [<threads>] [<bytecount>] " +"[<batchsize>]" + +#: t/helper/test-simple-ipc.c +msgid "name or pathname of unix domain socket" +msgstr "Unix 網域通訊端的名稱或路徑名稱" + +#: t/helper/test-simple-ipc.c +msgid "named-pipe name" +msgstr "有命名管道的名稱" + +#: t/helper/test-simple-ipc.c +msgid "number of threads in server thread pool" +msgstr "伺服器執行緒集區的執行緒數量" + +#: t/helper/test-simple-ipc.c +msgid "seconds to wait for daemon to start or stop" +msgstr "要等待守護程式啟動或停止多久（秒）" + +#: t/helper/test-simple-ipc.c +msgid "number of bytes" +msgstr "位元組數" + +#: t/helper/test-simple-ipc.c +msgid "number of requests per thread" +msgstr "每個執行緒的請求數" + +#: t/helper/test-simple-ipc.c +msgid "byte" +msgstr "位元組" + +#: t/helper/test-simple-ipc.c +msgid "ballast character" +msgstr "穩定 (ballast) 字元" + +#: t/helper/test-simple-ipc.c +msgid "token" +msgstr "代符" + +#: t/helper/test-simple-ipc.c +msgid "command token to send to the server" +msgstr "要傳送至伺服器的命令代符" + +#: trailer.c +#, c-format +msgid "running trailer command '%s' failed" +msgstr "執行 trailer 指令 '%s' 失敗" + +#: trailer.c +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "鍵 '%2$s' 的未知取值 '%1$s'" + +#: trailer.c +#, c-format +msgid "empty trailer token in trailer '%.*s'" +msgstr "簽名 '%.*s' 的鍵為空" + +#: trailer.c +#, c-format +msgid "could not read input file '%s'" +msgstr "不能讀取輸入檔案 '%s'" + +#: trailer.c wrapper.c +#, c-format +msgid "could not stat %s" +msgstr "不能對 %s 呼叫 stat" + +#: trailer.c +#, c-format +msgid "file %s is not a regular file" +msgstr "檔案 %s 不是一個正規檔案" + +#: trailer.c +#, c-format +msgid "file %s is not writable by user" +msgstr "檔案 %s 使用者不可寫" + +#: trailer.c +msgid "could not open temporary file" +msgstr "不能開啟暫存檔" + +#: trailer.c +#, c-format +msgid "could not rename temporary file to %s" +msgstr "不能重新命名暫存檔為 %s" + +#: transport-helper.c +msgid "full write to remote helper failed" +msgstr "完整寫入遠端協助工具失敗" + +#: transport-helper.c +#, c-format +msgid "unable to find remote helper for '%s'" +msgstr "無法為 '%s' 找到遠端協助工具" + +#: transport-helper.c +msgid "can't dup helper output fd" +msgstr "無法複製協助工具輸出檔案句柄" + +#: transport-helper.c +#, c-format +msgid "" +"unknown mandatory capability %s; this remote helper probably needs newer " +"version of Git" +msgstr "未知的強制能力 %s，該遠端協助工具可能需要新版本的Git" + +#: transport-helper.c +msgid "this remote helper should implement refspec capability" +msgstr "遠端協助工具需要實現 refspec 引用規格能力" + +#: transport-helper.c +#, c-format +msgid "%s unexpectedly said: '%s'" +msgstr "%s 意外地說：'%s'" + +#: transport-helper.c +#, c-format +msgid "%s also locked %s" +msgstr "%s 也鎖定了 %s" + +#: transport-helper.c +msgid "couldn't run fast-import" +msgstr "不能執行 fast-import" + +#: transport-helper.c +msgid "error while running fast-import" +msgstr "執行 fast-import 發生錯誤" + +#: transport-helper.c +#, c-format +msgid "could not read ref %s" +msgstr "無法讀取引用 %s" + +#: transport-helper.c +#, c-format +msgid "unknown response to connect: %s" +msgstr "連線時未知的回應：%s" + +#: transport-helper.c +msgid "setting remote service path not supported by protocol" +msgstr "協定不支援設定遠端服務路徑" + +#: transport-helper.c +msgid "invalid remote service path" +msgstr "無效的遠端服務路徑" + +#: transport-helper.c transport.c +msgid "operation not supported by protocol" +msgstr "協定不支援該動作" + +#: transport-helper.c +#, c-format +msgid "can't connect to subservice %s" +msgstr "不能連線到子服務 %s" + +#: transport-helper.c transport.c +msgid "--negotiate-only requires protocol v2" +msgstr "--negotiate-only 需要 v2 版協定" + +#: transport-helper.c +msgid "'option' without a matching 'ok/error' directive" +msgstr "'option' 缺少對應的 'ok/error' 指令" + +#: transport-helper.c +#, c-format +msgid "expected ok/error, helper said '%s'" +msgstr "預期 ok/error，協助工具說 '%s'" + +#: transport-helper.c +#, c-format +msgid "helper reported unexpected status of %s" +msgstr "協助工具報告 %s 的意外狀態" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support dry-run" +msgstr "協助工具 %s 不支援 dry-run" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support --signed" +msgstr "協助工具 %s 不支援 --signed" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support --signed=if-asked" +msgstr "協助工具 %s 不支援 --signed=if-asked" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support --atomic" +msgstr "協助工具 %s 不支援 --atomic" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support --%s" +msgstr "協助工具 %s 不支援 --%s" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support 'push-option'" +msgstr "協助工具 %s 不支援 'push-option'" + +#: transport-helper.c +msgid "remote-helper doesn't support push; refspec needed" +msgstr "remote-heper 不支援 push，需要引用規格" + +#: transport-helper.c +#, c-format +msgid "helper %s does not support 'force'" +msgstr "協助工具 %s 不支援 'force'" + +#: transport-helper.c +msgid "couldn't run fast-export" +msgstr "無法執行 fast-export" + +#: transport-helper.c +msgid "error while running fast-export" +msgstr "執行 fast-export 時發生錯誤" + +#: transport-helper.c +#, c-format +msgid "" +"No refs in common and none specified; doing nothing.\n" +"Perhaps you should specify a branch.\n" +msgstr "" +"沒有共同的引用並且也沒有指定，什麼也不會做。\n" +"您或許得指定一個分支。\n" + +#: transport-helper.c +#, c-format +msgid "unsupported object format '%s'" +msgstr "不支援的物件格式「%s」" + +#: transport-helper.c +#, c-format +msgid "malformed response in ref list: %s" +msgstr "引用列表中格式錯誤的回應：%s" + +#: transport-helper.c +#, c-format +msgid "read(%s) failed" +msgstr "讀取（%s）失敗" + +#: transport-helper.c +#, c-format +msgid "write(%s) failed" +msgstr "寫（%s）失敗" + +#: transport-helper.c +#, c-format +msgid "%s thread failed" +msgstr "%s 執行緒失敗" + +#: transport-helper.c +#, c-format +msgid "%s thread failed to join: %s" +msgstr "%s 執行緒等待失敗：%s" + +#: transport-helper.c +#, c-format +msgid "can't start thread for copying data: %s" +msgstr "不能啟動執行緒來複製資料：%s" + +#: transport-helper.c +#, c-format +msgid "%s process failed to wait" +msgstr "%s 進程等待失敗" + +#: transport-helper.c +#, c-format +msgid "%s process failed" +msgstr "%s 進程失敗" + +#: transport-helper.c +msgid "can't start thread for copying data" +msgstr "不能啟動執行緒來複製資料" + +#: transport.c +#, c-format +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "將要設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n" + +#: transport.c +#, c-format +msgid "could not read bundle '%s'" +msgstr "無法讀取「%s」套件" + +#: transport.c +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "傳輸：無效的深度選項 '%s'" + +#: transport.c +msgid "see protocol.version in 'git help config' for more details" +msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息" + +#: transport.c +msgid "server options require protocol version 2 or later" +msgstr "服務端選項需要版本 2 協定或更高" + +#: transport.c +msgid "server does not support wait-for-done" +msgstr "伺服器不支援「等待完成」(wait-for-done) 功能" + +#: transport.c +msgid "could not parse transport.color.* config" +msgstr "不能解析 transport.color.* 設定" + +#: transport.c +msgid "support for protocol v2 not implemented yet" +msgstr "協定 v2 的支援尚未實現" + +#: transport.c +#, c-format +msgid "unknown value for config '%s': %s" +msgstr "設定 '%s' 的取值未知：%s" + +#: transport.c +#, c-format +msgid "transport '%s' not allowed" +msgstr "傳輸 '%s' 不允許" + +#: transport.c +msgid "git-over-rsync is no longer supported" +msgstr "不再支援 git-over-rsync" + +#: transport.c +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "下列子模組路徑所包含的修改在任何遠端來源中都找不到：\n" + +#: transport.c +#, c-format +msgid "" +"\n" +"Please try\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"or cd to the path and use\n" +"\n" +"\tgit push\n" +"\n" +"to push them to a remote.\n" +"\n" +msgstr "" +"\n" +"請嘗試\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"或者進入到子目錄執行\n" +"\n" +"\tgit push\n" +"\n" +"以推送至遠端。\n" +"\n" + +#: transport.c +msgid "Aborting." +msgstr "正在終止。" + +#: transport.c +msgid "failed to push all needed submodules" +msgstr "不能推送全部需要的子模組" + +#: tree-walk.c +msgid "too-short tree object" +msgstr "太短的樹狀物件" + +#: tree-walk.c +msgid "malformed mode in tree entry" +msgstr "樹狀物件中的條目模式錯誤" + +#: tree-walk.c +msgid "empty filename in tree entry" +msgstr "樹狀物件條目中空的檔案名" + +#: tree-walk.c +msgid "too-short tree file" +msgstr "太短的樹檔案" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you switch branches." +msgstr "" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" +"%%s請在切換分支前提交或儲藏您的修改。" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"您對下列檔案的本機修改將被簽出動作覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" +"您對下列檔案的本機修改將被合併動作覆蓋：\n" +"%%s請在合併前提交或儲藏您的修改。" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" +msgstr "" +"您對下列檔案的本機修改將被合併動作覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%sPlease commit your changes or stash them before you %s." +msgstr "" +"您對下列檔案的本機修改將被 %s 覆蓋：\n" +"%%s請在 %s 之前提交或儲藏您的修改。" + +#: unpack-trees.c +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" +msgstr "" +"您對下列檔案的本機修改將被 %s 覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"Updating the following directories would lose untracked files in them:\n" +"%s" +msgstr "" +"更新如下目錄將會遺失其中未追蹤的檔案：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "" +"Refusing to remove the current working directory:\n" +"%s" +msgstr "" +"拒絕移除目前工作目錄：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" +"%%s請在切換分支之前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" +"%%s請在合併前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" +"%%s請在 %s 前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%sPlease move or remove them before you switch branches." +msgstr "" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" +"%%s請在切換分支前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by " +"checkout:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" +"%%s請在合併前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" +"%%s請在 %s 前移動或刪除。" + +#: unpack-trees.c +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n" +"%%s" + +#: unpack-trees.c +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "條目 '%s' 和 '%s' 重疊。無法合併。" + +#: unpack-trees.c +#, c-format +msgid "" +"Cannot update submodule:\n" +"%s" +msgstr "" +"無法更新子模組：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following paths are not up to date and were left despite sparse " +"patterns:\n" +"%s" +msgstr "" +"即使有稀疏簽出樣板，以下路徑不是最新且保留下來：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following paths are unmerged and were left despite sparse patterns:\n" +"%s" +msgstr "" +"即使有稀疏簽出樣板，以下路徑未合併且保留下來：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "" +"The following paths were already present and thus not updated despite sparse " +"patterns:\n" +"%s" +msgstr "" +"即使有稀疏簽出樣板，以下路徑已經存在而因此未更新：\n" +"%s" + +#: unpack-trees.c +#, c-format +msgid "Aborting\n" +msgstr "正在終止\n" + +#: unpack-trees.c +#, c-format +msgid "" +"After fixing the above paths, you may want to run `git sparse-checkout " +"reapply`.\n" +msgstr "修正以上路徑後，您可能想要執行「git sparse-checkout reapply」。\n" + +#: unpack-trees.c +msgid "Updating files" +msgstr "正在更新檔案" + +#: unpack-trees.c +msgid "" +"the following paths have collided (e.g. case-sensitive paths\n" +"on a case-insensitive filesystem) and only one from the same\n" +"colliding group is in the working tree:\n" +msgstr "" +"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n" +"並且碰撞組中只有一個檔案存在工作區中：\n" + +#: unpack-trees.c +msgid "Updating index flags" +msgstr "正在更新索引旗標" + +#: unpack-trees.c +#, c-format +msgid "worktree and untracked commit have duplicate entries: %s" +msgstr "工作區和未追蹤提交有重複項目：%s" + +#: upload-pack.c +msgid "expected flush after fetch arguments" +msgstr "在 fetch 引數應為一個 flush 包" + +#: urlmatch.c +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "無效的 URL 方案名稱或遺失 '://' 後綴" + +#: urlmatch.c +#, c-format +msgid "invalid %XX escape sequence" +msgstr "無效的 %XX 轉義序列" + +#: urlmatch.c +msgid "missing host and scheme is not 'file:'" +msgstr "缺少主機名稱且 URL 方案不是 'file:'" + +#: urlmatch.c +msgid "a 'file:' URL may not have a port number" +msgstr "一個 'file:' URL 不應該包含埠號" + +#: urlmatch.c +msgid "invalid characters in host name" +msgstr "主機名稱中包含無效的字元" + +#: urlmatch.c +msgid "invalid port number" +msgstr "無效的埠號" + +#: urlmatch.c +msgid "invalid '..' path segment" +msgstr "無效的 '..' 路徑區塊" + +#: walker.c +msgid "Fetching objects" +msgstr "正在抓取物件" + +#: worktree.c +#, c-format +msgid "'%s' at main working tree is not the repository directory" +msgstr "在主工作區的 '%s' 不是版本庫目錄" + +#: worktree.c +#, c-format +msgid "'%s' file does not contain absolute path to the working tree location" +msgstr "檔案 '%s' 不包含工作區的絕對路徑" + +#: worktree.c +#, c-format +msgid "'%s' is not a .git file, error code %d" +msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d" + +#: worktree.c +#, c-format +msgid "'%s' does not point back to '%s'" +msgstr "'%s' 沒有指回到 '%s'" + +#: worktree.c +msgid "not a directory" +msgstr "不是目錄" + +#: worktree.c +msgid ".git is not a file" +msgstr ".git 不是檔案" + +#: worktree.c +msgid ".git file broken" +msgstr ".git 檔案損毀" + +#: worktree.c +msgid ".git file incorrect" +msgstr ".git 檔案不正確" + +#: worktree.c +msgid "not a valid path" +msgstr "非有效路徑" + +#: worktree.c +msgid "unable to locate repository; .git is not a file" +msgstr "無法定位版本庫；.git 不是檔案" + +#: worktree.c +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "無法定位版本庫：.git 檔案未指向版本庫" + +#: worktree.c +msgid "unable to locate repository; .git file broken" +msgstr "無法定位版本庫；.git 檔案損壞" + +#: worktree.c +msgid "gitdir unreadable" +msgstr "無法讀取 gitdir" + +#: worktree.c +msgid "gitdir incorrect" +msgstr "不正確的 gitdir" + +#: worktree.c +msgid "not a valid directory" +msgstr "非有效目錄" + +#: worktree.c +msgid "gitdir file does not exist" +msgstr "找不到 gitdir 檔案" + +#: worktree.c +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "無法讀取 gitdir 檔案 (%s)" + +#: worktree.c +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）" + +#: worktree.c +msgid "invalid gitdir file" +msgstr "gitdir 檔案無效" + +#: worktree.c +msgid "gitdir file points to non-existent location" +msgstr "gitdir 檔案指向的位置不存在" + +#: worktree.c +#, c-format +msgid "unable to set %s in '%s'" +msgstr "無法在「%2$s」設定 %1$s" + +#: worktree.c +#, c-format +msgid "unable to unset %s in '%s'" +msgstr "無法取消在「%2$s」設定的 %1$s" + +#: worktree.c +msgid "failed to set extensions.worktreeConfig setting" +msgstr "無法設定 extensions.worktreeConfig 設定" + +#: wrapper.c +#, c-format +msgid "could not setenv '%s'" +msgstr "無法 setenv '%s'" + +#: wrapper.c +#, c-format +msgid "unable to create '%s'" +msgstr "不能建立 '%s'" + +#: wrapper.c +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "無法開啟 '%s' 進行讀寫" + +#: wrapper.c +#, c-format +msgid "unable to access '%s'" +msgstr "不能存取 '%s'" + +#: wrapper.c +msgid "unable to get current working directory" +msgstr "不能取得目前工作目錄" + +#: wt-status.c +msgid "Unmerged paths:" +msgstr "未合併的路徑：" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git restore --staged <file>...\" to unstage)" +msgstr " （使用 \"git restore --staged <檔案>...\" 以取消暫存）" + +# 譯者：請維持前導空格 +#: wt-status.c +#, c-format +msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)" +msgstr " （使用 \"git restore --source=%s --staged <檔案>...\" 以取消暫存）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " （使用 \"git rm --cached <檔案>...\" 以取消暫存）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git add <file>...\" to mark resolution)" +msgstr " （使用 \"git add <檔案>...\" 標記解決方案）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git rm <file>...\" to mark resolution)" +msgstr " （使用 \"git rm <檔案>...\" 標記解決方案）" + +#: wt-status.c +msgid "Changes to be committed:" +msgstr "要提交的變更：" + +#: wt-status.c +msgid "Changes not staged for commit:" +msgstr "尚未暫存以備提交的變更：" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " （使用 \"git add <檔案>...\" 更新要提交的內容）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " （使用 \"git add/rm <檔案>...\" 更新要提交的內容）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid "" +" (use \"git restore <file>...\" to discard changes in working directory)" +msgstr " （使用 \"git restore <檔案>...\" 捨棄工作區的改動）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr " （提交或捨棄子模組中未追蹤或修改的內容）" + +# 譯者：請維持前導空格 +#: wt-status.c +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " （使用 \"git %s <檔案>...\" 以包含要提交的內容）" + +#: wt-status.c +msgid "both deleted:" +msgstr "雙方刪除：" + +#: wt-status.c +msgid "added by us:" +msgstr "由我們新增：" + +#: wt-status.c +msgid "deleted by them:" +msgstr "由他們刪除：" + +#: wt-status.c +msgid "added by them:" +msgstr "由他們新增：" + +#: wt-status.c +msgid "deleted by us:" +msgstr "由我們刪除：" + +#: wt-status.c +msgid "both added:" +msgstr "雙方新增：" + +#: wt-status.c +msgid "both modified:" +msgstr "雙方修改：" + +#: wt-status.c +msgid "new file:" +msgstr "新檔案：" + +#: wt-status.c +msgid "copied:" +msgstr "複製：" + +#: wt-status.c +msgid "deleted:" +msgstr "刪除：" + +#: wt-status.c +msgid "modified:" +msgstr "修改：" + +#: wt-status.c +msgid "renamed:" +msgstr "重新命名：" + +#: wt-status.c +msgid "typechange:" +msgstr "類型變更：" + +#: wt-status.c +msgid "unknown:" +msgstr "未知：" + +#: wt-status.c +msgid "unmerged:" +msgstr "未合併：" + +# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 +#: wt-status.c +msgid "new commits, " +msgstr "新提交, " + +# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 +#: wt-status.c +msgid "modified content, " +msgstr "修改的內容, " + +# 譯者：末尾兩個位元組可能被刪減，如果翻譯為中文標點會出現半個漢字 +#: wt-status.c +msgid "untracked content, " +msgstr "未追蹤的內容, " + +#: wt-status.c +#, c-format +msgid "Your stash currently has %d entry" +msgid_plural "Your stash currently has %d entries" +msgstr[0] "您的儲藏區目前有 %d 條紀錄" + +#: wt-status.c +msgid "Submodules changed but not updated:" +msgstr "子模組已修改但尚未更新：" + +#: wt-status.c +msgid "Submodule changes to be committed:" +msgstr "要提交的子模組變更：" + +#: wt-status.c +msgid "" +"Do not modify or remove the line above.\n" +"Everything below it will be ignored." +msgstr "" +"不要改動或刪除上面的一行。\n" +"其下所有內容都將被忽略。" + +#: wt-status.c +#, c-format +msgid "" +"\n" +"It took %.2f seconds to compute the branch ahead/behind values.\n" +"You can use '--no-ahead-behind' to avoid this.\n" +msgstr "" +"\n" +"花了 %.2f 秒才計算出分支的領先/落後範圍。\n" +"為避免，您可以使用 '--no-ahead-behind'。\n" + +#: wt-status.c +msgid "You have unmerged paths." +msgstr "您有尚未合併的路徑。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (fix conflicts and run \"git commit\")" +msgstr " （解決衝突並執行 \"git commit\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " （使用 \"git merge --abort\" 終止合併）" + +#: wt-status.c +msgid "All conflicts fixed but you are still merging." +msgstr "所有衝突已解決但您仍處於合併中。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git commit\" to conclude merge)" +msgstr " （使用 \"git commit\" 結束合併）" + +#: wt-status.c +msgid "You are in the middle of an am session." +msgstr "您正處於 am 動作過程中。" + +#: wt-status.c +msgid "The current patch is empty." +msgstr "目前的修補檔為空。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " （解決衝突，然後執行 \"git am --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " （使用 \"git am --skip\" 略過此修補檔）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid "" +" (use \"git am --allow-empty\" to record this patch as an empty commit)" +msgstr " （使用 \"git am --allow-empty\" 將目前修補檔錄製為空白提交）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " （使用 \"git am --abort\" 復原原有分支）" + +#: wt-status.c +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo 遺失。" + +#: wt-status.c +msgid "No commands done." +msgstr "沒有指令被執行。" + +#: wt-status.c +#, c-format +msgid "Last command done (%<PRIuMAX> command done):" +msgid_plural "Last commands done (%<PRIuMAX> commands done):" +msgstr[0] "上次完成的命令（完成 %<PRIuMAX> 條指令）：" + +#: wt-status.c +#, c-format +msgid " (see more in file %s)" +msgstr " （更多參見檔案 %s）" + +#: wt-status.c +msgid "No commands remaining." +msgstr "未剩下任何指令。" + +#: wt-status.c +#, c-format +msgid "Next command to do (%<PRIuMAX> remaining command):" +msgid_plural "Next commands to do (%<PRIuMAX> remaining commands):" +msgstr[0] "接下來要執行的命令（剩餘 %<PRIuMAX> 條命令）：" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）" + +#: wt-status.c +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。" + +#: wt-status.c +msgid "You are currently rebasing." +msgstr "您在執行重定基底動作。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (fix conflicts and then run \"git rebase --continue\")" +msgstr " （解決衝突，然後執行 \"git rebase --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " （使用 \"git rebase --skip\" 略過此修補檔）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (all conflicts fixed: run \"git rebase --continue\")" +msgstr " （所有衝突已解決：執行 \"git rebase --continue\"）" + +#: wt-status.c +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。" + +#: wt-status.c +msgid "You are currently splitting a commit during a rebase." +msgstr "您在執行重定基底動作時分割提交。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (Once your working directory is clean, run \"git rebase --continue\")" +msgstr " （一旦您工作目錄提交乾淨後，執行 \"git rebase --continue\"）" + +#: wt-status.c +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。" + +#: wt-status.c +msgid "You are currently editing a commit during a rebase." +msgstr "您在執行重定基底動作時編輯提交。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " （使用 \"git commit --amend\" 修補目前提交）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" +msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）" + +#: wt-status.c +msgid "Cherry-pick currently in progress." +msgstr "揀選動作正在進行中。" + +#: wt-status.c +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "您在執行揀選提交 %s 的動作。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (run \"git cherry-pick --continue\" to continue)" +msgstr " （執行 \"git cherry-pick --continue\" 以繼續）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " （使用 \"git cherry-pick --skip\" 略過此修補檔）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）" + +#: wt-status.c +msgid "Revert currently in progress." +msgstr "還原動作正在進行中。" + +#: wt-status.c +#, c-format +msgid "You are currently reverting commit %s." +msgstr "您在執行反轉提交 %s 的動作。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " （解決衝突並執行 \"git revert --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (run \"git revert --continue\" to continue)" +msgstr " （執行 \"git revert --continue\" 以繼續）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr " （所有衝突已解決：執行 \"git revert --continue\"）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " （使用 \"git revert --skip\" 略過此修補檔）" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git revert --abort\" to cancel the revert operation)" +msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）" + +#: wt-status.c +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。" + +#: wt-status.c +msgid "You are currently bisecting." +msgstr "您在執行二分搜尋動作。" + +# 譯者：請維持前導空格 +#: wt-status.c +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " （使用 \"git bisect reset\" 簽出原有分支）" + +#: wt-status.c +msgid "You are in a sparse checkout." +msgstr "您正在稀疏簽出的工作區中。" + +#: wt-status.c +#, c-format +msgid "You are in a sparse checkout with %d%% of tracked files present." +msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。" + +#: wt-status.c +msgid "On branch " +msgstr "位於分支 " + +#: wt-status.c +msgid "interactive rebase in progress; onto " +msgstr "互動式重定基底動作正在進行中；至 " + +#: wt-status.c +msgid "rebase in progress; onto " +msgstr "重定基底動作正在進行中；至 " + +#: wt-status.c +msgid "HEAD detached at " +msgstr "開頭指標分離於 " + +#: wt-status.c +msgid "HEAD detached from " +msgstr "開頭指標分離自 " + +#: wt-status.c +msgid "Not currently on any branch." +msgstr "目前不在任何分支上。" + +#: wt-status.c +msgid "Initial commit" +msgstr "初始提交" + +#: wt-status.c +msgid "No commits yet" +msgstr "尚無提交" + +#: wt-status.c +msgid "Untracked files" +msgstr "未追蹤的檔案" + +#: wt-status.c +msgid "Ignored files" +msgstr "忽略的檔案" + +#: wt-status.c +#, c-format +msgid "" +"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" +"may speed it up, but you have to be careful not to forget to add\n" +"new files yourself (see 'git help status')." +msgstr "" +"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n" +"但您需要小心不要忘了新增新檔案（參見 'git help status'）。" + +#: wt-status.c +#, c-format +msgid "Untracked files not listed%s" +msgstr "未追蹤的檔案沒有列出%s" + +# 譯者：中文字串拼接，可刪除前導空格 +#: wt-status.c +msgid " (use -u option to show untracked files)" +msgstr " （使用 -u 參數顯示未追蹤的檔案）" + +#: wt-status.c +msgid "No changes" +msgstr "沒有修改" + +#: wt-status.c +#, c-format +msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" + +#: wt-status.c +#, c-format +msgid "no changes added to commit\n" +msgstr "修改尚未加入提交\n" + +#: wt-status.c +#, c-format +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n" + +#: wt-status.c +#, c-format +msgid "nothing added to commit but untracked files present\n" +msgstr "提交為空，但是存在尚未追蹤的檔案\n" + +# 譯者：中文字串拼接，可刪除前導空格 +#: wt-status.c +#, c-format +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n" + +#: wt-status.c +#, c-format +msgid "nothing to commit\n" +msgstr "無檔案要提交\n" + +# 譯者：中文字串拼接，可刪除前導空格 +#: wt-status.c +#, c-format +msgid "nothing to commit (use -u to show untracked files)\n" +msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n" + +# 譯者：中文字串拼接，可刪除前導空格 +#: wt-status.c +#, c-format +msgid "nothing to commit, working tree clean\n" +msgstr "沒有要提交的檔案，工作區為乾淨狀態\n" + +#: wt-status.c +msgid "No commits yet on " +msgstr "尚無提交在 " + +#: wt-status.c +msgid "HEAD (no branch)" +msgstr "HEAD（非分支）" + +#: wt-status.c +msgid "different" +msgstr "不同" + +# 譯者：請維持句尾空格 +#: wt-status.c +msgid "behind " +msgstr "落後 " + +#: wt-status.c +msgid "ahead " +msgstr "領先 " + +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c +#, c-format +msgid "cannot %s: You have unstaged changes." +msgstr "不能%s：您有未暫存的變更。" + +#: wt-status.c +msgid "additionally, your index contains uncommitted changes." +msgstr "另外，您的索引中包含未提交的變更。" + +#: wt-status.c +#, c-format +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "不能%s：您的索引中包含未提交的變更。" + +#: git-merge-octopus.sh msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" msgstr "錯誤：您對下列檔案的本機修改將被合併動作覆蓋" -#: git-merge-octopus.sh:61 +#: git-merge-octopus.sh msgid "Automated merge did not work." msgstr "自動合併未生效。" -#: git-merge-octopus.sh:62 +#: git-merge-octopus.sh msgid "Should not be doing an octopus." msgstr "不應該執行章魚式合併。" -#: git-merge-octopus.sh:73 +#: git-merge-octopus.sh #, sh-format msgid "Unable to find common commit with $pretty_name" msgstr "無法找到和 $pretty_name 的基礎提交" -#: git-merge-octopus.sh:77 +#: git-merge-octopus.sh #, sh-format msgid "Already up to date with $pretty_name" msgstr "已經和 $pretty_name 保持一致" -#: git-merge-octopus.sh:89 +#: git-merge-octopus.sh #, sh-format msgid "Fast-forwarding to: $pretty_name" msgstr "快轉至：$pretty_name" -#: git-merge-octopus.sh:97 +#: git-merge-octopus.sh #, sh-format msgid "Trying simple merge with $pretty_name" msgstr "嘗試和 $pretty_name 的簡單合併" -#: git-merge-octopus.sh:102 +#: git-merge-octopus.sh msgid "Simple merge did not work, trying automatic merge." msgstr "簡單合併未生效，嘗試自動合併。" -#: git-sh-setup.sh:89 git-sh-setup.sh:94 +#: git-sh-setup.sh #, sh-format msgid "usage: $dashless $USAGE" msgstr "用法：$dashless $USAGE" -#: git-sh-setup.sh:182 +#: git-sh-setup.sh #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "不能切換目錄到 $cdup，工作區的頂級目錄" -#: git-sh-setup.sh:191 git-sh-setup.sh:198 +#: git-sh-setup.sh #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。" -#: git-sh-setup.sh:212 +#: git-sh-setup.sh msgid "Cannot rewrite branches: You have unstaged changes." msgstr "不能重寫分支：您有未暫存的變更。" -#: git-sh-setup.sh:215 +#: git-sh-setup.sh #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "不能 $action：您有未暫存的變更。" -#: git-sh-setup.sh:226 +#: git-sh-setup.sh #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "不能 $action：您的索引中包含未提交的變更。" -#: git-sh-setup.sh:228 +#: git-sh-setup.sh msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引中包含未提交的變更。" -#: git-sh-setup.sh:348 +#: git-sh-setup.sh msgid "You need to run this command from the toplevel of the working tree." msgstr "您需要在工作區的頂級目錄中執行這個指令。" -#: git-sh-setup.sh:353 +#: git-sh-setup.sh 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:212 +#: git-add--interactive.perl #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" -#: git-add--interactive.perl:632 +#: git-add--interactive.perl #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "建立了 %d 個路徑\n" -#: git-add--interactive.perl:1056 +#: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。" -#: git-add--interactive.perl:1059 +#: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。" -#: git-add--interactive.perl:1062 +#: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。" -#: git-add--interactive.perl:1065 git-add--interactive.perl:1074 -#: git-add--interactive.perl:1080 +#: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為套用。" -#: git-add--interactive.perl:1068 git-add--interactive.perl:1071 -#: git-add--interactive.perl:1077 +#: git-add--interactive.perl msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。" -#: git-add--interactive.perl:1114 +#: git-add--interactive.perl #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "為寫入開啟區塊編輯檔案失敗：%s" -#: git-add--interactive.perl:1121 +#: git-add--interactive.perl #, perl-format msgid "" "---\n" @@ -25704,12 +25957,12 @@ msgstr "" "要刪除 '%s' 開始的行，刪除它們。\n" "以 %s 開始的行將被刪除。\n" -#: git-add--interactive.perl:1143 +#: git-add--interactive.perl #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "無法讀取區塊編輯檔案：%s" -#: git-add--interactive.perl:1253 +#: git-add--interactive.perl msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -25723,7 +25976,7 @@ msgstr "" "a - 暫存此區塊和本檔案中後面的全部區塊\n" "d - 不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1259 +#: git-add--interactive.perl msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -25737,7 +25990,7 @@ msgstr "" "a - 儲藏此區塊和本檔案中後面的全部區塊\n" "d - 不儲藏此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1265 +#: git-add--interactive.perl msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -25751,7 +26004,7 @@ msgstr "" "a - 不暫存此區塊和本檔案中後面的全部區塊\n" "d - 不要不暫存此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1271 +#: git-add--interactive.perl msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -25765,7 +26018,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1277 git-add--interactive.perl:1295 +#: git-add--interactive.perl msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -25779,7 +26032,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1283 +#: git-add--interactive.perl msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -25793,7 +26046,7 @@ msgstr "" "a - 捨棄此區塊和本檔案中後面的全部區塊\n" "d - 不要捨棄此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1289 +#: git-add--interactive.perl msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -25807,7 +26060,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1301 +#: git-add--interactive.perl msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -25821,7 +26074,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊" -#: git-add--interactive.perl:1316 +#: git-add--interactive.perl msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -25843,88 +26096,88 @@ msgstr "" "e - 手動編輯目前區塊\n" "? - 顯示說明\n" -#: git-add--interactive.perl:1347 +#: git-add--interactive.perl msgid "The selected hunks do not apply to the index!\n" msgstr "選取區塊不能套用到索引！\n" -#: git-add--interactive.perl:1362 +#: git-add--interactive.perl #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未套用的：%s\n" -#: git-add--interactive.perl:1481 +#: git-add--interactive.perl #, 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:1482 +#: git-add--interactive.perl #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1483 +#: git-add--interactive.perl #, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1484 +#: git-add--interactive.perl #, 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:1601 +#: git-add--interactive.perl msgid "No other hunks to goto\n" msgstr "沒有其它可供跳轉的區塊\n" -#: git-add--interactive.perl:1619 +#: git-add--interactive.perl #, perl-format msgid "Invalid number: '%s'\n" msgstr "無效數字：'%s'\n" -#: git-add--interactive.perl:1624 +#: git-add--interactive.perl #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "對不起，只有 %d 個可用區塊。\n" -#: git-add--interactive.perl:1659 +#: git-add--interactive.perl msgid "No other hunks to search\n" msgstr "沒有其它可供尋找的區塊\n" -#: git-add--interactive.perl:1676 +#: git-add--interactive.perl #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "錯誤的常規表示式 %s：%s\n" -#: git-add--interactive.perl:1686 +#: git-add--interactive.perl msgid "No hunk matches the given pattern\n" msgstr "沒有和提供模式相符合的區塊\n" -#: git-add--interactive.perl:1698 git-add--interactive.perl:1720 +#: git-add--interactive.perl msgid "No previous hunk\n" msgstr "沒有上一個區塊\n" -#: git-add--interactive.perl:1707 git-add--interactive.perl:1726 +#: git-add--interactive.perl msgid "No next hunk\n" msgstr "沒有下一個區塊\n" -#: git-add--interactive.perl:1732 +#: git-add--interactive.perl msgid "Sorry, cannot split this hunk\n" msgstr "對不起，不能分割這個區塊\n" -#: git-add--interactive.perl:1738 +#: git-add--interactive.perl #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "分割為 %d 塊。\n" -#: git-add--interactive.perl:1748 +#: git-add--interactive.perl msgid "Sorry, cannot edit this hunk\n" msgstr "對不起，不能編輯這個區塊\n" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1813 +#: git-add--interactive.perl msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -25941,56 +26194,53 @@ msgstr "" "diff - 顯示 HEAD 和索引間差異\n" "add untracked - 新增未追蹤檔案的內容至暫存列表\n" -#: git-add--interactive.perl:1830 git-add--interactive.perl:1842 -#: git-add--interactive.perl:1845 git-add--interactive.perl:1852 -#: git-add--interactive.perl:1855 git-add--interactive.perl:1862 -#: git-add--interactive.perl:1866 git-add--interactive.perl:1872 +#: git-add--interactive.perl msgid "missing --" msgstr "缺少 --" -#: git-add--interactive.perl:1868 +#: git-add--interactive.perl #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模式：%s" -#: git-add--interactive.perl:1874 git-add--interactive.perl:1880 +#: git-add--interactive.perl #, perl-format msgid "invalid argument %s, expecting --" msgstr "無效的參數 %s，期望是 --" -#: git-send-email.perl:159 +#: git-send-email.perl msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本機時間和 GMT 有不到一分鐘間隔\n" -#: git-send-email.perl:166 git-send-email.perl:172 +#: git-send-email.perl msgid "local time offset greater than or equal to 24 hours\n" msgstr "本機時間位移量大於等於 24 小時\n" -#: git-send-email.perl:244 +#: git-send-email.perl #, perl-format msgid "fatal: command '%s' died with exit code %d" msgstr "致命錯誤：命令「%s」中止，結束碼：%d" -#: git-send-email.perl:257 +#: git-send-email.perl msgid "the editor exited uncleanly, aborting everything" msgstr "編輯器非正常離開，終止所有動作" -#: git-send-email.perl:346 +#: git-send-email.perl #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包含您正在編寫的一個中間版本的信件。\n" -#: git-send-email.perl:351 +#: git-send-email.perl #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包含編輯的信件。\n" -#: git-send-email.perl:484 +#: git-send-email.perl msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它選項不相容\n" -#: git-send-email.perl:561 +#: git-send-email.perl msgid "" "fatal: found configuration options for 'sendmail'\n" "git-send-email is configured with the sendemail.* options - note the 'e'.\n" @@ -26000,47 +26250,47 @@ msgstr "" "git-send-email 已經以 sendemail.* 選項設定 - 注意裡面的 'e'。\n" "請將 sendemail.forbidSendmailVariables 設為 false 停用此檢查。\n" -#: git-send-email.perl:566 git-send-email.perl:782 +#: git-send-email.perl msgid "Cannot run git format-patch from outside a repository\n" msgstr "不能在版本庫之外執行 git format-patch\n" -#: git-send-email.perl:569 +#: git-send-email.perl msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` 和 `relogin` 必須同時定義（透過指令列或者設定選項）\n" -#: git-send-email.perl:582 +#: git-send-email.perl #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc 欄位：'%s'\n" -#: git-send-email.perl:613 +#: git-send-email.perl #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 設定：'%s'\n" -#: git-send-email.perl:653 +#: git-send-email.perl #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "警告：不支援帶引號的 sendmail 別名：%s\n" -#: git-send-email.perl:655 +#: git-send-email.perl #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "警告：不支援 `:include:`：%s\n" -#: git-send-email.perl:657 +#: git-send-email.perl #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "警告：不支援 `/file` 或 `|pipe` 重定向：%s\n" -#: git-send-email.perl:662 +#: git-send-email.perl #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "警告：不能識別的 sendmail 行：%s\n" -#: git-send-email.perl:747 +#: git-send-email.perl #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" @@ -26055,12 +26305,12 @@ msgstr "" " * 如果含義為一個檔案，使用 \"./%s\"，或者\n" " * 如果含義為一個範圍，使用 --format-patch 選項。\n" -#: git-send-email.perl:768 +#: git-send-email.perl #, perl-format msgid "Failed to opendir %s: %s" msgstr "無法開啟目錄 %s: %s" -#: git-send-email.perl:803 +#: git-send-email.perl msgid "" "\n" "No patch files specified!\n" @@ -26070,17 +26320,17 @@ msgstr "" "未指定修補檔案！\n" "\n" -#: git-send-email.perl:816 +#: git-send-email.perl #, perl-format msgid "No subject line in %s?" msgstr "在 %s 中沒有標題行？" -#: git-send-email.perl:827 +#: git-send-email.perl #, perl-format msgid "Failed to open for writing %s: %s" msgstr "為寫入開啟 %s 失敗: %s" -#: git-send-email.perl:838 +#: git-send-email.perl msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" @@ -26093,37 +26343,37 @@ msgstr "" "\n" "如果您不想傳送摘要，清除內容。\n" -#: git-send-email.perl:862 +#: git-send-email.perl #, perl-format msgid "Failed to open %s: %s" msgstr "無法開啟 %s: %s" -#: git-send-email.perl:879 +#: git-send-email.perl #, perl-format msgid "Failed to open %s.final: %s" msgstr "無法開啟 %s.final: %s" -#: git-send-email.perl:922 +#: git-send-email.perl msgid "Summary email is empty, skipping it\n" msgstr "摘要信件為空，略過\n" #. TRANSLATORS: please keep [y/N] as is. -#: git-send-email.perl:971 +#: git-send-email.perl #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您是否要使用 <%s> [y/N]？ " -#: git-send-email.perl:1026 +#: git-send-email.perl msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "如下檔案含 8bit 內容，但沒有聲明一個 Content-Transfer-Encoding。\n" -#: git-send-email.perl:1031 +#: git-send-email.perl msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "要宣告 8bit 為什麼樣的編碼格式 [UTF-8]？ " -#: git-send-email.perl:1039 +#: git-send-email.perl #, perl-format msgid "" "Refusing to send because the patch\n" @@ -26135,20 +26385,20 @@ msgstr "" "\t%s\n" "包含範本標題 '*** SUBJECT HERE ***'。如果確定想要傳送，使用參數 --force。\n" -#: git-send-email.perl:1058 +#: git-send-email.perl msgid "To whom should the emails be sent (if anyone)?" msgstr "信件將要傳送給誰？" -#: git-send-email.perl:1076 +#: git-send-email.perl #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "致命錯誤：別名 '%s' 展開後還是自己\n" -#: git-send-email.perl:1088 +#: git-send-email.perl msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "（如果有）Message-ID 是否要被用作第一封信件的 In-Reply-To ？ " -#: git-send-email.perl:1150 git-send-email.perl:1158 +#: git-send-email.perl #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" @@ -26156,16 +26406,16 @@ msgstr "錯誤：不能從 %s 中擷取一個有效的信件位址\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1162 +#: git-send-email.perl msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何處理這個位址？([q]uit|[d]rop|[e]dit)： " -#: git-send-email.perl:1482 +#: git-send-email.perl #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路徑 \"%s\" 不存在" -#: git-send-email.perl:1565 +#: git-send-email.perl msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" @@ -26190,112 +26440,112 @@ msgstr "" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. -#: git-send-email.perl:1580 +#: git-send-email.perl msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "傳送這封信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): " -#: git-send-email.perl:1583 +#: git-send-email.perl msgid "Send this email reply required" msgstr "傳送要求的信件回復" -#: git-send-email.perl:1617 +#: git-send-email.perl msgid "The required SMTP server is not properly defined." msgstr "要求的 SMTP 伺服器未被正確定義。" -#: git-send-email.perl:1664 +#: git-send-email.perl #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "伺服器不支援 STARTTLS！%s" -#: git-send-email.perl:1669 git-send-email.perl:1673 +#: git-send-email.perl #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失敗！%s" -#: git-send-email.perl:1682 +#: git-send-email.perl msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "無法正確地初始化 SMTP。檢查設定並使用 --smtp-debug。" -#: git-send-email.perl:1700 +#: git-send-email.perl #, perl-format msgid "Failed to send %s\n" msgstr "無法傳送 %s\n" -#: git-send-email.perl:1703 +#: git-send-email.perl #, perl-format msgid "Dry-Sent %s\n" msgstr "測試執行傳送 %s\n" -#: git-send-email.perl:1703 +#: git-send-email.perl #, perl-format msgid "Sent %s\n" msgstr "正傳送 %s\n" -#: git-send-email.perl:1705 +#: git-send-email.perl msgid "Dry-OK. Log says:\n" msgstr "測試執行成功。日誌說：\n" -#: git-send-email.perl:1705 +#: git-send-email.perl msgid "OK. Log says:\n" msgstr "OK。日誌說：\n" -#: git-send-email.perl:1724 +#: git-send-email.perl msgid "Result: " msgstr "結果： " -#: git-send-email.perl:1727 +#: git-send-email.perl msgid "Result: OK\n" msgstr "結果：OK\n" -#: git-send-email.perl:1744 +#: git-send-email.perl #, perl-format msgid "can't open file %s" msgstr "無法開啟檔案 %s" -#: git-send-email.perl:1792 git-send-email.perl:1812 +#: git-send-email.perl #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1798 +#: git-send-email.perl #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) 新增 to：%s 自行 '%s'\n" -#: git-send-email.perl:1855 +#: git-send-email.perl #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n" -#: git-send-email.perl:1890 +#: git-send-email.perl #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) 新增 cc: %s 自行 '%s'\n" -#: git-send-email.perl:2009 +#: git-send-email.perl #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) 不能執行 '%s'" -#: git-send-email.perl:2016 +#: git-send-email.perl #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) 新增 %s: %s 自：'%s'\n" -#: git-send-email.perl:2020 +#: git-send-email.perl #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) 無法關閉管道至 '%s'" -#: git-send-email.perl:2050 +#: git-send-email.perl msgid "cannot send message as 7bit" msgstr "不能以 7bit 形式傳送訊息" -#: git-send-email.perl:2058 +#: git-send-email.perl msgid "invalid transfer encoding" msgstr "無效的傳送編碼" -#: git-send-email.perl:2100 +#: git-send-email.perl #, perl-format msgid "" "fatal: %s: rejected by %s hook\n" @@ -26306,12 +26556,12 @@ msgstr "" "%s\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:2110 git-send-email.perl:2163 git-send-email.perl:2173 +#: git-send-email.perl #, perl-format msgid "unable to open %s: %s\n" msgstr "不能開啟 %s：%s\n" -#: git-send-email.perl:2113 +#: git-send-email.perl #, perl-format msgid "" "fatal: %s:%d is longer than 998 characters\n" @@ -26320,1222 +26570,13 @@ msgstr "" "致命錯誤：%s:%d 的字元數超過 998\n" "警告：修補檔未能傳送\n" -#: git-send-email.perl:2131 +#: git-send-email.perl #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略過 %s 含備份後綴 '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. -#: git-send-email.perl:2135 +#: git-send-email.perl #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的要傳送 %s？[y|N]： " - -#, perl-format -#~ msgid "fatal: %s: rejected by %s hook\n" -#~ msgstr "致命錯誤：%s：被 %s 掛勾拒絕\n" - -#~ msgid "git archive --list" -#~ msgstr "git archive --list" - -#, c-format -#~ msgid "unknown value for --diff-merges: %s" -#~ msgstr "--diff-merges 的值無效：%s" - -#, c-format -#~ msgid "invalid value '%s' for lsrefs.unborn" -#~ msgstr "lsrefs.unborn 的值「%s」無效" - -#~ msgid "backend for `git stash -p`" -#~ msgstr "`git stash -p` 的後端" - -#, c-format -#~ msgid "Invalid value for --empty: %s" -#~ msgstr "傳入 --empty 的值無效：%s" - -#, c-format -#~ msgid "Invalid value for --patch-format: %s" -#~ msgstr "無效的 --patch-format 值：%s" - -#, c-format -#~ msgid "Invalid value for --show-current-patch: %s" -#~ msgstr "無效的 --show-current-patch 值：%s" - -#~ msgid "" -#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " -#~ "| --term-new]" -#~ msgstr "" -#~ "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad " -#~ "| --term-new]" - -#~ msgid "git bisect--helper --bisect-next" -#~ msgstr "git bisect--helper --bisect-next" - -#~ msgid "git bisect--helper --bisect-visualize" -#~ msgstr "git bisect--helper --bisect-visualize" - -#, c-format -#~ msgid "invalid color '%s' in color.blame.repeatedLines" -#~ msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'" - -#~ msgid "invalid value for blame.coloring" -#~ msgstr "設定 blame.coloring 中的無效取值" - -#~ msgid "" -#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " -#~ "| -p | <type> | --textconv | --filters) [--path=<path>] <object>" -#~ msgstr "" -#~ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e " -#~ "| -p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>" - -#~ msgid "show object type" -#~ msgstr "顯示物件類型" - -#~ msgid "exit with zero when there's no error" -#~ msgstr "當沒有錯誤時離開並返回零" - -#~ msgid "show info and content of objects fed from the standard input" -#~ msgstr "顯示從標準輸入提供的物件的訊息和內容" - -#~ msgid "show info about objects fed from the standard input" -#~ msgstr "顯示從標準輸入提供的物件的訊息" - -#~ msgid "follow in-tree symlinks (used with --batch or --batch-check)" -#~ msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）" - -#~ msgid "show all objects with --batch or --batch-check" -#~ msgstr "使用 --batch 或 --batch-check 參數顯示所有物件" - -#~ msgid "do not order --batch-all-objects output" -#~ msgstr "不要對 --batch-all-objects 的輸出排序" - -#~ msgid "set up tracking mode (see git-pull(1))" -#~ msgstr "設定追蹤模式（參見 git-pull(1)）" - -#~ msgid "Using both --reset-author and --author does not make sense" -#~ msgstr "同時使用 --reset-author 和 --author 沒有意義" - -#~ msgid "Options --squash and --fixup cannot be used together" -#~ msgstr "選項 --squash 和 --fixup 不能同時使用" - -#~ msgid "Only one of -c/-C/-F/--fixup can be used." -#~ msgstr "只能用一個 -c/-C/-F/--fixup 選項。" - -#~ msgid "Option -m cannot be combined with -c/-C/-F." -#~ msgstr "選項 -m 不能和 -c/-C/-F 同時使用。" - -#~ msgid "" -#~ "Only one of --include/--only/--all/--interactive/--patch can be used." -#~ msgstr "只能用一個 --include/--only/--all/--interactive/--patch 選項。" - -#~ msgid "git count-objects [-v] [-H | --human-readable]" -#~ msgstr "git count-objects [-v] [-H | --human-readable]" - -#, c-format -#~ msgid "configuration fetch.output contains invalid value %s" -#~ msgstr "設定變數 fetch.output 包含無效值 %s" - -#~ msgid "--cached or --untracked cannot be used with --no-index" -#~ msgstr "--cached 或 --untracked 不能與 --no-index 同時使用" - -#~ msgid "--untracked cannot be used with --cached" -#~ msgstr "--untracked 不能與 --cached 一起使用" - -#~ msgid "git hash-object --stdin-paths" -#~ msgstr "git hash-object --stdin-paths" - -#~ msgid "git help [-g|--guides]" -#~ msgstr "git help [-g|--guides]" - -#~ msgid "git help [-c|--config]" -#~ msgstr "git help [-c|--config]" - -#~ msgid "git mktag" -#~ msgstr "git mktag" - -#~ msgid "git mktree [-z] [--missing] [--batch]" -#~ msgstr "git mktree [-z] [--missing] [--batch]" - -#~ msgid "read from stdin" -#~ msgstr "從標準輸入讀取" - -#~ msgid "git notes merge --commit [-v | -q]" -#~ msgstr "git notes merge --commit [-v | -q]" - -#~ msgid "git notes merge --abort [-v | -q]" -#~ msgstr "git notes merge --abort [-v | -q]" - -#~ msgid "git notes get-ref" -#~ msgstr "git notes get-ref" - -#~ msgid "invalid value for --missing" -#~ msgstr "選項 --missing 的值無效" - -#~ msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" -#~ msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" - -#, c-format -#~ msgid "Invalid value for %s: %s" -#~ msgstr "%s 的值無效：%s" - -#, c-format -#~ msgid "Invalid value for pull.ff: %s" -#~ msgstr "pull.ff 的取值無效：%s" - -#~ msgid "git rebase --continue | --abort | --skip | --edit-todo" -#~ msgstr "git rebase --continue | --abort | --skip | --edit-todo" - -#, c-format -#~ msgid "'%s' is not a valid timestamp" -#~ msgstr "'%s' 不是一個有效的時間戳" - -#~ msgid "git reflog [ show | expire | delete | exists ]" -#~ msgstr "git reflog [ show | expire | delete | exists ]" - -#~ msgid "git remote [-v | --verbose]" -#~ msgstr "git remote [-v | --verbose]" - -#~ msgid "git replace [-f] --convert-graft-file" -#~ msgstr "git replace [-f] --convert-graft-file" - -#, c-format -#~ msgid "" -#~ "\n" -#~ "It took %.2f seconds to enumerate unstaged changes after reset. You can\n" -#~ "use '--quiet' to avoid this. Set the config setting reset.quiet to true\n" -#~ "to make this the default.\n" -#~ msgstr "" -#~ "\n" -#~ "重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n" -#~ "將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n" - -#~ msgid "git sparse-checkout list" -#~ msgstr "git sparse-checkout list" - -#~ msgid "unable to upgrade repository format to enable worktreeConfig" -#~ msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig" - -#~ msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]" -#~ msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]" - -#~ msgid "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" -#~ msgstr "git sparse-checkout reapply [--[no-]cone] [--[no-]sparse-index]" - -#~ msgid "git sparse-checkout disable" -#~ msgstr "git sparse-checkout disable" - -#~ msgid "" -#~ "the stash.useBuiltin support has been removed!\n" -#~ "See its entry in 'git help config' for details." -#~ msgstr "" -#~ "對 stash.useBuiltin 的支援已被刪除！\n" -#~ "詳見「git help config」中的條目。" - -#~ msgid "git stripspace [-s | --strip-comments]" -#~ msgstr "git stripspace [-s | --strip-comments]" - -#~ msgid "git stripspace [-c | --comment-lines]" -#~ msgstr "git stripspace [-c | --comment-lines]" - -#~ msgid "submodule--helper print-default-remote takes no arguments" -#~ msgstr "submodule--helper print-default-remote 不帶參數" - -#~ msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" -#~ msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]" - -#~ msgid "suppress output for update by rebase or merge" -#~ msgstr "隱藏 rebase 或 merge 觸發之更新的輸出" - -#~ msgid "overrides update mode in case the repository is a fresh clone" -#~ msgstr "如果版本庫是剛複製的，就覆蓋更新模式" - -#~ msgid "depth for shallow fetch" -#~ msgstr "淺 fetch 的深度" - -#~ msgid "sha1" -#~ msgstr "sha1" - -#~ msgid "SHA1 expected by superproject" -#~ msgstr "上層專案預期應是 SHA1" - -#~ msgid "subsha1" -#~ msgstr "subsha1" - -#~ msgid "SHA1 of submodule's HEAD" -#~ msgstr "子模組 HEAD 的 SHA1" - -#~ msgid "git submodule--helper run-update-procedure [<options>] <path>" -#~ msgstr "git submodule--helper run-update-procedure [<選項>] [<路徑>]" - -#~ msgid "git submodule--helper config --check-writeable" -#~ msgstr "git submodule--helper config --check-writeable" - -#~ msgid "git update-server-info [--force]" -#~ msgstr "git update-server-info [--force]" - -#~ msgid "Initialize and modify the sparse-checkout" -#~ msgstr "初始化並修改稀疏簽出" - -#, sh-format -#~ msgid "" -#~ "Unable to find current ${remote_name}/${branch} revision in submodule " -#~ "path '$sm_path'" -#~ msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}" - -#, sh-format -#~ msgid "Failed to recurse into submodule path '$displaypath'" -#~ msgstr "無法遞迴進子模組路徑 '$displaypath'" - -#~ msgid "--index outside a repository" -#~ msgstr "--index 在版本庫之外" - -#~ msgid "--cached outside a repository" -#~ msgstr "--cached 在版本庫之外" - -#~ msgid "unrecognized input" -#~ msgstr "無法識別的輸入" - -#, c-format -#~ msgid "cannot read %s" -#~ msgstr "不能讀取 %s" - -#~ msgid "Option --exec can only be used together with --remote" -#~ msgstr "選項 --exec 只能和 --remote 同時使用" - -#, c-format -#~ msgid "" -#~ "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing." -#~ msgstr "分支 '%1$s' 設定為使用重定基底來追蹤來自 '%3$s' 的遠端分支 '%2$s'。" - -#, c-format -#~ msgid "Branch '%s' set up to track remote branch '%s' from '%s'." -#~ msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的遠端分支 '%2$s'。" - -#, c-format -#~ msgid "Branch '%s' set up to track local branch '%s' by rebasing." -#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤本機分支 '%s'。" - -#, c-format -#~ msgid "Branch '%s' set up to track local branch '%s'." -#~ msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。" - -#, c-format -#~ msgid "Branch '%s' set up to track remote ref '%s' by rebasing." -#~ msgstr "分支 '%s' 設定為使用重定基底來追蹤遠端引用 '%s'。" - -#, c-format -#~ msgid "Branch '%s' set up to track remote ref '%s'." -#~ msgstr "分支 '%s' 設定為追蹤遠端引用 '%s'。" - -#~ msgid "Cannot force update the current branch." -#~ msgstr "無法強制更新目前分支。" - -#, c-format -#~ msgid "Not a valid object name: '%s'." -#~ msgstr "不是一個有效的物件名：'%s'。" - -#~ msgid "--name-only, --name-status, --check and -s are mutually exclusive" -#~ msgstr "--name-only、--name-status、--check 和 -s 是互斥的" - -#~ msgid "-G, -S and --find-object are mutually exclusive" -#~ msgstr "-G、-S 和 --find-object 是互斥的" - -#~ msgid "" -#~ "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" -#~ msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex 搭配 -S" - -#~ msgid "" -#~ "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " -#~ "with -G and -S" -#~ msgstr "" -#~ "--pickaxe-all 和 --find-object 互斥。請使用 --pickaxe-all 搭配 -G 和 -S" - -#~ msgid "--stateless-rpc requires multi_ack_detailed" -#~ msgstr "--stateless-rpc 需要 multi_ack_detailed" - -#~ msgid "--left-only and --right-only are mutually exclusive" -#~ msgstr "--left-only 和 --right-only 互斥" - -#, c-format -#~ msgid "unrecognized %%(objectsize) argument: %s" -#~ msgstr "無法識別的 %%(objectsize) 參數：%s" - -#, c-format -#~ msgid "unrecognized %%(subject) argument: %s" -#~ msgstr "無法識別的 %%(subject) 引數：%s" - -#, c-format -#~ msgid "unrecognized %%(contents) argument: %s" -#~ msgstr "無法識別的 %%(contents) 參數：%s" - -#, c-format -#~ msgid "unrecognized %%(raw) argument: %s" -#~ msgstr "無法識別的 %%(raw) 引數：%s" - -#, c-format -#~ msgid "unrecognized argument '%s' in %%(%s)" -#~ msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數" - -#, c-format -#~ msgid "unrecognized %%(align) argument: %s" -#~ msgstr "無法識別的 %%(align) 參數：%s" - -#, c-format -#~ msgid "unrecognized %%(if) argument: %s" -#~ msgstr "無法識別的 %%(if) 參數：%s" - -#, c-format -#~ msgid "format: %%(if) atom used without a %%(then) atom" -#~ msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素" - -#, c-format -#~ msgid "format: %%(then) atom used without an %%(if) atom" -#~ msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素" - -#, c-format -#~ msgid "format: %%(else) atom used without a %%(then) atom" -#~ msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素" - -#~ msgid "--unsorted-input is incompatible with --no-walk" -#~ msgstr "--unsorted-input 與 --no-walk 不相容" - -#~ msgid "--no-walk is incompatible with --unsorted-input" -#~ msgstr "--no-walk 與 --unsorted-input 不相容" - -#~ msgid "--dry-run is incompatible with --interactive/--patch" -#~ msgstr "--dry-run 和 --interactive/--patch 不相容" - -#~ msgid "--pathspec-from-file is incompatible with --interactive/--patch" -#~ msgstr "--pathspec-from-file 與 --interactive/--patch 不相容" - -#~ msgid "--pathspec-from-file is incompatible with --edit" -#~ msgstr "--pathspec-from-file 與 --edit 不相容" - -#~ msgid "-A and -u are mutually incompatible" -#~ msgstr "-A 和 -u 選項互斥" - -#~ msgid "Option --ignore-missing can only be used together with --dry-run" -#~ msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用" - -#~ msgid "--pathspec-from-file is incompatible with pathspec arguments" -#~ msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容" - -#~ msgid "--pathspec-file-nul requires --pathspec-from-file" -#~ msgstr "--pathspec-file-nul 需要 --pathspec-from-file" - -#, c-format -#~ msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" -#~ msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容" - -#~ msgid "--column and --verbose are incompatible" -#~ msgstr "--column 和 --verbose 不相容" - -#, c-format -#~ msgid "'%s' cannot be used with %s" -#~ msgstr "'%s' 不能和 %s 同時使用" - -#~ msgid "set upstream info for new branch" -#~ msgstr "為新的分支設定上游訊息" - -#, c-format -#~ msgid "-%c, -%c and --orphan are mutually exclusive" -#~ msgstr "-%c、-%c 和 --orphan 是互斥的" - -#~ msgid "-p and --overlay are mutually exclusive" -#~ msgstr "-p 和 --overlay 互斥" - -#~ msgid "--pathspec-from-file is incompatible with --detach" -#~ msgstr "--pathspec-from-file 與 --detach 不相容" - -#~ msgid "--pathspec-from-file is incompatible with --patch" -#~ msgstr "--pathspec-from-file 與 --patch 不相容" - -#, c-format -#~ msgid "--bare and --origin %s options are incompatible." -#~ msgstr "--bare 和 --origin %s 選項不相容。" - -#~ msgid "--bare and --separate-git-dir are incompatible." -#~ msgstr "--bare 和 --separate-git-dir 選項不相容。" - -#~ msgid "--pathspec-from-file with -a does not make sense" -#~ msgstr "--pathspec-from-file 和 -a 同時使用沒有意義" - -#, c-format -#~ msgid "cannot combine -m with --fixup:%s" -#~ msgstr "-m 和 --fixup:%s 不可結合使用" - -#~ msgid "--long and -z are incompatible" -#~ msgstr "--long 和 -z 選項不相容" - -#, c-format -#~ msgid "cannot combine reword option of --fixup with path '%s'" -#~ msgstr "不能將「%s」路徑與 --fixup 的 reword 選項結合" - -#~ msgid "" -#~ "reword option of --fixup is mutually exclusive with --patch/--" -#~ "interactive/--all/--include/--only" -#~ msgstr "" -#~ "--fixup 的 reword 選項與 --patch/--interactive/--all/--include/--only 互斥" - -#~ msgid "--long is incompatible with --abbrev=0" -#~ msgstr "--long 與 --abbrev=0 不相容" - -#~ msgid "--dirty is incompatible with commit-ishes" -#~ msgstr "--dirty 與提交號不相容" - -#~ msgid "--broken is incompatible with commit-ishes" -#~ msgstr "--broken 與提交號不相容" - -#~ msgid "--stdin and --merge-base are mutually exclusive" -#~ msgstr "--stdin 和 --merge-base 互斥" - -#~ msgid "--dir-diff is incompatible with --no-index" -#~ msgstr "--dir-diff 和 --no-index 不相容" - -#~ msgid "--gui, --tool and --extcmd are mutually exclusive" -#~ msgstr "--gui、--tool 和 --extcmd 互斥" - -#~ msgid "--anonymize-map without --anonymize does not make sense" -#~ msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義" - -#~ msgid "Cannot pass both --import-marks and --import-marks-if-exists" -#~ msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists" - -#, c-format -#~ msgid "Refusing to fetch into current branch %s of non-bare repository" -#~ msgstr "拒絕取得到非純版本庫的目前分支 %s" - -#~ msgid "--deepen and --depth are mutually exclusive" -#~ msgstr "--deepen 和 --depth 是互斥的" - -#~ msgid "--depth and --unshallow cannot be used together" -#~ msgstr "--depth 和 --unshallow 不能同時使用" - -#~ msgid "--fix-thin cannot be used without --stdin" -#~ msgstr "--fix-thin 不能和 --stdin 同時使用" - -#~ msgid "--object-format cannot be used with --stdin" -#~ msgstr "--object-format 不能和 --stdin 同時使用" - -#~ msgid "--separate-git-dir and --bare are mutually exclusive" -#~ msgstr "--separate-git-dir 和 --bare 互斥" - -#~ msgid "-n and -k are mutually exclusive" -#~ msgstr "-n 和 -k 互斥" - -#~ msgid "--subject-prefix/--rfc and -k are mutually exclusive" -#~ msgstr "--subject-prefix/--rfc 和 -k 互斥" - -#~ msgid "--stdout, --output, and --output-directory are mutually exclusive" -#~ msgstr "--stdout、--output 和 --output-directory 互斥" - -#~ msgid "--creation-factor requires --range-diff" -#~ msgstr "--creation-factor 需要 --range-diff" - -#~ msgid "You cannot combine --squash with --no-ff." -#~ msgstr "您不能將 --squash 和 --no-ff 組合使用。" - -#~ msgid "You cannot combine --squash with --commit." -#~ msgstr "您不能將 --squash 和 --commit 組合使用。" - -#~ msgid "--keep-unreachable and --unpack-unreachable are incompatible" -#~ msgstr "--keep-unreachable 和 --unpack-unreachable 不相容" - -#~ msgid "--delete is incompatible with --all, --mirror and --tags" -#~ msgstr "--delete 與 --all、--mirror 及 --tags 不相容" - -#~ msgid "--all and --tags are incompatible" -#~ msgstr "--all 和 --tags 不相容" - -#~ msgid "--mirror and --tags are incompatible" -#~ msgstr "--mirror 和 --tags 不相容" - -#~ msgid "--all and --mirror are incompatible" -#~ msgstr "--all 和 --mirror 不相容" - -#~ msgid "cannot combine '--keep-base' with '--onto'" -#~ msgstr "不能將 '--keep-base' 和 '--onto' 組合使用" - -#~ msgid "cannot combine '--keep-base' with '--root'" -#~ msgstr "不能將 '--keep-base' 和 '--root' 組合使用" - -#~ msgid "cannot combine '--root' with '--fork-point'" -#~ msgstr "不能將 '--root' 和 '--fork-point' 結合使用" - -#~ msgid "cannot combine apply options with merge options" -#~ msgstr "不能將 apply 套用選項與 merge 合併選項一起使用" - -#~ msgid "--keep-unreachable and -A are incompatible" -#~ msgstr "--keep-unreachable 和 -A 不相容" - -#~ msgid "--geometric is incompatible with -A, -a" -#~ msgstr "--geometric 與 -A, -a 不相容" - -#~ msgid "--patch is incompatible with --{hard,mixed,soft}" -#~ msgstr "--patch 與 --{hard、mixed、soft} 選項不相容" - -#~ msgid "-N can only be used with --mixed" -#~ msgstr "-N 只能和 --mixed 同時使用" - -#~ msgid "cannot combine --exclude-promisor-objects and --missing" -#~ msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項" - -#~ msgid "marked counting is incompatible with --objects" -#~ msgstr "--objects 不相容標記計數 (marked counting)" - -#~ msgid "" -#~ "--reflog is incompatible with --all, --remotes, --independent or --merge-" -#~ "base" -#~ msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不相容" - -#~ msgid "git sparse-checkout reapply" -#~ msgstr "git sparse-checkout reapply" - -#~ msgid "--cached and --files are mutually exclusive" -#~ msgstr "--cached 和 --files 互斥" - -#~ msgid "--branch and --default are mutually exclusive" -#~ msgstr "--branch 與 --default 互斥" - -#~ msgid "--column and -n are incompatible" -#~ msgstr "--column 和 -n 不相容" - -#~ msgid "--contains option is only allowed in list mode" -#~ msgstr "--contains 選項只允許用在列表顯示模式" - -#~ msgid "--no-contains option is only allowed in list mode" -#~ msgstr "--no-contains 選項只允許用在列表顯示模式" - -#~ msgid "--points-at option is only allowed in list mode" -#~ msgstr "--points-at 選項只允許用在列表顯示模式" - -#~ msgid "--merged and --no-merged options are only allowed in list mode" -#~ msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式" - -#~ msgid "only one -F or -m option is allowed." -#~ msgstr "只允許一個 -F 或 -m 選項。" - -#~ msgid "-b, -B, and --detach are mutually exclusive" -#~ msgstr "-b、-B 和 --detach 是互斥的" - -#~ msgid "--reason requires --lock" -#~ msgstr "--reason 需要 --lock" - -#~ msgid "--verbose and --porcelain are mutually exclusive" -#~ msgstr "--verbose 和 --porcelain 互斥" - -#, c-format -#~ msgid "no directory given for --git-dir\n" -#~ msgstr "沒有為 --git-dir 提供目錄\n" - -#, c-format -#~ msgid "no directory given for --work-tree\n" -#~ msgstr "沒有為 --work-tree 提供目錄\n" - -#~ msgid "--packfile requires --index-pack-args" -#~ msgstr "--packfile 需要 --index-pack-args" - -#~ msgid "--index-pack-args can only be used with --packfile" -#~ msgstr "--index-pack-args 只能與 --packfile 一起使用" - -#~ msgid "" -#~ "The following pathspecs didn't match any eligible path, but they do match " -#~ "index\n" -#~ "entries outside the current sparse checkout:\n" -#~ msgstr "" -#~ "下列路徑規格不符合任何適合路徑，\n" -#~ "但符合目前稀疏簽出外的索引項目：\n" - -#~ msgid "" -#~ "Disable or modify the sparsity rules if you intend to update such entries." -#~ msgstr "若有意更新這些項目，請停用或修改稀疏規則。" - -#~ msgid "could not set GIT_DIR to '%s'" -#~ msgstr "不能設定 GIT_DIR 為 '%s'" - -#~ msgid "unable to unpack %s header with --allow-unknown-type" -#~ msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息" - -#~ msgid "unable to parse %s header with --allow-unknown-type" -#~ msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息" - -#~ msgid "open /dev/null failed" -#~ msgstr "不能開啟 /dev/null" - -#~ msgid "" -#~ "after resolving the conflicts, mark the corrected paths\n" -#~ "with 'git add <paths>' or 'git rm <paths>'\n" -#~ "and commit the result with 'git commit'" -#~ msgstr "" -#~ "衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n" -#~ "對修正後的檔案做標記，然後用 'git commit' 提交" - -#~ msgid "open /dev/null or dup failed" -#~ msgstr "不能開啟或者複製 /dev/null" - -#~ msgid "attempting to use sparse-index without cone mode" -#~ msgstr "嘗試不在 cone 模式使用稀疏索引" - -#~ msgid "unable to update cache-tree, staying full" -#~ msgstr "無法更新快取樹，保持完整" - -#~ msgid "Could not open '%s' for writing." -#~ msgstr "無法為寫入開啟 '%s'。" - -#~ msgid "could not create archive file '%s'" -#~ msgstr "不能建立歸檔檔案 '%s'" - -#~ msgid "" -#~ "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" -#~ msgstr "git bisect--helper --bisect-next-check <好-術語> <壞-術語> [<術語>]" - -#~ msgid "--bisect-next-check requires 2 or 3 arguments" -#~ msgstr "--bisect-next-check 需要 2 或 3 個參數" - -#~ msgid "couldn't create a new file at '%s'" -#~ msgstr "不要在「%s」建立新檔案" - -#~ msgid "git commit-tree: failed to open '%s'" -#~ msgstr "git commit-tree：無法開啟 '%s'" - -#~ msgid "cannot open packfile '%s'" -#~ msgstr "無法開啟 packfile '%s'" - -#~ msgid "cannot store pack file" -#~ msgstr "無法儲存包檔案" - -#~ msgid "exclude patterns are read from <file>" -#~ msgstr "從 <檔案> 中讀取排除模式" - -#~ msgid "Unknown option for merge-recursive: -X%s" -#~ msgstr "merge-recursive 的未知選項：-X%s" - -#~ msgid "unusable todo list: '%s'" -#~ msgstr "不可用的待辦列表：'%s'" - -#~ msgid "git rebase--interactive [<options>]" -#~ msgstr "git rebase--interactive [<選項>]" - -#~ msgid "rebase merge commits" -#~ msgstr "對合併提交重定基底" - -#~ msgid "keep original branch points of cousins" -#~ msgstr "保持兄弟提交的原始分支點" - -#~ msgid "move commits that begin with squash!/fixup!" -#~ msgstr "移動以 squash!/fixup! 開頭的提交" - -#~ msgid "sign commits" -#~ msgstr "簽名提交" - -#~ msgid "continue rebase" -#~ msgstr "繼續重定基底" - -#~ msgid "skip commit" -#~ msgstr "略過提交" - -#~ msgid "edit the todo list" -#~ msgstr "重定基底待辦列表" - -#~ msgid "shorten commit ids in the todo list" -#~ msgstr "縮短待辦列表中的提交號" - -#~ msgid "expand commit ids in the todo list" -#~ msgstr "擴展待辦列表中的提交號" - -#~ msgid "check the todo list" -#~ msgstr "檢查待辦列表" - -#~ msgid "rearrange fixup/squash lines" -#~ msgstr "重新排列 fixup/squash 行" - -#~ msgid "insert exec commands in todo list" -#~ msgstr "在待辦列表中插入 exec 執行指令" - -#~ msgid "onto" -#~ msgstr "onto" - -#~ msgid "restrict-revision" -#~ msgstr "restrict-revision" - -#~ msgid "restrict revision" -#~ msgstr "限制版本" - -#~ msgid "squash-onto" -#~ msgstr "squash-onto" - -#~ msgid "squash onto" -#~ msgstr "squash onto" - -#~ msgid "the upstream commit" -#~ msgstr "上游提交" - -#~ msgid "head-name" -#~ msgstr "head-name" - -#~ msgid "head name" -#~ msgstr "head 名稱" - -#~ msgid "rebase strategy" -#~ msgstr "重定基底策略" - -#~ msgid "strategy-opts" -#~ msgstr "strategy-opts" - -#~ msgid "strategy options" -#~ msgstr "策略選項" - -#~ msgid "switch-to" -#~ msgstr "切換到" - -#~ msgid "the branch or commit to checkout" -#~ msgstr "要簽出的分支或提交" - -#~ msgid "onto-name" -#~ msgstr "onto-name" - -#~ msgid "onto name" -#~ msgstr "onto name" - -#~ msgid "cmd" -#~ msgstr "cmd" - -#~ msgid "the command to run" -#~ msgstr "要執行的指令" - -#~ msgid "--[no-]rebase-cousins has no effect without --rebase-merges" -#~ msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果" - -#~ msgid "cannot combine '--preserve-merges' with '--rebase-merges'" -#~ msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用" - -#~ msgid "" -#~ "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" -#~ msgstr "" -#~ "錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用" - -#~ msgid "" -#~ "git submodule--helper add-clone [<options>...] --url <url> --path <path> " -#~ "--name <name>" -#~ msgstr "" -#~ "git submodule--helper add-clone [<選項>...] --url <URL> --path <路徑> --" -#~ "name <名稱>" - -#~ msgid "failed to create file %s" -#~ msgstr "建立檔案 %s 失敗" - -#~ msgid "exit immediately after initial ref advertisement" -#~ msgstr "在初始的引用廣告後立即離開" - -#~ msgid "socket/pipe already in use: '%s'" -#~ msgstr "通訊端 (socket) 或管道 (pipe) 已在使用：「%s」" - -#~ msgid "could not spawn daemon in the background" -#~ msgstr "無法在背景啟動 (spawn) 守護程式" - -#~ msgid "waitpid failed" -#~ msgstr "waitpid 失敗" - -#~ msgid "waitpid is confused" -#~ msgstr "waitpid 被混淆" - -#~ msgid "daemon has not shutdown yet" -#~ msgstr "守護程式尚未關閉" - -#~ msgid "Protocol restrictions not supported with cURL < 7.19.4" -#~ msgstr "不支援協定限制，因為 cURL < 7.19.4" - -#~ msgid "running $command" -#~ msgstr "執行 $command" - -#~ msgid "'$sm_path' does not have a commit checked out" -#~ msgstr "'$sm_path' 沒有簽出的提交" - -#~ msgid "Submodule path '$displaypath': '$command $sha1'" -#~ msgstr "子模組 '$displaypath'：'$command $sha1'" - -#~ msgid "Applied autostash." -#~ msgstr "已套用 autostash。" - -#~ msgid "Cannot store $stash_sha1" -#~ msgstr "不能儲存 $stash_sha1" - -#~ msgid "" -#~ "Applying autostash resulted in conflicts.\n" -#~ "Your changes are safe in the stash.\n" -#~ "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -#~ msgstr "" -#~ "套用 autostash 導致衝突。\n" -#~ "您的修改安全地儲存在儲藏區中。\n" -#~ "您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n" - -#~ msgid "Rebasing ($new_count/$total)" -#~ msgstr "重定基底中（$new_count/$total）" - -#~ msgid "" -#~ "\n" -#~ "Commands:\n" -#~ "p, pick <commit> = use commit\n" -#~ "r, reword <commit> = use commit, but edit the commit message\n" -#~ "e, edit <commit> = use commit, but stop for amending\n" -#~ "s, squash <commit> = use commit, but meld into previous commit\n" -#~ "f, fixup <commit> = like \"squash\", but discard this commit's log " -#~ "message\n" -#~ "x, exec <commit> = run command (the rest of the line) using shell\n" -#~ "d, drop <commit> = remove commit\n" -#~ "l, label <label> = label current HEAD with a name\n" -#~ "t, reset <label> = reset HEAD to a label\n" -#~ "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" -#~ ". create a merge commit using the original merge commit's\n" -#~ ". message (or the oneline, if no original merge commit was\n" -#~ ". specified). Use -c <commit> to reword the commit message.\n" -#~ "\n" -#~ "These lines can be re-ordered; they are executed from top to bottom.\n" -#~ msgstr "" -#~ "\n" -#~ "指令:\n" -#~ "p, pick <提交> = 使用提交\n" -#~ "r, reword <提交> = 使用提交，但修改提交說明\n" -#~ "e, edit <提交> = 使用提交，但停下來修補\n" -#~ "s, squash <提交> = 使用提交，但融合到前一個提交\n" -#~ "f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n" -#~ "x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n" -#~ "d, drop <提交> = 刪除提交\n" -#~ "l, label <標籤> = 為目前 HEAD 打上標籤\n" -#~ "t, reset <標籤> = 重設 HEAD 到該標籤\n" -#~ "m, merge [-C <提交> | -c <提交>] <標籤> [# <oneline>]\n" -#~ ". 建立一個合併提交，並使用原始的合併提交說明（如果沒有指定\n" -#~ ". 原始提交，使用備註部分的 oneline 作為提交說明）。使用\n" -#~ ". -c <提交> 可以編輯提交說明。\n" -#~ "\n" -#~ "可以對這些行重新排序，將從上至下執行。\n" - -#~ msgid "" -#~ "You can amend the commit now, with\n" -#~ "\n" -#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "Once you are satisfied with your changes, run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "您現在可以修補這個提交，使用\n" -#~ "\n" -#~ "\tgit commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "當您對變更感到滿意，執行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#~ msgid "$sha1: not a commit that can be picked" -#~ msgstr "$sha1：不是一個可以被揀選的提交" - -#~ msgid "Invalid commit name: $sha1" -#~ msgstr "無效的提交名：$sha1" - -#~ msgid "Cannot write current commit's replacement sha1" -#~ msgstr "不能寫入目前提交的替代 sha1" - -#~ msgid "Fast-forward to $sha1" -#~ msgstr "快轉到 $sha1" - -#~ msgid "Cannot fast-forward to $sha1" -#~ msgstr "不能快轉到 $sha1" - -#~ msgid "Cannot move HEAD to $first_parent" -#~ msgstr "不能移動 HEAD 到 $first_parent" - -#~ msgid "Refusing to squash a merge: $sha1" -#~ msgstr "拒絕壓縮一個合併：$sha1" - -#~ msgid "Error redoing merge $sha1" -#~ msgstr "無法重做合併 $sha1" - -#~ msgid "Could not pick $sha1" -#~ msgstr "不能揀選 $sha1" - -#~ msgid "This is the commit message #${n}:" -#~ msgstr "這是提交說明 #${n}：" - -#~ msgid "The commit message #${n} will be skipped:" -#~ msgstr "提交說明 #${n} 將被略過：" - -#~ msgid "This is a combination of $count commit." -#~ msgid_plural "This is a combination of $count commits." -#~ msgstr[0] "這是一個 $count 個提交的組合。" - -#~ msgid "Cannot write $fixup_msg" -#~ msgstr "不能寫入 $fixup_msg" - -#~ msgid "This is a combination of 2 commits." -#~ msgstr "這是一個 2 個提交的組合。" - -#~ msgid "Could not apply $sha1... $rest" -#~ msgstr "不能套用 $sha1... $rest" - -#~ msgid "" -#~ "Could not amend commit after successfully picking $sha1... $rest\n" -#~ "This is most likely due to an empty commit message, or the pre-commit " -#~ "hook\n" -#~ "failed. If the pre-commit hook failed, you may need to resolve the issue " -#~ "before\n" -#~ "you are able to reword the commit." -#~ msgstr "" -#~ "不能在成功揀選 $sha1... $rest 之後修補提交\n" -#~ "這通常是因為空的提交說明，或者 pre-commit 掛鉤執行失敗。如果是 pre-" -#~ "commit\n" -#~ "掛鉤執行失敗，你可能需要在重寫提交說明前解決這個問題。" - -#~ msgid "Stopped at $sha1_abbrev... $rest" -#~ msgstr "停止在 $sha1_abbrev... $rest" - -#~ msgid "Cannot '$squash_style' without a previous commit" -#~ msgstr "沒有父提交的情況下不能 '$squash_style'" - -#~ msgid "Executing: $rest" -#~ msgstr "執行：$rest" - -#~ msgid "Execution failed: $rest" -#~ msgstr "執行失敗：$rest" - -#~ msgid "and made changes to the index and/or the working tree" -#~ msgstr "並且修改索引和/或工作區" - -# 譯者：請維持前導空格 -#~ msgid "" -#~ "You can fix the problem, and then run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "您可以解決這個問題，然後執行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#~ msgid "" -#~ "Execution succeeded: $rest\n" -#~ "but left changes to the index and/or the working tree\n" -#~ "Commit or stash your changes, and then run\n" -#~ "\n" -#~ "\tgit rebase --continue" -#~ msgstr "" -#~ "執行成功：$rest\n" -#~ "但是在索引和/或工作區中存在變更。提交或儲藏修改，然後執行\n" -#~ "\n" -#~ "\tgit rebase --continue" - -#~ msgid "Unknown command: $command $sha1 $rest" -#~ msgstr "未知指令：$command $sha1 $rest" - -#~ msgid "Please fix this using 'git rebase --edit-todo'." -#~ msgstr "要修改請使用指令 'git rebase --edit-todo'。" - -#~ msgid "Successfully rebased and updated $head_name." -#~ msgstr "成功重定基底並更新 $head_name。" - -#~ msgid "Could not remove CHERRY_PICK_HEAD" -#~ msgstr "不能刪除 CHERRY_PICK_HEAD" - -#~ msgid "" -#~ "You have staged changes in your working tree.\n" -#~ "If these changes are meant to be\n" -#~ "squashed into the previous commit, run:\n" -#~ "\n" -#~ " git commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "If they are meant to go into a new commit, run:\n" -#~ "\n" -#~ " git commit $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "In both cases, once you're done, continue with:\n" -#~ "\n" -#~ " git rebase --continue\n" -#~ msgstr "" -#~ "您已暫存了工作區的修改。如果這些修改要壓縮到前一個提交，執行：\n" -#~ "\n" -#~ " git commit --amend $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "如果這些變更要形成一個新提交，執行：\n" -#~ "\n" -#~ " git commit $gpg_sign_opt_quoted\n" -#~ "\n" -#~ "無論哪種情況，當您完成提交，繼續執行：\n" -#~ "\n" -#~ " git rebase --continue\n" - -#~ msgid "Error trying to find the author identity to amend commit" -#~ 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'。" - -#~ msgid "Could not commit staged changes." -#~ msgstr "不能提交暫存的修改。" - -#~ msgid "Could not execute editor" -#~ msgstr "無法執行編輯器" - -#~ msgid "Could not checkout $switch_to" -#~ msgstr "不能簽出 $switch_to" - -#~ msgid "No HEAD?" -#~ msgstr "沒有 HEAD？" - -#~ msgid "Could not create temporary $state_dir" -#~ msgstr "不能建立暫時 $state_dir" - -#~ msgid "Could not mark as interactive" -#~ msgstr "不能標記為互動式" - -#~ msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" -#~ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" -#~ msgstr[0] "重定基底 $shortrevisions 到 $shortonto（$todocount 個提交）" - -#~ msgid "Note that empty commits are commented out" -#~ msgstr "注意空提交已被備註掉" - -#~ msgid "Could not init rewritten commits" -#~ msgstr "不能對重寫提交進行初始化" - -#~ msgid "Cannot rebase: You have unstaged changes." -#~ msgstr "不能重定基底：您有未暫存的變更。" - -#~ msgid "Cannot pull with rebase: You have unstaged changes." -#~ msgstr "無法透過重定基底方式拉取：您有未暫存的變更。" - -#~ msgid "Cannot rebase: Your index contains uncommitted changes." -#~ msgstr "不能重定基底：您的索引中包含未提交的變更。" - -#~ msgid "Cannot pull with rebase: Your index contains uncommitted changes." -#~ msgstr "無法透過重定基底方式拉取：您的索引中包含未提交的變更。" - -#~ msgid "unable to write stateless separator packet" -#~ msgstr "無法寫入無狀態的分隔符號封包" - -#~ msgid "git merge --abort" -#~ msgstr "git merge --abort" - -#~ msgid "git merge --continue" -#~ msgstr "git merge --continue" - -#~ msgid "git stash clear" -#~ msgstr "git stash clear" - -#~ msgid "remote server sent stateless separator" -#~ msgstr "遠端伺服器傳送了無狀態的分隔符號" - -#~ msgid "--cached and --3way cannot be used together." -#~ msgstr "--cached 和 --3way 不能同時使用。" - -#~ msgid "both" -#~ msgstr "雙方" - -#~ msgid "one" -#~ msgstr "一方" - -#~ msgid "Already up to date!" -#~ msgstr "已經是最新的！" - -#~ msgid "Already up to date. Yeeah!" -#~ msgstr "已經是最新的。耶！" - -#~ msgid "--batch-size option is only for 'repack' subcommand" -#~ msgstr "--batch-size 選項僅用於 'repack' 子指令" - -#~ msgid "Percentage by which creation is weighted" -#~ msgstr "建立權重的百分比" - -#~ msgid "" -#~ "the rebase.useBuiltin support has been removed!\n" -#~ "See its entry in 'git help config' for details." -#~ msgstr "" -#~ "對 rebase.useBuiltin 的支援已被刪除！\n" -#~ "詳見 'git help config' 中的條目。" - -#~ msgid "%s: patch contains a line longer than 998 characters" -#~ msgstr "%s：修補檔包含一個超過 998 字元的行" - -#~ msgid "repository contains replace objects; skipping commit-graph" -#~ msgstr "版本庫有取代物件；跳過提交圖形" - -#~ msgid "repository contains (deprecated) grafts; skipping commit-graph" -#~ msgstr "版本庫有（廢棄的）移植項目；跳過提交圖形" - -#~ msgid "repository is shallow; skipping commit-graph" -#~ msgstr "版本庫是淺複製；忽略提交圖形" - -#~ msgid "commit-graph improper chunk offset %08x%08x" -#~ msgstr "提交圖形不正確的區塊位移 %08x%08x" - -#~ msgid "commit-graph chunk id %08x appears multiple times" -#~ msgstr "提交圖形區塊 id %08x 出現了多次" - -#~ msgid "invalid chunk offset (too large)" -#~ msgstr "無效的區塊位移（太大）" - -#~ msgid "Writing chunks to multi-pack-index" -#~ msgstr "寫入區塊至多包索引" - -#~ msgid "rev-list died" -#~ msgstr "rev-list 終止" - -#~ msgid "" -#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> " -#~ "<good_term> <bad_term>" -#~ msgstr "" -#~ "git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-" -#~ "術語>" - -#~ msgid "" -#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -#~ "<bad_term>" -#~ msgstr "" -#~ "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>" - -#~ msgid "git bisect--helper --bisect-auto-next" -#~ msgstr "git bisect--helper --bisect-auto-next" - -#~ msgid "write out the bisection state in BISECT_LOG" -#~ msgstr "將二分尋找的狀態寫入 BISECT_LOG" - -#~ msgid "check and set terms in a bisection state" -#~ msgstr "在一個二分尋找狀態中檢查和設定術語" - -#~ msgid "" -#~ "verify the next bisection state then checkout the next bisection commit" -#~ msgstr "驗證下一個二分尋找狀態後，檢出下一個二分尋找提交" - -#~ msgid "--bisect-write requires either 4 or 5 arguments" -#~ msgstr "--bisect-write 需要 4 或 5 個參數" - -#~ msgid "--check-and-set-terms requires 3 arguments" -#~ msgstr "--check-and-set-terms 需要 3 個參數" - -#~ msgid "--bisect-auto-next requires 0 arguments" -#~ msgstr "--bisect-auto-next 需要 0 個引數" - -#~ msgid "Force progress reporting" -#~ msgstr "強制進度顯示" - -#~ msgid "Error deleting remote-tracking branch '%s'" -#~ msgstr "無法刪除遠端追蹤分支 '%s'" - -#~ msgid "show parse tree for grep expression" -#~ msgstr "顯示 grep 表達式的解析樹" - -#~ msgid "too many parameters" -#~ msgstr "參數太多" - -#~ msgid "too few parameters" -#~ msgstr "參數太少" - -#~ msgid "Recurse into nested submodules" -#~ msgstr "遞迴進入嵌套子模組中" - -#~ msgid "too many params" -#~ msgstr "太多參數" - -#~ msgid "Bad rev input: $arg" -#~ msgstr "壞的輸入版本：$arg" |