@matheusbsbs / matheus-bagliano / commits / de86879ace

l10n: zh_CN: updated translation for 2.46

Signed-off-by: Teng Long <dyroneteng@gmail.com> Co-authored-by: 依云 <lilydjwg@gmail.com> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Teng Long committed Jul 18, 2024 at 19:36 UTC de86879acedd3d6be01ac912bd6b9bc6601d03d7
1 file changed +637 -229
po/zh_CN.po
+637 -229
@@ -154,8 +154,8 @@ msgid ""
154 msgstr ""
155 "Project-Id-Version: Git\n"
156 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
157 -"POT-Creation-Date: 2024-04-28 19:59+0800\n"
158 -"PO-Revision-Date: 2024-04-28 20:31+0800\n"
157 +"POT-Creation-Date: 2024-07-27 22:28+0800\n"
158 +"PO-Revision-Date: 2024-07-28 19:52+0800\n"
159 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
160 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
161 "Language: zh_CN\n"
@@ -252,12 +252,12 @@ msgstr[1] "增加了 %d 个路径\n"
252 msgid "ignoring unmerged: %s"
253 msgstr "忽略未合入的：%s"
254
255 -#: add-interactive.c add-patch.c
255 +#: add-interactive.c
256 #, c-format
257 msgid "Only binary files changed.\n"
258 msgstr "只有二进制文件被修改。\n"
259
260 -#: add-interactive.c add-patch.c
260 +#: add-interactive.c
261 #, c-format
262 msgid "No changes.\n"
263 msgstr "没有修改。\n"
@@ -798,6 +798,11 @@ msgstr ""
798 "p - 显示当前块\n"
799 "? - 显示帮助\n"
800
801 +#: add-patch.c
802 +#, c-format
803 +msgid "Only one letter is expected, got '%s'"
804 +msgstr "预期只有一个字母，得到 '%s'"
805 +
806 #: add-patch.c
807 msgid "No previous hunk"
808 msgstr "没有前一个块"
@@ -860,10 +865,23 @@ msgstr "拆分为 %d 块。"
865 msgid "Sorry, cannot edit this hunk"
866 msgstr "对不起，不能编辑这个块"
867
868 +#: add-patch.c
869 +#, c-format
870 +msgid "Unknown command '%s' (use '?' for help)"
871 +msgstr "未知命令 '%s'（使用 '?' 寻求帮助）"
872 +
873 #: add-patch.c
874 msgid "'git apply' failed"
875 msgstr "'git apply' 失败"
876
877 +#: add-patch.c
878 +msgid "No changes."
879 +msgstr "没有修改。"
880 +
881 +#: add-patch.c
882 +msgid "Only binary files changed."
883 +msgstr "只有二进制文件被修改。"
884 +
885 #: advice.c
886 #, c-format
887 msgid ""
@@ -1036,7 +1054,7 @@ msgid "unclosed quote"
1054 msgstr "未关闭的引号"
1055
1056 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
1039 -#: builtin/receive-pack.c builtin/tag.c t/helper/test-pkt-line.c
1057 +#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c
1058 msgid "too many arguments"
1059 msgstr "太多参数"
1060
@@ -1917,6 +1935,10 @@ msgstr "忽略过大的 gitattributes 文件 '%s'"
1935 msgid "ignoring overly large gitattributes blob '%s'"
1936 msgstr "忽略过大的 gitattributes 数据对象 '%s'"
1937
1938 +#: attr.c
1939 +msgid "cannot use --attr-source or GIT_ATTR_SOURCE without repo"
1940 +msgstr "无法在没有存储库的情况下使用 --attr-source 或 GIT_ATTR_SOURCE"
1941 +
1942 #: attr.c
1943 msgid "bad --attr-source or GIT_ATTR_SOURCE"
1944 msgstr "错误的 --attr-source 或 GIT_ATTR_SOURCE"
@@ -2277,14 +2299,6 @@ msgstr "不能 chmod %cx '%s'"
2299 msgid "Unstaged changes after refreshing the index:"
2300 msgstr "刷新索引之后尚未被暂存的变更："
2301
2280 -#: builtin/add.c
2281 -msgid ""
2282 -"the add.interactive.useBuiltin setting has been removed!\n"
2283 -"See its entry in 'git help config' for details."
2284 -msgstr ""
2285 -"设置 add.interactive.useBuiltin 已经被移除！\n"
2286 -"查看 'git help config' 中的相关条目以获取更多信息。"
2287 -
2302 #: builtin/add.c
2303 msgid "could not read the index"
2304 msgstr "不能读取索引"
@@ -2720,7 +2734,7 @@ msgid ""
2734 "Not rewinding to ORIG_HEAD"
2735 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2736
2723 -#: builtin/am.c builtin/bisect.c worktree.c
2737 +#: builtin/am.c builtin/bisect.c builtin/tag.c worktree.c
2738 #, c-format
2739 msgid "failed to read '%s'"
2740 msgstr "无法读取 '%s'"
@@ -2798,8 +2812,8 @@ msgstr "n"
2812
2813 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2814 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2801 -#: builtin/ls-files.c builtin/ls-tree.c builtin/replace.c builtin/tag.c
2802 -#: builtin/verify-tag.c
2815 +#: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c
2816 +#: builtin/tag.c builtin/verify-tag.c
2817 msgid "format"
2818 msgstr "格式"
2819
@@ -2835,6 +2849,10 @@ msgstr "终止补丁操作但保持 HEAD 不变"
2849 msgid "show the patch being applied"
2850 msgstr "显示正在应用的补丁"
2851
2852 +#: builtin/am.c
2853 +msgid "try to apply current patch again"
2854 +msgstr "尝试再次应用当前补丁"
2855 +
2856 #: builtin/am.c
2857 msgid "record the empty patch as an empty commit"
2858 msgstr "把空补丁记录为空提交"
@@ -2906,10 +2924,6 @@ msgstr "git apply [<选项>] [<补丁>...]"
2924 msgid "could not redirect output"
2925 msgstr "不能重定向输出"
2926
2909 -#: builtin/archive.c
2910 -msgid "git archive: Remote with no URL"
2911 -msgstr "git archive：未提供远程 URL"
2912 -
2927 #: builtin/archive.c
2928 msgid "git archive: expected ACK/NAK, got a flush packet"
2929 msgstr "git archive：期望是 ACK/NAK，却得到 flush 包"
@@ -4024,6 +4038,10 @@ msgstr "需要一个仓库来创建归档包。"
4038 msgid "do not show bundle details"
4039 msgstr "不显示归档包的细节"
4040
4041 +#: builtin/bundle.c bundle.c
4042 +msgid "need a repository to verify a bundle"
4043 +msgstr "需要一个仓库来校验一个归档包"
4044 +
4045 #: builtin/bundle.c
4046 #, c-format
4047 msgid "%s is okay\n"
@@ -5064,9 +5082,9 @@ msgstr "交互式清除"
5082 msgid "remove whole directories"
5083 msgstr "删除整个目录"
5084
5067 -#: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c
5068 -#: builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c builtin/show-ref.c
5069 -#: ref-filter.h
5085 +#: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
5086 +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c
5087 +#: builtin/show-ref.c ref-filter.h
5088 msgid "pattern"
5089 msgstr "模式"
5090
@@ -5282,6 +5300,16 @@ msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆"
5300 msgid "failed to unlink '%s'"
5301 msgstr "无法删除 '%s'"
5302
5303 +#: builtin/clone.c
5304 +#, c-format
5305 +msgid "hardlink cannot be checked at '%s'"
5306 +msgstr "无法检查 '%s' 处的硬链接"
5307 +
5308 +#: builtin/clone.c
5309 +#, c-format
5310 +msgid "hardlink different from source at '%s'"
5311 +msgstr "硬链接与 '%s' 处的源不同"
5312 +
5313 #: builtin/clone.c
5314 #, c-format
5315 msgid "failed to create link '%s'"
@@ -5358,7 +5386,7 @@ msgstr "太多参数。"
5386 msgid "You must specify a repository to clone."
5387 msgstr "您必须指定一个仓库来克隆。"
5388
5361 -#: builtin/clone.c builtin/init-db.c setup.c
5389 +#: builtin/clone.c builtin/init-db.c builtin/refs.c setup.c
5390 #, c-format
5391 msgid "unknown ref storage format '%s'"
5392 msgstr "未知的引用存储格式 '%s'"
@@ -5967,7 +5995,7 @@ msgstr "%s提交者：%.*s <%.*s>"
5995 msgid "Cannot read index"
5996 msgstr "无法读取索引"
5997
5970 -#: builtin/commit.c
5998 +#: builtin/commit.c builtin/tag.c
5999 msgid "unable to pass trailers to --trailers"
6000 msgstr "无法将尾注传递给 --trailers"
6001
@@ -6177,11 +6205,11 @@ msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
6205 msgid "the commit is authored by me now (used with -C/-c/--amend)"
6206 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
6207
6180 -#: builtin/commit.c builtin/interpret-trailers.c
6208 +#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c
6209 msgid "trailer"
6210 msgstr "尾注"
6211
6184 -#: builtin/commit.c
6212 +#: builtin/commit.c builtin/tag.c
6213 msgid "add custom trailer(s)"
6214 msgstr "添加自定义尾注"
6215
@@ -6293,17 +6321,57 @@ msgstr ""
6321 "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
6322
6323 #: builtin/config.c
6296 -msgid "git config [<options>]"
6297 -msgstr "git config [<选项>]"
6324 +msgid "git config list [<file-option>] [<display-option>] [--includes]"
6325 +msgstr "git config list [<文件选项>] [<显示选项>] [--includes]"
6326
6327 #: builtin/config.c
6300 -#, c-format
6301 -msgid "unrecognized --type argument, %s"
6302 -msgstr "未能识别的 --type 参数，%s"
6328 +msgid ""
6329 +"git config get [<file-option>] [<display-option>] [--includes] [--all] [--"
6330 +"regexp=<regexp>] [--value=<value>] [--fixed-value] [--default=<default>] "
6331 +"<name>"
6332 +msgstr ""
6333 +"git config get [<文件选项>] [<显示选项>] [--includes] [--all] [--regexp=<正则"
6334 +"表达式>] [--value=<值>] [--fixed-value] [--default=<默认值>] <名称>"
6335
6336 #: builtin/config.c
6305 -msgid "only one type at a time"
6306 -msgstr "一次只能一个类型"
6337 +msgid ""
6338 +"git config set [<file-option>] [--type=<type>] [--all] [--value=<value>] [--"
6339 +"fixed-value] <name> <value>"
6340 +msgstr ""
6341 +"git config set [<文件选项>] [--type=<类型>] [--all] [--value=<值>] [--fixed-"
6342 +"value] <名称> <值>"
6343 +
6344 +#: builtin/config.c
6345 +msgid ""
6346 +"git config unset [<file-option>] [--all] [--value=<value>] [--fixed-value] "
6347 +"<name> <value>"
6348 +msgstr ""
6349 +"git config unset [<文件选项>] [--all] [--value=<值>] [--fixed-value] <名称> <"
6350 +"值>"
6351 +
6352 +#: builtin/config.c
6353 +msgid "git config rename-section [<file-option>] <old-name> <new-name>"
6354 +msgstr "git config rename-section [<文件选项>] <旧名称> <新名称>"
6355 +
6356 +#: builtin/config.c
6357 +msgid "git config remove-section [<file-option>] <name>"
6358 +msgstr "git config remove-section [<文件选项>] <名称>"
6359 +
6360 +#: builtin/config.c
6361 +msgid "git config edit [<file-option>]"
6362 +msgstr "git config edit [<文件选项>]"
6363 +
6364 +#: builtin/config.c
6365 +msgid "git config [<file-option>] --get-colorbool <name> [<stdout-is-tty>]"
6366 +msgstr "git config [<文件选项>] --get-colorbool <名称> [<标准输出为tty>]"
6367 +
6368 +#: builtin/config.c
6369 +msgid ""
6370 +"git config set [<file-option>] [--type=<type>] [--comment=<message>] [--all] "
6371 +"[--value=<value>] [--fixed-value] <name> <value>"
6372 +msgstr ""
6373 +"git config set [<文件选项>] [--type=<类型>] [--comment=<消息>] [--all] [--"
6374 +"value=<值>] [--fixed-value] <名称> <值>"
6375
6376 #: builtin/config.c
6377 msgid "Config file location"
@@ -6337,70 +6405,6 @@ msgstr "数据对象 ID"
6405 msgid "read config from given blob object"
6406 msgstr "从给定的数据对象读取配置"
6407
6340 -#: builtin/config.c
6341 -msgid "Action"
6342 -msgstr "操作"
6343 -
6344 -#: builtin/config.c
6345 -msgid "get value: name [value-pattern]"
6346 -msgstr "获取值：名称 [值模式]"
6347 -
6348 -#: builtin/config.c
6349 -msgid "get all values: key [value-pattern]"
6350 -msgstr "获得所有的值：键 [值模式]"
6351 -
6352 -#: builtin/config.c
6353 -msgid "get values for regexp: name-regex [value-pattern]"
6354 -msgstr "根据正则表达式获得值：名称正则 [值模式]"
6355 -
6356 -#: builtin/config.c
6357 -msgid "get value specific for the URL: section[.var] URL"
6358 -msgstr "获得 URL 取值：section[.var] URL"
6359 -
6360 -#: builtin/config.c
6361 -msgid "replace all matching variables: name value [value-pattern]"
6362 -msgstr "替换所有匹配的变量：名称 值 [值模式]"
6363 -
6364 -#: builtin/config.c
6365 -msgid "add a new variable: name value"
6366 -msgstr "添加一个新的变量：名称 值"
6367 -
6368 -#: builtin/config.c
6369 -msgid "remove a variable: name [value-pattern]"
6370 -msgstr "删除一个变量：名称 [值模式]"
6371 -
6372 -#: builtin/config.c
6373 -msgid "remove all matches: name [value-pattern]"
6374 -msgstr "删除所有匹配项：名称 [值模式]"
6375 -
6376 -#: builtin/config.c
6377 -msgid "rename section: old-name new-name"
6378 -msgstr "重命名小节：old-name new-name"
6379 -
6380 -#: builtin/config.c
6381 -msgid "remove a section: name"
6382 -msgstr "删除一个小节：name"
6383 -
6384 -#: builtin/config.c
6385 -msgid "list all"
6386 -msgstr "列出所有"
6387 -
6388 -#: builtin/config.c
6389 -msgid "use string equality when comparing values to 'value-pattern'"
6390 -msgstr "在比较值与 '值模式' 时，使用字符串字面比较"
6391 -
6392 -#: builtin/config.c
6393 -msgid "open an editor"
6394 -msgstr "打开一个编辑器"
6395 -
6396 -#: builtin/config.c
6397 -msgid "find the color configured: slot [default]"
6398 -msgstr "获得配置的颜色：配置 [默认]"
6399 -
6400 -#: builtin/config.c
6401 -msgid "find the color setting: slot [stdout-is-tty]"
6402 -msgstr "获得颜色设置：配置 [stdout-is-tty]"
6403 -
6408 #: builtin/config.c
6409 msgid "Type"
6410 msgstr "类型"
@@ -6438,8 +6442,8 @@ msgid "value is an expiry date"
6442 msgstr "值是一个到期日期"
6443
6444 #: builtin/config.c
6441 -msgid "Other"
6442 -msgstr "其它"
6445 +msgid "Display options"
6446 +msgstr "显示选项"
6447
6448 #: builtin/config.c
6449 msgid "terminate values with NUL byte"
@@ -6449,10 +6453,6 @@ msgstr "终止值是 NUL 字节"
6453 msgid "show variable names only"
6454 msgstr "只显示变量名"
6455
6452 -#: builtin/config.c
6453 -msgid "respect include directives on lookup"
6454 -msgstr "查询时参照 include 指令递归查找"
6455 -
6456 #: builtin/config.c
6457 msgid "show origin of config (file, standard input, blob, command line)"
6458 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
@@ -6462,16 +6462,17 @@ msgid "show scope of config (worktree, local, global, system, command)"
6462 msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
6463
6464 #: builtin/config.c
6465 -msgid "value"
6466 -msgstr "取值"
6465 +msgid "show config keys in addition to their values"
6466 +msgstr "显示配置键及其值"
6467
6468 #: builtin/config.c
6469 -msgid "with --get, use default value when missing entry"
6470 -msgstr "使用 --get 参数，当缺少设置时使用默认值"
6469 +#, c-format
6470 +msgid "unrecognized --type argument, %s"
6471 +msgstr "未能识别的 --type 参数，%s"
6472
6473 #: builtin/config.c
6473 -msgid "human-readable comment string (# will be prepended as needed)"
6474 -msgstr "人类可读的注释字符串（# 将根据需要添加到前面）"
6474 +msgid "only one type at a time"
6475 +msgstr "一次只能一个类型"
6476
6477 #: builtin/config.c
6478 #, c-format
@@ -6564,56 +6565,93 @@ msgstr ""
6565 "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
6566
6567 #: builtin/config.c
6567 -msgid "--get-color and variable type are incoherent"
6568 -msgstr "--get-color 和变量类型不兼容"
6568 +msgid "Other"
6569 +msgstr "其它"
6570
6571 #: builtin/config.c
6571 -msgid "only one action at a time"
6572 -msgstr "一次只能有一个动作"
6572 +msgid "respect include directives on lookup"
6573 +msgstr "查询时参照 include 指令递归查找"
6574
6575 #: builtin/config.c
6575 -msgid "--name-only is only applicable to --list or --get-regexp"
6576 -msgstr "--name-only 仅适用于 --list 或 --get-regexp"
6576 +#, c-format
6577 +msgid "unable to read config file '%s'"
6578 +msgstr "无法读取配置文件 '%s'"
6579
6580 #: builtin/config.c
6579 -msgid ""
6580 -"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
6581 -"list"
6582 -msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
6581 +msgid "error processing config file(s)"
6582 +msgstr "处理配置文件出错"
6583
6584 #: builtin/config.c
6585 -msgid "--default is only applicable to --get"
6586 -msgstr "--default 仅适用于 --get"
6585 +msgid "Filter options"
6586 +msgstr "过滤选项"
6587
6588 #: builtin/config.c
6589 -msgid "--comment is only applicable to add/set/replace operations"
6590 -msgstr "--comment 仅适用于 add/set/replace 操作"
6589 +msgid "return all values for multi-valued config options"
6590 +msgstr "返回多值配置选项的所有值"
6591 +
6592 +#: builtin/config.c
6593 +msgid "interpret the name as a regular expression"
6594 +msgstr "将名称解释为正则表达式"
6595 +
6596 +#: builtin/config.c
6597 +msgid "show config with values matching the pattern"
6598 +msgstr "显示值与模式匹配的配置"
6599 +
6600 +#: builtin/config.c
6601 +msgid "use string equality when comparing values to value pattern"
6602 +msgstr "在将值与值模式进行比较时使用字符串相等性"
6603 +
6604 +#: builtin/config.c
6605 +msgid "URL"
6606 +msgstr "URL"
6607 +
6608 +#: builtin/config.c
6609 +msgid "show config matching the given URL"
6610 +msgstr "显示与给定 URL 匹配的配置"
6611 +
6612 +#: builtin/config.c
6613 +msgid "value"
6614 +msgstr "值"
6615 +
6616 +#: builtin/config.c
6617 +msgid "use default value when missing entry"
6618 +msgstr "缺少条目时使用默认值"
6619
6620 #: builtin/config.c
6621 msgid "--fixed-value only applies with 'value-pattern'"
6622 msgstr "--fixed-value 仅适用于有 '值模式'"
6623
6624 #: builtin/config.c
6597 -#, c-format
6598 -msgid "unable to read config file '%s'"
6599 -msgstr "无法读取配置文件 '%s'"
6625 +msgid "--default= cannot be used with --all or --url="
6626 +msgstr "--default= 不能与 --all 或 --url= 一起使用"
6627
6628 #: builtin/config.c
6602 -msgid "error processing config file(s)"
6603 -msgstr "处理配置文件出错"
6629 +msgid "--url= cannot be used with --all, --regexp or --value"
6630 +msgstr "--url= 不能与 --all、--regexp 或 --value 一起使用"
6631
6632 #: builtin/config.c
6606 -msgid "editing stdin is not supported"
6607 -msgstr "不支持编辑标准输入"
6633 +msgid "Filter"
6634 +msgstr "过滤器"
6635
6636 #: builtin/config.c
6610 -msgid "editing blobs is not supported"
6611 -msgstr "不支持编辑数据对象"
6637 +msgid "replace multi-valued config option with new value"
6638 +msgstr "将多值配置选项替换为新值"
6639
6640 #: builtin/config.c
6614 -#, c-format
6615 -msgid "cannot create configuration file %s"
6616 -msgstr "不能创建配置文件 %s"
6641 +msgid "human-readable comment string (# will be prepended as needed)"
6642 +msgstr "人类可读的注释字符串（# 将根据需要添加到前面）"
6643 +
6644 +#: builtin/config.c
6645 +msgid "add a new line without altering any existing values"
6646 +msgstr "添加新行而不更改任何现有值"
6647 +
6648 +#: builtin/config.c
6649 +msgid "--fixed-value only applies with --value=<pattern>"
6650 +msgstr "--fixed-value 只能与 --value=<模式> 配合使用"
6651 +
6652 +#: builtin/config.c
6653 +msgid "--append cannot be used with --value=<pattern>"
6654 +msgstr "--append 不能与 --value=<模式> 一起使用"
6655
6656 #: builtin/config.c
6657 #, c-format
@@ -6629,6 +6667,109 @@ msgstr ""
6667 msgid "no such section: %s"
6668 msgstr "无此小节：%s"
6669
6670 +#: builtin/config.c
6671 +msgid "editing stdin is not supported"
6672 +msgstr "不支持编辑标准输入"
6673 +
6674 +#: builtin/config.c
6675 +msgid "editing blobs is not supported"
6676 +msgstr "不支持编辑数据对象"
6677 +
6678 +#: builtin/config.c
6679 +#, c-format
6680 +msgid "cannot create configuration file %s"
6681 +msgstr "不能创建配置文件 %s"
6682 +
6683 +#: builtin/config.c
6684 +msgid "Action"
6685 +msgstr "操作"
6686 +
6687 +#: builtin/config.c
6688 +msgid "get value: name [<value-pattern>]"
6689 +msgstr "获取值：name [<值模式>]"
6690 +
6691 +#: builtin/config.c
6692 +msgid "get all values: key [<value-pattern>]"
6693 +msgstr "获取所有值：key [<值模式>]"
6694 +
6695 +#: builtin/config.c
6696 +msgid "get values for regexp: name-regex [<value-pattern>]"
6697 +msgstr "获取正则表达式的值：name-regex [<值模式>]"
6698 +
6699 +#: builtin/config.c
6700 +msgid "get value specific for the URL: section[.var] URL"
6701 +msgstr "获得 URL 取值：section[.var] URL"
6702 +
6703 +#: builtin/config.c
6704 +msgid "replace all matching variables: name value [<value-pattern>]"
6705 +msgstr "替换所有匹配的变量：name value [<值模式>]"
6706 +
6707 +#: builtin/config.c
6708 +msgid "add a new variable: name value"
6709 +msgstr "添加一个新的变量：名称 值"
6710 +
6711 +#: builtin/config.c
6712 +msgid "remove a variable: name [<value-pattern>]"
6713 +msgstr "删除一个变量：名称 [<值模式>]"
6714 +
6715 +#: builtin/config.c
6716 +msgid "remove all matches: name [<value-pattern>]"
6717 +msgstr "删除所有匹配项：名称 [<值模式>]"
6718 +
6719 +#: builtin/config.c
6720 +msgid "rename section: old-name new-name"
6721 +msgstr "重命名小节：old-name new-name"
6722 +
6723 +#: builtin/config.c
6724 +msgid "remove a section: name"
6725 +msgstr "删除一个小节：name"
6726 +
6727 +#: builtin/config.c
6728 +msgid "list all"
6729 +msgstr "列出所有"
6730 +
6731 +#: builtin/config.c
6732 +msgid "open an editor"
6733 +msgstr "打开编辑器"
6734 +
6735 +#: builtin/config.c
6736 +msgid "find the color configured: slot [<default>]"
6737 +msgstr "找到配置的颜色：slot [<默认>]"
6738 +
6739 +#: builtin/config.c
6740 +msgid "find the color setting: slot [<stdout-is-tty>]"
6741 +msgstr "找到颜色设置：slot [<stdout-is-tty>]"
6742 +
6743 +#: builtin/config.c
6744 +msgid "with --get, use default value when missing entry"
6745 +msgstr "使用 --get 参数，当缺少设置时使用默认值"
6746 +
6747 +#: builtin/config.c
6748 +msgid "--get-color and variable type are incoherent"
6749 +msgstr "--get-color 和变量类型不兼容"
6750 +
6751 +#: builtin/config.c
6752 +msgid "no action specified"
6753 +msgstr "未指定任何操作"
6754 +
6755 +#: builtin/config.c
6756 +msgid "--name-only is only applicable to --list or --get-regexp"
6757 +msgstr "--name-only 仅适用于 --list 或 --get-regexp"
6758 +
6759 +#: builtin/config.c
6760 +msgid ""
6761 +"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
6762 +"list"
6763 +msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
6764 +
6765 +#: builtin/config.c
6766 +msgid "--default is only applicable to --get"
6767 +msgstr "--default 仅适用于 --get"
6768 +
6769 +#: builtin/config.c
6770 +msgid "--comment is only applicable to add/set/replace operations"
6771 +msgstr "--comment 仅适用于 add/set/replace 操作"
6772 +
6773 #: builtin/count-objects.c
6774 msgid "print sizes in human readable format"
6775 msgstr "以用户可读的格式显示大小"
@@ -7654,6 +7795,10 @@ msgstr "配置"
7795 msgid "config key storing a list of repository paths"
7796 msgstr "存储着仓库路径列表的配置项键名"
7797
7798 +#: builtin/for-each-repo.c
7799 +msgid "keep going even if command fails in a repository"
7800 +msgstr "即使存储库中的命令失败，仍继续执行"
7801 +
7802 #: builtin/for-each-repo.c
7803 msgid "missing --config=<config>"
7804 msgstr "缺少 --config=<配置>"
@@ -9489,8 +9634,12 @@ msgid "max length of output filename"
9634 msgstr "输出文件名的最大长度"
9635
9636 #: builtin/log.c
9492 -msgid "use [RFC PATCH] instead of [PATCH]"
9493 -msgstr "使用 [RFC PATCH] 代替 [PATCH]"
9637 +msgid "rfc"
9638 +msgstr "RFC"
9639 +
9640 +#: builtin/log.c
9641 +msgid "add <rfc> (default 'RFC') before 'PATCH'"
9642 +msgstr "在 'PATCH' 之前添加 <RFC> （默认为 'RFC'）"
9643
9644 #: builtin/log.c
9645 msgid "cover-from-description-mode"
@@ -9834,11 +9983,11 @@ msgstr ""
9983
9984 #: builtin/ls-remote.c
9985 msgid ""
9837 -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9986 +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<exec>]\n"
9987 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
9988 " [--symref] [<repository> [<patterns>...]]"
9989 msgstr ""
9841 -"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
9990 +"git ls-remote [--branches] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
9991 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n"
9992 " [--symref] [<仓库> [<模式>...]]"
9993
@@ -9859,9 +10008,13 @@ msgid "limit to tags"
10008 msgstr "仅限于标签"
10009
10010 #: builtin/ls-remote.c
9862 -msgid "limit to heads"
10011 +msgid "limit to branches"
10012 msgstr "仅限于分支"
10013
10014 +#: builtin/ls-remote.c builtin/show-ref.c
10015 +msgid "deprecated synonym for --branches"
10016 +msgstr "已弃用的 --branches 同义词"
10017 +
10018 #: builtin/ls-remote.c
10019 msgid "do not show peeled tags"
10020 msgstr "不显示已解析的标签"
@@ -13048,6 +13201,27 @@ msgstr "未指定要删除的引用日志"
13201 msgid "invalid ref format: %s"
13202 msgstr "无效的引用格式：%s"
13203
13204 +#: builtin/refs.c
13205 +msgid "git refs migrate --ref-format=<format> [--dry-run]"
13206 +msgstr "git refs migrate --ref-format=<格式> [--dry-run]"
13207 +
13208 +#: builtin/refs.c
13209 +msgid "specify the reference format to convert to"
13210 +msgstr "指定要转换的引用格式"
13211 +
13212 +#: builtin/refs.c
13213 +msgid "perform a non-destructive dry-run"
13214 +msgstr "进行非破坏性的试运行（dry-run）"
13215 +
13216 +#: builtin/refs.c
13217 +msgid "missing --ref-format=<format>"
13218 +msgstr "缺少 --ref-format=<格式>"
13219 +
13220 +#: builtin/refs.c
13221 +#, c-format
13222 +msgid "repository already uses '%s' format"
13223 +msgstr "仓库已使用 '%s' 格式"
13224 +
13225 #: builtin/remote.c
13226 msgid ""
13227 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -13392,10 +13566,6 @@ msgstr "* 远程 %s"
13566 msgid " Fetch URL: %s"
13567 msgstr " 获取地址：%s"
13568
13395 -#: builtin/remote.c
13396 -msgid "(no URL)"
13397 -msgstr "(无 URL)"
13398 -
13569 #. TRANSLATORS: the colon ':' should align
13570 #. with the one in " Fetch URL: %s"
13571 #. translation.
@@ -13405,6 +13575,10 @@ msgstr "(无 URL)"
13575 msgid " Push URL: %s"
13576 msgstr " 推送地址：%s"
13577
13578 +#: builtin/remote.c
13579 +msgid "(no URL)"
13580 +msgstr "(无 URL)"
13581 +
13582 #: builtin/remote.c
13583 #, c-format
13584 msgid " HEAD branch: %s"
@@ -13541,11 +13715,6 @@ msgstr "查询推送 URL 地址，而非获取 URL 地址"
13715 msgid "return all URLs"
13716 msgstr "返回所有 URL 地址"
13717
13544 -#: builtin/remote.c
13545 -#, c-format
13546 -msgid "no URLs configured for remote '%s'"
13547 -msgstr "没有给远程仓库 '%s' 设定 URL"
13548 -
13718 #: builtin/remote.c
13719 msgid "manipulate push URLs"
13720 msgstr "操作推送 URLS"
@@ -14793,12 +14962,12 @@ msgstr "未知的哈希算法"
14962 #: builtin/show-ref.c
14963 msgid ""
14964 "git show-ref [--head] [-d | --dereference]\n"
14796 -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14797 -" [--heads] [--] [<pattern>...]"
14965 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
14966 +" [--] [<pattern>...]"
14967 msgstr ""
14968 "git show-ref [--head] [-d | --dereference]\n"
14800 -" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--tags]\n"
14801 -" [--heads] [--] [<模式>...]"
14969 +" [-s | --hash[=<n>]] [--abbrev[=<n>]] [--branches] [--tags]\n"
14970 +" [--] [<模式>...]"
14971
14972 #: builtin/show-ref.c
14973 msgid ""
@@ -14827,12 +14996,12 @@ msgid "failed to look up reference"
14996 msgstr "无法找到引用"
14997
14998 #: builtin/show-ref.c
14830 -msgid "only show tags (can be combined with heads)"
14831 -msgstr "只显示标签（可以和头共用）"
14999 +msgid "only show tags (can be combined with branches)"
15000 +msgstr "仅显示标签（可与分支组合使用）"
15001
15002 #: builtin/show-ref.c
14834 -msgid "only show heads (can be combined with tags)"
14835 -msgstr "只显示头（可以和标签共用）"
15003 +msgid "only show branches (can be combined with tags)"
15004 +msgstr "仅显示分支（可以和标签组合使用）"
15005
15006 #: builtin/show-ref.c
15007 msgid "check for reference existence without resolving"
@@ -15579,20 +15748,20 @@ msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
15748 msgid "Value '%s' for submodule.alternateLocation is not recognized"
15749 msgstr "不能识别 submodule.alternateLocation 的取值 '%s'"
15750
15582 -#: builtin/submodule--helper.c
15751 +#: builtin/submodule--helper.c submodule.c
15752 #, c-format
15753 msgid "refusing to create/use '%s' in another submodule's git dir"
15754 msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
15755
15756 #: builtin/submodule--helper.c
15757 #, c-format
15589 -msgid "clone of '%s' into submodule path '%s' failed"
15590 -msgstr "无法克隆 '%s' 到子模组路径 '%s'"
15758 +msgid "directory not empty: '%s'"
15759 +msgstr "目录非空：'%s'"
15760
15761 #: builtin/submodule--helper.c
15762 #, c-format
15594 -msgid "directory not empty: '%s'"
15595 -msgstr "目录非空：'%s'"
15763 +msgid "clone of '%s' into submodule path '%s' failed"
15764 +msgstr "无法克隆 '%s' 到子模组路径 '%s'"
15765
15766 #: builtin/submodule--helper.c
15767 #, c-format
@@ -16033,9 +16202,11 @@ msgstr "更新的原因"
16202 #: builtin/tag.c
16203 msgid ""
16204 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] [-e]\n"
16205 +" [(--trailer <token>[(=|:)<value>])...]\n"
16206 " <tagname> [<commit> | <object>]"
16207 msgstr ""
16038 -"git tag [-a | -s | -u <私钥 ID>] [-f] [-m <消息> | -F <文件>] [-e]\n"
16208 +"git tag [-a | -s | -u <私钥 id>] [-f] [-m <消息> | -F <文件>] [-e]\n"
16209 +" [(--trailer <令牌>[(=|:)<值>])...]\n"
16210 " <标签名> [<提交> | <对象>]"
16211
16212 #: builtin/tag.c
@@ -17079,10 +17250,6 @@ msgstr "未能识别的包头：%s%s (%d)"
17250 msgid "Repository lacks these prerequisite commits:"
17251 msgstr "仓库中缺少这些必备的提交："
17252
17082 -#: bundle.c
17083 -msgid "need a repository to verify a bundle"
17084 -msgstr "需要一个仓库来校验一个归档包"
17085 -
17253 #: bundle.c
17254 msgid ""
17255 "some prerequisite commits exist in the object store, but are not connected "
@@ -17603,6 +17770,10 @@ msgstr "接收推送到仓库中的对象"
17770 msgid "Manage reflog information"
17771 msgstr "管理 reflog 信息"
17772
17773 +#: command-list.h
17774 +msgid "Low-level access to refs"
17775 +msgstr "对引用的低级访问"
17776 +
17777 #: command-list.h
17778 msgid "Manage set of tracked repositories"
17779 msgstr "管理已跟踪仓库"
@@ -17999,6 +18170,13 @@ msgstr "提交图所需的对象 ID 查询块缺失或损坏"
18170 msgid "commit-graph required commit data chunk missing or corrupted"
18171 msgstr "提交图所需的提交数据块缺失或损坏"
18172
18173 +#: commit-graph.c
18174 +#, c-format
18175 +msgid ""
18176 +"disabling Bloom filters for commit-graph layer '%s' due to incompatible "
18177 +"settings"
18178 +msgstr "由于不兼容的设置，正在禁用提交图层 '%s' 的布隆过滤器"
18179 +
18180 #: commit-graph.c
18181 msgid "commit-graph has no base graphs chunk"
18182 msgstr "提交图没有基础图形块"
@@ -18158,6 +18336,13 @@ msgstr "正在合并提交图"
18336 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
18337 msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
18338
18339 +#: commit-graph.c
18340 +#, c-format
18341 +msgid ""
18342 +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
18343 +"(%d) is not supported"
18344 +msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (%d)"
18345 +
18346 #: commit-graph.c
18347 msgid "too many commits to write graph"
18348 msgstr "提交太多不能画图"
@@ -20418,16 +20603,19 @@ msgstr "因为缺少 Unix 套接字支持，套接字目录 '%s' 与 fsmonitor
20603 msgid ""
20604 "git [-v | --version] [-h | --help] [-C <path>] [-c <name>=<value>]\n"
20605 " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
20421 -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
20422 -"bare]\n"
20423 -" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
20424 -" [--config-env=<name>=<envvar>] <command> [<args>]"
20606 +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--no-"
20607 +"lazy-fetch]\n"
20608 +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<path>]\n"
20609 +" [--work-tree=<path>] [--namespace=<name>] [--config-"
20610 +"env=<name>=<envvar>]\n"
20611 +" <command> [<args>]"
20612 msgstr ""
20613 "git [-v | --version] [-h | --help] [-C <路径>] [-c <名称>=<取值>]\n"
20614 " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
20428 -" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
20429 -"bare]\n"
20430 -" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
20615 +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [\"--"
20616 +"no-lazy-fetch]\n"
20617 +" [--no-optional-locks] [--no-advice] [--bare] [--git-dir=<路径>]\n"
20618 +" [--work-tree=<路径>] [--namespace=<名称>]\n"
20619 " [--config-env=<名称>=<环境变量>] <命令> [<参数>]"
20620
20621 #: git.c
@@ -20833,15 +21021,15 @@ msgstr ""
21021 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
21022 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
21023
21024 +#: http-fetch.c
21025 +msgid "not a git repository"
21026 +msgstr "不是 git 仓库"
21027 +
21028 #: http-fetch.c
21029 #, c-format
21030 msgid "argument to --packfile must be a valid hash (got '%s')"
21031 msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
21032
20841 -#: http-fetch.c
20842 -msgid "not a git repository"
20843 -msgstr "不是 git 仓库"
20844 -
21033 #: http.c
21034 #, c-format
21035 msgid "negative value for http.postBuffer; defaulting to %d"
@@ -20855,6 +21043,10 @@ msgstr "不支持委托控制，因为 cURL < 7.22.0"
21043 msgid "Public key pinning not supported with cURL < 7.39.0"
21044 msgstr "不支持公钥文件锁定，因为 cURL < 7.39.0"
21045
21046 +#: http.c
21047 +msgid "Unknown value for http.proactiveauth"
21048 +msgstr "http.proactiveauth 为未知取值"
21049 +
21050 #: http.c
21051 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
21052 msgstr "不支持 CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
@@ -20874,6 +21066,14 @@ msgstr "无法设置 SSL 后端为 '%s'：cURL: cURL 没有使用 SSL 后端构
21066 msgid "Could not set SSL backend to '%s': already set"
21067 msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
21068
21069 +#: http.c
21070 +msgid "refusing to read cookies from http.cookiefile '-'"
21071 +msgstr "拒绝从 http.cookiefile '-' 读取 cookies"
21072 +
21073 +#: http.c
21074 +msgid "ignoring http.savecookies for empty http.cookiefile"
21075 +msgstr "因为 http.cookiefile 为空，忽略 http.savecookies"
21076 +
21077 #: http.c
21078 #, c-format
21079 msgid ""
@@ -21080,10 +21280,10 @@ msgstr "无法合并子模组 %s （没有合并基线）"
21280 msgid "Failed to merge submodule %s (commits not present)"
21281 msgstr "无法合并子模组 %s（提交不存在）"
21282
21083 -#: merge-ort.c merge-recursive.c
21283 +#: merge-ort.c
21284 #, c-format
21085 -msgid "Failed to merge submodule %s (repository corrupt)"
21086 -msgstr "无法合并子模组 %s（仓库损坏）"
21285 +msgid "error: failed to merge submodule %s (repository corrupt)"
21286 +msgstr "错误：无法合并子模组 %s（仓库损坏）"
21287
21288 #: merge-ort.c merge-recursive.c
21289 #, c-format
@@ -21115,14 +21315,15 @@ msgstr ""
21315 "无法合并子模组 %s，但是存在多个可能的合并：\n"
21316 "%s"
21317
21118 -#: merge-ort.c merge-recursive.c
21119 -msgid "failed to execute internal merge"
21120 -msgstr "无法执行内部合并"
21318 +#: merge-ort.c
21319 +#, c-format
21320 +msgid "error: failed to execute internal merge for %s"
21321 +msgstr "错误：无法为 %s 执行内部合并"
21322
21122 -#: merge-ort.c merge-recursive.c
21323 +#: merge-ort.c
21324 #, c-format
21124 -msgid "unable to add %s to database"
21125 -msgstr "不能添加 %s 至对象库"
21325 +msgid "error: unable to add %s to database"
21326 +msgstr "错误：不能添加 %s 至对象库"
21327
21328 #: merge-ort.c merge-recursive.c
21329 #, c-format
@@ -21220,15 +21421,15 @@ msgstr ""
21421 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
21422 msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
21423
21223 -#: merge-ort.c merge-recursive.c
21424 +#: merge-ort.c
21425 #, c-format
21225 -msgid "cannot read object %s"
21226 -msgstr "不能读取对象 %s"
21426 +msgid "error: cannot read object %s"
21427 +msgstr "错误：不能读取对象 %s"
21428
21228 -#: merge-ort.c merge-recursive.c
21429 +#: merge-ort.c
21430 #, c-format
21230 -msgid "object %s is not a blob"
21231 -msgstr "对象 %s 不是一个数据对象"
21431 +msgid "error: object %s is not a blob"
21432 +msgstr "错误：对象 %s 不是一个数据对象"
21433
21434 #: merge-ort.c
21435 #, c-format
@@ -21382,6 +21583,11 @@ msgstr "无法创建符号链接 '%s'：%s"
21583 msgid "do not know what to do with %06o %s '%s'"
21584 msgstr "不知道如何处理 %06o %s '%s'"
21585
21586 +#: merge-recursive.c
21587 +#, c-format
21588 +msgid "Failed to merge submodule %s (repository corrupt)"
21589 +msgstr "无法合并子模组 %s（仓库损坏）"
21590 +
21591 #: merge-recursive.c
21592 #, c-format
21593 msgid "Fast-forwarding submodule %s to the following commit:"
@@ -21427,6 +21633,15 @@ msgstr ""
21633 msgid "Failed to merge submodule %s (multiple merges found)"
21634 msgstr "无法合并子模组 %s （发现多个合并）"
21635
21636 +#: merge-recursive.c
21637 +msgid "failed to execute internal merge"
21638 +msgstr "无法执行内部合并"
21639 +
21640 +#: merge-recursive.c
21641 +#, c-format
21642 +msgid "unable to add %s to database"
21643 +msgstr "不能添加 %s 至对象库"
21644 +
21645 #: merge-recursive.c
21646 #, c-format
21647 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -21540,6 +21755,16 @@ msgstr ""
21755 "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
21756 "%4$s->%5$s"
21757
21758 +#: merge-recursive.c
21759 +#, c-format
21760 +msgid "cannot read object %s"
21761 +msgstr "不能读取对象 %s"
21762 +
21763 +#: merge-recursive.c
21764 +#, c-format
21765 +msgid "object %s is not a blob"
21766 +msgstr "对象 %s 不是一个数据对象"
21767 +
21768 #: merge-recursive.c
21769 msgid "modify"
21770 msgstr "修改"
@@ -21644,10 +21869,6 @@ msgstr "不能解析行：%s"
21869 msgid "malformed line: %s"
21870 msgstr "格式错误的行：%s"
21871
21647 -#: midx-write.c
21648 -msgid "ignoring existing multi-pack-index; checksum mismatch"
21649 -msgstr "忽略已存在的多包索引，校验码不匹配"
21650 -
21872 #: midx-write.c
21873 msgid "could not load pack"
21874 msgstr "不能载入包"
@@ -21657,6 +21878,10 @@ msgstr "不能载入包"
21878 msgid "could not open index for %s"
21879 msgstr "不能打开 %s 的索引"
21880
21881 +#: midx-write.c
21882 +msgid "ignoring existing multi-pack-index; checksum mismatch"
21883 +msgstr "忽略已存在的多包索引，校验码不匹配"
21884 +
21885 #: midx-write.c
21886 msgid "Adding packfiles to multi-pack-index"
21887 msgstr "添加包文件到多包索引"
@@ -22393,6 +22618,20 @@ msgstr "不能解析对象：%s"
22618 msgid "hash mismatch %s"
22619 msgstr "哈希值与 %s 不匹配"
22620
22621 +#: pack-bitmap-write.c
22622 +#, c-format
22623 +msgid "duplicate entry when writing bitmap index: %s"
22624 +msgstr "写入位图索引时存在重复条目：'%s'"
22625 +
22626 +#: pack-bitmap-write.c
22627 +#, c-format
22628 +msgid "attempted to store non-selected commit: '%s'"
22629 +msgstr "尝试存储未选定的提交：'%s'"
22630 +
22631 +#: pack-bitmap-write.c
22632 +msgid "too many pseudo-merges"
22633 +msgstr "太多伪合并"
22634 +
22635 #: pack-bitmap-write.c
22636 msgid "trying to write commit not in index"
22637 msgstr "尝试写入未在索引中的提交"
@@ -22422,6 +22661,19 @@ msgstr "损坏的位图索引（太小，容不下哈希缓存）"
22661 msgid "corrupted bitmap index file (too short to fit lookup table)"
22662 msgstr "损坏的位图索引（太小，容不下查询表）"
22663
22664 +#: pack-bitmap.c
22665 +msgid ""
22666 +"corrupted bitmap index file (too short to fit pseudo-merge table header)"
22667 +msgstr "损坏的位图索引文件（太短而无法容纳伪合并表头）"
22668 +
22669 +#: pack-bitmap.c
22670 +msgid "corrupted bitmap index file (too short to fit pseudo-merge table)"
22671 +msgstr "损坏的位图索引（太短而无法容纳伪合并表）"
22672 +
22673 +#: pack-bitmap.c
22674 +msgid "corrupted bitmap index file, pseudo-merge table too short"
22675 +msgstr "损坏的位图索引，伪合并表过短"
22676 +
22677 #: pack-bitmap.c
22678 #, c-format
22679 msgid "duplicate entry in bitmap index: '%s'"
@@ -22535,6 +22787,11 @@ msgstr "提交 '%s' 没有索引位图"
22787 msgid "mismatch in bitmap results"
22788 msgstr "位图结果不一致"
22789
22790 +#: pack-bitmap.c
22791 +#, c-format
22792 +msgid "pseudo-merge index out of range (%<PRIu32> >= %<PRIuMAX>)"
22793 +msgstr "伪合并索引超出范围 (%<PRIu32> >= %<PRIuMAX>)"
22794 +
22795 #: pack-bitmap.c
22796 #, c-format
22797 msgid "could not find '%s' in pack '%s' at offset %<PRIuMAX>"
@@ -22987,6 +23244,10 @@ msgstr "无法创建线程 lstat：%s"
23244 msgid "unable to parse --pretty format"
23245 msgstr "不能解析 --pretty 格式"
23246
23247 +#: promisor-remote.c
23248 +msgid "lazy fetching disabled; some objects may not be available"
23249 +msgstr "禁用延迟获取，某些对象可能不可用"
23250 +
23251 #: promisor-remote.c
23252 msgid "promisor-remote: unable to fork off fetch subprocess"
23253 msgstr "promisor-remote：无法派生 fetch 子进程"
@@ -23017,6 +23278,72 @@ msgstr "object-info：在参数之后应有一个 flush"
23278 msgid "Removing duplicate objects"
23279 msgstr "正在删除重复对象"
23280
23281 +#: pseudo-merge.c
23282 +#, c-format
23283 +msgid "failed to load pseudo-merge regex for %s: '%s'"
23284 +msgstr "未能加载 %s 的伪合并正则表达式：'%s'"
23285 +
23286 +#: pseudo-merge.c
23287 +#, c-format
23288 +msgid "%s must be non-negative, using default"
23289 +msgstr "%s 必须为非负整数，使用默认值"
23290 +
23291 +#: pseudo-merge.c
23292 +#, c-format
23293 +msgid "%s must be between 0 and 1, using default"
23294 +msgstr "%s 必须介于 0 到 1 之间，使用默认值"
23295 +
23296 +#: pseudo-merge.c
23297 +#, c-format
23298 +msgid "%s must be positive, using default"
23299 +msgstr "%s 必须为正数，使用默认值"
23300 +
23301 +#: pseudo-merge.c
23302 +#, c-format
23303 +msgid "pseudo-merge group '%s' missing required pattern"
23304 +msgstr "伪合并组 '%s' 缺少所需的模式"
23305 +
23306 +#: pseudo-merge.c
23307 +#, c-format
23308 +msgid "pseudo-merge group '%s' has unstable threshold before stable one"
23309 +msgstr "伪合并组 '%s' 在稳定阈值之前有不稳定阈值"
23310 +
23311 +#: pseudo-merge.c
23312 +#, c-format
23313 +msgid ""
23314 +"pseudo-merge regex from config has too many capture groups (max=%<PRIuMAX>)"
23315 +msgstr "来自 config 的伪合并正则表达式有太多的捕获组（最多 %<PRIuMAX> 个）"
23316 +
23317 +#: pseudo-merge.c
23318 +#, c-format
23319 +msgid "extended pseudo-merge read out-of-bounds (%<PRIuMAX> >= %<PRIuMAX>)"
23320 +msgstr "扩展伪合并读取越界 (%<PRIuMAX> >= %<PRIuMAX>)"
23321 +
23322 +#: pseudo-merge.c
23323 +#, c-format
23324 +msgid "extended pseudo-merge entry is too short (%<PRIuMAX> >= %<PRIuMAX>)"
23325 +msgstr "扩展伪合并条目太短（%<PRIuMAX> >= %<PRIuMAX>）"
23326 +
23327 +#: pseudo-merge.c
23328 +#, c-format
23329 +msgid "could not find pseudo-merge for commit %s at offset %<PRIuMAX>"
23330 +msgstr "无法在提交 %1$s 的偏移 %2$<PRIuMAX> 中找到伪合并"
23331 +
23332 +#: pseudo-merge.c
23333 +#, c-format
23334 +msgid "extended pseudo-merge lookup out-of-bounds (%<PRIu32> >= %<PRIu32>)"
23335 +msgstr "扩展伪合并查找越界 (%<PRIu32> >= %<PRIu32>)"
23336 +
23337 +#: pseudo-merge.c
23338 +#, c-format
23339 +msgid "out-of-bounds read: (%<PRIuMAX> >= %<PRIuMAX>)"
23340 +msgstr "越界读取：(%<PRIuMAX> >= %<PRIuMAX>)"
23341 +
23342 +#: pseudo-merge.c
23343 +#, c-format
23344 +msgid "could not read extended pseudo-merge table for commit %s"
23345 +msgstr "无法读取提交 %s 的扩展伪合并表"
23346 +
23347 #: range-diff.c
23348 msgid "could not start `log`"
23349 msgstr "不能启动 `log`"
@@ -23725,11 +24052,20 @@ msgstr "引用 %s 的日志意外终止于 %s "
24052 msgid "log for %s is empty"
24053 msgstr "%s 的日志为空"
24054
24055 +#: refs.c
24056 +msgid "refusing to force and skip creation of reflog"
24057 +msgstr "拒绝既强制又跳过创建引用日志"
24058 +
24059 #: refs.c
24060 #, c-format
24061 msgid "refusing to update ref with bad name '%s'"
24062 msgstr "拒绝更新有错误名称 '%s' 的引用"
24063
24064 +#: refs.c
24065 +#, c-format
24066 +msgid "refusing to update pseudoref '%s'"
24067 +msgstr "拒绝更新伪引用 '%s'"
24068 +
24069 #: refs.c
24070 #, c-format
24071 msgid "update_ref failed for ref '%s': %s"
@@ -23768,6 +24104,27 @@ msgstr "无法删除引用 %s：%s"
24104 msgid "could not delete references: %s"
24105 msgstr "无法删除引用：%s"
24106
24107 +#: refs.c
24108 +#, c-format
24109 +msgid "Finished dry-run migration of refs, the result can be found at '%s'\n"
24110 +msgstr "已完成 refs 的试运行迁移，结果可在 '%s' 处找到\n"
24111 +
24112 +#: refs.c
24113 +#, c-format
24114 +msgid "could not remove temporary migration directory '%s'"
24115 +msgstr "无法删除临时迁移目录 '%s'"
24116 +
24117 +#: refs.c
24118 +#, c-format
24119 +msgid "migrated refs can be found at '%s'"
24120 +msgstr "迁移的引用可以在 '%s' 处找到"
24121 +
24122 +#: refs/files-backend.c refs/reftable-backend.c
24123 +#, c-format
24124 +msgid ""
24125 +"cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
24126 +msgstr "无法锁定引用 '%s'：预期目标为 '%s' 的符号引用：但是是普通引用"
24127 +
24128 #: refs/reftable-backend.c
24129 #, c-format
24130 msgid "refname is dangerous: %s"
@@ -25157,6 +25514,53 @@ msgstr "'%s' 不是一个有效的引用名"
25514 msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
25515 msgstr "update-ref 需要一个完整的引用名，例如：refs/heads/%s"
25516
25517 +#: sequencer.c
25518 +#, c-format
25519 +msgid "'%s' does not accept merge commits"
25520 +msgstr "'%s' 不接受合并提交"
25521 +
25522 +#. TRANSLATORS: 'pick' and 'merge -C' should not be
25523 +#. translated.
25524 +#.
25525 +#: sequencer.c
25526 +msgid ""
25527 +"'pick' does not take a merge commit. If you wanted to\n"
25528 +"replay the merge, use 'merge -C' on the commit."
25529 +msgstr ""
25530 +"'pick' 不接受合并提交。如果您想要重放合并，\n"
25531 +"请在提交上使用 'merge -C'。"
25532 +
25533 +#. TRANSLATORS: 'reword' and 'merge -c' should not be
25534 +#. translated.
25535 +#.
25536 +#: sequencer.c
25537 +msgid ""
25538 +"'reword' does not take a merge commit. If you wanted to\n"
25539 +"replay the merge and reword the commit message, use\n"
25540 +"'merge -c' on the commit"
25541 +msgstr ""
25542 +"'reword' 不接受合并提交。如果您想重放合并并重写提交消息，\n"
25543 +"请在提交上使用 'merge -c'"
25544 +
25545 +#. TRANSLATORS: 'edit', 'merge -C' and 'break' should
25546 +#. not be translated.
25547 +#.
25548 +#: sequencer.c
25549 +msgid ""
25550 +"'edit' does not take a merge commit. If you wanted to\n"
25551 +"replay the merge, use 'merge -C' on the commit, and then\n"
25552 +"'break' to give the control back to you so that you can\n"
25553 +"do 'git commit --amend && git rebase --continue'."
25554 +msgstr ""
25555 +"'edit”' 不接受合并提交。如果您想要重放合并，\n"
25556 +"请在提交上使用 'merge -C'，然后使用 'break'\n"
25557 +"将控制权交还给您，以便您可以执行\n"
25558 +"'git commit --amend && git rebase --continue'。"
25559 +
25560 +#: sequencer.c
25561 +msgid "cannot squash merge commit into another commit"
25562 +msgstr "无法将合并提交压缩到另一个提交中"
25563 +
25564 #: sequencer.c
25565 #, c-format
25566 msgid "invalid command '%.*s'"
@@ -25307,9 +25711,8 @@ msgid "cannot read HEAD"
25711 msgstr "不能读取 HEAD"
25712
25713 #: sequencer.c
25310 -#, c-format
25311 -msgid "unable to copy '%s' to '%s'"
25312 -msgstr "无法拷贝 '%s' 至 '%s'"
25714 +msgid "could not write commit message file"
25715 +msgstr "无法写入提交说明文件"
25716
25717 #: sequencer.c
25718 #, c-format
@@ -25787,6 +26190,19 @@ msgstr "无法返回当前工作目录"
26190 msgid "failed to stat '%*s%s%s'"
26191 msgstr "无法获取 '%*s%s%s' 状态（stat）"
26192
26193 +#: setup.c
26194 +#, c-format
26195 +msgid ""
26196 +"detected dubious ownership in repository at '%s'\n"
26197 +"%sTo add an exception for this directory, call:\n"
26198 +"\n"
26199 +"\tgit config --global --add safe.directory %s"
26200 +msgstr ""
26201 +"在 '%s' 检测到可疑的仓库所有权\n"
26202 +"%s要为本仓库创建特例，请运行：\n"
26203 +"\n"
26204 +"\tgit config --global --add safe.directory %s"
26205 +
26206 #: setup.c
26207 msgid "Unable to read current working directory"
26208 msgstr "不能读取当前工作目录"
@@ -25810,19 +26226,6 @@ msgstr ""
26226 "不是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
26227 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
26228
25813 -#: setup.c
25814 -#, c-format
25815 -msgid ""
25816 -"detected dubious ownership in repository at '%s'\n"
25817 -"%sTo add an exception for this directory, call:\n"
25818 -"\n"
25819 -"\tgit config --global --add safe.directory %s"
25820 -msgstr ""
25821 -"在 '%s' 检测到可疑的仓库所有权\n"
25822 -"%s要为本仓库创建特例，请运行：\n"
25823 -"\n"
25824 -"\tgit config --global --add safe.directory %s"
25825 -
26229 #: setup.c
26230 #, c-format
26231 msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
@@ -26187,6 +26590,16 @@ msgstr "子模组 '%s' 无法被更新。"
26590 msgid "submodule git dir '%s' is inside git dir '%.*s'"
26591 msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
26592
26593 +#: submodule.c
26594 +#, c-format
26595 +msgid "expected '%.*s' in submodule path '%s' not to be a symbolic link"
26596 +msgstr "期望子模组的父目录 '%.*s' 不是一个符号链接，子模组路径为 '%s'"
26597 +
26598 +#: submodule.c
26599 +#, c-format
26600 +msgid "expected submodule path '%s' not to be a symbolic link"
26601 +msgstr "预期子模组路径 '%s' 不是符号链接"
26602 +
26603 #: submodule.c
26604 #, c-format
26605 msgid ""
@@ -26232,11 +26645,6 @@ msgstr "无法执行 lstat '%s'"
26645 msgid "no remote configured to get bundle URIs from"
26646 msgstr "没有远程被设置为可以获取归档包 URI"
26647
26235 -#: t/helper/test-bundle-uri.c
26236 -#, c-format
26237 -msgid "remote '%s' has no configured URL"
26238 -msgstr "远程 '%s' 没有设置 URL"
26239 -
26648 #: t/helper/test-bundle-uri.c
26649 msgid "could not get the bundle-uri list"
26650 msgstr "无法获取 bundle-uri 列表"
@@ -28025,29 +28433,29 @@ msgstr "无法发送 %s\n"
28433
28434 #: git-send-email.perl
28435 #, perl-format
28028 -msgid "Dry-Sent %s\n"
28029 -msgstr "演习发送 %s\n"
28436 +msgid "Dry-Sent %s"
28437 +msgstr "演习发送 %s"
28438
28439 #: git-send-email.perl
28440 #, perl-format
28033 -msgid "Sent %s\n"
28034 -msgstr "正发送 %s\n"
28441 +msgid "Sent %s"
28442 +msgstr "已发送 %s"
28443
28444 #: git-send-email.perl
28037 -msgid "Dry-OK. Log says:\n"
28038 -msgstr "演习成功。日志说：\n"
28445 +msgid "Dry-OK. Log says:"
28446 +msgstr "演习成功。日志说："
28447
28448 #: git-send-email.perl
28041 -msgid "OK. Log says:\n"
28042 -msgstr "OK。日志说：\n"
28449 +msgid "OK. Log says:"
28450 +msgstr "成功。日志说："
28451
28452 #: git-send-email.perl
28453 msgid "Result: "
28454 msgstr "结果："
28455
28456 #: git-send-email.perl
28049 -msgid "Result: OK\n"
28050 -msgstr "结果：OK\n"
28457 +msgid "Result: OK"
28458 +msgstr "结果：成功"
28459
28460 #: git-send-email.perl
28461 #, perl-format