3d735322df · matheusbsbs/matheus-bagliano

@@ -1,7 +1,7 @@

1 # Chinese (traditional) translations for Git package

2 # Git 套裝軟體的繁體中文翻譯。

5 # This file is distributed under the same license as the Git package.

6 #

7 # The glossary can be found on https://github.com/l10n-tw/git-glossary

@@ -26,8 +26,8 @@ msgid ""

26 msgstr ""

27 "Project-Id-Version: Git\n"

28 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

29 -"POT-Creation-Date: 2023-08-20 21:51+0800\n"

30 -"PO-Revision-Date: 2023-08-20 21:58+0800\n"

29 +"POT-Creation-Date: 2023-11-19 22:29+0800\n"

30 +"PO-Revision-Date: 2023-11-19 23:34+0800\n"

31 "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"

32 "Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"

33 "po/git-cli/zh_Hant/>\n"

@@ -36,7 +36,7 @@ msgstr ""

36 "Content-Type: text/plain; charset=UTF-8\n"

37 "Content-Transfer-Encoding: 8bit\n"

38 "Plural-Forms: nplurals=1; plural=0;\n"

39 -"X-Generator: Poedit 3.3.2\n"

39 +"X-Generator: Poedit 3.4.1\n"

40 "X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"

41 "zhconvert.org\n"

42

@@ -924,14 +924,15 @@ msgstr "空白字元選項 “%s” 無法識別"

924 msgid "unrecognized whitespace ignore option '%s'"

925 msgstr "空白字元忽略選項 “%s” 無法識別"

926

927 -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c

928 -#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c

929 -#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c

930 -#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c

931 -#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c

932 -#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c

933 -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c

934 -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c

927 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c

928 +#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c

929 +#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c

930 +#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c

931 +#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c

932 +#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c

933 +#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c

934 +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c

935 +#: range-diff.c revision.c

936 #, c-format

937 msgid "options '%s' and '%s' cannot be used together"

938 msgstr "無法同時使用 “%s” 和 “%s” 選項"

@@ -1402,7 +1403,7 @@ msgid "%d line applied after fixing whitespace errors."

1403 msgid_plural "%d lines applied after fixing whitespace errors."

1404 msgstr[0] "修正空白誤用後，套用了 %d 列。"

1405

1405 -#: apply.c builtin/add.c builtin/mv.c builtin/rm.c

1406 +#: apply.c builtin/mv.c builtin/rm.c

1407 msgid "Unable to write new index file"

1408 msgstr "無法寫入新索引檔案"

1409

@@ -2106,8 +2107,8 @@ msgstr "“%s” 子模組：無法建立 “%s” 分支"

2107

2108 #: branch.c

2109 #, c-format

2109 -msgid "'%s' is already checked out at '%s'"

2110 -msgstr "“%s” 已在 “%s” 點簽出"

2110 +msgid "'%s' is already used by worktree at '%s'"

2111 +msgstr "“%s” 已被位於 “%s” 的工作區使用"

2112

2113 #: builtin/add.c

2114 msgid "git add [<options>] [--] <pathspec>..."

@@ -2130,30 +2131,26 @@ msgstr ""

2131 "add.interactive.useBuiltin 設定已被移除！\n"

2132 "深入了解請參閱 “git help config” 中的對應條目。"

2133

2133 -#: builtin/add.c builtin/rev-parse.c

2134 -msgid "Could not read the index"

2135 -msgstr "無法讀取索引"

2136 -

2134 #: builtin/add.c

2138 -msgid "Could not write patch"

2139 -msgstr "無法寫入修補檔"

2135 +msgid "could not read the index"

2136 +msgstr "無法讀取索引"

2137

2138 #: builtin/add.c

2139 msgid "editing patch failed"

2140 msgstr "編輯修補檔失敗"

2141

2145 -#: builtin/add.c

2142 +#: builtin/add.c read-cache.c

2143 #, c-format

2147 -msgid "Could not stat '%s'"

2148 -msgstr "不能對 “%s” 執行 stat"

2144 +msgid "could not stat '%s'"

2145 +msgstr "不能對 '%s' 呼叫 stat"

2146

2147 #: builtin/add.c

2151 -msgid "Empty patch. Aborted."

2152 -msgstr "修補檔空白。中止。"

2148 +msgid "empty patch. aborted"

2149 +msgstr "修補檔空白。中止"

2150

2151 #: builtin/add.c

2152 #, c-format

2156 -msgid "Could not apply '%s'"

2153 +msgid "could not apply '%s'"

2154 msgstr "無法套用 “%s”"

2155

2156 #: builtin/add.c

@@ -2315,6 +2312,11 @@ msgstr ""

2312 msgid "index file corrupt"

2313 msgstr "索引檔案損壞"

2314

2315 +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c

2316 +#: builtin/commit.c builtin/stash.c merge.c rerere.c

2317 +msgid "unable to write new index file"

2318 +msgstr "無法寫入新的索引檔案"

2319 +

2320 #: builtin/am.c builtin/mailinfo.c mailinfo.c

2321 #, c-format

2322 msgid "bad action '%s' for '%s'"

@@ -2565,11 +2567,6 @@ msgstr ""

2567 "您應該對已經解決衝突的每一個檔案執行 `git add`，標記為已經完成。\n"

2568 "你可以對「由他們刪除」的檔案，執行 `git rm` 指令。"

2569

2568 -#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c

2569 -#: rerere.c

2570 -msgid "unable to write new index file"

2571 -msgstr "無法寫入新的索引檔案"

2572 -

2570 #: builtin/am.c builtin/reset.c

2571 #, c-format

2572 msgid "Could not parse object '%s'."

@@ -2592,11 +2589,6 @@ msgstr ""

2589 msgid "failed to read '%s'"

2590 msgstr "無法讀取 “%s”"

2591

2595 -#: builtin/am.c

2596 -#, c-format

2597 -msgid "options '%s=%s' and '%s=%s' cannot be used together"

2598 -msgstr "“%s=%s” 和 “%s=%s” 選項不得同時使用"

2599 -

2592 #: builtin/am.c

2593 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"

2594 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"

@@ -2800,10 +2792,10 @@ msgstr "git archive：預期收到 flush 封包"

2792

2793 #: builtin/bisect.c

2794 msgid ""

2803 -"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"

2795 +"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"

2796 "checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"

2797 msgstr ""

2806 -"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"

2798 +"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"

2799 "checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"

2800

2801 #: builtin/bisect.c

@@ -2823,8 +2815,8 @@ msgid "git bisect replay <logfile>"

2815 msgstr "git bisect replay <logfile>"

2816

2817 #: builtin/bisect.c

2826 -msgid "git bisect run <cmd>..."

2827 -msgstr "git bisect run <cmd>..."

2818 +msgid "git bisect run <cmd> [<arg>...]"

2819 +msgstr "git bisect run <cmd> [<arg>...]"

2820

2821 #: builtin/bisect.c

2822 #, c-format

@@ -3343,37 +3335,37 @@ msgstr "git branch [<options>] [-r | -a] [--format]"

3335 #, c-format

3336 msgid ""

3337 "deleting branch '%s' that has been merged to\n"

3346 -" '%s', but not yet merged to HEAD."

3338 +" '%s', but not yet merged to HEAD"

3339 msgstr ""

3340 "將要刪除的 “%s” 分支已經被合併到\n"

3349 -" “%s”，但尚未合併到 HEAD。"

3341 +" “%s”，但尚未合併到 HEAD"

3342

3343 # 譯者：保持原換行格式，在輸出時 %s 的替代內容會讓字串變長

3344 #: builtin/branch.c

3345 #, c-format

3346 msgid ""

3347 "not deleting branch '%s' that is not yet merged to\n"

3356 -" '%s', even though it is merged to HEAD."

3348 +" '%s', even though it is merged to HEAD"

3349 msgstr ""

3350 "並未刪除分支 “%s”，雖然已經合併到 HEAD，\n"

3359 -" 卻尚未被合併至 “%s” 分支。"

3351 +" 卻尚未被合併至 “%s” 分支"

3352

3353 #: builtin/branch.c

3354 #, c-format

3363 -msgid "Couldn't look up commit object for '%s'"

3355 +msgid "couldn't look up commit object for '%s'"

3356 msgstr "無法查詢 “%s” 指向的提交物件"

3357

3358 #: builtin/branch.c

3359 #, c-format

3360 msgid ""

3369 -"The branch '%s' is not fully merged.\n"

3370 -"If you are sure you want to delete it, run 'git branch -D %s'."

3361 +"the branch '%s' is not fully merged.\n"

3362 +"If you are sure you want to delete it, run 'git branch -D %s'"

3363 msgstr ""

3364 "分支 “%s” 沒有完全合併。\n"

3373 -"如果確定要刪除它，請執行 “git branch -D %s”。"

3365 +"如果確定要刪除它，請執行 “git branch -D %s”"

3366

3367 #: builtin/branch.c

3376 -msgid "Update of config-file failed"

3368 +msgid "update of config-file failed"

3369 msgstr "更新組態檔案失敗"

3370

3371 #: builtin/branch.c

@@ -3382,13 +3374,13 @@ msgstr "不能將 -a 和 -d 同時使用"

3374

3375 #: builtin/branch.c

3376 #, c-format

3385 -msgid "Cannot delete branch '%s' checked out at '%s'"

3386 -msgstr "無法刪除在 “%2$s” 簽出的 “%1$s” 分支"

3377 +msgid "cannot delete branch '%s' used by worktree at '%s'"

3378 +msgstr "無法刪除被位於 “%2$s” 的工作區使用的 “%1$s” 分支"

3379

3380 #: builtin/branch.c

3381 #, c-format

3390 -msgid "remote-tracking branch '%s' not found."

3391 -msgstr "找不到 “%s” 遠端追蹤分支。"

3382 +msgid "remote-tracking branch '%s' not found"

3383 +msgstr "找不到 “%s” 遠端追蹤分支"

3384

3385 #: builtin/branch.c

3386 #, c-format

@@ -3401,8 +3393,8 @@ msgstr ""

3393

3394 #: builtin/branch.c

3395 #, c-format

3404 -msgid "branch '%s' not found."

3405 -msgstr "找不到 “%s” 分支。"

3396 +msgid "branch '%s' not found"

3397 +msgstr "找不到 “%s” 分支"

3398

3399 #: builtin/branch.c

3400 #, c-format

@@ -3429,12 +3421,12 @@ msgstr "HEAD 指針 (%s) 指向 refs/heads/ 之外"

