From: Lumynous Date: Sat, 20 Jun 2026 11:36:09 +0000 (+0800) Subject: l10n: zh-TW.po: Update Chinese (Traditional) translation X-Git-Tag: v2.55.0~3^2~2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d908e50fa27151235afae1c4ae9ba03661e2c043;p=thirdparty%2Fgit.git l10n: zh-TW.po: Update Chinese (Traditional) translation Signed-off-by: Yi-Jyun Pan --- diff --git a/po/zh_TW.po b/po/zh_TW.po index fe31e18096..87a8faca93 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -20,19 +20,20 @@ # - Zhuang Ya # # Yi-Jyun Pan , 2021, 2022, 2023, 2024, 2025, 2026. -# Kaiyang Wu , 2022. +# Kaiyang Wu , 2022, 2026. # Lumynous , 2023, 2024, 2025, 2026. -# Kisaragi Hiu , 2024. -# Ngoo Ka-iu , 2024. -# Nightfeather Chen , 2024. -# hms5232 , 2024, 2025. +# Kisaragi Hiu , 2024, 2026. +# Ngoo Ka-iu , 2024, 2026. +# Nightfeather Chen , 2024, 2026. +# hms5232 , 2024, 2025, 2026. +# WellsTsai , 2026. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2026-04-19 19:19+0800\n" -"PO-Revision-Date: 2026-04-19 13:40+0000\n" -"Last-Translator: Yi-Jyun Pan \n" +"POT-Creation-Date: 2026-06-26 12:08+0800\n" +"PO-Revision-Date: 2026-06-28 14:21+0800\n" +"Last-Translator: Lumynous \n" "Language-Team: Chinese (Traditional Han script) \n" "Language: zh_TW\n" @@ -40,7 +41,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 5.16.2\n" +"X-Generator: Poedit 3.9\n" "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://" "zhconvert.org\n" @@ -49,9 +50,7 @@ msgstr "" msgid "Huh (%s)?" msgstr "嗯（%s）？" -#: add-interactive.c add-interactive.c builtin/merge.c -#: builtin/rebase.c builtin/rebase.c reset.c sequencer.c -#: sequencer.c sequencer.c +#: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "無法讀取索引" @@ -71,14 +70,12 @@ msgstr "未變更" msgid "Update" msgstr "更新" -#: add-interactive.c add-interactive.c add-interactive.c +#: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "無法暫存「%s」" -#: add-interactive.c add-interactive.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/stash.c reset.c sequencer.c +#: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "無法寫入索引" @@ -93,8 +90,7 @@ msgstr[0] "已更新 %d 個路徑\n" msgid "note: %s is untracked now.\n" msgstr "註：現已不再追蹤 %s。\n" -#: add-interactive.c apply.c builtin/checkout.c -#: builtin/reset.c +#: 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 失敗" @@ -175,7 +171,7 @@ msgstr "檢視 HEAD 及索引之間的差異" msgid "add contents of untracked files to the staged set of changes" msgstr "將未追蹤檔案的內容加入至變更暫存集" -#: add-interactive.c add-interactive.c +#: add-interactive.c msgid "Prompt help:" msgstr "提示說明：" @@ -191,7 +187,7 @@ msgstr "選取範圍中項目" msgid "select multiple ranges" msgstr "選取多個範圍" -#: add-interactive.c add-interactive.c +#: add-interactive.c msgid "select item based on unique prefix" msgstr "根據獨特前綴選取項目" @@ -231,11 +227,9 @@ msgstr "已暫存" msgid "unstaged" msgstr "未暫存" -#: add-interactive.c apply.c apply.c builtin/am.c -#: builtin/am.c builtin/bugreport.c builtin/clone.c -#: builtin/diagnose.c builtin/fetch.c builtin/hook.c -#: builtin/merge.c builtin/pull.c builtin/submodule--helper.c -#: builtin/submodule--helper.c +#: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c +#: builtin/pull.c builtin/submodule--helper.c msgid "path" msgstr "路徑" @@ -268,13 +262,13 @@ msgstr "暫存加入動作%s [y,n,q,a,d%s,?]? " msgid "Stage this hunk%s [y,n,q,a,d%s,?]? " msgstr "暫存此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。" -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -388,7 +382,7 @@ msgstr "將加入動作套用至索引%s [y,n,q,a,d%s,?]? " msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? " msgstr "將此區塊套用到索引%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." @@ -408,33 +402,33 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄模式變更%s [y,n,q,a,d%s,?]？ " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄刪除動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄加入動作%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? " msgstr "從工作區捨棄此區塊%s [y,n,q,a,d%s,?]? " -#: add-patch.c add-patch.c add-patch.c +#: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果修補檔能完全套用，編輯區塊將立即標記為捨棄。" -#: add-patch.c add-patch.c +#: add-patch.c msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -550,7 +544,7 @@ msgstr "" "a - 套用此區塊和本檔案中後面的全部區塊\n" "d - 不要套用此區塊和本檔案中後面的全部區塊\n" -#: add-patch.c add-patch.c add-patch.c add-patch.c +#: add-patch.c #, c-format msgid "%s cannot be negative" msgstr "%s 不能是負數" @@ -723,11 +717,11 @@ msgstr "沒有下一個檔案" msgid "No previous file" msgstr "沒有上一個檔案" -#: add-patch.c add-patch.c +#: add-patch.c msgid "No other hunk" msgstr "沒有其他區塊" -#: add-patch.c add-patch.c +#: add-patch.c msgid "No other undecided hunk" msgstr "沒有其他未決區塊" @@ -994,12 +988,9 @@ msgstr "命令列以 \\ 結尾" msgid "unclosed quote" msgstr "未閉合的引號" -#: alias.c builtin/cat-file.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/prune-packed.c builtin/receive-pack.c -#: builtin/refs.c builtin/repo.c builtin/tag.c -#: t/helper/test-pkt-line.c +#: alias.c builtin/cat-file.c builtin/name-rev.c builtin/notes.c +#: builtin/prune-packed.c builtin/receive-pack.c builtin/refs.c builtin/repo.c +#: builtin/tag.c t/helper/test-pkt-line.c msgid "too many arguments" msgstr "引數過多" @@ -1013,37 +1004,20 @@ msgstr "無法識別空白字元選項「%s」" msgid "unrecognized whitespace ignore option '%s'" msgstr "無法辨識空白字元忽略選項「%s」" -#: apply.c archive.c builtin/add.c builtin/add.c -#: builtin/add.c builtin/add.c builtin/branch.c -#: builtin/checkout-index.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/clean.c builtin/clone.c builtin/clone.c -#: builtin/commit.c builtin/commit.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/describe.c -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c -#: builtin/fetch.c builtin/help.c builtin/index-pack.c -#: builtin/init-db.c builtin/log.c builtin/log.c -#: builtin/ls-files.c builtin/merge-base.c builtin/merge-base.c -#: builtin/merge-tree.c builtin/merge.c builtin/merge.c -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c -#: builtin/repack.c builtin/reset.c builtin/reset.c -#: builtin/rev-parse.c builtin/rev-parse.c builtin/rev-parse.c -#: builtin/show-branch.c builtin/show-branch.c builtin/stash.c -#: builtin/stash.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/tag.c builtin/tag.c -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c -#: builtin/worktree.c builtin/worktree.c builtin/worktree.c -#: parse-options.c parse-options.c range-diff.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c revision.c revision.c revision.c -#: revision.c +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c +#: builtin/checkout.c builtin/clean.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-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c +#: builtin/reset.c builtin/rev-parse.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 apply.c apply.c +#: apply.c #, c-format msgid "'%s' outside a repository" msgstr "「%s」在版本庫之外" @@ -1297,8 +1271,7 @@ msgstr "修補失敗：%s:%ld" msgid "cannot checkout %s" msgstr "無法簽出 %s" -#: apply.c apply.c apply.c midx.c pack-mtimes.c -#: pack-revindex.c setup.c +#: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "無法讀取 %s" @@ -1308,17 +1281,17 @@ msgstr "無法讀取 %s" msgid "reading from '%s' beyond a symbolic link" msgstr "讀取符號連結背後的「%s」" -#: apply.c apply.c +#: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路徑 %s 已被重新命名或刪除" -#: apply.c apply.c +#: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不在索引中" -#: apply.c apply.c apply.c +#: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：與索引不符" @@ -1332,7 +1305,7 @@ msgstr "版本庫缺少用來進行三方合併，所需要的資料物件。" msgid "Performing three-way merge...\n" msgstr "正在進行三方合併……\n" -#: apply.c apply.c +#: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "無法讀取「%s」目前的內容" @@ -1371,9 +1344,7 @@ msgstr "%s：錯誤類型" msgid "%s has type %o, expected %o" msgstr "%s 的類型是 %o，預期是 %o" -#: apply.c apply.c builtin/fast-import.c -#: builtin/fast-import.c read-cache.c read-cache.c -#: read-cache.c +#: apply.c builtin/fast-import.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "路徑「%s」無效" @@ -1398,7 +1369,7 @@ msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符" 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 apply.c +#: apply.c #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影響的檔案「%s」在符號連結後" @@ -1458,12 +1429,12 @@ msgstr "無法對剛建立的檔案「%s」執行 stat" msgid "unable to create backing store for newly created file %s" msgstr "無法對剛建立的檔案 %s 建立後端儲存" -#: apply.c apply.c +#: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "無法為 %s 加入快取項目" -#: apply.c builtin/bisect.c builtin/gc.c builtin/gc.c +#: apply.c builtin/bisect.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "無法寫入「%s」" @@ -1493,7 +1464,7 @@ msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "套用修補檔 %%s，其中 %d 個被拒絕……" -#: apply.c apply.c apply.c +#: apply.c #, c-format msgid "cannot open %s" msgstr "無法開啟 %s" @@ -1547,7 +1518,7 @@ msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 個空白字元誤用" -#: apply.c apply.c +#: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1647,9 +1618,8 @@ msgstr "路徑以 NUL 字元分隔" msgid "ensure at least lines of context match" msgstr "確保至少符合 列上下文" -#: apply.c builtin/am.c builtin/am.c -#: builtin/interpret-trailers.c builtin/interpret-trailers.c -#: builtin/pack-objects.c builtin/rebase.c +#: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c +#: builtin/rebase.c msgid "action" msgstr "動作" @@ -1657,7 +1627,7 @@ msgstr "動作" msgid "detect new or modified lines that have whitespace errors" msgstr "檢查新增和修改的列中間，是否有空白字元誤用" -#: apply.c apply.c +#: apply.c msgid "ignore changes in whitespace when finding context" msgstr "尋找上下文時忽略空白字元變更" @@ -1712,7 +1682,6 @@ msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支援的檔案模式：0%o (SHA1：%s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c -#: builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "壓縮錯誤 (%d)" @@ -1760,9 +1729,7 @@ msgstr "" msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote [--exec ] --list" -#: archive.c archive.c builtin/fast-import.c -#: builtin/fast-import.c builtin/gc.c builtin/notes.c -#: builtin/tag.c +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "無法讀取「%s」" @@ -1772,7 +1739,7 @@ msgstr "無法讀取「%s」" msgid "pathspec '%s' matches files outside the current directory" msgstr "符合路徑規格「%s」的檔案在目前目錄之外" -#: archive.c builtin/add.c builtin/add.c builtin/rm.c +#: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路徑規格「%s」未符合任何檔案" @@ -1838,17 +1805,13 @@ msgstr "前綴" msgid "prepend prefix to each pathname in the archive" msgstr "為封存中的每個路徑名稱加上前綴" -#: archive.c archive.c builtin/blame.c builtin/blame.c -#: builtin/blame.c builtin/commit-tree.c builtin/config.c -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-export.c builtin/gc.c builtin/gc.c -#: builtin/grep.c builtin/hash-object.c builtin/ls-files.c -#: builtin/ls-files.c builtin/notes.c builtin/notes.c -#: builtin/read-tree.c parse-options.h +#: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c +#: builtin/fast-export.c builtin/gc.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 "file" -#: archive.c archive.c +#: archive.c msgid "add untracked file to archive" msgstr "將未追蹤檔案加進封存" @@ -1868,8 +1831,8 @@ msgstr "讀取工作目錄中的 .gitattributes" msgid "report archived files on stderr" msgstr "在 stderr 上回報封存的檔案" -#: archive.c builtin/clone.c builtin/fetch.c -#: builtin/pack-objects.c builtin/pack-objects.c builtin/pull.c +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c msgid "time" msgstr "time" @@ -1885,8 +1848,7 @@ msgstr "設定壓縮級別" msgid "list supported archive formats" msgstr "列出支援的封存格式" -#: archive.c builtin/archive.c builtin/clone.c builtin/clone.c -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "repo" @@ -1894,8 +1856,7 @@ msgstr "repo" msgid "retrieve the archive from remote repository " msgstr "從遠端版本庫 擷取封存檔案" -#: archive.c builtin/archive.c builtin/difftool.c -#: builtin/notes.c +#: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "command" @@ -1907,18 +1868,10 @@ msgstr "遠端 git-upload-archive 命令的路徑" msgid "Unexpected option --remote" msgstr "非預期選項 --remote" -#: archive.c builtin/add.c builtin/add.c builtin/add.c -#: builtin/add.c builtin/add.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/clone.c builtin/clone.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/fast-export.c -#: builtin/index-pack.c builtin/log.c builtin/reset.c -#: builtin/reset.c builtin/reset.c builtin/reset.c -#: builtin/reset.c builtin/rm.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c -#: builtin/worktree.c builtin/worktree.c fetch-pack.c -#: http-fetch.c http-fetch.c revision.c +#: 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」" @@ -1997,10 +1950,8 @@ msgstr "無效的 --attr-source 或 GIT_ATTR_SOURCE" msgid "unable to stat '%s'" msgstr "無法 stat「%s」" -#: bisect.c builtin/cat-file.c builtin/cat-file.c -#: builtin/index-pack.c builtin/notes.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pack-objects.c combine-diff.c -#: object-file.c object-file.c rerere.c +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c +#: builtin/pack-objects.c combine-diff.c object-file.c rerere.c #, c-format msgid "unable to read %s" msgstr "無法讀取 %s" @@ -2041,33 +1992,33 @@ msgstr "" #: bisect.c #, c-format msgid "" -"The merge base %s is %s.\n" +"The merge base %s is '%s'.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" -"合併基礎 %s 是 %s。\n" -"這意味著第一個「%s」提交位於 %s 和 [%s] 之間。\n" +"合併基底 %s 是「%s」。\n" +"這代表第一個「%s」提交位於 %s 和 [%s] 之間。\n" #: bisect.c #, c-format msgid "" -"Some %s revs are not ancestors of the %s rev.\n" +"Some '%s' revs are not ancestors of the '%s' rev.\n" "git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +"Maybe you mistook '%s' and '%s' revs?\n" msgstr "" -"部分 %s 修訂版不是 %s 修訂版的祖先。\n" +"部分「%s」修訂版不是「%s」修訂版的祖先。\n" "這種情況下 git bisect 無法正常運作。\n" -"您可能弄錯了 %s 和 %s 修訂版？\n" +"您可能弄錯了「%s」和「%s」修訂版？\n" #: bisect.c #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" +"So we cannot be sure the first '%s' commit is between %s and %s.\n" "We continue anyway." msgstr "" -"介於 %s 和 [%s] 的合併基礎一定被略過了。\n" -"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n" -"我們仍舊繼續。" +"介於 %s 和 [%s] 之間的合併基底一定被略過了。\n" +"所以第一個「%s」提交無法確認是否介於 %s 和 %s 之間。\n" +"將依然繼續。" #: bisect.c #, c-format @@ -2076,8 +2027,8 @@ msgstr "二分搜尋中：合併基礎必須經過測試\n" #: bisect.c #, c-format -msgid "a %s revision is needed" -msgstr "需要一個 %s 修訂版" +msgid "a '%s' revision is needed" +msgstr "需要一個「%s」修訂版" #: bisect.c #, c-format @@ -2100,8 +2051,8 @@ msgstr "無法讀取二分搜尋的引用" #: bisect.c #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s 同時為 %s 和 %s\n" +msgid "%s was both '%s' and '%s'\n" +msgstr "%s 同時為「%s」和「%s」\n" #: bisect.c #, c-format @@ -2135,21 +2086,16 @@ msgstr "--contents 和 --reverse 不能混用。" msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" -#: blame.c builtin/bisect.c builtin/bisect.c -#: builtin/commit.c builtin/fast-export.c builtin/log.c -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c -#: builtin/merge.c builtin/pack-objects.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pack-objects.c -#: builtin/shortlog.c midx-write.c pack-bitmap.c -#: pack-bitmap.c remote.c sequencer.c sequencer.c -#: submodule.c +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "修訂版遍歷設定失敗" #: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" -msgstr "--reverse 和 --first-parent 共用，需要第一上級鏈的提交範圍" +msgstr "--reverse 和 --first-parent 一起使用時需要沿第一親代鏈選擇範圍" #: blame.c #, c-format @@ -2217,12 +2163,10 @@ msgid "not tracking: ambiguous information for ref '%s'" msgstr "未追蹤：「%s」引用有歧義" # 譯者：為保證在輸出中對齊，注意調整句中空格！ -#. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. -#. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space @@ -2304,8 +2248,7 @@ msgstr "" "並建立兩個分支間的追蹤關係，您可能需要使用 `git push -u`\n" "推送分支並設定和上游的關聯。" -#: branch.c builtin/replace.c builtin/replace.c -#: builtin/replace.c builtin/replace.c +#: branch.c builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "物件名稱無效：「%s」" @@ -2334,7 +2277,7 @@ msgstr "" "您可以使用「git checkout --no-recurse-submodules %s && git submodule update " "--init」命令嘗試更新子模組" -#: branch.c branch.c +#: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "「%s」子模組：無法建立「%s」分支" @@ -2384,15 +2327,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路徑根據其中一個 .gitignore 檔案而被忽略：\n" #: 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 -#: builtin/sparse-checkout.c +#: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c msgid "dry run" msgstr "測試執行" #: 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 builtin/refs.c +#: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c +#: builtin/read-tree.c builtin/refs.c msgid "be verbose" msgstr "詳細輸出" @@ -2404,8 +2346,7 @@ msgstr "互動式挑選" msgid "select hunks interactively" msgstr "互動式選取區塊" -#: builtin/add.c builtin/checkout.c builtin/reset.c -#: builtin/stash.c builtin/stash.c +#: builtin/add.c builtin/checkout.c builtin/reset.c builtin/stash.c msgid "auto advance to the next file when selecting hunks interactively" msgstr "在互動式選取區塊時自動前往下一個檔案" @@ -2505,10 +2446,8 @@ msgstr "如果您確定想要加入它們，請使用 -f。" msgid "adding files failed" msgstr "加入檔案失敗" -#: builtin/add.c builtin/add.c builtin/checkout.c -#: builtin/checkout.c builtin/commit.c builtin/commit.c -#: builtin/reset.c builtin/reset.c builtin/stash.c -#: builtin/stash.c builtin/stash.c builtin/stash.c +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c +#: builtin/stash.c #, c-format msgid "'%s' cannot be negative" msgstr "「%s」不能是負數" @@ -2518,8 +2457,8 @@ msgstr "「%s」不能是負數" msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod 的參數「%s」必須是 -x 或 +x" -#: builtin/add.c builtin/checkout.c builtin/commit.c -#: builtin/reset.c builtin/rm.c builtin/stash.c +#: 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」和路徑規格引數不得同時使用" @@ -2533,19 +2472,15 @@ msgstr "沒有指定，亦未加入檔案。\n" msgid "Maybe you wanted to say 'git add .'?" msgstr "也許您想要執行的是「git add .」？" -#: builtin/add.c builtin/check-ignore.c builtin/checkout.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 -#: builtin/submodule--helper.c read-cache.c read-cache.c -#: rerere.c rerere.c rerere.c submodule.c +#: 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/add.c builtin/am.c builtin/am.c builtin/checkout.c -#: builtin/checkout.c builtin/clone.c builtin/commit.c -#: builtin/commit.c builtin/commit.c builtin/history.c -#: builtin/stash.c merge.c rerere.c +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c +#: builtin/commit.c builtin/history.c builtin/stash.c merge.c rerere.c msgid "unable to write new index file" msgstr "無法寫入新的索引檔案" @@ -2554,18 +2489,14 @@ msgstr "無法寫入新的索引檔案" msgid "bad action '%s' for '%s'" msgstr "「%s」動作對「%s」無效" -#: builtin/am.c builtin/am.c builtin/am.c builtin/blame.c -#: builtin/blame.c builtin/fetch.c builtin/pack-objects.c -#: builtin/pack-objects.c builtin/pull.c builtin/pull.c -#: builtin/pull.c builtin/revert.c diff-merges.c diff.c -#: environment.c gpg-interface.c gpg-interface.c ls-refs.c -#: parallel-checkout.c sequencer.c setup.c setup.c setup.c +#: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.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 -#: sequencer.c sequencer.c sequencer.c trailer.c +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c #, c-format msgid "could not read '%s'" msgstr "無法讀取「%s」" @@ -2574,7 +2505,6 @@ msgstr "無法讀取「%s」" msgid "could not parse author script" msgstr "無法解析作者文稿" -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" @@ -2599,14 +2529,12 @@ msgstr "從「%s」複製註解到「%s」失敗" msgid "fseek failed" msgstr "fseek 失敗" -#: builtin/am.c builtin/am.c builtin/rebase.c sequencer.c -#: wrapper.c wrapper.c +#: 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 editor.c sequencer.c -#: wrapper.c wrapper.c +#: builtin/am.c builtin/rebase.c editor.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "無法開啟「%s」進行寫入" @@ -2624,7 +2552,7 @@ msgstr "一次只能套用一個 StGIT 修補檔序列" msgid "invalid timestamp" msgstr "無效的時間戳" -#: builtin/am.c builtin/am.c +#: builtin/am.c msgid "invalid Date line" msgstr "無效的 Date 列" @@ -2680,8 +2608,7 @@ msgstr "在提交 %s 中缺少作者列" msgid "invalid ident line: %.*s" msgstr "ident 列無效：%.*s" -#: builtin/am.c builtin/checkout.c builtin/clone.c -#: commit-graph.c +#: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" msgstr "無法解析 %s 提交" @@ -2718,12 +2645,11 @@ msgstr "git write-tree 無法寫入樹狀物件" msgid "applying to an empty history" msgstr "正在套用至空白歷史記錄上" -#: builtin/am.c builtin/commit.c builtin/merge.c -#: builtin/merge.c replay.c sequencer.c +#: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c msgid "failed to write commit object" msgstr "無法寫入提交物件" -#: builtin/am.c builtin/am.c +#: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "無法繼續：%s 不存在。" @@ -2765,7 +2691,7 @@ msgstr "建立空白提交：%.*s" msgid "Patch is empty." msgstr "修補檔空白。" -#: builtin/am.c builtin/am.c +#: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "套用：%.*s" @@ -2808,13 +2734,12 @@ msgstr "" "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n" "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。" -#: builtin/am.c builtin/am.c builtin/am.c builtin/reset.c -#: builtin/reset.c +#: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "無法解析物件「%s」。" -#: builtin/am.c builtin/am.c +#: builtin/am.c msgid "failed to clean index" msgstr "無法清除索引" @@ -2855,8 +2780,8 @@ msgstr "歷史遺留選項——無作用" msgid "allow fall back on 3way merging if needed" msgstr "必要時允許回復至三方合併" -#: builtin/am.c builtin/init-db.c builtin/prune-packed.c -#: builtin/repack.c builtin/stash.c +#: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c +#: builtin/stash.c msgid "be quiet" msgstr "靜默模式" @@ -2892,30 +2817,21 @@ msgstr "截掉裁切線前的所有內容" msgid "pass it through git-mailinfo" msgstr "透過 git-mailinfo 傳入" -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c -#: builtin/am.c builtin/am.c builtin/am.c builtin/am.c #: builtin/am.c msgid "pass it through git-apply" msgstr "透過 git-apply 傳入" -#: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c -#: builtin/fmt-merge-msg.c builtin/grep.c builtin/merge.c -#: builtin/pull.c builtin/pull.c builtin/pull.c -#: builtin/rebase.c builtin/repack.c builtin/repack.c -#: builtin/repack.c builtin/show-branch.c builtin/show-ref.c -#: builtin/tag.c parse-options.h parse-options.h -#: parse-options.h +#: 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 builtin/branch.c builtin/bugreport.c -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c -#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c -#: builtin/init-db.c builtin/ls-files.c builtin/ls-tree.c -#: builtin/refs.c builtin/replace.c builtin/repo.c -#: builtin/repo.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c -#: builtin/tag.c builtin/verify-tag.c +#: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c +#: builtin/ls-files.c builtin/ls-tree.c builtin/name-rev.c builtin/refs.c +#: builtin/replace.c builtin/repo.c builtin/submodule--helper.c builtin/tag.c +#: builtin/verify-tag.c msgid "format" msgstr "format" @@ -2967,9 +2883,8 @@ msgstr "將作者日期當作提交日期" msgid "use current timestamp for author date" msgstr "把目前時間戳當作是作者日期" -#: 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 +#: 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" @@ -3045,8 +2960,25 @@ msgid "git archive: expected a flush" msgstr "git archive：預期收到 flush 封包" #: builtin/backfill.c -msgid "git backfill [--min-batch-size=] [--[no-]sparse]" -msgstr "git backfill [--min-batch-size=] [--[no-]sparse]" +msgid "" +"git backfill [--min-batch-size=] [--[no-]sparse] [--[no-]include-edges] " +"[]" +msgstr "" +"git backfill [--min-batch-size=] [--[no-]sparse] [--[no-]include-edges] " +"[]" + +#: builtin/backfill.c +#, c-format +msgid "'%s' cannot be used with 'git backfill'" +msgstr "「%s」不能與「git backfill」同時使用" + +#: builtin/backfill.c +msgid "cannot backfill with these filter options" +msgstr "無法以這些過濾器選項回填" + +#: builtin/backfill.c +msgid "cannot backfill with blob size limits" +msgstr "無法帶資料物件大小限制回填" #: builtin/backfill.c msgid "problem loading sparse-checkout" @@ -3060,8 +2992,12 @@ msgstr "一次請求的最小物件數量" msgid "Restrict the missing objects to the current sparse-checkout" msgstr "將缺少的物件限制於目前的稀疏簽出" -#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c -#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c +#: builtin/backfill.c +msgid "Include blobs from boundary commits in the backfill" +msgstr "在回填時包含邊界提交的資料物件" + +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c +#: builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "不認識的引數：%s" @@ -3118,21 +3054,21 @@ msgstr "無法開啟檔案「%s」來讀取" #: builtin/bisect.c #, c-format msgid "'%s' is not a valid term" -msgstr "「%s」不是有效的術語" +msgstr "「%s」不是有效的措詞" #: builtin/bisect.c #, c-format msgid "can't use the builtin command '%s' as a term" -msgstr "不能將內建命令「%s」當作術語使用" +msgstr "不能將內建命令「%s」當作措詞使用" #: builtin/bisect.c #, c-format msgid "can't change the meaning of the term '%s'" -msgstr "不能變更術語「%s」的含義" +msgstr "不能變更措詞「%s」的含義" #: builtin/bisect.c msgid "please use two different terms" -msgstr "請使用兩個不同的術語" +msgstr "請使用兩個不同的措詞" #: builtin/bisect.c #, c-format @@ -3168,7 +3104,7 @@ msgstr "無法開啟檔案「%s」" #: builtin/bisect.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" -msgstr "命令無效：您正處於採用 %s/%s 術語的二分搜尋" +msgstr "命令無效：您正處於採用 %s/%s 措詞的二分搜尋" #: builtin/bisect.c #, c-format @@ -3205,31 +3141,33 @@ msgid "Are you sure [Y/n]? " msgstr "是否確定 [Y/n]? " #: builtin/bisect.c -msgid "status: waiting for both good and bad commits\n" -msgstr "狀態：正在等待好和壞的提交\n" +#, c-format +msgid "status: waiting for both '%s' and '%s' commits\n" +msgstr "狀態：正在等待「%s」和「%s」提交\n" #: builtin/bisect.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" +msgid "status: waiting for '%s' commit, %d '%s' commit known\n" +msgid_plural "status: waiting for '%s' commit, %d '%s' commits known\n" +msgstr[0] "狀態：正在等待「%s」提交，已知有 %d 個「%s」提交\n" #: builtin/bisect.c -msgid "status: waiting for good commit(s), bad commit known\n" -msgstr "狀態：正在等待好的提交，已知有壞的提交\n" +#, c-format +msgid "status: waiting for '%s' commit(s), '%s' commit known\n" +msgstr "狀態：正在等待「%s」提交，已知有「%s」提交\n" #: builtin/bisect.c msgid "no terms defined" -msgstr "未定義術語" +msgstr "未定義措詞" #: builtin/bisect.c #, c-format msgid "" -"Your current terms are %s for the old state\n" -"and %s for the new state.\n" +"Your current terms are '%s' for the old state\n" +"and '%s' for the new state.\n" msgstr "" -"您目前針對舊狀態的術語是 %s；\n" -"對新狀態的術語是 %s。\n" +"您目前對舊狀態的措詞是「%s」；\n" +"對新狀態的措詞是「%s」。\n" #: builtin/bisect.c #, c-format @@ -3245,9 +3183,9 @@ msgstr "" msgid "could not open '%s' for appending" msgstr "無法開啟「%s」進行附加" -#: builtin/bisect.c builtin/bisect.c +#: builtin/bisect.c msgid "'' is not a valid term" -msgstr "「 」不是有效術語" +msgstr "「」不是有效的措詞" #: builtin/bisect.c #, c-format @@ -3299,7 +3237,7 @@ msgstr "要呼叫 `--bisect-state`，請傳入一個以上的引數" msgid "'git bisect %s' can take only one argument." msgstr "「git bisect %s」只取一個引數。" -#: builtin/bisect.c builtin/bisect.c +#: builtin/bisect.c #, c-format msgid "Bad rev input: %s" msgstr "rev 輸入格式錯誤：%s" @@ -3334,13 +3272,13 @@ msgstr "二分搜尋執行失敗：沒有提供命令。" #: builtin/bisect.c #, c-format -msgid "unable to verify %s on good revision" -msgstr "無法在好的修訂版上驗證 %s" +msgid "unable to verify %s on '%s' revision" +msgstr "無法在「%2$s」修訂版上驗證 %1$s" #: builtin/bisect.c #, c-format -msgid "bogus exit code %d for good revision" -msgstr "好的修訂版回傳偽造的錯誤碼 %d" +msgid "bogus exit code %d for '%s' revision" +msgstr "處理「%2$s」修訂版時遇到了虛假的結束代碼 %1$d" #: builtin/bisect.c #, c-format @@ -3361,8 +3299,9 @@ msgid "bisect run success" msgstr "二分搜尋執行成功" #: builtin/bisect.c -msgid "bisect found first bad commit" -msgstr "二分搜尋發現到第一個有問題的提交" +#, c-format +msgid "bisect found first '%s' commit\n" +msgstr "二分搜尋找到了第一個「%s」提交\n" #: builtin/bisect.c #, c-format @@ -3410,7 +3349,7 @@ msgstr "git blame [] [] [] [--] " msgid "git annotate [] [] [] [--] " msgstr "git annotate [] [] [] [--] " -#: builtin/blame.c builtin/blame.c +#: builtin/blame.c msgid " are documented in git-rev-list(1)" msgstr " 的文件在 git-rev-list(1)" @@ -3423,7 +3362,7 @@ msgstr "預期是個顏色：%s" msgid "must end with a color" msgstr "結尾必須是一個顏色" -#: builtin/blame.c diff.c diff.c merge-ort.c transport.c +#: builtin/blame.c diff.c merge-ort.c transport.c #, c-format msgid "unknown value for config '%s': %s" msgstr "設定 '%s' 的取值未知：%s" @@ -3456,9 +3395,8 @@ msgstr "不把根提交當作邊界（預設值：off）" msgid "show work cost statistics" msgstr "顯示工作量統計" -#: builtin/blame.c builtin/checkout.c builtin/clone.c -#: builtin/commit-graph.c builtin/commit-graph.c builtin/fetch.c -#: builtin/merge.c builtin/multi-pack-index.c builtin/pull.c +#: 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 "強制顯示進度報告" @@ -3547,7 +3485,7 @@ msgstr "使用來自 的修訂集而不是呼叫 git-rev-list" msgid "use 's contents as the final image" msgstr "將 的內容當成是最終印象" -#: builtin/blame.c builtin/blame.c +#: builtin/blame.c msgid "score" msgstr "score" @@ -3739,12 +3677,12 @@ msgstr "%s 工作區的 HEAD 指標未被更新" msgid "invalid branch name: '%s'" msgstr "分支名稱無效：「%s」" -#: builtin/branch.c builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no commit on branch '%s' yet" msgstr "分支「%s」尚無提交" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no branch named '%s'" msgstr "沒有名為「%s」的分支" @@ -3803,8 +3741,7 @@ msgstr "顯示雜湊值和主旨，若傳入兩次則顯示上游分支" msgid "suppress informational messages" msgstr "不顯示資訊訊息" -#: builtin/branch.c builtin/checkout.c -#: builtin/submodule--helper.c +#: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "設定分支追蹤組態" @@ -3832,11 +3769,11 @@ msgstr "使用彩色輸出" msgid "act on remote-tracking branches" msgstr "作用於遠端追蹤分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "print only branches that contain the commit" msgstr "只輸出包含此提交的分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "只輸出不包含此提交的分支" @@ -3908,9 +3845,7 @@ msgstr "只輸出尚未合併的分支" msgid "list branches in columns" msgstr "以行的形式列出分支" -#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "object" @@ -3926,8 +3861,8 @@ msgstr "排序和過濾不區分大小寫" msgid "recurse through submodules" msgstr "在子模組中遞迴" -#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c -#: builtin/ls-tree.c builtin/tag.c builtin/verify-tag.c +#: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c +#: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "輸出格式" @@ -3950,7 +3885,7 @@ msgstr "" msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用來建立分支" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c msgid "branch name required" msgstr "必須提供分支名稱" @@ -3988,7 +3923,7 @@ msgid "" "could not set upstream of HEAD to %s when it does not point to any branch" msgstr "HEAD 不指向任何分支時無法將其上游設為 %s" -#: builtin/branch.c builtin/branch.c +#: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "無「%s」分支" @@ -4086,10 +4021,8 @@ msgstr "" "請檢閱臭蟲報告下方的剩餘部分。\n" "您可刪除任何您不想分享的地方。\n" -#: builtin/bugreport.c builtin/commit.c builtin/commit.c -#: builtin/commit.c builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c +#: builtin/pack-objects.c builtin/rebase.c builtin/repack.c builtin/replay.c #: parse-options.h msgid "mode" msgstr "mode" @@ -4168,7 +4101,7 @@ msgstr "需要提供 引數" msgid "do not show progress meter" msgstr "不顯示進度列" -#: builtin/bundle.c builtin/bundle.c builtin/pack-objects.c +#: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "顯示進度列" @@ -4214,6 +4147,11 @@ msgstr "正在拆分物件" msgid "cannot read object %s '%s'" msgstr "無法讀取物件 %s「%s」" +#: builtin/cat-file.c +#, c-format +msgid "mailmap: invalid boolean '%s'" +msgstr "mailmap：無效的布林值「%s」" + #: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "排清功能只能用於 --buffer 模式" @@ -4382,8 +4320,7 @@ msgstr "「%s=<%s>」需要「%s」或「%s」" msgid "path|tree-ish" msgstr "path|tree-ish" -#: builtin/cat-file.c builtin/cat-file.c builtin/cat-file.c -#: builtin/cat-file.c builtin/cat-file.c +#: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "「%s」需要批次處理模式" @@ -4397,7 +4334,7 @@ msgstr "「-%c」與批次處理模式不相容" msgid "batch modes take no arguments" msgstr "批次處理模式不取引數" -#: builtin/cat-file.c builtin/cat-file.c +#: builtin/cat-file.c #, c-format msgid " required with '%s'" msgstr "「%s」需要 " @@ -4450,8 +4387,7 @@ msgstr "" msgid "which tree-ish to check attributes at" msgstr "要檢查屬性的樹狀物件指示元" -#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c -#: builtin/worktree.c +#: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "不顯示進度報告" @@ -4515,10 +4451,8 @@ msgstr "未指定聯絡地址" msgid "git checkout--worker []" msgstr "git checkout--worker []" -#: builtin/checkout--worker.c builtin/checkout-index.c -#: builtin/column.c builtin/column.c builtin/submodule--helper.c +#: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c #: builtin/submodule--helper.c builtin/worktree.c -#: builtin/worktree.c msgid "string" msgstr "string" @@ -4570,12 +4504,12 @@ msgstr "將內容寫入暫存檔" msgid "copy out the files from named stage" msgstr "從指定暫存區中拷出檔案" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "「%s」路徑沒有我們的版本" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "「%s」路徑沒有他們的版本" @@ -4618,7 +4552,6 @@ msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "已從索引區更新 %d 個路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" @@ -4639,7 +4572,7 @@ msgstr "「%s」或「%s」皆未指定" msgid "'%s' must be used when '%s' is not specified" msgstr "未指定「%2$s」時，必須使用「%1$s」" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "「%s」或「%s」不能與 %s 同時使用" @@ -4649,16 +4582,13 @@ msgstr "「%s」或「%s」不能與 %s 同時使用" msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree" msgstr "「%s」、「%s」或「%s」不能在簽出樹狀物件時使用" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "路徑「%s」未合併" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/grep.c builtin/grep.c builtin/grep.c -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c -#: builtin/reset.c merge-ort.c reset.c sequencer.c -#: sequencer.c tree-walk.c +#: builtin/checkout.c builtin/grep.c builtin/merge-tree.c builtin/reset.c +#: merge-ort.c reset.c sequencer.c tree-walk.c #, c-format msgid "unable to read tree (%s)" msgstr "無法讀取樹狀物件（%s）" @@ -4667,15 +4597,6 @@ msgstr "無法讀取樹狀物件（%s）" msgid "you need to resolve your current index first" msgstr "您需要先解決目前索引區的衝突" -#: builtin/checkout.c -#, c-format -msgid "" -"cannot continue with staged changes in the following files:\n" -"%s" -msgstr "" -"無法繼續，下列檔案有暫存的變更：\n" -"%s" - #: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -4685,7 +4606,7 @@ msgstr "無法對「%s」執行 reflog 動作：%s\n" msgid "HEAD is now at" msgstr "HEAD 目前位於" -#: builtin/checkout.c builtin/clone.c builtin/clone.c +#: builtin/checkout.c builtin/clone.c msgid "unable to update HEAD" msgstr "無法更新 HEAD" @@ -4704,7 +4625,7 @@ msgstr "已經位於「%s」\n" msgid "Switched to and reset branch '%s'\n" msgstr "已切換並重設分支「%s」\n" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "已切換至新分支「%s」\n" @@ -4767,10 +4688,15 @@ msgstr "在修訂版遍歷時遇到內部錯誤" msgid "Previous HEAD position was" msgstr "之前的 HEAD 指標位置在" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "您正位於一個尚未初始化的分支" +#: builtin/checkout.c +#, c-format +msgid "The following paths have local changes:\n" +msgstr "如下路徑有本機變更：\n" + #: builtin/checkout.c #, c-format msgid "" @@ -4815,12 +4741,12 @@ msgstr "預期只有一個引用" msgid "only one reference expected, %d given." msgstr "預期只有一個引用，卻提供了 %d 個。" -#: builtin/checkout.c builtin/worktree.c builtin/worktree.c +#: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "無效引用：%s" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "引用不是樹狀物件：%s" @@ -4835,7 +4761,7 @@ msgstr "預期收到分支，卻收到標籤「%s」" msgid "a branch is expected, got remote branch '%s'" msgstr "預期收到分支，卻收到遠端分支「%s」" -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "預期收到分支，卻收到「%s」" @@ -4898,7 +4824,7 @@ msgstr "在進行二分搜尋時切換分支" msgid "paths cannot be used with switching branches" msgstr "切換分支時不能指定路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "切換分支時不能指定「%s」" @@ -4908,8 +4834,7 @@ msgstr "切換分支時不能指定「%s」" msgid "'%s' needs the paths to check out" msgstr "「%s」需要指定要簽出的路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/checkout.c +#: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "「%s」不能與「%s」同時使用" @@ -4937,8 +4862,7 @@ msgstr "未知的衝突輸出風格「%s」" msgid "perform a 3-way merge with the new branch" msgstr "和新分支進行三方合併" -#: builtin/checkout.c builtin/log.c builtin/range-diff.c -#: parse-options.h +#: builtin/checkout.c builtin/log.c builtin/range-diff.c parse-options.h msgid "style" msgstr "style" @@ -5042,12 +4966,8 @@ msgstr "" msgid "you must specify path(s) to restore" msgstr "您必須指定要還原的路徑" -#: builtin/checkout.c builtin/checkout.c builtin/checkout.c -#: builtin/checkout.c builtin/clone.c builtin/remote.c -#: builtin/remote.c builtin/replay.c builtin/replay.c -#: builtin/replay.c builtin/submodule--helper.c +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c #: builtin/submodule--helper.c builtin/worktree.c -#: builtin/worktree.c msgid "branch" msgstr "branch" @@ -5255,11 +5175,9 @@ msgstr "互動式清除" msgid "remove whole directories" msgstr "移除整個目錄" -#: builtin/clean.c builtin/config.c builtin/config.c -#: builtin/config.c builtin/describe.c builtin/describe.c -#: builtin/grep.c builtin/log.c builtin/log.c -#: builtin/ls-files.c builtin/name-rev.c builtin/name-rev.c -#: builtin/show-ref.c pack-refs.c pack-refs.c ref-filter.h +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c +#: pack-refs.c ref-filter.h msgid "pattern" msgstr "pattern" @@ -5284,8 +5202,7 @@ msgstr "clean.requireForce 是 true 且未給定 -f 選項：拒絕清理" msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能為「%s」新增一個備用：%s\n" -#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c -#: setup.c +#: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format msgid "failed to stat '%s'" msgstr "對「%s」呼叫 stat 失敗" @@ -5396,7 +5313,7 @@ msgstr "不要拓製淺層版本庫" msgid "don't create a checkout" msgstr "不要建立簽出" -#: builtin/clone.c builtin/clone.c builtin/init-db.c +#: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "建立裸版本庫" @@ -5436,21 +5353,17 @@ msgstr "模板目錄" msgid "directory from which templates will be used" msgstr "將被使用的模板目錄" -#: builtin/clone.c builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c +#: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "引用版本庫" #: builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "僅在拓製時使用 --reference" -#: 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/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 -#: t/helper/test-simple-ipc.c msgid "name" msgstr "name" @@ -5491,7 +5404,6 @@ msgid "deepen history of shallow clone, excluding ref" msgstr "取得更多淺層拓製的過往歷史記錄，除了特定修訂版" #: builtin/clone.c builtin/submodule--helper.c -#: builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "只拓製一個分支、HEAD 或 --branch" @@ -5512,7 +5424,6 @@ msgid "separate git dir from working tree" msgstr "git 目錄和工作區分離" #: builtin/clone.c builtin/init-db.c builtin/submodule--helper.c -#: builtin/submodule--helper.c builtin/submodule--helper.c msgid "specify the reference format to use" msgstr "指定要使用的引用格式" @@ -5524,13 +5435,13 @@ msgstr "key=value" msgid "set config inside the new repository" msgstr "在新版本庫中設定設定訊息" -#: builtin/clone.c builtin/fetch.c builtin/ls-remote.c -#: builtin/pull.c builtin/push.c builtin/send-pack.c +#: 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 builtin/fetch.c builtin/ls-remote.c -#: builtin/pull.c builtin/push.c builtin/send-pack.c +#: 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 "傳輸選項" @@ -5566,9 +5477,8 @@ msgstr "太多參數。" msgid "You must specify a repository to clone." msgstr "您必須指定要拓製的版本庫。" -#: builtin/clone.c builtin/init-db.c builtin/refs.c -#: builtin/submodule--helper.c builtin/submodule--helper.c -#: builtin/submodule--helper.c setup.c setup.c +#: builtin/clone.c builtin/init-db.c builtin/refs.c builtin/submodule--helper.c +#: setup.c #, c-format msgid "unknown ref storage format '%s'" msgstr "未知的引用儲存格式「%s」" @@ -5598,8 +5508,7 @@ msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。" msgid "working tree '%s' already exists." msgstr "工作區 '%s' 已經存在。" -#: builtin/clone.c builtin/clone.c builtin/difftool.c -#: builtin/log.c builtin/worktree.c builtin/worktree.c +#: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "無法為「%s」建立前導目錄" @@ -5625,7 +5534,7 @@ msgid "" "able" msgstr "clone --recursive 與 --reference 和 --reference-if-able 不相容" -#: builtin/clone.c builtin/remote.c builtin/remote.c +#: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一個有效的遠端名稱" @@ -5646,7 +5555,7 @@ msgstr "本機拓製會忽略 --shallow-exclude。請改用 file:// 協定。" msgid "--filter is ignored in local clones; use file:// instead." msgstr "本機拓製會忽略 --filter。請改用 file:// 協定。" -#: builtin/clone.c fetch-pack.c fetch-pack.c +#: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "來源版本庫是淺版本庫 (shallow)。拒絕拓製。" @@ -5662,7 +5571,7 @@ msgstr "--local 被忽略" msgid "cannot clone from filtered bundle" msgstr "無法從過濾後的套件包拓製" -#: builtin/clone.c builtin/clone.c +#: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "無法初始化版本庫，略過套件包 URI" @@ -5675,7 +5584,7 @@ msgstr "無法從套件包 URL「%s」抓取物件" msgid "failed to fetch advertised bundles" msgstr "無法抓取公佈的套件包" -#: builtin/clone.c builtin/clone.c +#: builtin/clone.c msgid "remote transport reported error" msgstr "遠端傳輸回報錯誤" @@ -5701,7 +5610,7 @@ msgstr "git column [<選項>]" msgid "lookup config vars" msgstr "尋找設定變數" -#: builtin/column.c builtin/column.c +#: builtin/column.c msgid "layout to use" msgstr "要使用的配置" @@ -5752,8 +5661,8 @@ msgstr "" "[no-]progress]\n" " " -#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c -#: builtin/log.c builtin/repack.c builtin/repack.c +#: builtin/commit-graph.c builtin/fetch.c builtin/gc.c builtin/log.c +#: builtin/repack.c msgid "dir" msgstr "目錄" @@ -5790,7 +5699,7 @@ msgstr "非期望的非十六進位物件 ID：%s" msgid "invalid object: %s" msgstr "物件無效：%s" -#: builtin/commit-graph.c parse-options-cb.c parse-options-cb.c +#: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "選項 `%s' 期望一個數字值" @@ -5858,9 +5767,9 @@ msgstr "" #: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" -msgstr "忽略重複的父提交 %s" +msgstr "忽略重複的親代提交 %s" -#: builtin/commit-tree.c builtin/commit-tree.c builtin/log.c +#: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "不是一個有效的物件名 %s" @@ -5877,15 +5786,14 @@ msgstr "git commit-tree：無法關閉 '%s'" #: builtin/commit-tree.c msgid "parent" -msgstr "父提交" +msgstr "親代" #: builtin/commit-tree.c msgid "id of a parent commit object" -msgstr "父提交物件 ID" +msgstr "親代提交物件 ID" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c -#: builtin/notes.c builtin/notes.c builtin/stash.c -#: builtin/tag.c +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c +#: builtin/stash.c builtin/tag.c msgid "message" msgstr "訊息" @@ -5897,8 +5805,8 @@ msgstr "提交說明" msgid "read commit log message from file" msgstr "從檔案中讀取提交說明" -#: builtin/commit-tree.c builtin/commit.c builtin/merge.c -#: builtin/pull.c builtin/revert.c +#: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c +#: builtin/revert.c msgid "GPG sign commit" msgstr "GPG 提交簽名" @@ -6061,7 +5969,7 @@ msgid "" "in the current commit message" msgstr "無法選擇一個未被目前提交說明使用的備註字元" -#: builtin/commit.c builtin/commit.c builtin/commit.c +#: builtin/commit.c #, c-format msgid "could not lookup commit '%s'" msgstr "無法查詢提交「%s」" @@ -6085,7 +5993,7 @@ msgstr "無法讀取日誌檔案「%s」" msgid "options '%s' and '%s:%s' cannot be used together" msgstr "「%s」和「%s:%s」選項不得同時使用" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "無法讀取 SQUASH_MSG" @@ -6093,8 +6001,8 @@ msgstr "無法讀取 SQUASH_MSG" msgid "could not read MERGE_MSG" msgstr "無法讀取 MERGE_MSG" -#: builtin/commit.c builtin/history.c builtin/submodule--helper.c -#: bundle.c rerere.c rerere.c sequencer.c sequencer.c +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c bundle.c +#: rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "無法開啟「%s」" @@ -6214,7 +6122,7 @@ msgstr "--author '%s' 不是 '姓名 <信箱>' 格式，且未能在現有作者 msgid "Invalid ignored mode '%s'" msgstr "無效的忽略模式 '%s'" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "無效的未追蹤檔案參數 '%s'" @@ -6267,11 +6175,11 @@ msgstr "未知選項：--fixup=%s:%s" msgid "paths '%s ...' with -a does not make sense" msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show status concisely" msgstr "以簡潔的格式顯示狀態" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show branch information" msgstr "顯示分支訊息" @@ -6279,7 +6187,7 @@ msgstr "顯示分支訊息" msgid "show stash information" msgstr "顯示貯存區訊息" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "compute full ahead/behind values" msgstr "計算完整的領先/落後值" @@ -6287,20 +6195,19 @@ msgstr "計算完整的領先/落後值" msgid "version" msgstr "版本" -#: builtin/commit.c builtin/commit.c builtin/fetch.c -#: builtin/push.c builtin/worktree.c +#: builtin/commit.c builtin/fetch.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "機器可讀的輸出" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show status in long format (default)" msgstr "以長格式顯示狀態（預設值）" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "terminate entries with NUL" msgstr "條目以 NUL 字元結尾" -#: builtin/commit.c builtin/commit.c +#: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）" @@ -6371,8 +6278,7 @@ msgstr "日期" msgid "override date for commit" msgstr "提交時覆蓋日期" -#: builtin/commit.c builtin/commit.c builtin/commit.c -#: parse-options.h ref-filter.h +#: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" @@ -6404,8 +6310,7 @@ msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）" -#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c -#: builtin/tag.c +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c builtin/tag.c msgid "trailer" msgstr "結尾資訊" @@ -6413,8 +6318,8 @@ msgstr "結尾資訊" msgid "add custom trailer(s)" msgstr "加入自訂結尾資訊" -#: builtin/commit.c builtin/log.c builtin/merge.c -#: builtin/pull.c builtin/revert.c +#: 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" @@ -6478,7 +6383,7 @@ msgstr "允許一個空提交" msgid "ok to record a change with an empty message" msgstr "允許空的提交說明" -#: builtin/commit.c sequencer.c sequencer.c +#: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" msgstr "無法解析 HEAD 提交" @@ -6520,7 +6425,7 @@ msgstr "" "版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n" "已滿或磁碟配額已耗盡，然後執行「git restore --staged :/」復原。" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config list [] [] [--includes]" msgstr "git config list [<檔案選項>] [<顯示選項>] [--includes]" @@ -6542,7 +6447,7 @@ msgstr "" "git config set [] [--type=] [--all] [--value=] " "[--fixed-value] " -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "" "git config unset [] [--all] [--value=] [--fixed-value] " "" @@ -6550,15 +6455,15 @@ msgstr "" "git config unset [] [--all] [--value=] [--fixed-value] " "" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config rename-section [] " msgstr "git config rename-section [<檔案選項>] <舊名稱> <新名稱>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config remove-section [] " msgstr "git config remove-section [<檔案選項>] <名稱>" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "git config edit []" msgstr "git config edit [<檔案選項>]" @@ -6604,7 +6509,7 @@ msgstr "使用版本庫級設定檔案" msgid "use per-worktree config file" msgstr "使用工作區級別的設定檔案" -#: builtin/config.c builtin/gc.c builtin/gc.c +#: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的設定檔案" @@ -6697,6 +6602,21 @@ msgstr "錯誤的參數個數，應該為 %d 個" msgid "wrong number of arguments, should be from %d to %d" msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個" +#: builtin/config.c +#, c-format +msgid "missing value to set to the variable '%s'" +msgstr "缺少值來設定變數「%s」" + +#: builtin/config.c +#, c-format +msgid "did you mean \"git config set %s %s\"?" +msgstr "您是想用「git config set %s %s」嗎？" + +#: builtin/config.c +#, c-format +msgid "missing value to set to a variable with an invalid name '%s'" +msgstr "缺少值來設定具無效名稱「%s」的變數" + #: builtin/config.c #, c-format msgid "invalid key pattern: %s" @@ -6721,7 +6641,7 @@ msgstr "無法解析顏色 '%s'" msgid "unable to parse default color value" msgstr "無法解析預設顏色值" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "not in a git directory" msgstr "不在 git 版本庫中" @@ -6764,7 +6684,7 @@ msgstr "--blob 只能在一個版本庫內使用" msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 版本庫中使用" -#: builtin/config.c builtin/gc.c builtin/gc.c +#: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未設定" @@ -6777,21 +6697,20 @@ msgstr "" "不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴充部分。\n" "詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "Other" msgstr "其他" -#: builtin/config.c builtin/config.c builtin/config.c +#: builtin/config.c msgid "respect include directives on lookup" msgstr "查詢時引用 include 指令遞迴尋找" -#: builtin/config.c builtin/config.c +#: builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "無法讀取設定檔案 '%s'" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "error processing config file(s)" msgstr "處理設定檔案發生錯誤" @@ -6807,11 +6726,10 @@ msgstr "回傳有多項值之組態選項的所有值" msgid "interpret the name as a regular expression" msgstr "將名稱當作常規表示式解讀" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "show config with values matching the pattern" msgstr "顯示值符合模式的組態" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "use string equality when comparing values to value pattern" msgstr "使用字串相等比較值和模式" @@ -6824,7 +6742,6 @@ msgstr "URL" msgid "show config matching the given URL" msgstr "顯示符合提供 URL 的組態" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c msgid "value" msgstr "取值" @@ -6833,7 +6750,7 @@ msgstr "取值" msgid "use default value when missing entry" msgstr "未指定參數時所使用的預設值" -#: builtin/config.c builtin/config.c builtin/config.c +#: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 僅套用至 'value-pattern'" @@ -6845,7 +6762,7 @@ msgstr "--default= 無法和 --all 或 --url= 一起使用" msgid "--url= cannot be used with --all, --regexp or --value" msgstr "--url= 無法和 --all、--regexp、--value 一起使用" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "Filter" msgstr "過濾器" @@ -6853,7 +6770,7 @@ msgstr "過濾器" msgid "replace multi-valued config option with new value" msgstr "以新值取代有多項值的組態選項" -#: builtin/config.c builtin/config.c +#: builtin/config.c msgid "human-readable comment string (# will be prepended as needed)" msgstr "人類可讀的備註字串（將按需插入 # 至前方）" @@ -6886,7 +6803,6 @@ msgstr "取消設定所有多值組態選項" msgid "unset multi-valued config options with matching values" msgstr "取消設定其值相符的多值組態選項" -#: builtin/config.c builtin/config.c builtin/config.c #: builtin/config.c #, c-format msgid "no such section: %s" @@ -7025,12 +6941,11 @@ msgstr "" msgid "print debugging messages to stderr" msgstr "除錯訊息輸出到標準錯誤" -#: builtin/credential-cache--daemon.c #: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支援" -#: builtin/credential-cache.c builtin/credential-cache.c +#: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 無法使用；缺少 unix socket 支援" @@ -7167,7 +7082,7 @@ msgstr "始終使用長提交號格式" #: builtin/describe.c msgid "only follow first parent" -msgstr "只跟隨第一個父提交" +msgstr "只跟隨第一個親代提交" #: builtin/describe.c msgid "only output exact matches" @@ -7189,7 +7104,7 @@ msgstr "不考慮符合 <模式> 的標籤" msgid "show abbreviated commit object as fallback" msgstr "顯示簡寫的提交號作為後備" -#: builtin/describe.c builtin/describe.c +#: builtin/describe.c msgid "mark" msgstr "標記" @@ -7205,7 +7120,7 @@ msgstr "對於損壞的工作區，追加 <標記>（預設值：」-broken\"） msgid "No names found, cannot describe anything." msgstr "沒有發現名稱，無法描述任何東西。" -#: builtin/describe.c builtin/describe.c +#: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "「%s」選項和提交指示元不得同時使用" @@ -7293,7 +7208,7 @@ msgstr "'%s'：不是一個正規檔案或符號連結" #: builtin/diff.c msgid "no merge given, only parents." -msgstr "沒有提供合併提交，只有提供父提交。" +msgstr "沒有提供合併提交，只有提供親代提交。" #: builtin/diff.c #, c-format @@ -7305,8 +7220,7 @@ msgstr "無效選項：%s" msgid "%s...%s: no merge base" msgstr "%s...%s: 無合併基底" -#: builtin/diff.c setup.c setup.c setup.c setup.c -#: setup.c +#: builtin/diff.c setup.c msgid "cannot come back to cwd" msgstr "無法返回目前工作目錄" @@ -7370,7 +7284,7 @@ msgstr "兩個檔案都被修改：'%s' 和 '%s'。" msgid "working tree file has been left." msgstr "工作區檔案被留了下來。" -#: builtin/difftool.c sequencer.c sequencer.c sequencer.c +#: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "無法將「%s」複製至「%s」" @@ -7462,7 +7376,7 @@ msgstr "標籤之物件濾除者的模式未知：%s" msgid "unknown reencoding mode: %s" msgstr "重新編碼的模式未知：%s" -#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c #, c-format msgid "could not read blob %s" msgstr "無法讀取資料物件 %s" @@ -7482,7 +7396,7 @@ msgstr "無法寫入資料物件「%s」" msgid "unexpected comparison status '%c' for %s, %s" msgstr "%2$s、%3$s 有非預期的比較狀態「%1$c」" -#: builtin/fast-export.c builtin/fast-export.c +#: builtin/fast-export.c msgid "none" msgstr "無" @@ -7584,14 +7498,12 @@ msgstr "無法為寫入開啟標記檔案 %s。" msgid "unable to write marks file %s." msgstr "無法寫入標記檔案 %s。" -#: builtin/fast-export.c builtin/fast-export.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-export.c builtin/fast-import.c #, c-format msgid "corrupt mark line: %s" msgstr "損壞的標記列：%s" -#: builtin/fast-export.c builtin/fast-import.c -#: builtin/fast-import.c fetch-pack.c fetch-pack.c +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c #, c-format msgid "object not found: %s" msgstr "物件未找到：%s" @@ -7680,7 +7592,7 @@ msgstr "在匿名輸出中將 轉換為 " #: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" -msgstr "依物件 ID 引用不在 fast-export 串流中的父物件" +msgstr "依物件 ID 引用不在 fast-export 串流中的親代物件" #: builtin/fast-export.c msgid "show original object ids of blobs/commits" @@ -7764,7 +7676,7 @@ msgstr "非預期的壓縮失敗：%d" msgid "not a tree: %s" msgstr "非樹狀物件：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "can't load tree %s" msgstr "無法載入樹狀物件 %s" @@ -7778,7 +7690,7 @@ msgstr "%s 中有損壞的模式" msgid "root cannot be a non-directory" msgstr "根不能不是目錄" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c msgid "empty path component found in input" msgstr "輸入中有空的路徑部分" @@ -7801,8 +7713,8 @@ msgstr "分支 %s 缺少提交。" msgid "not updating %s (new tip %s does not contain %s)" msgstr "沒有更新 %s（提示：%s 不包含 %s）" -#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c -#: midx-write.c sequencer.c +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c +#: repack-midx.c sequencer.c #, c-format msgid "unable to create leading directories of %s" msgstr "不能為 %s 建立先導目錄" @@ -7861,7 +7773,7 @@ msgstr "身分字串中缺少 >：%s" msgid "missing space after > in ident string: %s" msgstr "身分字串的 > 後面缺少空格：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid raw date \"%s\" in ident: %s" msgstr "身分中有無效的原始日期「%s」：%s" @@ -7921,18 +7833,17 @@ msgstr "%s 後有垃圾：%s" msgid "missing space after %s: %s" msgstr "%s 後缺少空格：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "corrupt mode: %s" msgstr "損壞的模式：%s" -#: builtin/fast-import.c builtin/fast-import.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid dataref: %s" msgstr "無效的資料引用：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "missing space after SHA1: %s" msgstr "SHA1 值後缺少空格：%s" @@ -7975,25 +7886,22 @@ msgstr "分支中沒有路徑 %s" msgid "can't add a note on empty branch." msgstr "不能在空分支上附加註記。" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "mark :% not a commit" msgstr "標記 :% 不是提交" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "not a valid commit: %s" msgstr "不是有效的提交：%s" -#: builtin/fast-import.c builtin/fast-import.c -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "invalid ref name or SHA1 expression: %s" msgstr "無效的引用名稱或 SHA1 表示式：%s" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c #, c-format msgid "not a blob (actually a %s): %s" msgstr "不是資料物件（而是 %s）：%s" @@ -8045,8 +7953,7 @@ msgstr "找到多個 %s 簽章，忽略多餘的簽章" msgid "parse_one_signature() returned unknown hash algo" msgstr "parse_one_signature() 回傳了未知的雜湊演算法" -#: builtin/fast-import.c builtin/fsck.c builtin/fsck.c -#: builtin/fsck.c +#: builtin/fast-import.c builtin/fsck.c msgid "unknown" msgstr "未知" @@ -8104,7 +8011,7 @@ msgstr "" "正在取代提交的無效簽章\n" " 據稱由 %s 所簽" -#: builtin/fast-import.c builtin/fast-import.c +#: builtin/fast-import.c msgid "aborting due to invalid signature" msgstr "因為簽章無效而中止" @@ -8183,7 +8090,6 @@ msgstr "物件 %s 是 %s，但預期是資料物件。" msgid "not a mark: %s" msgstr "不是標記：%s" -#: builtin/fast-import.c builtin/fast-import.c #: builtin/fast-import.c #, c-format msgid "unknown mark: %s" @@ -8378,7 +8284,7 @@ msgstr "找不到物件 %s" msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c msgid "[rejected]" msgstr "[已拒絕]" @@ -8390,7 +8296,6 @@ msgstr "無法抓取至已簽出分支" msgid "[tag update]" msgstr "[標籤更新]" -#: builtin/fetch.c builtin/fetch.c builtin/fetch.c #: builtin/fetch.c msgid "unable to update local ref" msgstr "不能更新本機引用" @@ -8419,8 +8324,7 @@ msgstr "強制更新" msgid "non-fast-forward" msgstr "非快轉" -#: builtin/fetch.c builtin/fetch.c builtin/grep.c -#: sequencer.c +#: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" msgstr "不能開啟 '%s'" @@ -8479,15 +8383,20 @@ msgstr "選項「%s」的值「%s」對 %s 無效" msgid "option \"%s\" is ignored for %s" msgstr "選項「%s」被 %s 忽略" -#: builtin/fetch.c odb.c +#: builtin/fetch.c fetch-pack.c #, c-format -msgid "%s is not a valid object" -msgstr "%s 不是一個有效的物件" +msgid "the object %s does not exist" +msgstr "%s 物件不存在" #: builtin/fetch.c #, c-format -msgid "the object %s does not exist" -msgstr "%s 物件不存在" +msgid "ignoring %s=%s because it does not match any refs" +msgstr "忽略了 %s=%s，因為其與任何引用皆不符" + +#: builtin/fetch.c +#, c-format +msgid "ignoring %s because the protocol does not support it" +msgstr "忽略了 %s，因為通訊協定不支援之" #: builtin/fetch.c #, c-format @@ -8576,12 +8485,12 @@ msgstr "" "找不到來源分支。\n" "您得使用 --set-upstream 選項明確指定一個分支" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "正在取得 %s\n" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "無法取得 %s" @@ -8656,7 +8565,7 @@ msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除遠端不存在的本機標籤，並且取代變更標籤" # 譯者：可選值，不能翻譯 -#: builtin/fetch.c builtin/fetch.c builtin/pull.c +#: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "on-demand" @@ -8676,8 +8585,7 @@ msgstr "保持下載包" msgid "allow updating of HEAD ref" msgstr "允許更新 HEAD 引用" -#: builtin/fetch.c builtin/fetch.c builtin/pull.c -#: builtin/pull.c +#: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "取得淺拓製的更多過去歷史記錄" @@ -8715,8 +8623,7 @@ msgstr "引用映射" msgid "specify fetch refmap" msgstr "指定取得動作的引用映射" -#: builtin/fetch.c builtin/pull.c builtin/rebase.c -#: builtin/replay.c +#: builtin/fetch.c builtin/pull.c builtin/rebase.c builtin/replay.c msgid "revision" msgstr "revision" @@ -8724,11 +8631,15 @@ msgstr "revision" msgid "report that we have only objects reachable from this object" msgstr "報告我們只擁有從該物件開始可以取得的物件" +#: builtin/fetch.c builtin/pull.c +msgid "ensure this ref is always sent as a negotiation have" +msgstr "確保始終在磋商中發送此引用" + #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不取得 packfile，而是輸出協商的祖先提交" -#: builtin/fetch.c builtin/fetch.c +#: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "取得 (fetch) 後執行 'maintenance --auto'" @@ -8744,10 +8655,6 @@ msgstr "抓取後寫入提交圖" msgid "accept refspecs from stdin" msgstr "從標準輸入中接受引用規格" -#: builtin/fetch.c -msgid "--negotiate-only needs one or more --negotiation-tip=*" -msgstr "--negotiate-only 需要一或多個 --negotiation-tip=*" - #: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支援負數深度" @@ -8769,7 +8676,7 @@ msgstr "fetch --all 不能帶一個版本庫參數" msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 帶引用規格沒有任何意義" -#: builtin/fetch.c +#: builtin/fetch.c builtin/push.c #, c-format msgid "no such remote or remote group: %s" msgstr "無此遠端或遠端群組：%s" @@ -8786,6 +8693,11 @@ msgstr "使用 --negotiate-only 時必須提供遠端" msgid "protocol does not support --negotiate-only, exiting" msgstr "通訊協定不支援 --negotiate-only。結束" +#: builtin/fetch.c +#, c-format +msgid "%s needs one or more %s" +msgstr "%s 需要一個或數個 %s" + #: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in " @@ -8931,7 +8843,7 @@ msgid "got bad config --config=%s" msgstr "收到無效的組態 --config=%s" #. TRANSLATORS: e.g. error in tree 01bfda: -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "%s %s 錯誤：%s" @@ -8942,7 +8854,7 @@ msgstr "%s %s 錯誤：%s" msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "來自 %7s %s 的損壞的連結" @@ -8983,8 +8895,7 @@ msgstr "懸空 %s %s" msgid "could not create lost-found" msgstr "無法建立 lost-found" -#: builtin/fsck.c builtin/gc.c builtin/rebase.c -#: rebase-interactive.c rerere.c rerere.c sequencer.c +#: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c #: sequencer.c #, c-format msgid "could not write '%s'" @@ -9115,7 +9026,7 @@ msgstr "無法讀取「%s」封裝的修訂版索引 (rev-index)" msgid "invalid rev-index for pack '%s'" msgstr "「%s」封裝的修訂版索引 (rev-index) 無效" -#: builtin/fsck.c builtin/fsck.c +#: builtin/fsck.c msgid "Checking ref database" msgstr "正在檢查引用資料庫" @@ -9195,7 +9106,7 @@ msgstr "git fsmonitor--daemon start []" msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run []" -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "「%s」的數值超出範圍：%d" @@ -9205,6 +9116,11 @@ msgstr "「%s」的數值超出範圍：%d" msgid "value of '%s' not bool or int: %d" msgstr "「%s」的數值不是布林值或整數：%d" +#: builtin/fsmonitor--daemon.c +#, c-format +msgid "daemon did not stop within %d seconds" +msgstr "常駐行程未在 %d 秒內停止" + #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" @@ -9251,7 +9167,7 @@ msgstr "無法初始化健康檢查執行緒" msgid "could not cd home '%s'" msgstr "無法 cd home '%s'" -#: builtin/fsmonitor--daemon.c builtin/fsmonitor--daemon.c +#: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已在執行「%s」" @@ -9261,6 +9177,10 @@ msgstr "fsmonitor--daemon 已在執行「%s」" msgid "running fsmonitor-daemon in '%s'\n" msgstr "正在「%s」執行 fsmonitor-daemon\n" +#: builtin/fsmonitor--daemon.c setup.c +msgid "setsid failed" +msgstr "setsid 失敗" + #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" @@ -9490,7 +9410,7 @@ msgstr "'%s' 非有效作業" msgid "task '%s' cannot be selected multiple times" msgstr "不能多次選取 '%s' 作業" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "基於版本庫狀態執行作業" @@ -9510,7 +9430,7 @@ msgstr "依據頻率執行工作" msgid "do not report progress or other information over stderr" msgstr "不要在 stderr 輸出進度或其他資訊" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "task" msgstr "作業" @@ -9542,11 +9462,11 @@ msgstr "版本庫「%s」未註冊" msgid "failed to expand path '%s'" msgstr "無法展開「%s」路徑" -#: builtin/gc.c builtin/gc.c +#: builtin/gc.c msgid "failed to start launchctl" msgstr "無法啟動 launchctl" -#: builtin/gc.c builtin/gc.c builtin/gc.c +#: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "無法建立「%s」的目錄" @@ -9584,13 +9504,12 @@ msgstr "無法執行「crontab」；您的系統可能不支援「cron」" msgid "'crontab' died" msgstr "「crontab」結束運作" -#: builtin/gc.c builtin/gc.c builtin/gc.c builtin/worktree.c -#: builtin/worktree.c +#: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "刪除 '%s' 失敗" -#: builtin/gc.c builtin/gc.c rerere.c +#: builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "排清 '%s' 失敗" @@ -9681,13 +9600,11 @@ msgstr "grep：無法建立執行緒：%s" msgid "invalid number of threads specified (%d) for %s" msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效" -#. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c builtin/index-pack.c builtin/index-pack.c -#: builtin/pack-objects.c +#: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "沒有執行緒支援，忽略 %s" @@ -10045,7 +9962,7 @@ msgstr "無法解析 emacsclient 版本。" msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c builtin/help.c builtin/help.c builtin/help.c +#: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "執行 '%s' 失敗" @@ -10081,7 +9998,7 @@ msgstr "沒有 man 檢視器處理此請求" msgid "no info viewer handled the request" msgstr "沒有 info 檢視器處理此請求" -#: builtin/help.c builtin/help.c git.c +#: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的別名" @@ -10101,7 +10018,7 @@ msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "「--no-[external-commands|aliases]」選項只能與「--all」一起使用" -#: builtin/help.c builtin/help.c +#: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" @@ -10110,6 +10027,14 @@ msgstr "用法：%s%s" msgid "'git help config' for more information" msgstr "'git help config' 取得更多訊息" +#: builtin/history.c +msgid "" +"git history fixup [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" +msgstr "" +"git history fixup [--dry-run] [--update-refs=(branches|head)] [--" +"reedit-message] [--empty=(drop|keep|abort)]" + #: builtin/history.c msgid "git history reword [--dry-run] [--update-refs=(branches|head)]" msgstr "" @@ -10137,10 +10062,10 @@ msgstr "" msgid "Aborting commit as launching the editor failed.\n" msgstr "中止提交，因為無法開啟編輯器。\n" -#: builtin/history.c builtin/history.c +#: builtin/history.c #, c-format msgid "unable to parse parent commit %s" -msgstr "無法解析上級提交 %s" +msgstr "無法解析親代提交 %s" #: builtin/history.c #, c-format @@ -10173,7 +10098,7 @@ msgstr "使用 --update-refs=head 時，重寫後的提交必須是 HEAD 的祖 msgid "failed to begin ref transaction: %s" msgstr "無法開始引用事務：%s" -#: builtin/history.c builtin/history.c builtin/replay.c +#: builtin/history.c builtin/replay.c #, c-format msgid "failed to update ref '%s': %s" msgstr "無法更新「%s」引用：%s" @@ -10183,30 +10108,98 @@ msgstr "無法更新「%s」引用：%s" msgid "failed to commit ref transaction: %s" msgstr "無法提交引用事務：%s" +#: builtin/history.c +#, c-format +msgid "unable to parse parent of %s" +msgstr "無法解析 %s 的親代" + +#: builtin/history.c +#, c-format +msgid "" +"unrecognized '--empty=' action '%s'; valid values are \"drop\", \"keep\", " +"and \"abort\"." +msgstr "" +"無法辨識「--empty=」動作「%s」；有效值為「drop」、「keep」、和「abort」。" + #: builtin/history.c msgid "control which refs should be updated" msgstr "控制要更新的引用" -#: builtin/history.c builtin/history.c +#: builtin/history.c msgid "perform a dry-run without updating any refs" msgstr "進行測試執行，不更新任何引用" +#: builtin/history.c +msgid "open an editor to modify the commit message" +msgstr "開啟編輯器以修改提交訊息" + +#: builtin/history.c builtin/rebase.c builtin/revert.c +msgid "how to handle commits that become empty" +msgstr "處理空白提交的方式" + #: builtin/history.c msgid "command expects a single revision" msgstr "命令預期只有一個修訂版" -#: builtin/history.c builtin/history.c +#: builtin/history.c +msgid "cannot run fixup in a bare repository" +msgstr "無法在裸版本庫中進行 fixup" + +#: builtin/history.c #, c-format msgid "commit cannot be found: %s" msgstr "找不到提交：%s" #: builtin/history.c -msgid "failed writing reworded commit" -msgstr "無法寫入改寫說明後的提交" +msgid "cannot get tree for HEAD" +msgstr "無法取得 HEAD 的樹狀物件" -#: builtin/history.c builtin/history.c -msgid "failed replaying descendants" -msgstr "重放後代失敗" +#: builtin/history.c builtin/show-index.c +msgid "unable to read index" +msgstr "無法讀取索引" + +#: builtin/history.c +msgid "nothing to fixup: no staged changes" +msgstr "不需要 fixup：沒有已暫存的變更" + +#: builtin/history.c +msgid "unable to write index as a tree" +msgstr "無法將索引區寫入為樹狀物件" + +#: builtin/history.c +#, c-format +msgid "cannot get tree for commit %s" +msgstr "無法取得提交 %s 的樹狀物件" + +#: builtin/history.c +msgid "merge failed while applying fixup" +msgstr "套用 fixup 時合併失敗" + +#: builtin/history.c +msgid "fixup would produce conflicts; aborting" +msgstr "fixup 將產生衝突；中止" + +#: builtin/history.c +#, c-format +msgid "cannot drop root commit %s: it has no parent to replay onto" +msgstr "無法捨棄根提交 %s：其沒有親代可重放" + +#: builtin/history.c +#, c-format +msgid "fixup makes commit %s empty" +msgstr "fixup 致使提交 %s 為空" + +#: builtin/history.c +msgid "failed writing fixed-up commit" +msgstr "寫入經過 fixup 的提交失敗" + +#: builtin/history.c +msgid "failed replaying descendants" +msgstr "重放後代失敗" + +#: builtin/history.c +msgid "failed writing reworded commit" +msgstr "無法寫入改寫說明後的提交" #: builtin/history.c msgid "unable to populate index with tree" @@ -10255,10 +10248,12 @@ msgstr "無法拆分合併提交" #: builtin/hook.c msgid "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=] [-- ]" +"stdin=] [(-j|--jobs) ]\n" +" [-- ]" msgstr "" "git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-" -"stdin=] [-- ]" +"stdin=] [(-j|--jobs) ]\n" +" [-- ]" #: builtin/hook.c msgid "" @@ -10274,7 +10269,7 @@ msgstr "使用 NUL 作為列終止符" msgid "show the config scope that defined each hook" msgstr "顯示定義每個掛鉤的組態範圍" -#: builtin/hook.c builtin/hook.c +#: builtin/hook.c msgid "allow running a hook with a non-native hook name" msgstr "允許執行非原生名稱的掛鉤" @@ -10282,7 +10277,7 @@ msgstr "允許執行非原生名稱的掛鉤" msgid "you must specify a hook event name to list" msgstr "您必須指定要列出的掛鉤事件名稱" -#: builtin/hook.c builtin/hook.c +#: builtin/hook.c #, c-format msgid "" "unknown hook event '%s';\n" @@ -10308,6 +10303,15 @@ msgstr "靜默忽略不存在而請求的 " msgid "file to read into hooks' stdin" msgstr "要讀進掛鉤 stdin 的檔案" +#: builtin/hook.c +msgid "run up to hooks simultaneously (-1 for CPU count)" +msgstr "至多同時執行 個掛鉤（-1 表示 CPU 數量）" + +#: builtin/hook.c +#, c-format +msgid "invalid value for -j: %d (use -1 for CPU count or a positive integer)" +msgstr "無效的 -j 值：%d（使用 -1 表示 CPU 數量，或者一個正整數）" + #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" @@ -10369,6 +10373,10 @@ msgstr "包中有錯誤的物件位於位移量 %：%s" msgid "inflate returned %d" msgstr "解壓縮返回 %d" +#: builtin/index-pack.c builtin/unpack-objects.c +msgid "object size too large for this platform" +msgstr "物件對此平台而言過大" + #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "位移值覆蓋了 delta 基準物件" @@ -10396,8 +10404,7 @@ msgstr[0] "包檔案過早結束，缺少 % 位元組" msgid "serious inflate inconsistency" msgstr "解壓縮嚴重的不一致" -#: builtin/index-pack.c builtin/index-pack.c builtin/index-pack.c -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "發現 %s 出現 SHA1 衝突！" @@ -10417,7 +10424,7 @@ msgstr "不能讀取現存物件 %s" msgid "invalid blob object %s" msgstr "無效的資料物件 %s" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c msgid "fsck error in packed object" msgstr "對打包物件 fsck 檢查發生錯誤" @@ -10431,7 +10438,7 @@ msgstr "無效的 %s" msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子物件並非都可以取得" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c msgid "failed to apply delta" msgstr "套用 delta 失敗" @@ -10464,7 +10471,6 @@ msgid "Resolving deltas" msgstr "處理 delta 中" #: builtin/index-pack.c builtin/pack-objects.c -#: builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "不能建立執行緒：%s" @@ -10576,12 +10582,12 @@ msgstr "無法返回目前工作目錄" msgid "bad --pack_header: %s" msgstr "無效的 --pack_header：%s" -#: builtin/index-pack.c builtin/index-pack.c +#: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "錯誤選項 %s" -#: builtin/index-pack.c builtin/init-db.c setup.c setup.c +#: builtin/index-pack.c builtin/init-db.c setup.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的「%s」雜湊算法" @@ -10640,12 +10646,12 @@ msgstr "雜湊" msgid "specify the hash algorithm to use" msgstr "指定要使用的雜湊算法" -#: builtin/init-db.c builtin/init-db.c +#: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "不能建立目錄 %s" -#: builtin/init-db.c builtin/init-db.c +#: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "不能切換目錄到 %s" @@ -10857,7 +10863,7 @@ msgstr "" msgid "git show %s: bad file" msgstr "git show %s: 損壞的檔案" -#: builtin/log.c builtin/log.c +#: builtin/log.c #, c-format msgid "could not read object %s" msgstr "無法讀取物件 %s" @@ -10934,13 +10940,12 @@ msgstr "git format-patch [<選項>] [<從> | <版本範圍>]" msgid "two output directories?" msgstr "兩個輸出目錄？" -#: builtin/log.c builtin/log.c builtin/log.c builtin/log.c +#: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" -#: builtin/log.c builtin/replace.c builtin/replace.c -#: builtin/replace.c +#: builtin/log.c builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "無法將 '%s' 解析為一個有效引用" @@ -11096,7 +11101,7 @@ msgstr "header" msgid "add email header" msgstr "新增信件頭" -#: builtin/log.c builtin/log.c +#: builtin/log.c msgid "email" msgstr "信箱" @@ -11124,7 +11129,7 @@ msgstr "信件標記" msgid "make first mail a reply to " msgstr "使第一封信件作為對 <信件標記> 的回覆" -#: builtin/log.c builtin/log.c +#: builtin/log.c msgid "boundary" msgstr "邊界" @@ -11205,8 +11210,7 @@ msgstr "--check 無意義" msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 無意義" -#: builtin/log.c builtin/submodule--helper.c -#: builtin/submodule--helper.c rerere.c submodule.c +#: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "無法建立「%s」目錄" @@ -11398,11 +11402,11 @@ msgstr "" msgid "do not print remote URL" msgstr "不列印遠端 URL" -#: builtin/ls-remote.c builtin/ls-remote.c builtin/rebase.c +#: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "exec" -#: builtin/ls-remote.c builtin/ls-remote.c +#: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "遠端主機上的 git-upload-pack 路徑" @@ -11454,7 +11458,7 @@ msgstr "條目以 NUL 字元終止" msgid "include object size" msgstr "包括物件大小" -#: builtin/ls-tree.c builtin/ls-tree.c +#: builtin/ls-tree.c msgid "list only filenames" msgstr "只列出檔案名" @@ -11632,7 +11636,7 @@ msgstr[0] "無法處理 %d 條以上的基礎。忽略 %s。" msgid "not handling anything other than two heads merge." msgstr "不能處理兩個頭合併之外的任何動作。" -#: builtin/merge-recursive.c builtin/merge-recursive.c +#: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "無法解析引用「%s」" @@ -11642,12 +11646,12 @@ msgstr "無法解析引用「%s」" msgid "Merging %s with %s\n" msgstr "合併 %s 和 %s\n" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c +#: builtin/merge-tree.c #, c-format msgid "could not parse as tree '%s'" msgstr "無法解析為樹狀物件「%s」" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge.c +#: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不能合併" @@ -11707,7 +11711,7 @@ msgstr "option=value" msgid "option for selected merge strategy" msgstr "所選的合併策略的選項" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/merge-tree.c +#: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 和其他所有選項都不相容" @@ -11716,7 +11720,7 @@ msgstr "--trivial-merge 和其他所有選項都不相容" msgid "unknown strategy option: -X%s" msgstr "未知的策略選項：-X%s" -#: builtin/merge-tree.c builtin/merge-tree.c builtin/notes.c +#: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "格式錯誤的輸入行：'%s'。" @@ -11793,8 +11797,8 @@ msgstr "如果不能快轉就放棄合併" msgid "verify that the named commit has a valid GPG signature" msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名" -#: builtin/merge.c builtin/notes.c builtin/pull.c -#: builtin/rebase.c builtin/revert.c +#: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c +#: builtin/revert.c msgid "strategy" msgstr "策略" @@ -11835,7 +11839,7 @@ msgstr "無法執行貯存。" msgid "stash failed" msgstr "貯存失敗" -#: builtin/merge.c builtin/merge.c +#: builtin/merge.c msgid "read-tree failed" msgstr "讀取樹失敗" @@ -11868,7 +11872,7 @@ msgstr "'%s' 沒有指向一個提交" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "壞的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c builtin/merge.c merge-ort-wrappers.c +#: builtin/merge.c merge-ort-wrappers.c msgid "Unable to write index." msgstr "不能寫入索引。" @@ -11948,7 +11952,7 @@ msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支" msgid "Bad value '%s' in environment '%s'" msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'" -#: builtin/merge.c editor.c read-cache.c wrapper.c +#: builtin/merge.c editor.c read-cache.c t/helper/test-synthesize.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "無法關閉「%s」" @@ -12043,7 +12047,7 @@ msgstr "嘗試非常小的索引內合併...\n" msgid "Nope.\n" msgstr "無。\n" -#: builtin/merge.c builtin/merge.c +#: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "將樹回滾至原始狀態...\n" @@ -12126,19 +12130,23 @@ msgstr "允許建立一個以上的樹" msgid "" "git multi-pack-index [] write [--preferred-pack=]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=]" +" [--refs-snapshot=] [--[no-]write-chain-file]\n" +" [--base=]" msgstr "" "git multi-pack-index [] write [--preferred-pack=]\n" " [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n" -" [--refs-snapshot=]" +" [--refs-snapshot=] [--[no-]write-chain-file]\n" +" [--base=]" #: builtin/multi-pack-index.c msgid "" "git multi-pack-index [] compact [--[no-]incremental]\n" -" [--[no-]bitmap] " +" [--[no-]bitmap] [--base=] [--[no-]write-chain-file]\n" +" " msgstr "" "git multi-pack-index [] compact [--[no-]incremental]\n" -" [--[no-]bitmap] " +" [--[no-]bitmap] [--base=] [--[no-]write-chain-file]\n" +" " #: builtin/multi-pack-index.c msgid "git multi-pack-index [] verify" @@ -12168,14 +12176,26 @@ msgstr "偏好包" msgid "pack for reuse when computing a multi-pack bitmap" msgstr "計算多包位圖時要重複使用的包" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "寫入多包位圖" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c +msgid "checksum" +msgstr "總和檢查碼" + +#: builtin/multi-pack-index.c +msgid "base MIDX for incremental writes" +msgstr "增量寫入的基礎 MIDX" + +#: builtin/multi-pack-index.c msgid "write a new incremental MIDX" msgstr "寫入新的增量 MIDX" +#: builtin/multi-pack-index.c +msgid "write the multi-pack-index chain file" +msgstr "寫入多包索引鏈檔" + #: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "寫入只包含指定索引的多包索引" @@ -12184,14 +12204,23 @@ msgstr "寫入只包含指定索引的多包索引" msgid "refs snapshot for selecting bitmap commits" msgstr "用來選取位圖提交的引用快照" -#: builtin/multi-pack-index.c builtin/multi-pack-index.c +#: builtin/multi-pack-index.c +#, c-format +msgid "cannot use %s without %s" +msgstr "不能不與 %2$s 一起使用 %1$s" + +#: builtin/multi-pack-index.c +msgid "cannot use --base without --no-write-chain-file" +msgstr "不能不與 --no-write-chain-file 一起使用 --base" + +#: builtin/multi-pack-index.c #, c-format msgid "could not find MIDX: %s" msgstr "找不到 MIDX：%s" #: builtin/multi-pack-index.c msgid "MIDX compaction endpoints must be unique" -msgstr "MIDX 壓縮端點必須唯一" +msgstr "MIDX 緻密化端點必須唯一" #: builtin/multi-pack-index.c #, c-format @@ -12244,11 +12273,11 @@ msgstr "目的地「%s」不是目錄" msgid "Checking rename of '%s' to '%s'\n" msgstr "檢查 '%s' 到 '%s' 的重新命名\n" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c msgid "bad source" msgstr "來源損壞" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c msgid "destination exists" msgstr "目的地已存在" @@ -12272,7 +12301,7 @@ msgstr "不在版本控制之下" msgid "conflicted" msgstr "衝突" -#: builtin/mv.c builtin/mv.c +#: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆蓋 '%s'" @@ -12361,6 +12390,60 @@ msgstr "允許列印 `未定義` 的名稱（預設值）" msgid "dereference tags in the input (internal use)" msgstr "反向解析輸入中的標籤（內部使用）" +#: builtin/name-rev.c +#, c-format +msgid "'%s' needs to be either text, revs, or rev" +msgstr "「%s」應為 text、revs、或 rev" + +#: builtin/name-rev.c +msgid "" +"(EXPERIMENTAL!) git format-rev --stdin-mode= --format= [--" +"[no-]notes=] [-z] [--[no-]null-output] [--[no-]null-input]" +msgstr "" +"（實驗性！）git format-rev --stdin-mode= --format= [--" +"[no-]notes=] [-z] [--[no-]null-output] [--[no-]null-input]" + +#: builtin/name-rev.c +msgid "pretty format to use" +msgstr "要使用的美化輸出格式" + +#: builtin/name-rev.c +msgid "stdin-mode" +msgstr "stdin-mode" + +#: builtin/name-rev.c +msgid "how revs are processed" +msgstr "修訂版如何處理" + +#: builtin/name-rev.c builtin/range-diff.c +msgid "notes" +msgstr "註解" + +#: builtin/name-rev.c +msgid "display notes for pretty format" +msgstr "以美化格式顯示註解" + +#: builtin/name-rev.c +msgid "z" +msgstr "z" + +#: builtin/name-rev.c +msgid "Use NUL for input and output termination" +msgstr "使用 NUL 作為輸入和輸出終止符" + +#: builtin/name-rev.c +msgid "Use NUL for input termination" +msgstr "使用 NUL 作為輸入終止符" + +#: builtin/name-rev.c +msgid "Use NUL for output termination" +msgstr "使用 NUL 作為輸出終止符" + +#: builtin/name-rev.c +#, c-format +msgid "'%s' is required" +msgstr "需要「%s」" + #: builtin/notes.c msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref <註解引用>] [list [<物件>]]" @@ -12493,9 +12576,7 @@ msgstr "註解內容被留在 %s 中" msgid "could not open or read '%s'" msgstr "無法開啟或讀取「%s」" -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c -#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "無法解析 '%s' 為一個有效引用。" @@ -12523,48 +12604,48 @@ msgstr "將註解從「%s」複製至「%s」失敗" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒絕向 %2$s（在 refs/notes/ 之外）%1$s註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "未發現物件 %s 的註解。" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "note contents as a string" msgstr "註解內容作為一個字串" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "note contents in a file" msgstr "註解內容到一個檔案中" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "reuse and edit specified note object" msgstr "重用和編輯指定的註解物件" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "edit note message in editor" msgstr "在編輯器中編輯備註訊息" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "reuse specified note object" msgstr "重用指定的註解物件" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "allow storing empty note" msgstr "允許儲存空白備註" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "replace existing notes" msgstr "取代已存在的註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "" msgstr "" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "insert between paragraphs" msgstr "在段落間插入 " -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c msgid "remove unnecessary whitespace" msgstr "移除不必要的空白字元" @@ -12575,12 +12656,12 @@ msgid "" "existing notes" msgstr "不能新增註解。發現物件 %s 已存在註解。使用 '-f' 覆蓋現存註解" -#: builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆蓋物件 %s 現存註解\n" -#: builtin/notes.c builtin/notes.c builtin/notes.c +#: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "刪除物件 %s 的註解\n" @@ -12788,6 +12869,11 @@ msgstr "無效的 --name-hash-version 選項：%d" msgid "currently, --write-bitmap-index requires --name-hash-version=1" msgstr "目前 --write-bitmap-index 需要指定 --name-hash-version=1" +#: builtin/pack-objects.c +#, c-format +msgid "write_reuse_object: unable to parse object header of %s" +msgstr "write_reuse_object：無法解析 %s 的物件標頭" + #: builtin/pack-objects.c #, c-format msgid "" @@ -12866,7 +12952,7 @@ msgstr "%s 的 delta 基準位移越界" msgid "Counting objects" msgstr "正在計算物件數量" -#: builtin/pack-objects.c pack-bitmap.c pack-bitmap.c +#: builtin/pack-objects.c pack-bitmap.c #, c-format msgid "unable to get size of %s" msgstr "不能得到 %s 的大小" @@ -12876,13 +12962,12 @@ msgstr "不能得到 %s 的大小" msgid "unable to parse object header of %s" msgstr "無法解析物件 %s 標頭訊息" -#: builtin/pack-objects.c builtin/pack-objects.c #: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "物件 %s 無法讀取" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "物件 %s 不一致的物件長度（% vs %）" @@ -12906,7 +12991,7 @@ msgstr "無法為標籤 %s 壓縮物件" msgid "unable to get type of object %s" msgstr "無法獲得物件 %s 類型" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "Compressing objects by path" msgstr "正在根據路徑壓縮物件" @@ -12949,7 +13034,7 @@ msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s') msgid "could not get type of object %s in pack %s" msgstr "無法取得 %2$s 包中 %1$s 物件的類型" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "找不到「%s」包" @@ -12964,7 +13049,7 @@ msgstr "封包檔案 %s 是承諾者，但是指定了 --exclude-promisor-object msgid "packfile %s cannot be accessed" msgstr "無法存取封包檔案 %s" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "正在枚舉無用物件" @@ -12994,7 +13079,7 @@ msgstr "" "預期物件 ID，卻得到垃圾資料：\n" " %s" -#: builtin/pack-objects.c builtin/pack-objects.c +#: builtin/pack-objects.c msgid "cannot open pack index" msgstr "無法開啟包檔案索引" @@ -13007,10 +13092,6 @@ msgstr "無法檢查 %s 處的鬆散物件" msgid "unable to force loose object" msgstr "無法強制鬆散物件" -#: builtin/pack-objects.c -msgid "failed to pack objects via path-walk" -msgstr "無法使用 path-walk 封裝物件" - #: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" @@ -13021,6 +13102,10 @@ msgstr "不是一個版本 '%s'" msgid "bad revision '%s'" msgstr "壞的版本 '%s'" +#: builtin/pack-objects.c +msgid "failed to pack objects via path-walk" +msgstr "無法使用 path-walk 封裝物件" + #: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "無法新增最近的物件" @@ -13347,24 +13432,23 @@ msgstr "" msgid "You are not currently on a branch." msgstr "您目前不在一個分支上。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "Please specify which branch you want to rebase against." msgstr "請指定您要重定基底到哪一個分支。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "Please specify which branch you want to merge with." msgstr "請指定您要合併哪一個分支。" -#: builtin/pull.c builtin/pull.c +#: builtin/pull.c msgid "See git-pull(1) for details." msgstr "詳見 git-pull(1)。" -#: builtin/pull.c builtin/pull.c builtin/pull.c -#: builtin/rebase.c +#: builtin/pull.c builtin/rebase.c msgid "" msgstr "<遠端>" -#: builtin/pull.c builtin/pull.c builtin/pull.c scalar.c +#: builtin/pull.c scalar.c msgid "" msgstr "<分支>" @@ -13727,6 +13811,11 @@ msgstr "在有 push.recurseSubmodules=only; 的情況嘗試遞迴子模組；改 msgid "invalid value for '%s'" msgstr "「%s」的值無效" +#: builtin/push.c +#, c-format +msgid "could not push to %s" +msgstr "無法推送到 %s" + #: builtin/push.c builtin/submodule--helper.c msgid "repository" msgstr "版本庫" @@ -13771,8 +13860,7 @@ msgstr "控制子模組的遞迴推送" msgid "use thin pack" msgstr "使用精簡打包" -#: builtin/push.c builtin/push.c builtin/send-pack.c -#: builtin/send-pack.c +#: builtin/push.c builtin/send-pack.c msgid "receive pack program" msgstr "接收包程式" @@ -13820,15 +13908,35 @@ msgid "" "and then push using the remote name\n" "\n" " git push \n" +"\n" +"To push to multiple remotes at once, configure a remote group using\n" +"\n" +" git config remotes. \" \"\n" +"\n" +"and then push using the group name\n" +"\n" +" git push \n" msgstr "" "沒有設定推送目的地。\n" -"請透過命令列指定 URL，或者用下面指令設定遠端版本庫\n" +"請透過命令列指定 URL，或者用以下命令設定遠端版本庫\n" "\n" -" git remote add <名稱> <位址>\n" +" git remote add <名稱> \n" "\n" -"然後使用該遠端版本庫名執行推送\n" +"然後以該遠端名稱進行推送\n" "\n" " git push <名稱>\n" +"\n" +"要一次推送到多個遠端，用以下命令設定遠端群組\n" +"\n" +" git config remotes.<群組名稱> \"<遠端1> <遠端2>\"\n" +"\n" +"然後以該群組名稱進行推送\n" +"\n" +" git push <群組名稱>\n" + +#: builtin/push.c +msgid "push options must not have new line characters" +msgstr "推送選項不能有換行符號" #: builtin/push.c msgid "--all can't be combined with refspecs" @@ -13839,8 +13947,8 @@ msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用規格同時使用" #: builtin/push.c -msgid "push options must not have new line characters" -msgstr "推送選項不能有換行符號" +msgid "--atomic can only be used when pushing to one remote" +msgstr "--atomic 只能在推送到一個遠端時使用" #: builtin/range-diff.c msgid "git range-diff [] .. .." @@ -13864,10 +13972,6 @@ msgid "use simple diff colors" msgstr "使用簡單差異顏色" #: builtin/range-diff.c -msgid "notes" -msgstr "註解" - -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c msgid "passed to 'git log'" msgstr "傳遞給 'git log'" @@ -13887,12 +13991,12 @@ msgstr "只發出跟第一個範圍相關的輸出" msgid "only emit output related to the second range" msgstr "只發出跟第二個範圍相關的輸出" -#: builtin/range-diff.c builtin/range-diff.c builtin/range-diff.c +#: builtin/range-diff.c #, c-format msgid "not a revision: '%s'" msgstr "非修訂版：「%s」" -#: builtin/range-diff.c builtin/range-diff.c +#: builtin/range-diff.c #, c-format msgid "not a commit range: '%s'" msgstr "不是提交範圍：「%s」" @@ -14046,8 +14150,7 @@ msgstr "無效的原始 head：'%s'" msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "忽略無效的 allow_rerere_autoupdate：'%s'" -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c -#: builtin/rm.c sequencer.c sequencer.c +#: builtin/rebase.c builtin/rm.c sequencer.c #, c-format msgid "could not remove '%s'" msgstr "無法刪除「%s」" @@ -14080,7 +14183,6 @@ msgstr "未知的 rebase-merges 模式：%s" msgid "could not switch to %s" msgstr "無法切換到 %s" -#: builtin/rebase.c builtin/rebase.c builtin/rebase.c #: builtin/rebase.c msgid "apply options and merge options cannot be used together" msgstr "套用選項與合併選項不得同時使用" @@ -14183,7 +14285,7 @@ msgstr "忽略製作日期而使用日前日期" msgid "synonym of --reset-author-date" msgstr "和 --reset-author-date 同義" -#: builtin/rebase.c builtin/rebase.c +#: builtin/rebase.c msgid "passed to 'git apply'" msgstr "傳遞給 'git apply'" @@ -14191,7 +14293,7 @@ msgstr "傳遞給 'git apply'" msgid "ignore changes in whitespace" msgstr "忽略空白字元中的變更" -#: builtin/rebase.c builtin/rebase.c +#: builtin/rebase.c msgid "cherry-pick all commits, even if unchanged" msgstr "揀選所有提交，即使未修改" @@ -14236,10 +14338,6 @@ msgstr "讓使用者編輯要重定基底的提交列表" msgid "(REMOVED) was: try to recreate merges instead of ignoring them" msgstr "（已移除）曾為：嘗試重新建立，而非忽略合併" -#: builtin/rebase.c builtin/revert.c -msgid "how to handle commits that become empty" -msgstr "處理空白提交的方式" - #: builtin/rebase.c msgid "keep commits which start empty" msgstr "保留開頭是空白的提交" @@ -14570,7 +14668,7 @@ msgstr "" " [--dry-run | -n] [--verbose] [--all [--single-worktree] | " "...]" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c #, c-format msgid "invalid timestamp '%s' given to '--%s'" msgstr "傳入「--%s」的時間戳「%s」無效" @@ -14580,24 +14678,24 @@ msgstr "傳入「--%s」的時間戳「%s」無效" msgid "%s does not accept arguments: '%s'" msgstr "%s 不接受參數：'%s'" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "do not actually prune any entries" msgstr "不實際剪除任何項目" -#: builtin/reflog.c builtin/reflog.c +#: 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 builtin/reflog.c +#: builtin/reflog.c msgid "update the reference to the value of the top reflog entry" msgstr "更新引用至首個引用日誌項目的值" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "print extra information on screen" msgstr "在螢幕上輸出額外資訊" -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c msgid "timestamp" msgstr "時間戳" @@ -14628,7 +14726,7 @@ msgstr "限制只處理目前工作區的引用日誌" msgid "Marking reachable objects..." msgstr "正在標記可以取得物件..." -#: builtin/reflog.c builtin/reflog.c +#: builtin/reflog.c #, c-format msgid "reflog could not be found: '%s'" msgstr "找不到引用日誌：「%s」" @@ -14763,15 +14861,15 @@ msgstr "" "git remote add [-t <分支>] [-m ] [-f] [--tags | --no-tags] [--" "mirror=] <名稱> <位址>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote rename [--[no-]progress] " msgstr "git remote rename [--[no-]progress] " -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote remove " msgstr "git remote remove <名稱>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-head (-a | --auto | -d | --delete | )" msgstr "git remote set-head <名稱> (-a | --auto | -d | --delete | <分支>)" @@ -14792,19 +14890,19 @@ msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <遠端>)... msgid "git remote set-branches [--add] ..." msgstr "git remote set-branches [--add] <名稱> <分支>..." -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote get-url [--push] [--all] " msgstr "git remote get-url [--push] [--all] <名稱>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url [--push] []" msgstr "git remote set-url [--push] <名稱> <新的位址> [<舊的位址>]" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url --add " msgstr "git remote set-url --add <名稱> <新的位址>" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "git remote set-url --delete " msgstr "git remote set-url --delete <名稱> <位址>" @@ -14897,7 +14995,7 @@ msgstr "指定一個 master 分支並使用 --mirror 選項沒有意義" msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "remote %s already exists." msgstr "遠端 %s 已經存在。" @@ -14907,8 +15005,7 @@ msgstr "遠端 %s 已經存在。" msgid "Could not setup master '%s'" msgstr "無法配置 master「%s」" -#: builtin/remote.c builtin/remote.c trailer.c trailer.c -#: trailer.c +#: builtin/remote.c trailer.c #, c-format msgid "more than one %s" msgstr "多於一個 %s" @@ -14923,7 +15020,7 @@ msgstr "branch.%s.rebase=%s 未處理。假設成 'true'" msgid "Could not get fetch map for refspec %s" msgstr "無法取得引用規格 %s 的 fetch 映射" -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid "(matching)" msgstr "（符合）" @@ -14936,8 +15033,7 @@ msgstr "（刪除）" msgid "could not set '%s'" msgstr "無法設定「%s」" -#: builtin/remote.c builtin/remote.c builtin/remote.c -#: config.c +#: builtin/remote.c config.c #, c-format msgid "could not unset '%s'" msgstr "無法取消設定「%s」" @@ -14969,7 +15065,7 @@ msgstr "" "\n" "若是這種情況，你可以先將遠端改為不同的名稱來解決這個問題。\n" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "No such remote: '%s'" msgstr "沒有此遠端版本庫：'%s'" @@ -15132,7 +15228,7 @@ msgstr " 取得位址：%s" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid " Push URL: %s" msgstr " 推送位址：%s" @@ -15141,7 +15237,7 @@ msgstr " 推送位址：%s" msgid "(no URL)" msgstr "(無 URL)" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支：%s" @@ -15168,7 +15264,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " 遠端分支：%s" # 譯者：中文字串拼接，可刪除前導空格 -#: builtin/remote.c builtin/remote.c +#: builtin/remote.c msgid " (status not queried)" msgstr " （狀態未查詢）" @@ -15269,7 +15365,7 @@ msgstr " * [已剪除] %s" msgid "prune remotes after fetching" msgstr "抓取後剪除遠端" -#: builtin/remote.c builtin/remote.c builtin/remote.c +#: builtin/remote.c #, c-format msgid "No such remote '%s'" msgstr "沒有此遠端 '%s'" @@ -15328,11 +15424,11 @@ msgstr "詳細輸出；必須置於子指令之前" msgid "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=] [--depth=] [--threads=] [--keep-pack=]\n" -"[--write-midx] [--name-hash-version=] [--path-walk]" +"[--write-midx[=]] [--name-hash-version=] [--path-walk]" msgstr "" "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n" "[--window=] [--depth=] [--threads=] [--keep-pack=]\n" -"[--write-midx] [--name-hash-version=] [--path-walk]" +"[--write-midx[=]] [--name-hash-version=] [--path-walk]" #: builtin/repack.c msgid "" @@ -15342,6 +15438,11 @@ msgstr "" "增量 repack 和 bitmap 索引不相容。請使用 --no-write-bitmap-index\n" "或停用 pack.writeBitmaps 設定。" +#: builtin/repack.c +#, c-format +msgid "unknown value for %s: %s" +msgstr "未知的 %s 值：%s" + #: builtin/repack.c msgid "pack everything in a single pack" msgstr "所有內容打包到一個包檔案中" @@ -15354,7 +15455,7 @@ msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件" msgid "same as -a, pack unreachable cruft objects separately" msgstr "和 -a 相同，會獨立封裝無法存取的無用物件" -#: builtin/repack.c builtin/repack.c +#: builtin/repack.c msgid "approxidate" msgstr "近似日期" @@ -15459,6 +15560,11 @@ msgstr "將前綴進行包裝，儲存為包含已過濾物件的封裝" msgid "cannot delete packs in a precious-objects repo" msgstr "不能刪除珍品版本庫中的封包" +#: builtin/repack.c +#, c-format +msgid "invalid value for %s: %d" +msgstr "無效的 %s 值：%d" + #: builtin/repack.c #, c-format msgid "option '%s' can only be used along with '%s'" @@ -15478,7 +15584,7 @@ msgstr "git replace [-f] --edit <物件>" #: builtin/replace.c msgid "git replace [-f] --graft [...]" -msgstr "git replace [-f] --graft <提交> [<父提交>...]" +msgstr "git replace [-f] --graft <提交> [<親代提交>...]" #: builtin/replace.c msgid "git replace -d ..." @@ -15650,7 +15756,7 @@ msgstr "編輯現存的物件" #: builtin/replace.c msgid "change a commit's parents" -msgstr "修改一個提交的父提交" +msgstr "修改一個提交的親代提交" #: builtin/replace.c msgid "convert existing graft file" @@ -15747,7 +15853,6 @@ msgstr "控制引用的更新行為（update|print）" msgid "exactly one of --onto, --advance, or --revert is required" msgstr "--onto、--advance 或 --revert 必須三選一" -#: builtin/replay.c builtin/replay.c builtin/replay.c #: builtin/replay.c #, c-format msgid "" @@ -15769,11 +15874,11 @@ msgstr "--keys 只能與 --format=lines 或 --format=nul 一起使用" msgid "invalid format '%s'" msgstr "「%s」格式無效" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "output format" msgstr "輸出格式" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "synonym for --format=nul" msgstr "和 --format=nul 同義" @@ -15801,7 +15906,7 @@ msgstr "--all 和 不能同時使用" msgid "References" msgstr "引用" -#: builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Count" msgstr "總數" @@ -15809,7 +15914,6 @@ msgstr "總數" msgid "Branches" msgstr "分支" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c #: builtin/repo.c msgid "Tags" msgstr "標籤" @@ -15826,15 +15930,15 @@ msgstr "其他" msgid "Reachable objects" msgstr "可到達物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Commits" msgstr "提交" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Trees" msgstr "樹狀物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Blobs" msgstr "資料物件" @@ -15850,13 +15954,13 @@ msgstr "磁碟大小" msgid "Largest objects" msgstr "最大的物件" -#: builtin/repo.c builtin/repo.c builtin/repo.c builtin/repo.c +#: builtin/repo.c msgid "Maximum size" msgstr "最大大小" #: builtin/repo.c msgid "Maximum parents" -msgstr "最大父提交數" +msgstr "最大親代提交數" #: builtin/repo.c msgid "Maximum entries" @@ -15956,8 +16060,7 @@ msgstr "HEAD 現在位於 %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合併過程中不能做%s重設動作。" -#: builtin/reset.c builtin/stash.c builtin/stash.c -#: builtin/stash.c +#: builtin/reset.c builtin/stash.c msgid "be quiet, only report errors" msgstr "安靜模式，只報告錯誤" @@ -15973,7 +16076,7 @@ msgstr "重設 HEAD 和索引" msgid "reset only HEAD" msgstr "只重設 HEAD" -#: builtin/reset.c builtin/reset.c +#: builtin/reset.c msgid "reset HEAD, index and working tree" msgstr "重設 HEAD、索引和工作區" @@ -16223,11 +16326,11 @@ msgstr "編輯提交說明" #: builtin/revert.c msgid "parent-number" -msgstr "父編號" +msgstr "親代編號" #: builtin/revert.c msgid "select mainline parent" -msgstr "選擇主幹父提交編號" +msgstr "選擇主幹親代提交編號" #: builtin/revert.c msgid "merge strategy" @@ -16297,7 +16400,7 @@ 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 builtin/rm.c +#: builtin/rm.c msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -16394,7 +16497,7 @@ msgstr "git log --pretty=short | git shortlog [<選項>]" msgid "using multiple --group options with stdin is not supported" msgstr "不支援在標準輸入使用多個 --group 選項" -#: builtin/shortlog.c builtin/shortlog.c +#: builtin/shortlog.c #, c-format msgid "using %s with stdin is not supported" msgstr "不支援對 %s 使用 stdin" @@ -16588,10 +16691,6 @@ msgstr "無法讀取標頭" msgid "unknown index version" msgstr "未知的索引版本" -#: builtin/show-index.c builtin/show-index.c -msgid "unable to read index" -msgstr "無法讀取索引" - #: builtin/show-index.c msgid "corrupt index file" msgstr "索引檔案損壞" @@ -16669,7 +16768,7 @@ msgstr "檢查引用是否存在但不解析" msgid "stricter reference checking, requires exact ref path" msgstr "更嚴格的引用檢測，需要精確的引用路徑" -#: builtin/show-ref.c builtin/show-ref.c +#: builtin/show-ref.c msgid "show the HEAD reference, even if it would be filtered out" msgstr "顯示 HEAD 引用，即使被過濾掉" @@ -16734,12 +16833,10 @@ msgstr "無法初始化工作區組態" msgid "failed to modify sparse-index config" msgstr "無法修改稀疏索引設定" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "initialize the sparse-checkout in cone mode" msgstr "以 cone 模式初始化稀疏簽出" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "toggle the use of a sparse index" msgstr "切換是否使用稀疏索引" @@ -16754,12 +16851,11 @@ msgstr "無法開啟「%s」" msgid "could not normalize path %s" msgstr "無法標準化路徑 %s" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c #, c-format msgid "unable to unquote C-style string '%s'" msgstr "無法去掉 '%s' C 樣式字串的引號" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c #: builtin/sparse-checkout.c msgid "unable to load existing sparse-checkout patterns" msgstr "無法載入現存的稀疏簽出樣式" @@ -16810,12 +16906,12 @@ msgstr "" msgid "git sparse-checkout add [--skip-checks] (--stdin | )" msgstr "git sparse-checkout add [--skip-checks] (--stdin | )" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c msgid "" "skip some sanity checks on the given paths that might give false positives" msgstr "在可能給出誤判結果的指定目錄，略過某些完整性檢查" -#: builtin/sparse-checkout.c builtin/sparse-checkout.c +#: builtin/sparse-checkout.c msgid "read patterns from standard in" msgstr "從標準輸入讀取樣式" @@ -16912,8 +17008,12 @@ msgid "git stash pop [--index] [-q | --quiet] []" msgstr "git stash pop [--index] [-q | --quiet] []" #: builtin/stash.c -msgid "git stash apply [--index] [-q | --quiet] []" -msgstr "git stash apply [--index] [-q | --quiet] []" +msgid "" +"git stash apply [--index] [-q | --quiet] [--label-ours=