@matheusbsbs / matheus-bagliano / commits / 3c58354a53

l10n: zh_CN: for git 2.44 rounds

In addition to the localized translation in 2.44, for zh_CN, we have uniformly modified the translation of the word "commit-graph" to make it more consistent with language usage habits. Signed-off-by: Teng Long <dyroneteng@gmail.com>

Teng Long committed Feb 12, 2024 at 21:04 UTC 3c58354a5319393425847add40c2458d59c9d649
1 file changed +340 -198
po/zh_CN.po
+340 -198
@@ -46,6 +46,7 @@
46 # commit | 提交
47 # commit message | 提交说明
48 # commit object | 提交对象
49 +# commit-graph | 提交图
50 # commit-ish (also committish) | 提交号
51 # cone | 锥形（稀疏检出模型）；锥（稀疏检出）
52 # conflict | 冲突
@@ -99,6 +100,7 @@
100 # plumbing | 管件（Git 底层核心命令的别称）
101 # porcelain | 瓷件（Git 上层封装命令的别称）
102 # precious-objects repo | 珍品仓库
103 +# preferred pack | 首选包（多包索引中引入的首选包概念）
104 # promisor | 承诺者
105 # prune | 清除
106 # pull | 拉，拉取
@@ -151,8 +153,8 @@ msgid ""
153 msgstr ""
154 "Project-Id-Version: Git\n"
155 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
154 -"POT-Creation-Date: 2023-11-10 10:49+0800\n"
155 -"PO-Revision-Date: 2023-11-10 17:13+0800\n"
156 +"POT-Creation-Date: 2024-02-16 14:27+0800\n"
157 +"PO-Revision-Date: 2024-02-18 11:47+0800\n"
158 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
159 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
160 "Language: zh_CN\n"
@@ -1031,7 +1033,7 @@ msgid "unclosed quote"
1033 msgstr "未关闭的引号"
1034
1035 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
1034 -#: builtin/receive-pack.c builtin/tag.c
1036 +#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c
1037 msgid "too many arguments"
1038 msgstr "太多参数"
1039
@@ -1046,12 +1048,13 @@ msgid "unrecognized whitespace ignore option '%s'"
1048 msgstr "未能识别的空白字符忽略选项 '%s'"
1049
1050 #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout-index.c
1049 -#: builtin/checkout.c builtin/clone.c builtin/commit.c builtin/describe.c
1050 -#: builtin/diff-tree.c builtin/difftool.c builtin/fast-export.c builtin/fetch.c
1051 -#: builtin/help.c builtin/index-pack.c builtin/init-db.c builtin/log.c
1052 -#: builtin/ls-files.c builtin/merge-base.c builtin/merge.c
1053 -#: builtin/pack-objects.c builtin/push.c builtin/rebase.c builtin/repack.c
1054 -#: builtin/reset.c builtin/rev-list.c builtin/show-branch.c builtin/stash.c
1051 +#: builtin/checkout.c builtin/clean.c builtin/clone.c builtin/commit.c
1052 +#: builtin/describe.c builtin/diff-tree.c builtin/difftool.c
1053 +#: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
1054 +#: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
1055 +#: builtin/merge-tree.c builtin/merge.c builtin/pack-objects.c builtin/rebase.c
1056 +#: builtin/repack.c builtin/replay.c builtin/reset.c builtin/rev-list.c
1057 +#: builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
1058 #: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
1059 #: range-diff.c revision.c
1060 #, c-format
@@ -1859,6 +1862,11 @@ msgstr "选项 '%s' 需要 '%s'"
1862 msgid "Unexpected option --output"
1863 msgstr "未知参数 --output"
1864
1865 +#: archive.c
1866 +#, c-format
1867 +msgid "extra command line parameter '%s'"
1868 +msgstr "额外的命令行参数：'%s'"
1869 +
1870 #: archive.c
1871 #, c-format
1872 msgid "Unknown archive format '%s'"
@@ -1915,6 +1923,17 @@ msgstr "忽略过大的 gitattributes 数据对象 '%s'"
1923 msgid "bad --attr-source or GIT_ATTR_SOURCE"
1924 msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE"
1925
1926 +#: attr.c read-cache.c
1927 +#, c-format
1928 +msgid "unable to stat '%s'"
1929 +msgstr "无法对 %s 执行 stat"
1930 +
1931 +#: bisect.c builtin/cat-file.c builtin/index-pack.c builtin/notes.c
1932 +#: builtin/pack-objects.c combine-diff.c rerere.c
1933 +#, c-format
1934 +msgid "unable to read %s"
1935 +msgstr "不能读 %s"
1936 +
1937 #: bisect.c
1938 #, c-format
1939 msgid "Badly quoted content in file '%s': %s"
@@ -2448,8 +2467,8 @@ msgid "bad action '%s' for '%s'"
2467 msgstr "'%2$s' 的错误动作 '%1$s'"
2468
2469 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2451 -#: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c
2452 -#: sequencer.c setup.c
2470 +#: builtin/pull.c config.c diff-merges.c gpg-interface.c ls-refs.c
2471 +#: parallel-checkout.c sequencer.c setup.c
2472 #, c-format
2473 msgid "invalid value for '%s': '%s'"
2474 msgstr "'%s' 的值无效：'%s'"
@@ -2602,8 +2621,7 @@ msgstr "git write-tree 无法写入树对象"
2621 msgid "applying to an empty history"
2622 msgstr "正应用到一个空历史上"
2623
2605 -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2606 -#: t/helper/test-fast-rebase.c
2624 +#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c
2625 msgid "failed to write commit object"
2626 msgstr "无法写提交对象"
2627
@@ -2783,8 +2801,9 @@ msgid "n"
2801 msgstr "n"
2802
2803 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2786 -#: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c
2787 -#: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c
2804 +#: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2805 +#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2806 +#: builtin/verify-tag.c
2807 msgid "format"
2808 msgstr "格式"
2809
@@ -2916,7 +2935,9 @@ msgstr "git archive：应有一个 flush 包"
2935 msgid ""
2936 "git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
2937 "checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2919 -msgstr "git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
2938 +msgstr ""
2939 +"git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-"
2940 +"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
2941
2942 #: builtin/bisect.c
2943 msgid "git bisect (good|bad) [<rev>...]"
@@ -3473,12 +3494,13 @@ msgstr "无法查询 '%s' 指向的提交对象"
3494
3495 #: builtin/branch.c
3496 #, c-format
3476 -msgid ""
3477 -"the branch '%s' is not fully merged.\n"
3478 -"If you are sure you want to delete it, run 'git branch -D %s'"
3479 -msgstr ""
3480 -"分支 '%s' 没有完全合并。\n"
3481 -"如果您确认要删除它，执行 'git branch -D %s'"
3497 +msgid "the branch '%s' is not fully merged"
3498 +msgstr "分支 '%s' 没有完全合并"
3499 +
3500 +#: builtin/branch.c
3501 +#, c-format
3502 +msgid "If you are sure you want to delete it, run 'git branch -D %s'"
3503 +msgstr "如果您确认要删除它，执行 'git branch -D %s'"
3504
3505 #: builtin/branch.c
3506 msgid "update of config-file failed"
@@ -4488,7 +4510,7 @@ msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
4510 msgid "HEAD is now at"
4511 msgstr "HEAD 目前位于"
4512
4491 -#: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c
4513 +#: builtin/checkout.c builtin/clone.c
4514 msgid "unable to update HEAD"
4515 msgstr "不能更新 HEAD"
4516
@@ -4757,8 +4779,8 @@ msgid "new-branch"
4779 msgstr "新分支"
4780
4781 #: builtin/checkout.c
4760 -msgid "new unparented branch"
4761 -msgstr "新的没有父提交的分支"
4782 +msgid "new unborn branch"
4783 +msgstr "新的未诞生的分支"
4784
4785 #: builtin/checkout.c builtin/merge.c
4786 msgid "update ignored files (default)"
@@ -4824,7 +4846,7 @@ msgstr ""
4846 msgid "you must specify path(s) to restore"
4847 msgstr "您必须指定要恢复的路径"
4848
4827 -#: builtin/checkout.c builtin/clone.c builtin/remote.c
4849 +#: builtin/checkout.c builtin/clone.c builtin/remote.c builtin/replay.c
4850 #: builtin/submodule--helper.c builtin/worktree.c
4851 msgid "branch"
4852 msgstr "分支"
@@ -5065,10 +5087,6 @@ msgid ""
5087 msgstr ""
5088 "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
5089
5068 -#: builtin/clean.c
5069 -msgid "-x and -X cannot be used together"
5070 -msgstr "-x 和 -X 不能同时使用"
5071 -
5090 #: builtin/clone.c
5091 msgid "git clone [<options>] [--] <repo> [<dir>]"
5092 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
@@ -5160,6 +5178,7 @@ msgid "create a shallow clone since a specific time"
5178 msgstr "从一个特定时间创建一个浅克隆"
5179
5180 #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c
5181 +#: builtin/replay.c
5182 msgid "revision"
5183 msgstr "版本"
5184
@@ -5187,6 +5206,10 @@ msgstr "git目录"
5206 msgid "separate git dir from working tree"
5207 msgstr "git目录和工作区分离"
5208
5209 +#: builtin/clone.c builtin/init-db.c
5210 +msgid "specify the reference format to use"
5211 +msgstr "指定要使用的引用格式"
5212 +
5213 #: builtin/clone.c
5214 msgid "key=value"
5215 msgstr "key=value"
@@ -5336,11 +5359,10 @@ msgstr "太多参数。"
5359 msgid "You must specify a repository to clone."
5360 msgstr "您必须指定一个仓库来克隆。"
5361
5339 -#: builtin/clone.c
5340 -msgid ""
5341 -"--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-"
5342 -"exclude"
5343 -msgstr "--bundle-uri 与 --depth、--shallow-since 和 --shallow-exclude 不兼容"
5362 +#: builtin/clone.c builtin/init-db.c setup.c
5363 +#, c-format
5364 +msgid "unknown ref storage format '%s'"
5365 +msgstr "未知的引用存储格式 '%s'"
5366
5367 #: builtin/clone.c
5368 #, c-format
@@ -5501,7 +5523,7 @@ msgid ""
5523 "--stdin-commits]\n"
5524 " [--changed-paths] [--[no-]max-new-filters <n>] [--"
5525 "[no-]progress]\n"
5504 -" <split options>"
5526 +" <split-options>"
5527 msgstr ""
5528 "git commit-graph write [--object-dir <目录>] [--append]\n"
5529 " [--split[=<策略>]] [--reachable | --stdin-packs | --"
@@ -5520,17 +5542,17 @@ msgstr "保存图形的对象目录"
5542
5543 #: builtin/commit-graph.c
5544 msgid "if the commit-graph is split, only verify the tip file"
5523 -msgstr "如果提交图形被拆分，只验证头一个文件"
5545 +msgstr "如果提交图被拆分，只验证头一个文件"
5546
5547 #: builtin/commit-graph.c
5548 #, c-format
5549 msgid "Could not open commit-graph '%s'"
5528 -msgstr "无法打开提交图形 '%s'"
5550 +msgstr "无法打开提交图 '%s'"
5551
5552 #: builtin/commit-graph.c
5553 #, c-format
5554 msgid "could not open commit-graph chain '%s'"
5533 -msgstr "无法打开提交图形链 '%s'"
5555 +msgstr "无法打开提交图链 '%s'"
5556
5557 #: builtin/commit-graph.c
5558 #, c-format
@@ -5574,15 +5596,15 @@ msgstr "启用变更路径的计算"
5596
5597 #: builtin/commit-graph.c
5598 msgid "allow writing an incremental commit-graph file"
5577 -msgstr "允许写一个增量提交图形文件"
5599 +msgstr "允许写一个增量提交图文件"
5600
5601 #: builtin/commit-graph.c
5602 msgid "maximum number of commits in a non-base split commit-graph"
5581 -msgstr "在非基本拆分提交图形中的最大提交数"
5603 +msgstr "在非基本拆分提交图中的最大提交数"
5604
5605 #: builtin/commit-graph.c
5606 msgid "maximum ratio between two levels of a split commit-graph"
5585 -msgstr "一个拆分提交图形的两个级别之间的最大比率"
5607 +msgstr "一个拆分提交图的两个级别之间的最大比率"
5608
5609 #: builtin/commit-graph.c
5610 msgid "only expire files older than a given date-time"
@@ -8378,6 +8400,11 @@ msgstr "没有线程支持，忽略 %s"
8400 msgid "unable to read tree (%s)"
8401 msgstr "无法读取树（%s）"
8402
8403 +#: builtin/grep.c
8404 +#, c-format
8405 +msgid "unable to read tree %s"
8406 +msgstr "无法读取树 %s"
8407 +
8408 #: builtin/grep.c
8409 #, c-format
8410 msgid "unable to grep from object of type %s"
@@ -8901,11 +8928,6 @@ msgstr "解压缩严重的不一致"
8928 msgid "SHA1 COLLISION FOUND WITH %s !"
8929 msgstr "发现 %s 出现 SHA1 冲突！"
8930
8904 -#: builtin/index-pack.c builtin/pack-objects.c
8905 -#, c-format
8906 -msgid "unable to read %s"
8907 -msgstr "不能读 %s"
8908 -
8931 #: builtin/index-pack.c
8932 #, c-format
8933 msgid "cannot read existing object info %s"
@@ -9083,11 +9105,13 @@ msgstr "在打包对象中 fsck 检查出错"
9105 msgid ""
9106 "git init [-q | --quiet] [--bare] [--template=<template-directory>]\n"
9107 " [--separate-git-dir <git-dir>] [--object-format=<format>]\n"
9108 +" [--ref-format=<format>]\n"
9109 " [-b <branch-name> | --initial-branch=<branch-name>]\n"
9110 " [--shared[=<permissions>]] [<directory>]"
9111 msgstr ""
9112 "git init [-q | --quiet] [--bare] [--template=<模板目录>]\n"
9113 " [--separate-git-dir <git 目录>] [--object-format=<格式>]\n"
9114 +" [--ref-format=<格式>]\n"
9115 " [-b <分支名> | --initial-branch=<分支名>]\n"
9116 " [--shared[=<权限>]] [<目录>]"
9117
@@ -9246,7 +9270,7 @@ msgid ""
9270 "<file>"
9271 msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
9272
9249 -#: builtin/log.c builtin/shortlog.c bundle.c
9273 +#: builtin/log.c builtin/replay.c builtin/shortlog.c bundle.c
9274 #, c-format
9275 msgid "unrecognized argument: %s"
9276 msgstr "未能识别的参数：%s"
@@ -9990,6 +10014,12 @@ msgstr ""
10014 "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
10015 "始文件> <文件2>"
10016
10017 +#: builtin/merge-file.c diff.c
10018 +msgid ""
10019 +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
10020 +"\"histogram\""
10021 +msgstr "选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
10022 +
10023 #: builtin/merge-file.c
10024 msgid "send results to standard output"
10025 msgstr "将结果发送到标准输出"
@@ -10018,6 +10048,14 @@ msgstr "如果冲突，使用他们的版本"
10048 msgid "for conflicts, use a union version"
10049 msgstr "如果冲突，使用联合版本"
10050
10051 +#: builtin/merge-file.c diff.c
10052 +msgid "<algorithm>"
10053 +msgstr "<算法>"
10054 +
10055 +#: builtin/merge-file.c diff.c
10056 +msgid "choose a diff algorithm"
10057 +msgstr "选择一个差异算法"
10058 +
10059 #: builtin/merge-file.c
10060 msgid "for conflicts, use this marker size"
10061 msgstr "如果冲突，使用指定长度的标记"
@@ -10135,10 +10173,6 @@ msgstr "--trivial-merge 与其他所有选项不兼容"
10173 msgid "unknown strategy option: -X%s"
10174 msgstr "未知的策略选项：-X%s"
10175
10138 -#: builtin/merge-tree.c
10139 -msgid "--merge-base is incompatible with --stdin"
10140 -msgstr "--merge-base 与 --stdin 不兼容"
10141 -
10176 #: builtin/merge-tree.c builtin/notes.c
10177 #, c-format
10178 msgid "malformed input line: '%s'."
@@ -10296,7 +10330,7 @@ msgstr "'%s' 没有指向一个提交"
10330 msgid "Bad branch.%s.mergeoptions string: %s"
10331 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
10332
10299 -#: builtin/merge.c builtin/stash.c merge-recursive.c
10333 +#: builtin/merge.c merge-recursive.c
10334 msgid "Unable to write index."
10335 msgstr "不能写入索引。"
10336
@@ -10304,7 +10338,7 @@ msgstr "不能写入索引。"
10338 msgid "Not handling anything other than two heads merge."
10339 msgstr "未处理两个头合并之外的任何操作。"
10340
10307 -#: builtin/merge.c t/helper/test-fast-rebase.c
10341 +#: builtin/merge.c
10342 #, c-format
10343 msgid "unable to write %s"
10344 msgstr "不能写 %s"
@@ -11290,6 +11324,11 @@ msgstr "压缩对象中"
11324 msgid "inconsistency with delta count"
11325 msgstr "不一致的差异计数"
11326
11327 +#: builtin/pack-objects.c
11328 +#, c-format
11329 +msgid "invalid pack.allowPackReuse value: '%s'"
11330 +msgstr "无效的 pack.allowPackReuse 值：'%s'"
11331 +
11332 #: builtin/pack-objects.c
11333 #, c-format
11334 msgid ""
@@ -11614,10 +11653,10 @@ msgstr "枚举对象中"
11653 #, c-format
11654 msgid ""
11655 "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
11617 -"reused %<PRIu32>"
11656 +"reused %<PRIu32> (from %<PRIuMAX>)"
11657 msgstr ""
11658 "总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
11620 -"%<PRIu32>"
11659 +"%<PRIu32>（来自 %<PRIuMAX> 个包）"
11660
11661 #: builtin/pack-redundant.c
11662 msgid ""
@@ -12691,7 +12730,7 @@ msgstr "没有正在进行的变基？"
12730 msgid "The --edit-todo action can only be used during interactive rebase."
12731 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
12732
12694 -#: builtin/rebase.c t/helper/test-fast-rebase.c
12733 +#: builtin/rebase.c
12734 msgid "Cannot read HEAD"
12735 msgstr "不能读取 HEAD"
12736
@@ -12735,12 +12774,6 @@ msgstr ""
12774 msgid "switch `C' expects a numerical value"
12775 msgstr "开关 `C' 期望一个数字值"
12776
12738 -#: builtin/rebase.c
12739 -msgid ""
12740 -"apply options are incompatible with rebase.autoSquash. Consider adding --no-"
12741 -"autosquash"
12742 -msgstr "应用的选项与 rebase.autoSquash 不兼容。考虑加上 --no-autosquash"
12743 -
12777 #: builtin/rebase.c
12778 msgid ""
12779 "apply options are incompatible with rebase.rebaseMerges. Consider adding --"
@@ -13224,8 +13257,8 @@ msgid ""
13257 msgid_plural ""
13258 "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
13259 "to delete them, use:"
13227 -msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
13228 -msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
13260 +msgstr[0] "注意：refs/remotes/ 层级之外的一个分支未被移除。要删除它，使用："
13261 +msgstr[1] "注意：refs/remotes/ 层级之外的一些分支未被移除。要删除它们，使用："
13262
13263 #: builtin/remote.c
13264 #, c-format
@@ -13956,6 +13989,84 @@ msgstr "--convert-graft-file 不带参数"
13989 msgid "only one pattern can be given with -l"
13990 msgstr "只能为 -l 提供一个模式"
13991
13992 +#: builtin/replay.c
13993 +msgid "need some commits to replay"
13994 +msgstr "需要一些提交来重放"
13995 +
13996 +#: builtin/replay.c
13997 +msgid "--onto and --advance are incompatible"
13998 +msgstr "--onto 和 --advance 不兼容"
13999 +
14000 +#: builtin/replay.c
14001 +msgid "all positive revisions given must be references"
14002 +msgstr "提供的所有正向版本必须为引用"
14003 +
14004 +#: builtin/replay.c
14005 +msgid "argument to --advance must be a reference"
14006 +msgstr "--advance 的参数必须是引用"
14007 +
14008 +#: builtin/replay.c
14009 +msgid ""
14010 +"cannot advance target with multiple sources because ordering would be ill-"
14011 +"defined"
14012 +msgstr "不能使用多个源推进目标，因为无法明确如何排序"
14013 +
14014 +#: builtin/replay.c
14015 +msgid ""
14016 +"cannot implicitly determine whether this is an --advance or --onto operation"
14017 +msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作"
14018 +
14019 +#: builtin/replay.c
14020 +msgid ""
14021 +"cannot advance target with multiple source branches because ordering would "
14022 +"be ill-defined"
14023 +msgstr "不能使用多个源分支推进目标，因为无法明确如何排序"
14024 +
14025 +#: builtin/replay.c
14026 +msgid "cannot implicitly determine correct base for --onto"
14027 +msgstr "不能隐式地确定 --onto 正确的基线"
14028 +
14029 +#: builtin/replay.c
14030 +msgid ""
14031 +"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
14032 +"<branch>) <revision-range>..."
14033 +msgstr "（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版本范围>..."
14034 +
14035 +#: builtin/replay.c
14036 +msgid "make replay advance given branch"
14037 +msgstr "重放时演进给定的分支"
14038 +
14039 +#: builtin/replay.c
14040 +msgid "replay onto given commit"
14041 +msgstr "重放到给定提交"
14042 +
14043 +#: builtin/replay.c
14044 +msgid "advance all branches contained in revision-range"
14045 +msgstr "演进版本范围中包含的所有分支"
14046 +
14047 +#: builtin/replay.c
14048 +msgid "option --onto or --advance is mandatory"
14049 +msgstr "选项 --onto 或 --advance 必须指定其一"
14050 +
14051 +#: builtin/replay.c
14052 +#, c-format
14053 +msgid ""
14054 +"some rev walking options will be overridden as '%s' bit in 'struct rev_info' "
14055 +"will be forced"
14056 +msgstr "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
14057 +
14058 +#: builtin/replay.c
14059 +msgid "error preparing revisions"
14060 +msgstr "准备版本时错误"
14061 +
14062 +#: builtin/replay.c
14063 +msgid "replaying down to root commit is not supported yet!"
14064 +msgstr "目前还不支持重放到根提交！"
14065 +
14066 +#: builtin/replay.c
14067 +msgid "replaying merge commits is not supported yet!"
14068 +msgstr "目前还不支持重放到合并提交！"
14069 +
14070 #: builtin/rerere.c
14071 msgid ""
14072 "git rerere [clear | forget <pathspec>... | diff | status | remaining | gc]"
@@ -14215,18 +14326,6 @@ msgstr "--prefix 需要一个参数"
14326 msgid "unknown mode for --abbrev-ref: %s"
14327 msgstr "未知的 --abbrev-ref 模式：%s"
14328
14218 -#: builtin/rev-parse.c revision.c
14219 -msgid "--exclude-hidden cannot be used together with --branches"
14220 -msgstr "--exclude-hidden 不能与 --branches 一起使用"
14221 -
14222 -#: builtin/rev-parse.c revision.c
14223 -msgid "--exclude-hidden cannot be used together with --tags"
14224 -msgstr "--exclude-hidden 不能与 --tags 一起使用"
14225 -
14226 -#: builtin/rev-parse.c revision.c
14227 -msgid "--exclude-hidden cannot be used together with --remotes"
14228 -msgstr "--exclude-hidden 不能与 --remotes 一起使用"
14229 -
14329 #: builtin/rev-parse.c setup.c
14330 msgid "this operation must be run in a work tree"
14331 msgstr "该操作必须在一个工作区中运行"
@@ -14730,11 +14829,6 @@ msgstr "不打印结果到标准输出（例如与 --verify 参数共用）"
14829 msgid "show refs from stdin that aren't in local repository"
14830 msgstr "显示从标准输入中读入的不在本地仓库中的引用"
14831
14733 -#: builtin/show-ref.c
14734 -#, c-format
14735 -msgid "only one of '%s', '%s' or '%s' can be given"
14736 -msgstr "选项 '%s'、'%s' 或 '%s' 只能使用其一"
14737 -
14832 #: builtin/sparse-checkout.c
14833 msgid ""
14834 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
@@ -16509,30 +16603,30 @@ msgstr "没有可用的源分支，将基于 '--orphan' 选项进行推断"
16603 #: builtin/worktree.c
16604 #, c-format
16605 msgid ""
16512 -"If you meant to create a worktree containing a new orphan branch\n"
16606 +"If you meant to create a worktree containing a new unborn branch\n"
16607 "(branch with no commits) for this repository, you can do so\n"
16608 "using the --orphan flag:\n"
16609 "\n"
16610 " git worktree add --orphan -b %s %s\n"
16611 msgstr ""
16518 -"如果你打算为此仓库创建一个包含新的孤立分支\n"
16519 -"（没有提交的分支）的工作区，你可以使用选项\n"
16520 -"--orphan 来执行此操作：\n"
16612 +"如果你打算为此仓库创建一个包含新的未诞生的\n"
16613 +"分支（没有提交的分支）的工作区，你可以使用\n"
16614 +"选项 --orphan 来执行此操作：\n"
16615 "\n"
16616 " git worktree add --orphan -b %s %s\n"
16617
16618 #: builtin/worktree.c
16619 #, c-format
16620 msgid ""
16527 -"If you meant to create a worktree containing a new orphan branch\n"
16621 +"If you meant to create a worktree containing a new unborn branch\n"
16622 "(branch with no commits) for this repository, you can do so\n"
16623 "using the --orphan flag:\n"
16624 "\n"
16625 " git worktree add --orphan %s\n"
16626 msgstr ""
16533 -"如果你打算为此仓库创建一个包含新的孤立分支\n"
16534 -"（没有提交的分支）的工作区，你可以使用选项\n"
16535 -"--orphan 来执行此操作：\n"
16627 +"如果你打算为此仓库创建一个包含新的未诞生的\n"
16628 +"分支（没有提交的分支）的工作区，你可以使用\n"
16629 +"选项 --orphan 来执行此操作：\n"
16630 "\n"
16631 " git worktree add --orphan %s\n"
16632
@@ -16601,6 +16695,11 @@ msgstr "不能创建目录 '%s'"
16695 msgid "initializing"
16696 msgstr "初始化"
16697
16698 +#: builtin/worktree.c
16699 +#, c-format
16700 +msgid "could not find created worktree '%s'"
16701 +msgstr "无法找到已创建的工作树 '%s'"
16702 +
16703 #: builtin/worktree.c
16704 #, c-format
16705 msgid "Preparing worktree (new branch '%s')"
@@ -16645,11 +16744,6 @@ msgstr ""
16744 "尽管已配置远程仓库，但不存在任何本地的或远程的引用，操作终止。\n"
16745 "请先使用 'add -f' 来覆盖或拉取一个远程仓库"
16746
16648 -#: builtin/worktree.c
16649 -#, c-format
16650 -msgid "'%s' and '%s' cannot be used together"
16651 -msgstr "'%s' 和 '%s' 不能同时使用"
16652 -
16747 #: builtin/worktree.c
16748 msgid "checkout <branch> even if already checked out in other worktree"
16749 msgstr "检出 <分支>，即使已经被检出到其它工作区"
@@ -16663,8 +16757,8 @@ msgid "create or reset a branch"
16757 msgstr "创建或重置一个分支"
16758
16759 #: builtin/worktree.c
16666 -msgid "create unborn/orphaned branch"
16667 -msgstr "创建一个尚未诞生的/孤立的分支"
16760 +msgid "create unborn branch"
16761 +msgstr "创建一个尚未诞生的分支"
16762
16763 #: builtin/worktree.c
16764 msgid "populate the new working tree"
@@ -16693,12 +16787,8 @@ msgstr "选项 '%s'、'%s' 和 '%s' 不能同时使用"
16787
16788 #: builtin/worktree.c
16789 #, c-format
16696 -msgid "options '%s', and '%s' cannot be used together"
16697 -msgstr "选项 '%s' 与 '%s' 不能同时使用"
16698 -
16699 -#: builtin/worktree.c
16700 -msgid "<commit-ish>"
16701 -msgstr "<提交号>"
16790 +msgid "option '%s' and commit-ish cannot be used together"
16791 +msgstr "选项 '%s' 和提交号不能同时使用"
16792
16793 #: builtin/worktree.c
16794 msgid "added with --lock"
@@ -17488,6 +17578,10 @@ msgstr "打包仓库中未打包对象"
17578 msgid "Create, list, delete refs to replace objects"
17579 msgstr "创建、列出、删除对象替换引用"
17580
17581 +#: command-list.h
17582 +msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
17583 +msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库"
17584 +
17585 #: command-list.h
17586 msgid "Generates a summary of pending changes"
17587 msgstr "生成待定更改的摘要"
@@ -17803,57 +17897,104 @@ msgstr "一个管理大型 Git 仓库的工具"
17897
17898 #: commit-graph.c
17899 msgid "commit-graph file is too small"
17806 -msgstr "提交图形文件太小"
17900 +msgstr "提交图文件太小"
17901 +
17902 +#: commit-graph.c
17903 +msgid "commit-graph oid fanout chunk is wrong size"
17904 +msgstr "提交图中对象 ID 的扇出块大小错误"
17905 +
17906 +#: commit-graph.c
17907 +msgid "commit-graph fanout values out of order"
17908 +msgstr "提交图的扇出值失序"
17909 +
17910 +#: commit-graph.c
17911 +msgid "commit-graph OID lookup chunk is the wrong size"
17912 +msgstr "提交图的对象 ID 查询块大小错误"
17913 +
17914 +#: commit-graph.c
17915 +msgid "commit-graph commit data chunk is wrong size"
17916 +msgstr "提交图的提交数据块大小错误"
17917 +
17918 +#: commit-graph.c
17919 +msgid "commit-graph generations chunk is wrong size"
17920 +msgstr "提交图的世代块大小错误"
17921 +
17922 +#: commit-graph.c
17923 +msgid "commit-graph changed-path index chunk is too small"
17924 +msgstr "提交图的变更路径的索引块太小"
17925 +
17926 +#: commit-graph.c
17927 +#, c-format
17928 +msgid ""
17929 +"ignoring too-small changed-path chunk (%<PRIuMAX> < %<PRIuMAX>) in commit-"
17930 +"graph file"
17931 +msgstr "忽略提交图文件中过小的更改路径块（%<PRIuMAX> < %<PRIuMAX>）"
17932
17933 #: commit-graph.c
17934 #, c-format
17935 msgid "commit-graph signature %X does not match signature %X"
17811 -msgstr "提交图形签名 %X 和签名 %X 不匹配"
17936 +msgstr "提交图签名 %X 和签名 %X 不匹配"
17937
17938 #: commit-graph.c
17939 #, c-format
17940 msgid "commit-graph version %X does not match version %X"
17816 -msgstr "提交图形版本 %X 和版本 %X 不匹配"
17941 +msgstr "提交图版本 %X 和版本 %X 不匹配"
17942
17943 #: commit-graph.c
17944 #, c-format
17945 msgid "commit-graph hash version %X does not match version %X"
17821 -msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
17946 +msgstr "提交图哈希版本 %X 和版本 %X 不匹配"
17947
17948 #: commit-graph.c
17949 #, c-format
17950 msgid "commit-graph file is too small to hold %u chunks"
17826 -msgstr "提交图形文件太小，容不下 %u 个块"
17951 +msgstr "提交图文件太小，容不下 %u 个块"
17952 +
17953 +#: commit-graph.c
17954 +msgid "commit-graph required OID fanout chunk missing or corrupted"
17955 +msgstr "提交图所需的对象 ID 扇出块缺失或损坏"
17956 +
17957 +#: commit-graph.c
17958 +msgid "commit-graph required OID lookup chunk missing or corrupted"
17959 +msgstr "提交图所需的对象 ID 查询块缺失或损坏"
17960 +
17961 +#: commit-graph.c
17962 +msgid "commit-graph required commit data chunk missing or corrupted"
17963 +msgstr "提交图所需的提交数据块缺失或损坏"
17964
17965 #: commit-graph.c
17966 msgid "commit-graph has no base graphs chunk"
17830 -msgstr "提交图形没有基础图形块"
17967 +msgstr "提交图没有基础图形块"
17968
17969 #: commit-graph.c
17970 msgid "commit-graph base graphs chunk is too small"
17834 -msgstr "提交图形的基础图形块过小"
17971 +msgstr "提交图的基础图形块过小"
17972
17973 #: commit-graph.c
17974 msgid "commit-graph chain does not match"
17838 -msgstr "提交图形链不匹配"
17975 +msgstr "提交图链不匹配"
17976
17977 #: commit-graph.c
17978 #, c-format
17979 msgid "commit count in base graph too high: %<PRIuMAX>"
17980 msgstr "基础图形中的提交数量过高：%<PRIuMAX>"
17981
17982 +#: commit-graph.c
17983 +msgid "commit-graph chain file too small"
17984 +msgstr "提交图链文件太小"
17985 +
17986 #: commit-graph.c
17987 #, c-format
17988 msgid "invalid commit-graph chain: line '%s' not a hash"
17848 -msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
17989 +msgstr "无效的提交图链：行 '%s' 不是一个哈希值"
17990
17991 #: commit-graph.c
17992 msgid "unable to find all commit-graph files"
17852 -msgstr "无法找到所有提交图形文件"
17993 +msgstr "无法找到所有提交图文件"
17994
17995 #: commit-graph.c
17996 msgid "invalid commit position. commit-graph is likely corrupt"
17856 -msgstr "无效的提交位置。提交图形可能已损坏"
17997 +msgstr "无效的提交位置。提交图可能已损坏"
17998
17999 #: commit-graph.c
18000 #, c-format
@@ -17868,6 +18009,10 @@ msgstr "提交图需要溢出世代数据，但是没有"
18009 msgid "commit-graph overflow generation data is too small"
18010 msgstr "提交图溢出世代数据过小"
18011
18012 +#: commit-graph.c
18013 +msgid "commit-graph extra-edges pointer out of bounds"
18014 +msgstr "提交图额外边的指针越界"
18015 +
18016 #: commit-graph.c
18017 msgid "Loading known commits in commit graph"
18018 msgstr "正在加载提交图中的已知提交"
@@ -17943,26 +18088,25 @@ msgstr[1] "正在用 %d 步写出提交图"
18088
18089 #: commit-graph.c
18090 msgid "unable to open commit-graph chain file"
17946 -msgstr "无法打开提交图形链文件"
18091 +msgstr "无法打开提交图链文件"
18092
18093 #: commit-graph.c
18094 msgid "failed to rename base commit-graph file"
17950 -msgstr "无法重命名基础提交图形文件"
18095 +msgstr "无法重命名基础提交图文件"
18096
18097 #: commit-graph.c
18098 msgid "failed to rename temporary commit-graph file"
17954 -msgstr "无法重命名临时提交图形文件"
18099 +msgstr "无法重命名临时提交图文件"
18100
18101 #: commit-graph.c
18102 #, c-format
18103 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
17959 -msgstr ""
17960 -"无法合并提交图形，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
18104 +msgstr "无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
18105
18106 #: commit-graph.c
18107 #, c-format
18108 msgid "cannot merge graph %s, too many commits: %<PRIuMAX>"
17965 -msgstr "无法合并提交图形 %s, 提交过多：%<PRIuMAX>"
18109 +msgstr "无法合并提交图 %s, 提交过多：%<PRIuMAX>"
18110
18111 #: commit-graph.c
18112 msgid "Scanning merged commits"
@@ -17970,7 +18114,7 @@ msgstr "正在扫描合并提交"
18114
18115 #: commit-graph.c
18116 msgid "Merging commit-graph"
17973 -msgstr "正在合并提交图形"
18117 +msgstr "正在合并提交图"
18118
18119 #: commit-graph.c
18120 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
@@ -17987,59 +18131,59 @@ msgstr "提交图文件的校验码错误，可能已经损坏"
18131 #: commit-graph.c
18132 #, c-format
18133 msgid "commit-graph has incorrect OID order: %s then %s"
17990 -msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
18134 +msgstr "提交图的对象 ID 顺序不正确：%s 然后 %s"
18135
18136 #: commit-graph.c
18137 #, c-format
18138 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
17995 -msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
18139 +msgstr "提交图有不正确的扇出值：fanout[%d] = %u != %u"
18140
18141 #: commit-graph.c
18142 #, c-format
18143 msgid "failed to parse commit %s from commit-graph"
18000 -msgstr "无法从提交图形中解析提交 %s"
18144 +msgstr "无法从提交图中解析提交 %s"
18145
18146 #: commit-graph.c
18147 #, c-format
18148 msgid "failed to parse commit %s from object database for commit-graph"
18005 -msgstr "无法从提交图形的对象库中解析提交 %s"
18149 +msgstr "无法从提交图的对象库中解析提交 %s"
18150
18151 #: commit-graph.c
18152 #, c-format
18153 msgid "root tree OID for commit %s in commit-graph is %s != %s"
18010 -msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
18154 +msgstr "提交图中的提交 %s 的根树对象 ID 是 %s != %s"
18155
18156 #: commit-graph.c
18157 #, c-format
18158 msgid "commit-graph parent list for commit %s is too long"
18015 -msgstr "提交 %s 的提交图形父提交列表太长了"
18159 +msgstr "提交 %s 的提交图父提交列表太长了"
18160
18161 #: commit-graph.c
18162 #, c-format
18163 msgid "commit-graph parent for %s is %s != %s"
18020 -msgstr "%s 的提交图形父提交是 %s != %s"
18164 +msgstr "%s 的提交图父提交是 %s != %s"
18165
18166 #: commit-graph.c
18167 #, c-format
18168 msgid "commit-graph parent list for commit %s terminates early"
18025 -msgstr "提交 %s 的提交图形父提交列表过早终止"
18169 +msgstr "提交 %s 的提交图父提交列表过早终止"
18170
18171 #: commit-graph.c
18172 #, c-format
18173 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
18030 -msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
18174 +msgstr "提交图中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
18175
18176 #: commit-graph.c
18177 #, c-format
18178 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
18035 -msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
18179 +msgstr "提交图中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
18180
18181 #: commit-graph.c
18182 #, c-format
18183 msgid ""
18184 "commit-graph has both zero and non-zero generations (e.g., commits '%s' and "
18185 "'%s')"
18042 -msgstr "提交图形具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
18186 +msgstr "提交图具有零和非零的世代（例如：提交 '%s' 和 '%s'）"
18187
18188 #: commit-graph.c
18189 msgid "Verifying commits in commit graph"
@@ -18073,7 +18217,7 @@ msgstr ""
18217 #: commit.c
18218 #, c-format
18219 msgid "commit %s exists in commit-graph but not in the object database"
18076 -msgstr "提交 %s 存在于提交图形中，但不存在于对象数据库中"
18220 +msgstr "提交 %s 存在于提交图中，但不存在于对象数据库中"
18221
18222 #: commit.c
18223 #, c-format
@@ -19255,6 +19399,11 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模
19399 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
19400 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
19401
19402 +#: diff.c transport.c
19403 +#, c-format
19404 +msgid "unknown value for config '%s': %s"
19405 +msgstr "配置 '%s' 未知的取值：%s"
19406 +
19407 #: diff.c
19408 #, c-format
19409 msgid ""
@@ -19348,13 +19497,6 @@ msgstr "坏的 --color-moved 参数：%s"
19497 msgid "invalid mode '%s' in --color-moved-ws"
19498 msgstr "--color-moved-ws 中的无效模式 '%s' "
19499
19351 -#: diff.c
19352 -msgid ""
19353 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
19354 -"\"histogram\""
19355 -msgstr ""
19356 -"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
19357 -
19500 #: diff.c
19501 #, c-format
19502 msgid "invalid argument to %s"
@@ -19412,8 +19554,8 @@ msgid "output only the last line of --stat"
19554 msgstr "只输出 --stat 的最后一行"
19555
19556 #: diff.c
19415 -msgid "<param1,param2>..."
19416 -msgstr "<参数1,参数2>..."
19557 +msgid "<param1>,<param2>..."
19558 +msgstr "<参数1>,<参数2>..."
19559
19560 #: diff.c
19561 msgid ""
@@ -19425,8 +19567,8 @@ msgid "synonym for --dirstat=cumulative"
19567 msgstr "和 --dirstat=cumulative 同义"
19568
19569 #: diff.c
19428 -msgid "synonym for --dirstat=files,param1,param2..."
19429 -msgstr "是 --dirstat=files,param1,param2... 的同义词"
19570 +msgid "synonym for --dirstat=files,<param1>,<param2>..."
19571 +msgstr "是 --dirstat=files,<参数1>,<参数2>... 的同义词"
19572
19573 #: diff.c
19574 msgid "warn if changes introduce conflict markers or whitespace errors"
@@ -19648,14 +19790,6 @@ msgstr "使用 \"patience diff\" 算法生成差异"
19790 msgid "generate diff using the \"histogram diff\" algorithm"
19791 msgstr "使用 \"histogram diff\" 算法生成差异"
19792
19651 -#: diff.c
19652 -msgid "<algorithm>"
19653 -msgstr "<算法>"
19654 -
19655 -#: diff.c
19656 -msgid "choose a diff algorithm"
19657 -msgstr "选择一个差异算法"
19658 -
19793 #: diff.c
19794 msgid "<text>"
19795 msgstr "<文本>"
@@ -21411,6 +21545,12 @@ msgstr "无法读取缓存"
21545 msgid "multi-pack-index OID fanout is of the wrong size"
21546 msgstr "多包索引的对象 ID 扇出表大小错误"
21547
21548 +#: midx.c
21549 +#, c-format
21550 +msgid ""
21551 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21552 +msgstr "对象 ID 扇出失序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21553 +
21554 #: midx.c
21555 msgid "multi-pack-index OID lookup chunk is the wrong size"
21556 msgstr "多包索引的对象 ID 查询块大小错误"
@@ -21469,6 +21609,15 @@ msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
21609 msgid "bad pack-int-id: %u (%u total packs)"
21610 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
21611
21612 +#: midx.c
21613 +msgid "MIDX does not contain the BTMP chunk"
21614 +msgstr "多包索引中未包含 BTMP 块"
21615 +
21616 +#: midx.c
21617 +#, c-format
21618 +msgid "could not load bitmapped pack %<PRIu32>"
21619 +msgstr "不能打开已被位图索引的包 %<PRIu32>"
21620 +
21621 #: midx.c
21622 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
21623 msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
@@ -21576,12 +21725,6 @@ msgstr "不正确的校验码"
21725 msgid "Looking for referenced packfiles"
21726 msgstr "正在查找引用的包文件"
21727
21579 -#: midx.c
21580 -#, c-format
21581 -msgid ""
21582 -"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21583 -msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
21584 -
21728 #: midx.c
21729 msgid "the midx contains no oid"
21730 msgstr "midx 不包含 oid"
@@ -22211,6 +22354,10 @@ msgstr "多包位图缺少必需的反向索引"
22354 msgid "could not open pack %s"
22355 msgstr "不能打开包 %s"
22356
22357 +#: pack-bitmap.c t/helper/test-read-midx.c
22358 +msgid "could not determine MIDX preferred pack"
22359 +msgstr "不能确定多包索引的首选包"
22360 +
22361 #: pack-bitmap.c
22362 #, c-format
22363 msgid "preferred pack (%s) is invalid"
@@ -22234,6 +22381,11 @@ msgstr "损坏的位图查询表：提交索引 %u 超出范围"
22381 msgid "corrupt ewah bitmap: truncated header for bitmap of commit \"%s\""
22382 msgstr "损坏的 EWAH 位图：提交 \"%s\" 位图的文件头被截断"
22383
22384 +#: pack-bitmap.c
22385 +#, c-format
22386 +msgid "unable to load pack: '%s', disabling pack-reuse"
22387 +msgstr "无法打开包：'%s'，禁用包重用"
22388 +
22389 #: pack-bitmap.c
22390 #, c-format
22391 msgid "object '%s' not found in type bitmaps"
@@ -22349,6 +22501,10 @@ msgstr "位于 %<PRIu64> 的无效的反向索引：%<PRIu32> != %<PRIu32>"
22501 msgid "multi-pack-index reverse-index chunk is the wrong size"
22502 msgstr "多包索引的反向索引块大小错误"
22503
22504 +#: pack-revindex.c
22505 +msgid "could not determine preferred pack"
22506 +msgstr "无法确定首选包"
22507 +
22508 #: pack-write.c
22509 msgid "cannot both write and verify reverse index"
22510 msgstr "无法同时写入和校验反向索引"
@@ -22427,11 +22583,6 @@ msgstr "%s 不可用"
22583 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
22584 msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀"
22585
22430 -#: parse-options.c
22431 -#, c-format
22432 -msgid "%s is incompatible with %s"
22433 -msgstr "%s 与 %s 不兼容"
22434 -
22586 #: parse-options.c
22587 #, c-format
22588 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
@@ -22821,11 +22972,6 @@ msgstr "无法索引文件 '%s'"
22972 msgid "unable to add '%s' to index"
22973 msgstr "无法在索引中添加 '%s'"
22974
22824 -#: read-cache.c
22825 -#, c-format
22826 -msgid "unable to stat '%s'"
22827 -msgstr "无法对 %s 执行 stat"
22828 -
22975 #: read-cache.c
22976 #, c-format
22977 msgid "'%s' appears as both a file and as a directory"
@@ -23500,17 +23646,12 @@ msgstr "'%s' 已存在，无法创建 '%s'"
23646 msgid "cannot process '%s' and '%s' at the same time"
23647 msgstr "无法同时处理 '%s' 和 '%s'"
23648
23503 -#: refs/files-backend.c
23504 -#, c-format
23505 -msgid "could not remove reference %s"
23506 -msgstr "无法删除引用 %s"
23507 -
23508 -#: refs/files-backend.c refs/packed-backend.c
23649 +#: refs.c
23650 #, c-format
23651 msgid "could not delete reference %s: %s"
23652 msgstr "无法删除引用 %s：%s"
23653
23513 -#: refs/files-backend.c refs/packed-backend.c
23654 +#: refs.c
23655 #, c-format
23656 msgid "could not delete references: %s"
23657 msgstr "无法删除引用：%s"
@@ -24665,7 +24806,7 @@ msgstr "无效的作者身份 '%s'"
24806 msgid "corrupt author: missing date information"
24807 msgstr "损坏的作者：缺失日期信息"
24808
24668 -#: sequencer.c t/helper/test-fast-rebase.c
24809 +#: sequencer.c
24810 #, c-format
24811 msgid "could not update %s"
24812 msgstr "不能更新 %s"
@@ -25155,6 +25296,10 @@ msgstr "应用自动贮藏导致冲突。"
25296 msgid "Autostash exists; creating a new stash entry."
25297 msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
25298
25299 +#: sequencer.c
25300 +msgid "autostash reference is a symref"
25301 +msgstr "自动贮藏的引用是一个符号引用"
25302 +
25303 #: sequencer.c
25304 msgid "could not detach HEAD"
25305 msgstr "不能分离头指针"
@@ -25529,6 +25674,11 @@ msgstr "没有从 '%s' 复制模版：%s"
25674 msgid "invalid initial branch name: '%s'"
25675 msgstr "无效的初始分支名：'%s'"
25676
25677 +#: setup.c
25678 +#, c-format
25679 +msgid "re-init: ignored --initial-branch=%s"
25680 +msgstr "re-init：已忽略 --initial-branch=%s"
25681 +
25682 #: setup.c
25683 #, c-format
25684 msgid "unable to handle file type %d"
@@ -25544,14 +25694,14 @@ msgid "attempt to reinitialize repository with different hash"
25694 msgstr "尝试用不同的哈希算法重新初始化仓库"
25695
25696 #: setup.c
25547 -#, c-format
25548 -msgid "%s already exists"
25549 -msgstr "%s 已经存在"
25697 +msgid ""
25698 +"attempt to reinitialize repository with different reference storage format"
25699 +msgstr "尝试使用不同的引用存储格式重新初始化仓库"
25700
25701 #: setup.c
25702 #, c-format
25553 -msgid "re-init: ignored --initial-branch=%s"
25554 -msgstr "re-init：已忽略 --initial-branch=%s"
25703 +msgid "%s already exists"
25704 +msgstr "%s 已经存在"
25705
25706 #: setup.c
25707 #, c-format
@@ -25869,14 +26019,6 @@ msgstr "在每次迭代前清除缓存树"
26019 msgid "number of entries in the cache tree to invalidate (default 0)"
26020 msgstr "缓存树中无效化的条目数量（默认 0）"
26021
25872 -#: t/helper/test-fast-rebase.c
25873 -msgid "unhandled options"
25874 -msgstr "未处理的选项"
25875 -
25876 -#: t/helper/test-fast-rebase.c
25877 -msgid "error preparing revisions"
25878 -msgstr "准备版本时错误"
25879 -
26022 #: t/helper/test-reach.c
26023 #, c-format
26024 msgid "commit %s is not marked reachable"
@@ -26070,10 +26212,6 @@ msgstr "协议不支持设置远程服务路径"
26212 msgid "invalid remote service path"
26213 msgstr "无效的远程服务路径"
26214
26073 -#: transport-helper.c transport.c
26074 -msgid "operation not supported by protocol"
26075 -msgstr "协议不支持该操作"
26076 -
26215 #: transport-helper.c
26216 #, c-format
26217 msgid "can't connect to subservice %s"
@@ -26237,11 +26375,6 @@ msgstr "不能解析 transport.color.* 配置"
26375 msgid "support for protocol v2 not implemented yet"
26376 msgstr "协议 v2 的支持尚未实现"
26377
26240 -#: transport.c
26241 -#, c-format
26242 -msgid "unknown value for config '%s': %s"
26243 -msgstr "配置 '%s' 的取值未知：%s"
26244 -
26378 #: transport.c
26379 #, c-format
26380 msgid "transport '%s' not allowed"
@@ -26301,6 +26434,10 @@ msgstr "协议不支持 bundle-uri 操作"
26434 msgid "could not retrieve server-advertised bundle-uri list"
26435 msgstr "无法获取服务器公布的 bundle-uri 列表"
26436
26437 +#: transport.c
26438 +msgid "operation not supported by protocol"
26439 +msgstr "协议不支持该操作"
26440 +
26441 #: tree-walk.c
26442 msgid "too-short tree object"
26443 msgstr "太短的树对象"
@@ -27329,6 +27466,11 @@ msgstr "另外，您的索引中包含未提交的变更。"
27466 msgid "cannot %s: Your index contains uncommitted changes."
27467 msgstr "不能%s：您的索引中包含未提交的变更。"
27468
27469 +#: xdiff-interface.c
27470 +#, c-format
27471 +msgid "unknown style '%s' given for '%s'"
27472 +msgstr "'%2$s' 的未知风格取值 '%1$s'"
27473 +
27474 #: git-merge-octopus.sh git-merge-resolve.sh
27475 msgid ""
27476 "Error: Your local changes to the following files would be overwritten by "