@matheusbsbs / matheus-bagliano / commits / 64294acb07

l10n: zh_CN: for git 2.43.0-rc1

Signed-off-by: Teng Long <dyroneteng@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Teng Long committed Nov 10, 2023 at 17:17 UTC 64294acb073c6724ab9c050ca6f0ef5213e6109c
1 file changed +373 -229
po/zh_CN.po
+373 -229
@@ -151,8 +151,8 @@ msgid ""
151 msgstr ""
152 "Project-Id-Version: Git\n"
153 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
154 -"POT-Creation-Date: 2023-08-18 10:21+0800\n"
155 -"PO-Revision-Date: 2023-08-18 19:29+0800\n"
154 +"POT-Creation-Date: 2023-11-10 10:49+0800\n"
155 +"PO-Revision-Date: 2023-11-10 17:13+0800\n"
156 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
157 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
158 "Language: zh_CN\n"
@@ -1045,14 +1045,15 @@ msgstr "未能识别的空白字符选项 '%s'"
1045 msgid "unrecognized whitespace ignore option '%s'"
1046 msgstr "未能识别的空白字符忽略选项 '%s'"
1047
1048 -#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c
1049 -#: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c
1050 -#: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c
1051 -#: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c
1052 -#: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c
1053 -#: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c
1054 -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
1055 -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
1048 +#: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
1049 +#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c
1050 +#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c
1051 +#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c
1052 +#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c
1053 +#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c
1054 +#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c
1055 +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
1056 +#: range-diff.c revision.c
1057 #, c-format
1058 msgid "options '%s' and '%s' cannot be used together"
1059 msgstr "选项 '%s' 和 '%s' 不能同时使用"
@@ -1529,7 +1530,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."
1530 msgstr[0] "修复空白错误后，应用了 %d 行。"
1531 msgstr[1] "修复空白错误后，应用了 %d 行。"
1532
1532 -#: apply.c builtin/add.c builtin/mv.c builtin/rm.c
1533 +#: apply.c builtin/mv.c builtin/rm.c
1534 msgid "Unable to write new index file"
1535 msgstr "无法写入新索引文件"
1536
@@ -2234,8 +2235,8 @@ msgstr "子模组 '%s'：不能创建分支 '%s'"
2235
2236 #: branch.c
2237 #, c-format
2237 -msgid "'%s' is already checked out at '%s'"
2238 -msgstr "'%s' 已经检出到 '%s'"
2238 +msgid "'%s' is already used by worktree at '%s'"
2239 +msgstr "'%s' 已经被工作区 '%s' 使用"
2240
2241 #: builtin/add.c
2242 msgid "git add [<options>] [--] <pathspec>..."
@@ -2258,30 +2259,26 @@ msgstr ""
2259 "设置 add.interactive.useBuiltin 已经被移除！\n"
2260 "查看 'git help config' 中的相关条目以获取更多信息。"
2261
2261 -#: builtin/add.c builtin/rev-parse.c
2262 -msgid "Could not read the index"
2263 -msgstr "不能读取索引"
2264 -
2262 #: builtin/add.c
2266 -msgid "Could not write patch"
2267 -msgstr "不能生成补丁"
2263 +msgid "could not read the index"
2264 +msgstr "不能读取索引"
2265
2266 #: builtin/add.c
2267 msgid "editing patch failed"
2268 msgstr "编辑补丁失败"
2269
2273 -#: builtin/add.c
2270 +#: builtin/add.c read-cache.c
2271 #, c-format
2275 -msgid "Could not stat '%s'"
2272 +msgid "could not stat '%s'"
2273 msgstr "不能对 '%s' 调用 stat"
2274
2275 #: builtin/add.c
2279 -msgid "Empty patch. Aborted."
2280 -msgstr "空补丁。异常终止。"
2276 +msgid "empty patch. aborted"
2277 +msgstr "空补丁。异常终止"
2278
2279 #: builtin/add.c
2280 #, c-format
2284 -msgid "Could not apply '%s'"
2281 +msgid "could not apply '%s'"
2282 msgstr "不能应用 '%s'"
2283
2284 #: builtin/add.c
@@ -2440,6 +2437,11 @@ msgstr ""
2437 msgid "index file corrupt"
2438 msgstr "索引文件损坏"
2439
2440 +#: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c
2441 +#: builtin/commit.c builtin/stash.c merge.c rerere.c
2442 +msgid "unable to write new index file"
2443 +msgstr "无法写新的索引文件"
2444 +
2445 #: builtin/am.c builtin/mailinfo.c mailinfo.c
2446 #, c-format
2447 msgid "bad action '%s' for '%s'"
@@ -2689,11 +2691,6 @@ msgstr ""
2691 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
2692 "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
2693
2692 -#: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c
2693 -#: rerere.c
2694 -msgid "unable to write new index file"
2695 -msgstr "无法写新的索引文件"
2696 -
2694 #: builtin/am.c builtin/reset.c
2695 #, c-format
2696 msgid "Could not parse object '%s'."
@@ -2714,11 +2711,6 @@ msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_H
2711 msgid "failed to read '%s'"
2712 msgstr "无法读取 '%s'"
2713
2717 -#: builtin/am.c
2718 -#, c-format
2719 -msgid "options '%s=%s' and '%s=%s' cannot be used together"
2720 -msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用"
2721 -
2714 #: builtin/am.c
2715 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
2716 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
@@ -2922,11 +2914,9 @@ msgstr "git archive：应有一个 flush 包"
2914
2915 #: builtin/bisect.c
2916 msgid ""
2925 -"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
2917 +"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
2918 "checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2927 -msgstr ""
2928 -"git bisect start [--term-{new,bad}=<术语> --term-{old,good}=<术语>] [--no-"
2929 -"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
2919 +msgstr "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
2920
2921 #: builtin/bisect.c
2922 msgid "git bisect (good|bad) [<rev>...]"
@@ -2945,8 +2935,8 @@ msgid "git bisect replay <logfile>"
2935 msgstr "git bisect replay <日志文件>"
2936
2937 #: builtin/bisect.c
2948 -msgid "git bisect run <cmd>..."
2949 -msgstr "git bisect run <命令>..."
2938 +msgid "git bisect run <cmd> [<arg>...]"
2939 +msgstr "git bisect run <命令> [<参数>...]"
2940
2941 #: builtin/bisect.c
2942 #, c-format
@@ -3461,37 +3451,37 @@ msgstr "git branch [<选项>] [-r | -a] [--format]"
3451 #, c-format
3452 msgid ""
3453 "deleting branch '%s' that has been merged to\n"
3464 -" '%s', but not yet merged to HEAD."
3454 +" '%s', but not yet merged to HEAD"
3455 msgstr ""
3456 "将要删除的分支 '%s' 已经被合并到\n"
3467 -" '%s'，但未合并到 HEAD。"
3457 +" '%s'，但未合并到 HEAD"
3458
3459 # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
3460 #: builtin/branch.c
3461 #, c-format
3462 msgid ""
3463 "not deleting branch '%s' that is not yet merged to\n"
3474 -" '%s', even though it is merged to HEAD."
3464 +" '%s', even though it is merged to HEAD"
3465 msgstr ""
3476 -"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
3477 -" 然而却尚未被合并到分支 '%s' 。"
3466 +"并未删除分支 '%s'，虽然它已经合并到 HEAD，\n"
3467 +" 然而却尚未被合并到分支 '%s'"
3468
3469 #: builtin/branch.c
3470 #, c-format
3481 -msgid "Couldn't look up commit object for '%s'"
3471 +msgid "couldn't look up commit object for '%s'"
3472 msgstr "无法查询 '%s' 指向的提交对象"
3473
3474 #: builtin/branch.c
3475 #, c-format
3476 msgid ""
3487 -"The branch '%s' is not fully merged.\n"
3488 -"If you are sure you want to delete it, run 'git branch -D %s'."
3477 +"the branch '%s' is not fully merged.\n"
3478 +"If you are sure you want to delete it, run 'git branch -D %s'"
3479 msgstr ""
3480 "分支 '%s' 没有完全合并。\n"
3491 -"如果您确认要删除它，执行 'git branch -D %s'。"
3481 +"如果您确认要删除它，执行 'git branch -D %s'"
3482
3483 #: builtin/branch.c
3494 -msgid "Update of config-file failed"
3484 +msgid "update of config-file failed"
3485 msgstr "更新配置文件失败"
3486
3487 #: builtin/branch.c
@@ -3500,13 +3490,13 @@ msgstr "不能将 -a 和 -d 同时使用"
3490
3491 #: builtin/branch.c
3492 #, c-format
3503 -msgid "Cannot delete branch '%s' checked out at '%s'"
3504 -msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
3493 +msgid "cannot delete branch '%s' used by worktree at '%s'"
3494 +msgstr "无法强制更新被工作区 '%2$s' 所使用的分支 '%1$s'"
3495
3496 #: builtin/branch.c
3497 #, c-format
3508 -msgid "remote-tracking branch '%s' not found."
3509 -msgstr "未能找到远程跟踪分支 '%s'。"
3498 +msgid "remote-tracking branch '%s' not found"
3499 +msgstr "未能找到远程跟踪分支 '%s'"
3500
3501 #: builtin/branch.c
3502 #, c-format
@@ -3519,8 +3509,8 @@ msgstr ""
3509
3510 #: builtin/branch.c
3511 #, c-format
3522 -msgid "branch '%s' not found."
3523 -msgstr "分支 '%s' 未发现。"
3512 +msgid "branch '%s' not found"
3513 +msgstr "分支 '%s' 未发现"
3514
3515 #: builtin/branch.c
3516 #, c-format
@@ -3547,12 +3537,12 @@ msgstr "HEAD (%s) 指向 refs/heads/ 之外"
3537
3538 #: builtin/branch.c
3539 #, c-format
3550 -msgid "Branch %s is being rebased at %s"
3540 +msgid "branch %s is being rebased at %s"
3541 msgstr "分支 %s 正被变基到 %s"
3542
3543 #: builtin/branch.c
3544 #, c-format
3555 -msgid "Branch %s is being bisected at %s"
3545 +msgid "branch %s is being bisected at %s"
3546 msgstr "分支 %s 正被二分查找于 %s"
3547
3548 #: builtin/branch.c
@@ -3562,48 +3552,48 @@ msgstr "工作区 %s 的 HEAD 指向没有被更新"
3552
3553 #: builtin/branch.c
3554 #, c-format
3565 -msgid "Invalid branch name: '%s'"
3555 +msgid "invalid branch name: '%s'"
3556 msgstr "无效的分支名：'%s'"
3557
3558 #: builtin/branch.c
3559 #, c-format
3570 -msgid "No commit on branch '%s' yet."
3571 -msgstr "分支 '%s' 尚无提交。"
3560 +msgid "no commit on branch '%s' yet"
3561 +msgstr "分支 '%s' 尚无提交"
3562
3563 #: builtin/branch.c
3564 #, c-format
3575 -msgid "No branch named '%s'."
3576 -msgstr "没有分支 '%s'。"
3565 +msgid "no branch named '%s'"
3566 +msgstr "没有分支 '%s'"
3567
3568 #: builtin/branch.c
3579 -msgid "Branch rename failed"
3569 +msgid "branch rename failed"
3570 msgstr "分支重命名失败"
3571
3572 #: builtin/branch.c
3583 -msgid "Branch copy failed"
3573 +msgid "branch copy failed"
3574 msgstr "分支拷贝失败"
3575
3576 #: builtin/branch.c
3577 #, c-format
3588 -msgid "Created a copy of a misnamed branch '%s'"
3578 +msgid "created a copy of a misnamed branch '%s'"
3579 msgstr "已为错误命名的分支 '%s' 创建了一个副本"
3580
3581 #: builtin/branch.c
3582 #, c-format
3593 -msgid "Renamed a misnamed branch '%s' away"
3583 +msgid "renamed a misnamed branch '%s' away"
3584 msgstr "已将错误命名的分支 '%s' 重命名"
3585
3586 #: builtin/branch.c
3587 #, c-format
3598 -msgid "Branch renamed to %s, but HEAD is not updated!"
3599 -msgstr "分支重命名为 %s，但 HEAD 没有更新！"
3588 +msgid "branch renamed to %s, but HEAD is not updated"
3589 +msgstr "分支重命名为 %s，但 HEAD 没有更新"
3590
3591 #: builtin/branch.c
3602 -msgid "Branch is renamed, but update of config-file failed"
3592 +msgid "branch is renamed, but update of config-file failed"
3593 msgstr "分支被重命名，但更新配置文件失败"
3594
3595 #: builtin/branch.c
3606 -msgid "Branch is copied, but update of config-file failed"
3596 +msgid "branch is copied, but update of config-file failed"
3597 msgstr "分支已拷贝，但更新配置文件失败"
3598
3599 #: builtin/branch.c
@@ -3754,9 +3744,9 @@ msgstr "在子模组中递归"
3744 msgid "format to use for the output"
3745 msgstr "输出格式"
3746
3757 -#: builtin/branch.c builtin/submodule--helper.c submodule.c
3758 -msgid "Failed to resolve HEAD as a valid ref."
3759 -msgstr "无法将 HEAD 解析为有效引用。"
3747 +#: builtin/branch.c
3748 +msgid "failed to resolve HEAD as a valid ref"
3749 +msgstr "无法将 HEAD 解析为有效引用"
3750
3751 #: builtin/branch.c builtin/clone.c
3752 msgid "HEAD not found below refs/heads!"
@@ -3778,7 +3768,7 @@ msgid "branch name required"
3768 msgstr "必须提供分支名"
3769
3770 #: builtin/branch.c
3781 -msgid "Cannot give description to detached HEAD"
3771 +msgid "cannot give description to detached HEAD"
3772 msgstr "不能向分离头指针提供描述"
3773
3774 #: builtin/branch.c
@@ -3786,12 +3776,12 @@ msgid "cannot edit description of more than one branch"
3776 msgstr "不能为一个以上的分支编辑描述"
3777
3778 #: builtin/branch.c
3789 -msgid "cannot copy the current branch while not on any."
3790 -msgstr "不处于任何分支上，无法拷贝当前分支。"
3779 +msgid "cannot copy the current branch while not on any"
3780 +msgstr "不处于任何分支上，无法拷贝当前分支"
3781
3782 #: builtin/branch.c
3793 -msgid "cannot rename the current branch while not on any."
3794 -msgstr "不处于任何分支上，无法重命名当前分支。"
3783 +msgid "cannot rename the current branch while not on any"
3784 +msgstr "不处于任何分支上，无法重命名当前分支"
3785
3786 #: builtin/branch.c
3787 msgid "too many branches for a copy operation"
@@ -3808,8 +3798,8 @@ msgstr "为设置新上游提供了太多的参数"
3798 #: builtin/branch.c
3799 #, c-format
3800 msgid ""
3811 -"could not set upstream of HEAD to %s when it does not point to any branch."
3812 -msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
3801 +"could not set upstream of HEAD to %s when it does not point to any branch"
3802 +msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支"
3803
3804 #: builtin/branch.c
3805 #, c-format
@@ -3826,17 +3816,17 @@ msgid "too many arguments to unset upstream"
3816 msgstr "为取消上游设置操作提供了太多的参数"
3817
3818 #: builtin/branch.c
3829 -msgid "could not unset upstream of HEAD when it does not point to any branch."
3819 +msgid "could not unset upstream of HEAD when it does not point to any branch"
3820 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
3821
3822 #: builtin/branch.c
3823 #, c-format
3834 -msgid "Branch '%s' has no upstream information"
3824 +msgid "branch '%s' has no upstream information"
3825 msgstr "分支 '%s' 没有上游信息"
3826
3827 #: builtin/branch.c
3828 msgid ""
3839 -"The -a, and -r, options to 'git branch' do not take a branch name.\n"
3829 +"the -a, and -r, options to 'git branch' do not take a branch name.\n"
3830 "Did you mean to use: -a|-r --list <pattern>?"
3831 msgstr ""
3832 "'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
@@ -3845,9 +3835,8 @@ msgstr ""
3835 #: builtin/branch.c
3836 msgid ""
3837 "the '--set-upstream' option is no longer supported. Please use '--track' or "
3848 -"'--set-upstream-to' instead."
3849 -msgstr ""
3850 -"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
3838 +"'--set-upstream-to' instead"
3839 +msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'"
3840
3841 #: builtin/bugreport.c
3842 msgid "git version:\n"
@@ -3930,6 +3919,11 @@ msgstr "指定错误报告文件的目标位置"
3919 msgid "specify a strftime format suffix for the filename(s)"
3920 msgstr "指定文件的 strftime 格式后缀"
3921
3922 +#: builtin/bugreport.c
3923 +#, c-format
3924 +msgid "unknown argument `%s'"
3925 +msgstr "未知参数 `%s'"
3926 +
3927 #: builtin/bugreport.c builtin/diagnose.c
3928 #, c-format
3929 msgid "could not create leading directories for '%s'"
@@ -4067,6 +4061,14 @@ msgstr "git cat-file (-e | -p) <对象>"
4061 msgid "git cat-file (-t | -s) [--allow-unknown-type] <object>"
4062 msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>"
4063
4064 +#: builtin/cat-file.c
4065 +msgid ""
4066 +"git cat-file (--textconv | --filters)\n"
4067 +" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
4068 +msgstr ""
4069 +"git cat-file (--textconv | --filters)\n"
4070 +" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]"
4071 +
4072 #: builtin/cat-file.c
4073 msgid ""
4074 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
@@ -4079,14 +4081,6 @@ msgstr ""
4081 " [--buffer] [--follow-symlinks] [--unordered]\n"
4082 " [--textconv | --filters] [-Z]"
4083
4082 -#: builtin/cat-file.c
4083 -msgid ""
4084 -"git cat-file (--textconv | --filters)\n"
4085 -" [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"
4086 -msgstr ""
4087 -"git cat-file (--textconv | --filters)\n"
4088 -" [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]"
4089 -
4084 #: builtin/cat-file.c
4085 msgid "Check object existence or emit object contents"
4086 msgstr "检查对象存在或输出对象内容"
@@ -4462,6 +4456,11 @@ msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
4456 msgid "'%s' or '%s' cannot be used with %s"
4457 msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
4458
4459 +#: builtin/checkout.c
4460 +#, c-format
4461 +msgid "'%s', '%s', or '%s' cannot be used when checking out of a tree"
4462 +msgstr "'%s'、'%s' 或 '%s' 不能在检出一个树时使用"
4463 +
4464 #: builtin/checkout.c
4465 #, c-format
4466 msgid "path '%s' is unmerged"
@@ -5148,7 +5147,7 @@ msgstr "检出 <分支> 而不是远程 HEAD"
5147 msgid "path to git-upload-pack on the remote"
5148 msgstr "远程 git-upload-pack 路径"
5149
5151 -#: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c
5150 +#: builtin/clone.c builtin/fetch.c builtin/pull.c
5151 msgid "depth"
5152 msgstr "深度"
5153
@@ -5528,6 +5527,11 @@ msgstr "如果提交图形被拆分，只验证头一个文件"
5527 msgid "Could not open commit-graph '%s'"
5528 msgstr "无法打开提交图形 '%s'"
5529
5530 +#: builtin/commit-graph.c
5531 +#, c-format
5532 +msgid "could not open commit-graph chain '%s'"
5533 +msgstr "无法打开提交图形链 '%s'"
5534 +
5535 #: builtin/commit-graph.c
5536 #, c-format
5537 msgid "unrecognized --split argument, %s"
@@ -5768,10 +5772,6 @@ msgstr "无法更新临时索引"
5772 msgid "Failed to update main cache tree"
5773 msgstr "不能更新树的主缓存"
5774
5771 -#: builtin/commit.c
5772 -msgid "unable to write new_index file"
5773 -msgstr "无法写 new_index 文件"
5774 -
5775 #: builtin/commit.c
5776 msgid "cannot do a partial commit during a merge."
5777 msgstr "在合并过程中不能做部分提交。"
@@ -6260,10 +6260,10 @@ msgstr "因提交说明的正文为空而终止提交。\n"
6260 #: builtin/commit.c
6261 msgid ""
6262 "repository has been updated, but unable to write\n"
6263 -"new_index file. Check that disk is not full and quota is\n"
6263 +"new index file. Check that disk is not full and quota is\n"
6264 "not exceeded, and then \"git restore --staged :/\" to recover."
6265 msgstr ""
6266 -"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n"
6266 +"仓库已更新，但无法写入索引文件。检查是否磁盘已满或\n"
6267 "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
6268
6269 #: builtin/config.c
@@ -8070,6 +8070,10 @@ msgstr "清除未引用的对象"
8070 msgid "pack unreferenced objects separately"
8071 msgstr "分开打包未引用的对象"
8072
8073 +#: builtin/gc.c builtin/repack.c
8074 +msgid "with --cruft, limit the size of new cruft packs"
8075 +msgstr "使用 --cruft，限制新 cruft 包的总大小"
8076 +
8077 #: builtin/gc.c
8078 msgid "be more thorough (increased runtime)"
8079 msgstr "更彻底（增加运行时间）"
@@ -8285,14 +8289,6 @@ msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
8289 msgid "'crontab' died"
8290 msgstr "'crontab' 终止"
8291
8288 -#: builtin/gc.c
8289 -msgid "failed to start systemctl"
8290 -msgstr "无法启动 systemctl"
8291 -
8292 -#: builtin/gc.c
8293 -msgid "failed to run systemctl"
8294 -msgstr "无法运行 systemctl"
8295 -
8292 #: builtin/gc.c builtin/worktree.c
8293 #, c-format
8294 msgid "failed to delete '%s'"
@@ -8303,6 +8299,14 @@ msgstr "无法删除 '%s'"
8299 msgid "failed to flush '%s'"
8300 msgstr "无法刷新 '%s'"
8301
8302 +#: builtin/gc.c
8303 +msgid "failed to start systemctl"
8304 +msgstr "无法启动 systemctl"
8305 +
8306 +#: builtin/gc.c
8307 +msgid "failed to run systemctl"
8308 +msgstr "无法运行 systemctl"
8309 +
8310 #: builtin/gc.c
8311 #, c-format
8312 msgid "unrecognized --scheduler argument '%s'"
@@ -8333,6 +8337,10 @@ msgstr "调度器"
8337 msgid "scheduler to trigger git maintenance run"
8338 msgstr "触发 git maintenance 执行的调度器"
8339
8340 +#: builtin/gc.c
8341 +msgid "failed to set up maintenance schedule"
8342 +msgstr "无法设置维护计划"
8343 +
8344 #: builtin/gc.c
8345 msgid "failed to add repo to global config"
8346 msgstr "无法将仓库添加到全局配置"
@@ -8429,8 +8437,8 @@ msgid "search in subdirectories (default)"
8437 msgstr "在子目录中寻找（默认）"
8438
8439 #: builtin/grep.c
8432 -msgid "descend at most <depth> levels"
8433 -msgstr "最多以指定的深度向下寻找"
8440 +msgid "descend at most <n> levels"
8441 +msgstr "最多向下寻找 <n> 层"
8442
8443 #: builtin/grep.c
8444 msgid "use extended POSIX regular expressions"
@@ -9132,11 +9140,11 @@ msgstr "--separate-git-dir 不能用于纯仓库"
9140 #: builtin/interpret-trailers.c
9141 msgid ""
9142 "git interpret-trailers [--in-place] [--trim-empty]\n"
9135 -" [(--trailer <token>[(=|:)<value>])...]\n"
9143 +" [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n"
9144 " [--parse] [<file>...]"
9145 msgstr ""
9146 "git interpret-trailers [--in-place] [--trim-empty]\n"
9139 -" [(--trailer <键>[(=|:)<值>])...]\n"
9147 +" [(--trailer (<键|键别名>)[(=|:)<值>])...]\n"
9148 " [--parse] [<文件>...]"
9149
9150 #: builtin/interpret-trailers.c
@@ -9147,6 +9155,10 @@ msgstr "在原位编辑文件"
9155 msgid "trim empty trailers"
9156 msgstr "删除空的尾注"
9157
9158 +#: builtin/interpret-trailers.c
9159 +msgid "placement"
9160 +msgstr "安置"
9161 +
9162 #: builtin/interpret-trailers.c
9163 msgid "where to place the new trailer"
9164 msgstr "在哪里放置新的尾注"
@@ -9164,20 +9176,20 @@ msgid "output only the trailers"
9176 msgstr "只输出尾注"
9177
9178 #: builtin/interpret-trailers.c
9167 -msgid "do not apply config rules"
9168 -msgstr "不要应用配置规则"
9179 +msgid "do not apply trailer.* configuration variables"
9180 +msgstr "不应用 trailer.* 配置变量"
9181
9182 #: builtin/interpret-trailers.c
9171 -msgid "join whitespace-continued values"
9172 -msgstr "连接空白折行的值"
9183 +msgid "reformat multiline trailer values as single-line values"
9184 +msgstr "将多行尾注值重新格式化为单行值"
9185
9186 #: builtin/interpret-trailers.c
9175 -msgid "set parsing options"
9176 -msgstr "设置解析选项"
9187 +msgid "alias for --only-trailers --only-input --unfold"
9188 +msgstr "--only-trailers --only-input --unfold 的别名"
9189
9190 #: builtin/interpret-trailers.c
9179 -msgid "do not treat --- specially"
9180 -msgstr "不要对 --- 特殊处理"
9191 +msgid "do not treat \"---\" as the end of input"
9192 +msgstr "不要将 \"---\" 视为输入的结束"
9193
9194 #: builtin/interpret-trailers.c
9195 msgid "trailer(s) to add"
@@ -9289,6 +9301,11 @@ msgstr "只需要一个范围"
9301 msgid "not a range"
9302 msgstr "不是一个范围"
9303
9304 +#: builtin/log.c
9305 +#, c-format
9306 +msgid "unable to read branch description file '%s'"
9307 +msgstr "无法读取分支描述文件 '%s'"
9308 +
9309 #: builtin/log.c
9310 msgid "cover letter needs email format"
9311 msgstr "附函需要邮件地址格式"
@@ -9415,6 +9432,10 @@ msgstr "从分支描述获取附函的模式"
9432 msgid "generate parts of a cover letter based on a branch's description"
9433 msgstr "基于一个分支描述生成部分附函"
9434
9435 +#: builtin/log.c
9436 +msgid "use branch description from file"
9437 +msgstr "使用来自文件的分支描述"
9438 +
9439 #: builtin/log.c
9440 msgid "use [<prefix>] instead of [PATCH]"
9441 msgstr "使用 [<前缀>] 代替 [PATCH]"
@@ -9973,6 +9994,10 @@ msgstr ""
9994 msgid "send results to standard output"
9995 msgstr "将结果发送到标准输出"
9996
9997 +#: builtin/merge-file.c
9998 +msgid "use object IDs instead of filenames"
9999 +msgstr "使用对象 ID 替换文件名"
10000 +
10001 #: builtin/merge-file.c
10002 msgid "use a diff3 based merge"
10003 msgstr "使用基于 diff3 的合并"
@@ -10005,6 +10030,15 @@ msgstr "不要警告冲突"
10030 msgid "set labels for file1/orig-file/file2"
10031 msgstr "为 文件1/初始文件/文件2 设置标签"
10032
10033 +#: builtin/merge-file.c
10034 +#, c-format
10035 +msgid "object '%s' does not exist"
10036 +msgstr "对象 '%s' 不存在"
10037 +
10038 +#: builtin/merge-file.c
10039 +msgid "Could not write object file"
10040 +msgstr "不能写入对象文件"
10041 +
10042 #: builtin/merge-recursive.c
10043 #, c-format
10044 msgid "unknown option %s"
@@ -10084,10 +10118,23 @@ msgstr "实施多个合并，每输入行一个"
10118 msgid "specify a merge-base for the merge"
10119 msgstr "指定用于合并的合并基线"
10120
10121 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
10122 +msgid "option=value"
10123 +msgstr "option=value"
10124 +
10125 +#: builtin/merge-tree.c builtin/merge.c builtin/pull.c
10126 +msgid "option for selected merge strategy"
10127 +msgstr "所选的合并策略的选项"
10128 +
10129 #: builtin/merge-tree.c
10130 msgid "--trivial-merge is incompatible with all other options"
10131 msgstr "--trivial-merge 与其他所有选项不兼容"
10132
10133 +#: builtin/merge-tree.c builtin/merge.c
10134 +#, c-format
10135 +msgid "unknown strategy option: -X%s"
10136 +msgstr "未知的策略选项：-X%s"
10137 +
10138 #: builtin/merge-tree.c
10139 msgid "--merge-base is incompatible with --stdin"
10140 msgstr "--merge-base 与 --stdin 不兼容"
@@ -10179,14 +10226,6 @@ msgstr "策略"
10226 msgid "merge strategy to use"
10227 msgstr "要使用的合并策略"
10228
10182 -#: builtin/merge.c builtin/pull.c
10183 -msgid "option=value"
10184 -msgstr "option=value"
10185 -
10186 -#: builtin/merge.c builtin/pull.c
10187 -msgid "option for selected merge strategy"
10188 -msgstr "所选的合并策略的选项"
10189 -
10229 #: builtin/merge.c
10230 msgid "merge commit message (for a non-fast-forward merge)"
10231 msgstr "合并的提交说明（针对非快进式合并）"
@@ -10265,11 +10304,6 @@ msgstr "不能写入索引。"
10304 msgid "Not handling anything other than two heads merge."
10305 msgstr "未处理两个头合并之外的任何操作。"
10306
10268 -#: builtin/merge.c
10269 -#, c-format
10270 -msgid "unknown strategy option: -X%s"
10271 -msgstr "未知的策略选项：-X%s"
10272 -
10307 #: builtin/merge.c t/helper/test-fast-rebase.c
10308 #, c-format
10309 msgid "unable to write %s"
@@ -10628,8 +10662,8 @@ msgid "can not move directory into itself"
10662 msgstr "不能将目录移动到自身"
10663
10664 #: builtin/mv.c
10631 -msgid "cannot move directory over file"
10632 -msgstr "不能将目录移动到文件"
10665 +msgid "destination already exists"
10666 +msgstr "目标已存在"
10667
10668 #: builtin/mv.c
10669 msgid "source directory is empty"
@@ -11556,10 +11590,6 @@ msgstr "最小的包文件大小是 1 MiB"
11590 msgid "--thin cannot be used to build an indexable pack"
11591 msgstr "--thin 不能用于创建一个可索引包"
11592
11559 -#: builtin/pack-objects.c
11560 -msgid "cannot use --filter without --stdout"
11561 -msgstr "不能在没有 --stdout 的情况下使用 --filter"
11562 -
11593 #: builtin/pack-objects.c
11594 msgid "cannot use --filter with --stdin-packs"
11595 msgstr "不能同时使用 --filter 和 --stdin-packs"
@@ -11576,10 +11606,6 @@ msgstr "不能同时使用内部版本列表和 --cruft"
11606 msgid "cannot use --stdin-packs with --cruft"
11607 msgstr "不能将 --stdin-packs 和 --cruft 同时使用"
11608
11579 -#: builtin/pack-objects.c
11580 -msgid "cannot use --max-pack-size with --cruft"
11581 -msgstr "不能将 --max-pack-size 和 --cruft 同时使用"
11582 -
11609 #: builtin/pack-objects.c
11610 msgid "Enumerating objects"
11611 msgstr "枚举对象中"
@@ -12709,10 +12735,6 @@ msgstr ""
12735 msgid "switch `C' expects a numerical value"
12736 msgstr "开关 `C' 期望一个数字值"
12737
12712 -#: builtin/rebase.c
12713 -msgid "--strategy requires --merge or --interactive"
12714 -msgstr "--strategy 需要 --merge 或 --interactive"
12715 -
12738 #: builtin/rebase.c
12739 msgid ""
12740 "apply options are incompatible with rebase.autoSquash. Consider adding --no-"
@@ -13561,6 +13583,11 @@ msgstr "不能关闭引用快照临时文件"
13583 msgid "could not remove stale bitmap: %s"
13584 msgstr "无法删除过期的位图： %s"
13585
13586 +#: builtin/repack.c
13587 +#, c-format
13588 +msgid "pack prefix %s does not begin with objdir %s"
13589 +msgstr "包前缀 %s 没有以对象目录 %s 开始"
13590 +
13591 #: builtin/repack.c
13592 msgid "pack everything in a single pack"
13593 msgstr "所有内容打包到一个包文件中"
@@ -13661,18 +13688,22 @@ msgstr "写入结果包的多包索引"
13688 msgid "pack prefix to store a pack containing pruned objects"
13689 msgstr "储存被清除的对象的包的前缀"
13690
13691 +#: builtin/repack.c
13692 +msgid "pack prefix to store a pack containing filtered out objects"
13693 +msgstr "储存被过滤的对象的包的前缀"
13694 +
13695 #: builtin/repack.c
13696 msgid "cannot delete packs in a precious-objects repo"
13697 msgstr "不能删除珍品仓库中的打包文件"
13698
13699 #: builtin/repack.c
13669 -msgid "Nothing new to pack."
13670 -msgstr "没有新的要打包。"
13700 +#, c-format
13701 +msgid "option '%s' can only be used along with '%s'"
13702 +msgstr "选项 '%s' 只能和 '%s' 搭配使用"
13703
13704 #: builtin/repack.c
13673 -#, c-format
13674 -msgid "pack prefix %s does not begin with objdir %s"
13675 -msgstr "包前缀 %s 没有以对象目录 .%s 开始"
13705 +msgid "Nothing new to pack."
13706 +msgstr "没有新的要打包。"
13707
13708 #: builtin/repack.c
13709 #, c-format
@@ -14200,6 +14231,10 @@ msgstr "--exclude-hidden 不能与 --remotes 一起使用"
14231 msgid "this operation must be run in a work tree"
14232 msgstr "该操作必须在一个工作区中运行"
14233
14234 +#: builtin/rev-parse.c
14235 +msgid "Could not read the index"
14236 +msgstr "不能读取索引"
14237 +
14238 #: builtin/rev-parse.c
14239 #, c-format
14240 msgid "unknown mode for --show-object-format: %s"
@@ -14625,18 +14660,40 @@ msgstr "未知的哈希算法"
14660
14661 #: builtin/show-ref.c
14662 msgid ""
14628 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"
14663 +"git show-ref [--head] [-d | --dereference]\n"
14664 " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14665 " [--heads] [--] [<pattern>...]"
14666 msgstr ""
14632 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"
14667 +"git show-ref [--head] [-d | --dereference]\n"
14668 " [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14669 " [--heads] [--] [<模式>...]"
14670
14671 +#: builtin/show-ref.c
14672 +msgid ""
14673 +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
14674 +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
14675 +" [--] [<ref>...]"
14676 +msgstr ""
14677 +"git show-ref --verify [-q | --quiet] [-d | --dereference]\n"
14678 +" [-s | --hash[=<n>]] [--abbrev[=<n>]]\n"
14679 +" [--] [<引用>...]"
14680 +
14681 #: builtin/show-ref.c
14682 msgid "git show-ref --exclude-existing[=<pattern>]"
14683 msgstr "git show-ref --exclude-existing[=<模式>]"
14684
14685 +#: builtin/show-ref.c
14686 +msgid "git show-ref --exists <ref>"
14687 +msgstr "git show-ref --exists <引用>"
14688 +
14689 +#: builtin/show-ref.c
14690 +msgid "reference does not exist"
14691 +msgstr "引用不存在"
14692 +
14693 +#: builtin/show-ref.c
14694 +msgid "failed to look up reference"
14695 +msgstr "无法找到引用"
14696 +
14697 #: builtin/show-ref.c
14698 msgid "only show tags (can be combined with heads)"
14699 msgstr "只显示标签（可以和头共用）"
@@ -14645,6 +14702,10 @@ msgstr "只显示标签（可以和头共用）"
14702 msgid "only show heads (can be combined with tags)"
14703 msgstr "只显示头（可以和标签共用）"
14704
14705 +#: builtin/show-ref.c
14706 +msgid "check for reference existence without resolving"
14707 +msgstr "检查引用是否存在但不解析"
14708 +
14709 #: builtin/show-ref.c
14710 msgid "stricter reference checking, requires exact ref path"
14711 msgstr "更严格的引用检测，需要精确的引用路径"
@@ -14669,6 +14730,11 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
14730 msgid "show refs from stdin that aren't in local repository"
14731 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
14732
14733 +#: builtin/show-ref.c
14734 +#, c-format
14735 +msgid "only one of '%s', '%s' or '%s' can be given"
14736 +msgstr "选项 '%s'、'%s' 或 '%s' 只能使用其一"
14737 +
14738 #: builtin/sparse-checkout.c
14739 msgid ""
14740 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
@@ -15631,6 +15697,10 @@ msgstr ""
15697 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
15698 "径>...]"
15699
15700 +#: builtin/submodule--helper.c submodule.c
15701 +msgid "Failed to resolve HEAD as a valid ref."
15702 +msgstr "无法将 HEAD 解析为有效引用。"
15703 +
15704 #: builtin/submodule--helper.c
15705 msgid "git submodule absorbgitdirs [<options>] [<path>...]"
15706 msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]"
@@ -16206,6 +16276,10 @@ msgstr "(for porcelains) 忘记保存的未解决的冲突"
16276 msgid "write index in this format"
16277 msgstr "以这种格式写入索引区"
16278
16279 +#: builtin/update-index.c
16280 +msgid "report on-disk index format version"
16281 +msgstr "报告磁盘索引格式的版本"
16282 +
16283 #: builtin/update-index.c
16284 msgid "enable or disable split index"
16285 msgstr "启用或禁用索引拆分"
@@ -16238,6 +16312,16 @@ msgstr "标记文件为 fsmonitor 有效"
16312 msgid "clear fsmonitor valid bit"
16313 msgstr "清除 fsmonitor 有效位"
16314
16315 +#: builtin/update-index.c
16316 +#, c-format
16317 +msgid "%d\n"
16318 +msgstr "%d\n"
16319 +
16320 +#: builtin/update-index.c
16321 +#, c-format
16322 +msgid "index-version: was %d, set to %d"
16323 +msgstr "索引版本：从 %d 设置为 %d"
16324 +
16325 #: builtin/update-index.c
16326 msgid ""
16327 "core.splitIndex is set to false; remove or change it, if you really want to "
@@ -16556,10 +16640,10 @@ msgstr ""
16640 #: builtin/worktree.c
16641 msgid ""
16642 "No local or remote refs exist despite at least one remote\n"
16559 -"present, stopping; use 'add -f' to overide or fetch a remote first"
16643 +"present, stopping; use 'add -f' to override or fetch a remote first"
16644 msgstr ""
16561 -"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止;\n"
16562 -"请使用 'add -f' 来覆盖或拉取一个远程仓库"
16645 +"尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n"
16646 +"请先使用 'add -f' 来覆盖或拉取一个远程仓库"
16647
16648 #: builtin/worktree.c
16649 #, c-format
@@ -16610,7 +16694,7 @@ msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
16694 #: builtin/worktree.c
16695 #, c-format
16696 msgid "options '%s', and '%s' cannot be used together"
16613 -msgstr "选项 '%s'，与 '%s' 不能同时使用"
16697 +msgstr "选项 '%s' 与 '%s' 不能同时使用"
16698
16699 #: builtin/worktree.c
16700 msgid "<commit-ish>"
@@ -16950,6 +17034,11 @@ msgstr "index-pack 终止"
17034 msgid "terminating chunk id appears earlier than expected"
17035 msgstr "终止块 ID 比预期更早出现"
17036
17037 +#: chunk-format.c
17038 +#, c-format
17039 +msgid "chunk id %<PRIx32> not %d-byte aligned"
17040 +msgstr "块 id %<PRIx32> 未 %d 字节对齐"
17041 +
17042 #: chunk-format.c
17043 #, c-format
17044 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
@@ -17019,8 +17108,8 @@ msgid "Move objects and refs by archive"
17108 msgstr "通过归档移动对象和引用"
17109
17110 #: command-list.h
17022 -msgid "Provide content or type and size information for repository objects"
17023 -msgstr "提供仓库对象的内容、类型或大小"
17111 +msgid "Provide contents or details of repository objects"
17112 +msgstr "提供仓库对象的内容或详情"
17113
17114 #: command-list.h
17115 msgid "Display gitattributes information"
@@ -17561,7 +17650,7 @@ msgid "Display version information about Git"
17650 msgstr "显示关于 Git 的版本信息"
17651
17652 #: command-list.h
17564 -msgid "Show logs with difference each commit introduces"
17653 +msgid "Show logs with differences each commit introduces"
17654 msgstr "显示每一个提交引入的差异日志"
17655
17656 #: command-list.h
@@ -17740,6 +17829,10 @@ msgstr "提交图形文件太小，容不下 %u 个块"
17829 msgid "commit-graph has no base graphs chunk"
17830 msgstr "提交图形没有基础图形块"
17831
17832 +#: commit-graph.c
17833 +msgid "commit-graph base graphs chunk is too small"
17834 +msgstr "提交图形的基础图形块过小"
17835 +
17836 #: commit-graph.c
17837 msgid "commit-graph chain does not match"
17838 msgstr "提交图形链不匹配"
@@ -17771,6 +17864,10 @@ msgstr "无法找到提交 %s"
17864 msgid "commit-graph requires overflow generation data but has none"
17865 msgstr "提交图需要溢出世代数据，但是没有"
17866
17867 +#: commit-graph.c
17868 +msgid "commit-graph overflow generation data is too small"
17869 +msgstr "提交图溢出世代数据过小"
17870 +
17871 #: commit-graph.c
17872 msgid "Loading known commits in commit graph"
17873 msgstr "正在加载提交图中的已知提交"
@@ -17927,18 +18024,6 @@ msgstr "%s 的提交图形父提交是 %s != %s"
18024 msgid "commit-graph parent list for commit %s terminates early"
18025 msgstr "提交 %s 的提交图形父提交列表过早终止"
18026
17930 -#: commit-graph.c
17931 -#, c-format
17932 -msgid ""
17933 -"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
17934 -msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
17935 -
17936 -#: commit-graph.c
17937 -#, c-format
17938 -msgid ""
17939 -"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
17940 -msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
17941 -
18027 #: commit-graph.c
18028 #, c-format
18029 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
@@ -17949,6 +18034,13 @@ msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
18034 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
18035 msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
18036
18037 +#: commit-graph.c
18038 +#, c-format
18039 +msgid ""
18040 +"commit-graph has both zero and non-zero generations (e.g., commits '%s' and "
18041 +"'%s')"
18042 +msgstr "提交图形具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
18043 +
18044 #: commit-graph.c
18045 msgid "Verifying commits in commit graph"
18046 msgstr "正在校验提交图中的提交"
@@ -17978,6 +18070,11 @@ msgstr ""
18070 "设置 \"git config advice.graftFileDeprecated false\"\n"
18071 "可关闭本消息"
18072
18073 +#: commit.c
18074 +#, c-format
18075 +msgid "commit %s exists in commit-graph but not in the object database"
18076 +msgstr "提交 %s 存在于提交图形中，但不存在于对象数据库中"
18077 +
18078 #: commit.c
18079 #, c-format
18080 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
@@ -18521,11 +18618,6 @@ msgstr "引用 '%s' 没有指向一个数据对象"
18618 msgid "unable to resolve config blob '%s'"
18619 msgstr "不能解析配置对象 '%s'"
18620
18524 -#: config.c
18525 -#, c-format
18526 -msgid "failed to parse %s"
18527 -msgstr "无法解析 %s"
18528 -
18621 #: config.c
18622 msgid "unable to parse command-line config"
18623 msgstr "无法解析命令行中的配置"
@@ -19093,10 +19185,6 @@ msgstr "无法写入归档"
19185 msgid "--merge-base does not work with ranges"
19186 msgstr "--merge-base 不适用于范围"
19187
19096 -#: diff-lib.c
19097 -msgid "--merge-base only works with commits"
19098 -msgstr "--merge-base 仅适用于提交"
19099 -
19188 #: diff-lib.c
19189 msgid "unable to get HEAD"
19190 msgstr "不能解析 HEAD"
@@ -20820,12 +20908,12 @@ msgstr ""
20908 "%s"
20909
20910 #: merge-ort.c merge-recursive.c
20823 -msgid "Failed to execute internal merge"
20911 +msgid "failed to execute internal merge"
20912 msgstr "无法执行内部合并"
20913
20914 #: merge-ort.c merge-recursive.c
20915 #, c-format
20828 -msgid "Unable to add %s to database"
20916 +msgid "unable to add %s to database"
20917 msgstr "不能添加 %s 至对象库"
20918
20919 #: merge-ort.c merge-recursive.c
@@ -21321,7 +21409,15 @@ msgstr "无法读取缓存"
21409
21410 #: midx.c
21411 msgid "multi-pack-index OID fanout is of the wrong size"
21324 -msgstr "多包索引的对象ID扇出表大小错误"
21412 +msgstr "多包索引的对象 ID 扇出表大小错误"
21413 +
21414 +#: midx.c
21415 +msgid "multi-pack-index OID lookup chunk is the wrong size"
21416 +msgstr "多包索引的对象 ID 查询块大小错误"
21417 +
21418 +#: midx.c
21419 +msgid "multi-pack-index object offset chunk is the wrong size"
21420 +msgstr "多包索引的对象 ID 偏移块大小错误"
21421
21422 #: midx.c
21423 #, c-format
@@ -21344,20 +21440,24 @@ msgid "multi-pack-index hash version %u does not match version %u"
21440 msgstr "多包索引哈希版本 %u 和版本 %u 不匹配"
21441
21442 #: midx.c
21347 -msgid "multi-pack-index missing required pack-name chunk"
21348 -msgstr "多包索引缺少必需的包名块"
21443 +msgid "multi-pack-index required pack-name chunk missing or corrupted"
21444 +msgstr "多包索引必需的包名块缺失或损坏"
21445 +
21446 +#: midx.c
21447 +msgid "multi-pack-index required OID fanout chunk missing or corrupted"
21448 +msgstr "多包索引必需的对象 ID 扇出块缺失或损坏"
21449
21450 #: midx.c
21351 -msgid "multi-pack-index missing required OID fanout chunk"
21352 -msgstr "多包索引缺少必需的对象 ID 扇出块"
21451 +msgid "multi-pack-index required OID lookup chunk missing or corrupted"
21452 +msgstr "多包索引必需的对象 ID 查询块缺失或损坏"
21453
21454 #: midx.c
21355 -msgid "multi-pack-index missing required OID lookup chunk"
21356 -msgstr "多包索引缺少必需的对象 ID 查询块"
21455 +msgid "multi-pack-index required object offsets chunk missing or corrupted"
21456 +msgstr "多包索引必需的对象偏移块缺少或损坏"
21457
21458 #: midx.c
21359 -msgid "multi-pack-index missing required object offsets chunk"
21360 -msgstr "多包索引缺少必需的对象偏移块"
21459 +msgid "multi-pack-index pack-name chunk is too short"
21460 +msgstr "多包索引包名块过短"
21461
21462 #: midx.c
21463 #, c-format
@@ -21373,6 +21473,10 @@ msgstr "错的 pack-int-id：%u（共有 %u 个包）"
21473 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
21474 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
21475
21476 +#: midx.c
21477 +msgid "multi-pack-index large offset out of bounds"
21478 +msgstr "多包索引大偏移区越界"
21479 +
21480 #: midx.c
21481 #, c-format
21482 msgid "failed to add packfile '%s'"
@@ -22241,6 +22345,10 @@ msgstr "无效的校验码 %s"
22345 msgid "invalid rev-index position at %<PRIu64>: %<PRIu32> != %<PRIu32>"
22346 msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>"
22347
22348 +#: pack-revindex.c
22349 +msgid "multi-pack-index reverse-index chunk is the wrong size"
22350 +msgstr "多包索引的反向索引块大小错误"
22351 +
22352 #: pack-write.c
22353 msgid "cannot both write and verify reverse index"
22354 msgstr "无法同时写入和校验反向索引"
@@ -22304,16 +22412,6 @@ msgstr "选项 `%s' 期望 \"%s\" 或 \"%s\""
22412 msgid "%s requires a value"
22413 msgstr "%s 需要一个值"
22414
22307 -#: parse-options.c
22308 -#, c-format
22309 -msgid "%s is incompatible with %s"
22310 -msgstr "%s 与 %s 不兼容"
22311 -
22312 -#: parse-options.c
22313 -#, c-format
22314 -msgid "%s : incompatible with something else"
22315 -msgstr "%s：和其它的不兼容"
22316 -
22415 #: parse-options.c
22416 #, c-format
22417 msgid "%s takes no value"
@@ -22329,6 +22427,11 @@ msgstr "%s 不可用"
22427 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
22428 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
22429
22430 +#: parse-options.c
22431 +#, c-format
22432 +msgid "%s is incompatible with %s"
22433 +msgstr "%s 与 %s 不兼容"
22434 +
22435 #: parse-options.c
22436 #, c-format
22437 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
@@ -22414,6 +22517,11 @@ msgstr " %s"
22517 msgid "-NUM"
22518 msgstr "-数字"
22519
22520 +#: parse-options.c
22521 +#, c-format
22522 +msgid "opposite of --no-%s"
22523 +msgstr "与 --no-%s 相反"
22524 +
22525 #: parse-options.h
22526 msgid "expiry-date"
22527 msgstr "到期时间"
@@ -22451,6 +22559,16 @@ msgid ""
22559 "with --pathspec-from-file, pathspec elements are separated with NUL character"
22560 msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
22561
22562 +#: parse.c
22563 +#, c-format
22564 +msgid "bad boolean environment value '%s' for '%s'"
22565 +msgstr "对于 '%2$s' 的错误的布尔环境取值 '%1$s'"
22566 +
22567 +#: parse.c
22568 +#, c-format
22569 +msgid "failed to parse %s"
22570 +msgstr "无法解析 %s"
22571 +
22572 #: path.c
22573 #, c-format
22574 msgid "Could not make %s writable by group"
@@ -22507,6 +22625,11 @@ msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
22625 msgid "%s: 'literal' and 'glob' are incompatible"
22626 msgstr "%s：'literal' 和 'glob' 不兼容"
22627
22628 +#: pathspec.c
22629 +#, c-format
22630 +msgid "'%s' is outside the directory tree"
22631 +msgstr "'%s' 位于目录树之外"
22632 +
22633 #: pathspec.c
22634 #, c-format
22635 msgid "%s: '%s' is outside repository at '%s'"
@@ -22836,11 +22959,6 @@ msgstr "无法为稀疏索引写入拆分索引"
22959 msgid "failed to convert to a sparse-index"
22960 msgstr "无法转换为稀疏索引"
22961
22839 -#: read-cache.c
22840 -#, c-format
22841 -msgid "could not stat '%s'"
22842 -msgstr "不能对 '%s' 调用 stat"
22843 -
22962 #: read-cache.c
22963 #, c-format
22964 msgid "unable to open git dir: %s"
@@ -24067,8 +24185,16 @@ msgid "only download metadata for the branch that will be checked out"
24185 msgstr "只下载要检出的分支的元信息"
24186
24187 #: scalar.c
24070 -msgid "scalar clone [<options>] [--] <repo> [<dir>]"
24071 -msgstr "scalar clone [<选项>] [--] <仓库> [<目录>]"
24188 +msgid "create repository within 'src' directory"
24189 +msgstr "在 'src' 目录中创建仓库"
24190 +
24191 +#: scalar.c
24192 +msgid ""
24193 +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
24194 +"\t[--[no-]src] <url> [<enlistment>]"
24195 +msgstr ""
24196 +"scalar clone [--single-branch] [--branch <main-branch>] [--full-clone]\n"
24197 +"\t[--[no-]src] <url> [<登记>]"
24198
24199 #: scalar.c
24200 #, c-format
@@ -24134,13 +24260,32 @@ msgstr "无法删除过期的 scalar.repo '%s'"
24260
24261 #: scalar.c
24262 #, c-format
24137 -msgid "removing stale scalar.repo '%s'"
24138 -msgstr "正在删除过期的 scalar.repo '%s'"
24263 +msgid "removed stale scalar.repo '%s'"
24264 +msgstr "已删除过期的 scalar.repo '%s'"
24265
24266 #: scalar.c
24267 #, c-format
24142 -msgid "git repository gone in '%s'"
24143 -msgstr "在 '%s' 的 git 仓库已消失"
24268 +msgid "repository at '%s' has different owner"
24269 +msgstr "位于 '%s' 处的仓库有不同的所有者"
24270 +
24271 +#: scalar.c
24272 +#, c-format
24273 +msgid "repository at '%s' has a format issue"
24274 +msgstr "位于 '%s' 处的仓库存在格式问题"
24275 +
24276 +#: scalar.c
24277 +#, c-format
24278 +msgid "repository not found in '%s'"
24279 +msgstr "在 '%s' 中找不到仓库"
24280 +
24281 +#: scalar.c
24282 +#, c-format
24283 +msgid ""
24284 +"to unregister this repository from Scalar, run\n"
24285 +"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
24286 +msgstr ""
24287 +"若希望从 Scalar 注销该仓库，执行\n"
24288 +"\tgit config --global --unset --fixed-value scalar.repo \"%s\""
24289
24290 #: scalar.c
24291 msgid ""
@@ -24615,11 +24760,6 @@ msgstr "不能得到 %s 的提交说明"
24760 msgid "%s: cannot parse parent commit %s"
24761 msgstr "%s：不能解析父提交 %s"
24762
24618 -#: sequencer.c
24619 -#, c-format
24620 -msgid "could not rename '%s' to '%s'"
24621 -msgstr "不能将 '%s' 重命名为 '%s'"
24622 -
24763 #: sequencer.c
24764 #, c-format
24765 msgid "could not revert %s... %s"
@@ -25051,13 +25191,13 @@ msgstr ""
25191
25192 #: sequencer.c
25193 #, c-format
25054 -msgid "Rebasing (%d/%d)%s"
25055 -msgstr "正在变基（%d/%d）%s"
25194 +msgid "Stopped at %s... %.*s\n"
25195 +msgstr "停止在 %s... %.*s\n"
25196
25197 #: sequencer.c
25198 #, c-format
25059 -msgid "Stopped at %s... %.*s\n"
25060 -msgstr "停止在 %s... %.*s\n"
25199 +msgid "Rebasing (%d/%d)%s"
25200 +msgstr "正在变基（%d/%d）%s"
25201
25202 #: sequencer.c
25203 #, c-format
@@ -26613,6 +26753,10 @@ msgstr "不能访问 '%s'"
26753 msgid "unable to get current working directory"
26754 msgstr "不能获取当前工作目录"
26755
26756 +#: wrapper.c
26757 +msgid "unable to get random bytes"
26758 +msgstr "无法获取随机字节"
26759 +
26760 #: wt-status.c
26761 msgid "Unmerged paths:"
26762 msgstr "未合并的路径："
@@ -27401,13 +27545,13 @@ msgstr ""
27545
27546 #: git-send-email.perl
27547 #, perl-format
27404 -msgid "Failed to open %s: %s"
27405 -msgstr "无法打开 %s: %s"
27548 +msgid "Failed to open %s.final: %s"
27549 +msgstr "无法打开 %s.final: %s"
27550
27551 #: git-send-email.perl
27552 #, perl-format
27409 -msgid "Failed to open %s.final: %s"
27410 -msgstr "无法打开 %s.final: %s"
27553 +msgid "Failed to open %s: %s"
27554 +msgstr "无法打开 %s: %s"
27555
27556 #: git-send-email.perl
27557 msgid "Summary email is empty, skipping it\n"