@matheusbsbs / matheus-bagliano / commits / 459419567a

l10n: zh_CN v2.39.0 round 1

- Revise translation of 'stale' Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Fangyi Zhou committed Dec 2, 2022 at 14:04 UTC 459419567a636a85f7280d41e0cc081f3ebab0ea
1 file changed +508 -345
po/zh_CN.po
+508 -345
@@ -119,6 +119,7 @@
119 # smart HTTP protocol | 智能 HTTP 协议
120 # squash | 挤压
121 # stage | n. 暂存区（即索引）; v. 暂存
122 +# stale | 过期的
123 # stash | n. 贮藏区; v. 贮藏
124 # submodule | 子模组
125 # symref | 符号引用
@@ -144,8 +145,8 @@ msgid ""
145 msgstr ""
146 "Project-Id-Version: Git\n"
147 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
147 -"POT-Creation-Date: 2022-09-28 15:50+0100\n"
148 -"PO-Revision-Date: 2022-09-23 14:53+0100\n"
148 +"POT-Creation-Date: 2022-12-01 14:04+0000\n"
149 +"PO-Revision-Date: 2022-12-01 14:17+0000\n"
150 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
151 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
152 "Language: zh_CN\n"
@@ -1016,6 +1017,11 @@ msgstr "命令行以 \\ 结尾"
1017 msgid "unclosed quote"
1018 msgstr "未关闭的引号"
1019
1020 +#: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
1021 +#: builtin/receive-pack.c builtin/tag.c
1022 +msgid "too many arguments"
1023 +msgstr "太多参数"
1024 +
1025 #: apply.c
1026 #, c-format
1027 msgid "unrecognized whitespace option '%s'"
@@ -1467,7 +1473,7 @@ msgstr "略过补丁 '%s'。"
1473 msgid "No valid patches in input (allow with \"--allow-empty\")"
1474 msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）"
1475
1470 -#: apply.c
1476 +#: apply.c t/helper/test-cache-tree.c
1477 msgid "unable to read index file"
1478 msgstr "无法读取索引文件"
1479
@@ -1700,7 +1706,7 @@ msgstr "无此引用：%.*s"
1706 msgid "not a valid object name: %s"
1707 msgstr "不是一个有效的对象名：%s"
1708
1703 -#: archive.c
1709 +#: archive.c t/helper/test-cache-tree.c
1710 #, c-format
1711 msgid "not a tree object: %s"
1712 msgstr "不是一个树对象：%s"
@@ -1751,7 +1757,7 @@ msgid "prepend prefix to each pathname in the archive"
1757 msgstr "为归档中每个路径名加上前缀"
1758
1759 #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c
1754 -#: builtin/fast-export.c builtin/grep.c builtin/hash-object.c
1760 +#: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c
1761 #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h
1762 msgid "file"
1763 msgstr "文件"
@@ -3175,54 +3181,6 @@ msgid ""
3181 "code %d"
3182 msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d"
3183
3178 -#: builtin/bisect--helper.c
3179 -msgid "reset the bisection state"
3180 -msgstr "清除二分查找状态"
3181 -
3182 -#: builtin/bisect--helper.c
3183 -msgid "check whether bad or good terms exist"
3184 -msgstr "检查坏的或好的术语是否存在"
3185 -
3186 -#: builtin/bisect--helper.c
3187 -msgid "print out the bisect terms"
3188 -msgstr "打印二分查找术语"
3189 -
3190 -#: builtin/bisect--helper.c
3191 -msgid "start the bisect session"
3192 -msgstr "启动二分查找过程"
3193 -
3194 -#: builtin/bisect--helper.c
3195 -msgid "find the next bisection commit"
3196 -msgstr "查询下一个二分查找提交"
3197 -
3198 -#: builtin/bisect--helper.c
3199 -msgid "mark the state of ref (or refs)"
3200 -msgstr "标记引用的状态"
3201 -
3202 -#: builtin/bisect--helper.c
3203 -msgid "list the bisection steps so far"
3204 -msgstr "列出到目前为止的二分查找步骤"
3205 -
3206 -#: builtin/bisect--helper.c
3207 -msgid "replay the bisection process from the given file"
3208 -msgstr "从给定文件重放二分查找进程"
3209 -
3210 -#: builtin/bisect--helper.c
3211 -msgid "skip some commits for checkout"
3212 -msgstr "跳过要检出的一些提交"
3213 -
3214 -#: builtin/bisect--helper.c
3215 -msgid "visualize the bisection"
3216 -msgstr "可视化二分查找过程"
3217 -
3218 -#: builtin/bisect--helper.c
3219 -msgid "use <cmd>... to automatically bisect"
3220 -msgstr "使用 <命令>... 来自动二分查找"
3221 -
3222 -#: builtin/bisect--helper.c
3223 -msgid "no log for BISECT_WRITE"
3224 -msgstr "BISECT_WRITE 无日志"
3225 -
3184 #: builtin/bisect--helper.c
3185 msgid "--bisect-reset requires either no argument or a commit"
3186 msgstr "--bisect-reset 无需参数或者需要一个提交"
@@ -3247,6 +3205,10 @@ msgstr "未提供日志文件"
3205 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3206 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3207
3208 +#: builtin/blame.c
3209 +msgid "git annotate [<options>] [<rev-opts>] [<rev>] [--] <file>"
3210 +msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>"
3211 +
3212 #: builtin/blame.c
3213 msgid "<rev-opts> are documented in git-rev-list(1)"
3214 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
@@ -3486,10 +3448,6 @@ msgstr "更新配置文件失败"
3448 msgid "cannot use -a with -d"
3449 msgstr "不能将 -a 和 -d 同时使用"
3450
3489 -#: builtin/branch.c
3490 -msgid "Couldn't look up commit object for HEAD"
3491 -msgstr "无法查询 HEAD 指向的提交对象"
3492 -
3451 #: builtin/branch.c
3452 #, c-format
3453 msgid "Cannot delete branch '%s' checked out at '%s'"
@@ -3539,17 +3497,19 @@ msgid "Branch %s is being bisected at %s"
3497 msgstr "分支 %s 正被二分查找于 %s"
3498
3499 #: builtin/branch.c
3542 -msgid "cannot copy the current branch while not on any."
3543 -msgstr "无法拷贝当前分支因为不处于任何分支上。"
3500 +#, c-format
3501 +msgid "Invalid branch name: '%s'"
3502 +msgstr "无效的分支名：'%s'"
3503
3504 #: builtin/branch.c
3546 -msgid "cannot rename the current branch while not on any."
3547 -msgstr "无法重命名当前分支因为不处于任何分支上。"
3505 +#, c-format
3506 +msgid "No commit on branch '%s' yet."
3507 +msgstr "分支 '%s' 尚无提交。"
3508
3509 #: builtin/branch.c
3510 #, c-format
3551 -msgid "Invalid branch name: '%s'"
3552 -msgstr "无效的分支名：'%s'"
3511 +msgid "No branch named '%s'."
3512 +msgstr "没有分支 '%s'。"
3513
3514 #: builtin/branch.c
3515 msgid "Branch rename failed"
@@ -3758,14 +3718,12 @@ msgid "cannot edit description of more than one branch"
3718 msgstr "不能为一个以上的分支编辑描述"
3719
3720 #: builtin/branch.c
3761 -#, c-format
3762 -msgid "No commit on branch '%s' yet."
3763 -msgstr "分支 '%s' 尚无提交。"
3721 +msgid "cannot copy the current branch while not on any."
3722 +msgstr "不处于任何分支上，无法拷贝当前分支。"
3723
3724 #: builtin/branch.c
3766 -#, c-format
3767 -msgid "No branch named '%s'."
3768 -msgstr "没有分支 '%s'。"
3725 +msgid "cannot rename the current branch while not on any."
3726 +msgstr "不处于任何分支上，无法重命名当前分支。"
3727
3728 #: builtin/branch.c
3729 msgid "too many branches for a copy operation"
@@ -3846,11 +3804,11 @@ msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n"
3804
3805 #: builtin/bugreport.c
3806 msgid ""
3849 -"git bugreport [-o|--output-directory <file>] [-s|--suffix <format>] [--"
3850 -"diagnose[=<mode>]"
3807 +"git bugreport [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
3808 +" [--diagnose[=<mode>]]"
3809 msgstr ""
3852 -"git bugreport [-o|--output-directory <文件>] [-s|--suffix <格式>] [--"
3853 -"diagnose[=<模式>]"
3810 +"git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n"
3811 +" [--diagnose[=<模式>]"
3812
3813 #: builtin/bugreport.c
3814 msgid ""
@@ -3933,20 +3891,26 @@ msgid "Created new report at '%s'.\n"
3891 msgstr "在 '%s' 创建了新报告。\n"
3892
3893 #: builtin/bundle.c
3936 -msgid "git bundle create [<options>] <file> <git-rev-list args>"
3937 -msgstr "git bundle create [<选项>] <文件> <git-rev-list 参数>"
3894 +msgid ""
3895 +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
3896 +"progress-implied]\n"
3897 +" [--version=<version>] <file> <git-rev-list-args>"
3898 +msgstr ""
3899 +"git bundle create [-q | --quiet | --progress | --all-progress] [--all-"
3900 +"progress-implied]\n"
3901 +" [--version=<版本>] <文件> <git-rev-list-参数>"
3902
3903 #: builtin/bundle.c
3940 -msgid "git bundle verify [<options>] <file>"
3941 -msgstr "git bundle verify [<选项>] <文件>"
3904 +msgid "git bundle verify [-q | --quiet] <file>"
3905 +msgstr "git bundle verify [-q | --quiet] <文件>"
3906
3907 #: builtin/bundle.c
3908 msgid "git bundle list-heads <file> [<refname>...]"
3909 msgstr "git bundle list-heads <文件> [<引用名>...]"
3910
3911 #: builtin/bundle.c
3948 -msgid "git bundle unbundle <file> [<refname>...]"
3949 -msgstr "git bundle unbundle <文件> [<引用名>...]"
3912 +msgid "git bundle unbundle [--progress] <file> [<refname>...]"
3913 +msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]"
3914
3915 #: builtin/bundle.c builtin/pack-objects.c
3916 msgid "do not show progress meter"
@@ -4043,12 +4007,12 @@ msgid ""
4007 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
4008 "objects]\n"
4009 " [--buffer] [--follow-symlinks] [--unordered]\n"
4046 -" [--textconv | --filters]"
4010 +" [--textconv | --filters] [-z]"
4011 msgstr ""
4012 "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-"
4013 "objects]\n"
4014 " [--buffer] [--follow-symlinks] [--unordered]\n"
4051 -" [--textconv | --filters]"
4015 +" [--textconv | --filters] [-z]"
4016
4017 #: builtin/cat-file.c
4018 msgid ""
@@ -4185,11 +4149,6 @@ msgstr "'%s' 需要 <版本>"
4149 msgid "<object> required with '-%c'"
4150 msgstr "'-%c' 需要 <对象>"
4151
4188 -#: builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
4189 -#: builtin/receive-pack.c builtin/tag.c
4190 -msgid "too many arguments"
4191 -msgstr "太多参数"
4192 -
4152 #: builtin/cat-file.c
4153 #, c-format
4154 msgid "only two arguments allowed in <type> <object> mode, not %d"
@@ -4847,9 +4806,10 @@ msgstr "使用叠加模式"
4806
4807 #: builtin/clean.c
4808 msgid ""
4850 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
4809 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
4810 +"[<pathspec>...]"
4811 msgstr ""
4852 -"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
4812 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..."
4813
4814 #: builtin/clean.c
4815 #, c-format
@@ -5215,6 +5175,11 @@ msgstr "%s 存在且不是一个目录"
5175 msgid "failed to start iterator over '%s'"
5176 msgstr "无法在 '%s' 上启动迭代器"
5177
5178 +#: builtin/clone.c
5179 +#, c-format
5180 +msgid "symlink '%s' exists, refusing to clone with --local"
5181 +msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆"
5182 +
5183 #: builtin/clone.c compat/precompose_utf8.c
5184 #, c-format
5185 msgid "failed to unlink '%s'"
@@ -5296,11 +5261,6 @@ msgstr "太多参数。"
5261 msgid "You must specify a repository to clone."
5262 msgstr "您必须指定一个仓库来克隆。"
5263
5299 -#: builtin/clone.c
5300 -#, c-format
5301 -msgid "options '%s' and '%s %s' cannot be used together"
5302 -msgstr "选项 '%s' 和 '%s %s' 不能同时使用"
5303 -
5264 #: builtin/clone.c
5265 msgid ""
5266 "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
@@ -5451,22 +5411,27 @@ msgstr "--command 必须是第一个参数"
5411
5412 #: builtin/commit-graph.c
5413 msgid ""
5454 -"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
5414 +"git commit-graph verify [--object-dir <dir>] [--shallow] [--[no-]progress]"
5415 msgstr ""
5456 -"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
5457 -"[no-]progress]"
5416 +"git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]"
5417
5418 #: builtin/commit-graph.c
5419 msgid ""
5461 -"git commit-graph write [--object-dir <objdir>] [--append] [--"
5462 -"split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
5463 -"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <split options>"
5464 -msgstr ""
5465 -"git commit-graph write [--object-dir <对象目录>] [--append] [--split[=<策略"
5466 -">]] [--reachable|--stdin-packs|--stdin-commits] [--changed-paths] [--"
5467 -"[no-]max-new-filters <n>] [--[no-]progress] <切分选项>"
5468 -
5469 -#: builtin/commit-graph.c builtin/fetch.c builtin/log.c
5420 +"git commit-graph write [--object-dir <dir>] [--append]\n"
5421 +" [--split[=<strategy>]] [--reachable | --stdin-packs | "
5422 +"--stdin-commits]\n"
5423 +" [--changed-paths] [--[no-]max-new-filters <n>] [--"
5424 +"[no-]progress]\n"
5425 +" <split options>"
5426 +msgstr ""
5427 +"git commit-graph write [--object-dir <目录>] [--append]\n"
5428 +" [--split[=<策略>]] [--reachable | --stdin-packs | --"
5429 +"stdin-commits] \n"
5430 +" [--changed-paths] [--[no-]max-new-filters <n>] [--"
5431 +"[no-]progress]\n"
5432 +" <切分选项>"
5433 +
5434 +#: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c
5435 msgid "dir"
5436 msgstr "目录"
5437
@@ -5551,13 +5516,17 @@ msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
5516 msgid "Collecting commits from input"
5517 msgstr "正从标准输入收集提交"
5518
5519 +#: builtin/commit-tree.c
5520 +msgid "git commit-tree <tree> [(-p <parent>)...]"
5521 +msgstr "git commit-tree <树> [(-p <父提交>)...]"
5522 +
5523 #: builtin/commit-tree.c
5524 msgid ""
5556 -"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
5557 -"<file>)...] <tree>"
5525 +"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...]\n"
5526 +" [(-F <file>)...] <tree>"
5527 msgstr ""
5559 -"git commit-tree [(-p <父提交>)...] [-S[<keyid>]] [(-m <消息>)...] [(-F <文件"
5560 -">)...] <树>"
5528 +"git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n"
5529 +" [(-F <文件>)...] <树>"
5530
5531 #: builtin/commit-tree.c
5532 #, c-format
@@ -5614,12 +5583,30 @@ msgid "git commit-tree: failed to read"
5583 msgstr "git commit-tree：无法读取"
5584
5585 #: builtin/commit.c
5617 -msgid "git commit [<options>] [--] <pathspec>..."
5618 -msgstr "git commit [<选项>] [--] <路径规格>..."
5586 +msgid ""
5587 +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]\n"
5588 +" [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|"
5589 +"reword):]<commit>)]\n"
5590 +" [-F <file> | -m <msg>] [--reset-author] [--allow-empty]\n"
5591 +" [--allow-empty-message] [--no-verify] [-e] [--author=<author>]\n"
5592 +" [--date=<date>] [--cleanup=<mode>] [--[no-]status]\n"
5593 +" [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
5594 +" [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]\n"
5595 +" [--] [<pathspec>...]"
5596 +msgstr ""
5597 +"git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n"
5598 +" [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|"
5599 +"reword):]<提交>)]\n"
5600 +" [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n"
5601 +" [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n"
5602 +" [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n"
5603 +" [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
5604 +" [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n"
5605 +" [--] [<路径规格>...]"
5606
5607 #: builtin/commit.c
5621 -msgid "git status [<options>] [--] <pathspec>..."
5622 -msgstr "git status [<选项>] [--] <路径规格>..."
5608 +msgid "git status [<options>] [--] [<pathspec>...]"
5609 +msgstr "git status [<选项>] [--] [<路径规格>...]"
5610
5611 #: builtin/commit.c
5612 msgid ""
@@ -6228,7 +6215,7 @@ msgstr "使用仓库级配置文件"
6215 msgid "use per-worktree config file"
6216 msgstr "使用工作区级别的配置文件"
6217
6231 -#: builtin/config.c
6218 +#: builtin/config.c builtin/gc.c
6219 msgid "use given config file"
6220 msgstr "使用指定的配置文件"
6221
@@ -6449,7 +6436,7 @@ msgstr "--blob 只能在 git 仓库内使用"
6436 msgid "--worktree can only be used inside a git repository"
6437 msgstr "--worktree 只能在 git 仓库内使用"
6438
6452 -#: builtin/config.c
6439 +#: builtin/config.c builtin/gc.c
6440 msgid "$HOME not set"
6441 msgstr "$HOME 未设置"
6442
@@ -6559,12 +6546,20 @@ msgid "unable to get credential storage lock in %d ms"
6546 msgstr "无法在 %d ms 获得凭证存储锁"
6547
6548 #: builtin/describe.c
6562 -msgid "git describe [<options>] [<commit-ish>...]"
6563 -msgstr "git describe [<选项>] [<提交号>...]"
6549 +msgid ""
6550 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]"
6551 +msgstr ""
6552 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] [<提交号>...]"
6553 +
6554 +#: builtin/describe.c
6555 +msgid ""
6556 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]"
6557 +msgstr ""
6558 +"git describe [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<标记>]"
6559
6560 #: builtin/describe.c
6566 -msgid "git describe [<options>] --dirty"
6567 -msgstr "git describe [<选项>] --dirty"
6561 +msgid "git describe <blob>"
6562 +msgstr "git describe <数据对象>"
6563
6564 #: builtin/describe.c
6565 msgid "head"
@@ -6717,11 +6712,11 @@ msgstr "选项 '%s' 和提交号不能同时使用"
6712
6713 #: builtin/diagnose.c
6714 msgid ""
6720 -"git diagnose [-o|--output-directory <path>] [-s|--suffix <format>] [--"
6721 -"mode=<mode>]"
6715 +"git diagnose [(-o | --output-directory) <path>] [(-s | --suffix) <format>]\n"
6716 +" [--mode=<mode>]"
6717 msgstr ""
6723 -"git diagnose [-o|--output-directory <文件>] [-s|--suffix <格式>] [--mode=<模"
6724 -"式>]"
6718 +"git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n"
6719 +" [--mode=<模式>]"
6720
6721 #: builtin/diagnose.c
6722 msgid "specify a destination for the diagnostics archive"
@@ -6744,6 +6739,10 @@ msgstr "--merge-base 仅适用于两个提交"
6739 msgid "'%s': not a regular file or symlink"
6740 msgstr "'%s'：不是一个正规文件或符号链接"
6741
6742 +#: builtin/diff.c
6743 +msgid "no merge given, only parents."
6744 +msgstr "没有给出合并，只有父提交。"
6745 +
6746 #: builtin/diff.c
6747 #, c-format
6748 msgid "invalid option: %s"
@@ -7533,8 +7532,8 @@ msgid "print only refs which don't contain the commit"
7532 msgstr "只打印不包含该提交的引用"
7533
7534 #: builtin/for-each-repo.c
7536 -msgid "git for-each-repo --config=<config> <command-args>"
7537 -msgstr "git for-each-repo --config=<配置> <命令参数>"
7535 +msgid "git for-each-repo --config=<config> [--] <arguments>"
7536 +msgstr "git for-each-repo --config=<配置> [--] <命令参数>"
7537
7538 #: builtin/for-each-repo.c
7539 msgid "config"
@@ -7751,8 +7750,16 @@ msgid "%s: invalid sha1 pointer in resolve-undo"
7750 msgstr "%s：resolve-undo 中无效的 sha1 指针"
7751
7752 #: builtin/fsck.c
7754 -msgid "git fsck [<options>] [<object>...]"
7755 -msgstr "git fsck [<选项>] [<对象>...]"
7753 +msgid ""
7754 +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
7755 +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
7756 +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
7757 +" [--[no-]name-objects] [<object>...]"
7758 +msgstr ""
7759 +"git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n"
7760 +" [--[no-]full] [--strict] [--verbose] [--lost-found]\n"
7761 +" [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n"
7762 +" [--[no-]name-objects] [<对象>...]"
7763
7764 #: builtin/fsck.c
7765 msgid "show unreachable objects"
@@ -7824,14 +7831,6 @@ msgstr "git fsmonitor--daemon start [<选项>]"
7831 msgid "git fsmonitor--daemon run [<options>]"
7832 msgstr "git fsmonitor--daemon run [<选项>]"
7833
7827 -#: builtin/fsmonitor--daemon.c
7828 -msgid "git fsmonitor--daemon stop"
7829 -msgstr "git fsmonitor--daemon stop"
7830 -
7831 -#: builtin/fsmonitor--daemon.c
7832 -msgid "git fsmonitor--daemon status"
7833 -msgstr "git fsmonitor--daemon status"
7834 -
7834 #: builtin/fsmonitor--daemon.c
7835 #, c-format
7836 msgid "value of '%s' out of range: %d"
@@ -7932,7 +7931,7 @@ msgstr "等待守护进程启动的最大秒数"
7931 msgid "invalid 'ipc-threads' value (%d)"
7932 msgstr "无效的 'ipc-threads' 值（%d）"
7933
7935 -#: builtin/fsmonitor--daemon.c
7934 +#: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c
7935 #, c-format
7936 msgid "Unhandled subcommand '%s'"
7937 msgstr "未处理的子命令 '%s'"
@@ -8132,8 +8131,23 @@ msgid "use at most one of --auto and --schedule=<frequency>"
8131 msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
8132
8133 #: builtin/gc.c
8135 -msgid "failed to run 'git config'"
8136 -msgstr "无法运行 'git config'"
8134 +#, c-format
8135 +msgid "unable to add '%s' value of '%s'"
8136 +msgstr "无法添加 '%2$s' 的 '%1$s' 值"
8137 +
8138 +#: builtin/gc.c
8139 +msgid "return success even if repository was not registered"
8140 +msgstr "即便仓库非注册仍然返回成功"
8141 +
8142 +#: builtin/gc.c
8143 +#, c-format
8144 +msgid "unable to unset '%s' value of '%s'"
8145 +msgstr "无法取消设置 '%2$s' 的 '%1$s' 值"
8146 +
8147 +#: builtin/gc.c
8148 +#, c-format
8149 +msgid "repository '%s' is not registered"
8150 +msgstr "仓库 '%s' 未注册"
8151
8152 #: builtin/gc.c
8153 #, c-format
@@ -8509,11 +8523,15 @@ msgstr "同时给出了 --cached 和树对象"
8523
8524 #: builtin/hash-object.c
8525 msgid ""
8512 -"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
8513 -"[--] <file>..."
8526 +"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters]\n"
8527 +" [--stdin [--literally]] [--] <file>..."
8528 msgstr ""
8515 -"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
8516 -"[--] <文件>..."
8529 +"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n"
8530 +" [--stdin [--literally]] [--] <文件>..."
8531 +
8532 +#: builtin/hash-object.c
8533 +msgid "git hash-object [-t <type>] [-w] --stdin-paths [--no-filters]"
8534 +msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]"
8535
8536 #: builtin/hash-object.c
8537 msgid "object type"
@@ -9047,11 +9065,15 @@ msgstr "已初始化空的 Git 仓库于 %s%s\n"
9065
9066 #: builtin/init-db.c
9067 msgid ""
9050 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
9051 -"shared[=<permissions>]] [<directory>]"
9068 +"git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
9069 +" [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
9070 +" [-b <branch-name> | --initial-branch=<branch-name>]\n"
9071 +" [--shared[=<permissions>]] [<directory>]"
9072 msgstr ""
9053 -"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
9054 -"[<目录>]"
9073 +"git init [-q | --quiet] [--bare] [--template=<模板目录>]\n"
9074 +" [--separate-git-dir <git 目录>] [--object-format=<格式>]\n"
9075 +" [-b <分支名> | --initial-branch=<分支名>]\n"
9076 +" [--shared[=<权限>]] [<目录>]"
9077
9078 #: builtin/init-db.c
9079 msgid "permissions"
@@ -9101,11 +9123,13 @@ msgstr "--separate-git-dir 不能用于纯仓库"
9123
9124 #: builtin/interpret-trailers.c
9125 msgid ""
9104 -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
9105 -"<token>[(=|:)<value>])...] [<file>...]"
9126 +"git interpret-trailers [--in-place] [--trim-empty]\n"
9127 +" [(--trailer <token>[(=|:)<value>])...]\n"
9128 +" [--parse] [<file>...]"
9129 msgstr ""
9107 -"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
9108 -">])...] [<文件>...]"
9130 +"git interpret-trailers [--in-place] [--trim-empty]\n"
9131 +" [(--trailer <键>[(=|:)<值>])...]\n"
9132 +" [--parse] [<文件>...]"
9133
9134 #: builtin/interpret-trailers.c
9135 msgid "edit files in place"
@@ -9724,11 +9748,11 @@ msgstr ""
9748 #: builtin/ls-remote.c
9749 msgid ""
9750 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9727 -" [-q | --quiet] [--exit-code] [--get-url]\n"
9751 +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
9752 " [--symref] [<repository> [<refs>...]]"
9753 msgstr ""
9730 -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9731 -" [-q | --quiet] [--exit-code] [--get-url]\n"
9754 +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
9755 +" [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n"
9756 " [--symref] [<仓库> [<引用>...]]"
9757
9758 #: builtin/ls-remote.c
@@ -9897,14 +9921,14 @@ msgstr "git merge-base [-a | --all] <提交> <提交>..."
9921 msgid "git merge-base [-a | --all] --octopus <commit>..."
9922 msgstr "git merge-base [-a | --all] --octopus <提交>..."
9923
9900 -#: builtin/merge-base.c
9901 -msgid "git merge-base --independent <commit>..."
9902 -msgstr "git merge-base --independent <提交>..."
9903 -
9924 #: builtin/merge-base.c
9925 msgid "git merge-base --is-ancestor <commit> <commit>"
9926 msgstr "git merge-base --is-ancestor <提交> <提交>"
9927
9928 +#: builtin/merge-base.c
9929 +msgid "git merge-base --independent <commit>..."
9930 +msgstr "git merge-base --independent <提交>..."
9931 +
9932 #: builtin/merge-base.c
9933 msgid "git merge-base --fork-point <ref> [<commit>]"
9934 msgstr "git merge-base --fork-point <引用> [<提交>]"
@@ -10044,10 +10068,24 @@ msgstr "列出没有模式/对象 ID/暂存的文件名"
10068 msgid "allow merging unrelated histories"
10069 msgstr "允许合并不相关的历史"
10070
10071 +#: builtin/merge-tree.c
10072 +msgid "perform multiple merges, one per line of input"
10073 +msgstr "实施多个合并，每输入行一个"
10074 +
10075 #: builtin/merge-tree.c
10076 msgid "--trivial-merge is incompatible with all other options"
10077 msgstr "--trivial-merge 与其他所有选项不兼容"
10078
10079 +#: builtin/merge-tree.c builtin/notes.c
10080 +#, c-format
10081 +msgid "malformed input line: '%s'."
10082 +msgstr "格式错误的输入行：'%s'。"
10083 +
10084 +#: builtin/merge-tree.c
10085 +#, c-format
10086 +msgid "merging cannot continue; got unclean result of %d"
10087 +msgstr "合并无法继续；得到不干净的结果 %d"
10088 +
10089 #: builtin/merge.c
10090 msgid "git merge [<options>] [<commit>...]"
10091 msgstr "git merge [<选项>] [<提交>...]"
@@ -10620,7 +10658,7 @@ msgstr "%s，源=%s，目标=%s"
10658 msgid "Renaming %s to %s\n"
10659 msgstr "重命名 %s 至 %s\n"
10660
10623 -#: builtin/mv.c builtin/remote.c builtin/repack.c
10661 +#: builtin/mv.c builtin/remote.c
10662 #, c-format
10663 msgid "renaming '%s' failed"
10664 msgstr "重命名 '%s' 失败"
@@ -10821,11 +10859,6 @@ msgstr "无法读取对象 '%s'。"
10859 msgid "cannot read note data from non-blob object '%s'."
10860 msgstr "不能从非数据对象 '%s' 中读取注解数据。"
10861
10824 -#: builtin/notes.c
10825 -#, c-format
10826 -msgid "malformed input line: '%s'."
10827 -msgstr "格式错误的输入行：'%s'。"
10828 -
10862 #: builtin/notes.c
10863 #, c-format
10864 msgid "failed to copy notes from '%s' to '%s'"
@@ -11058,14 +11091,13 @@ msgid "unknown subcommand: `%s'"
11091 msgstr "未知子命令：`%s'"
11092
11093 #: builtin/pack-objects.c
11061 -msgid ""
11062 -"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
11063 -msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
11094 +msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
11095 +msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]"
11096
11097 #: builtin/pack-objects.c
11098 msgid ""
11067 -"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
11068 -msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
11099 +"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
11100 +msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]"
11101
11102 #: builtin/pack-objects.c
11103 #, c-format
@@ -11535,8 +11567,8 @@ msgstr ""
11567 "使用它。 谢谢。\n"
11568
11569 #: builtin/pack-refs.c
11538 -msgid "git pack-refs [<options>]"
11539 -msgstr "git pack-refs [<选项>]"
11570 +msgid "git pack-refs [--all] [--no-prune]"
11571 +msgstr "git pack-refs [--all] [--no-prune]"
11572
11573 #: builtin/pack-refs.c
11574 msgid "pack everything"
@@ -11546,6 +11578,22 @@ msgstr "打包一切"
11578 msgid "prune loose refs (default)"
11579 msgstr "清除松散的引用（默认）"
11580
11581 +#: builtin/patch-id.c
11582 +msgid "git patch-id [--stable | --unstable | --verbatim]"
11583 +msgstr "git patch-id [--stable | --unstable | --verbatim]"
11584 +
11585 +#: builtin/patch-id.c
11586 +msgid "use the unstable patch-id algorithm"
11587 +msgstr "使用不稳定的 patch-id 算法"
11588 +
11589 +#: builtin/patch-id.c
11590 +msgid "use the stable patch-id algorithm"
11591 +msgstr "使用稳定的 patch-id 算法"
11592 +
11593 +#: builtin/patch-id.c
11594 +msgid "don't strip whitespace from the patch"
11595 +msgstr "不要从补丁中删除空白字符"
11596 +
11597 #: builtin/prune.c
11598 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
11599 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
@@ -11793,9 +11841,8 @@ msgstr ""
11841 #: builtin/push.c
11842 msgid ""
11843 "\n"
11796 -"To avoid automatically configuring upstream branches when their name\n"
11797 -"doesn't match the local branch, see option 'simple' of branch."
11798 -"autoSetupMerge\n"
11844 +"To avoid automatically configuring an upstream branch when its name\n"
11845 +"won't match the local branch, see option 'simple' of branch.autoSetupMerge\n"
11846 "in 'git help config'.\n"
11847 msgstr ""
11848 "\n"
@@ -11953,6 +12000,13 @@ msgstr "推送到 %s\n"
12000 msgid "failed to push some refs to '%s'"
12001 msgstr "无法推送一些引用到 '%s'"
12002
12003 +#: builtin/push.c
12004 +msgid ""
12005 +"recursing into submodule with push.recurseSubmodules=only; using on-demand "
12006 +"instead"
12007 +msgstr ""
12008 +"在 push.recurseSubmodules=only 时递归进入子模组；取而代之使用 on-demand"
12009 +
12010 #: builtin/push.c builtin/send-pack.c submodule-config.c
12011 #, c-format
12012 msgid "invalid value for '%s'"
@@ -12125,13 +12179,14 @@ msgstr "需要两个提交范围"
12179
12180 #: builtin/read-tree.c
12181 msgid ""
12128 -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
12129 -"[-u | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-"
12130 -"ish1> [<tree-ish2> [<tree-ish3>]])"
12182 +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
12183 +"prefix=<prefix>)\n"
12184 +" [-u | -i]] [--index-output=<file>] [--no-sparse-checkout]\n"
12185 +" (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
12186 msgstr ""
12132 -"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
12133 -"u | -i]] [--no-sparse-checkout] [--index-output=<文件>] (--empty | <树对象一"
12134 -"> [<树对象二> [<树对象三>]])"
12187 +"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>)\n"
12188 +" [-u | -i]] [--index-output=<文件>] [--no-sparse-checkout]\n"
12189 +" (--empty | <树对象一> [<树对象二> [<树对象三>]])"
12190
12191 #: builtin/read-tree.c
12192 msgid "write resulting index to <file>"
@@ -12248,8 +12303,8 @@ msgstr "%s 需要合并后端"
12303
12304 #: builtin/rebase.c
12305 #, c-format
12251 -msgid "could not get 'onto': '%s'"
12252 -msgstr "无法获取 'onto'：'%s'"
12306 +msgid "invalid onto: '%s'"
12307 +msgstr "无效新基线：'%s'"
12308
12309 #: builtin/rebase.c
12310 #, c-format
@@ -12613,8 +12668,8 @@ msgid "No such ref: %s"
12668 msgstr "没有这样的引用：%s"
12669
12670 #: builtin/rebase.c
12616 -msgid "Could not resolve HEAD to a revision"
12617 -msgstr "无法将 HEAD 解析为一个版本"
12671 +msgid "Could not resolve HEAD to a commit"
12672 +msgstr "不能解析 HEAD 至一个提交"
12673
12674 #: builtin/rebase.c
12675 #, c-format
@@ -13084,7 +13139,7 @@ msgstr " 已跳过"
13139
13140 #: builtin/remote.c
13141 msgid " stale (use 'git remote prune' to remove)"
13087 -msgstr " 过时（使用 'git remote prune' 来移除）"
13142 +msgstr " 已过期（使用 'git remote prune' 来移除）"
13143
13144 #: builtin/remote.c
13145 msgid " ???"
@@ -13415,6 +13470,11 @@ msgstr "无法打开临时文件 %s 进行写入"
13470 msgid "could not close refs snapshot tempfile"
13471 msgstr "不能关闭引用快照临时文件"
13472
13473 +#: builtin/repack.c
13474 +#, c-format
13475 +msgid "could not remove stale bitmap: %s"
13476 +msgstr "无法删除过期的位图： %s"
13477 +
13478 #: builtin/repack.c
13479 msgid "pack everything in a single pack"
13480 msgstr "所有内容打包到一个包文件中"
@@ -13511,6 +13571,10 @@ msgstr "使用因子 <n> 查找几何级数"
13571 msgid "write a multi-pack index of the resulting packs"
13572 msgstr "写入结果包的多包索引"
13573
13574 +#: builtin/repack.c
13575 +msgid "pack prefix to store a pack containing pruned objects"
13576 +msgstr "储存被清除的对象的包的前缀"
13577 +
13578 #: builtin/repack.c
13579 msgid "cannot delete packs in a precious-objects repo"
13580 msgstr "不能删除珍品仓库中的打包文件"
@@ -13526,11 +13590,16 @@ msgstr "包前缀 %s 没有以对象目录 .%s 开始"
13590
13591 #: builtin/repack.c
13592 #, c-format
13529 -msgid "missing required file: %s"
13530 -msgstr "缺少需要的文件：%s"
13593 +msgid "renaming pack to '%s' failed"
13594 +msgstr "重命名包至 '%s' 失败"
13595
13596 #: builtin/repack.c
13597 #, c-format
13598 +msgid "pack-objects did not write a '%s' file for pack %s-%s"
13599 +msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件"
13600 +
13601 +#: builtin/repack.c sequencer.c
13602 +#, c-format
13603 msgid "could not unlink: %s"
13604 msgstr "不能删除：%s"
13605
@@ -13771,8 +13840,10 @@ msgid "only one pattern can be given with -l"
13840 msgstr "只能为 -l 提供一个模式"
13841
13842 #: builtin/rerere.c
13774 -msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
13775 -msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
13843 +msgid ""
13844 +"git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
13845 +msgstr ""
13846 +"git rerere [clear | forget <路径规格>... | diff | status | remaining | gc]"
13847
13848 #: builtin/rerere.c
13849 msgid "register clean resolutions in index"
@@ -14027,6 +14098,18 @@ msgstr "--prefix 需要一个参数"
14098 msgid "unknown mode for --abbrev-ref: %s"
14099 msgstr "未知的 --abbrev-ref 模式：%s"
14100
14101 +#: builtin/rev-parse.c revision.c
14102 +msgid "--exclude-hidden cannot be used together with --branches"
14103 +msgstr "--exclude-hidden 不能与 --branches 一起使用"
14104 +
14105 +#: builtin/rev-parse.c revision.c
14106 +msgid "--exclude-hidden cannot be used together with --tags"
14107 +msgstr "--exclude-hidden 不能与 --tags 一起使用"
14108 +
14109 +#: builtin/rev-parse.c revision.c
14110 +msgid "--exclude-hidden cannot be used together with --remotes"
14111 +msgstr "--exclude-hidden 不能与 --remotes 一起使用"
14112 +
14113 #: builtin/rev-parse.c setup.c
14114 msgid "this operation must be run in a work tree"
14115 msgstr "该操作必须在一个工作区中运行"
@@ -14037,20 +14120,27 @@ msgid "unknown mode for --show-object-format: %s"
14120 msgstr "未知的 --show-object-format 模式：%s"
14121
14122 #: builtin/revert.c
14040 -msgid "git revert [<options>] <commit-ish>..."
14041 -msgstr "git revert [<选项>] <提交号>..."
14123 +msgid ""
14124 +"git revert [--[no-]edit] [-n] [-m <parent-number>] [-s] [-S[<keyid>]] "
14125 +"<commit>..."
14126 +msgstr ""
14127 +"git revert [--[no-]edit] [-n] [-m <父编号>] [-s] [-S[<私钥 ID>]] <提交>..."
14128
14129 #: builtin/revert.c
14044 -msgid "git revert <subcommand>"
14045 -msgstr "git revert <子命令>"
14130 +msgid "git revert (--continue | --skip | --abort | --quit)"
14131 +msgstr "git revert (--continue | --skip | --abort | --quit)"
14132
14133 #: builtin/revert.c
14048 -msgid "git cherry-pick [<options>] <commit-ish>..."
14049 -msgstr "git cherry-pick [<选项>] <提交号>..."
14134 +msgid ""
14135 +"git cherry-pick [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]\n"
14136 +" [-S[<keyid>]] <commit>..."
14137 +msgstr ""
14138 +"git cherry-pick [--edit] [-n] [-m <父编号>] [-s] [-x] [--ff]\n"
14139 +" [-S[<私钥 ID>]] <提交>..."
14140
14141 #: builtin/revert.c
14052 -msgid "git cherry-pick <subcommand>"
14053 -msgstr "git cherry-pick <子命令>"
14142 +msgid "git cherry-pick (--continue | --skip | --abort | --quit)"
14143 +msgstr "git cherry-pick (--continue | --skip | --abort | --quit)"
14144
14145 #: builtin/revert.c
14146 #, c-format
@@ -14131,8 +14221,14 @@ msgid "cherry-pick failed"
14221 msgstr "拣选失败"
14222
14223 #: builtin/rm.c
14134 -msgid "git rm [<options>] [--] <file>..."
14135 -msgstr "git rm [<选项>] [--] <文件>..."
14224 +msgid ""
14225 +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
14226 +" [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
14227 +" [--] [<pathspec>...]"
14228 +msgstr ""
14229 +"git rm [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]\n"
14230 +" [--quiet] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
14231 +" [--] [<路径规格>...]"
14232
14233 #: builtin/rm.c
14234 msgid ""
@@ -14215,11 +14311,13 @@ msgid ""
14311 "git send-pack [--mirror] [--dry-run] [--force]\n"
14312 " [--receive-pack=<git-receive-pack>]\n"
14313 " [--verbose] [--thin] [--atomic]\n"
14314 +" [--[no-]signed | --signed=(true|false|if-asked)]\n"
14315 " [<host>:]<directory> (--all | <ref>...)"
14316 msgstr ""
14317 "git send-pack [--mirror] [--dry-run] [--force]\n"
14318 " [--receive-pack=<git-receive-pack>]\n"
14319 " [--verbose] [--thin] [--atomic]\n"
14320 +" [--[no-]signed | --signed=(true|false|if-asked)]\n"
14321 " [<主机>:]<目录> (--all | <引用>...)"
14322
14323 #: builtin/send-pack.c
@@ -14251,8 +14349,9 @@ msgid "using multiple --group options with stdin is not supported"
14349 msgstr "不支持和标准输入一起使用多个 --group 选项"
14350
14351 #: builtin/shortlog.c
14254 -msgid "using --group=trailer with stdin is not supported"
14255 -msgstr "不支持和标准输入一起使用 --group=trailer"
14352 +#, c-format
14353 +msgid "using %s with stdin is not supported"
14354 +msgstr "不支持对 %s 使用标准输入"
14355
14356 #: builtin/shortlog.c
14357 #, c-format
@@ -14300,12 +14399,14 @@ msgid ""
14399 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
14400 " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
14401 " [--more=<n> | --list | --independent | --merge-base]\n"
14303 -" [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
14402 +" [--no-name | --sha1-name] [--topics]\n"
14403 +" [(<rev> | <glob>)...]"
14404 msgstr ""
14405 "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
14406 " [--current] [--color[=<何时>] | --no-color] [--sparse]\n"
14407 " [--more=<n> | --list | --independent | --merge-base]\n"
14308 -" [--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
14408 +" [--no-name | --sha1-name] [--topics]\n"
14409 +" [(<版本> | <通配符>)...]"
14410
14411 #: builtin/show-branch.c
14412 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -14434,11 +14535,13 @@ msgstr "未知的哈希算法"
14535
14536 #: builtin/show-ref.c
14537 msgid ""
14437 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
14438 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
14538 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"
14539 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14540 +" [--heads] [--] [<pattern>...]"
14541 msgstr ""
14440 -"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
14441 -"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
14542 +"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference]\n"
14543 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14544 +" [--heads] [--] [<模式>...]"
14545
14546 #: builtin/show-ref.c
14547 msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -14477,8 +14580,10 @@ msgid "show refs from stdin that aren't in local repository"
14580 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
14581
14582 #: builtin/sparse-checkout.c
14480 -msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
14481 -msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <选项>"
14583 +msgid ""
14584 +"git sparse-checkout (init | list | set | add | reapply | disable) [<options>]"
14585 +msgstr ""
14586 +"git sparse-checkout (init | list | set | add | reapply | disable) [<选项>]"
14587
14588 #: builtin/sparse-checkout.c
14589 msgid "this worktree is not sparse"
@@ -14619,78 +14724,65 @@ msgid "error while refreshing working directory"
14724 msgstr "刷新工作目录时出错"
14725
14726 #: builtin/stash.c
14622 -msgid "git stash list [<options>]"
14623 -msgstr "git stash list [<选项>]"
14727 +msgid "git stash list [<log-options>]"
14728 +msgstr "git stash list [<日志选项>]"
14729 +
14730 +#: builtin/stash.c
14731 +msgid ""
14732 +"git stash show [-u | --include-untracked | --only-untracked] [<diff-"
14733 +"options>] [<stash>]"
14734 +msgstr ""
14735 +"git stash show [-u | --include-untracked | --only-untracked] [<差异选项>] [<"
14736 +"贮存>]"
14737
14738 #: builtin/stash.c
14626 -msgid "git stash show [<options>] [<stash>]"
14627 -msgstr "git stash show [<选项>] [<stash>]"
14739 +msgid "git stash drop [-q | --quiet] [<stash>]"
14740 +msgstr "git stash drop [-q | --quiet] [<贮存>]"
14741
14742 #: builtin/stash.c
14630 -msgid "git stash drop [-q|--quiet] [<stash>]"
14631 -msgstr "git stash drop [-q|--quiet] [<stash>]"
14743 +msgid "git stash pop [--index] [-q | --quiet] [<stash>]"
14744 +msgstr "git stash pop [--index] [-q | --quiet] [<贮存>]"
14745
14746 #: builtin/stash.c
14634 -msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
14635 -msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
14747 +msgid "git stash apply [--index] [-q | --quiet] [<stash>]"
14748 +msgstr "git stash apply [--index] [-q | --quiet] [<贮存>]"
14749
14750 #: builtin/stash.c
14751 msgid "git stash branch <branchname> [<stash>]"
14752 msgstr "git stash branch <分支名> [<stash>]"
14753
14754 +#: builtin/stash.c
14755 +msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
14756 +msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>"
14757 +
14758 #: builtin/stash.c
14759 msgid ""
14643 -"git stash [push [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
14644 -"quiet]\n"
14645 -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
14760 +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
14761 +"| --quiet]\n"
14762 +" [-u | --include-untracked] [-a | --all] [(-m | --message) "
14763 +"<message>]\n"
14764 " [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
14765 " [--] [<pathspec>...]]"
14766 msgstr ""
14649 -"git stash [push [-p|--patch] [[-S|--staged] -k|--[no-]keep-index] [-q|--"
14650 -"quiet]\n"
14651 -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
14767 +"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
14768 +"| --quiet]\n"
14769 +" [-u | --include-untracked] [-a | --all] [(-m | --message <消息>]\n"
14770 " [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
14771 " [--] [<路径规格>...]]"
14772
14773 #: builtin/stash.c
14774 msgid ""
14657 -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
14658 -"quiet]\n"
14659 -" [-u|--include-untracked] [-a|--all] [<message>]"
14775 +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
14776 +"--quiet]\n"
14777 +" [-u | --include-untracked] [-a | --all] [<message>]"
14778 msgstr ""
14661 -"git stash save [-p|--patch] [-S|--staged] [-k|--[no-]keep-index] [-q|--"
14662 -"quiet]\n"
14663 -" [-u|--include-untracked] [-a|--all] [<消息>]"
14664 -
14665 -#: builtin/stash.c
14666 -msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
14667 -msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
14668 -
14669 -#: builtin/stash.c
14670 -msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
14671 -msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
14779 +"git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
14780 +"--quiet]\n"
14781 +" [-u | --include-untracked] [-a | --all] [<消息>]"
14782
14783 #: builtin/stash.c
14674 -msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
14675 -msgstr "git stash store [-m|--message <消息>] [-q|--quiet] <提交>"
14676 -
14677 -#: builtin/stash.c
14678 -msgid ""
14679 -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
14680 -" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
14681 -" [--] [<pathspec>...]]"
14682 -msgstr ""
14683 -"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
14684 -" [-u|--include-untracked] [-a|--all] [-m|--message <消息>]\n"
14685 -" [--] [<路径规格>...]]"
14686 -
14687 -#: builtin/stash.c
14688 -msgid ""
14689 -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
14690 -" [-u|--include-untracked] [-a|--all] [<message>]"
14691 -msgstr ""
14692 -"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
14693 -" [-u|--include-untracked] [-a|--all] [<消息>]"
14784 +msgid "git stash create [<message>]"
14785 +msgstr "git stash create [<消息>]"
14786
14787 #: builtin/stash.c
14788 #, c-format
@@ -15378,10 +15470,6 @@ msgstr "递归遍历子模组"
15470 msgid "don't fetch new objects from the remote site"
15471 msgstr "不要从远程地址获取新对象"
15472
15381 -#: builtin/submodule--helper.c
15382 -msgid "path into the working tree"
15383 -msgstr "到工作区的路径"
15384 -
15473 #: builtin/submodule--helper.c
15474 msgid "use the 'checkout' update strategy (default)"
15475 msgstr "使用 'checkout' 更新策略（默认）"
@@ -15426,34 +15514,10 @@ msgstr ""
15514 "shallow] [--reference <仓库>] [--recursive] [--[no-]single-branch] [--] [<路"
15515 "径>...]"
15516
15429 -#: builtin/submodule--helper.c
15430 -msgid "recurse into submodules"
15431 -msgstr "在子模组中递归"
15432 -
15517 #: builtin/submodule--helper.c
15518 msgid "git submodule absorbgitdirs [<options>] [<path>...]"
15519 msgstr "git submodule absorbgitdirs [<选项>] [<路径>...]"
15520
15437 -#: builtin/submodule--helper.c
15438 -msgid "check if it is safe to write to the .gitmodules file"
15439 -msgstr "检查写入 .gitmodules 文件是否安全"
15440 -
15441 -#: builtin/submodule--helper.c
15442 -msgid "unset the config in the .gitmodules file"
15443 -msgstr "取消 .gitmodules 文件中的设置"
15444 -
15445 -#: builtin/submodule--helper.c
15446 -msgid "git submodule--helper config <name> [<value>]"
15447 -msgstr "git submodule--helper config <名称> [<值>]"
15448 -
15449 -#: builtin/submodule--helper.c
15450 -msgid "git submodule--helper config --unset <name>"
15451 -msgstr "git submodule--helper config --unset <名称>"
15452 -
15453 -#: builtin/submodule--helper.c
15454 -msgid "please make sure that the .gitmodules file is in the working tree"
15455 -msgstr "请确认 .gitmodules 文件在工作区里"
15456 -
15521 #: builtin/submodule--helper.c
15522 msgid "suppress output for setting url of a submodule"
15523 msgstr "抑制设置子模组 URL 的输出"
@@ -15547,6 +15611,10 @@ msgstr "为子模组 '%s' 重新激活本地 git 目录\n"
15611 msgid "unable to checkout submodule '%s'"
15612 msgstr "无法检出子模组 '%s'"
15613
15614 +#: builtin/submodule--helper.c
15615 +msgid "please make sure that the .gitmodules file is in the working tree"
15616 +msgstr "请确认 .gitmodules 文件在工作区里"
15617 +
15618 #: builtin/submodule--helper.c
15619 #, c-format
15620 msgid "Failed to add submodule '%s'"
@@ -15608,23 +15676,26 @@ msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
15676 msgid "'%s' is not a valid submodule name"
15677 msgstr "'%s' 不是一个有效的子模组名称"
15678
15679 +#: builtin/submodule--helper.c
15680 +msgid "git submodule--helper <command>"
15681 +msgstr "git submodule--helper <命令>"
15682 +
15683 #: builtin/submodule--helper.c git.c
15684 #, c-format
15685 msgid "%s doesn't support --super-prefix"
15686 msgstr "%s 不支持 --super-prefix"
15687
15616 -#: builtin/submodule--helper.c
15617 -#, c-format
15618 -msgid "'%s' is not a valid submodule--helper subcommand"
15619 -msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
15688 +#: builtin/symbolic-ref.c
15689 +msgid "git symbolic-ref [-m <reason>] <name> <ref>"
15690 +msgstr "git symbolic-ref [-m <理由>] <名称> <引用>"
15691
15692 #: builtin/symbolic-ref.c
15622 -msgid "git symbolic-ref [<options>] <name> [<ref>]"
15623 -msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
15693 +msgid "git symbolic-ref [-q] [--short] [--no-recurse] <name>"
15694 +msgstr "git symbolic-ref [-q] [--short] [--no-recurse] <名称>"
15695
15696 #: builtin/symbolic-ref.c
15626 -msgid "git symbolic-ref -d [-q] <name>"
15627 -msgstr "git symbolic-ref -d [-q] <名称>"
15697 +msgid "git symbolic-ref --delete [-q] <name>"
15698 +msgstr "git symbolic-ref --delete [-q] <名称>"
15699
15700 #: builtin/symbolic-ref.c
15701 msgid "suppress error message for non-symbolic (detached) refs"
@@ -15638,6 +15709,10 @@ msgstr "删除符号引用"
15709 msgid "shorten ref output"
15710 msgstr "缩短引用输出"
15711
15712 +#: builtin/symbolic-ref.c
15713 +msgid "recursively dereference (default)"
15714 +msgstr "递归解引用（默认）"
15715 +
15716 #: builtin/symbolic-ref.c builtin/update-ref.c
15717 msgid "reason"
15718 msgstr "原因"
@@ -15648,11 +15723,11 @@ msgstr "更新的原因"
15723
15724 #: builtin/tag.c
15725 msgid ""
15651 -"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
15652 -" <tagname> [<head>]"
15726 +"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
15727 +" <tagname> [<commit> | <object>]"
15728 msgstr ""
15654 -"git tag [-a | -s | -u <key-id>] [-f] [-m <消息> | -F <文件>]\n"
15655 -" <标签名> [<头>]"
15729 +"git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n"
15730 +" <标签名> [<提交> | <对象>]"
15731
15732 #: builtin/tag.c
15733 msgid "git tag -d <tagname>..."
@@ -15660,14 +15735,15 @@ msgstr "git tag -d <标签名>..."
15735
15736 #: builtin/tag.c
15737 msgid ""
15663 -"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
15664 -"points-at <object>]\n"
15665 -" [--format=<format>] [--merged <commit>] [--no-merged <commit>] "
15666 -"[<pattern>...]"
15738 +"git tag [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]\n"
15739 +" [--points-at <object>] [--column[=<options>] | --no-column]\n"
15740 +" [--create-reflog] [--sort=<key>] [--format=<format>]\n"
15741 +" [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
15742 msgstr ""
15668 -"git tag -l [-n[<数字>]] [--contains <提交>] [--no-contains <提交>] [--points-"
15669 -"at <对象>]\n"
15670 -" [--format=<格式>] [--merged <提交>] [--no-merged <提交>] [<模式>...]"
15743 +"git tag [-n[<数字>]] -l [--contains <提交>] [--no-contains <提交>]\n"
15744 +" [--points-at <对象>] [--column[=<选项>] | --no-column]\n"
15745 +" [--create-reflog] [--sort=<键>] [--format=<格式>]\n"
15746 +" [--merged <提交>] [--no-merged <提交>] [<模式>...]"
15747
15748 #: builtin/tag.c
15749 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -16139,8 +16215,12 @@ msgid "update the info files from scratch"
16215 msgstr "从头开始更新文件信息"
16216
16217 #: builtin/upload-pack.c
16142 -msgid "git upload-pack [<options>] <dir>"
16143 -msgstr "git upload-pack [<选项>] <目录>"
16218 +msgid ""
16219 +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
16220 +" [--advertise-refs] <directory>"
16221 +msgstr ""
16222 +"git-upload-pack [--[no-]strict] [--timeout=<n>] [--stateless-rpc]\n"
16223 +" [--advertise-refs] <目录>"
16224
16225 #: builtin/upload-pack.c t/helper/test-serve-v2.c
16226 msgid "quit after a single request/response exchange"
@@ -16159,8 +16239,8 @@ msgid "interrupt transfer after <n> seconds of inactivity"
16239 msgstr "不活动 <n> 秒钟后终止传输"
16240
16241 #: builtin/verify-commit.c
16162 -msgid "git verify-commit [-v | --verbose] <commit>..."
16163 -msgstr "git verify-commit [-v | --verbose] <提交>..."
16242 +msgid "git verify-commit [-v | --verbose] [--raw] <commit>..."
16243 +msgstr "git verify-commit [-v | --verbose] [--raw] <提交>..."
16244
16245 #: builtin/verify-commit.c
16246 msgid "print commit contents"
@@ -16171,8 +16251,8 @@ msgid "print raw gpg status output"
16251 msgstr "打印原始 gpg 状态输出"
16252
16253 #: builtin/verify-pack.c
16174 -msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
16175 -msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
16254 +msgid "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <pack>.idx..."
16255 +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] [--] <包>.idx..."
16256
16257 #: builtin/verify-pack.c
16258 msgid "verbose"
@@ -16183,44 +16263,48 @@ msgid "show statistics only"
16263 msgstr "只显示统计"
16264
16265 #: builtin/verify-tag.c
16186 -msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
16187 -msgstr "git verify-tag [-v | --verbose] [--format=<格式>] <标签>..."
16266 +msgid "git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."
16267 +msgstr "git verify-tag [-v | --verbose] [--format=<格式>] [--raw] <标签>..."
16268
16269 #: builtin/verify-tag.c
16270 msgid "print tag contents"
16271 msgstr "打印标签内容"
16272
16273 #: builtin/worktree.c
16194 -msgid "git worktree add [<options>] <path> [<commit-ish>]"
16195 -msgstr "git worktree add [<选项>] <路径> [<提交>]"
16274 +msgid ""
16275 +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <string>]]\n"
16276 +" [-b <new-branch>] <path> [<commit-ish>]"
16277 +msgstr ""
16278 +"git worktree add [-f] [--detach] [--checkout] [--lock [--reason <字符串>]]\n"
16279 +" [-b <新分支>] <路径> [<提交号>]"
16280
16281 #: builtin/worktree.c
16198 -msgid "git worktree list [<options>]"
16199 -msgstr "git worktree list [<选项>]"
16282 +msgid "git worktree list [-v | --porcelain [-z]]"
16283 +msgstr "git worktree list [-v | --porcelain [-z]]"
16284
16285 #: builtin/worktree.c
16202 -msgid "git worktree lock [<options>] <path>"
16203 -msgstr "git worktree lock [<选项>] <路径>"
16286 +msgid "git worktree lock [--reason <string>] <worktree>"
16287 +msgstr "git worktree lock [--reason <字符串>] <工作区>"
16288
16289 #: builtin/worktree.c
16290 msgid "git worktree move <worktree> <new-path>"
16291 msgstr "git worktree move <工作区> <新路径>"
16292
16293 #: builtin/worktree.c
16210 -msgid "git worktree prune [<options>]"
16211 -msgstr "git worktree prune [<选项>]"
16294 +msgid "git worktree prune [-n] [-v] [--expire <expire>]"
16295 +msgstr "git worktree prune [-n] [-v] [--expire <过期>]"
16296
16297 #: builtin/worktree.c
16214 -msgid "git worktree remove [<options>] <worktree>"
16215 -msgstr "git worktree remove [<选项>] <工作区>"
16298 +msgid "git worktree remove [-f] <worktree>"
16299 +msgstr "git worktree remove [-f] <工作区>"
16300
16301 #: builtin/worktree.c
16302 msgid "git worktree repair [<path>...]"
16303 msgstr "git worktree repair [<路径>...]"
16304
16305 #: builtin/worktree.c
16222 -msgid "git worktree unlock <path>"
16223 -msgstr "git worktree unlock <路径>"
16306 +msgid "git worktree unlock <worktree>"
16307 +msgstr "git worktree unlock <工作区>"
16308
16309 #: builtin/worktree.c
16310 #, c-format
@@ -16504,6 +16588,11 @@ msgstr "只对调试有用"
16588 msgid "core.fsyncMethod = batch is unsupported on this platform"
16589 msgstr "core.fsyncMethod = batch 不支持本平台"
16590
16591 +#: bundle-uri.c
16592 +#, c-format
16593 +msgid "bundle list at '%s' has no mode"
16594 +msgstr "在 '%s' 的归档包列表没有模式"
16595 +
16596 #: bundle-uri.c
16597 msgid "failed to create temporary file"
16598 msgstr "无法创建临时文件"
@@ -16512,6 +16601,16 @@ msgstr "无法创建临时文件"
16601 msgid "insufficient capabilities"
16602 msgstr "缺乏能力"
16603
16604 +#: bundle-uri.c
16605 +#, c-format
16606 +msgid "unrecognized bundle mode from URI '%s'"
16607 +msgstr "不可辨认的归档包模式来自 URI '%s'"
16608 +
16609 +#: bundle-uri.c
16610 +#, c-format
16611 +msgid "exceeded bundle URI recursion limit (%d)"
16612 +msgstr "超过了 URI 递归限制 (%d)"
16613 +
16614 #: bundle-uri.c
16615 #, c-format
16616 msgid "failed to download bundle from URI '%s'"
@@ -16519,13 +16618,20 @@ msgstr "无法从 URI '%s' 下载归档包"
16618
16619 #: bundle-uri.c
16620 #, c-format
16522 -msgid "file at URI '%s' is not a bundle"
16523 -msgstr "位于 URI '%s' 的文件不是归档包"
16621 +msgid "file at URI '%s' is not a bundle or bundle list"
16622 +msgstr "位于 URI '%s' 的文件不是归档包或归档包列表"
16623
16624 #: bundle-uri.c
16526 -#, c-format
16527 -msgid "failed to unbundle bundle from URI '%s'"
16528 -msgstr "无法从 URI '%s' 解开归档包"
16625 +msgid "bundle-uri: got an empty line"
16626 +msgstr "bundle-uri: 获得了空行"
16627 +
16628 +#: bundle-uri.c
16629 +msgid "bundle-uri: line is not of the form 'key=value'"
16630 +msgstr "bundle-uri: 行不是以 'key=value' 格式"
16631 +
16632 +#: bundle-uri.c
16633 +msgid "bundle-uri: line has empty key or value"
16634 +msgstr "bundle-uri: 行有空的键或值"
16635
16636 #: bundle.c
16637 #, c-format
@@ -17280,7 +17386,7 @@ msgid "Chunk-based file formats"
17386 msgstr "块式文件格式"
17387
17388 #: command-list.h
17283 -msgid "Git commit graph format"
17389 +msgid "Git commit-graph format"
17390 msgstr "Git 提交图格式"
17391
17392 #: command-list.h
@@ -17707,6 +17813,11 @@ msgstr "'has_worktree_moved' 中未处理的情况：%d"
17813 msgid "health thread wait failed [GLE %ld]"
17814 msgstr "健康监测线程等待失败 [GLE %ld]"
17815
17816 +#: compat/fsmonitor/fsm-ipc-darwin.c
17817 +#, c-format
17818 +msgid "Invalid path: %s"
17819 +msgstr "无效路径： %s"
17820 +
17821 #: compat/fsmonitor/fsm-listen-darwin.c
17822 msgid "Unable to create FSEventStream."
17823 msgstr "无法创建 FSEventStream。"
@@ -17745,12 +17856,32 @@ msgstr "GetOverlappedResult 失败于 '%s' [GLE %ld]"
17856 msgid "could not read directory changes [GLE %ld]"
17857 msgstr "无法获取目录变更 [GLE %ld]"
17858
17748 -#: compat/fsmonitor/fsm-settings-win32.c
17859 +#: compat/fsmonitor/fsm-path-utils-darwin.c
17860 +#, c-format
17861 +msgid "opendir('%s') failed"
17862 +msgstr "opendir('%s') 失败"
17863 +
17864 +#: compat/fsmonitor/fsm-path-utils-darwin.c
17865 +#, c-format
17866 +msgid "lstat('%s') failed"
17867 +msgstr "lstat('%s') 失败"
17868 +
17869 +#: compat/fsmonitor/fsm-path-utils-darwin.c
17870 +#, c-format
17871 +msgid "strbuf_readlink('%s') failed"
17872 +msgstr "strbuf_readlink('%s') 失败"
17873 +
17874 +#: compat/fsmonitor/fsm-path-utils-darwin.c
17875 +#, c-format
17876 +msgid "closedir('%s') failed"
17877 +msgstr "closedir('%s') 失败"
17878 +
17879 +#: compat/fsmonitor/fsm-path-utils-win32.c
17880 #, c-format
17881 msgid "[GLE %ld] unable to open for read '%ls'"
17882 msgstr "[GLE %ld] 无法打开要读取的 '%ls'"
17883
17753 -#: compat/fsmonitor/fsm-settings-win32.c
17884 +#: compat/fsmonitor/fsm-path-utils-win32.c
17885 #, c-format
17886 msgid "[GLE %ld] unable to get protocol information for '%ls'"
17887 msgstr "[GLE %ld] 无法获取 '%ls' 的协议信息 "
@@ -19719,8 +19850,9 @@ msgstr "虚拟仓库 '%s' 与 fsmonitor 不兼容"
19850 #: fsmonitor-settings.c
19851 #, c-format
19852 msgid ""
19722 -"repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"
19723 -msgstr "因为缺少 Unix 套接字，仓库 '%s' 与 fsmonitor 不兼容"
19853 +"socket directory '%s' is incompatible with fsmonitor due to lack of Unix "
19854 +"sockets support"
19855 +msgstr "因为缺少 Unix 套接字支持，套接字目录 '%s' 与 fsmonitor 不兼容"
19856
19857 #: git.c
19858 msgid ""
@@ -20107,8 +20239,8 @@ msgstr[1] ""
20239 "最相似的命令是"
20240
20241 #: help.c
20110 -msgid "git version [<options>]"
20111 -msgstr "git version [<选项>]"
20242 +msgid "git version [--build-options]"
20243 +msgstr "git version [--build-options]"
20244
20245 #: help.c
20246 #, c-format
@@ -21180,11 +21312,6 @@ msgstr "无法规范化备用对象路径：%s"
21312 msgid "%s: ignoring alternate object stores, nesting too deep"
21313 msgstr "%s：忽略备用对象库，嵌套太深"
21314
21183 -#: object-file.c
21184 -#, c-format
21185 -msgid "unable to normalize object directory: %s"
21186 -msgstr "无法规范化对象目录: %s"
21187 -
21315 #: object-file.c
21316 msgid "unable to fdopen alternates lockfile"
21317 msgstr "无法 fdopen 替换锁文件"
@@ -22194,6 +22321,11 @@ msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入"
22321 msgid "promisor remote name cannot begin with '/': %s"
22322 msgstr "promisor 远程名称不能以 '/' 开始：%s"
22323
22324 +#: promisor-remote.c
22325 +#, c-format
22326 +msgid "could not fetch %s from promisor remote"
22327 +msgstr "无法从承诺者远程获取 %s"
22328 +
22329 #: protocol-caps.c
22330 msgid "object-info: expected flush after arguments"
22331 msgstr "object-info：在参数之后应有一个 flush"
@@ -23466,6 +23598,15 @@ msgstr "不能确定 HEAD 版本"
23598 msgid "failed to find tree of %s"
23599 msgstr "无法找到 %s 指向的树"
23600
23601 +#: revision.c
23602 +#, c-format
23603 +msgid "unsupported section for hidden refs: %s"
23604 +msgstr "不支持的隐藏引用片段： %s"
23605 +
23606 +#: revision.c
23607 +msgid "--exclude-hidden= passed more than once"
23608 +msgstr "--exclude-hidden= 传递了不止一次"
23609 +
23610 #: revision.c
23611 #, c-format
23612 msgid "resolve-undo records `%s` which is missing"
@@ -23651,6 +23792,16 @@ msgstr "scalar reconfigure [--all | <登记>]"
23792 msgid "--all or <enlistment>, but not both"
23793 msgstr "--all 或者 <登记>，而不是两个一起"
23794
23795 +#: scalar.c
23796 +#, c-format
23797 +msgid "could not remove stale scalar.repo '%s'"
23798 +msgstr "无法删除过期的 scalar.repo '%s'"
23799 +
23800 +#: scalar.c
23801 +#, c-format
23802 +msgid "removing stale scalar.repo '%s'"
23803 +msgstr "正在删除过期的 scalar.repo '%s'"
23804 +
23805 #: scalar.c
23806 #, c-format
23807 msgid "git repository gone in '%s'"
@@ -24397,6 +24548,11 @@ msgstr ""
24548 msgid "illegal label name: '%.*s'"
24549 msgstr "非法的标签名称：'%.*s'"
24550
24551 +#: sequencer.c
24552 +#, c-format
24553 +msgid "could not resolve '%s'"
24554 +msgstr "无法解析 '%s'"
24555 +
24556 #: sequencer.c
24557 msgid "writing fake root commit"
24558 msgstr "写伪根提交"
@@ -24405,11 +24561,6 @@ msgstr "写伪根提交"
24561 msgid "writing squash-onto"
24562 msgstr "写入 squash-onto"
24563
24408 -#: sequencer.c
24409 -#, c-format
24410 -msgid "could not resolve '%s'"
24411 -msgstr "无法解析 '%s'"
24412 -
24564 #: sequencer.c
24565 msgid "cannot merge without a current revision"
24566 msgstr "没有当前版本不能合并"
@@ -25123,6 +25274,18 @@ msgstr "ls-tree 返回未知返回值 %d"
25274 msgid "failed to lstat '%s'"
25275 msgstr "无法执行 lstat '%s'"
25276
25277 +#: t/helper/test-cache-tree.c
25278 +msgid "test-tool cache-tree <options> (control|prime|update)"
25279 +msgstr "test-tool cache-tree <选项> (control|prime|update)"
25280 +
25281 +#: t/helper/test-cache-tree.c
25282 +msgid "clear the cache tree before each iteration"
25283 +msgstr "在每次迭代前清除缓存树"
25284 +
25285 +#: t/helper/test-cache-tree.c
25286 +msgid "number of entries in the cache tree to invalidate (default 0)"
25287 +msgstr "缓存树中无效化的条目数量（默认 0）"
25288 +
25289 #: t/helper/test-fast-rebase.c
25290 msgid "unhandled options"
25291 msgstr "未处理的选项"