@matheusbsbs / matheus-bagliano / commits / 3065daed59

l10n: zh_CN: updated translation for 2.53

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

Jiang Xin committed Jan 29, 2026 at 20:30 UTC 3065daed59fec71bbe0a5d464b6ce3eb66f6b806
1 file changed +345 -209
po/zh_CN.po
+345 -209
@@ -155,7 +155,7 @@ 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-11-15 22:02+0800\n"
158 +"POT-Creation-Date: 2026-01-29 19:17+0800\n"
159 "PO-Revision-Date: 2025-11-16 01:03+0800\n"
160 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
161 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
@@ -1083,9 +1083,9 @@ msgstr "未能识别的空白字符忽略选项 '%s'"
1083 #: builtin/fast-export.c builtin/fetch.c builtin/help.c builtin/index-pack.c
1084 #: builtin/init-db.c builtin/log.c builtin/ls-files.c builtin/merge-base.c
1085 #: builtin/merge-tree.c builtin/merge.c builtin/rebase.c builtin/repack.c
1086 -#: builtin/replay.c builtin/reset.c builtin/rev-parse.c builtin/show-branch.c
1087 -#: builtin/stash.c builtin/submodule--helper.c builtin/tag.c builtin/worktree.c
1088 -#: parse-options.c range-diff.c revision.c
1086 +#: builtin/reset.c builtin/rev-parse.c builtin/show-branch.c builtin/stash.c
1087 +#: builtin/submodule--helper.c builtin/tag.c builtin/worktree.c parse-options.c
1088 +#: range-diff.c revision.c
1089 #, c-format
1090 msgid "options '%s' and '%s' cannot be used together"
1091 msgstr "选项 '%s' 和 '%s' 不能同时使用"
@@ -2235,8 +2235,8 @@ msgid "'%s' is not a valid branch name"
2235 msgstr "'%s' 不是一个有效的分支名称"
2236
2237 #: branch.c builtin/branch.c
2238 -msgid "See `man git check-ref-format`"
2239 -msgstr "查阅 `man git check-ref-format`"
2238 +msgid "See 'git help check-ref-format'"
2239 +msgstr "参阅 'git help check-ref-format'"
2240
2241 #: branch.c
2242 #, c-format
@@ -3347,6 +3347,19 @@ msgstr "期望一个颜色：%s"
3347 msgid "must end with a color"
3348 msgstr "必须以一个颜色结尾"
3349
3350 +#: builtin/blame.c diff.c merge-ort.c transport.c
3351 +#, c-format
3352 +msgid "unknown value for config '%s': %s"
3353 +msgstr "配置 '%s' 未知的取值：%s"
3354 +
3355 +#: builtin/blame.c builtin/merge-file.c diff.c
3356 +msgid ""
3357 +"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
3358 +"\"histogram\""
3359 +msgstr ""
3360 +"选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 "
3361 +"\"histogram\""
3362 +
3363 #: builtin/blame.c
3364 #, c-format
3365 msgid "cannot find revision %s to ignore"
@@ -3418,6 +3431,14 @@ msgstr "显示作者的邮箱而不是名字（默认：关闭）"
3431 msgid "ignore whitespace differences"
3432 msgstr "忽略空白差异"
3433
3434 +#: builtin/blame.c builtin/merge-file.c diff.c
3435 +msgid "<algorithm>"
3436 +msgstr "<算法>"
3437 +
3438 +#: builtin/blame.c builtin/merge-file.c diff.c
3439 +msgid "choose a diff algorithm"
3440 +msgstr "选择一个差异算法"
3441 +
3442 #: builtin/blame.c builtin/clone.c builtin/log.c
3443 msgid "rev"
3444 msgstr "版本"
@@ -3439,8 +3460,8 @@ msgid "color lines by age"
3460 msgstr "依据时间着色"
3461
3462 #: builtin/blame.c
3442 -msgid "spend extra cycles to find better match"
3443 -msgstr "花费额外的循环来找到更好的匹配"
3463 +msgid "spend extra cycles to find a better match"
3464 +msgstr "花费更多计算来找到更好的匹配"
3465
3466 #: builtin/blame.c
3467 msgid "use revisions from <file> instead of calling git-rev-list"
@@ -3985,7 +4006,7 @@ msgstr ""
4006 "您可以删除任何您不想共享的内容。\n"
4007
4008 #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c
3988 -#: builtin/pack-objects.c builtin/rebase.c parse-options.h
4009 +#: builtin/pack-objects.c builtin/rebase.c builtin/replay.c parse-options.h
4010 msgid "mode"
4011 msgstr "模式"
4012
@@ -4905,10 +4926,10 @@ msgstr "--track 需要一个分支名"
4926 msgid "missing branch name; try -%c"
4927 msgstr "缺少分支名，尝试 -%c"
4928
4908 -#: builtin/checkout.c
4929 +#: builtin/checkout.c sequencer.c
4930 #, c-format
4910 -msgid "could not resolve %s"
4911 -msgstr "无法解析 %s"
4931 +msgid "could not resolve '%s'"
4932 +msgstr "无法解析 '%s'"
4933
4934 #: builtin/checkout.c
4935 msgid "invalid path specification"
@@ -6732,10 +6753,18 @@ msgstr "--append 不能与 --value=<模式> 一起使用"
6753 #, c-format
6754 msgid ""
6755 "cannot overwrite multiple values with a single value\n"
6735 -" Use a regexp, --add or --replace-all to change %s."
6756 +" Use --value=<pattern>, --append or --all to change %s."
6757 msgstr ""
6737 -"无法用一个值覆盖多个值\n"
6738 -" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
6758 +"无法用单个值覆盖多个值\n"
6759 +" 使用 --value=<模式>, --append 或 --all 来修改 %s。"
6760 +
6761 +#: builtin/config.c
6762 +msgid "unset all multi-valued config options"
6763 +msgstr "取消设置所有多值配置选项"
6764 +
6765 +#: builtin/config.c
6766 +msgid "unset multi-valued config options with matching values"
6767 +msgstr "取消设置匹配值的多值配置选项"
6768
6769 #: builtin/config.c
6770 #, c-format
@@ -6845,6 +6874,15 @@ msgstr "--default 仅适用于 --get"
6874 msgid "--comment is only applicable to add/set/replace operations"
6875 msgstr "--comment 仅适用于 add/set/replace 操作"
6876
6877 +#: builtin/config.c
6878 +#, c-format
6879 +msgid ""
6880 +"cannot overwrite multiple values with a single value\n"
6881 +" Use a regexp, --add or --replace-all to change %s."
6882 +msgstr ""
6883 +"无法用一个值覆盖多个值\n"
6884 +" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
6885 +
6886 #: builtin/count-objects.c
6887 msgid "print sizes in human readable format"
6888 msgstr "以用户可读的格式显示大小"
@@ -7349,11 +7387,6 @@ msgid ""
7387 msgstr ""
7388 "在提交 %3$s 中遇到提交特定编码 %2$.*1$s；使用 --reencode=[yes|no] 来处理"
7389
7352 -#: builtin/fast-export.c
7353 -#, c-format
7354 -msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
7355 -msgstr "遇到已签名提交 %s；使用 --signed-commits=<模式> 来处理"
7356 -
7390 #: builtin/fast-export.c
7391 #, c-format
7392 msgid "exporting %<PRIuMAX> signature(s) for commit %s"
@@ -7364,6 +7397,19 @@ msgstr "正在导出提交 %2$s 的 %1$<PRIuMAX> 个签名"
7397 msgid "stripping signature(s) from commit %s"
7398 msgstr "正在剥离提交 %s 的签名"
7399
7400 +#: builtin/fast-export.c
7401 +#, c-format
7402 +msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
7403 +msgstr "遇到已签名提交 %s；使用 --signed-commits=<模式> 来处理"
7404 +
7405 +#: builtin/fast-export.c
7406 +msgid ""
7407 +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7408 +"commits=<mode>"
7409 +msgstr ""
7410 +"在 git fast-export 的 --signed-commits=<模式> 中，'strip-if-invalid' 不是有效"
7411 +"模式"
7412 +
7413 #: builtin/fast-export.c
7414 #, c-format
7415 msgid ""
@@ -7378,11 +7424,6 @@ msgstr ""
7424 msgid "could not read tag %s"
7425 msgstr "无法读取标签 %s"
7426
7381 -#: builtin/fast-export.c
7382 -#, c-format
7383 -msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
7384 -msgstr "遇到已签名标签 %s；使用 --signed-tags=<模式> 来处理"
7385 -
7427 #: builtin/fast-export.c
7428 #, c-format
7429 msgid "exporting signed tag %s"
@@ -7393,6 +7434,19 @@ msgstr "正在导出已签名标签 %s"
7434 msgid "stripping signature from tag %s"
7435 msgstr "正在从标签 %s 中剥离签名"
7436
7437 +#: builtin/fast-export.c
7438 +#, c-format
7439 +msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
7440 +msgstr "遇到已签名标签 %s；使用 --signed-tags=<模式> 来处理"
7441 +
7442 +#: builtin/fast-export.c
7443 +msgid ""
7444 +"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7445 +"tags=<mode>"
7446 +msgstr ""
7447 +"在 git fast-export 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模"
7448 +"式"
7449 +
7450 #: builtin/fast-export.c
7451 #, c-format
7452 msgid ""
@@ -7883,6 +7937,37 @@ msgstr "发现多个 %s 签名，忽略附加的签名"
7937 msgid "parse_one_signature() returned unknown hash algo"
7938 msgstr "parse_one_signature() 返回了未知的哈希算法"
7939
7940 +#: builtin/fast-import.c builtin/fsck.c
7941 +msgid "unknown"
7942 +msgstr "未知"
7943 +
7944 +#: builtin/fast-import.c
7945 +#, c-format
7946 +msgid ""
7947 +"stripping invalid signature for commit '%.100s...'\n"
7948 +" allegedly by %s"
7949 +msgstr ""
7950 +"正在剥离提交 '%.100s...' 的无效签名\n"
7951 +" 据称由 %s 提供"
7952 +
7953 +#: builtin/fast-import.c
7954 +#, c-format
7955 +msgid ""
7956 +"stripping invalid signature for commit '%.*s'\n"
7957 +" allegedly by %s"
7958 +msgstr ""
7959 +"正在剥离提交 '%.*s' 的无效签名\n"
7960 +" 据称由 %s 提供"
7961 +
7962 +#: builtin/fast-import.c
7963 +#, c-format
7964 +msgid ""
7965 +"stripping invalid signature for commit\n"
7966 +" allegedly by %s"
7967 +msgstr ""
7968 +"正在剥离提交的无效签名\n"
7969 +" 据称由 %s 提供"
7970 +
7971 #: builtin/fast-import.c
7972 msgid "expected committer but didn't get one"
7973 msgstr "预期提交者但未获取"
@@ -7899,10 +7984,6 @@ msgstr "正在剥离提交签名"
7984 msgid "importing a commit signature verbatim"
7985 msgstr "逐字导入提交签名"
7986
7902 -#: builtin/fast-import.c
7903 -msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7904 -msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它"
7905 -
7987 #: builtin/fast-import.c
7988 #, c-format
7989 msgid "importing a tag signature verbatim for tag '%s'"
@@ -7913,6 +7994,18 @@ msgstr "逐字导入标签 '%s' 的签名"
7994 msgid "stripping a tag signature for tag '%s'"
7995 msgstr "正在剥离标签 '%s' 的签名"
7996
7997 +#: builtin/fast-import.c
7998 +msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7999 +msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它"
8000 +
8001 +#: builtin/fast-import.c
8002 +msgid ""
8003 +"'strip-if-invalid' is not a valid mode for git fast-import with --signed-"
8004 +"tags=<mode>"
8005 +msgstr ""
8006 +"在 git fast-import 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模"
8007 +"式"
8008 +
8009 #: builtin/fast-import.c
8010 #, c-format
8011 msgid "expected 'from' command, got '%s'"
@@ -8111,8 +8204,8 @@ msgid "git fetch [<options>] <group>"
8204 msgstr "git fetch [<选项>] <组>"
8205
8206 #: builtin/fetch.c
8114 -msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
8115 -msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
8207 +msgid "git fetch --multiple [<options>] [(<repository>|<group>)...]"
8208 +msgstr "git fetch --multiple [<选项>] [(<仓库>|<组>)...]"
8209
8210 #: builtin/fetch.c
8211 msgid "git fetch --all [<options>]"
@@ -8684,10 +8777,6 @@ msgstr "缺少 --config=<配置>"
8777 msgid "got bad config --config=%s"
8778 msgstr "发现错误的配置行 --config=%s"
8779
8687 -#: builtin/fsck.c
8688 -msgid "unknown"
8689 -msgstr "未知"
8690 -
8780 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
8781 #: builtin/fsck.c
8782 #, c-format
@@ -8806,6 +8895,11 @@ msgstr "%s：无效的 sha1 指针 %s"
8895 msgid "%s: not a commit"
8896 msgstr "%s：不是一个提交"
8897
8898 +#: builtin/fsck.c
8899 +#, c-format
8900 +msgid "invalid parameter: expected sha1, got '%s'"
8901 +msgstr "无效的参数：期望 sha1，得到 '%s'"
8902 +
8903 #: builtin/fsck.c
8904 msgid "notice: No default references"
8905 msgstr "注意：无默认引用"
@@ -8838,31 +8932,6 @@ msgstr "正在检查对象目录"
8932 msgid "Checking object directories"
8933 msgstr "正在检查对象目录"
8934
8841 -#: builtin/fsck.c
8842 -#, c-format
8843 -msgid "Checking %s link"
8844 -msgstr "正在检查 %s 链接"
8845 -
8846 -#: builtin/fsck.c builtin/index-pack.c
8847 -#, c-format
8848 -msgid "invalid %s"
8849 -msgstr "无效的 %s"
8850 -
8851 -#: builtin/fsck.c
8852 -#, c-format
8853 -msgid "%s points to something strange (%s)"
8854 -msgstr "%s 指向奇怪的东西（%s）"
8855 -
8856 -#: builtin/fsck.c
8857 -#, c-format
8858 -msgid "%s: detached HEAD points at nothing"
8859 -msgstr "%s：分离头指针的指向不存在"
8860 -
8861 -#: builtin/fsck.c
8862 -#, c-format
8863 -msgid "notice: %s points to an unborn branch (%s)"
8864 -msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
8865 -
8935 #: builtin/fsck.c
8936 #, c-format
8937 msgid "Checking cache tree of %s"
@@ -8964,16 +9033,6 @@ msgstr "检查引用数据库一致性"
9033 msgid "Checking objects"
9034 msgstr "正在检查对象"
9035
8967 -#: builtin/fsck.c
8968 -#, c-format
8969 -msgid "%s: object missing"
8970 -msgstr "%s：对象缺失"
8971 -
8972 -#: builtin/fsck.c
8973 -#, c-format
8974 -msgid "invalid parameter: expected sha1, got '%s'"
8975 -msgstr "无效的参数：期望 sha1，得到 '%s'"
8976 -
9036 #: builtin/fsmonitor--daemon.c
9037 msgid "git fsmonitor--daemon start [<options>]"
9038 msgstr "git fsmonitor--daemon start [<选项>]"
@@ -9444,6 +9503,10 @@ msgstr "无法设置维护计划"
9503 msgid "failed to add repo to global config"
9504 msgstr "无法将仓库添加到全局配置"
9505
9506 +#: builtin/gc.c
9507 +msgid "check a specific task"
9508 +msgstr "检查特定任务"
9509 +
9510 #: builtin/gc.c
9511 msgid "git maintenance <subcommand> [<options>]"
9512 msgstr "git maintenance <子命令> [<选项>]"
@@ -10019,6 +10082,11 @@ msgstr "无效的数据对象 %s"
10082 msgid "fsck error in packed object"
10083 msgstr "对打包对象 fsck 检查出错"
10084
10085 +#: builtin/index-pack.c
10086 +#, c-format
10087 +msgid "invalid %s"
10088 +msgstr "无效的 %s"
10089 +
10090 #: builtin/index-pack.c
10091 #, c-format
10092 msgid "Not all child objects of %s are reachable"
@@ -10195,6 +10263,10 @@ msgstr "--stdin 需要 git 仓库"
10263 msgid "--verify with no packfile name given"
10264 msgstr "--verify 没有提供包文件名参数"
10265
10266 +#: builtin/index-pack.c
10267 +msgid "cannot perform queued object checks outside of a repository"
10268 +msgstr "无法在仓库之外执行排队的对象检查"
10269 +
10270 #: builtin/index-pack.c builtin/unpack-objects.c
10271 msgid "fsck error in pack objects"
10272 msgstr "在打包对象中 fsck 检查出错"
@@ -11149,14 +11221,6 @@ msgstr ""
11221 "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
11222 "始文件> <文件2>"
11223
11152 -#: builtin/merge-file.c diff.c
11153 -msgid ""
11154 -"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
11155 -"\"histogram\""
11156 -msgstr ""
11157 -"选项 diff-algorithm 接受参数 \"myers\"、\"minimal\"、\"patience\" 和 "
11158 -"\"histogram\""
11159 -
11224 #: builtin/merge-file.c
11225 msgid "send results to standard output"
11226 msgstr "将结果发送到标准输出"
@@ -11173,14 +11237,6 @@ msgstr "使用基于 diff3 的合并"
11237 msgid "use a zealous diff3 based merge"
11238 msgstr "使用基于狂热 diff3（zealous diff3）的合并"
11239
11176 -#: builtin/merge-file.c diff.c
11177 -msgid "<algorithm>"
11178 -msgstr "<算法>"
11179 -
11180 -#: builtin/merge-file.c diff.c
11181 -msgid "choose a diff algorithm"
11182 -msgstr "选择一个差异算法"
11183 -
11240 #: builtin/merge-file.c
11241 msgid "for conflicts, use this marker size"
11242 msgstr "如果冲突，使用指定长度的标记"
@@ -12508,6 +12564,11 @@ msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '
12564 msgid "could not get type of object %s in pack %s"
12565 msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
12566
12567 +#: builtin/pack-objects.c
12568 +#, c-format
12569 +msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
12570 +msgstr "包文件 %s 是承诺者，但已给出 --exclude-promisor-objects"
12571 +
12572 #: builtin/pack-objects.c
12573 #, c-format
12574 msgid "could not find pack '%s'"
@@ -12839,12 +12900,12 @@ msgid "git patch-id [--stable | --unstable | --verbatim]"
12900 msgstr "git patch-id [--stable | --unstable | --verbatim]"
12901
12902 #: builtin/patch-id.c
12842 -msgid "use the unstable patch-id algorithm"
12843 -msgstr "使用不稳定的 patch-id 算法"
12903 +msgid "use the unstable patch ID algorithm"
12904 +msgstr "使用不稳定的 patch ID 算法"
12905
12906 #: builtin/patch-id.c
12846 -msgid "use the stable patch-id algorithm"
12847 -msgstr "使用稳定的 patch-id 算法"
12907 +msgid "use the stable patch ID algorithm"
12908 +msgstr "使用稳定的 patch ID 算法"
12909
12910 #: builtin/patch-id.c
12911 msgid "don't strip whitespace from the patch"
@@ -12874,50 +12935,6 @@ msgstr "不能在珍品仓库中执行清理操作"
12935 msgid "git pull [<options>] [<repository> [<refspec>...]]"
12936 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
12937
12877 -#: builtin/pull.c
12878 -msgid "control for recursive fetching of submodules"
12879 -msgstr "控制子模组的递归获取"
12880 -
12881 -#: builtin/pull.c
12882 -msgid "Options related to merging"
12883 -msgstr "和合并相关的选项"
12884 -
12885 -#: builtin/pull.c
12886 -msgid "incorporate changes by rebasing rather than merging"
12887 -msgstr "使用变基操作取代合并操作以合入修改"
12888 -
12889 -#: builtin/pull.c builtin/revert.c
12890 -msgid "allow fast-forward"
12891 -msgstr "允许快进式"
12892 -
12893 -#: builtin/pull.c
12894 -msgid "control use of pre-merge-commit and commit-msg hooks"
12895 -msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
12896 -
12897 -#: builtin/pull.c parse-options.h
12898 -msgid "automatically stash/stash pop before and after"
12899 -msgstr "在操作前后执行自动贮藏和弹出贮藏"
12900 -
12901 -#: builtin/pull.c
12902 -msgid "Options related to fetching"
12903 -msgstr "和获取相关的参数"
12904 -
12905 -#: builtin/pull.c
12906 -msgid "force overwrite of local branch"
12907 -msgstr "强制覆盖本地分支"
12908 -
12909 -#: builtin/pull.c
12910 -msgid "number of submodules pulled in parallel"
12911 -msgstr "并发拉取的子模组的数量"
12912 -
12913 -#: builtin/pull.c parse-options.h
12914 -msgid "use IPv4 addresses only"
12915 -msgstr "只使用 IPv4 地址"
12916 -
12917 -#: builtin/pull.c parse-options.h
12918 -msgid "use IPv6 addresses only"
12919 -msgstr "只使用 IPv6 地址"
12920 -
12938 #: builtin/pull.c
12939 msgid ""
12940 "There is no candidate for rebasing against among the refs that you just "
@@ -13028,6 +13045,50 @@ msgstr ""
13045 "缺省的配置项。您也可以在每次执行 pull 命令时添加 --rebase、--no-rebase，\n"
13046 "或者 --ff-only 参数覆盖缺省设置。\n"
13047
13048 +#: builtin/pull.c
13049 +msgid "control for recursive fetching of submodules"
13050 +msgstr "控制子模组的递归获取"
13051 +
13052 +#: builtin/pull.c
13053 +msgid "Options related to merging"
13054 +msgstr "和合并相关的选项"
13055 +
13056 +#: builtin/pull.c
13057 +msgid "incorporate changes by rebasing rather than merging"
13058 +msgstr "使用变基操作取代合并操作以合入修改"
13059 +
13060 +#: builtin/pull.c builtin/revert.c
13061 +msgid "allow fast-forward"
13062 +msgstr "允许快进式"
13063 +
13064 +#: builtin/pull.c
13065 +msgid "control use of pre-merge-commit and commit-msg hooks"
13066 +msgstr "控制 pre-merge-commit 和 commit-msg 钩子的使用"
13067 +
13068 +#: builtin/pull.c parse-options.h
13069 +msgid "automatically stash/stash pop before and after"
13070 +msgstr "在操作前后执行自动贮藏和弹出贮藏"
13071 +
13072 +#: builtin/pull.c
13073 +msgid "Options related to fetching"
13074 +msgstr "和获取相关的参数"
13075 +
13076 +#: builtin/pull.c
13077 +msgid "force overwrite of local branch"
13078 +msgstr "强制覆盖本地分支"
13079 +
13080 +#: builtin/pull.c
13081 +msgid "number of submodules pulled in parallel"
13082 +msgstr "并发拉取的子模组的数量"
13083 +
13084 +#: builtin/pull.c parse-options.h
13085 +msgid "use IPv4 addresses only"
13086 +msgstr "只使用 IPv4 地址"
13087 +
13088 +#: builtin/pull.c parse-options.h
13089 +msgid "use IPv6 addresses only"
13090 +msgstr "只使用 IPv6 地址"
13091 +
13092 #: builtin/pull.c
13093 msgid "Updating an unborn branch with changes added to the index."
13094 msgstr "更新尚未诞生的分支，变更添加至索引。"
@@ -15254,6 +15315,11 @@ msgstr "--convert-graft-file 不带参数"
15315 msgid "only one pattern can be given with -l"
15316 msgstr "只能为 -l 提供一个模式"
15317
15318 +#: builtin/replay.c
15319 +#, c-format
15320 +msgid "'%s' is not a valid commit-ish for %s"
15321 +msgstr "'%s' 不是 %s 的有效提交号"
15322 +
15323 #: builtin/replay.c
15324 msgid "need some commits to replay"
15325 msgstr "需要一些提交来重放"
@@ -15273,27 +15339,17 @@ msgid ""
15339 msgstr "不能使用多个源推进目标，因为无法明确如何排序"
15340
15341 #: builtin/replay.c
15276 -msgid ""
15277 -"cannot implicitly determine whether this is an --advance or --onto operation"
15278 -msgstr "不能隐式地确定这是 --advance 还是 --onto 的操作"
15279 -
15280 -#: builtin/replay.c
15281 -msgid ""
15282 -"cannot advance target with multiple source branches because ordering would "
15283 -"be ill-defined"
15284 -msgstr "不能使用多个源分支推进目标，因为无法明确如何排序"
15285 -
15286 -#: builtin/replay.c
15287 -msgid "cannot implicitly determine correct base for --onto"
15288 -msgstr "不能隐式地确定 --onto 正确的基线"
15342 +#, c-format
15343 +msgid "invalid %s value: '%s'"
15344 +msgstr "无效的 %s 值：'%s'"
15345
15346 #: builtin/replay.c
15347 msgid ""
15348 "(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
15293 -"<branch>) <revision-range>..."
15349 +"<branch>) [--ref-action[=<mode>]] <revision-range>"
15350 msgstr ""
15295 -"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) <版"
15296 -"本范围>..."
15351 +"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) [--"
15352 +"ref-action[=<模式>]] <版本范围>"
15353
15354 #: builtin/replay.c
15355 msgid "make replay advance given branch"
@@ -15304,8 +15360,12 @@ msgid "replay onto given commit"
15360 msgstr "重放到给定提交"
15361
15362 #: builtin/replay.c
15307 -msgid "advance all branches contained in revision-range"
15308 -msgstr "演进版本范围中包含的所有分支"
15363 +msgid "update all branches that point at commits in <revision-range>"
15364 +msgstr "更新指向 <版本范围> 中提交的所有分支"
15365 +
15366 +#: builtin/replay.c
15367 +msgid "control ref update behavior (update|print)"
15368 +msgstr "控制引用更新行为（update|print）"
15369
15370 #: builtin/replay.c
15371 msgid "option --onto or --advance is mandatory"
@@ -15319,18 +15379,33 @@ msgid ""
15379 msgstr ""
15380 "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
15381
15382 +#: builtin/replay.c
15383 +#, c-format
15384 +msgid "failed to begin ref transaction: %s"
15385 +msgstr "无法开始引用事务：%s"
15386 +
15387 #: builtin/replay.c
15388 msgid "error preparing revisions"
15389 msgstr "准备版本时错误"
15390
15391 #: builtin/replay.c
15327 -msgid "replaying down to root commit is not supported yet!"
15328 -msgstr "目前还不支持重放到根提交！"
15392 +msgid "replaying down from root commit is not supported yet!"
15393 +msgstr "目前还不支持从根提交向下重放！"
15394
15395 #: builtin/replay.c
15396 msgid "replaying merge commits is not supported yet!"
15397 msgstr "目前还不支持重放到合并提交！"
15398
15399 +#: builtin/replay.c
15400 +#, c-format
15401 +msgid "failed to update ref '%s': %s"
15402 +msgstr "无法更新引用 '%s'：%s"
15403 +
15404 +#: builtin/replay.c
15405 +#, c-format
15406 +msgid "failed to commit ref transaction: %s"
15407 +msgstr "无法提交引用事务：%s"
15408 +
15409 #: builtin/repo.c
15410 #, c-format
15411 msgid "key '%s' not found"
@@ -15349,10 +15424,18 @@ msgstr "输出格式"
15424 msgid "synonym for --format=nul"
15425 msgstr "和 --format=nul 同义"
15426
15427 +#: builtin/repo.c
15428 +msgid "print all keys/values"
15429 +msgstr "打印所有键/值"
15430 +
15431 #: builtin/repo.c
15432 msgid "unsupported output format"
15433 msgstr "不支持的输出格式"
15434
15435 +#: builtin/repo.c
15436 +msgid "--all and <key> cannot be used together"
15437 +msgstr "--all 不能和 <key> 一起使用"
15438 +
15439 #: builtin/repo.c
15440 msgid "References"
15441 msgstr "引用"
@@ -15393,6 +15476,14 @@ msgstr "树"
15476 msgid "Blobs"
15477 msgstr "数据对象"
15478
15479 +#: builtin/repo.c
15480 +msgid "Inflated size"
15481 +msgstr "展开后大小"
15482 +
15483 +#: builtin/repo.c
15484 +msgid "Disk size"
15485 +msgstr "磁盘大小"
15486 +
15487 #: builtin/repo.c
15488 msgid "Repository structure"
15489 msgstr "仓库结构"
@@ -17378,7 +17469,7 @@ msgstr "'%s' 已经存在于索引中"
17469 msgid "'%s' already exists in the index and is not a submodule"
17470 msgstr "'%s' 已经存在于索引中且不是一个子模组"
17471
17381 -#: builtin/submodule--helper.c read-cache.c
17472 +#: builtin/submodule--helper.c object-file.c
17473 #, c-format
17474 msgid "'%s' does not have a commit checked out"
17475 msgstr "'%s' 没有检出一个提交"
@@ -18432,6 +18523,11 @@ msgstr "不能解析归档包列表键 %s 的值 '%s'"
18523 msgid "bundle list at '%s' has no mode"
18524 msgstr "在 '%s' 的归档包列表没有模式"
18525
18526 +#: bundle-uri.c
18527 +#, c-format
18528 +msgid "bundle list at '%s': bundle '%s' has no uri"
18529 +msgstr "在 '%s' 的归档包列表中，归档包 '%s' 没有 URI"
18530 +
18531 #: bundle-uri.c
18532 msgid "failed to create temporary file"
18533 msgstr "无法创建临时文件"
@@ -18459,6 +18555,11 @@ msgstr "不可辨认的归档包模式来自 URI '%s'"
18555 msgid "exceeded bundle URI recursion limit (%d)"
18556 msgstr "超过了 URI 递归限制 (%d)"
18557
18558 +#: bundle-uri.c
18559 +#, c-format
18560 +msgid "bundle '%s' has no uri"
18561 +msgstr "归档包 '%s' 没有 URI"
18562 +
18563 #: bundle-uri.c
18564 #, c-format
18565 msgid "failed to download bundle from URI '%s'"
@@ -19103,8 +19204,8 @@ msgid "Reuse recorded resolution of conflicted merges"
19204 msgstr "重用冲突合并的解决方案记录"
19205
19206 #: command-list.h
19106 -msgid "Reset current HEAD to the specified state"
19107 -msgstr "重置当前 HEAD 到指定状态"
19207 +msgid "Set `HEAD` or the index to a known state"
19208 +msgstr "将 `HEAD` 或索引设置为已知状态"
19209
19210 #: command-list.h
19211 msgid "Restore working tree files"
@@ -20954,11 +21055,6 @@ msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模
21055 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
21056 msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
21057
20957 -#: diff.c merge-ort.c transport.c
20958 -#, c-format
20959 -msgid "unknown value for config '%s': %s"
20960 -msgstr "配置 '%s' 未知的取值：%s"
20961 -
21058 #: diff.c
21059 #, c-format
21060 msgid ""
@@ -23519,6 +23615,10 @@ msgstr "索引 %s 时读入不完整"
23615 msgid "%s: failed to insert into database"
23616 msgstr "%s：无法插入数据库"
23617
23618 +#: object-file.c
23619 +msgid "cannot add a submodule of a different hash algorithm"
23620 +msgstr "不能添加使用不同哈希算法的子模组"
23621 +
23622 #: object-file.c
23623 #, c-format
23624 msgid "%s: unsupported file type"
@@ -25248,6 +25348,11 @@ msgstr "这个命令拒绝元素 %%(%.*s)"
25348 msgid "--format=%.*s cannot be used with --python, --shell, --tcl"
25349 msgstr "--format=%.*s 不能和 --python、--shell、--tcl 同时使用"
25350
25351 +#: ref-filter.c
25352 +#, c-format
25353 +msgid "parse_object_buffer failed on %s for %s"
25354 +msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
25355 +
25356 #: ref-filter.c
25357 msgid "failed to run 'describe'"
25358 msgstr "无法运行 'describe'"
@@ -25286,11 +25391,6 @@ msgstr "（非分支）"
25391 msgid "missing object %s for %s"
25392 msgstr "缺失 %2$s 的对象 %1$s"
25393
25289 -#: ref-filter.c
25290 -#, c-format
25291 -msgid "parse_object_buffer failed on %s for %s"
25292 -msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
25293 -
25394 #: ref-filter.c
25395 #, c-format
25396 msgid "malformed object at '%s'"
@@ -25640,6 +25740,21 @@ msgstr "引用名称 %s 未找到"
25740 msgid "refname %s is a symbolic ref, copying it is not supported"
25741 msgstr "引用名 %s 是一个符号引用，不支持复制"
25742
25743 +#: refs/reftable-backend.c
25744 +#, c-format
25745 +msgid "reftable stack for worktree '%s' is broken"
25746 +msgstr "工作区 '%s' 的 reftable 堆栈已损坏"
25747 +
25748 +#: refs/reftable-backend.c
25749 +#, c-format
25750 +msgid "could not create iterator for worktree '%s'"
25751 +msgstr "无法为工作区 '%s' 创建迭代器"
25752 +
25753 +#: refs/reftable-backend.c
25754 +#, c-format
25755 +msgid "could not read record for worktree '%s'"
25756 +msgstr "无法读取工作区 '%s' 的记录"
25757 +
25758 #: refspec.c
25759 #, c-format
25760 msgid "pattern '%s' has no '*'"
@@ -26140,6 +26255,10 @@ msgstr "repack：来自 pack-objects 的输入必须为完整的十六进制对
26255 msgid "could not finish pack-objects to repack promisor objects"
26256 msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
26257
26258 +#: repack-promisor.c
26259 +msgid "could not start pack-objects to repack promisor packs"
26260 +msgstr "无法启动 pack-objects 来重新打包承诺者包"
26261 +
26262 #: repack.c
26263 #, c-format
26264 msgid "pack prefix %s does not begin with objdir %s"
@@ -27344,11 +27463,6 @@ msgstr ""
27463 msgid "illegal label name: '%.*s'"
27464 msgstr "非法的标签名称：'%.*s'"
27465
27347 -#: sequencer.c
27348 -#, c-format
27349 -msgid "could not resolve '%s'"
27350 -msgstr "无法解析 '%s'"
27351 -
27466 #: sequencer.c
27467 msgid "writing fake root commit"
27468 msgstr "写伪根提交"
@@ -27925,57 +28039,83 @@ msgstr "坏的 %s 格式：元素 '%s' 没有以 ')' 结尾"
28039 msgid "bad %s format: %%%.*s"
28040 msgstr "坏的 %s 格式：%%%.*s"
28041
27928 -#. TRANSLATORS: IEC 80000-13:2008 gibibyte
28042 #: strbuf.c
28043 #, c-format
27931 -msgid "%u.%2.2u GiB"
27932 -msgstr "%u.%2.2u GiB"
28044 +msgid "%u.%2.2u"
28045 +msgstr "%u.%2.2u"
28046
27934 -#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
28047 +#. TRANSLATORS: SI decimal prefix symbol for 10^9
28048 #: strbuf.c
27936 -#, c-format
27937 -msgid "%u.%2.2u GiB/s"
27938 -msgstr "%u.%2.2u GiB/s"
28049 +msgid "G"
28050 +msgstr "G"
28051
27940 -#. TRANSLATORS: IEC 80000-13:2008 mebibyte
28052 +#. TRANSLATORS: SI decimal prefix symbol for 10^6
28053 #: strbuf.c
27942 -#, c-format
27943 -msgid "%u.%2.2u MiB"
27944 -msgstr "%u.%2.2u MiB"
28054 +msgid "M"
28055 +msgstr "M"
28056
27946 -#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
28057 +#. TRANSLATORS: SI decimal prefix symbol for 10^3
28058 #: strbuf.c
27948 -#, c-format
27949 -msgid "%u.%2.2u MiB/s"
27950 -msgstr "%u.%2.2u MiB/s"
28059 +msgid "k"
28060 +msgstr "k"
28061
27952 -#. TRANSLATORS: IEC 80000-13:2008 kibibyte
28062 +#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second and gibibyte
28063 #: strbuf.c
27954 -#, c-format
27955 -msgid "%u.%2.2u KiB"
27956 -msgstr "%u.%2.2u KiB"
28064 +msgid "GiB/s"
28065 +msgstr "GiB/s"
28066
27958 -#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
28067 #: strbuf.c
27960 -#, c-format
27961 -msgid "%u.%2.2u KiB/s"
27962 -msgstr "%u.%2.2u KiB/s"
28068 +msgid "GiB"
28069 +msgstr "GiB"
28070
27964 -#. TRANSLATORS: IEC 80000-13:2008 byte
28071 +#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second and mebibyte
28072 #: strbuf.c
27966 -#, c-format
27967 -msgid "%u byte"
27968 -msgid_plural "%u bytes"
27969 -msgstr[0] "%u 字节"
27970 -msgstr[1] "%u 字节"
28073 +msgid "MiB/s"
28074 +msgstr "MiB/s"
28075 +
28076 +#: strbuf.c
28077 +msgid "MiB"
28078 +msgstr "MiB"
28079 +
28080 +#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second and kibibyte
28081 +#: strbuf.c
28082 +msgid "KiB/s"
28083 +msgstr "KiB/s"
28084 +
28085 +#: strbuf.c
28086 +msgid "KiB"
28087 +msgstr "KiB"
28088 +
28089 +#. TRANSLATORS: IEC 80000-13:2008 byte/second and byte
28090 +#: strbuf.c
28091 +msgid "B/s"
28092 +msgstr "B/s"
28093 +
28094 +#: strbuf.c
28095 +msgid "B"
28096 +msgstr "B"
28097
28098 #. TRANSLATORS: IEC 80000-13:2008 byte/second
28099 #: strbuf.c
28100 +msgid "byte/s"
28101 +msgid_plural "bytes/s"
28102 +msgstr[0] "字节/秒"
28103 +msgstr[1] "字节/秒"
28104 +
28105 +#. TRANSLATORS: IEC 80000-13:2008 byte
28106 +#: strbuf.c
28107 +msgid "byte"
28108 +msgid_plural "bytes"
28109 +msgstr[0] "字节"
28110 +msgstr[1] "字节"
28111 +
28112 +#. TRANSLATORS: The first argument is the number string. The second
28113 +#. argument is the unit string (i.e. "12.34 MiB/s").
28114 +#.
28115 +#: strbuf.c
28116 #, c-format
27975 -msgid "%u byte/s"
27976 -msgid_plural "%u bytes/s"
27977 -msgstr[0] "%u 字节/秒"
27978 -msgstr[1] "%u 字节/秒"
28117 +msgid "%s %s"
28118 +msgstr "%s %s"
28119
28120 #: submodule-config.c
28121 #, c-format
@@ -28330,10 +28470,6 @@ msgstr "字节数目"
28470 msgid "number of requests per thread"
28471 msgstr "每个线程的请求数"
28472
28333 -#: t/helper/test-simple-ipc.c
28334 -msgid "byte"
28335 -msgstr "字节"
28336 -
28473 #: t/helper/test-simple-ipc.c
28474 msgid "ballast character"
28475 msgstr "ballast character"