@matheusbsbs / matheus-bagliano / commits / ad892a61d6

l10n: zh_CN: updated translation for 2.52

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

Teng Long committed Nov 13, 2025 at 19:53 UTC ad892a61d6dd73211aafbc72e177ffa31e4cbec3
1 file changed +1416 -312
po/zh_CN.po
+1416 -312
@@ -155,8 +155,8 @@ msgid ""
155 msgstr ""
156 "Project-Id-Version: Git\n"
157 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
158 -"POT-Creation-Date: 2025-08-12 20:20-0400\n"
159 -"PO-Revision-Date: 2025-08-17 08:14-0400\n"
158 +"POT-Creation-Date: 2025-11-15 22:02+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"
162 "Language: zh_CN\n"
@@ -782,26 +782,28 @@ msgstr "未应用。\n"
782
783 #: add-patch.c
784 msgid ""
785 -"j - leave this hunk undecided, see next undecided hunk\n"
786 -"J - leave this hunk undecided, see next hunk\n"
787 -"k - leave this hunk undecided, see previous undecided hunk\n"
788 -"K - leave this hunk undecided, see previous hunk\n"
785 +"j - go to the next undecided hunk, roll over at the bottom\n"
786 +"J - go to the next hunk, roll over at the bottom\n"
787 +"k - go to the previous undecided hunk, roll over at the top\n"
788 +"K - go to the previous hunk, roll over at the top\n"
789 "g - select a hunk to go to\n"
790 "/ - search for a hunk matching the given regex\n"
791 "s - split the current hunk into smaller hunks\n"
792 "e - manually edit the current hunk\n"
793 -"p - print the current hunk, 'P' to use the pager\n"
793 +"p - print the current hunk\n"
794 +"P - print the current hunk using the pager\n"
795 "? - print help\n"
796 msgstr ""
796 -"j - 维持该块未决状态，查看下一个未决块\n"
797 -"J - 维持该块未决状态，查看下一个块\n"
798 -"k - 维持该块未决状态，查看上一个未决块\n"
799 -"K - 维持该块未决状态，查看上一个块\n"
800 -"g - 选择跳转到一个块\n"
797 +"j - 跳转至下一个未决定块，在底部翻页\n"
798 +"J - 跳转至下一个块，在底部翻页\n"
799 +"k - 跳转至上一个未决定块，在顶部翻页\n"
800 +"K - 跳转至上一个块，在顶部翻页\n"
801 +"g - 选择要跳转的块\n"
802 "/ - 查找和给定正则表达式匹配的块\n"
803 "s - 拆分当前块为更小的块\n"
804 "e - 手动编辑当前块\n"
804 -"p - 显示当前块, 'P' 使用分页器\n"
805 +"p - 显示当前块\n"
806 +"P - 使用分页器显示当前块\n"
807 "? - 显示帮助\n"
808
809 #: add-patch.c
@@ -810,12 +812,12 @@ msgid "Only one letter is expected, got '%s'"
812 msgstr "预期只有一个字母，得到 '%s'"
813
814 #: add-patch.c
813 -msgid "No previous hunk"
814 -msgstr "没有前一个块"
815 +msgid "No other hunk"
816 +msgstr "没有其它块"
817
818 #: add-patch.c
817 -msgid "No next hunk"
818 -msgstr "没有下一个块"
819 +msgid "No other undecided hunk"
820 +msgstr "没有其它未决定的块"
821
822 #: add-patch.c
823 msgid "No other hunks to goto"
@@ -1060,7 +1062,8 @@ msgid "unclosed quote"
1062 msgstr "未关闭的引号"
1063
1064 #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c
1063 -#: builtin/receive-pack.c builtin/refs.c builtin/tag.c t/helper/test-pkt-line.c
1065 +#: builtin/receive-pack.c builtin/refs.c builtin/repo.c builtin/tag.c
1066 +#: t/helper/test-pkt-line.c
1067 msgid "too many arguments"
1068 msgstr "太多参数"
1069
@@ -1374,7 +1377,7 @@ msgstr "%s：错误类型"
1377 msgid "%s has type %o, expected %o"
1378 msgstr "%s 的类型是 %o，应为 %o"
1379
1377 -#: apply.c read-cache.c
1380 +#: apply.c builtin/fast-import.c read-cache.c
1381 #, c-format
1382 msgid "invalid path '%s'"
1383 msgstr "无效路径 '%s'"
@@ -1753,7 +1756,7 @@ msgstr ""
1756 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1757 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
1758
1756 -#: archive.c builtin/gc.c builtin/notes.c builtin/tag.c
1759 +#: archive.c builtin/fast-import.c builtin/gc.c builtin/notes.c builtin/tag.c
1760 #, c-format
1761 msgid "cannot read '%s'"
1762 msgstr "不能读取 '%s'"
@@ -2112,9 +2115,9 @@ msgstr "--contents 和 --reverse 不能混用。"
2115 msgid "--reverse and --first-parent together require specified latest commit"
2116 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
2117
2115 -#: blame.c builtin/bisect.c builtin/commit.c builtin/log.c builtin/merge.c
2116 -#: builtin/pack-objects.c builtin/shortlog.c midx-write.c pack-bitmap.c
2117 -#: remote.c sequencer.c submodule.c
2118 +#: blame.c builtin/bisect.c builtin/commit.c builtin/fast-export.c
2119 +#: builtin/log.c builtin/merge.c builtin/pack-objects.c builtin/shortlog.c
2120 +#: midx-write.c pack-bitmap.c remote.c sequencer.c submodule.c
2121 msgid "revision walk setup failed"
2122 msgstr "版本遍历初始化失败"
2123
@@ -2353,7 +2356,7 @@ msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
2356
2357 #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c
2358 #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c
2356 -#: builtin/rm.c builtin/send-pack.c
2359 +#: builtin/rm.c builtin/send-pack.c builtin/sparse-checkout.c
2360 msgid "dry run"
2361 msgstr "演习"
2362
@@ -2508,8 +2511,8 @@ msgid "bad action '%s' for '%s'"
2511 msgstr "'%2$s' 的错误动作 '%1$s'"
2512
2513 #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c
2511 -#: builtin/pull.c builtin/revert.c diff-merges.c environment.c gpg-interface.c
2512 -#: ls-refs.c parallel-checkout.c sequencer.c setup.c
2514 +#: builtin/pull.c builtin/revert.c diff-merges.c diff.c environment.c
2515 +#: gpg-interface.c ls-refs.c parallel-checkout.c sequencer.c setup.c
2516 #, c-format
2517 msgid "invalid value for '%s': '%s'"
2518 msgstr "'%s' 的值无效：'%s'"
@@ -2845,7 +2848,8 @@ msgstr "n"
2848 #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c
2849 #: builtin/clone.c builtin/diagnose.c builtin/for-each-ref.c builtin/init-db.c
2850 #: builtin/ls-files.c builtin/ls-tree.c builtin/refs.c builtin/replace.c
2848 -#: builtin/submodule--helper.c builtin/tag.c builtin/verify-tag.c
2851 +#: builtin/repo.c builtin/submodule--helper.c builtin/tag.c
2852 +#: builtin/verify-tag.c
2853 msgid "format"
2854 msgstr "格式"
2855
@@ -2991,15 +2995,21 @@ msgstr "将缺少的对象限制在当前的稀疏检出中"
2995
2996 #: builtin/bisect.c
2997 msgid ""
2994 -"git bisect start [--term-(new|bad)=<term> --term-(old|good)=<term>] [--no-"
2995 -"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2998 +"git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
2999 +" [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
3000 +"[<pathspec>...]"
3001 msgstr ""
2997 -"git bisect start [--term-{new|bad}=<术语> --term-{old|good}=<术语>] [--no-"
2998 -"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
3002 +"git bisect start [--term-(bad|new)=<新术语> --term-(good|old)=<旧术语>]\n"
3003 +" [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路"
3004 +"径规格>...]"
3005 +
3006 +#: builtin/bisect.c
3007 +msgid "git bisect (bad|new|<term-new>) [<rev>]"
3008 +msgstr "git bisect (bad|new|<新术语>) [<版本>]"
3009
3010 #: builtin/bisect.c
3001 -msgid "git bisect (good|bad) [<rev>...]"
3002 -msgstr "git bisect (good|bad) [<版本>...]"
3011 +msgid "git bisect (good|old|<term-old>) [<rev>...]"
3012 +msgstr "git bisect (good|old|<旧术语>) [<版本>...]"
3013
3014 #: builtin/bisect.c
3015 msgid "git bisect skip [(<rev>|<range>)...]"
@@ -3830,8 +3840,8 @@ msgstr "HEAD 没有位于 /refs/heads 之下！"
3840
3841 #: builtin/branch.c
3842 msgid ""
3833 -"branch with --recurse-submodules can only be used if submodule."
3834 -"propagateBranches is enabled"
3843 +"branch with --recurse-submodules can only be used if "
3844 +"submodule.propagateBranches is enabled"
3845 msgstr ""
3846 "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用"
3847
@@ -4380,7 +4390,7 @@ msgstr "还从标准输入读取联系地址"
4390 msgid "read additional mailmap entries from file"
4391 msgstr "从文件中读取附加邮件映射条目"
4392
4383 -#: builtin/check-mailmap.c
4393 +#: builtin/check-mailmap.c builtin/fast-import.c
4394 msgid "blob"
4395 msgstr "数据对象"
4396
@@ -4993,12 +5003,12 @@ msgid ""
5003 msgstr ""
5004 "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..."
5005
4996 -#: builtin/clean.c
5006 +#: builtin/clean.c builtin/sparse-checkout.c
5007 #, c-format
5008 msgid "Removing %s\n"
5009 msgstr "正删除 %s\n"
5010
5001 -#: builtin/clean.c
5011 +#: builtin/clean.c builtin/sparse-checkout.c
5012 #, c-format
5013 msgid "Would remove %s\n"
5014 msgstr "将删除 %s\n"
@@ -5016,7 +5026,7 @@ msgstr "将忽略仓库 %s\n"
5026 #: builtin/clean.c midx.c
5027 #, c-format
5028 msgid "failed to remove %s"
5019 -msgstr "无法删除 %s"
5029 +msgstr "无法删除 '%s'"
5030
5031 #: builtin/clean.c
5032 #, c-format
@@ -5122,7 +5132,7 @@ msgstr "没有要清理的文件，退出。"
5132 msgid "do not print names of files removed"
5133 msgstr "不打印删除文件的名称"
5134
5125 -#: builtin/clean.c
5135 +#: builtin/clean.c builtin/sparse-checkout.c
5136 msgid "force"
5137 msgstr "强制"
5138
@@ -5135,8 +5145,8 @@ msgid "remove whole directories"
5145 msgstr "删除整个目录"
5146
5147 #: builtin/clean.c builtin/config.c builtin/describe.c builtin/grep.c
5138 -#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/pack-refs.c
5139 -#: builtin/show-ref.c ref-filter.h
5148 +#: builtin/log.c builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c
5149 +#: pack-refs.c ref-filter.h
5150 msgid "pattern"
5151 msgstr "模式"
5152
@@ -6950,6 +6960,16 @@ msgstr "已遍历 %lu 个提交\n"
6960 msgid "found %i tags; gave up search at %s\n"
6961 msgstr "找到 %i 个标签；在 %s 处放弃搜索\n"
6962
6963 +#: builtin/describe.c
6964 +#, c-format
6965 +msgid "cannot search for blob '%s' on an unborn branch"
6966 +msgstr "无法在尚未诞生的分支上搜索数据对象 '%s'"
6967 +
6968 +#: builtin/describe.c
6969 +#, c-format
6970 +msgid "blob '%s' not reachable from HEAD"
6971 +msgstr "数据对象 '%s' 从 HEAD 不可达"
6972 +
6973 #: builtin/describe.c
6974 #, c-format
6975 msgid "describe %s\n"
@@ -7131,6 +7151,10 @@ msgstr "无效选项：%s"
7151 msgid "%s...%s: no merge base"
7152 msgstr "%s...%s：无合并基线"
7153
7154 +#: builtin/diff.c setup.c
7155 +msgid "cannot come back to cwd"
7156 +msgstr "无法返回当前工作目录"
7157 +
7158 #: builtin/diff.c
7159 msgid "Not a git repository"
7160 msgstr "不是 git 仓库"
@@ -7269,8 +7293,162 @@ msgid "git fast-export [<rev-list-opts>]"
7293 msgstr "git fast-export [<rev-list 选项>]"
7294
7295 #: builtin/fast-export.c
7272 -msgid "Error: Cannot export nested tags unless --mark-tags is specified."
7273 -msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
7296 +#, c-format
7297 +msgid "unknown %s mode: %s"
7298 +msgstr "未知 %s 模式：%s"
7299 +
7300 +#: builtin/fast-export.c
7301 +#, c-format
7302 +msgid "unknown tag-of-filtered mode: %s"
7303 +msgstr "未知 tag-of-filtered 模式：%s"
7304 +
7305 +#: builtin/fast-export.c
7306 +#, c-format
7307 +msgid "unknown reencoding mode: %s"
7308 +msgstr "未知重编码模式：%s"
7309 +
7310 +#: builtin/fast-export.c
7311 +#, c-format
7312 +msgid "could not read blob %s"
7313 +msgstr "无法读取数据对象 %s"
7314 +
7315 +#: builtin/fast-export.c
7316 +#, c-format
7317 +msgid "oid mismatch in blob %s"
7318 +msgstr "数据对象 %s 中的对象 ID 不匹配"
7319 +
7320 +#: builtin/fast-export.c
7321 +#, c-format
7322 +msgid "could not write blob '%s'"
7323 +msgstr "无法写入数据对象 '%s'"
7324 +
7325 +#: builtin/fast-export.c
7326 +#, c-format
7327 +msgid "unexpected comparison status '%c' for %s, %s"
7328 +msgstr "对于 %2$s、%3$s 出现非预期的比较状态 '%1$c'"
7329 +
7330 +#: builtin/fast-export.c
7331 +msgid "none"
7332 +msgstr "无"
7333 +
7334 +#: builtin/fast-export.c
7335 +#, c-format
7336 +msgid "could not find author in commit %s"
7337 +msgstr "无法在提交 %s 中找到作者"
7338 +
7339 +#: builtin/fast-export.c
7340 +#, c-format
7341 +msgid "could not find committer in commit %s"
7342 +msgstr "无法在提交 %s 中找到提交者"
7343 +
7344 +#: builtin/fast-export.c
7345 +#, c-format
7346 +msgid ""
7347 +"encountered commit-specific encoding %.*s in commit %s; use --reencode=[yes|"
7348 +"no] to handle it"
7349 +msgstr ""
7350 +"在提交 %3$s 中遇到提交特定编码 %2$.*1$s；使用 --reencode=[yes|no] 来处理"
7351 +
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 +
7357 +#: builtin/fast-export.c
7358 +#, c-format
7359 +msgid "exporting %<PRIuMAX> signature(s) for commit %s"
7360 +msgstr "正在导出提交 %2$s 的 %1$<PRIuMAX> 个签名"
7361 +
7362 +#: builtin/fast-export.c
7363 +#, c-format
7364 +msgid "stripping signature(s) from commit %s"
7365 +msgstr "正在剥离提交 %s 的签名"
7366 +
7367 +#: builtin/fast-export.c
7368 +#, c-format
7369 +msgid ""
7370 +"omitting tag %s,\n"
7371 +"since tags of trees (or tags of tags of trees, etc.) are not supported."
7372 +msgstr ""
7373 +"忽略标签 %s，\n"
7374 +"因为不支持树的标签（或树的标签的标签等）。"
7375 +
7376 +#: builtin/fast-export.c
7377 +#, c-format
7378 +msgid "could not read tag %s"
7379 +msgstr "无法读取标签 %s"
7380 +
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 +
7386 +#: builtin/fast-export.c
7387 +#, c-format
7388 +msgid "exporting signed tag %s"
7389 +msgstr "正在导出已签名标签 %s"
7390 +
7391 +#: builtin/fast-export.c
7392 +#, c-format
7393 +msgid "stripping signature from tag %s"
7394 +msgstr "正在从标签 %s 中剥离签名"
7395 +
7396 +#: builtin/fast-export.c
7397 +#, c-format
7398 +msgid ""
7399 +"tag %s tags unexported object; use --tag-of-filtered-object=<mode> to handle "
7400 +"it"
7401 +msgstr ""
7402 +"标签 %s 指向未导出的对象；使用 --tag-of-filtered-object=<模式> 来处理它"
7403 +
7404 +#: builtin/fast-export.c
7405 +msgid "cannot export nested tags unless --mark-tags is specified."
7406 +msgstr "除非指定 --mark-tags，否则无法导出嵌套标签。"
7407 +
7408 +#: builtin/fast-export.c
7409 +#, c-format
7410 +msgid "tag %s points nowhere?"
7411 +msgstr "标签 %s 没有指向任何对象？"
7412 +
7413 +#: builtin/fast-export.c
7414 +#, c-format
7415 +msgid "%s: unexpected object of type %s, skipping."
7416 +msgstr "%s：遇到类型为 %s 的非预期对象，跳过。"
7417 +
7418 +#: builtin/fast-export.c
7419 +#, c-format
7420 +msgid "tag points to object of unexpected type %s, skipping."
7421 +msgstr "标签指向非预期类型 %s 的对象，跳过。"
7422 +
7423 +#: builtin/fast-export.c
7424 +#, c-format
7425 +msgid "unable to open marks file %s for writing."
7426 +msgstr "无法打开标记文件 %s 以写入。"
7427 +
7428 +#: builtin/fast-export.c
7429 +#, c-format
7430 +msgid "unable to write marks file %s."
7431 +msgstr "无法写入标记文件 %s。"
7432 +
7433 +#: builtin/fast-export.c builtin/fast-import.c
7434 +#, c-format
7435 +msgid "corrupt mark line: %s"
7436 +msgstr "损坏的标记行：%s"
7437 +
7438 +#: builtin/fast-export.c builtin/fast-import.c fetch-pack.c
7439 +#, c-format
7440 +msgid "object not found: %s"
7441 +msgstr "对象未找到：%s"
7442 +
7443 +#: builtin/fast-export.c
7444 +#, c-format
7445 +msgid "not a commit? can't happen: %s"
7446 +msgstr "不是一个提交？不应该发生：%s"
7447 +
7448 +#: builtin/fast-export.c
7449 +#, c-format
7450 +msgid "object %s already has a mark"
7451 +msgstr "对象 %s 已经有一个标记"
7452
7453 #: builtin/fast-export.c
7454 msgid "--anonymize-map token cannot be empty"
@@ -7358,33 +7536,567 @@ msgstr "对带有标记 ID 的标签做标记"
7536
7537 #: builtin/fast-import.c
7538 #, c-format
7361 -msgid "Missing from marks for submodule '%s'"
7539 +msgid "can't write crash report %s"
7540 +msgstr "无法写入崩溃报告 %s"
7541 +
7542 +#: builtin/fast-import.c
7543 +#, c-format
7544 +msgid "fast-import: dumping crash report to %s\n"
7545 +msgstr "fast-import：正在转储崩溃报告到 %s\n"
7546 +
7547 +#: builtin/fast-import.c
7548 +#, c-format
7549 +msgid "mark :%<PRIuMAX> not declared"
7550 +msgstr "标记 :%<PRIuMAX> 未声明"
7551 +
7552 +#: builtin/fast-import.c
7553 +#, c-format
7554 +msgid "invalid attempt to create duplicate branch: %s"
7555 +msgstr "尝试创建重复分支的无效操作：%s"
7556 +
7557 +#: builtin/fast-import.c
7558 +#, c-format
7559 +msgid "branch name doesn't conform to Git standards: %s"
7560 +msgstr "分支名称不符合 Git 标准：%s"
7561 +
7562 +#: builtin/fast-import.c
7563 +msgid "internal consistency error creating the index"
7564 +msgstr "创建索引时出现内部一致性错误"
7565 +
7566 +#: builtin/fast-import.c
7567 +msgid "cannot create keep file"
7568 +msgstr "无法创建 keep 文件"
7569 +
7570 +#: builtin/fast-import.c
7571 +msgid "failed to write keep file"
7572 +msgstr "无法写入 keep 文件"
7573 +
7574 +#: builtin/fast-import.c
7575 +msgid "cannot store pack file"
7576 +msgstr "无法存储包文件"
7577 +
7578 +#: builtin/fast-import.c
7579 +msgid "cannot store index file"
7580 +msgstr "无法存储索引文件"
7581 +
7582 +#: builtin/fast-import.c
7583 +#, c-format
7584 +msgid "failed seeking to start of '%s'"
7585 +msgstr "无法寻找到 '%s' 的开始位置"
7586 +
7587 +#: builtin/fast-import.c
7588 +#, c-format
7589 +msgid "core Git rejected index %s"
7590 +msgstr "Git 核心拒绝索引 %s"
7591 +
7592 +#: builtin/fast-import.c
7593 +msgid "cannot truncate pack to skip duplicate"
7594 +msgstr "无法截断包以跳过重复"
7595 +
7596 +#: builtin/fast-import.c
7597 +#, c-format
7598 +msgid "EOF in data (%<PRIuMAX> bytes remaining)"
7599 +msgstr "数据中 EOF（剩余 %<PRIuMAX> 字节）"
7600 +
7601 +#: builtin/fast-import.c
7602 +#, c-format
7603 +msgid "unexpected deflate failure: %d"
7604 +msgstr "意外的压缩失败：%d"
7605 +
7606 +#: builtin/fast-import.c
7607 +#, c-format
7608 +msgid "not a tree: %s"
7609 +msgstr "不是一个树对象：%s"
7610 +
7611 +#: builtin/fast-import.c
7612 +#, c-format
7613 +msgid "can't load tree %s"
7614 +msgstr "无法加载树 %s"
7615 +
7616 +#: builtin/fast-import.c
7617 +#, c-format
7618 +msgid "corrupt mode in %s"
7619 +msgstr "%s 中损坏的模式"
7620 +
7621 +#: builtin/fast-import.c
7622 +msgid "root cannot be a non-directory"
7623 +msgstr "根目录不能是非目录"
7624 +
7625 +#: builtin/fast-import.c
7626 +msgid "empty path component found in input"
7627 +msgstr "在输入中发现空路径组件"
7628 +
7629 +#: builtin/fast-import.c
7630 +msgid "non-directories cannot have subtrees"
7631 +msgstr "非目录不能有子树"
7632 +
7633 +#: builtin/fast-import.c
7634 +#, c-format
7635 +msgid "dropping %s since it would point to itself (i.e. to %s)"
7636 +msgstr "丢弃 %s 因为它将指向自身（即 %s）"
7637 +
7638 +#: builtin/fast-import.c
7639 +#, c-format
7640 +msgid "branch %s is missing commits."
7641 +msgstr "分支 %s 缺少提交。"
7642 +
7643 +#: builtin/fast-import.c
7644 +#, c-format
7645 +msgid "not updating %s (new tip %s does not contain %s)"
7646 +msgstr "未更新 %s（新的分支顶端 %s 不包含 %s）"
7647 +
7648 +#: builtin/fast-import.c builtin/sparse-checkout.c commit-graph.c midx-write.c
7649 +#: sequencer.c
7650 +#, c-format
7651 +msgid "unable to create leading directories of %s"
7652 +msgstr "不能为 %s 创建先导目录"
7653 +
7654 +#: builtin/fast-import.c
7655 +#, c-format
7656 +msgid "unable to write marks file %s"
7657 +msgstr "无法写入标记文件 %s"
7658 +
7659 +#: builtin/fast-import.c
7660 +#, c-format
7661 +msgid "unable to write marks file %s: %s"
7662 +msgstr "无法写入标记文件 %s：%s"
7663 +
7664 +#: builtin/fast-import.c object-file.c
7665 +#, c-format
7666 +msgid "unable to write file %s"
7667 +msgstr "无法写文件 %s"
7668 +
7669 +#: builtin/fast-import.c
7670 +#, c-format
7671 +msgid "expected 'data n' command, found: %s"
7672 +msgstr "预期 'data n' 命令，实际：%s"
7673 +
7674 +#: builtin/fast-import.c
7675 +#, c-format
7676 +msgid "EOF in data (terminator '%s' not found)"
7677 +msgstr "数据中 EOF（未找到终止符 '%s'）"
7678 +
7679 +#: builtin/fast-import.c
7680 +msgid "data is too large to use in this context"
7681 +msgstr "数据太大无法在此上下文中使用"
7682 +
7683 +#: builtin/fast-import.c
7684 +#, c-format
7685 +msgid "EOF in data (%lu bytes remaining)"
7686 +msgstr "数据中 EOF（剩余 %lu 字节）"
7687 +
7688 +#: builtin/fast-import.c
7689 +#, c-format
7690 +msgid "missing < in ident string: %s"
7691 +msgstr "身份标识字符串中缺少 <：%s"
7692 +
7693 +#: builtin/fast-import.c
7694 +#, c-format
7695 +msgid "missing space before < in ident string: %s"
7696 +msgstr "身份标识字符串中 < 之前缺少空格：%s"
7697 +
7698 +#: builtin/fast-import.c
7699 +#, c-format
7700 +msgid "missing > in ident string: %s"
7701 +msgstr "身份标识字符串中缺少 >：%s"
7702 +
7703 +#: builtin/fast-import.c
7704 +#, c-format
7705 +msgid "missing space after > in ident string: %s"
7706 +msgstr "身份标识字符串中 > 之后缺少空格：%s"
7707 +
7708 +#: builtin/fast-import.c
7709 +#, c-format
7710 +msgid "invalid raw date \"%s\" in ident: %s"
7711 +msgstr "身份标识中无效的原始日期 \"%s\"：%s"
7712 +
7713 +#: builtin/fast-import.c
7714 +#, c-format
7715 +msgid "invalid rfc2822 date \"%s\" in ident: %s"
7716 +msgstr "身份标识中无效的 rfc2822 日期 \"%s\"：%s"
7717 +
7718 +#: builtin/fast-import.c
7719 +#, c-format
7720 +msgid "date in ident must be 'now': %s"
7721 +msgstr "ident 中的日期必须为 'now'：%s"
7722 +
7723 +#: builtin/fast-import.c
7724 +#, c-format
7725 +msgid "too large fanout (%u)"
7726 +msgstr "扇出值过大 (%u)"
7727 +
7728 +#: builtin/fast-import.c
7729 +#, c-format
7730 +msgid "failed to remove path %s"
7731 +msgstr "无法删除路径 %s"
7732 +
7733 +#: builtin/fast-import.c
7734 +#, c-format
7735 +msgid "no value after ':' in mark: %s"
7736 +msgstr "标记中 ':' 后面没有值：%s"
7737 +
7738 +#: builtin/fast-import.c
7739 +#, c-format
7740 +msgid "garbage after mark: %s"
7741 +msgstr "标记后面有垃圾内容：%s"
7742 +
7743 +#: builtin/fast-import.c
7744 +#, c-format
7745 +msgid "missing space after mark: %s"
7746 +msgstr "标记后面缺少空格：%s"
7747 +
7748 +#: builtin/fast-import.c
7749 +#, c-format
7750 +msgid "invalid %s: %s"
7751 +msgstr "无效 %s：%s"
7752 +
7753 +#: builtin/fast-import.c
7754 +#, c-format
7755 +msgid "NUL in %s: %s"
7756 +msgstr "在 %s 中存在 NUL：%s"
7757 +
7758 +#: builtin/fast-import.c
7759 +#, c-format
7760 +msgid "garbage after %s: %s"
7761 +msgstr "在 %s 后面有垃圾内容：%s"
7762 +
7763 +#: builtin/fast-import.c
7764 +#, c-format
7765 +msgid "missing space after %s: %s"
7766 +msgstr "在 %s 后面缺少空格：%s"
7767 +
7768 +#: builtin/fast-import.c
7769 +#, c-format
7770 +msgid "corrupt mode: %s"
7771 +msgstr "损坏的模式：%s"
7772 +
7773 +#: builtin/fast-import.c
7774 +#, c-format
7775 +msgid "invalid dataref: %s"
7776 +msgstr "无效的数据引用：%s"
7777 +
7778 +#: builtin/fast-import.c
7779 +#, c-format
7780 +msgid "missing space after SHA1: %s"
7781 +msgstr "SHA1 后面缺少空格：%s"
7782 +
7783 +#: builtin/fast-import.c
7784 +#, c-format
7785 +msgid "Git links cannot be specified 'inline': %s"
7786 +msgstr "Git 链接不能指定为 'inline'：%s"
7787 +
7788 +#: builtin/fast-import.c
7789 +#, c-format
7790 +msgid "not a commit (actually a %s): %s"
7791 +msgstr "不是一个提交（实际为 %s）：%s"
7792 +
7793 +#: builtin/fast-import.c
7794 +#, c-format
7795 +msgid "directories cannot be specified 'inline': %s"
7796 +msgstr "目录不能指定为 'inline'：%s"
7797 +
7798 +#: builtin/fast-import.c
7799 +#, c-format
7800 +msgid "%s not found: %s"
7801 +msgstr "未找到%s：%s"
7802 +
7803 +#: builtin/fast-import.c
7804 +msgid "tree"
7805 +msgstr "树"
7806 +
7807 +#: builtin/fast-import.c
7808 +#, c-format
7809 +msgid "not a %s (actually a %s): %s"
7810 +msgstr "不是一个 %s（实际为 %s）：%s"
7811 +
7812 +#: builtin/fast-import.c
7813 +#, c-format
7814 +msgid "path %s not in branch"
7815 +msgstr "路径 %s 不在分支中"
7816 +
7817 +#: builtin/fast-import.c
7818 +msgid "can't add a note on empty branch."
7819 +msgstr "不能在空分支上添加注释。"
7820 +
7821 +#: builtin/fast-import.c
7822 +#, c-format
7823 +msgid "mark :%<PRIuMAX> not a commit"
7824 +msgstr "标记 :%<PRIuMAX> 不是一个提交"
7825 +
7826 +#: builtin/fast-import.c
7827 +#, c-format
7828 +msgid "not a valid commit: %s"
7829 +msgstr "不是一个有效的提交：%s"
7830 +
7831 +#: builtin/fast-import.c
7832 +#, c-format
7833 +msgid "invalid ref name or SHA1 expression: %s"
7834 +msgstr "无效的引用名或 SHA1 表达式：%s"
7835 +
7836 +#: builtin/fast-import.c
7837 +#, c-format
7838 +msgid "not a blob (actually a %s): %s"
7839 +msgstr "不是一个数据对象（实际为 %s）：%s"
7840 +
7841 +#: builtin/fast-import.c
7842 +#, c-format
7843 +msgid "blob not found: %s"
7844 +msgstr "数据对象未找到：%s"
7845 +
7846 +#: builtin/fast-import.c
7847 +#, c-format
7848 +msgid "the commit %s is corrupt"
7849 +msgstr "提交 %s 损坏"
7850 +
7851 +#: builtin/fast-import.c
7852 +#, c-format
7853 +msgid "can't create a branch from itself: %s"
7854 +msgstr "无法从自身创建分支：%s"
7855 +
7856 +#: builtin/fast-import.c
7857 +#, c-format
7858 +msgid ""
7859 +"expected gpgsig format: 'gpgsig <hash-algo> <signature-format>', got 'gpgsig "
7860 +"%s'"
7861 +msgstr "期望的 gpgsig 格式：'gpgsig <哈希算法> <签名格式>'，却得到 'gpgsig %s'"
7862 +
7863 +#: builtin/fast-import.c
7864 +#, c-format
7865 +msgid "unknown git hash algorithm in gpgsig: '%s'"
7866 +msgstr "gpgsig 中未知的 git 哈希算法：'%s'"
7867 +
7868 +#: builtin/fast-import.c
7869 +#, c-format
7870 +msgid "invalid signature format in gpgsig: '%s'"
7871 +msgstr "gpgsig 中无效的签名格式：'%s'"
7872 +
7873 +#: builtin/fast-import.c
7874 +msgid "'unknown' signature format in gpgsig"
7875 +msgstr "gpgsig 中的 'unknown' 签名格式"
7876 +
7877 +#: builtin/fast-import.c
7878 +#, c-format
7879 +msgid "multiple %s signatures found, ignoring additional signature"
7880 +msgstr "发现多个 %s 签名，忽略附加的签名"
7881 +
7882 +#: builtin/fast-import.c
7883 +msgid "parse_one_signature() returned unknown hash algo"
7884 +msgstr "parse_one_signature() 返回了未知的哈希算法"
7885 +
7886 +#: builtin/fast-import.c
7887 +msgid "expected committer but didn't get one"
7888 +msgstr "预期提交者但未获取"
7889 +
7890 +#: builtin/fast-import.c
7891 +msgid "encountered signed commit; use --signed-commits=<mode> to handle it"
7892 +msgstr "遇到已签名提交；使用 --signed-commits=<模式> 来处理它"
7893 +
7894 +#: builtin/fast-import.c
7895 +msgid "stripping a commit signature"
7896 +msgstr "正在剥离提交签名"
7897 +
7898 +#: builtin/fast-import.c
7899 +msgid "importing a commit signature verbatim"
7900 +msgstr "逐字导入提交签名"
7901 +
7902 +#: builtin/fast-import.c
7903 +msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
7904 +msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它"
7905 +
7906 +#: builtin/fast-import.c
7907 +#, c-format
7908 +msgid "importing a tag signature verbatim for tag '%s'"
7909 +msgstr "逐字导入标签 '%s' 的签名"
7910 +
7911 +#: builtin/fast-import.c
7912 +#, c-format
7913 +msgid "stripping a tag signature for tag '%s'"
7914 +msgstr "正在剥离标签 '%s' 的签名"
7915 +
7916 +#: builtin/fast-import.c
7917 +#, c-format
7918 +msgid "expected 'from' command, got '%s'"
7919 +msgstr "预期 'from' 命令，实际：'%s'"
7920 +
7921 +#: builtin/fast-import.c
7922 +msgid "can't tag an empty branch."
7923 +msgstr "无法标记一个空分支。"
7924 +
7925 +#: builtin/fast-import.c builtin/merge.c
7926 +#, c-format
7927 +msgid "not a valid object: %s"
7928 +msgstr "不是一个有效对象：%s"
7929 +
7930 +#: builtin/fast-import.c
7931 +msgid "write to frontend failed"
7932 +msgstr "写入前端失败"
7933 +
7934 +#: builtin/fast-import.c
7935 +#, c-format
7936 +msgid "can't read object %s"
7937 +msgstr "无法读取对象 %s"
7938 +
7939 +#: builtin/fast-import.c
7940 +#, c-format
7941 +msgid "object %s is a %s but a blob was expected."
7942 +msgstr "对象 %s 是一个 %s，但预期是数据对象。"
7943 +
7944 +#: builtin/fast-import.c
7945 +#, c-format
7946 +msgid "not a mark: %s"
7947 +msgstr "不是一个标记：%s"
7948 +
7949 +#: builtin/fast-import.c
7950 +#, c-format
7951 +msgid "unknown mark: %s"
7952 +msgstr "未知标记：%s"
7953 +
7954 +#: builtin/fast-import.c
7955 +#, c-format
7956 +msgid "garbage after SHA1: %s"
7957 +msgstr "SHA1 后面有垃圾内容：%s"
7958 +
7959 +#: builtin/fast-import.c
7960 +#, c-format
7961 +msgid "not a tree-ish: %s"
7962 +msgstr "不是一个树对象：%s"
7963 +
7964 +#: builtin/fast-import.c
7965 +#, c-format
7966 +msgid "can't load object %s"
7967 +msgstr "无法加载对象 %s"
7968 +
7969 +#: builtin/fast-import.c
7970 +#, c-format
7971 +msgid "invalid SHA1 in tag: %s"
7972 +msgstr "标签中无效的 SHA1：%s"
7973 +
7974 +#: builtin/fast-import.c
7975 +#, c-format
7976 +msgid "invalid SHA1 in commit: %s"
7977 +msgstr "提交中无效的 SHA1：%s"
7978 +
7979 +#: builtin/fast-import.c
7980 +#, c-format
7981 +msgid "missing from marks for submodule '%s'"
7982 msgstr "子模组 '%s' 缺少 from 标记"
7983
7984 #: builtin/fast-import.c
7985 #, c-format
7366 -msgid "Missing to marks for submodule '%s'"
7986 +msgid "missing to marks for submodule '%s'"
7987 msgstr "子模组 '%s' 缺少 to 标记"
7988
7989 #: builtin/fast-import.c
7990 #, c-format
7371 -msgid "Expected 'mark' command, got %s"
7372 -msgstr "预期 'mark' 命令，得到 %s"
7991 +msgid "missing space after tree-ish: %s"
7992 +msgstr "树对象后面缺少空格：%s"
7993 +
7994 +#: builtin/fast-import.c
7995 +#, c-format
7996 +msgid "not in a commit: %s"
7997 +msgstr "不在一个提交中：%s"
7998 +
7999 +#: builtin/fast-import.c
8000 +#, c-format
8001 +msgid "expected 'mark' command, got %s"
8002 +msgstr "预期 'mark' 命令，实际：%s"
8003 +
8004 +#: builtin/fast-import.c
8005 +#, c-format
8006 +msgid "expected 'to' command, got %s"
8007 +msgstr "预期 'to' 命令，实际：%s"
8008 +
8009 +#: builtin/fast-import.c
8010 +msgid "only one import-marks command allowed per stream"
8011 +msgstr "每个流只允许一个 import-marks 命令"
8012 +
8013 +#: builtin/fast-import.c
8014 +#, c-format
8015 +msgid "unknown --date-format argument %s"
8016 +msgstr "未知的 --date-format 参数 %s"
8017 +
8018 +#: builtin/fast-import.c
8019 +#, c-format
8020 +msgid "%s: argument must be a non-negative integer"
8021 +msgstr "%s：参数必须为非负整数"
8022
8023 #: builtin/fast-import.c
8024 #, c-format
7376 -msgid "Expected 'to' command, got %s"
7377 -msgstr "预期 'to' 命令，得到 %s"
8025 +msgid "--depth cannot exceed %u"
8026 +msgstr "--depth 不能超过 %u"
8027
8028 #: builtin/fast-import.c
7380 -msgid "Expected format name:filename for submodule rewrite option"
8029 +#, c-format
8030 +msgid "--cat-blob-fd cannot exceed %d"
8031 +msgstr "--cat-blob-fd 不能超过 %d"
8032 +
8033 +#: builtin/fast-import.c
8034 +msgid "expected format name:filename for submodule rewrite option"
8035 msgstr "子模组重写选项的预期格式为 name:filename"
8036
8037 +#: builtin/fast-import.c
8038 +#, c-format
8039 +msgid "max-pack-size is now in bytes, assuming --max-pack-size=%lum"
8040 +msgstr "max-pack-size 现在以字节为单位，假定为 --max-pack-size=%lum"
8041 +
8042 +#: builtin/fast-import.c
8043 +msgid "minimum max-pack-size is 1 MiB"
8044 +msgstr "最小 max-pack-size 为 1 MiB"
8045 +
8046 +#: builtin/fast-import.c
8047 +#, c-format
8048 +msgid "unknown --signed-commits mode '%s'"
8049 +msgstr "未知的 --signed-commits 模式 '%s'"
8050 +
8051 +#: builtin/fast-import.c
8052 +#, c-format
8053 +msgid "unknown --signed-tags mode '%s'"
8054 +msgstr "未知的 --signed-tags 模式 '%s'"
8055 +
8056 #: builtin/fast-import.c
8057 #, c-format
8058 msgid "feature '%s' forbidden in input without --allow-unsafe-features"
8059 msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
8060
8061 +#: builtin/fast-import.c
8062 +#, c-format
8063 +msgid "got feature command '%s' after data command"
8064 +msgstr "在 data 命令后得到 feature 命令 '%s'"
8065 +
8066 +#: builtin/fast-import.c
8067 +#, c-format
8068 +msgid "this version of fast-import does not support feature %s."
8069 +msgstr "此版本的 fast-import 不支持特性 %s。"
8070 +
8071 +#: builtin/fast-import.c
8072 +#, c-format
8073 +msgid "got option command '%s' after data command"
8074 +msgstr "在 data 命令后得到 option 命令 '%s'"
8075 +
8076 +#: builtin/fast-import.c
8077 +#, c-format
8078 +msgid "this version of fast-import does not support option: %s"
8079 +msgstr "此版本的 fast-import 不支持选项：%s"
8080 +
8081 +#: builtin/fast-import.c builtin/merge-recursive.c
8082 +#, c-format
8083 +msgid "unknown option %s"
8084 +msgstr "未知选项 %s"
8085 +
8086 +#: builtin/fast-import.c
8087 +#, c-format
8088 +msgid "unknown option --%s"
8089 +msgstr "未知选项 --%s"
8090 +
8091 +#: builtin/fast-import.c
8092 +#, c-format
8093 +msgid "unsupported command: %s"
8094 +msgstr "不支持的命令：%s"
8095 +
8096 +#: builtin/fast-import.c
8097 +msgid "stream ends early"
8098 +msgstr "流过早结束"
8099 +
8100 #: builtin/fetch-pack.c
8101 #, c-format
8102 msgid "Lockfile created but not reported: %s"
@@ -7551,6 +8263,32 @@ msgstr ""
8263 "运行命令 'git config remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
8264 "以禁用该警告，直到远程将 HEAD 更改为其他内容。"
8265
8266 +#: builtin/fetch.c
8267 +msgid ""
8268 +"You're on a case-insensitive filesystem, and the remote you are\n"
8269 +"trying to fetch from has references that only differ in casing. It\n"
8270 +"is impossible to store such references with the 'files' backend. You\n"
8271 +"can either accept this as-is, in which case you won't be able to\n"
8272 +"store all remote references on disk. Or you can alternatively\n"
8273 +"migrate your repository to use the 'reftable' backend with the\n"
8274 +"following command:\n"
8275 +"\n"
8276 +" git refs migrate --ref-format=reftable\n"
8277 +"\n"
8278 +"Please keep in mind that not all implementations of Git support this\n"
8279 +"new format yet. So if you use tools other than Git to access this\n"
8280 +"repository it may not be an option to migrate to reftables.\n"
8281 +msgstr ""
8282 +"您处于不区分大小写的文件系统中，而您正在尝试获取的远程仓库具有仅在\n"
8283 +"大小写上不同的引用。使用 'files' 后端无法存储此类引用。您可以接受\n"
8284 +"这种情况，但这意味着您无法在磁盘上存储所有远程引用。或者，您也可以\n"
8285 +"使用以下命令将仓库迁移到使用 'reftable' 后端：\n"
8286 +"\n"
8287 +" git refs migrate --ref-format=reftable\n"
8288 +"\n"
8289 +"请注意，并非所有 Git 实现都支持这种新格式。因此，如果您使用 Git\n"
8290 +"以外的工具访问此仓库，迁移到 reftables 可能不是一个可选项。\n"
8291 +
8292 #: builtin/fetch.c
8293 #, c-format
8294 msgid ""
@@ -7804,8 +8542,8 @@ msgstr "协议不支持 --negotiate-only，退出"
8542
8543 #: builtin/fetch.c
8544 msgid ""
7807 -"--filter can only be used with the remote configured in extensions."
7808 -"partialclone"
8545 +"--filter can only be used with the remote configured in "
8546 +"extensions.partialclone"
8547 msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库"
8548
8549 #: builtin/fetch.c
@@ -7837,33 +8575,13 @@ msgstr "文本"
8575 msgid "use <text> as start of message"
8576 msgstr "使用 <文本> 作为提交说明的开始"
8577
7840 -#: builtin/fmt-merge-msg.c
7841 -msgid "use <name> instead of the real target branch"
7842 -msgstr "使用 <名称> 而不是真正的目标分支"
7843 -
7844 -#: builtin/fmt-merge-msg.c
7845 -msgid "file to read from"
7846 -msgstr "从文件中读取"
7847 -
7848 -#: builtin/for-each-ref.c
7849 -msgid "git for-each-ref [<options>] [<pattern>]"
7850 -msgstr "git for-each-ref [<选项>] [<模式>]"
7851 -
7852 -#: builtin/for-each-ref.c
7853 -msgid "git for-each-ref [--points-at <object>]"
7854 -msgstr "git for-each-ref [--points-at <对象>]"
7855 -
7856 -#: builtin/for-each-ref.c
7857 -msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
7858 -msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]"
7859 -
7860 -#: builtin/for-each-ref.c
7861 -msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
7862 -msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]"
8578 +#: builtin/fmt-merge-msg.c
8579 +msgid "use <name> instead of the real target branch"
8580 +msgstr "使用 <名称> 而不是真正的目标分支"
8581
7864 -#: builtin/for-each-ref.c
7865 -msgid "git for-each-ref [--start-after <marker>]"
7866 -msgstr "git for-each-ref [--start-after <标记>]"
8582 +#: builtin/fmt-merge-msg.c
8583 +msgid "file to read from"
8584 +msgstr "从文件中读取"
8585
8586 #: builtin/for-each-ref.c
8587 msgid "quote placeholders suitably for shells"
@@ -7937,6 +8655,10 @@ msgstr "为 --stdin 提供了未知的命令参数"
8655 msgid "cannot use --start-after with patterns"
8656 msgstr "不能将 --start-after 与模式匹配一同使用"
8657
8658 +#: builtin/for-each-ref.c
8659 +msgid "git for-each-ref "
8660 +msgstr "git for-each-ref "
8661 +
8662 #: builtin/for-each-repo.c
8663 msgid "git for-each-repo --config=<config> [--] <arguments>"
8664 msgstr "git for-each-repo --config=<配置> [--] <命令参数>"
@@ -8226,7 +8948,7 @@ msgstr "启用更严格的检查"
8948 msgid "write dangling objects in .git/lost-found"
8949 msgstr "将悬空对象写入 .git/lost-found 中"
8950
8229 -#: builtin/fsck.c builtin/prune.c
8951 +#: builtin/fsck.c builtin/prune.c builtin/repo.c
8952 msgid "show progress"
8953 msgstr "显示进度"
8954
@@ -8527,6 +9249,10 @@ msgid ""
9249 "skipping incremental-repack task because core.multiPackIndex is disabled"
9250 msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
9251
9252 +#: builtin/gc.c
9253 +msgid "failed to perform geometric repack"
9254 +msgstr "无法执行几何打包"
9255 +
9256 #: builtin/gc.c
9257 #, c-format
9258 msgid "task '%s' failed"
@@ -8537,6 +9263,11 @@ msgstr "任务 '%s' 失败"
9263 msgid "lock file '%s' exists, skipping maintenance"
9264 msgstr "锁文件 '%s' 已存在，跳过维护"
9265
9266 +#: builtin/gc.c
9267 +#, c-format
9268 +msgid "unknown maintenance strategy: '%s'"
9269 +msgstr "未知的维护策略：'%s'"
9270 +
9271 #: builtin/gc.c
9272 #, c-format
9273 msgid "'%s' is not a valid task"
@@ -9627,6 +10358,34 @@ msgstr "--trailer 和 --only-input 同时使用没有意义"
10358 msgid "no input file given for in-place editing"
10359 msgstr "没有给出要原位编辑的文件"
10360
10361 +#: builtin/last-modified.c
10362 +msgid "last-modified can only operate on one tree at a time"
10363 +msgstr "last-modified 一次只能在一个树对象上操作"
10364 +
10365 +#: builtin/last-modified.c
10366 +#, c-format
10367 +msgid "unknown last-modified argument: %s"
10368 +msgstr "未知的 last-modified 参数：%s"
10369 +
10370 +#: builtin/last-modified.c
10371 +msgid "unable to setup last-modified"
10372 +msgstr "无法设置 last-modified"
10373 +
10374 +#: builtin/last-modified.c
10375 +msgid ""
10376 +"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "
10377 +"<path>...]"
10378 +msgstr ""
10379 +"git last-modified [--recursive] [--show-trees] [<版本范围>] [[--] <路径>...]"
10380 +
10381 +#: builtin/last-modified.c builtin/ls-tree.c
10382 +msgid "recurse into subtrees"
10383 +msgstr "递归到子树"
10384 +
10385 +#: builtin/last-modified.c
10386 +msgid "show tree entries when recursing into subtrees"
10387 +msgstr "递归进入子目录时，显示树的条目"
10388 +
10389 #: builtin/log.c
10390 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
10391 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
@@ -9674,6 +10433,22 @@ msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数
10433 msgid "-L<range>:<file> cannot be used with pathspec"
10434 msgstr "-L<范围>:<文件> 不能和路径表达式共用"
10435
10436 +#: builtin/log.c
10437 +msgid ""
10438 +"\n"
10439 +"hint: You can replace 'git whatchanged <opts>' with:\n"
10440 +"hint:\tgit log <opts> --raw --no-merges\n"
10441 +"hint: Or make an alias:\n"
10442 +"hint:\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
10443 +"\n"
10444 +msgstr ""
10445 +"\n"
10446 +"提示：您可以将 'git whatchanged <选项>' 替换为：\n"
10447 +"提示：\tgit log <选项> --raw --no-merges\n"
10448 +"提示：或者创建一个别名：\n"
10449 +"提示：\tgit config set --global alias.whatchanged 'log --raw --no-merges'\n"
10450 +"\n"
10451 +
10452 #: builtin/log.c
10453 #, c-format
10454 msgid "git show %s: bad file"
@@ -10236,10 +11011,6 @@ msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
11011 msgid "only show trees"
11012 msgstr "只显示树"
11013
10239 -#: builtin/ls-tree.c
10240 -msgid "recurse into subtrees"
10241 -msgstr "递归到子树"
10242 -
11014 #: builtin/ls-tree.c
11015 msgid "show trees when recursing"
11016 msgstr "当递归时显示树"
@@ -10431,11 +11202,6 @@ msgstr "对象 '%s' 不存在"
11202 msgid "Could not write object file"
11203 msgstr "不能写入对象文件"
11204
10434 -#: builtin/merge-recursive.c
10435 -#, c-format
10436 -msgid "unknown option %s"
10437 -msgstr "未知选项 %s"
10438 -
11205 #: builtin/merge-recursive.c
11206 #, c-format
11207 msgid "could not parse object '%s'"
@@ -10655,11 +11421,6 @@ msgstr "不能运行贮藏。"
11421 msgid "stash failed"
11422 msgstr "贮藏失败"
11423
10658 -#: builtin/merge.c
10659 -#, c-format
10660 -msgid "not a valid object: %s"
10661 -msgstr "不是一个有效对象：%s"
10662 -
11424 #: builtin/merge.c
11425 msgid "read-tree failed"
11426 msgstr "读取树失败"
@@ -11108,7 +11869,7 @@ msgstr "不能同时移动 '%s' 及其父目录 '%s'"
11869 msgid "Renaming %s to %s\n"
11870 msgstr "重命名 %s 至 %s\n"
11871
11111 -#: builtin/mv.c builtin/remote.c
11872 +#: builtin/mv.c
11873 #, c-format
11874 msgid "renaming '%s' failed"
11875 msgstr "重命名 '%s' 失败"
@@ -11660,7 +12421,7 @@ msgstr "%s 压缩中 delta 基准偏移越界"
12421 msgid "delta base offset out of bound for %s"
12422 msgstr "%s 的 delta 基准偏移越界"
12423
11663 -#: builtin/pack-objects.c
12424 +#: builtin/pack-objects.c builtin/repo.c
12425 msgid "Counting objects"
12426 msgstr "对象计数中"
12427
@@ -12070,32 +12831,8 @@ msgstr ""
12831 "%<PRIu32>（来自 %<PRIuMAX> 个包）"
12832
12833 #: builtin/pack-refs.c
12073 -msgid ""
12074 -"git pack-refs [--all] [--no-prune] [--auto] [--include <pattern>] [--exclude "
12075 -"<pattern>]"
12076 -msgstr ""
12077 -"git pack-refs [--all] [--no-prune] [--auto] [--include <模式>] [--exclude <模"
12078 -"式>]"
12079 -
12080 -#: builtin/pack-refs.c
12081 -msgid "pack everything"
12082 -msgstr "打包一切"
12083 -
12084 -#: builtin/pack-refs.c
12085 -msgid "prune loose refs (default)"
12086 -msgstr "清除松散的引用（默认）"
12087 -
12088 -#: builtin/pack-refs.c
12089 -msgid "auto-pack refs as needed"
12090 -msgstr "按需对引用自动打包"
12091 -
12092 -#: builtin/pack-refs.c
12093 -msgid "references to include"
12094 -msgstr "需包含的引用"
12095 -
12096 -#: builtin/pack-refs.c
12097 -msgid "references to exclude"
12098 -msgstr "需排除的引用"
12834 +msgid "git pack-refs "
12835 +msgstr "git pack-refs "
12836
12837 #: builtin/patch-id.c
12838 msgid "git patch-id [--stable | --unstable | --verbatim]"
@@ -12426,8 +13163,8 @@ msgid ""
13163 "upstream, see 'push.autoSetupRemote' in 'git help config'.\n"
13164 msgstr ""
13165 "\n"
12429 -"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 'push."
12430 -"autoSetupRemote'。\n"
13166 +"为了让没有追踪上游的分支自动配置，参见 'git help config' 中的 "
13167 +"'push.autoSetupRemote'。\n"
13168
13169 #: builtin/push.c
13170 #, c-format
@@ -12671,6 +13408,11 @@ msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
13408 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
13409 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
13410
13411 +#: builtin/range-diff.c
13412 +#, c-format
13413 +msgid "invalid max-memory value: %s"
13414 +msgstr "无效的 max-memory 值：%s"
13415 +
13416 #: builtin/range-diff.c
13417 msgid "use simple diff colors"
13418 msgstr "使用简单差异颜色"
@@ -12683,6 +13425,14 @@ msgstr "注解"
13425 msgid "passed to 'git log'"
13426 msgstr "传递给 'git log'"
13427
13428 +#: builtin/range-diff.c
13429 +msgid "size"
13430 +msgstr "大小"
13431 +
13432 +#: builtin/range-diff.c
13433 +msgid "maximum memory for cost matrix (default 4G)"
13434 +msgstr "成本矩阵的最大内存（默认 4G）"
13435 +
13436 #: builtin/range-diff.c
13437 msgid "only emit output related to the first range"
13438 msgstr "仅显示与第一个范围有关的输出"
@@ -12893,8 +13643,8 @@ msgstr "--empty=ask 已弃用；请使用 '--empty=stop'。"
13643 #: builtin/rebase.c
13644 #, c-format
13645 msgid ""
12896 -"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"stop"
12897 -"\"."
13646 +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and "
13647 +"\"stop\"."
13648 msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"stop\"。"
13649
13650 #: builtin/rebase.c
@@ -13340,16 +14090,12 @@ msgid "git reflog list"
14090 msgstr "git reflog list"
14091
14092 #: builtin/reflog.c
13343 -msgid ""
13344 -"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
13345 -" [--rewrite] [--updateref] [--stale-fix]\n"
13346 -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
13347 -"<refs>...]"
13348 -msgstr ""
13349 -"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>]\n"
13350 -" [--rewrite] [--updateref] [--stale-fix]\n"
13351 -" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <"
13352 -"引用>...]"
14093 +msgid "git reflog exists <ref>"
14094 +msgstr "git reflog exists <引用>"
14095 +
14096 +#: builtin/reflog.c
14097 +msgid "git reflog write <ref> <old-oid> <new-oid> <message>"
14098 +msgstr "git reflog write <引用> <旧oid> <新oid> <消息>"
14099
14100 #: builtin/reflog.c
14101 msgid ""
@@ -13359,14 +14105,22 @@ msgstr ""
14105 "git reflog delete [--rewrite] [--updateref]\n"
14106 " [--dry-run | -n] [--verbose] <引用>@{<指定符>}..."
14107
13362 -#: builtin/reflog.c
13363 -msgid "git reflog exists <ref>"
13364 -msgstr "git reflog exists <引用>"
13365 -
14108 #: builtin/reflog.c
14109 msgid "git reflog drop [--all [--single-worktree] | <refs>...]"
14110 msgstr "git reflog drop [--all [--single-worktree] | <引用>...]"
14111
14112 +#: builtin/reflog.c
14113 +msgid ""
14114 +"git reflog expire [--expire=<time>] [--expire-unreachable=<time>]\n"
14115 +" [--rewrite] [--updateref] [--stale-fix]\n"
14116 +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | "
14117 +"<refs>...]"
14118 +msgstr ""
14119 +"git reflog expire [--expire=<时间>] [--expire-unreachable=<时间>]\n"
14120 +" [--rewrite] [--updateref] [--stale-fix]\n"
14121 +" [--dry-run | -n] [--verbose] [--all [--single-worktree] | <"
14122 +"引用>...]"
14123 +
14124 #: builtin/reflog.c
14125 #, c-format
14126 msgid "invalid timestamp '%s' given to '--%s'"
@@ -13418,7 +14172,7 @@ msgstr "处理所有引用的引用日志"
14172
14173 #: builtin/reflog.c
14174 msgid "limits processing to reflogs from the current worktree only"
13421 -msgstr "仅处理当前工作树的引用日志"
14175 +msgstr "仅处理当前工作区的引用日志"
14176
14177 #: builtin/reflog.c
14178 #, c-format
@@ -13451,6 +14205,46 @@ msgstr "仅从当前工作区中丢弃引用日志"
14205 msgid "references specified along with --all"
14206 msgstr "--all 选项不能与具体引用同时使用"
14207
14208 +#: builtin/reflog.c
14209 +#, c-format
14210 +msgid "invalid reference name: %s"
14211 +msgstr "无效引用名称：%s"
14212 +
14213 +#: builtin/reflog.c
14214 +#, c-format
14215 +msgid "invalid old object ID: '%s'"
14216 +msgstr "无效对象 ID：%s"
14217 +
14218 +#: builtin/reflog.c
14219 +#, c-format
14220 +msgid "old object '%s' does not exist"
14221 +msgstr "旧对象 '%s' 不存在"
14222 +
14223 +#: builtin/reflog.c
14224 +#, c-format
14225 +msgid "invalid new object ID: '%s'"
14226 +msgstr "无效的新对象 ID：'%s'"
14227 +
14228 +#: builtin/reflog.c
14229 +#, c-format
14230 +msgid "new object '%s' does not exist"
14231 +msgstr "新对象 '%s' 不存在"
14232 +
14233 +#: builtin/reflog.c
14234 +#, c-format
14235 +msgid "cannot start transaction: %s"
14236 +msgstr "不能启动事务：%s"
14237 +
14238 +#: builtin/reflog.c
14239 +#, c-format
14240 +msgid "cannot queue reflog update: %s"
14241 +msgstr "无法将引用日志更新加入队列：%s"
14242 +
14243 +#: builtin/reflog.c
14244 +#, c-format
14245 +msgid "cannot commit reflog update: %s"
14246 +msgstr "无法提交引用日志更新：%s"
14247 +
14248 #: builtin/refs.c
14249 msgid "git refs migrate --ref-format=<format> [--no-reflog] [--dry-run]"
14250 msgstr "git refs migrate --ref-format=<格式> [--no-reflog] [--dry-run]"
@@ -13459,6 +14253,14 @@ msgstr "git refs migrate --ref-format=<格式> [--no-reflog] [--dry-run]"
14253 msgid "git refs verify [--strict] [--verbose]"
14254 msgstr "git refs verify [--strict] [--verbose]"
14255
14256 +#: builtin/refs.c
14257 +msgid "git refs exists <ref>"
14258 +msgstr "git reflog exists <引用>"
14259 +
14260 +#: builtin/refs.c
14261 +msgid "git refs optimize "
14262 +msgstr "git refs optimize "
14263 +
14264 #: builtin/refs.c
14265 msgid "specify the reference format to convert to"
14266 msgstr "指定要转换的引用格式"
@@ -13488,6 +14290,22 @@ msgstr "启用严格的检查"
14290 msgid "'git refs verify' takes no arguments"
14291 msgstr "'git refs verify' 不接受任何参数"
14292
14293 +#: builtin/refs.c
14294 +msgid "git refs list "
14295 +msgstr "git reflog list"
14296 +
14297 +#: builtin/refs.c
14298 +msgid "'git refs exists' requires a reference"
14299 +msgstr "'git refs exists' 需要一个引用"
14300 +
14301 +#: builtin/refs.c builtin/show-ref.c
14302 +msgid "reference does not exist"
14303 +msgstr "引用不存在"
14304 +
14305 +#: builtin/refs.c builtin/show-ref.c
14306 +msgid "failed to look up reference"
14307 +msgstr "无法找到引用"
14308 +
14309 #: builtin/remote.c
14310 msgid ""
14311 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
@@ -13682,6 +14500,22 @@ msgstr ""
14500 "\t%s:%d\n"
14501 "现在在为不存在的远程名 '%s' 命名"
14502
14503 +#: builtin/remote.c
14504 +msgid ""
14505 +"The remote you are trying to rename has conflicting references in the\n"
14506 +"new target refspec. This is most likely caused by you trying to nest\n"
14507 +"a remote into itself, e.g. by renaming 'parent' into 'parent/child'\n"
14508 +"or by unnesting a remote, e.g. the other way round.\n"
14509 +"\n"
14510 +"If that is the case, you can address this by first renaming the\n"
14511 +"remote to a different name.\n"
14512 +msgstr ""
14513 +"您尝试重命名的远程仓库在新目标引用规格中存在冲突的引用。这很可能\n"
14514 +"是由于您尝试将远程仓库嵌套到自身，例如将 'parent' 重命名为 'parent/child'，\n"
14515 +"或者取消嵌套远程仓库（反向操作）。\n"
14516 +"\n"
14517 +"如果是这种情况，您可以先将远程仓库重命名为不同的名称来解决此问题。\n"
14518 +
14519 #: builtin/remote.c
14520 #, c-format
14521 msgid "No such remote: '%s'"
@@ -13692,6 +14526,15 @@ msgstr "没有此远程仓库：'%s'"
14526 msgid "Could not rename config section '%s' to '%s'"
14527 msgstr "不能重命名配置小节 '%s' 到 '%s'"
14528
14529 +#: builtin/remote.c
14530 +msgid "Renaming remote references"
14531 +msgstr "重命名远程引用中"
14532 +
14533 +#: builtin/remote.c
14534 +#, c-format
14535 +msgid "queueing remote ref renames failed: %s"
14536 +msgstr "无法将远程引用重命名操作加入队列：%s"
14537 +
14538 #: builtin/remote.c
14539 #, c-format
14540 msgid ""
@@ -13703,19 +14546,10 @@ msgstr ""
14546 "\t%s\n"
14547 "\t如果必要请手动更新配置。"
14548
13706 -#: builtin/remote.c
13707 -msgid "Renaming remote references"
13708 -msgstr "正在重命名远程引用"
13709 -
13710 -#: builtin/remote.c
13711 -#, c-format
13712 -msgid "deleting '%s' failed"
13713 -msgstr "删除 '%s' 失败"
13714 -
14549 #: builtin/remote.c
14550 #, c-format
13717 -msgid "creating '%s' failed"
13718 -msgstr "创建 '%s' 失败"
14551 +msgid "renaming remote refs failed: %s"
14552 +msgstr "重命名远程引用失败：%s"
14553
14554 #: builtin/remote.c
14555 msgid ""
@@ -14058,56 +14892,6 @@ msgstr ""
14892 "增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
14893 "或禁用 pack.writeBitmaps 配置。"
14894
14061 -#: builtin/repack.c
14062 -msgid "could not start pack-objects to repack promisor objects"
14063 -msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
14064 -
14065 -#: builtin/repack.c
14066 -msgid "failed to feed promisor objects to pack-objects"
14067 -msgstr "无法将承诺者对象提供给 pack-objects"
14068 -
14069 -#: builtin/repack.c
14070 -msgid "repack: Expecting full hex object ID lines only from pack-objects."
14071 -msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
14072 -
14073 -#: builtin/repack.c
14074 -msgid "could not finish pack-objects to repack promisor objects"
14075 -msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
14076 -
14077 -#: builtin/repack.c
14078 -#, c-format
14079 -msgid "cannot open index for %s"
14080 -msgstr "不能打开 %s 的索引"
14081 -
14082 -#: builtin/repack.c
14083 -#, c-format
14084 -msgid "pack %s too large to consider in geometric progression"
14085 -msgstr "包 %s 太大，不在几何级数中考虑"
14086 -
14087 -#: builtin/repack.c
14088 -#, c-format
14089 -msgid "pack %s too large to roll up"
14090 -msgstr "包 %s 太大导致数字溢出"
14091 -
14092 -#: builtin/repack.c
14093 -#, c-format
14094 -msgid "could not open tempfile %s for writing"
14095 -msgstr "无法打开临时文件 %s 进行写入"
14096 -
14097 -#: builtin/repack.c
14098 -msgid "could not close refs snapshot tempfile"
14099 -msgstr "不能关闭引用快照临时文件"
14100 -
14101 -#: builtin/repack.c
14102 -#, c-format
14103 -msgid "could not remove stale bitmap: %s"
14104 -msgstr "无法删除过期的位图： %s"
14105 -
14106 -#: builtin/repack.c
14107 -#, c-format
14108 -msgid "pack prefix %s does not begin with objdir %s"
14109 -msgstr "包前缀 %s 没有以对象目录 %s 开始"
14110 -
14895 #: builtin/repack.c
14896 msgid "pack everything in a single pack"
14897 msgstr "所有内容打包到一个包文件中"
@@ -14234,21 +15018,6 @@ msgstr "选项 '%s' 只能和 '%s' 搭配使用"
15018 msgid "Nothing new to pack."
15019 msgstr "没有新的要打包。"
15020
14237 -#: builtin/repack.c
14238 -#, c-format
14239 -msgid "renaming pack to '%s' failed"
14240 -msgstr "重命名包至 '%s' 失败"
14241 -
14242 -#: builtin/repack.c
14243 -#, c-format
14244 -msgid "pack-objects did not write a '%s' file for pack %s-%s"
14245 -msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件"
14246 -
14247 -#: builtin/repack.c sequencer.c
14248 -#, c-format
14249 -msgid "could not unlink: %s"
14250 -msgstr "不能删除：%s"
14251 -
15021 #: builtin/replace.c
15022 msgid "git replace [-f] <object> <replacement>"
15023 msgstr "git replace [-f] <对象> <替换物>"
@@ -14550,17 +15319,91 @@ msgid ""
15319 msgstr ""
15320 "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
15321
14553 -#: builtin/replay.c
14554 -msgid "error preparing revisions"
14555 -msgstr "准备版本时错误"
15322 +#: builtin/replay.c
15323 +msgid "error preparing revisions"
15324 +msgstr "准备版本时错误"
15325 +
15326 +#: builtin/replay.c
15327 +msgid "replaying down to root commit is not supported yet!"
15328 +msgstr "目前还不支持重放到根提交！"
15329 +
15330 +#: builtin/replay.c
15331 +msgid "replaying merge commits is not supported yet!"
15332 +msgstr "目前还不支持重放到合并提交！"
15333 +
15334 +#: builtin/repo.c
15335 +#, c-format
15336 +msgid "key '%s' not found"
15337 +msgstr "未找到键 '%s'"
15338 +
15339 +#: builtin/repo.c
15340 +#, c-format
15341 +msgid "invalid format '%s'"
15342 +msgstr "无效格式 '%s'"
15343 +
15344 +#: builtin/repo.c
15345 +msgid "output format"
15346 +msgstr "输出格式"
15347 +
15348 +#: builtin/repo.c
15349 +msgid "synonym for --format=nul"
15350 +msgstr "和 --format=nul 同义"
15351 +
15352 +#: builtin/repo.c
15353 +msgid "unsupported output format"
15354 +msgstr "不支持的输出格式"
15355 +
15356 +#: builtin/repo.c
15357 +msgid "References"
15358 +msgstr "引用"
15359 +
15360 +#: builtin/repo.c
15361 +msgid "Count"
15362 +msgstr "计数"
15363 +
15364 +#: builtin/repo.c
15365 +msgid "Branches"
15366 +msgstr "分支"
15367 +
15368 +#: builtin/repo.c
15369 +msgid "Tags"
15370 +msgstr "标签"
15371 +
15372 +#: builtin/repo.c
15373 +msgid "Remotes"
15374 +msgstr "远程"
15375 +
15376 +#: builtin/repo.c
15377 +msgid "Others"
15378 +msgstr "其它"
15379 +
15380 +#: builtin/repo.c
15381 +msgid "Reachable objects"
15382 +msgstr "可达的对象"
15383
14557 -#: builtin/replay.c
14558 -msgid "replaying down to root commit is not supported yet!"
14559 -msgstr "目前还不支持重放到根提交！"
15384 +#: builtin/repo.c
15385 +msgid "Commits"
15386 +msgstr "提交"
15387
14561 -#: builtin/replay.c
14562 -msgid "replaying merge commits is not supported yet!"
14563 -msgstr "目前还不支持重放到合并提交！"
15388 +#: builtin/repo.c
15389 +msgid "Trees"
15390 +msgstr "树"
15391 +
15392 +#: builtin/repo.c
15393 +msgid "Blobs"
15394 +msgstr "数据对象"
15395 +
15396 +#: builtin/repo.c
15397 +msgid "Repository structure"
15398 +msgstr "仓库结构"
15399 +
15400 +#: builtin/repo.c
15401 +msgid "Value"
15402 +msgstr "值"
15403 +
15404 +#: builtin/repo.c
15405 +msgid "Counting references"
15406 +msgstr "正在引用计数"
15407
15408 #: builtin/rerere.c
15409 msgid ""
@@ -15293,14 +16136,6 @@ msgstr "git show-ref --exclude-existing[=<模式>]"
16136 msgid "git show-ref --exists <ref>"
16137 msgstr "git show-ref --exists <引用>"
16138
15296 -#: builtin/show-ref.c
15297 -msgid "reference does not exist"
15298 -msgstr "引用不存在"
15299 -
15300 -#: builtin/show-ref.c
15301 -msgid "failed to look up reference"
15302 -msgstr "无法找到引用"
15303 -
16139 #: builtin/show-ref.c
16140 msgid "only show tags (can be combined with --branches)"
16141 msgstr "仅显示标签（可与 --branches 组合使用）"
@@ -15340,10 +16175,10 @@ msgstr "显示从标准输入中读入的不在本地仓库中的引用"
16175 #: builtin/sparse-checkout.c
16176 msgid ""
16177 "git sparse-checkout (init | list | set | add | reapply | disable | check-"
15343 -"rules) [<options>]"
16178 +"rules | clean) [<options>]"
16179 msgstr ""
16180 "git sparse-checkout (init | list | set | add | reapply | disable | check\n"
15346 -"-rules) [<选项>]"
16181 +"-rules | clean) [<选项>]"
16182
16183 #: builtin/sparse-checkout.c
16184 msgid "this worktree is not sparse"
@@ -15376,7 +16211,7 @@ msgstr "不能 fdopen %s"
16211
16212 #: builtin/sparse-checkout.c
16213 msgid "failed to initialize worktree config"
15379 -msgstr "无法初始化工作树配置"
16214 +msgstr "无法初始化工作区配置"
16215
16216 #: builtin/sparse-checkout.c
16217 msgid "failed to modify sparse-index config"
@@ -15390,11 +16225,6 @@ msgstr "初始化稀疏检出为锥形模式"
16225 msgid "toggle the use of a sparse index"
16226 msgstr "切换稀疏索引的使用"
16227
15393 -#: builtin/sparse-checkout.c commit-graph.c midx-write.c sequencer.c
15394 -#, c-format
15395 -msgid "unable to create leading directories of %s"
15396 -msgstr "不能为 %s 创建先导目录"
15397 -
16228 #: builtin/sparse-checkout.c
16229 #, c-format
16230 msgid "failed to open '%s'"
@@ -15484,6 +16314,37 @@ msgstr ""
16314 msgid "must be in a sparse-checkout to reapply sparsity patterns"
16315 msgstr "必须在稀疏检出中重应用稀疏模式"
16316
16317 +#: builtin/sparse-checkout.c
16318 +msgid "report each affected file, not just directories"
16319 +msgstr "报告每个受影响的文件，而不仅是目录"
16320 +
16321 +#: builtin/sparse-checkout.c
16322 +msgid "must be in a sparse-checkout to clean directories"
16323 +msgstr "必须在稀疏检出中才能清理目录"
16324 +
16325 +#: builtin/sparse-checkout.c
16326 +msgid "must be in a cone-mode sparse-checkout to clean directories"
16327 +msgstr "必须在锥形模式的稀疏检出中才能清理目录"
16328 +
16329 +#: builtin/sparse-checkout.c
16330 +msgid "for safety, refusing to clean without one of --force or --dry-run"
16331 +msgstr "为了安全，在没有 --force 或 --dry-run 选项的情况下拒绝执行清理"
16332 +
16333 +#: builtin/sparse-checkout.c
16334 +msgid "failed to read index"
16335 +msgstr "无法读取索引"
16336 +
16337 +#: builtin/sparse-checkout.c
16338 +msgid ""
16339 +"failed to convert index to a sparse index; resolve merge conflicts and try "
16340 +"again"
16341 +msgstr "无法将索引转换为稀疏索引；解决合并冲突后重试"
16342 +
16343 +#: builtin/sparse-checkout.c
16344 +#, c-format
16345 +msgid "failed to remove '%s'"
16346 +msgstr "无法删除 %s"
16347 +
16348 #: builtin/sparse-checkout.c
16349 msgid "error while refreshing working directory"
16350 msgstr "刷新工作目录时出错"
@@ -17295,7 +18156,7 @@ msgstr "无法将 '%s' 复制至 '%s'；稀疏检出可能无法正确工作"
18156 #: builtin/worktree.c
18157 #, c-format
18158 msgid "failed to copy worktree config from '%s' to '%s'"
17298 -msgstr "无法把工作树配置从 '%s' 拷贝到 '%s'"
18159 +msgstr "无法把工作区配置从 '%s' 拷贝到 '%s'"
18160
18161 #: builtin/worktree.c
18162 #, c-format
@@ -17314,7 +18175,7 @@ msgstr "初始化"
18175 #: builtin/worktree.c
18176 #, c-format
18177 msgid "could not find created worktree '%s'"
17317 -msgstr "无法找到已创建的工作树 '%s'"
18178 +msgstr "无法找到已创建的工作区 '%s'"
18179
18180 #: builtin/worktree.c
18181 #, c-format
@@ -17561,10 +18422,6 @@ msgstr "将 <前缀> 子目录内容写到一个树对象"
18422 msgid "only useful for debugging"
18423 msgstr "只对调试有用"
18424
17564 -#: bulk-checkin.c
17565 -msgid "core.fsyncMethod = batch is unsupported on this platform"
17566 -msgstr "core.fsyncMethod = batch 不支持本平台"
17567 -
18425 #: bundle-uri.c
18426 #, c-format
18427 msgid "could not parse bundle list key %s with value '%s'"
@@ -18068,6 +18925,10 @@ msgstr "在 gitweb 中即时浏览您的工作仓库"
18925 msgid "Add or parse structured information in commit messages"
18926 msgstr "添加或解析提交说明中的结构化信息"
18927
18928 +#: command-list.h
18929 +msgid "EXPERIMENTAL: Show when files were last modified"
18930 +msgstr "实验性功能：显示文件最后修改的时间"
18931 +
18932 #: command-list.h
18933 msgid "Show commit logs"
18934 msgstr "显示提交日志"
@@ -18118,7 +18979,7 @@ msgstr "与 git-merge-index 一起使用的标准向导程序"
18979
18980 #: command-list.h
18981 msgid "Perform merge without touching index or working tree"
18121 -msgstr "在不触碰索引或工作树情况下应用合并"
18982 +msgstr "在不触碰索引或工作区情况下应用合并"
18983
18984 #: command-list.h
18985 msgid "Run merge conflict resolution tools to resolve merge conflicts"
@@ -18229,6 +19090,10 @@ msgstr "创建、列出、删除对象替换引用"
19090 msgid "EXPERIMENTAL: Replay commits on a new base, works with bare repos too"
19091 msgstr "试验中：基于一个新基线重放提交，同样适用于纯仓库"
19092
19093 +#: command-list.h
19094 +msgid "Retrieve information about the repository"
19095 +msgstr "检索仓库信息"
19096 +
19097 #: command-list.h
19098 msgid "Generates a summary of pending changes"
19099 msgstr "生成待定更改的摘要"
@@ -18304,7 +19169,7 @@ msgstr "显示本地仓库中的引用"
19169 # 译者：中文字符串拼接，可删除前导空格
19170 #: command-list.h
19171 msgid "Reduce your working tree to a subset of tracked files"
18307 -msgstr "将您的工作树缩减至已追踪文件的子集"
19172 +msgstr "将您的工作区缩减至已追踪文件的子集"
19173
19174 #: command-list.h
19175 msgid "Add file contents to the staging area"
@@ -18339,8 +19204,8 @@ msgid "Read, modify and delete symbolic refs"
19204 msgstr "读取、修改和删除符号引用"
19205
19206 #: command-list.h
18342 -msgid "Create, list, delete or verify a tag object signed with GPG"
18343 -msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
19207 +msgid "Create, list, delete or verify tags"
19208 +msgstr "创建、列出、删除或校验标签"
19209
19210 #: command-list.h
19211 msgid "Creates a temporary file with a blob's contents"
@@ -18755,8 +19620,7 @@ msgstr "无法重命名临时提交图文件"
19620 #: commit-graph.c
19621 #, c-format
19622 msgid "cannot merge graphs with %<PRIuMAX>, %<PRIuMAX> commits"
18758 -msgstr ""
18759 -"无法合并提交图，总共已累加提交数：%<PRIuMAX>，当前待累加提交数：%<PRIuMAX>"
19623 +msgstr "无法合并提交图，其提交数分别为 %<PRIuMAX> 和 %<PRIuMAX>"
19624
19625 #: commit-graph.c
19626 #, c-format
@@ -18778,8 +19642,8 @@ msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
19642 #: commit-graph.c
19643 #, c-format
19644 msgid ""
18781 -"attempting to write a commit-graph, but 'commitGraph."
18782 -"changedPathsVersion' (%d) is not supported"
19645 +"attempting to write a commit-graph, but 'commitGraph.changedPathsVersion' "
19646 +"(%d) is not supported"
19647 msgstr "尝试写入提交图，但不支持 'commitGraph.changedPathsVersion' (%d)"
19648
19649 #: commit-graph.c
@@ -19202,8 +20066,8 @@ msgid ""
20066 "remote URLs cannot be configured in file directly or indirectly included by "
20067 "includeIf.hasconfig:remote.*.url"
20068 msgstr ""
19205 -"远程 URL 不能在文件中配置，不管直接地还是通过 includeIf.hasconfig:remote.*."
19206 -"url 间接地包含"
20069 +"远程 URL 不能在文件中配置，不管直接地还是通过 "
20070 +"includeIf.hasconfig:remote.*.url 间接地包含"
20071
20072 #: config.c
20073 #, c-format
@@ -19381,6 +20245,48 @@ msgstr "不能解析配置对象 '%s'"
20245 msgid "unable to parse command-line config"
20246 msgstr "无法解析命令行中的配置"
20247
20248 +#: config.c
20249 +#, c-format
20250 +msgid ""
20251 +"\n"
20252 +"To use the default comment string (#) please run\n"
20253 +"\n"
20254 +"%s"
20255 +msgstr ""
20256 +"\n"
20257 +"要使用默认的注释字符串（#）时请运行\n"
20258 +"\n"
20259 +"%s"
20260 +
20261 +#: config.c
20262 +msgid "<comment string>"
20263 +msgstr "<注释字符串>"
20264 +
20265 +#: config.c
20266 +#, c-format
20267 +msgid ""
20268 +"\n"
20269 +"To set a custom comment string please run\n"
20270 +"\n"
20271 +"%s\n"
20272 +"where '%s' is the string you wish to use.\n"
20273 +msgstr ""
20274 +"\n"
20275 +"要设置自定义注释字符串时请运行\n"
20276 +"\n"
20277 +"%s\n"
20278 +"其中 '%s' 是您希望使用的字符串。\n"
20279 +
20280 +#: config.c
20281 +#, c-format
20282 +msgid "Support for '%s=auto' has been removed in Git 3.0"
20283 +msgstr "对 '%s=auto' 的支持已在 Git 3.0 中移除"
20284 +
20285 +#: config.c
20286 +#, c-format
20287 +msgid "Support for '%s=auto' is deprecated and will be removed in Git 3.0"
20288 +msgstr "对 '%s=auto' 的支持已过时，将在 Git 3.0 中移除"
20289 +
20290 #: config.c
20291 msgid "unknown error occurred while reading the configuration files"
20292 msgstr "在读取配置文件时遇到未知错误"
@@ -19960,6 +20866,14 @@ msgstr "无法添加目录 '%s' 至归档器"
20866 msgid "failed to write archive"
20867 msgstr "无法写入归档"
20868
20869 +#: diff-lib.c
20870 +msgid "max-depth is not supported for worktree diffs"
20871 +msgstr "工作区差异不支持 max-depth"
20872 +
20873 +#: diff-lib.c
20874 +msgid "max-depth is not supported for index diffs"
20875 +msgstr "索引差异不支持 max-depth"
20876 +
20877 #: diff-lib.c
20878 msgid "--merge-base does not work with ranges"
20879 msgstr "--merge-base 不适用于范围"
@@ -20237,7 +21151,7 @@ msgstr "只显示变更文件的文件名和状态"
21151
21152 #: diff.c
21153 msgid "<width>[,<name-width>[,<count>]]"
20240 -msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
21154 +msgstr "<宽度>[,<文件名宽度>[,<计数>]]"
21155
21156 #: diff.c
21157 msgid "generate diffstat"
@@ -20261,7 +21175,7 @@ msgstr "使用给定的图形长度生成差异统计"
21175
21176 #: diff.c
21177 msgid "<count>"
20264 -msgstr "<次数>"
21178 +msgstr "<计数>"
21179
21180 #: diff.c
21181 msgid "generate diffstat with limited lines"
@@ -20585,6 +21499,14 @@ msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
21499 msgid "select files by diff type"
21500 msgstr "通过差异类型选择文件"
21501
21502 +#: diff.c
21503 +msgid "<depth>"
21504 +msgstr "<深度>"
21505 +
21506 +#: diff.c
21507 +msgid "maximum tree depth to recurse"
21508 +msgstr "递归的最大树深度"
21509 +
21510 #: diff.c
21511 msgid "<file>"
21512 msgstr "<文件>"
@@ -20822,11 +21744,6 @@ msgstr "无效的 shallow 信息：%s"
21744 msgid "invalid unshallow line: %s"
21745 msgstr "无效的 unshallow 信息：%s"
21746
20825 -#: fetch-pack.c
20826 -#, c-format
20827 -msgid "object not found: %s"
20828 -msgstr "对象未找到：%s"
20829 -
21747 #: fetch-pack.c
21748 #, c-format
21749 msgid "error in object: %s"
@@ -21171,6 +22088,11 @@ msgstr "%s 的空别名"
22088 msgid "recursive alias: %s"
22089 msgstr "递归的别名：%s"
22090
22091 +#: git.c
22092 +#, c-format
22093 +msgid "alias loop detected: expansion of '%s' does not terminate:%s"
22094 +msgstr "检测到别名循环：'%s'的扩展未终止：%s"
22095 +
22096 #: git.c
22097 msgid "write failure on standard output"
22098 msgstr "在标准输出写入失败"
@@ -21183,11 +22105,6 @@ msgstr "到标准输出的未知写入错误"
22105 msgid "close failed on standard output"
22106 msgstr "标准输出关闭失败"
22107
21186 -#: git.c
21187 -#, c-format
21188 -msgid "alias loop detected: expansion of '%s' does not terminate:%s"
21189 -msgstr "检测到别名循环：'%s'的扩展未终止：%s"
21190 -
22108 #: git.c
22109 #, c-format
22110 msgid "cannot handle %s as a builtin"
@@ -21250,11 +22167,21 @@ msgstr "坏的/不兼容的签名 '%s‘"
22167 msgid "failed to get the ssh fingerprint for key '%s'"
22168 msgstr "无法得到密钥 '%s' 的 ssh 指纹"
22169
22170 +#: gpg-interface.c
22171 +#, c-format
22172 +msgid "failed to get the ssh fingerprint for key %s"
22173 +msgstr "无法得到密钥 '%s' 的 ssh 指纹"
22174 +
22175 #: gpg-interface.c
22176 msgid ""
22177 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"
22178 msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一"
22179
22180 +#: gpg-interface.c
22181 +#, c-format
22182 +msgid "malformed build-time gpg.ssh.defaultKeyCommand: %s"
22183 +msgstr "构建时 gpg.ssh.defaultKeyCommand 格式错误：%s"
22184 +
22185 #: gpg-interface.c
22186 #, c-format
22187 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"
@@ -21564,6 +22491,12 @@ msgstr ""
22491 " 请求：%s\n"
22492 " 重定向：%s"
22493
22494 +#: http.h
22495 +#, c-format
22496 +msgid ""
22497 +"number too large to represent as curl_off_t on this platform: %<PRIuMAX>"
22498 +msgstr "数字太大，无法在此平台上表示为 curl_off_t：%<PRIuMAX>"
22499 +
22500 #: ident.c
22501 msgid "Author identity unknown\n"
22502 msgstr "作者身份未知\n"
@@ -22090,11 +23023,6 @@ msgstr "格式错误的行：%s"
23023 msgid "could not load pack"
23024 msgstr "不能载入包"
23025
22093 -#: midx-write.c
22094 -#, c-format
22095 -msgid "could not open index for %s"
22096 -msgstr "不能打开 %s 的索引"
22097 -
23026 #: midx-write.c
23027 #, c-format
23028 msgid "unable to link '%s' to '%s'"
@@ -22123,6 +23051,11 @@ msgstr "添加包文件到多包索引"
23051 msgid "unknown preferred pack: '%s'"
23052 msgstr "未知的首选包：'%s'"
23053
23054 +#: midx-write.c
23055 +#, c-format
23056 +msgid "failed to open preferred pack %s"
23057 +msgstr "无法打开首选包 %s"
23058 +
23059 #: midx-write.c
23060 #, c-format
23061 msgid "cannot select preferred pack %s with no objects"
@@ -22154,6 +23087,10 @@ msgstr "无法创建临时 MIDX 层"
23087 msgid "could not write multi-pack bitmap"
23088 msgstr "无法写入多包位图"
23089
23090 +#: midx-write.c
23091 +msgid "too many multi-pack-indexes"
23092 +msgstr "过多的多包索引"
23093 +
23094 #: midx-write.c
23095 msgid "unable to open multi-pack-index chain file"
23096 msgstr "无法打开多包索引链文件"
@@ -22482,11 +23419,6 @@ msgstr "不能打开 %s"
23419 msgid "files '%s' and '%s' differ in contents"
23420 msgstr "文件 '%s' 和 '%s' 的内容不同"
23421
22485 -#: object-file.c
22486 -#, c-format
22487 -msgid "unable to write file %s"
22488 -msgstr "无法写文件 %s"
22489 -
23422 #: object-file.c
23423 #, c-format
23424 msgid "unable to write repeatedly vanishing file %s"
@@ -22497,6 +23429,10 @@ msgstr "无法写入反复消失的文件 %s"
23429 msgid "unable to set permission to '%s'"
23430 msgstr "无法为 '%s' 设置权限"
23431
23432 +#: object-file.c
23433 +msgid "core.fsyncMethod = batch is unsupported on this platform"
23434 +msgstr "core.fsyncMethod = batch 不支持本平台"
23435 +
23436 #: object-file.c
23437 msgid "error when closing loose object file"
23438 msgstr "关闭松散对象文件时出错"
@@ -23098,6 +24034,26 @@ msgstr "mtimes 文件 %s 有不支持的哈希 ID %<PRIu32>"
24034 msgid "mtimes file %s is corrupt"
24035 msgstr "mtimes 文件 %s 损坏"
24036
24037 +#: pack-refs.c
24038 +msgid "pack everything"
24039 +msgstr "打包一切"
24040 +
24041 +#: pack-refs.c
24042 +msgid "prune loose refs (default)"
24043 +msgstr "清除松散的引用（默认）"
24044 +
24045 +#: pack-refs.c
24046 +msgid "auto-pack refs as needed"
24047 +msgstr "按需对引用自动打包"
24048 +
24049 +#: pack-refs.c
24050 +msgid "references to include"
24051 +msgstr "需包含的引用"
24052 +
24053 +#: pack-refs.c
24054 +msgid "references to exclude"
24055 +msgstr "需排除的引用"
24056 +
24057 #: pack-revindex.c
24058 #, c-format
24059 msgid "reverse-index file %s is too small"
@@ -23614,6 +24570,11 @@ msgstr "promisor 远程名称不能以 '/' 开始：%s"
24570 msgid "could not fetch %s from promisor remote"
24571 msgstr "无法从承诺者远程获取 %s"
24572
24573 +#: promisor-remote.c
24574 +#, c-format
24575 +msgid "unsupported field '%s' in '%s' config"
24576 +msgstr "配置 '%2$s' 中存在不支持的字段 '%1$s'"
24577 +
24578 #: promisor-remote.c
24579 #, c-format
24580 msgid "no or empty URL advertised for remote '%s'"
@@ -23626,13 +24587,18 @@ msgstr "已知远程名称为 '%s'，但 URL 是 '%s' 而非 '%s'"
24587
24588 #: promisor-remote.c
24589 #, c-format
23629 -msgid "unknown '%s' value for '%s' config option"
23630 -msgstr "配置项 '%2$s' 为未知的取值 '%1$s'"
24590 +msgid "invalid element '%s' from remote info"
24591 +msgstr "远程信息中的无效元素 '%s'"
24592 +
24593 +#: promisor-remote.c
24594 +#, c-format
24595 +msgid "server advertised a promisor remote without a name or URL: %s"
24596 +msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：%s"
24597
24598 #: promisor-remote.c
24599 #, c-format
23634 -msgid "unknown element '%s' from remote info"
23635 -msgstr "远程信息中的未知元素 '%s'"
24600 +msgid "unknown '%s' value for '%s' config option"
24601 +msgstr "配置项 '%2$s' 为未知的取值 '%1$s'"
24602
24603 #: promisor-remote.c
24604 #, c-format
@@ -23742,6 +24708,16 @@ msgstr "无法解析 git 头 '%.*s'"
24708 msgid "failed to generate diff"
24709 msgstr "无法生成 diff"
24710
24711 +#: range-diff.c
24712 +#, c-format
24713 +msgid ""
24714 +"range-diff: unable to compute the range-diff, since it exceeds the maximum "
24715 +"memory for the cost matrix: %s (%<PRIuMAX> bytes) needed, limited to %s "
24716 +"(%<PRIuMAX> bytes)"
24717 +msgstr ""
24718 +"range-diff：无法计算 range-diff，因为它超出了成本矩阵的最大内存：需要 %s"
24719 +"（%<PRIuMAX> 字节），限制为 %s（%<PRIuMAX> 字节）"
24720 +
24721 #: range-diff.c
24722 #, c-format
24723 msgid "could not parse log for '%s'"
@@ -24367,6 +25343,10 @@ msgstr "不是一个引用日志：%s"
25343 msgid "no reflog for '%s'"
25344 msgstr "没有 '%s' 的引用日志"
25345
25346 +#: refs.c
25347 +msgid "Checking references consistency"
25348 +msgstr "正在检查引用一致性"
25349 +
25350 #: refs.c
25351 #, c-format
25352 msgid "%s does not point to a valid object!"
@@ -24388,8 +25368,9 @@ msgstr "%s%s 已在 %s 被删除后变为悬空引用\n"
25368 #, c-format
25369 msgid ""
25370 "Using '%s' as the name for the initial branch. This default branch name\n"
24391 -"is subject to change. To configure the initial branch name to use in all\n"
24392 -"of your new repositories, which will suppress this warning, call:\n"
25371 +"will change to \"main\" in Git 3.0. To configure the initial branch name\n"
25372 +"to use in all of your new repositories, which will suppress this warning,\n"
25373 +"call:\n"
25374 "\n"
25375 "\tgit config --global init.defaultBranch <name>\n"
25376 "\n"
@@ -24398,16 +25379,30 @@ msgid ""
25379 "\n"
25380 "\tgit branch -m <name>\n"
25381 msgstr ""
24401 -"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
24402 -"配置使用初始分支名，并消除这条警告，请执行：\n"
25382 +"使用 '%s' 作为初始分支的名称。这个默认分支名称在 Git 3.0 中将会修改为\n"
25383 +"\"main\"。要为您的所有新仓库配置初始分支名称（这将禁用此警告），请运行：\n"
25384 "\n"
25385 "\tgit config --global init.defaultBranch <名称>\n"
25386 "\n"
25387 "除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
24407 -"可以通过以下命令重命名刚创建的分支：\n"
25388 +"可以通过以下命令重命名新创建的分支：\n"
25389 "\n"
25390 "\tgit branch -m <name>\n"
25391
25392 +#: refs.c
25393 +#, c-format
25394 +msgid ""
25395 +"Using '%s' as the name for the initial branch since Git 3.0.\n"
25396 +"If you expected Git to create 'master', the just-created\n"
25397 +"branch can be renamed via this command:\n"
25398 +"\n"
25399 +"\tgit branch -m master\n"
25400 +msgstr ""
25401 +"从 Git 3.0 开始，使用 '%s' 作为初始分支的名称。如果您期望 Git\n"
25402 +"创建 'master'，新创建的分支可以通过以下命令重命名：\n"
25403 +"\n"
25404 +"\tgit branch -m master\n"
25405 +
25406 #: refs.c
25407 #, c-format
25408 msgid "could not retrieve `%s`"
@@ -24515,12 +25510,38 @@ msgstr "无法删除临时迁移目录 '%s'"
25510 msgid "migrated refs can be found at '%s'"
25511 msgstr "迁移的引用可以在 '%s' 处找到"
25512
25513 +#: refs/files-backend.c
25514 +msgid ""
25515 +"'core.preferSymlinkRefs=true' is nominated for removal.\n"
25516 +"hint: The use of symbolic links for symbolic refs is deprecated\n"
25517 +"hint: and will be removed in Git 3.0. The configuration that\n"
25518 +"hint: tells Git to use them is thus going away. You can unset\n"
25519 +"hint: it with:\n"
25520 +"hint:\n"
25521 +"hint:\tgit config unset core.preferSymlinkRefs\n"
25522 +"hint:\n"
25523 +"hint: Git will then use the textual symref format instead."
25524 +msgstr ""
25525 +"'core.preferSymlinkRefs=true' 已被列入移除计划。\n"
25526 +"提示：使用符号链接表示符号引用的功能已被弃用，\n"
25527 +"提示：并将在 Git 3.0 中移除。因此，用于启用该方式的\n"
25528 +"提示：配置也将随之废弃。您可以用以下命令取消该配置：\n"
25529 +"提示：\n"
25530 +"提示：\tgit config unset core.preferSymlinkRefs\n"
25531 +"提示：\n"
25532 +"提示：Git 将改为使用文本 symref 格式。"
25533 +
25534 #: refs/files-backend.c refs/reftable-backend.c
25535 #, c-format
25536 msgid ""
25537 "cannot lock ref '%s': expected symref with target '%s': but is a regular ref"
25538 msgstr "无法锁定引用 '%s'：预期目标为 '%s' 的符号引用：但是是普通引用"
25539
25540 +#: refs/files-backend.c refs/reftable-backend.c
25541 +#, c-format
25542 +msgid "trying to write reflog for '%s' with incomplete values"
25543 +msgstr "尝试为 '%s' 写入引用日志时使用了不完整的值"
25544 +
25545 #: refs/files-backend.c
25546 #, c-format
25547 msgid "cannot read ref file '%s'"
@@ -24531,10 +25552,6 @@ msgstr "无法读取引用文件 '%s'"
25552 msgid "cannot open directory %s"
25553 msgstr "无法打开目录 %s"
25554
24534 -#: refs/files-backend.c
24535 -msgid "Checking references consistency"
24536 -msgstr "正在检查引用一致性"
24537 -
25555 #: refs/packed-backend.c
25556 #, c-format
25557 msgid "unable to open '%s'"
@@ -24578,6 +25595,11 @@ msgid ""
25595 "multiple updates for '%s' (including one via symref '%s') are not allowed"
25596 msgstr "不允许对 '%s' 进行多次更新（包括通过符号引用 '%s' 更新）"
25597
25598 +#: refs/reftable-backend.c
25599 +#, c-format
25600 +msgid "cannot lock ref '%s': dangling symref already exists"
25601 +msgstr "无法锁定引用 '%s'：悬空符号引用已存在"
25602 +
25603 #: refs/reftable-backend.c
25604 #, c-format
25605 msgid "cannot lock ref '%s': reference already exists"
@@ -24703,10 +25725,6 @@ msgstr "remote-curl：意外响应结束包"
25725 msgid "RPC failed; %s"
25726 msgstr "RPC 失败。%s"
25727
24706 -#: remote-curl.c
24707 -msgid "cannot handle pushes this big"
24708 -msgstr "不能处理这么大的推送"
24709 -
25728 #: remote-curl.c
25729 #, c-format
25730 msgid "cannot deflate request; zlib deflate error %d"
@@ -24920,6 +25938,12 @@ msgstr ""
25938 "引用规格的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
25939 "'%s:refs/tags/%s' 推送么？"
25940
25941 +#: remote.c
25942 +#, c-format
25943 +msgid ""
25944 +"The <src> part of the refspec ('%s') is an object ID that doesn't exist.\n"
25945 +msgstr "引用规格的 <src> 部分（'%s'）是一个不存在的对象 ID。\n"
25946 +
25947 #: remote.c
25948 #, c-format
25949 msgid "%s cannot be resolved to branch"
@@ -25071,6 +26095,71 @@ msgstr "无法解析期望的对象名 '%s'"
26095 msgid "cannot strip one component off url '%s'"
26096 msgstr "无法从 url '%s' 剥离一个组件"
26097
26098 +#: repack-geometry.c
26099 +#, c-format
26100 +msgid "cannot open index for %s"
26101 +msgstr "不能打开 %s 的索引"
26102 +
26103 +#: repack-geometry.c
26104 +#, c-format
26105 +msgid "pack %s too large to consider in geometric progression"
26106 +msgstr "包 %s 太大，不在几何打包过程中考虑"
26107 +
26108 +#: repack-geometry.c
26109 +#, c-format
26110 +msgid "pack %s too large to roll up"
26111 +msgstr "包 %s 太大导致数字溢出"
26112 +
26113 +#: repack-midx.c
26114 +#, c-format
26115 +msgid "could not open tempfile %s for writing"
26116 +msgstr "无法打开临时文件 %s 进行写入"
26117 +
26118 +#: repack-midx.c
26119 +msgid "could not close refs snapshot tempfile"
26120 +msgstr "不能关闭引用快照临时文件"
26121 +
26122 +#: repack-midx.c
26123 +#, c-format
26124 +msgid "could not remove stale bitmap: %s"
26125 +msgstr "无法删除过期的位图： %s"
26126 +
26127 +#: repack-promisor.c
26128 +msgid "could not start pack-objects to repack promisor objects"
26129 +msgstr "无法开始 pack-objects 来重新打包承诺者对象"
26130 +
26131 +#: repack-promisor.c
26132 +msgid "failed to feed promisor objects to pack-objects"
26133 +msgstr "无法将承诺者对象提供给 pack-objects"
26134 +
26135 +#: repack-promisor.c repack.c
26136 +msgid "repack: Expecting full hex object ID lines only from pack-objects."
26137 +msgstr "repack：来自 pack-objects 的输入必须为完整的十六进制对象 ID 行。"
26138 +
26139 +#: repack-promisor.c
26140 +msgid "could not finish pack-objects to repack promisor objects"
26141 +msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
26142 +
26143 +#: repack.c
26144 +#, c-format
26145 +msgid "pack prefix %s does not begin with objdir %s"
26146 +msgstr "包前缀 %s 没有以对象目录 %s 开始"
26147 +
26148 +#: repack.c
26149 +#, c-format
26150 +msgid "renaming pack to '%s' failed"
26151 +msgstr "重命名包至 '%s' 失败"
26152 +
26153 +#: repack.c
26154 +#, c-format
26155 +msgid "pack-objects did not write a '%s' file for pack %s-%s"
26156 +msgstr "pack-objects 未为包 %2$s-%3$s 写入 '%1$s' 文件"
26157 +
26158 +#: repack.c sequencer.c
26159 +#, c-format
26160 +msgid "could not unlink: %s"
26161 +msgstr "不能删除：%s"
26162 +
26163 #: replace-object.c
26164 #, c-format
26165 msgid "bad replace ref name: %s"
@@ -25255,7 +26344,7 @@ msgstr "需要一个工作目录"
26344
26345 #: scalar.c
26346 msgid "Scalar enlistments require a worktree"
25258 -msgstr "Scalar 登记需要一个工作树"
26347 +msgstr "Scalar 登记需要一个工作区"
26348
26349 #: scalar.c
26350 #, c-format
@@ -26647,10 +27736,6 @@ msgstr "不是 git 仓库：'%s'"
27736 msgid "cannot chdir to '%s'"
27737 msgstr "不能切换目录到 '%s'"
27738
26650 -#: setup.c
26651 -msgid "cannot come back to cwd"
26652 -msgstr "无法返回当前工作目录"
26653 -
27739 #: setup.c
27740 #, c-format
27741 msgid "failed to stat '%*s%s%s'"
@@ -27859,7 +28944,7 @@ msgstr "正在更新索引标志"
28944 #: unpack-trees.c
28945 #, c-format
28946 msgid "worktree and untracked commit have duplicate entries: %s"
27862 -msgstr "工作树和未跟踪提交具有重复条目：%s"
28947 +msgstr "工作区和未跟踪提交具有重复条目：%s"
28948
28949 #: upload-pack.c
28950 msgid "expected flush after fetch arguments"
@@ -27915,19 +29000,34 @@ msgstr "错误："
29000 msgid "warning: "
29001 msgstr "警告："
29002
29003 +#: usage.c
29004 +#, c-format
29005 +msgid "'%s' is nominated for removal.\n"
29006 +msgstr "'%s' 被提名以移除。\n"
29007 +
29008 #: usage.c
29009 #, c-format
29010 msgid ""
27921 -"'%s' is nominated for removal.\n"
27922 -"If you still use this command, please add an extra\n"
27923 -"option, '--i-still-use-this', on the command line\n"
27924 -"and let us know you still use it by sending an e-mail\n"
27925 -"to <git@vger.kernel.org>. Thanks.\n"
29011 +"If you still use this command, here's what you can do:\n"
29012 +"\n"
29013 +"- read https://git-scm.com/docs/BreakingChanges.html\n"
29014 +"- check if anyone has discussed this on the mailing\n"
29015 +" list and if they came up with something that can\n"
29016 +" help you: https://lore.kernel.org/git/?q=%s\n"
29017 +"- send an email to <git@vger.kernel.org> to let us\n"
29018 +" know that you still use this command and were unable\n"
29019 +" to determine a suitable replacement\n"
29020 +"\n"
29021 msgstr ""
27927 -"'%s' 命令已被提名移除。\n"
27928 -"如果您仍在使用该命令，请在命令行中添加额外选项\n"
27929 -"'--i-still-use-this'，并通过发送邮件至 <git@vger.kernel.org> \n"
27930 -"通知我们您仍在使用它。谢谢。\n"
29022 +"如果您仍在使用此命令，以下是您可以做的事情：\n"
29023 +"\n"
29024 +"- 阅读 https://git-scm.com/docs/BreakingChanges.html\n"
29025 +"- 检查邮件列表中是否有人讨论过此问题，\n"
29026 +" 以及他们是否提出了可以帮助您的建议：\n"
29027 +" https://lore.kernel.org/git/?q=%s\n"
29028 +"- 发送电子邮件至 <git@vger.kernel.org>，让我们知道\n"
29029 +" 您仍在使用此命令且无法确定合适的替代方案\n"
29030 +"\n"
29031
29032 #: usage.c
29033 msgid "refusing to run without --i-still-use-this"
@@ -28996,6 +30096,10 @@ msgstr "发送这封邮件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
30096 msgid "Send this email reply required"
30097 msgstr "发送要求的邮件回复"
30098
30099 +#: git-send-email.perl
30100 +msgid "The destination IMAP folder is not properly defined."
30101 +msgstr "目标 IMAP 文件夹没有正确定义。"
30102 +
30103 #: git-send-email.perl
30104 msgid "The required SMTP server is not properly defined."
30105 msgstr "要求的 SMTP 服务器未被正确定义。"