@matheusbsbs / matheus-bagliano / commits / 2000abefba

l10n: zh_CN: updated translation for 2.51

Signed-off-by: Teng Long <dyroneteng@gmail.com> Reviewed-by: Fangyi Zhou <me@fangyi.io> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Teng Long committed Aug 15, 2025 at 15:27 UTC 2000abefbafc061ace30d0f92d7bde4b6805e6d1
1 file changed +444 -248
po/zh_CN.po
+444 -248
@@ -155,8 +155,8 @@ msgid ""
155 msgstr ""
156 "Project-Id-Version: Git\n"
157 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
158 -"POT-Creation-Date: 2025-06-08 20:30+0800\n"
159 -"PO-Revision-Date: 2025-06-12 14:50+0800\n"
158 +"POT-Creation-Date: 2025-08-12 20:20-0400\n"
159 +"PO-Revision-Date: 2025-08-17 08:14-0400\n"
160 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
161 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
162 "Language: zh_CN\n"
@@ -166,6 +166,11 @@ msgstr ""
166 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
167 "X-Generator: Gtranslator 42.0\n"
168
169 +#: add-interactive.c
170 +#, c-format
171 +msgid "%s cannot be negative"
172 +msgstr "%s 不能为负数"
173 +
174 #: add-interactive.c
175 #, c-format
176 msgid "Huh (%s)?"
@@ -1074,10 +1079,10 @@ msgstr "未能识别的空白字符忽略选项 '%s'"
1079 #: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
1080 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
1081 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
1077 -#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
1078 -#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-parse.c
1079 -#: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c
1080 -#: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c
1082 +#: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
1083 +#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
1084 +#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
1085 +#: parse-options.c range-diff.c revision.c
1086 #, c-format
1087 msgid "options '%s' and '%s' cannot be used together"
1088 msgstr "选项 '%s' 和 '%s' 不能同时使用"
@@ -2459,6 +2464,12 @@ msgstr "如果您确实想添加它们，请使用 -f 选项。"
2464 msgid "adding files failed"
2465 msgstr "添加文件失败"
2466
2467 +#: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c
2468 +#: builtin/stash.c
2469 +#, c-format
2470 +msgid "'%s' cannot be negative"
2471 +msgstr "'%s' 不能为负数"
2472 +
2473 #: builtin/add.c
2474 #, c-format
2475 msgid "--chmod param '%s' must be either -x or +x"
@@ -2497,7 +2508,7 @@ msgid "bad action '%s' for '%s'"
2508 msgstr "'%2$s' 的错误动作 '%1$s'"
2509
2510 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2500 -#: builtin/pull.c builtin/revert.c config.c diff-merges.c gpg-interface.c
2511 +#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
2512 #: ls-refs.c parallel-checkout.c sequencer.c setup.c
2513 #, c-format
2514 msgid "invalid value for '%s': '%s'"
@@ -3819,8 +3830,8 @@ msgstr "HEAD 没有位于 /refs/heads 之下！"
3830
3831 #: builtin/branch.c
3832 msgid ""
3822 -"branch with --recurse-submodules can only be used if "
3823 -"submodule.propagateBranches is enabled"
3833 +"branch with --recurse-submodules can only be used if submodule."
3834 +"propagateBranches is enabled"
3835 msgstr ""
3836 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
3837
@@ -3963,8 +3974,8 @@ msgstr ""
3974 "请检查下面错误报告中余下的内容。\n"
3975 "您可以删除任何您不想共享的内容。\n"
3976
3966 -#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c
3967 -#: parse-options.h
3977 +#: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
3978 +#: builtin/pack-objects.c builtin/rebase.c parse-options.h
3979 msgid "mode"
3980 msgstr "模式"
3981
@@ -6373,25 +6384,26 @@ msgstr "git config list [<文件选项>] [<显示选项>] [--includes]"
6384 #: builtin/config.c
6385 msgid ""
6386 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6376 -"regexp] [--value=<value>] [--fixed-value] [--default=<default>] <name>"
6387 +"regexp] [--value=<pattern>] [--fixed-value] [--default=<default>] [--"
6388 +"url=<url>] <name>"
6389 msgstr ""
6390 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp] [--"
6379 -"value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6391 +"value=<模式>] [--fixed-value] [--default=<默认值>] [--url=<url>] <名称>"
6392
6393 #: builtin/config.c
6394 msgid ""
6383 -"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
6384 -"fixed-value] <name> <value>"
6395 +"git config set [<file-option>] [--type=<type>] [--all] [--value=<pattern>] "
6396 +"[--fixed-value] <name> <value>"
6397 msgstr ""
6386 -"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-"
6387 -"value] <名称> <值>"
6398 +"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<模式>] [--"
6399 +"fixed-value] <名称> <值>"
6400
6401 #: builtin/config.c
6402 msgid ""
6391 -"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
6403 +"git config unset [<file-option>] [--all] [--value=<pattern>] [--fixed-value] "
6404 "<name>"
6405 msgstr ""
6394 -"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称>"
6406 +"git config unset [<文件选项>] [--all] [--value=<模式>] [--fixed-value] <名称>"
6407
6408 #: builtin/config.c
6409 msgid "git config rename-section [<file-option>] <old-name> <new-name>"
@@ -6412,19 +6424,19 @@ msgstr "git config [<文件选项>] --get-colorbool <名称> [<标准输出为tt
6424 #: builtin/config.c
6425 msgid ""
6426 "git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6415 -"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
6427 +"regexp=<regexp>] [--value=<pattern>] [--fixed-value] [--default=<default>] "
6428 "<name>"
6429 msgstr ""
6430 "git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
6419 -"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6431 +"表达式>] [--value=<模式>] [--fixed-value] [--default=<默认值>] <名称>"
6432
6433 #: builtin/config.c
6434 msgid ""
6435 "git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
6424 -"[--value=<value>] [--fixed-value] <name> <value>"
6436 +"[--value=<pattern>] [--fixed-value] <name> <value>"
6437 msgstr ""
6438 "git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--"
6427 -"value=<值>] [--fixed-value] <名称> <值>"
6439 +"value=<模式>] [--fixed-value] <名称> <值>"
6440
6441 #: builtin/config.c
6442 msgid "Config file location"
@@ -7046,7 +7058,7 @@ msgstr "不能解析模式：%s"
7058 #: builtin/diff-pairs.c
7059 #, c-format
7060 msgid "unable to parse object id: %s"
7049 -msgstr "不能解析对象ID：%s"
7061 +msgstr "不能解析对象 ID：%s"
7062
7063 #: builtin/diff-pairs.c
7064 msgid "git diff-pairs -z [<diff-options>]"
@@ -7492,27 +7504,6 @@ msgstr "%s 未发送所有必需的对象"
7504 msgid "rejected %s because shallow roots are not allowed to be updated"
7505 msgstr "拒绝 %s 因为浅克隆的根不允许被更新"
7506
7495 -#: builtin/fetch.c
7496 -#, c-format
7497 -msgid ""
7498 -"some local refs could not be updated; try running\n"
7499 -" 'git remote prune %s' to remove any old, conflicting branches"
7500 -msgstr ""
7501 -"一些本地引用不能被更新；尝试运行\n"
7502 -" 'git remote prune %s' 来删除旧的、有冲突的分支"
7503 -
7504 -# 译者：注意保持前导空格
7505 -#: builtin/fetch.c
7506 -#, c-format
7507 -msgid " (%s will become dangling)"
7508 -msgstr " （%s 将成为悬空状态）"
7509 -
7510 -# 译者：注意保持前导空格
7511 -#: builtin/fetch.c
7512 -#, c-format
7513 -msgid " (%s has become dangling)"
7514 -msgstr " （%s 已成为悬空状态）"
7515 -
7507 #: builtin/fetch.c
7508 msgid "[deleted]"
7509 msgstr "[已删除]"
@@ -7536,7 +7527,7 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
7527 msgid "option \"%s\" is ignored for %s"
7528 msgstr "选项 \"%s\" 为 %s 所忽略"
7529
7539 -#: builtin/fetch.c object-store.c
7530 +#: builtin/fetch.c odb.c
7531 #, c-format
7532 msgid "%s is not a valid object"
7533 msgstr "%s 不是一个有效的对象"
@@ -7560,6 +7551,20 @@ msgstr ""
7551 "运行命令 'git config remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
7552 "以禁用该警告，直到远程将 HEAD 更改为其他内容。"
7553
7554 +#: builtin/fetch.c
7555 +#, c-format
7556 +msgid ""
7557 +"some local refs could not be updated; try running\n"
7558 +" 'git remote prune %s' to remove any old, conflicting branches"
7559 +msgstr ""
7560 +"一些本地引用不能被更新；尝试运行\n"
7561 +" 'git remote prune %s' 来删除旧的、有冲突的分支"
7562 +
7563 +#: builtin/fetch.c
7564 +#, c-format
7565 +msgid "fetching ref %s failed: %s"
7566 +msgstr "获取引用 %s 失败：%s"
7567 +
7568 #: builtin/fetch.c
7569 msgid "multiple branches detected, incompatible with --set-upstream"
7570 msgstr "检测到多分支，和 --set-upstream 不兼容"
@@ -7799,8 +7804,8 @@ msgstr "协议不支持 --negotiate-only，退出"
7804
7805 #: builtin/fetch.c
7806 msgid ""
7802 -"--filter can only be used with the remote configured in "
7803 -"extensions.partialclone"
7807 +"--filter can only be used with the remote configured in extensions."
7808 +"partialclone"
7809 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
7810
7811 #: builtin/fetch.c
@@ -7856,6 +7861,10 @@ msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
7861 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
7862 msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
7863
7864 +#: builtin/for-each-ref.c
7865 +msgid "git for-each-ref [--start-after <marker>]"
7866 +msgstr "git for-each-ref [--start-after <标记>]"
7867 +
7868 #: builtin/for-each-ref.c
7869 msgid "quote placeholders suitably for shells"
7870 msgstr "引用占位符适用于 shells"
@@ -7876,6 +7885,14 @@ msgstr "引用占位符适用于 Tcl"
7885 msgid "show only <n> matched refs"
7886 msgstr "只显示 <n> 个匹配的引用"
7887
7888 +#: builtin/for-each-ref.c
7889 +msgid "marker"
7890 +msgstr "标记"
7891 +
7892 +#: builtin/for-each-ref.c
7893 +msgid "start iteration after the provided marker"
7894 +msgstr "从指定标记之后开始迭代"
7895 +
7896 #: builtin/for-each-ref.c builtin/tag.c
7897 msgid "respect format colors"
7898 msgstr "遵照格式中的颜色输出"
@@ -7908,10 +7925,18 @@ msgstr "从标准输入读取引用的模式"
7925 msgid "also include HEAD ref and pseudorefs"
7926 msgstr "还包括 HEAD 引用和伪引用"
7927
7928 +#: builtin/for-each-ref.c
7929 +msgid "cannot use --start-after with custom sort options"
7930 +msgstr "不能将 --start-after 与自定义排序选项一同使用"
7931 +
7932 #: builtin/for-each-ref.c
7933 msgid "unknown arguments supplied with --stdin"
7934 msgstr "为 --stdin 提供了未知的命令参数"
7935
7936 +#: builtin/for-each-ref.c
7937 +msgid "cannot use --start-after with patterns"
7938 +msgstr "不能将 --start-after 与模式匹配一同使用"
7939 +
7940 #: builtin/for-each-repo.c
7941 msgid "git for-each-repo --config=<config> [--] <arguments>"
7942 msgstr "git for-each-repo --config=<配置> [--] <命令参数>"
@@ -8413,6 +8438,10 @@ msgstr "除了最大的包之外，对所有其它包文件重新打包"
8438 msgid "pack prefix to store a pack containing pruned objects"
8439 msgstr "用于存储修剪对象的包前缀"
8440
8441 +#: builtin/gc.c
8442 +msgid "skip maintenance tasks typically done in the foreground"
8443 +msgstr "跳过通常在前台执行的维护任务"
8444 +
8445 #: builtin/gc.c
8446 #, c-format
8447 msgid "failed to parse gc.logExpiry value %s"
@@ -8500,13 +8529,13 @@ msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
8529
8530 #: builtin/gc.c
8531 #, c-format
8503 -msgid "lock file '%s' exists, skipping maintenance"
8504 -msgstr "锁文件 '%s' 已存在，跳过维护"
8532 +msgid "task '%s' failed"
8533 +msgstr "任务 '%s' 失败"
8534
8535 #: builtin/gc.c
8536 #, c-format
8508 -msgid "task '%s' failed"
8509 -msgstr "任务 '%s' 失败"
8537 +msgid "lock file '%s' exists, skipping maintenance"
8538 +msgstr "锁文件 '%s' 已存在，跳过维护"
8539
8540 #: builtin/gc.c
8541 #, c-format
@@ -8546,10 +8575,6 @@ msgstr "任务"
8575 msgid "run a specific task"
8576 msgstr "运行一个特定的任务"
8577
8549 -#: builtin/gc.c
8550 -msgid "use at most one of --auto and --schedule=<frequency>"
8551 -msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
8552 -
8578 #: builtin/gc.c
8579 #, c-format
8580 msgid "unable to add '%s' value of '%s'"
@@ -9649,11 +9674,6 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数
9674 msgid "-L<range>:<file> cannot be used with pathspec"
9675 msgstr "-L<范围>:<文件> 不能和路径表达式共用"
9676
9652 -#: builtin/log.c
9653 -#, c-format
9654 -msgid "Final output: %d %s\n"
9655 -msgstr "最终输出：%d %s\n"
9656 -
9677 #: builtin/log.c
9678 #, c-format
9679 msgid "git show %s: bad file"
@@ -10561,6 +10581,10 @@ msgstr "在合并的最后显示差异统计"
10581 msgid "(synonym to --stat)"
10582 msgstr "（和 --stat 同义）"
10583
10584 +#: builtin/merge.c builtin/pull.c
10585 +msgid "show a compact-summary at the end of the merge"
10586 +msgstr "在合并结束时显示简洁摘要"
10587 +
10588 #: builtin/merge.c builtin/pull.c
10589 msgid "add (at most <n>) entries from shortlog to merge commit message"
10590 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
@@ -10888,11 +10912,6 @@ msgstr "警告：标签输入未通过 fsck：%s"
10912 msgid "error: tag input does not pass fsck: %s"
10913 msgstr "错误：标签输入未通过 fsck：%s"
10914
10891 -#: builtin/mktag.c
10892 -#, c-format
10893 -msgid "%d (FSCK_IGNORE?) should never trigger this callback"
10894 -msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调"
10895 -
10915 #: builtin/mktag.c
10916 #, c-format
10917 msgid "could not read tagged object '%s'"
@@ -11536,14 +11555,27 @@ msgstr "从 <注解引用> 使用注解"
11555 msgid "unknown subcommand: `%s'"
11556 msgstr "未知子命令：`%s'"
11557
11539 -#: builtin/pack-objects.c
11540 -msgid "git pack-objects --stdout [<options>] [< <ref-list> | < <object-list>]"
11541 -msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]"
11542 -
11558 #: builtin/pack-objects.c
11559 msgid ""
11545 -"git pack-objects [<options>] <base-name> [< <ref-list> | < <object-list>]"
11546 -msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]"
11560 +"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
11561 +"implied]\n"
11562 +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
11563 +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
11564 +" [--revs [--unpacked | --all]] [--keep-pack=<pack-name>]\n"
11565 +" [--cruft] [--cruft-expiration=<time>]\n"
11566 +" [--stdout [--filter=<filter-spec>] | <base-name>]\n"
11567 +" [--shallow] [--keep-true-parents] [--[no-]sparse]\n"
11568 +" [--name-hash-version=<n>] [--path-walk] < <object-list>"
11569 +msgstr ""
11570 +"git pack-objects [-q | --progress | --all-progress] [--all-progress-"
11571 +"implied]\n"
11572 +" [--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
11573 +" [--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
11574 +" [--revs [--unpacked | --all]] [--keep-pack=<包名>]\n"
11575 +" [--cruft] [--cruft-expiration=<时间>]\n"
11576 +" [--stdout [--filter=<过滤规格>] | <基线名称>]\n"
11577 +" [--shallow] [--keep-true-parents] [--[no-]sparse]\"\n"
11578 +" [--name-hash-version=<n>] [--path-walk] < <对象列表>"
11579
11580 #: builtin/pack-objects.c
11581 #, c-format
@@ -11671,6 +11703,17 @@ msgstr "无法为标签 %s 压缩对象"
11703 msgid "unable to get type of object %s"
11704 msgstr "无法获得对象 %s 类型"
11705
11706 +#: builtin/pack-objects.c
11707 +msgid "Compressing objects by path"
11708 +msgstr "按路径压缩对象"
11709 +
11710 +#: builtin/pack-objects.c
11711 +#, c-format
11712 +msgid "Path-based delta compression using up to %d thread"
11713 +msgid_plural "Path-based delta compression using up to %d threads"
11714 +msgstr[0] "基于路径的差值压缩，最多使用 %d 个线程"
11715 +msgstr[1] "基于路径的差值压缩，最多使用 %d 个线程"
11716 +
11717 #: builtin/pack-objects.c
11718 msgid "Compressing objects"
11719 msgstr "压缩对象中"
@@ -11761,6 +11804,10 @@ msgstr "无法检查 %s 处的松散对象"
11804 msgid "unable to force loose object"
11805 msgstr "无法强制松散对象"
11806
11807 +#: builtin/pack-objects.c
11808 +msgid "failed to pack objects via path-walk"
11809 +msgstr "通过 path-walk 打包对象失败"
11810 +
11811 #: builtin/pack-objects.c
11812 #, c-format
11813 msgid "not a rev '%s'"
@@ -11905,6 +11952,10 @@ msgstr "使用稀疏可达性算法"
11952 msgid "create thin packs"
11953 msgstr "创建精简包"
11954
11955 +#: builtin/pack-objects.c
11956 +msgid "use the path-walk API to walk objects when possible"
11957 +msgstr "在可能的情况下使用 path-walk API 遍历对象"
11958 +
11959 #: builtin/pack-objects.c
11960 msgid "create packs suitable for shallow fetches"
11961 msgstr "创建适合浅克隆仓库获取的包"
@@ -11975,7 +12026,12 @@ msgstr "增量链深度 %d 太深了，强制为 %d"
12026 msgid "pack.deltaCacheLimit is too high, forcing %d"
12027 msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
12028
11978 -#: builtin/pack-objects.c config.c
12029 +#: builtin/pack-objects.c
12030 +#, c-format
12031 +msgid "cannot use %s with %s"
12032 +msgstr "不能将 %s 与 %s 一同使用"
12033 +
12034 +#: builtin/pack-objects.c environment.c
12035 #, c-format
12036 msgid "bad pack compression level %d"
12037 msgstr "错误的打包压缩级别 %d"
@@ -11992,10 +12048,6 @@ msgstr "最小的包文件大小是 1 MiB"
12048 msgid "--thin cannot be used to build an indexable pack"
12049 msgstr "--thin 不能用于创建一个可索引包"
12050
11995 -#: builtin/pack-objects.c
11996 -msgid "cannot use --filter with --stdin-packs"
11997 -msgstr "不能同时使用 --filter 和 --stdin-packs"
11998 -
12051 #: builtin/pack-objects.c
12052 msgid "cannot use internal rev list with --stdin-packs"
12053 msgstr "不能同时使用内部版本列表和 --stdin-packs"
@@ -12004,10 +12056,6 @@ msgstr "不能同时使用内部版本列表和 --stdin-packs"
12056 msgid "cannot use internal rev list with --cruft"
12057 msgstr "不能同时使用内部版本列表和 --cruft"
12058
12007 -#: builtin/pack-objects.c
12008 -msgid "cannot use --stdin-packs with --cruft"
12009 -msgstr "不能将 --stdin-packs 和 --cruft 同时使用"
12010 -
12059 #: builtin/pack-objects.c
12060 msgid "Enumerating objects"
12061 msgstr "枚举对象中"
@@ -12021,23 +12069,6 @@ msgstr ""
12069 "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
12070 "%<PRIu32>（来自 %<PRIuMAX> 个包）"
12071
12024 -#: builtin/pack-redundant.c
12025 -msgid ""
12026 -"'git pack-redundant' is nominated for removal.\n"
12027 -"If you still use this command, please add an extra\n"
12028 -"option, '--i-still-use-this', on the command line\n"
12029 -"and let us know you still use it by sending an e-mail\n"
12030 -"to <git@vger.kernel.org>. Thanks.\n"
12031 -msgstr ""
12032 -"准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n"
12033 -"命令，请在命令行中添加额外参数：'--i-still-use-this'，\n"
12034 -"并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
12035 -"使用它。 谢谢。\n"
12036 -
12037 -#: builtin/pack-redundant.c
12038 -msgid "refusing to run without --i-still-use-this"
12039 -msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
12040 -
12072 #: builtin/pack-refs.c
12073 msgid ""
12074 "git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
@@ -12395,8 +12426,8 @@ msgid ""
12426 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
12427 msgstr ""
12428 "\n"
12398 -"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 "
12399 -"push.autoSetupRemote。\n"
12429 +"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 'push."
12430 +"autoSetupRemote'。\n"
12431
12432 #: builtin/push.c
12433 #, c-format
@@ -12862,8 +12893,8 @@ msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。"
12893 #: builtin/rebase.c
12894 #, c-format
12895 msgid ""
12865 -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
12866 -"\"stop\"."
12896 +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop"
12897 +"\"."
12898 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
12899
12900 #: builtin/rebase.c
@@ -13557,6 +13588,16 @@ msgstr ""
13588 msgid "unknown --mirror argument: %s"
13589 msgstr "未知的 --mirror 参数：%s"
13590
13591 +#: builtin/remote.c
13592 +#, c-format
13593 +msgid "remote name '%s' is a subset of existing remote '%s'"
13594 +msgstr "远程名称 '%s' 是现有远程 '%s' 的子集"
13595 +
13596 +#: builtin/remote.c
13597 +#, c-format
13598 +msgid "remote name '%s' is a superset of existing remote '%s'"
13599 +msgstr "远程名称 '%s' 是现有远程 '%s' 的超集"
13600 +
13601 #: builtin/remote.c
13602 msgid "fetch the remote branches"
13603 msgstr "抓取远程的分支"
@@ -13920,18 +13961,6 @@ msgstr "不是一个有效引用：%s"
13961 msgid "Could not set up %s"
13962 msgstr "不能设置 %s"
13963
13923 -# 译者：注意保持前导空格
13924 -#: builtin/remote.c
13925 -#, c-format
13926 -msgid " %s will become dangling!"
13927 -msgstr " %s 将成为悬空状态！"
13928 -
13929 -# 译者：注意保持前导空格
13930 -#: builtin/remote.c
13931 -#, c-format
13932 -msgid " %s has become dangling!"
13933 -msgstr " %s 已成为悬空状态！"
13934 -
13964 #: builtin/remote.c
13965 #, c-format
13966 msgid "Pruning %s"
@@ -14015,11 +14044,11 @@ msgstr "冗长输出；必须置于子命令之前"
14044 msgid ""
14045 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
14046 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
14018 -"[--write-midx] [--name-hash-version=<n>]"
14047 +"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
14048 msgstr ""
14049 "git repack [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [-m]\n"
14050 "[--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<包名>]\n"
14022 -"[--write-midx] [--name-hash-version=<n>]"
14051 +"[--write-midx] [--name-hash-version=<n>] [--path-walk]"
14052
14053 #: builtin/repack.c
14054 msgid ""
@@ -14120,6 +14149,10 @@ msgid ""
14149 "specify the name hash version to use for grouping similar objects by path"
14150 msgstr "指定要使用的名称哈希算法，以实现按照路径对相似对象分组"
14151
14152 +#: builtin/repack.c
14153 +msgid "pass --path-walk to git-pack-objects"
14154 +msgstr "向 git-pack-objects 传递参数 --path-walk"
14155 +
14156 #: builtin/repack.c
14157 msgid "do not run git-update-server-info"
14158 msgstr "不运行 git-update-server-info"
@@ -15536,20 +15569,28 @@ msgstr ""
15569 msgid "git stash create [<message>]"
15570 msgstr "git stash create [<消息>]"
15571
15572 +#: builtin/stash.c
15573 +msgid "git stash export (--print | --to-ref <ref>) [<stash>...]"
15574 +msgstr "git stash export (--print | --to-ref <引用>) [<贮藏>...]"
15575 +
15576 +#: builtin/stash.c
15577 +msgid "git stash import <commit>"
15578 +msgstr "git stash import <提交>"
15579 +
15580 #: builtin/stash.c
15581 #, c-format
15582 msgid "'%s' is not a stash-like commit"
15583 msgstr "'%s' 不像是一个贮藏提交"
15584
15585 +#: builtin/stash.c
15586 +msgid "No stash entries found."
15587 +msgstr "未发现贮藏条目。"
15588 +
15589 #: builtin/stash.c
15590 #, c-format
15591 msgid "Too many revisions specified:%s"
15592 msgstr "指定了太多的版本：%s"
15593
15549 -#: builtin/stash.c
15550 -msgid "No stash entries found."
15551 -msgstr "未发现贮藏条目。"
15552 -
15594 #: builtin/stash.c
15595 #, c-format
15596 msgid "%s is not a valid reference"
@@ -15745,6 +15786,86 @@ msgstr "贮藏中包含未跟踪文件"
15786 msgid "include ignore files"
15787 msgstr "包含忽略的文件"
15788
15789 +#: builtin/stash.c
15790 +#, c-format
15791 +msgid "cannot parse commit %s"
15792 +msgstr "不能解析提交 %s"
15793 +
15794 +#: builtin/stash.c
15795 +#, c-format
15796 +msgid "invalid author or committer for %s"
15797 +msgstr "%s 的作者或提交者信息无效"
15798 +
15799 +#: builtin/stash.c
15800 +msgid "could not write commit"
15801 +msgstr "无法写入提交"
15802 +
15803 +#: builtin/stash.c
15804 +#, c-format
15805 +msgid "not a valid revision: %s"
15806 +msgstr "不是有效版本：%s"
15807 +
15808 +#: builtin/stash.c
15809 +#, c-format
15810 +msgid "not a commit: %s"
15811 +msgstr "不是提交：%s"
15812 +
15813 +#: builtin/stash.c
15814 +#, c-format
15815 +msgid "%s is not a valid exported stash commit"
15816 +msgstr "%s 不是一个有效的且已导出的贮藏提交"
15817 +
15818 +#: builtin/stash.c
15819 +#, c-format
15820 +msgid "found root commit %s with invalid data"
15821 +msgstr "发现根提交 %s 包含无效数据"
15822 +
15823 +#: builtin/stash.c
15824 +#, c-format
15825 +msgid "found stash commit %s without expected prefix"
15826 +msgstr "发现贮藏提交 %s 缺少预期前缀"
15827 +
15828 +#: builtin/stash.c
15829 +#, c-format
15830 +msgid "cannot parse parents of commit: %s"
15831 +msgstr "无法解析该提交的父提交：%s"
15832 +
15833 +#: builtin/stash.c
15834 +#, c-format
15835 +msgid "%s does not look like a stash commit"
15836 +msgstr "%s 看起来不像是一个贮藏提交"
15837 +
15838 +#: builtin/stash.c
15839 +#, c-format
15840 +msgid "cannot read commit buffer for %s"
15841 +msgstr "无法读取提交的缓冲区：%s"
15842 +
15843 +#: builtin/stash.c
15844 +#, c-format
15845 +msgid "cannot save the stash for %s"
15846 +msgstr "无法保存 %s 的贮藏"
15847 +
15848 +#: builtin/stash.c
15849 +msgid "unable to write base commit"
15850 +msgstr "无法写入基线提交"
15851 +
15852 +#: builtin/stash.c
15853 +#, c-format
15854 +msgid "unable to find stash entry %s"
15855 +msgstr "无法找到贮藏条目 %s"
15856 +
15857 +#: builtin/stash.c
15858 +msgid "print the object ID instead of writing it to a ref"
15859 +msgstr "打印对象 ID，而不是写入引用"
15860 +
15861 +#: builtin/stash.c
15862 +msgid "save the data to the given ref"
15863 +msgstr "将数据保存到指定引用"
15864 +
15865 +#: builtin/stash.c
15866 +msgid "exactly one of --print and --to-ref is required"
15867 +msgstr "参数 --print 和 --to-ref 必须二选一"
15868 +
15869 #: builtin/stripspace.c
15870 msgid "skip and remove all lines starting with comment character"
15871 msgstr "跳过和移除所有的注释行"
@@ -15755,21 +15876,16 @@ msgstr "为每一行的行首添加注释符和空格"
15876
15877 #: builtin/submodule--helper.c
15878 #, c-format
15758 -msgid "Expecting a full ref name, got %s"
15759 -msgstr "期望一个完整的引用名称，却得到 %s"
15879 +msgid ""
15880 +"could not look up configuration '%s'. Assuming this repository is its own "
15881 +"authoritative upstream."
15882 +msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
15883
15884 #: builtin/submodule--helper.c
15885 #, c-format
15886 msgid "could not get a repository handle for submodule '%s'"
15887 msgstr "无法获得子模组 '%s' 的仓库句柄"
15888
15766 -#: builtin/submodule--helper.c
15767 -#, c-format
15768 -msgid ""
15769 -"could not look up configuration '%s'. Assuming this repository is its own "
15770 -"authoritative upstream."
15771 -msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
15772 -
15889 #: builtin/submodule--helper.c
15890 #, c-format
15891 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -16187,6 +16303,11 @@ msgid ""
16303 "the superproject is not on any branch"
16304 msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
16305
16306 +#: builtin/submodule--helper.c
16307 +#, c-format
16308 +msgid "Expecting a full ref name, got %s"
16309 +msgstr "期望一个完整的引用名称，却得到 %s"
16310 +
16311 #: builtin/submodule--helper.c
16312 #, c-format
16313 msgid "Unable to find current revision in submodule path '%s'"
@@ -16432,6 +16553,11 @@ msgstr "只能在工作区的顶级目录中使用相对路径"
16553 msgid "repo URL: '%s' must be absolute or begin with ./|../"
16554 msgstr "仓库 URL：'%s' 必须是绝对路径或以 ./|../ 起始"
16555
16556 +#: builtin/submodule--helper.c
16557 +#, c-format
16558 +msgid "submodule name '%s' already used for path '%s'"
16559 +msgstr "子模组名称 '%s' 已被用于路径 '%s'"
16560 +
16561 #: builtin/submodule--helper.c
16562 #, c-format
16563 msgid "'%s' is not a valid submodule name"
@@ -16988,7 +17114,7 @@ msgstr "从标准输入读取更新"
17114
17115 #: builtin/update-ref.c
17116 msgid "batch reference updates"
16991 -msgstr "批量引用更新"
17117 +msgstr "批量处理引用更新"
17118
17119 #: builtin/update-server-info.c
17120 msgid "update the info files from scratch"
@@ -17205,11 +17331,6 @@ msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
17331 msgid "Preparing worktree (checking out '%s')"
17332 msgstr "准备工作区（检出 '%s'）"
17333
17208 -#: builtin/worktree.c
17209 -#, c-format
17210 -msgid "unreachable: invalid reference: %s"
17211 -msgstr "不可达：无效引用：%s"
17212 -
17334 #: builtin/worktree.c
17335 #, c-format
17336 msgid "Preparing worktree (detached HEAD %s)"
@@ -18657,8 +18778,8 @@ msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
18778 #: commit-graph.c
18779 #, c-format
18780 msgid ""
18660 -"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
18661 -"(%d) is not supported"
18781 +"attempting to write a commit-graph, but 'commitGraph."
18782 +"changedPathsVersion' (%d) is not supported"
18783 msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (%d)"
18784
18785 #: commit-graph.c
@@ -19081,8 +19202,8 @@ msgid ""
19202 "remote URLs cannot be configured in file directly or indirectly included by "
19203 "includeIf.hasconfig:remote.*.url"
19204 msgstr ""
19084 -"远程 URL 不能在文件中配置，不管直接地还是通过 "
19085 -"includeIf.hasconfig:remote.*.url 间接地包含。"
19205 +"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
19206 +"url 间接地包含"
19207
19208 #: config.c
19209 #, c-format
@@ -19226,16 +19347,6 @@ msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
19347 msgid "bad numeric config value '%s' for '%s' in %s: %s"
19348 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
19349
19229 -#: config.c
19230 -#, c-format
19231 -msgid "invalid value for variable %s"
19232 -msgstr "变量 %s 的值无效"
19233 -
19234 -#: config.c
19235 -#, c-format
19236 -msgid "ignoring unknown core.fsync component '%s'"
19237 -msgstr "忽略未知的 core.fsync 组件 '%s'"
19238 -
19350 #: config.c
19351 #, c-format
19352 msgid "bad boolean config value '%s' for '%s'"
@@ -19251,54 +19362,6 @@ msgstr "无法扩展用户目录：'%s'"
19362 msgid "'%s' for '%s' is not a valid timestamp"
19363 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
19364
19254 -#: config.c
19255 -#, c-format
19256 -msgid "abbrev length out of range: %d"
19257 -msgstr "缩写长度超出范围：%d"
19258 -
19259 -#: config.c
19260 -#, c-format
19261 -msgid "bad zlib compression level %d"
19262 -msgstr "错误的 zlib 压缩级别 %d"
19263 -
19264 -#: config.c
19265 -#, c-format
19266 -msgid "%s cannot contain newline"
19267 -msgstr "%s 不能包含换行符"
19268 -
19269 -#: config.c
19270 -#, c-format
19271 -msgid "%s must have at least one character"
19272 -msgstr "%s 必须至少有一个字符"
19273 -
19274 -#: config.c
19275 -#, c-format
19276 -msgid "ignoring unknown core.fsyncMethod value '%s'"
19277 -msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
19278 -
19279 -#: config.c
19280 -msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
19281 -msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
19282 -
19283 -#: config.c
19284 -#, c-format
19285 -msgid "invalid mode for object creation: %s"
19286 -msgstr "无效的对象创建模式：%s"
19287 -
19288 -#: config.c
19289 -#, c-format
19290 -msgid "malformed value for %s"
19291 -msgstr "%s 的取值格式错误"
19292 -
19293 -#: config.c
19294 -#, c-format
19295 -msgid "malformed value for %s: %s"
19296 -msgstr "%s 的取值格式错误：%s"
19297 -
19298 -#: config.c
19299 -msgid "must be one of nothing, matching, simple, upstream or current"
19300 -msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
19301 -
19365 #: config.c
19366 #, c-format
19367 msgid "unable to load config blob object '%s'"
@@ -19922,8 +19985,8 @@ msgid "cannot compare a named pipe to a directory"
19985 msgstr "无法将命名管道和目录进行比较"
19986
19987 #: diff-no-index.c
19925 -msgid "git diff --no-index [<options>] <path> <path>"
19926 -msgstr "git diff --no-index [<选项>] <路径> <路径>"
19988 +msgid "git diff --no-index [<options>] <path> <path> [<pathspec>...]"
19989 +msgstr "git diff --no-index [<选项>] <路径> <路径> [<路径规格>...]"
19990
19991 #: diff-no-index.c
19992 msgid ""
@@ -19931,6 +19994,12 @@ msgid ""
19994 "tree"
19995 msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
19996
19997 +#: diff-no-index.c
19998 +msgid ""
19999 +"Limiting comparison with pathspecs is only supported if both paths are "
20000 +"directories."
20001 +msgstr "仅当两个路径均为目录时，才支持使用路径表达式限制比较范围。"
20002 +
20003 # 译者：注意保持前导空格
20004 #: diff.c
20005 #, c-format
@@ -20109,7 +20178,7 @@ msgstr "生成补丁"
20178 msgid "<n>"
20179 msgstr "<n>"
20180
20112 -#: diff.c
20181 +#: diff.c parse-options.h
20182 msgid "generate diffs with <n> lines context"
20183 msgstr "生成含 <n> 行上下文的差异"
20184
@@ -20256,7 +20325,7 @@ msgstr "不显示任何源和目标前缀"
20325 msgid "use default prefixes a/ and b/"
20326 msgstr "使用 a/ 和 b/ 作为默认前缀"
20327
20259 -#: diff.c
20328 +#: diff.c parse-options.h
20329 msgid "show context between diff hunks up to the specified number of lines"
20330 msgstr "显示指定行数的差异块间的上下文"
20331
@@ -20641,6 +20710,64 @@ msgstr "不能对文件 '%s' 调用 stat"
20710 msgid "bad git namespace path \"%s\""
20711 msgstr "错误的 git 名字空间路径 \"%s\""
20712
20713 +#: environment.c
20714 +#, c-format
20715 +msgid "invalid value for variable %s"
20716 +msgstr "变量 %s 的值无效"
20717 +
20718 +#: environment.c
20719 +#, c-format
20720 +msgid "ignoring unknown core.fsync component '%s'"
20721 +msgstr "忽略未知的 core.fsync 组件 '%s'"
20722 +
20723 +#: environment.c
20724 +#, c-format
20725 +msgid "abbrev length out of range: %d"
20726 +msgstr "缩写长度超出范围：%d"
20727 +
20728 +#: environment.c
20729 +#, c-format
20730 +msgid "bad zlib compression level %d"
20731 +msgstr "错误的 zlib 压缩级别 %d"
20732 +
20733 +#: environment.c
20734 +#, c-format
20735 +msgid "%s cannot contain newline"
20736 +msgstr "%s 不能包含换行符"
20737 +
20738 +#: environment.c
20739 +#, c-format
20740 +msgid "%s must have at least one character"
20741 +msgstr "%s 必须至少有一个字符"
20742 +
20743 +#: environment.c
20744 +#, c-format
20745 +msgid "ignoring unknown core.fsyncMethod value '%s'"
20746 +msgstr "忽略未知的 core.fsyncMethod 值 '%s'"
20747 +
20748 +#: environment.c
20749 +msgid "core.fsyncObjectFiles is deprecated; use core.fsync instead"
20750 +msgstr "core.fsyncObjectFiles 已经被弃用；取而代之使用 core.fsync"
20751 +
20752 +#: environment.c
20753 +#, c-format
20754 +msgid "invalid mode for object creation: %s"
20755 +msgstr "无效的对象创建模式：%s"
20756 +
20757 +#: environment.c
20758 +#, c-format
20759 +msgid "malformed value for %s"
20760 +msgstr "%s 的取值格式错误"
20761 +
20762 +#: environment.c
20763 +#, c-format
20764 +msgid "malformed value for %s: %s"
20765 +msgstr "%s 的取值格式错误：%s"
20766 +
20767 +#: environment.c
20768 +msgid "must be one of nothing, matching, simple, upstream or current"
20769 +msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
20770 +
20771 #: exec-cmd.c
20772 #, c-format
20773 msgid "too many args to run %s"
@@ -21499,6 +21626,35 @@ msgstr "不允许空的姓名（对于 <%s>）"
21626 msgid "name consists only of disallowed characters: %s"
21627 msgstr "姓名中仅包含禁用字符：%s"
21628
21629 +#: imap-send.c
21630 +msgid "git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <folder>] < <mbox>"
21631 +msgstr ""
21632 +"git imap-send [-v] [-q] [--[no-]curl] [(--folder|-f) <文件夹>] < <mbox>"
21633 +
21634 +#: imap-send.c
21635 +msgid "no IMAP host specified"
21636 +msgstr "未指定 IMAP 主机"
21637 +
21638 +#: imap-send.c
21639 +msgid ""
21640 +"set the IMAP host with 'git config imap.host <host>'.\n"
21641 +"(e.g., 'git config imap.host imaps://imap.example.com')"
21642 +msgstr ""
21643 +"通过 'git config imap.host <主机>' 设置 IMAP 主机。\n"
21644 +"(例如：'git config imap.host imaps://imap.example.com')"
21645 +
21646 +#: imap-send.c
21647 +msgid "no IMAP folder specified"
21648 +msgstr "未指定 IMAP 文件夹"
21649 +
21650 +#: imap-send.c
21651 +msgid ""
21652 +"set the target folder with 'git config imap.folder <folder>'.\n"
21653 +"(e.g., 'git config imap.folder Drafts')"
21654 +msgstr ""
21655 +"通过 'git config imap.folder <文件夹>' 设置目标文件夹。\n"
21656 +"(例如：'git config imap.folder Drafts')"
21657 +
21658 #: list-objects-filter-options.c
21659 msgid "expected 'tree:<depth>'"
21660 msgstr "期望 'tree:<深度>'"
@@ -22455,7 +22611,7 @@ msgstr "无法解析 %s 的头部"
22611 #: object-file.c
22612 #, c-format
22613 msgid "unable to parse type from header '%s' of %s"
22458 -msgstr "无法从 %s 的包头 '%s' 中解析类型"
22614 +msgstr "无法从 %2$s 的包头 '%1$s' 中解析类型"
22615
22616 #: object-file.c
22617 #, c-format
@@ -22634,113 +22790,113 @@ msgstr "需要 <对象>:<路径>，只给出了 <对象> '%s'"
22790 msgid "invalid object name '%.*s'."
22791 msgstr "无效的对象名 '%.*s'。"
22792
22637 -#: object-store.c
22793 +#: object.c
22794 +#, c-format
22795 +msgid "invalid object type \"%s\""
22796 +msgstr "无效的对象类型 \"%s\""
22797 +
22798 +#: object.c
22799 +#, c-format
22800 +msgid "object %s is a %s, not a %s"
22801 +msgstr "对象 %s 是一个 %s，不是一个 %s"
22802 +
22803 +#: object.c
22804 +#, c-format
22805 +msgid "object %s has unknown type id %d"
22806 +msgstr "对象 %s 有未知的类型 id %d"
22807 +
22808 +#: object.c
22809 +#, c-format
22810 +msgid "unable to parse object: %s"
22811 +msgstr "不能解析对象：%s"
22812 +
22813 +#: object.c
22814 +#, c-format
22815 +msgid "hash mismatch %s"
22816 +msgstr "哈希值与 %s 不匹配"
22817 +
22818 +#: odb.c
22819 #, c-format
22820 msgid "object directory %s does not exist; check .git/objects/info/alternates"
22821 msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
22822
22642 -#: object-store.c
22823 +#: odb.c
22824 #, c-format
22825 msgid "unable to normalize alternate object path: %s"
22826 msgstr "无法规范化备用对象路径：%s"
22827
22647 -#: object-store.c
22828 +#: odb.c
22829 #, c-format
22830 msgid "%s: ignoring alternate object stores, nesting too deep"
22831 msgstr "%s：忽略备用对象库，嵌套太深"
22832
22652 -#: object-store.c
22833 +#: odb.c
22834 msgid "unable to fdopen alternates lockfile"
22835 msgstr "无法 fdopen alternates 的锁文件"
22836
22656 -#: object-store.c
22837 +#: odb.c
22838 msgid "unable to read alternates file"
22839 msgstr "无法读取 alternates 文件"
22840
22660 -#: object-store.c
22841 +#: odb.c
22842 msgid "unable to move new alternates file into place"
22843 msgstr "无法将新的 alternates 文件移动到位"
22844
22664 -#: object-store.c
22845 +#: odb.c
22846 #, c-format
22847 msgid "path '%s' does not exist"
22848 msgstr "路径 '%s' 不存在"
22849
22669 -#: object-store.c
22850 +#: odb.c
22851 #, c-format
22852 msgid "reference repository '%s' as a linked checkout is not supported yet."
22853 msgstr "尚不支持将参考仓库 '%s' 作为链接检出。"
22854
22674 -#: object-store.c
22855 +#: odb.c
22856 #, c-format
22857 msgid "reference repository '%s' is not a local repository."
22858 msgstr "参考仓库 '%s' 不是本地仓库。"
22859
22679 -#: object-store.c
22860 +#: odb.c
22861 #, c-format
22862 msgid "reference repository '%s' is shallow"
22863 msgstr "参考仓库 '%s' 是浅克隆"
22864
22684 -#: object-store.c
22865 +#: odb.c
22866 #, c-format
22867 msgid "reference repository '%s' is grafted"
22868 msgstr "参考仓库 '%s' 已被移植"
22869
22689 -#: object-store.c
22870 +#: odb.c
22871 #, c-format
22872 msgid "could not find object directory matching %s"
22873 msgstr "无法找到和 %s 匹配的对象目录"
22874
22694 -#: object-store.c
22875 +#: odb.c
22876 #, c-format
22877 msgid "invalid line while parsing alternate refs: %s"
22878 msgstr "解析备用引用时遇到无效的行：%s"
22879
22699 -#: object-store.c
22880 +#: odb.c
22881 #, c-format
22882 msgid "replacement %s not found for %s"
22883 msgstr "找不到 %2$s 的替代 %1$s"
22884
22704 -#: object-store.c
22885 +#: odb.c
22886 #, c-format
22887 msgid "packed object %s (stored in %s) is corrupt"
22888 msgstr "打包对象 %s（保存在 %s）已损坏"
22889
22709 -#: object-store.c
22890 +#: odb.c
22891 #, c-format
22892 msgid "missing mapping of %s to %s"
22893 msgstr "缺少 %s 到 %s 的映射"
22894
22714 -#: object-store.c
22895 +#: odb.c
22896 #, c-format
22897 msgid "%s is not a valid '%s' object"
22898 msgstr "%s 不是有效的 '%s' 对象"
22899
22719 -#: object.c
22720 -#, c-format
22721 -msgid "invalid object type \"%s\""
22722 -msgstr "无效的对象类型 \"%s\""
22723 -
22724 -#: object.c
22725 -#, c-format
22726 -msgid "object %s is a %s, not a %s"
22727 -msgstr "对象 %s 是一个 %s，不是一个 %s"
22728 -
22729 -#: object.c
22730 -#, c-format
22731 -msgid "object %s has unknown type id %d"
22732 -msgstr "对象 %s 有未知的类型 id %d"
22733 -
22734 -#: object.c
22735 -#, c-format
22736 -msgid "unable to parse object: %s"
22737 -msgstr "不能解析对象：%s"
22738 -
22739 -#: object.c
22740 -#, c-format
22741 -msgid "hash mismatch %s"
22742 -msgstr "哈希值与 %s 不匹配"
22743 -
22900 #: pack-bitmap-write.c
22901 #, c-format
22902 msgid "duplicate entry when writing bitmap index: %s"
@@ -22755,10 +22911,6 @@ msgstr "尝试存储未选定的提交：'%s'"
22911 msgid "too many pseudo-merges"
22912 msgstr "太多伪合并"
22913
22758 -#: pack-bitmap-write.c
22759 -msgid "trying to write commit not in index"
22760 -msgstr "尝试写入未在索引中的提交"
22761 -
22914 #: pack-bitmap.c
22915 msgid "failed to load bitmap index (corrupted?)"
22916 msgstr "无法载入位图索引（已损坏？）"
@@ -23061,6 +23213,11 @@ msgstr "%s 不取值"
23213 msgid "%s isn't available"
23214 msgstr "%s 不可用"
23215
23216 +#: parse-options.c
23217 +#, c-format
23218 +msgid "value for %s exceeds %<PRIdMAX>"
23219 +msgstr "%s 的值超出了 %<PRIdMAX>"
23220 +
23221 #: parse-options.c
23222 #, c-format
23223 msgid "value %s for %s not in range [%<PRIdMAX>,%<PRIdMAX>]"
@@ -24215,6 +24372,18 @@ msgstr "没有 '%s' 的引用日志"
24372 msgid "%s does not point to a valid object!"
24373 msgstr "%s 没有指向一个有效的对象！"
24374
24375 +# 译者：注意保持前导空格
24376 +#: refs.c
24377 +#, c-format
24378 +msgid "%s%s will become dangling after %s is deleted\n"
24379 +msgstr "%s%s 将在 %s 被删除后变为悬空引用\n"
24380 +
24381 +# 译者：注意保持前导空格
24382 +#: refs.c
24383 +#, c-format
24384 +msgid "%s%s has become dangling after %s was deleted\n"
24385 +msgstr "%s%s 已在 %s 被删除后变为悬空引用\n"
24386 +
24387 #: refs.c
24388 #, c-format
24389 msgid ""
@@ -26991,6 +27160,10 @@ msgstr "切换是否包含树对象"
27160 msgid "toggle pruning of uninteresting paths"
27161 msgstr "切换对无趣路径的修剪"
27162
27163 +#: t/helper/test-path-walk.c
27164 +msgid "toggle aggressive edge walk"
27165 +msgstr "切换激进边遍历模式"
27166 +
27167 #: t/helper/test-path-walk.c
27168 msgid "read a pattern list over stdin"
27169 msgstr "从标准输入读取模式列表"
@@ -27742,6 +27915,24 @@ msgstr "错误："
27915 msgid "warning: "
27916 msgstr "警告："
27917
27918 +#: usage.c
27919 +#, c-format
27920 +msgid ""
27921 +"'%s' is nominated for removal.\n"
27922 +"If you still use this command, please add an extra\n"
27923 +"option, '--i-still-use-this', on the command line\n"
27924 +"and let us know you still use it by sending an e-mail\n"
27925 +"to <git@vger.kernel.org>. Thanks.\n"
27926 +msgstr ""
27927 +"'%s' 命令已被提名移除。\n"
27928 +"如果您仍在使用该命令，请在命令行中添加额外选项\n"
27929 +"'--i-still-use-this'，并通过发送邮件至 <git@vger.kernel.org> \n"
27930 +"通知我们您仍在使用它。谢谢。\n"
27931 +
27932 +#: usage.c
27933 +msgid "refusing to run without --i-still-use-this"
27934 +msgstr "拒绝在未指定 --i-still-use-this 选项时运行"
27935 +
27936 #: version.c
27937 #, c-format
27938 msgid "uname() failed with error '%s' (%d)\n"
@@ -28888,6 +29079,11 @@ msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
29079 msgid "(body) Adding cc: %s from line '%s'\n"
29080 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
29081
29082 +#: git-send-email.perl
29083 +#, perl-format
29084 +msgid "error: invalid SMTP port '%s'\n"
29085 +msgstr "错误：无效的 SMTP 端口 '%s'\n"
29086 +
29087 #: git-send-email.perl
29088 #, perl-format
29089 msgid "(%s) Could not execute '%s'"