3421

3422 #: builtin/branch.c

3423 #, c-format

3432 -msgid "Branch %s is being rebased at %s"

3424 +msgid "branch %s is being rebased at %s"

3425 msgstr "%s 分支正在重定基底至 %s"

3426

3427 #: builtin/branch.c

3428 #, c-format

3437 -msgid "Branch %s is being bisected at %s"

3429 +msgid "branch %s is being bisected at %s"

3430 msgstr "%s 分支正於 %s 進行二分搜尋"

3431

3432 #: builtin/branch.c

@@ -3444,48 +3436,48 @@ msgstr "%s 工作區的 HEAD 指針未被更新"

3436

3437 #: builtin/branch.c

3438 #, c-format

3447 -msgid "Invalid branch name: '%s'"

3439 +msgid "invalid branch name: '%s'"

3440 msgstr "分支名稱無效：“%s”"

3441

3442 #: builtin/branch.c

3443 #, c-format

3452 -msgid "No commit on branch '%s' yet."

3453 -msgstr "分支 “%s” 尚無提交。"

3444 +msgid "no commit on branch '%s' yet"

3445 +msgstr "分支 “%s” 尚無提交"

3446

3447 #: builtin/branch.c

3448 #, c-format

3457 -msgid "No branch named '%s'."

3458 -msgstr "沒有名為 “%s” 的分支。"

3449 +msgid "no branch named '%s'"

3450 +msgstr "沒有名為 “%s” 的分支"

3451

3452 #: builtin/branch.c

3461 -msgid "Branch rename failed"

3453 +msgid "branch rename failed"

3454 msgstr "分支重新命名失敗"

3455

3456 #: builtin/branch.c

3465 -msgid "Branch copy failed"

3457 +msgid "branch copy failed"

3458 msgstr "分支拷貝失敗"

3459

3460 #: builtin/branch.c

3461 #, c-format

3470 -msgid "Created a copy of a misnamed branch '%s'"

3462 +msgid "created a copy of a misnamed branch '%s'"

3463 msgstr "已為誤命名的 “%s” 分支建立拷貝"

3464

3465 #: builtin/branch.c

3466 #, c-format

3475 -msgid "Renamed a misnamed branch '%s' away"

3467 +msgid "renamed a misnamed branch '%s' away"

3468 msgstr "已更改誤命名的 “%s” 分支的名稱"

3469

3470 #: builtin/branch.c

3471 #, c-format

3480 -msgid "Branch renamed to %s, but HEAD is not updated!"

3481 -msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新！"

3472 +msgid "branch renamed to %s, but HEAD is not updated"

3473 +msgstr "分支已重新命名為 %s，但 HEAD 指針尚未更新"

3474

3475 #: builtin/branch.c

3484 -msgid "Branch is renamed, but update of config-file failed"

3476 +msgid "branch is renamed, but update of config-file failed"

3477 msgstr "分支已重新命名，但無法更新組態檔案"

3478

3479 #: builtin/branch.c

3488 -msgid "Branch is copied, but update of config-file failed"

3480 +msgid "branch is copied, but update of config-file failed"

3481 msgstr "分支已拷貝，但無法更新組態檔案"

3482

3483 #: builtin/branch.c

@@ -3636,9 +3628,9 @@ msgstr "在子模組中遞迴"

3628 msgid "format to use for the output"

3629 msgstr "輸出格式"

3630

3639 -#: builtin/branch.c builtin/submodule--helper.c submodule.c

3640 -msgid "Failed to resolve HEAD as a valid ref."

3641 -msgstr "無法將 HEAD 解析為有效引用。"

3631 +#: builtin/branch.c

3632 +msgid "failed to resolve HEAD as a valid ref"

3633 +msgstr "無法將 HEAD 解析為有效引用"

3634

3635 #: builtin/branch.c builtin/clone.c

3636 msgid "HEAD not found below refs/heads!"

@@ -3660,7 +3652,7 @@ msgid "branch name required"

3652 msgstr "必須提供分支名稱"

3653

3654 #: builtin/branch.c

3663 -msgid "Cannot give description to detached HEAD"

3655 +msgid "cannot give description to detached HEAD"

3656 msgstr "無法向分離 HEAD 指針提供描述"

3657

3658 #: builtin/branch.c

@@ -3668,12 +3660,12 @@ msgid "cannot edit description of more than one branch"

3660 msgstr "無法編輯超過一個分支的描述"

3661

3662 #: builtin/branch.c

3671 -msgid "cannot copy the current branch while not on any."

3672 -msgstr "不在任何分支上，無法拷貝目前分支。"

3663 +msgid "cannot copy the current branch while not on any"

3664 +msgstr "不在任何分支上，無法拷貝目前分支"

3665

3666 #: builtin/branch.c

3675 -msgid "cannot rename the current branch while not on any."

3676 -msgstr "不在任何分支上，無法重新命名目前分支。"

3667 +msgid "cannot rename the current branch while not on any"

3668 +msgstr "不在任何分支上，無法重新命名目前分支"

3669

3670 #: builtin/branch.c

3671 msgid "too many branches for a copy operation"

@@ -3690,8 +3682,8 @@ msgstr "要設定新上游的引數太多"

3682 #: builtin/branch.c

3683 #, c-format

3684 msgid ""

3693 -"could not set upstream of HEAD to %s when it does not point to any branch."

3694 -msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支。"

3685 +"could not set upstream of HEAD to %s when it does not point to any branch"

3686 +msgstr "無法將 HEAD 的上游設為 %s：其未指向任何分支"

3687

3688 #: builtin/branch.c

3689 #, c-format

@@ -3708,17 +3700,17 @@ msgid "too many arguments to unset upstream"

3700 msgstr "要取消設定上游的引數太多"

3701

3702 #: builtin/branch.c

3711 -msgid "could not unset upstream of HEAD when it does not point to any branch."

3712 -msgstr "無法取消設定 HEAD 的上游：其未指向任何分支。"

3703 +msgid "could not unset upstream of HEAD when it does not point to any branch"

3704 +msgstr "無法取消設定 HEAD 的上游：其未指向任何分支"

3705

3706 #: builtin/branch.c

3707 #, c-format

3716 -msgid "Branch '%s' has no upstream information"

3708 +msgid "branch '%s' has no upstream information"

3709 msgstr "分支 “%s” 沒有上游資訊"

3710

3711 #: builtin/branch.c

3712 msgid ""

3721 -"The -a, and -r, options to 'git branch' do not take a branch name.\n"

3713 +"the -a, and -r, options to 'git branch' do not take a branch name.\n"

3714 "Did you mean to use: -a|-r --list <pattern>?"

3715 msgstr ""

3716 "“git branch” 的 -a 和 -r 選項不取分支名稱。\n"

@@ -3727,9 +3719,8 @@ msgstr ""

3719 #: builtin/branch.c

3720 msgid ""

3721 "the '--set-upstream' option is no longer supported. Please use '--track' or "

3730 -"'--set-upstream-to' instead."

3731 -msgstr ""

3732 -"不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”。"

3722 +"'--set-upstream-to' instead"

3723 +msgstr "不再支援選項 “--set-upstream”。請改用 “--track” 或 “--set-upstream-to”"

3724

3725 #: builtin/bugreport.c

3726 msgid "git version:\n"

@@ -3812,6 +3803,11 @@ msgstr "指定臭蟲報告檔案的目的地"

3803 msgid "specify a strftime format suffix for the filename(s)"

3804 msgstr "指定用於檔名的 strftime 格式後綴"

3805

3806 +#: builtin/bugreport.c

3807 +#, c-format

3808 +msgid "unknown argument `%s'"

3809 +msgstr "未知引數 “%s”"

3810 +

3811 #: builtin/bugreport.c builtin/diagnose.c

3812 #, c-format

3813 msgid "could not create leading directories for '%s'"

@@ -3949,6 +3945,14 @@ msgstr "git cat-file (-e | -p) <object>"

3945 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"

3946 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <object>"

3947

3948 +#: builtin/cat-file.c

3949 +msgid ""

3950 +"git cat-file (--textconv | --filters)\n"

3951 +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"

3952 +msgstr ""

3953 +"git cat-file (--textconv | --filters)\n"

3954 +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"

3955 +

3956 #: builtin/cat-file.c

3957 msgid ""

3958 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"

@@ -3961,14 +3965,6 @@ msgstr ""

3965 " [--buffer] [--follow-symlinks] [--unordered]\n"

3966 " [--textconv | --filters] [-Z]"

3967

3964 -#: builtin/cat-file.c

3965 -msgid ""

3966 -"git cat-file (--textconv | --filters)\n"

3967 -" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"

3968 -msgstr ""

3969 -"git cat-file (--textconv | --filters)\n"

3970 -" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"

3971 -

3968 #: builtin/cat-file.c

3969 msgid "Check object existence or emit object contents"

3970 msgstr "檢查物件的存在狀態，或輸出物件內容"

@@ -4342,6 +4338,11 @@ msgstr "未指定 “%2$s” 時，必須使用 “%1$s”"

4338 msgid "'%s' or '%s' cannot be used with %s"

4339 msgstr "“%s” 或 “%s” 無法與 %s 一起使用"

4340

4341 +#: builtin/checkout.c

4342 +#, c-format

4343 +msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"

4344 +msgstr "“%s”、“%s” 或 “%s” 無法在簽出樹狀物件時使用"

4345 +

4346 #: builtin/checkout.c

4347 #, c-format

4348 msgid "path '%s' is unmerged"

@@ -5021,7 +5022,7 @@ msgstr "簽出 <branch> 而不是遠端 HEAD"

5022 msgid "path to git-upload-pack on the remote"

5023 msgstr "遠端 git-upload-pack 路徑"

5024

5024 -#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c

5025 +#: builtin/clone.c builtin/fetch.c builtin/pull.c

5026 msgid "depth"

5027 msgstr "depth"

5028

@@ -5401,6 +5402,11 @@ msgstr "如果提交圖形被分割，只驗證頭一個檔案"

5402 msgid "Could not open commit-graph '%s'"

5403 msgstr "無法開啟提交圖形 '%s'"

5404

5405 +#: builtin/commit-graph.c

5406 +#, c-format

5407 +msgid "could not open commit-graph chain '%s'"

5408 +msgstr "無法開啟提交圖鏈 “%s”"

5409 +

5410 #: builtin/commit-graph.c

5411 #, c-format

5412 msgid "unrecognized --split argument, %s"

@@ -5641,10 +5647,6 @@ msgstr "無法更新暫時索引"

5647 msgid "Failed to update main cache tree"

5648 msgstr "不能更新樹的主快取"

5649

5644 -#: builtin/commit.c

5645 -msgid "unable to write new_index file"

5646 -msgstr "無法寫 new_index 檔案"

5647 -

5650 #: builtin/commit.c

5651 msgid "cannot do a partial commit during a merge."

5652 msgstr "在合併過程中不能做部分提交。"

@@ -6139,11 +6141,11 @@ msgstr "提交說明內文空白，中止提交作業。\n"

6141 #: builtin/commit.c

6142 msgid ""

6143 "repository has been updated, but unable to write\n"

6142 -"new_index file. Check that disk is not full and quota is\n"

6144 +"new index file. Check that disk is not full and quota is\n"

6145 "not exceeded, and then \"git restore --staged :/\" to recover."

6146 msgstr ""

6145 -"版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n"

6146 -"磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。"

6147 +"版本庫已更新，但無法寫入新的索引檔案。請檢查磁碟是否\n"

6148 +"已滿或磁碟配額已耗盡，然後執行 “git restore --staged :/” 復原。"

6149

6150 #: builtin/config.c

6151 msgid "git config [<options>]"

@@ -7954,6 +7956,10 @@ msgstr "清除未引用的物件"

7956 msgid "pack unreferenced objects separately"

7957 msgstr "獨立封裝無引用物件"

7958

7959 +#: builtin/gc.c builtin/repack.c

7960 +msgid "with --cruft, limit the size of new cruft packs"

7961 +msgstr "搭配 --cruft，限制新廢棄封裝的大小"

7962 +

7963 #: builtin/gc.c

7964 msgid "be more thorough (increased runtime)"

7965 msgstr "更徹底（增加執行時間）"

@@ -8168,14 +8174,6 @@ msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"

8174 msgid "'crontab' died"

8175 msgstr "“crontab” 結束運作"

8176

8171 -#: builtin/gc.c

8172 -msgid "failed to start systemctl"

8173 -msgstr "無法啟動 systemctl"

8174 -

8175 -#: builtin/gc.c

8176 -msgid "failed to run systemctl"

8177 -msgstr "無法執行 systemctl"

8178 -

8177 #: builtin/gc.c builtin/worktree.c

8178 #, c-format

8179 msgid "failed to delete '%s'"

@@ -8186,6 +8184,14 @@ msgstr "刪除 '%s' 失敗"

8184 msgid "failed to flush '%s'"

8185 msgstr "排清 '%s' 失敗"

8186

8187 +#: builtin/gc.c

8188 +msgid "failed to start systemctl"

8189 +msgstr "無法啟動 systemctl"

8190 +

8191 +#: builtin/gc.c

8192 +msgid "failed to run systemctl"

8193 +msgstr "無法執行 systemctl"

8194 +

8195 #: builtin/gc.c

8196 #, c-format

8197 msgid "unrecognized --scheduler argument '%s'"

@@ -8216,6 +8222,10 @@ msgstr "scheduler"

8222 msgid "scheduler to trigger git maintenance run"

8223 msgstr "要觸發 git maintenance run 的排程器"

8224

8225 +#: builtin/gc.c

8226 +msgid "failed to set up maintenance schedule"

8227 +msgstr "無法設定維護排程"

8228 +

8229 #: builtin/gc.c

8230 msgid "failed to add repo to global config"

8231 msgstr "無法將版本庫加至全域設定"

@@ -8312,8 +8322,8 @@ msgid "search in subdirectories (default)"

8322 msgstr "在子目錄中尋找（預設值）"

8323

8324 #: builtin/grep.c

8315 -msgid "descend at most <depth> levels"

8316 -msgstr "最多以指定的深度向下尋找"

8325 +msgid "descend at most <n> levels"

8326 +msgstr "最多向下尋找 <n> 層"

8327

8328 #: builtin/grep.c

8329 msgid "use extended POSIX regular expressions"

@@ -9009,11 +9019,11 @@ msgstr "--separate-git-dir 與純版本庫不相容"

9019 #: builtin/interpret-trailers.c

9020 msgid ""

9021 "git interpret-trailers [--in-place] [--trim-empty]\n"

9012 -" [(--trailer <token>[(=|:)<value>])...]\n"

9022 +" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"

9023 " [--parse] [<file>...]"

9024 msgstr ""

9025 "git interpret-trailers [--in-place] [--trim-empty]\n"

9016 -" [(--trailer <token>[(=|:)<value>])...]\n"

9026 +" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"

9027 " [--parse] [<file>...]"

9028

9029 #: builtin/interpret-trailers.c

@@ -9024,6 +9034,10 @@ msgstr "在原位編輯檔案"

9034 msgid "trim empty trailers"

9035 msgstr "刪除空的尾部署名"

9036

9037 +#: builtin/interpret-trailers.c

9038 +msgid "placement"

9039 +msgstr "placement"

9040 +

9041 #: builtin/interpret-trailers.c

9042 msgid "where to place the new trailer"

9043 msgstr "在哪裡放置新的尾部署名"

@@ -9041,20 +9055,20 @@ msgid "output only the trailers"

9055 msgstr "只輸出尾部署名"

9056

9057 #: builtin/interpret-trailers.c

9044 -msgid "do not apply config rules"

9045 -msgstr "不要套用組態設定規則"

9058 +msgid "do not apply trailer.* configuration variables"

9059 +msgstr "不套用 trailer.* 組態變數"

9060

9061 #: builtin/interpret-trailers.c

9048 -msgid "join whitespace-continued values"

9049 -msgstr "連線空白折行的值"

9062 +msgid "reformat multiline trailer values as single-line values"

9063 +msgstr "將多列尾注值 (trailer values) 重新格式化為單列值"

9064

9065 #: builtin/interpret-trailers.c

9052 -msgid "set parsing options"

9053 -msgstr "設定解析選項"

9066 +msgid "alias for --only-trailers --only-input --unfold"

9067 +msgstr "--only-trailers --only-input --unfold 的別名"

9068

9069 #: builtin/interpret-trailers.c

9056 -msgid "do not treat --- specially"

9057 -msgstr "不要對 --- 特殊處理"

9070 +msgid "do not treat \"---\" as the end of input"

9071 +msgstr "不要把 “---” 當作輸入結尾"

9072

9073 #: builtin/interpret-trailers.c

9074 msgid "trailer(s) to add"

@@ -9166,6 +9180,11 @@ msgstr "只需要一個範圍"

9180 msgid "not a range"

9181 msgstr "不是一個範圍"

9182

9183 +#: builtin/log.c

9184 +#, c-format

9185 +msgid "unable to read branch description file '%s'"

9186 +msgstr "無法讀取分支描述檔 “%s”"

9187 +

9188 #: builtin/log.c

9189 msgid "cover letter needs email format"

9190 msgstr "附函需要信件位址格式"

@@ -9292,6 +9311,10 @@ msgstr "從描述產生附函的模式"

9311 msgid "generate parts of a cover letter based on a branch's description"

9312 msgstr "基於分支描述產生部分附函"

9313

9314 +#: builtin/log.c

9315 +msgid "use branch description from file"

9316 +msgstr "從檔案讀取分支描述並使用"

9317 +

9318 #: builtin/log.c

9319 msgid "use [<prefix>] instead of [PATCH]"

9320 msgstr "使用 [<前綴>] 代替 [PATCH]"

@@ -9849,6 +9872,10 @@ msgstr ""

9872 msgid "send results to standard output"

9873 msgstr "將結果傳送到標準輸出"

9874

9875 +#: builtin/merge-file.c

9876 +msgid "use object IDs instead of filenames"

9877 +msgstr "使用物件 ID 取代檔名"

9878 +

9879 #: builtin/merge-file.c

9880 msgid "use a diff3 based merge"

9881 msgstr "使用基於 diff3 的合併"

@@ -9881,6 +9908,15 @@ msgstr "不要警告衝突"

9908 msgid "set labels for file1/orig-file/file2"

9909 msgstr "為檔案1/初始檔案/檔案2 設定標籤"

9910

9911 +#: builtin/merge-file.c

9912 +#, c-format

9913 +msgid "object '%s' does not exist"

9914 +msgstr "物件 “%s” 不存在"

9915 +

9916 +#: builtin/merge-file.c

9917 +msgid "Could not write object file"

9918 +msgstr "無法寫入物件檔案"

9919 +

9920 #: builtin/merge-recursive.c

9921 #, c-format

9922 msgid "unknown option %s"

@@ -9959,10 +9995,23 @@ msgstr "執行多次合併，一次執行輸入一列"

9995 msgid "specify a merge-base for the merge"

9996 msgstr "指定用來合併的合併基底"

9997

9998 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c

9999 +msgid "option=value"

10000 +msgstr "option=value"

10001 +

10002 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c

10003 +msgid "option for selected merge strategy"

10004 +msgstr "所選的合併策略的選項"

10005 +

10006 #: builtin/merge-tree.c

10007 msgid "--trivial-merge is incompatible with all other options"

10008 msgstr "--trivial-merge 和其他所有選項都不相容"

10009

10010 +#: builtin/merge-tree.c builtin/merge.c

10011 +#, c-format

10012 +msgid "unknown strategy option: -X%s"

10013 +msgstr "未知的策略選項：-X%s"

10014 +

10015 #: builtin/merge-tree.c

10016 msgid "--merge-base is incompatible with --stdin"

10017 msgstr "--merge-base 與 --stdin 不相容"

@@ -10054,14 +10103,6 @@ msgstr "策略"

10103 msgid "merge strategy to use"

10104 msgstr "要使用的合併策略"

10105

10057 -#: builtin/merge.c builtin/pull.c

10058 -msgid "option=value"

10059 -msgstr "option=value"

10060 -

10061 -#: builtin/merge.c builtin/pull.c

10062 -msgid "option for selected merge strategy"

10063 -msgstr "所選的合併策略的選項"

10064 -

10106 #: builtin/merge.c

10107 msgid "merge commit message (for a non-fast-forward merge)"

10108 msgstr "合併的提交說明（針對非快轉式合併）"

@@ -10141,11 +10182,6 @@ msgstr "不能寫入索引。"

10182 msgid "Not handling anything other than two heads merge."

10183 msgstr "未處理兩個頭合併之外的任何動作。"

10184

10144 -#: builtin/merge.c

10145 -#, c-format

10146 -msgid "unknown strategy option: -X%s"

10147 -msgstr "未知的策略選項：-X%s"

10148 -

10185 #: builtin/merge.c t/helper/test-fast-rebase.c

10186 #, c-format

10187 msgid "unable to write %s"

@@ -10504,8 +10540,8 @@ msgid "can not move directory into itself"

10540 msgstr "不能將目錄移動到自身"

10541

10542 #: builtin/mv.c

10507 -msgid "cannot move directory over file"

10508 -msgstr "不能將目錄移動到檔案"

10543 +msgid "destination already exists"

10544 +msgstr "目的地已存在"

10545

10546 #: builtin/mv.c

10547 msgid "source directory is empty"

@@ -11432,10 +11468,6 @@ msgstr "最小的包檔案大小是 1 MiB"

11468 msgid "--thin cannot be used to build an indexable pack"

11469 msgstr "--thin 不能用於建立一個可索引包"

11470

11435 -#: builtin/pack-objects.c

11436 -msgid "cannot use --filter without --stdout"

11437 -msgstr "不能在沒有 --stdout 的情況下使用 --filter"

11438 -

11471 #: builtin/pack-objects.c

11472 msgid "cannot use --filter with --stdin-packs"

11473 msgstr "無法將 --filter 及 --stdin-packs 結合使用"

@@ -11452,10 +11484,6 @@ msgstr "無法透過 --cruft 使用內部修訂清單"

11484 msgid "cannot use --stdin-packs with --cruft"

11485 msgstr "無法將 --stdin-packs 與 --cruft 組合使用"

11486

11455 -#: builtin/pack-objects.c

11456 -msgid "cannot use --max-pack-size with --cruft"

11457 -msgstr "無法將 --max-pack-size 與 --cruft 組合使用"

11458 -

11487 #: builtin/pack-objects.c

11488 msgid "Enumerating objects"

11489 msgstr "枚舉物件"

@@ -12590,10 +12618,6 @@ msgstr ""

12618 msgid "switch `C' expects a numerical value"

12619 msgstr "開關 `C' 期望一個數字值"

12620

12593 -#: builtin/rebase.c

12594 -msgid "--strategy requires --merge or --interactive"

12595 -msgstr "--strategy 需要 --merge 或 --interactive"

12596 -

12621 #: builtin/rebase.c

12622 msgid ""

12623 "apply options are incompatible with rebase.autoSquash. Consider adding --no-"

@@ -13441,6 +13465,11 @@ msgstr "無法關閉 refs 的快照暫存檔"

13465 msgid "could not remove stale bitmap: %s"

13466 msgstr "無法移除過時位圖：%s"

13467

13468 +#: builtin/repack.c

13469 +#, c-format

13470 +msgid "pack prefix %s does not begin with objdir %s"

13471 +msgstr "封包前綴 %s 不以 objdir %s 開頭"

13472 +

13473 #: builtin/repack.c

13474 msgid "pack everything in a single pack"

13475 msgstr "所有內容打包到一個包檔案中"

@@ -13541,18 +13570,22 @@ msgstr "寫入結果包的多包索引"

13570 msgid "pack prefix to store a pack containing pruned objects"

13571 msgstr "封裝前綴，儲存為包含過時物件的套件包"

13572

13573 +#: builtin/repack.c

13574 +msgid "pack prefix to store a pack containing filtered out objects"

13575 +msgstr "將前綴進行包裝，儲存為包含已過濾物件的封裝"

13576 +

13577 #: builtin/repack.c

13578 msgid "cannot delete packs in a precious-objects repo"

13579 msgstr "不能刪除珍品版本庫中的封包"

13580

13581 #: builtin/repack.c

13549 -msgid "Nothing new to pack."

13550 -msgstr "沒有新的要打包。"

13582 +#, c-format

13583 +msgid "option '%s' can only be used along with '%s'"

13584 +msgstr "“%s” 選項只能與 “%s” 一起使用"

13585

13586 #: builtin/repack.c

13553 -#, c-format

13554 -msgid "pack prefix %s does not begin with objdir %s"

13555 -msgstr "封包前綴 %s 不以 objdir %s 開頭"

13587 +msgid "Nothing new to pack."

13588 +msgstr "沒有新的要打包。"

13589

13590 #: builtin/repack.c

13591 #, c-format

@@ -14083,6 +14116,10 @@ msgstr "--exclude-hidden 無法與 --remotes 同時使用"

14116 msgid "this operation must be run in a work tree"

14117 msgstr "該動作必須在一個工作區中執行"

14118

14119 +#: builtin/rev-parse.c

14120 +msgid "Could not read the index"

14121 +msgstr "無法讀取索引"

14122 +

14123 #: builtin/rev-parse.c

14124 #, c-format

14125 msgid "unknown mode for --show-object-format: %s"

@@ -14503,18 +14540,40 @@ msgstr "未知的雜湊算法"

14540

14541 #: builtin/show-ref.c

14542 msgid ""

14506 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"

14543 +"git show-ref [--head] [-d | --dereference]\n"

14544 " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14545 " [--heads] [--] [<pattern>...]"

14546 msgstr ""

14510 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"

14547 +"git show-ref [--head] [-d | --dereference]\n"

14548 " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"

14549 " [--heads] [--] [<pattern>...]"

14550

14551 +#: builtin/show-ref.c

14552 +msgid ""

14553 +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"

14554 +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"

14555 +" [--] [<ref>...]"

14556 +msgstr ""

14557 +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"

14558 +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"

14559 +" [--] [<ref>...]"

14560 +

14561 #: builtin/show-ref.c

14562 msgid "git show-ref --exclude-existing[=<pattern>]"

14563 msgstr "git show-ref --exclude-existing[=<模式>]"

14564

14565 +#: builtin/show-ref.c

14566 +msgid "git show-ref --exists <ref>"

14567 +msgstr "git show-ref --exists <ref>"

14568 +

14569 +#: builtin/show-ref.c

14570 +msgid "reference does not exist"

14571 +msgstr "引用不存在"

14572 +

14573 +#: builtin/show-ref.c

14574 +msgid "failed to look up reference"

14575 +msgstr "無法查詢引用"

14576 +

14577 #: builtin/show-ref.c

14578 msgid "only show tags (can be combined with heads)"

14579 msgstr "只顯示標籤（可以和頭共用）"

@@ -14523,6 +14582,10 @@ msgstr "只顯示標籤（可以和頭共用）"

14582 msgid "only show heads (can be combined with tags)"

14583 msgstr "只顯示頭（可以和標籤共用）"

14584

14585 +#: builtin/show-ref.c

14586 +msgid "check for reference existence without resolving"

14587 +msgstr "檢查引用是否存在但不解析"

14588 +

14589 #: builtin/show-ref.c

14590 msgid "stricter reference checking, requires exact ref path"

14591 msgstr "更嚴格的引用檢測，需要精確的引用路徑"

@@ -14547,6 +14610,11 @@ msgstr "不列印結果到標準輸出（例如與 --verify 參數共用）"

14610 msgid "show refs from stdin that aren't in local repository"

14611 msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"

14612

14613 +#: builtin/show-ref.c

14614 +#, c-format

14615 +msgid "only one of '%s', '%s' or '%s' can be given"

14616 +msgstr "只能傳入 “%s”、“%s” 或 “%s”"

14617 +

14618 #: builtin/sparse-checkout.c

14619 msgid ""

@@ -15511,6 +15579,10 @@ msgstr ""

15579 "shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] "

15580 "[--] [<path>...]"

15581

15582 +#: builtin/submodule--helper.c submodule.c

15583 +msgid "Failed to resolve HEAD as a valid ref."

15584 +msgstr "無法將 HEAD 解析為有效引用。"

15585 +

15586 #: builtin/submodule--helper.c

15587 msgid "git submodule absorbgitdirs [<options>] [<path>...]"

15588 msgstr "git submodule absorbgitdirs [<options>] [<path>...]"

@@ -16086,6 +16158,10 @@ msgstr "(for porcelains) 忘記儲存的未解決的衝突"

16158 msgid "write index in this format"

16159 msgstr "以這種格式寫入索引區"

16160

16161 +#: builtin/update-index.c

16162 +msgid "report on-disk index format version"

16163 +msgstr "回報磁碟上索引格式的版本"

16164 +

16165 #: builtin/update-index.c

16166 msgid "enable or disable split index"

16167 msgstr "啟用或停用索引分割"

@@ -16118,6 +16194,16 @@ msgstr "標記檔案為 fsmonitor 有效"

16194 msgid "clear fsmonitor valid bit"

16195 msgstr "清除 fsmonitor 有效位"

16196

16197 +#: builtin/update-index.c

16198 +#, c-format

16199 +msgid "%d\n"

16200 +msgstr "%d\n"

16201 +

16202 +#: builtin/update-index.c

16203 +#, c-format

16204 +msgid "index-version: was %d, set to %d"

16205 +msgstr "index-version：曾是 %d，已設為 %d"

16206 +

16207 #: builtin/update-index.c

16208 msgid ""

16209 "core.splitIndex is set to false; remove or change it, if you really want to "

@@ -16434,7 +16520,7 @@ msgstr ""

16520 #: builtin/worktree.c

16521 msgid ""

16522 "No local or remote refs exist despite at least one remote\n"

16437 -"present, stopping; use 'add -f' to overide or fetch a remote first"

16523 +"present, stopping; use 'add -f' to override or fetch a remote first"

16524 msgstr ""

16525 "即使有提供一個遠端，卻不存在本機或遠端引用，\n"

16526 "故停止。使用 “add -f” 先覆蓋或抓取遠端"

@@ -16826,6 +16912,11 @@ msgstr "index-pack 終止"

16912 msgid "terminating chunk id appears earlier than expected"

16913 msgstr "終止區塊 id 出現的時間早於預期"

16914

16915 +#: chunk-format.c

16916 +#, c-format

16917 +msgid "chunk id %<PRIx32> not %d-byte aligned"

16918 +msgstr "區塊 ID %<PRIx32> 沒有以 %d 位元組為單位對齊"

16919 +

16920 #: chunk-format.c

16921 #, c-format

16922 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

@@ -16895,8 +16986,8 @@ msgid "Move objects and refs by archive"

16986 msgstr "透過歸檔移動物件和引用"

16987

16988 #: command-list.h

16898 -msgid "Provide content or type and size information for repository objects"

16899 -msgstr "提供版本庫物件的內容、類型或大小"

16989 +msgid "Provide contents or details of repository objects"

16990 +msgstr "提供版本庫物件的內容或詳細資訊"

16991

16992 #: command-list.h

16993 msgid "Display gitattributes information"

@@ -17437,7 +17528,7 @@ msgid "Display version information about Git"

17528 msgstr "顯示 Git 的版本資訊"

17529

17530 #: command-list.h

17440 -msgid "Show logs with difference each commit introduces"

17531 +msgid "Show logs with differences each commit introduces"

17532 msgstr "顯示每一個提交引入的差異日誌"

17533

17534 #: command-list.h

@@ -17616,6 +17707,10 @@ msgstr "commit-graph 檔案不夠放置 %u 個區塊"

17707 msgid "commit-graph has no base graphs chunk"

17708 msgstr "提交圖形沒有基礎圖形區塊"

17709

17710 +#: commit-graph.c

17711 +msgid "commit-graph base graphs chunk is too small"

17712 +msgstr "提交圖形的基礎圖形區塊過小"

17713 +

17714 #: commit-graph.c

17715 msgid "commit-graph chain does not match"

17716 msgstr "提交圖形鏈不符合"

@@ -17647,6 +17742,10 @@ msgstr "無法找到提交 %s"

17742 msgid "commit-graph requires overflow generation data but has none"

17743 msgstr "提交圖需要比目前更多的世代資料，但沒有相關資料"

17744

17745 +#: commit-graph.c

17746 +msgid "commit-graph overflow generation data is too small"

17747 +msgstr "提交圖形的溢出世代資料過小"

17748 +

17749 #: commit-graph.c

17750 msgid "Loading known commits in commit graph"

17751 msgstr "正在載入提交圖中的已知提交"

@@ -17800,18 +17899,6 @@ msgstr "%s 的提交圖形父提交是 %s != %s"

17899 msgid "commit-graph parent list for commit %s terminates early"

17900 msgstr "提交 %s 的提交圖形父提交列表過早終止"

17901

17803 -#: commit-graph.c

17804 -#, c-format

17805 -msgid ""

17806 -"commit-graph has generation number zero for commit %s, but non-zero elsewhere"

17807 -msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"

17808 -

17809 -#: commit-graph.c

17810 -#, c-format

17811 -msgid ""

17812 -"commit-graph has non-zero generation number for commit %s, but zero elsewhere"

17813 -msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"

17814 -

17902 #: commit-graph.c

17903 #, c-format

17904 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

@@ -17822,6 +17909,13 @@ msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"

17909 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

17910 msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"

17911

17912 +#: commit-graph.c

17913 +#, c-format

17914 +msgid ""

17915 +"commit-graph has both zero and non-zero generations (e.g., commits '%s' and "

17916 +"'%s')"

17917 +msgstr "提交圖形中包含 0 和非 0 兩個世代號（例如 “%s” 和 “%s” 提交）"

17918 +

17919 #: commit-graph.c

17920 msgid "Verifying commits in commit graph"

17921 msgstr "正在驗證提交圖中的提交"

@@ -17851,6 +17945,11 @@ msgstr ""

17945 "設定 \"git config advice.graftFileDeprecated false\"\n"

17946 "可關閉本消息"

17947

17948 +#: commit.c

17949 +#, c-format

17950 +msgid "commit %s exists in commit-graph but not in the object database"

17951 +msgstr "%s 提交在提交圖形中，但不在物件資料庫中"

17952 +

17953 #: commit.c

17954 #, c-format

17955 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

@@ -18394,11 +18493,6 @@ msgstr "引用 '%s' 沒有指向一個資料物件"

18493 msgid "unable to resolve config blob '%s'"

18494 msgstr "不能解析設定物件 '%s'"

18495

18397 -#: config.c

18398 -#, c-format

18399 -msgid "failed to parse %s"

18400 -msgstr "解析 %s 失敗"

18401 -

18496 #: config.c

18497 msgid "unable to parse command-line config"

18498 msgstr "無法解析命令列中的設定"

@@ -18956,10 +19050,6 @@ msgstr "無法寫入封存"

19050 msgid "--merge-base does not work with ranges"

19051 msgstr "--merge-base 跟範圍無法搭配運作"

19052

18959 -#: diff-lib.c

18960 -msgid "--merge-base only works with commits"

18961 -msgstr "--merge-base 只能跟提交搭配才能運作"

18962 -

19053 #: diff-lib.c

19054 msgid "unable to get HEAD"

19055 msgstr "不能取得 HEAD"

@@ -20679,13 +20769,13 @@ msgstr ""

20769 "%s"

20770

20771 #: merge-ort.c merge-recursive.c

20682 -msgid "Failed to execute internal merge"

20772 +msgid "failed to execute internal merge"

20773 msgstr "無法執行內部合併"

20774

20775 #: merge-ort.c merge-recursive.c

20776 #, c-format

20687 -msgid "Unable to add %s to database"

20688 -msgstr "不能新增 %s 至物件庫"

20777 +msgid "unable to add %s to database"

20778 +msgstr "無法將 %s 加進資料庫"

20779

20780 #: merge-ort.c merge-recursive.c

20781 #, c-format

@@ -21184,6 +21274,14 @@ msgstr "讀取快取失敗"

21274 msgid "multi-pack-index OID fanout is of the wrong size"

21275 msgstr "多包索引的物件 ID fanout 大小錯誤"

21276

21277 +#: midx.c

21278 +msgid "multi-pack-index OID lookup chunk is the wrong size"

21279 +msgstr "多包索引 OID 查詢區塊的大小有誤"

21280 +

21281 +#: midx.c

21282 +msgid "multi-pack-index object offset chunk is the wrong size"

21283 +msgstr "多包索引的物件偏移區塊大小有誤"

21284 +

21285 #: midx.c

21286 #, c-format

21287 msgid "multi-pack-index file %s is too small"

@@ -21205,20 +21303,24 @@ msgid "multi-pack-index hash version %u does not match version %u"

21303 msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"

21304

21305 #: midx.c

21208 -msgid "multi-pack-index missing required pack-name chunk"

21209 -msgstr "多包索引缺少必需的包名區塊"

21306 +msgid "multi-pack-index required pack-name chunk missing or corrupted"

21307 +msgstr "多包索引所需的封裝名稱區塊不存在或損壞"

21308

21309 #: midx.c

21212 -msgid "multi-pack-index missing required OID fanout chunk"

21213 -msgstr "多包索引缺少必需的物件 ID fanout 區塊"

21310 +msgid "multi-pack-index required OID fanout chunk missing or corrupted"

21311 +msgstr "多包索引所需的 OID fanout 區塊不存在或損壞"

21312

21313 #: midx.c

21216 -msgid "multi-pack-index missing required OID lookup chunk"

21217 -msgstr "多包索引缺少必需的物件 ID 查詢區塊"

21314 +msgid "multi-pack-index required OID lookup chunk missing or corrupted"

21315 +msgstr "多包索引所需的 OID 查詢區塊不存在或損壞"

21316

21317 #: midx.c

21220 -msgid "multi-pack-index missing required object offsets chunk"

21221 -msgstr "多包索引缺少必需的物件位移區塊"

21318 +msgid "multi-pack-index required object offsets chunk missing or corrupted"

21319 +msgstr "多包索引所需的物件偏移區塊不存在或損壞"

21320 +

21321 +#: midx.c

21322 +msgid "multi-pack-index pack-name chunk is too short"

21323 +msgstr "多包索引的封裝名稱區塊過短"

21324

21325 #: midx.c

21326 #, c-format

@@ -21234,6 +21336,10 @@ msgstr "錯的 pack-int-id：%u（共有 %u 個包）"

21336 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

21337 msgstr "多包索引儲存一個64位位移，但是 off_t 太小"

21338

21339 +#: midx.c

21340 +msgid "multi-pack-index large offset out of bounds"

21341 +msgstr "多包索引的最大偏移超出邊界"

21342 +

21343 #: midx.c

21344 #, c-format

21345 msgid "failed to add packfile '%s'"

@@ -22103,6 +22209,10 @@ msgstr "無效的總和檢查碼"

22209 msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"

22210 msgstr "%<PRIu64> 位置的修訂版索引 (rev-index) 無效：%<PRIu32> != %<PRIu32>"

22211

22212 +#: pack-revindex.c

22213 +msgid "multi-pack-index reverse-index chunk is the wrong size"

22214 +msgstr "多包索引的反向索引區塊大小有誤"

22215 +

22216 #: pack-write.c

22217 msgid "cannot both write and verify reverse index"

22218 msgstr "無法同時寫入和驗證倒排索引"

@@ -22166,16 +22276,6 @@ msgstr "選項「%s」期望「%s」或「%s」"

22276 msgid "%s requires a value"

22277 msgstr "%s 需要一個值"

22278

22169 -#: parse-options.c

22170 -#, c-format

22171 -msgid "%s is incompatible with %s"

22172 -msgstr "%s 與 %s 不相容"

22173 -

22174 -#: parse-options.c

22175 -#, c-format

22176 -msgid "%s : incompatible with something else"

22177 -msgstr "%s：和其它的不相容"

22178 -

22279 #: parse-options.c

22280 #, c-format

22281 msgid "%s takes no value"

@@ -22191,6 +22291,11 @@ msgstr "%s 不可用"

22291 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"

22292 msgstr "%s 期望一個非負整數和一個可選的 k/m/g 後綴"

22293

22294 +#: parse-options.c

22295 +#, c-format

22296 +msgid "%s is incompatible with %s"

22297 +msgstr "%s 與 %s 不相容"

22298 +

22299 #: parse-options.c

22300 #, c-format

22301 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

@@ -22276,6 +22381,11 @@ msgstr " %s"

22381 msgid "-NUM"

22382 msgstr "-數字"

22383

22384 +#: parse-options.c

22385 +#, c-format

22386 +msgid "opposite of --no-%s"

22387 +msgstr "--no-%s 的相反行為"

22388 +

22389 #: parse-options.h

22390 msgid "expiry-date"

22391 msgstr "到期時間"

@@ -22313,6 +22423,16 @@ msgid ""

22423 "with --pathspec-from-file, pathspec elements are separated with NUL character"

22424 msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"

22425

22426 +#: parse.c

22427 +#, c-format

22428 +msgid "bad boolean environment value '%s' for '%s'"

22429 +msgstr "「%2$s」的「%1$s」布林環境值無效"

22430 +

22431 +#: parse.c

22432 +#, c-format

22433 +msgid "failed to parse %s"

22434 +msgstr "解析 %s 失敗"

22435 +

22436 #: path.c

22437 #, c-format

22438 msgid "Could not make %s writable by group"

@@ -22369,6 +22489,11 @@ msgstr "路徑規格 '%2$s' 中包含未實現的神奇前綴 '%1$c'"

22489 msgid "%s: 'literal' and 'glob' are incompatible"

22490 msgstr "%s：'literal' 和 'glob' 不相容"

22491

22492 +#: pathspec.c

22493 +#, c-format

22494 +msgid "'%s' is outside the directory tree"

22495 +msgstr "“%s” 在目錄樹之外"

22496 +

22497 #: pathspec.c

22498 #, c-format

22499 msgid "%s: '%s' is outside repository at '%s'"

@@ -22699,11 +22824,6 @@ msgstr "無法寫入稀疏索引的索引分割"

22824 msgid "failed to convert to a sparse-index"

22825 msgstr "無法轉換成稀疏索引"

22826

22702 -#: read-cache.c

22703 -#, c-format

22704 -msgid "could not stat '%s'"

22705 -msgstr "不能對 '%s' 呼叫 stat"

22706 -

22827 #: read-cache.c

22828 #, c-format

22829 msgid "unable to open git dir: %s"

@@ -23928,8 +24048,16 @@ msgid "only download metadata for the branch that will be checked out"

24048 msgstr "只下載會簽出的分支中介資料"

24049

24050 #: scalar.c

23931 -msgid "scalar clone [<options>] [--] <repo> [<dir>]"

23932 -msgstr "scalar clone [<options>] [--] <repo> [<dir>]"

24051 +msgid "create repository within 'src' directory"

24052 +msgstr "在 “src” 目錄建立版本庫"

24053 +

24054 +#: scalar.c

24055 +msgid ""

24056 +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"

24057 +"\t[--[no-]src] <url> [<enlistment>]"

24058 +msgstr ""

24059 +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"

24060 +"\t[--[no-]src] <url> [<enlistment>]"

24061

24062 #: scalar.c

24063 #, c-format

@@ -23995,13 +24123,32 @@ msgstr "無法移除過時的 scalar.repo “%s”"

24123

24124 #: scalar.c

24125 #, c-format

23998 -msgid "removing stale scalar.repo '%s'"

23999 -msgstr "正在移除過時的 scalar.repo “%s”"

24126 +msgid "removed stale scalar.repo '%s'"

24127 +msgstr "已移除過時的 scalar.repo “%s”"

24128 +

24129 +#: scalar.c

24130 +#, c-format

24131 +msgid "repository at '%s' has different owner"

24132 +msgstr "位於 “%s” 的版本庫有不同的擁有者"

24133 +

24134 +#: scalar.c

24135 +#, c-format

24136 +msgid "repository at '%s' has a format issue"

24137 +msgstr "位於 “%s” 的版本庫有格式問題"

24138 +

24139 +#: scalar.c

24140 +#, c-format

24141 +msgid "repository not found in '%s'"

24142 +msgstr "版本庫不在 “%s”"

24143

24144 #: scalar.c

24145 #, c-format

24003 -msgid "git repository gone in '%s'"

24004 -msgstr "git 版本庫在「%s」遺失"

24146 +msgid ""

24147 +"to unregister this repository from Scalar, run\n"

24148 +"\tgit config --global --unset --fixed-value scalar.repo \"%s\""

24149 +msgstr ""

24150 +"如果要從 Scalar 解除這個版本庫的註冊，請執行\n"

24151 +"\tgit config --global --unset --fixed-value scalar.repo \"%s\""

24152

24153 #: scalar.c

24154 msgid ""

@@ -24480,11 +24627,6 @@ msgstr "不能得到 %s 的提交說明"

24627 msgid "%s: cannot parse parent commit %s"

24628 msgstr "%s：不能解析父提交 %s"

24629

24483 -#: sequencer.c

24484 -#, c-format

24485 -msgid "could not rename '%s' to '%s'"

24486 -msgstr "不能將 '%s' 重新命名為 '%s'"

24487 -

24630 #: sequencer.c

24631 #, c-format

24632 msgid "could not revert %s... %s"

@@ -24917,13 +25059,13 @@ msgstr ""

25059

25060 #: sequencer.c

25061 #, c-format

24920 -msgid "Rebasing (%d/%d)%s"

24921 -msgstr "正在重定基底 (%d/%d)%s"

25062 +msgid "Stopped at %s... %.*s\n"

25063 +msgstr "停止在 %s... %.*s\n"

25064

25065 #: sequencer.c

25066 #, c-format

24925 -msgid "Stopped at %s... %.*s\n"

24926 -msgstr "停止在 %s... %.*s\n"

25067 +msgid "Rebasing (%d/%d)%s"

25068 +msgstr "正在重定基底 (%d/%d)%s"

25069

25070 #: sequencer.c

25071 #, c-format

@@ -26475,6 +26617,10 @@ msgstr "不能存取 '%s'"

26617 msgid "unable to get current working directory"

26618 msgstr "不能取得目前工作目錄"

26619

26620 +#: wrapper.c

26621 +msgid "unable to get random bytes"

26622 +msgstr "無法取得隨機位元組"

26623 +

26624 #: wt-status.c

26625 msgid "Unmerged paths:"

26626 msgstr "未合併的路徑："

@@ -27263,13 +27409,13 @@ msgstr ""

27409

27410 #: git-send-email.perl

27411 #, perl-format

27266 -msgid "Failed to open %s: %s"

27267 -msgstr "無法開啟 %s: %s"

27412 +msgid "Failed to open %s.final: %s"

27413 +msgstr "無法開啟 %s.final: %s"

27414

27415 #: git-send-email.perl

27416 #, perl-format

27271 -msgid "Failed to open %s.final: %s"

27272 -msgstr "無法開啟 %s.final: %s"

27417 +msgid "Failed to open %s: %s"

27418 +msgstr "無法開啟 %s: %s"

27419

27420 #: git-send-email.perl

27421 msgid "Summary email is empty, skipping it\n"

@@ -27503,517 +27649,3 @@ msgstr "略過 %s 含備份後綴 '%s'。\n"

27649 #, perl-format

27650 msgid "Do you really want to send %s? [y|N]: "

27651 msgstr "您真的要傳送 %s？[y|N]： "

27506 -

27507 -#, c-format

27508 -#~ msgid "It is not possible to %s because you have unmerged files."

27509 -#~ msgstr "無法 %s，有未合併的檔案。"

27510 -

27511 -#~ msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

27512 -#~ msgstr "不向 git-mailsplit 傳入 --keep-cr 標記，無視 am.keepcr 的設定"

27513 -

27514 -#~ msgid ""

27515 -#~ "Updates were rejected because the tip of the remote-tracking\n"

27516 -#~ "branch has been updated since the last checkout. You may want\n"

27517 -#~ "to integrate those changes locally (e.g., 'git pull ...')\n"

27518 -#~ "before forcing an update.\n"

27519 -#~ msgstr ""

27520 -#~ "更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"

27521 -#~ "您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"

27522 -#~ "最後才強制更新。\n"

27523 -

27524 -#~ msgid "or do not fetch any tag at all (--no-tags)"

27525 -#~ msgstr "或不抓取任何標籤（--no-tags）"

27526 -

27527 -#~ msgid "current working directory is untracked"

27528 -#~ msgstr "尚未追蹤目前的工作目錄"

27529 -

27530 -#~ msgid "cannot use --contents with final commit object name"

27531 -#~ msgstr "無法將 --contents 與最終的提交物件名稱共用"

27532 -

27533 -#~ msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"

27534 -#~ msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"

27535 -

27536 -#~ msgid "won't bisect on cg-seek'ed tree"

27537 -#~ msgstr "不會在做了 cg-seek 的樹狀物件上進行二分搜尋"

27538 -

27539 -#~ msgid "--bisect-terms requires 0 or 1 argument"

27540 -#~ msgstr "--bisect-terms 需要 0 或 1 個引數"

27541 -

27542 -#~ msgid "--bisect-next requires 0 arguments"

27543 -#~ msgstr "--bisect-next 需要 0 個引數"

27544 -

27545 -#~ msgid "--bisect-log requires 0 arguments"

27546 -#~ msgstr "--bisect-log 需要 0 個引數"

27547 -

27548 -#~ msgid "git env--helper --type=[bool|ulong] <options> <env-var>"

27549 -#~ msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"

27550 -

27551 -#~ msgid "default for git_env_*(...) to fall back on"

27552 -#~ msgstr "git_env_*(...) 的預設值"

27553 -

27554 -#~ msgid "be quiet only use git_env_*() value as exit code"

27555 -#~ msgstr "安靜模式，只使用 git_env_*() 的值作為離開碼"

27556 -

27557 -#, c-format

27558 -#~ msgid ""

27559 -#~ "option `--default' expects a boolean value with `--type=bool`, not `%s`"

27560 -#~ msgstr "選項「--default」預期收到「--type=bool」的布林值，而非「%s」"

27561 -

27562 -#, c-format

27563 -#~ msgid ""

27564 -#~ "option `--default' expects an unsigned long value with `--type=ulong`, "

27565 -#~ "not `%s`"

27566 -#~ msgstr ""

27567 -#~ "選項「--default」預期收到「--type=ulong」的無號 long 數值，而非「%s」"

27568 -

27569 -#~ msgid "please commit or stash them."

27570 -#~ msgstr "請提交或貯存它們。"

27571 -

27572 -#, c-format

27573 -#~ msgid "Unknown mode: %s"

27574 -#~ msgstr "未知模式：%s"

27575 -

27576 -#, c-format

27577 -#~ msgid "%s doesn't support --super-prefix"

27578 -#~ msgstr "%s 不支援 --super-prefix"

27579 -

27580 -#, c-format

27581 -#~ msgid "no prefix given for --super-prefix\n"

27582 -#~ msgstr "沒有為 --super-prefix 提供前綴\n"

27583 -

27584 -#, c-format

27585 -#~ msgid "failed to read object %s"

27586 -#~ msgstr "讀取物件 %s 失敗"

27587 -

27588 -#~ msgid "file write error"

27589 -#~ msgstr "檔案寫錯誤"

27590 -

27591 -#~ msgid "corrupt commit"

27592 -#~ msgstr "損壞的提交"

27593 -

27594 -#~ msgid "corrupt tag"

27595 -#~ msgstr "損壞的標籤"

27596 -

27597 -#, c-format

27598 -#~ msgid "%%(objecttype) does not take arguments"

27599 -#~ msgstr "%%(objecttype) 不帶參數"

27600 -

27601 -#, c-format

27602 -#~ msgid "%%(deltabase) does not take arguments"

27603 -#~ msgstr "%%(deltabase) 不帶參數"

27604 -

27605 -#, c-format

27606 -#~ msgid "%%(body) does not take arguments"

27607 -#~ msgstr "%%(body) 不帶參數"

27608 -

27609 -#, c-format

27610 -#~ msgid "unrecognized email option: %s"

27611 -#~ msgstr "無法識別的 email 選項：%s"

27612 -

27613 -#~ msgid "could not lock HEAD"

27614 -#~ msgstr "不能鎖定 HEAD"

27615 -

27616 -#, c-format

27617 -#~ msgid ""

27618 -#~ "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

27619 -#~ "may speed it up, but you have to be careful not to forget to add\n"

27620 -#~ "new files yourself (see 'git help status')."

27621 -#~ msgstr ""

27622 -#~ "耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"

27623 -#~ "但您需要小心不要忘了新增新檔案（參見 'git help status'）。"

27624 -

27625 -#, perl-format

27626 -#~ msgid "%12s %12s %s"

27627 -#~ msgstr "%12s %12s %s"

27628 -

27629 -#, perl-format

27630 -#~ msgid "touched %d path\n"

27631 -#~ msgid_plural "touched %d paths\n"

27632 -#~ msgstr[0] "建立了 %d 個路徑\n"

27633 -

27634 -#~ msgid ""

27635 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

27636 -#~ "marked for staging."

27637 -#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為暫存。"

27638 -

27639 -#~ msgid ""

27640 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

27641 -#~ "marked for stashing."

27642 -#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為貯存。"

27643 -

27644 -#~ msgid ""

27645 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

27646 -#~ "marked for unstaging."

27647 -#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為未暫存。"

27648 -

27649 -#~ msgid ""

27650 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

27651 -#~ "marked for applying."

27652 -#~ msgstr "如果修補檔能完全套用，編輯區塊將立即標記為套用。"

27653 -

27654 -#~ msgid ""

27655 -#~ "If the patch applies cleanly, the edited hunk will immediately be\n"

27656 -#~ "marked for discarding."

27657 -#~ msgstr "如果修補檔能完全套用，編輯塊將立即標記為捨棄。"

27658 -

27659 -#, perl-format

27660 -#~ msgid "failed to open hunk edit file for writing: %s"

27661 -#~ msgstr "為寫入開啟區塊編輯檔案失敗：%s"

27662 -

27663 -#, perl-format

27664 -#~ msgid ""

27665 -#~ "---\n"

27666 -#~ "To remove '%s' lines, make them ' ' lines (context).\n"

27667 -#~ "To remove '%s' lines, delete them.\n"

27668 -#~ "Lines starting with %s will be removed.\n"

27669 -#~ msgstr ""

27670 -#~ "---\n"

27671 -#~ "要刪除 '%s' 開始的行，使其成為 ' ' 開始的行（上下文）。\n"

27672 -#~ "要刪除 '%s' 開始的行，刪除它們。\n"

27673 -#~ "以 %s 開始的行將被刪除。\n"

27674 -

27675 -#, perl-format

27676 -#~ msgid "failed to open hunk edit file for reading: %s"

27677 -#~ msgstr "無法讀取區塊編輯檔案：%s"

27678 -

27679 -#~ msgid ""

27680 -#~ "y - stage this hunk\n"

27681 -#~ "n - do not stage this hunk\n"

27682 -#~ "q - quit; do not stage this hunk or any of the remaining ones\n"

27683 -#~ "a - stage this hunk and all later hunks in the file\n"

27684 -#~ "d - do not stage this hunk or any of the later hunks in the file"

27685 -#~ msgstr ""

27686 -#~ "y - 暫存此區塊\n"

27687 -#~ "n - 不要暫存此區塊\n"

27688 -#~ "q - 離開。不暫存此區塊及後面的全部區塊\n"

27689 -#~ "a - 暫存此區塊和本檔案中後面的全部區塊\n"

27690 -#~ "d - 不暫存此區塊和本檔案中後面的全部區塊"

27691 -

27692 -#~ msgid ""

27693 -#~ "y - stash this hunk\n"

27694 -#~ "n - do not stash this hunk\n"

27695 -#~ "q - quit; do not stash this hunk or any of the remaining ones\n"

27696 -#~ "a - stash this hunk and all later hunks in the file\n"

27697 -#~ "d - do not stash this hunk or any of the later hunks in the file"

27698 -#~ msgstr ""

27699 -#~ "y - 貯存此區塊\n"

27700 -#~ "n - 不要貯存此區塊\n"

27701 -#~ "q - 離開。不貯存此區塊及後面的全部區塊\n"

27702 -#~ "a - 貯存此區塊和本檔案中後面的全部區塊\n"

27703 -#~ "d - 不貯存此區塊和本檔案中後面的全部區塊"

27704 -

27705 -#~ msgid ""

27706 -#~ "y - unstage this hunk\n"

27707 -#~ "n - do not unstage this hunk\n"

27708 -#~ "q - quit; do not unstage this hunk or any of the remaining ones\n"

27709 -#~ "a - unstage this hunk and all later hunks in the file\n"

27710 -#~ "d - do not unstage this hunk or any of the later hunks in the file"

27711 -#~ msgstr ""

27712 -#~ "y - 不暫存此區塊\n"

27713 -#~ "n - 不要不暫存此區塊\n"

27714 -#~ "q - 離開。不要不暫存此區塊及後面的全部區塊\n"

27715 -#~ "a - 不暫存此區塊和本檔案中後面的全部區塊\n"

27716 -#~ "d - 不要不暫存此區塊和本檔案中後面的全部區塊"

27717 -

27718 -#~ msgid ""

27719 -#~ "y - apply this hunk to index\n"

27720 -#~ "n - do not apply this hunk to index\n"

27721 -#~ "q - quit; do not apply this hunk or any of the remaining ones\n"

27722 -#~ "a - apply this hunk and all later hunks in the file\n"

27723 -#~ "d - do not apply this hunk or any of the later hunks in the file"

27724 -#~ msgstr ""

27725 -#~ "y - 在索引中套用此區塊\n"

27726 -#~ "n - 不要在索引中套用此區塊\n"

27727 -#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"

27728 -#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"

27729 -#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"

27730 -

27731 -#~ msgid ""

27732 -#~ "y - discard this hunk from worktree\n"

27733 -#~ "n - do not discard this hunk from worktree\n"

27734 -#~ "q - quit; do not discard this hunk or any of the remaining ones\n"

27735 -#~ "a - discard this hunk and all later hunks in the file\n"

27736 -#~ "d - do not discard this hunk or any of the later hunks in the file"

27737 -#~ msgstr ""

27738 -#~ "y - 在工作區中捨棄此區塊\n"

27739 -#~ "n - 不要在工作區中捨棄此區塊\n"

27740 -#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"

27741 -#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

27742 -#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"

27743 -

27744 -#~ msgid ""

27745 -#~ "y - discard this hunk from index and worktree\n"

27746 -#~ "n - do not discard this hunk from index and worktree\n"

27747 -#~ "q - quit; do not discard this hunk or any of the remaining ones\n"

27748 -#~ "a - discard this hunk and all later hunks in the file\n"

27749 -#~ "d - do not discard this hunk or any of the later hunks in the file"

27750 -#~ msgstr ""

27751 -#~ "y - 在索引和工作區中捨棄此區塊\n"

27752 -#~ "n - 不要在索引和工作區中捨棄此區塊\n"

27753 -#~ "q - 離開。不要捨棄此區塊及後面的全部區塊\n"

27754 -#~ "a - 捨棄此區塊和本檔案中後面的全部區塊\n"

27755 -#~ "d - 不要捨棄此區塊和本檔案中後面的全部區塊"

27756 -

27757 -#~ msgid ""

27758 -#~ "y - apply this hunk to index and worktree\n"

27759 -#~ "n - do not apply this hunk to index and worktree\n"

27760 -#~ "q - quit; do not apply this hunk or any of the remaining ones\n"

27761 -#~ "a - apply this hunk and all later hunks in the file\n"

27762 -#~ "d - do not apply this hunk or any of the later hunks in the file"

27763 -#~ msgstr ""

27764 -#~ "y - 在索引和工作區中套用此區塊\n"

27765 -#~ "n - 不要在索引和工作區中套用此區塊\n"

27766 -#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"

27767 -#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"

27768 -#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"

27769 -

27770 -#~ msgid ""

27771 -#~ "y - apply this hunk to worktree\n"

27772 -#~ "n - do not apply this hunk to worktree\n"

27773 -#~ "q - quit; do not apply this hunk or any of the remaining ones\n"

27774 -#~ "a - apply this hunk and all later hunks in the file\n"

27775 -#~ "d - do not apply this hunk or any of the later hunks in the file"

27776 -#~ msgstr ""

27777 -#~ "y - 在工作區中套用此區塊\n"

27778 -#~ "n - 不要在工作區中套用此區塊\n"

27779 -#~ "q - 離開。不要套用此區塊及後面的全部區塊\n"

27780 -#~ "a - 套用此區塊和本檔案中後面的全部區塊\n"

27781 -#~ "d - 不要套用此區塊和本檔案中後面的全部區塊"

27782 -

27783 -#~ msgid ""

27784 -#~ "g - select a hunk to go to\n"

27785 -#~ "/ - search for a hunk matching the given regex\n"

27786 -#~ "j - leave this hunk undecided, see next undecided hunk\n"

27787 -#~ "J - leave this hunk undecided, see next hunk\n"

27788 -#~ "k - leave this hunk undecided, see previous undecided hunk\n"

27789 -#~ "K - leave this hunk undecided, see previous hunk\n"

27790 -#~ "s - split the current hunk into smaller hunks\n"

27791 -#~ "e - manually edit the current hunk\n"

27792 -#~ "? - print help\n"

27793 -#~ msgstr ""

27794 -#~ "g - 選擇跳轉到一個區塊\n"

27795 -#~ "/ - 尋找和提供常規表示式符合的區塊\n"

27796 -#~ "j - 維持此區塊未決狀態，檢視下一個未決定區塊\n"

27797 -#~ "J - 維持此區塊未決狀態，檢視下一個區塊\n"

27798 -#~ "k - 維持此區塊未決狀態，檢視上一個未決定區塊\n"

27799 -#~ "K - 維持此區塊未決狀態，檢視上一個區塊\n"

27800 -#~ "s - 分割目前區塊為更小的區塊\n"

27801 -#~ "e - 手動編輯目前區塊\n"

27802 -#~ "? - 顯示說明\n"

27803 -

27804 -#~ msgid "The selected hunks do not apply to the index!\n"

27805 -#~ msgstr "選取區塊不能套用到索引！\n"

27806 -

27807 -#, perl-format

27808 -#~ msgid "ignoring unmerged: %s\n"

27809 -#~ msgstr "忽略未套用的：%s\n"

27810 -

27811 -#~ msgid "No other hunks to goto\n"

27812 -#~ msgstr "沒有其它可供跳轉的區塊\n"

27813 -

27814 -#, perl-format

27815 -#~ msgid "Invalid number: '%s'\n"

27816 -#~ msgstr "無效數字：'%s'\n"

27817 -

27818 -#, perl-format

27819 -#~ msgid "Sorry, only %d hunk available.\n"

27820 -#~ msgid_plural "Sorry, only %d hunks available.\n"

27821 -#~ msgstr[0] "對不起，只有 %d 個可用區塊。\n"

27822 -

27823 -#~ msgid "No other hunks to search\n"

27824 -#~ msgstr "沒有其它可供尋找的區塊\n"

27825 -

27826 -#, perl-format

27827 -#~ msgid "Malformed search regexp %s: %s\n"

27828 -#~ msgstr "錯誤的常規表示式 %s：%s\n"

27829 -

27830 -#~ msgid "No hunk matches the given pattern\n"

27831 -#~ msgstr "沒有和提供模式相符合的區塊\n"

27832 -

27833 -#~ msgid "No previous hunk\n"

27834 -#~ msgstr "沒有上一個區塊\n"

27835 -

27836 -#~ msgid "No next hunk\n"

27837 -#~ msgstr "沒有下一個區塊\n"

27838 -

27839 -#~ msgid "Sorry, cannot split this hunk\n"

27840 -#~ msgstr "對不起，不能分割這個區塊\n"

27841 -

27842 -#, perl-format

27843 -#~ msgid "Split into %d hunk.\n"

27844 -#~ msgid_plural "Split into %d hunks.\n"

27845 -#~ msgstr[0] "分割為 %d 塊。\n"

27846 -

27847 -#~ msgid "Sorry, cannot edit this hunk\n"

27848 -#~ msgstr "對不起，不能編輯這個區塊\n"

27849 -

27850 -#~ msgid ""

27851 -#~ "status - show paths with changes\n"

27852 -#~ "update - add working tree state to the staged set of changes\n"

27853 -#~ "revert - revert staged set of changes back to the HEAD version\n"

27854 -#~ "patch - pick hunks and update selectively\n"

27855 -#~ "diff - view diff between HEAD and index\n"

27856 -#~ "add untracked - add contents of untracked files to the staged set of "

27857 -#~ "changes\n"

27858 -#~ msgstr ""

27859 -#~ "status - 顯示含變更的路徑\n"

27860 -#~ "update - 新增工作區狀態至暫存列表\n"

27861 -#~ "revert - 還原修改的暫存集至 HEAD 版本\n"

27862 -#~ "patch - 挑選區塊並且有選擇地更新\n"

27863 -#~ "diff - 顯示 HEAD 和索引間差異\n"

27864 -#~ "add untracked - 新增未追蹤檔案的內容至暫存列表\n"

27865 -

27866 -#~ msgid "missing --"

27867 -#~ msgstr "缺少 --"

27868 -

27869 -#, perl-format

27870 -#~ msgid "unknown --patch mode: %s"

27871 -#~ msgstr "未知的 --patch 模式：%s"

27872 -

27873 -#, perl-format

27874 -#~ msgid "invalid argument %s, expecting --"

27875 -#~ msgstr "無效的參數 %s，期望是 --"

27876 -

27877 -#, c-format

27878 -#~ msgid "unable to normalize object directory: %s"

27879 -#~ msgstr "無法規範化物件目錄: %s"

27880 -

27881 -#~ msgid "reset the bisection state"

27882 -#~ msgstr "清除二分搜尋狀態"

27883 -

27884 -#~ msgid "check whether bad or good terms exist"

27885 -#~ msgstr "檢查壞的或好的術語是否存在"

27886 -

27887 -#~ msgid "print out the bisect terms"

27888 -#~ msgstr "列印二分搜尋術語"

27889 -

27890 -#~ msgid "start the bisect session"

27891 -#~ msgstr "啟動二分搜尋過程"

27892 -

27893 -#~ msgid "find the next bisection commit"

27894 -#~ msgstr "尋找下一個二分搜尋提交"

27895 -

27896 -#~ msgid "mark the state of ref (or refs)"

27897 -#~ msgstr "標記 ref (或 refs) 的狀態"

27898 -

27899 -#~ msgid "list the bisection steps so far"

27900 -#~ msgstr "列出迄今的二分搜尋步驟"

27901 -

27902 -#~ msgid "replay the bisection process from the given file"

27903 -#~ msgstr "從指定檔案重放二分搜尋過程"

27904 -

27905 -#~ msgid "skip some commits for checkout"

27906 -#~ msgstr "略過要簽出的部分提交"

27907 -

27908 -#~ msgid "visualize the bisection"

27909 -#~ msgstr "視覺化二分搜尋過程"

27910 -

27911 -#~ msgid "use <cmd>... to automatically bisect"

27912 -#~ msgstr "使用 <cmd>... 自動進行二分搜尋"

27913 -

27914 -#~ msgid "no log for BISECT_WRITE"

27915 -#~ msgstr "BISECT_WRITE 無日誌"

27916 -

27917 -#~ msgid "Couldn't look up commit object for HEAD"

27918 -#~ msgstr "無法查詢 HEAD 指向的提交物件"

27919 -

27920 -#~ msgid "git bundle create [<options>] <file> <git-rev-list args>"

27921 -#~ msgstr "git bundle create [<選項>] <檔案> <git-rev-list 參數>"

27922 -

27923 -#, c-format

27924 -#~ msgid "options '%s' and '%s %s' cannot be used together"

27925 -#~ msgstr "「%s」和「%s %s」選項不得同時使用"

27926 -

27927 -#~ msgid "git commit [<options>] [--] <pathspec>..."

27928 -#~ msgstr "git commit [<選項>] [--] <路徑規格>..."

27929 -

27930 -#~ msgid "git fsck [<options>] [<object>...]"

27931 -#~ msgstr "git fsck [<選項>] [<物件>...]"

27932 -

27933 -#~ msgid "git fsmonitor--daemon stop"

27934 -#~ msgstr "git fsmonitor--daemon stop"

27935 -

27936 -#~ msgid "git fsmonitor--daemon status"

27937 -#~ msgstr "git fsmonitor--daemon status"

27938 -

27939 -#~ msgid "failed to run 'git config'"

27940 -#~ msgstr "無法執行 ‘git config’"

27941 -

27942 -#, c-format

27943 -#~ msgid "could not get 'onto': '%s'"

27944 -#~ msgstr "無法取得 'onto'：'%s'"

27945 -

27946 -#~ msgid "Could not resolve HEAD to a revision"

27947 -#~ msgstr "無法將 HEAD 解析為一個版本"

27948 -

27949 -#, c-format

27950 -#~ msgid "missing required file: %s"

27951 -#~ msgstr "缺少必要檔案：%s"

27952 -

27953 -#~ msgid "git revert [<options>] <commit-ish>..."

27954 -#~ msgstr "git revert [<選項>] <提交號>..."

27955 -

27956 -#~ msgid "git revert <subcommand>"

27957 -#~ msgstr "git revert <子指令>"

27958 -

27959 -#~ msgid "git cherry-pick [<options>] <commit-ish>..."

27960 -#~ msgstr "git cherry-pick [<選項>] <提交號>..."

27961 -

27962 -#~ msgid "git cherry-pick <subcommand>"

27963 -#~ msgstr "git cherry-pick <子指令>"

27964 -

27965 -#~ msgid "git rm [<options>] [--] <file>..."

27966 -#~ msgstr "git rm [<選項>] [--] <檔案>..."

27967 -

27968 -#~ msgid "using --group=trailer with stdin is not supported"

27969 -#~ msgstr "不支援在標準輸入使用 --group=trailer"

27970 -

27971 -#~ msgid "git stash show [<options>] [<stash>]"

27972 -#~ msgstr "git stash show [<選項>] [<stash>]"

27973 -

27974 -#~ msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

27975 -#~ msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"

27976 -

27977 -#~ msgid ""

27978 -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

27979 -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"

27980 -#~ " [--] [<pathspec>...]]"

27981 -#~ msgstr ""

27982 -#~ "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

27983 -#~ " [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"

27984 -#~ " [--] [<路徑規格>...]]"

27985 -

27986 -#~ msgid ""

27987 -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

27988 -#~ " [-u|--include-untracked] [-a|--all] [<message>]"

27989 -#~ msgstr ""

27990 -#~ "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"

27991 -#~ " [-u|--include-untracked] [-a|--all] [<消息>]"

27992 -

27993 -#~ msgid "path into the working tree"

27994 -#~ msgstr "到工作區的路徑"

27995 -

27996 -#~ msgid "recurse into submodules"

27997 -#~ msgstr "在子模組中遞迴"

27998 -

27999 -#~ msgid "check if it is safe to write to the .gitmodules file"

28000 -#~ msgstr "檢查寫入 .gitmodules 檔案是否安全"

28001 -

28002 -#~ msgid "unset the config in the .gitmodules file"

28003 -#~ msgstr "取消 .gitmodules 檔案中的設定"

28004 -

28005 -#~ msgid "git submodule--helper config --unset <name>"

28006 -#~ msgstr "git submodule--helper config --unset <名稱>"

28007 -

28008 -#, c-format

28009 -#~ msgid "'%s' is not a valid submodule--helper subcommand"

28010 -#~ msgstr "'%s' 不是一個有效的 submodule--helper 子指令"

28011 -

28012 -#~ msgid "git upload-pack [<options>] <dir>"

28013 -#~ msgstr "git upload-pack [<選項>] <目錄>"

28014 -

28015 -#~ msgid "git worktree add [<options>] <path> [<commit-ish>]"

28016 -#~ msgstr "git worktree add [<選項>] <路徑> [<提交>]"

28017 -

28018 -#~ msgid "git worktree lock [<options>] <path>"

28019 -#~ msgstr "git worktree lock [<選項>] <路徑>"

l10n: zh-TW: Git 2.43.0-rc1