@matheusbsbs / matheus-bagliano / commits / 2a39e8ee72

l10n: zh_CN: updated translation for 2.54

Translate 198 previously fuzzy or untranslated messages, bringing the total number of translated messages to 6226. Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Mar 31, 2026 at 10:17 UTC 2a39e8ee72833ac21a4dc45df0b119c24ecfee3d
1 file changed +1069 -375
po/zh_CN.po
+1069 -375
@@ -53,6 +53,7 @@
53 # conflict | 冲突
54 # core Git | 核心 Git 工具
55 # cover letter | 附函
56 +# cruft pack | 废弃包
57 # DAG | 有向无环图
58 # dangling object | 悬空对象
59 # detached HEAD | 分离头指针
@@ -117,6 +118,7 @@
118 # reflog | 引用日志
119 # refmap | 引用映射
120 # refspec | 引用规格
121 +# regular file | 普通文件
122 # remote | 远程，远程仓库
123 # remote-tracking branch | 远程跟踪分支
124 # replay | 重放
@@ -152,7 +154,7 @@
154 # unreachable object | 不可达对象
155 # unstage | 取消暂存
156 # upstream | 上游（分支/仓库）
155 -# working tree | 工作区
157 +# working tree/worktree | 工作区
158 #
159 # Preferred Chinese Terms
160 #
@@ -172,7 +174,7 @@ msgid ""
174 msgstr ""
175 "Project-Id-Version: Git\n"
176 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
175 -"POT-Creation-Date: 2026-01-29 19:17+0800\n"
177 +"POT-Creation-Date: 2026-04-10 10:05+0800\n"
178 "PO-Revision-Date: 2025-11-16 01:03+0800\n"
179 "Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
180 "Language-Team: GitHub <https://github.com/dyrone/git/>\n"
@@ -183,10 +185,54 @@ msgstr ""
185 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
186 "X-Generator: Gtranslator 42.0\n"
187
186 -#: add-interactive.c
187 -#, c-format
188 -msgid "%s cannot be negative"
189 -msgstr "%s 不能为负数"
188 +#: builtin/fast-import.c
189 +msgid "aborting due to invalid signature"
190 +msgstr "由于签名无效而中止"
191 +
192 +#: builtin/fast-import.c
193 +msgid "failed to sign tag object"
194 +msgstr "无法为标签对象签名"
195 +
196 +#: builtin/history.c
197 +msgid "control which refs should be updated"
198 +msgstr "控制应更新哪些引用"
199 +
200 +#: builtin/history.c
201 +msgid "control ref update behavior"
202 +msgstr "控制引用更新行为"
203 +
204 +#: builtin/replay.c
205 +msgid ""
206 +"(EXPERIMENTAL!) git replay ([--contained] --onto=<newbase> | --"
207 +"advance=<branch> | --revert=<branch>)\n"
208 +"[--ref=<ref>] [--ref-action=<mode>] <revision-range>"
209 +msgstr ""
210 +"（实验性！）git replay ([--contained] --onto=<新基线> | --advance=<分支> | --"
211 +"revert=<分支>)\n"
212 +"[--ref=<引用>] [--ref-action=<模式>] <版本范围>"
213 +
214 +#: builtin/replay.c
215 +msgid "reference to update with result"
216 +msgstr "要更新结果的引用"
217 +
218 +#: builtin/stash.c
219 +msgid ""
220 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
221 +"| --quiet]\n"
222 +" [-u | --include-untracked] [-a | --all] [(-m | --message) "
223 +"<message>]\n"
224 +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
225 +" [--] [<pathspec>...]"
226 +msgstr ""
227 +"git stash [push] [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
228 +"| --quiet]\n"
229 +" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n"
230 +" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
231 +" [--] [<路径规格>...]"
232 +
233 +#: replay.c
234 +msgid "'--ref' cannot be used with multiple revision ranges"
235 +msgstr "'--ref' 不能与多个版本范围一起使用"
236
237 #: add-interactive.c
238 #, c-format
@@ -390,23 +436,23 @@ msgstr "再见。\n"
436
437 #: add-patch.c
438 #, c-format
393 -msgid "Stage mode change [y,n,q,a,d%s,?]? "
394 -msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
439 +msgid "Stage mode change%s [y,n,q,a,d%s,?]? "
440 +msgstr "暂存模式变更%s [y,n,q,a,d%s,?]? "
441
442 #: add-patch.c
443 #, c-format
398 -msgid "Stage deletion [y,n,q,a,d%s,?]? "
399 -msgstr "暂存删除变更 [y,n,q,a,d%s,?]? "
444 +msgid "Stage deletion%s [y,n,q,a,d%s,?]? "
445 +msgstr "暂存删除%s [y,n,q,a,d%s,?]? "
446
447 #: add-patch.c
448 #, c-format
403 -msgid "Stage addition [y,n,q,a,d%s,?]? "
404 -msgstr "暂存新增变更 [y,n,q,a,d%s,?]? "
449 +msgid "Stage addition%s [y,n,q,a,d%s,?]? "
450 +msgstr "暂存新增%s [y,n,q,a,d%s,?]? "
451
452 #: add-patch.c
453 #, c-format
408 -msgid "Stage this hunk [y,n,q,a,d%s,?]? "
409 -msgstr "暂存该块 [y,n,q,a,d%s,?]? "
454 +msgid "Stage this hunk%s [y,n,q,a,d%s,?]? "
455 +msgstr "暂存该块%s [y,n,q,a,d%s,?]? "
456
457 #: add-patch.c
458 msgid ""
@@ -430,23 +476,23 @@ msgstr ""
476
477 #: add-patch.c
478 #, c-format
433 -msgid "Stash mode change [y,n,q,a,d%s,?]? "
434 -msgstr "储藏模式变更 [y,n,q,a,d%s,?]? "
479 +msgid "Stash mode change%s [y,n,q,a,d%s,?]? "
480 +msgstr "储藏模式变更%s [y,n,q,a,d%s,?]? "
481
482 #: add-patch.c
483 #, c-format
438 -msgid "Stash deletion [y,n,q,a,d%s,?]? "
439 -msgstr "储藏删除变更 [y,n,q,a,d%s,?]? "
484 +msgid "Stash deletion%s [y,n,q,a,d%s,?]? "
485 +msgstr "储藏删除%s [y,n,q,a,d%s,?]? "
486
487 #: add-patch.c
488 #, c-format
443 -msgid "Stash addition [y,n,q,a,d%s,?]? "
444 -msgstr "储藏新增变更 [y,n,q,a,d%s,?]? "
489 +msgid "Stash addition%s [y,n,q,a,d%s,?]? "
490 +msgstr "储藏新增%s [y,n,q,a,d%s,?]? "
491
492 #: add-patch.c
493 #, c-format
448 -msgid "Stash this hunk [y,n,q,a,d%s,?]? "
449 -msgstr "储藏该块 [y,n,q,a,d%s,?]? "
494 +msgid "Stash this hunk%s [y,n,q,a,d%s,?]? "
495 +msgstr "储藏该块%s [y,n,q,a,d%s,?]? "
496
497 #: add-patch.c
498 msgid ""
@@ -470,23 +516,23 @@ msgstr ""
516
517 #: add-patch.c
518 #, c-format
473 -msgid "Unstage mode change [y,n,q,a,d%s,?]? "
474 -msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
519 +msgid "Unstage mode change%s [y,n,q,a,d%s,?]? "
520 +msgstr "取消暂存模式变更%s [y,n,q,a,d%s,?]? "
521
522 #: add-patch.c
523 #, c-format
478 -msgid "Unstage deletion [y,n,q,a,d%s,?]? "
479 -msgstr "取消暂存删除变更 [y,n,q,a,d%s,?]? "
524 +msgid "Unstage deletion%s [y,n,q,a,d%s,?]? "
525 +msgstr "取消暂存删除%s [y,n,q,a,d%s,?]? "
526
527 #: add-patch.c
528 #, c-format
483 -msgid "Unstage addition [y,n,q,a,d%s,?]? "
484 -msgstr "取消暂存新增变更 [y,n,q,a,d%s,?]? "
529 +msgid "Unstage addition%s [y,n,q,a,d%s,?]? "
530 +msgstr "取消暂存新增%s [y,n,q,a,d%s,?]? "
531
532 #: add-patch.c
533 #, c-format
488 -msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
489 -msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
534 +msgid "Unstage this hunk%s [y,n,q,a,d%s,?]? "
535 +msgstr "取消暂存该块%s [y,n,q,a,d%s,?]? "
536
537 #: add-patch.c
538 msgid ""
@@ -510,23 +556,23 @@ msgstr ""
556
557 #: add-patch.c
558 #, c-format
513 -msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
514 -msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
559 +msgid "Apply mode change to index%s [y,n,q,a,d%s,?]? "
560 +msgstr "将模式变更应用到索引%s [y,n,q,a,d%s,?]? "
561
562 #: add-patch.c
563 #, c-format
518 -msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
519 -msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
564 +msgid "Apply deletion to index%s [y,n,q,a,d%s,?]? "
565 +msgstr "将删除应用到索引%s [y,n,q,a,d%s,?]? "
566
567 #: add-patch.c
568 #, c-format
523 -msgid "Apply addition to index [y,n,q,a,d%s,?]? "
524 -msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
569 +msgid "Apply addition to index%s [y,n,q,a,d%s,?]? "
570 +msgstr "将添加应用到索引%s [y,n,q,a,d%s,?]? "
571
572 #: add-patch.c
573 #, c-format
528 -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
529 -msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
574 +msgid "Apply this hunk to index%s [y,n,q,a,d%s,?]? "
575 +msgstr "将该块应用到索引%s [y,n,q,a,d%s,?]? "
576
577 #: add-patch.c
578 msgid ""
@@ -550,23 +596,23 @@ msgstr ""
596
597 #: add-patch.c
598 #, c-format
553 -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
554 -msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
599 +msgid "Discard mode change from worktree%s [y,n,q,a,d%s,?]? "
600 +msgstr "从工作区丢弃模式变更%s [y,n,q,a,d%s,?]? "
601
602 #: add-patch.c
603 #, c-format
558 -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
559 -msgstr "从工作区中丢弃删除变更 [y,n,q,a,d%s,?]? "
604 +msgid "Discard deletion from worktree%s [y,n,q,a,d%s,?]? "
605 +msgstr "从工作区丢弃删除%s [y,n,q,a,d%s,?]? "
606
607 #: add-patch.c
608 #, c-format
563 -msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
564 -msgstr "从工作区中丢弃新增变更 [y,n,q,a,d%s,?]? "
609 +msgid "Discard addition from worktree%s [y,n,q,a,d%s,?]? "
610 +msgstr "从工作区丢弃新增%s [y,n,q,a,d%s,?]? "
611
612 #: add-patch.c
613 #, c-format
568 -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
569 -msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
614 +msgid "Discard this hunk from worktree%s [y,n,q,a,d%s,?]? "
615 +msgstr "从工作区丢弃该块%s [y,n,q,a,d%s,?]? "
616
617 #: add-patch.c
618 msgid ""
@@ -590,23 +636,23 @@ msgstr ""
636
637 #: add-patch.c
638 #, c-format
593 -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
594 -msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
639 +msgid "Discard mode change from index and worktree%s [y,n,q,a,d%s,?]? "
640 +msgstr "从索引和工作区丢弃模式变更%s [y,n,q,a,d%s,?]? "
641
642 #: add-patch.c
643 #, c-format
598 -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
599 -msgstr "从索引和工作区中丢弃删除变更 [y,n,q,a,d%s,?]? "
644 +msgid "Discard deletion from index and worktree%s [y,n,q,a,d%s,?]? "
645 +msgstr "从索引和工作区丢弃删除%s [y,n,q,a,d%s,?]? "
646
647 #: add-patch.c
648 #, c-format
603 -msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
604 -msgstr "从索引和工作区中丢弃新增变更 [y,n,q,a,d%s,?]? "
649 +msgid "Discard addition from index and worktree%s [y,n,q,a,d%s,?]? "
650 +msgstr "从索引和工作区丢弃新增%s [y,n,q,a,d%s,?]? "
651
652 #: add-patch.c
653 #, c-format
608 -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
609 -msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
654 +msgid "Discard this hunk from index and worktree%s [y,n,q,a,d%s,?]? "
655 +msgstr "从索引和工作区丢弃该块%s [y,n,q,a,d%s,?]? "
656
657 #: add-patch.c
658 msgid ""
@@ -624,23 +670,23 @@ msgstr ""
670
671 #: add-patch.c
672 #, c-format
627 -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
628 -msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
673 +msgid "Apply mode change to index and worktree%s [y,n,q,a,d%s,?]? "
674 +msgstr "将模式变更应用到索引和工作区%s [y,n,q,a,d%s,?]? "
675
676 #: add-patch.c
677 #, c-format
632 -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
633 -msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
678 +msgid "Apply deletion to index and worktree%s [y,n,q,a,d%s,?]? "
679 +msgstr "将删除应用到索引和工作区%s [y,n,q,a,d%s,?]? "
680
681 #: add-patch.c
682 #, c-format
637 -msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
638 -msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
683 +msgid "Apply addition to index and worktree%s [y,n,q,a,d%s,?]? "
684 +msgstr "将添加应用到索引和工作区%s [y,n,q,a,d%s,?]? "
685
686 #: add-patch.c
687 #, c-format
642 -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
643 -msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
688 +msgid "Apply this hunk to index and worktree%s [y,n,q,a,d%s,?]? "
689 +msgstr "将该块应用到索引和工作区%s [y,n,q,a,d%s,?]? "
690
691 #: add-patch.c
692 msgid ""
@@ -658,23 +704,23 @@ msgstr ""
704
705 #: add-patch.c
706 #, c-format
661 -msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
662 -msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
707 +msgid "Apply mode change to worktree%s [y,n,q,a,d%s,?]? "
708 +msgstr "将模式变更应用到工作区%s [y,n,q,a,d%s,?]? "
709
710 #: add-patch.c
711 #, c-format
666 -msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
667 -msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
712 +msgid "Apply deletion to worktree%s [y,n,q,a,d%s,?]? "
713 +msgstr "将删除应用到工作区%s [y,n,q,a,d%s,?]? "
714
715 #: add-patch.c
716 #, c-format
671 -msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
672 -msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
717 +msgid "Apply addition to worktree%s [y,n,q,a,d%s,?]? "
718 +msgstr "将添加应用到工作区%s [y,n,q,a,d%s,?]? "
719
720 #: add-patch.c
721 #, c-format
676 -msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
677 -msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
722 +msgid "Apply this hunk to worktree%s [y,n,q,a,d%s,?]? "
723 +msgstr "将该块应用到工作区%s [y,n,q,a,d%s,?]? "
724
725 #: add-patch.c
726 msgid ""
@@ -690,6 +736,11 @@ msgstr ""
736 "a - 应用该块和本文件中后面的全部块\n"
737 "d - 不要应用该块和本文件中后面的全部块\n"
738
739 +#: add-patch.c
740 +#, c-format
741 +msgid "%s cannot be negative"
742 +msgstr "%s 不能为负数"
743 +
744 #: add-patch.c
745 #, c-format
746 msgid "could not parse hunk header '%.*s'"
@@ -798,6 +849,7 @@ msgid "Nothing was applied.\n"
849 msgstr "未应用。\n"
850
851 #: add-patch.c
852 +#, c-format
853 msgid ""
854 "j - go to the next undecided hunk, roll over at the bottom\n"
855 "J - go to the next hunk, roll over at the bottom\n"
@@ -809,25 +861,51 @@ msgid ""
861 "e - manually edit the current hunk\n"
862 "p - print the current hunk\n"
863 "P - print the current hunk using the pager\n"
864 +"> - go to the next file, roll over at the bottom\n"
865 +"< - go to the previous file, roll over at the top\n"
866 "? - print help\n"
867 +"HUNKS SUMMARY - Hunks: %d, USE: %d, SKIP: %d\n"
868 msgstr ""
814 -"j - 跳转至下一个未决定块，在底部翻页\n"
815 -"J - 跳转至下一个块，在底部翻页\n"
816 -"k - 跳转至上一个未决定块，在顶部翻页\n"
817 -"K - 跳转至上一个块，在顶部翻页\n"
869 +"j - 跳转至下一个未决定块，在底部循环\n"
870 +"J - 跳转至下一个块，在底部循环\n"
871 +"k - 跳转至上一个未决定块，在顶部循环\n"
872 +"K - 跳转至上一个块，在顶部循环\n"
873 "g - 选择要跳转的块\n"
819 -"/ - 查找和给定正则表达式匹配的块\n"
820 -"s - 拆分当前块为更小的块\n"
874 +"/ - 查找与给定正则表达式匹配的块\n"
875 +"s - 将当前块拆成更小的块\n"
876 "e - 手动编辑当前块\n"
822 -"p - 显示当前块\n"
823 -"P - 使用分页器显示当前块\n"
824 -"? - 显示帮助\n"
877 +"p - 打印当前块\n"
878 +"P - 使用分页器打印当前块\n"
879 +"> - 跳转至下一个文件，在底部循环\n"
880 +"< - 跳转至上一个文件，在顶部循环\n"
881 +"? - 打印帮助\n"
882 +"补丁块摘要 - 块：%d，采用：%d，跳过：%d\n"
883 +
884 +#: add-patch.c
885 +msgid "'git apply' failed"
886 +msgstr "'git apply' 失败"
887 +
888 +#: add-patch.c
889 +msgid " (was: y)"
890 +msgstr "（原为：y）"
891 +
892 +#: add-patch.c
893 +msgid " (was: n)"
894 +msgstr "（原为：n）"
895
896 #: add-patch.c
897 #, c-format
898 msgid "Only one letter is expected, got '%s'"
899 msgstr "预期只有一个字母，得到 '%s'"
900
901 +#: add-patch.c
902 +msgid "No next file"
903 +msgstr "没有下一个文件"
904 +
905 +#: add-patch.c
906 +msgid "No previous file"
907 +msgstr "没有上一个文件"
908 +
909 #: add-patch.c
910 msgid "No other hunk"
911 msgstr "没有其他块"
@@ -895,10 +973,6 @@ msgstr "对不起，无法编辑这个块"
973 msgid "Unknown command '%s' (use '?' for help)"
974 msgstr "未知命令 '%s'（使用 '?' 寻求帮助）"
975
898 -#: add-patch.c
899 -msgid "'git apply' failed"
900 -msgstr "'git apply' 失败"
901 -
976 #: add-patch.c
977 msgid "No changes."
978 msgstr "没有修改。"
@@ -907,6 +981,30 @@ msgstr "没有修改。"
981 msgid "Only binary files changed."
982 msgstr "只有二进制文件被修改。"
983
984 +#: add-patch.c
985 +#, c-format
986 +msgid "Stage mode change [y,n,q,a,d%s,?]? "
987 +msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
988 +
989 +#: add-patch.c
990 +#, c-format
991 +msgid "Stage deletion [y,n,q,a,d%s,?]? "
992 +msgstr "暂存删除变更 [y,n,q,a,d%s,?]? "
993 +
994 +#: add-patch.c
995 +#, c-format
996 +msgid "Stage addition [y,n,q,a,d%s,?]? "
997 +msgstr "暂存新增变更 [y,n,q,a,d%s,?]? "
998 +
999 +#: add-patch.c
1000 +#, c-format
1001 +msgid "Stage this hunk [y,n,q,a,d%s,?]? "
1002 +msgstr "暂存该块 [y,n,q,a,d%s,?]? "
1003 +
1004 +#: add-patch.c
1005 +msgid "Revision does not refer to a commit"
1006 +msgstr "该版本并不指向一个提交"
1007 +
1008 #: advice.c
1009 #, c-format
1010 msgid ""
@@ -1132,29 +1230,55 @@ msgstr "regexec 返回 %d，输入为：%s"
1230
1231 #: apply.c
1232 #, c-format
1135 -msgid "unable to find filename in patch at line %d"
1136 -msgstr "无法在补丁的第 %d 行找到文件名"
1233 +msgid "unable to find filename in patch at %s:%d"
1234 +msgstr "无法在补丁 %s:%d 处找到文件名"
1235 +
1236 +#: apply.c
1237 +#, c-format
1238 +msgid "git apply: bad git-diff - expected /dev/null, got %s at %s:%d"
1239 +msgstr ""
1240 +"git apply：错误的 git-diff - 期望 /dev/null，但在 %2$s:%3$d 处得到 %1$s"
1241
1242 #: apply.c
1243 #, c-format
1244 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1245 msgstr "git apply：错误的 git-diff - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
1246
1247 +#: apply.c
1248 +#, c-format
1249 +msgid "git apply: bad git-diff - inconsistent new filename at %s:%d"
1250 +msgstr "git apply：错误的 git-diff - 在 %s:%d 处新文件名不一致"
1251 +
1252 +#: apply.c
1253 +#, c-format
1254 +msgid "git apply: bad git-diff - inconsistent old filename at %s:%d"
1255 +msgstr "git apply：错误的 git-diff - 在 %s:%d 处旧文件名不一致"
1256 +
1257 #: apply.c
1258 #, c-format
1259 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1146 -msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1260 +msgstr "git apply：错误的 git-diff - 第 %d 行处新文件名不一致"
1261
1262 #: apply.c
1263 #, c-format
1264 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1151 -msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1265 +msgstr "git apply：错误的 git-diff - 第 %d 行处旧文件名不一致"
1266 +
1267 +#: apply.c
1268 +#, c-format
1269 +msgid "git apply: bad git-diff - expected /dev/null at %s:%d"
1270 +msgstr "git apply：错误的 git-diff - 在 %s:%d 处应为 /dev/null"
1271
1272 #: apply.c
1273 #, c-format
1274 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1275 msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
1276
1277 +#: apply.c
1278 +#, c-format
1279 +msgid "invalid mode at %s:%d: %s"
1280 +msgstr "在 %s:%d 处模式无效：%s"
1281 +
1282 #: apply.c
1283 #, c-format
1284 msgid "invalid mode on line %d: %s"
@@ -1165,6 +1289,21 @@ msgstr "第 %d 行包含无效文件模式：%s"
1289 msgid "inconsistent header lines %d and %d"
1290 msgstr "不一致的文件头，%d 行和 %d 行"
1291
1292 +#: apply.c
1293 +#, c-format
1294 +msgid ""
1295 +"git diff header lacks filename information when removing %d leading pathname "
1296 +"component at %s:%d"
1297 +msgid_plural ""
1298 +"git diff header lacks filename information when removing %d leading pathname "
1299 +"components at %s:%d"
1300 +msgstr[0] ""
1301 +"当在 %2$s:%3$d 处移除前导路径名中的 %1$d 个组成部分时，git diff 的头信息缺少"
1302 +"文件名信息"
1303 +msgstr[1] ""
1304 +"当在 %2$s:%3$d 处移除前导路径名中的 %1$d 个组成部分时，git diff 的头信息缺少"
1305 +"文件名信息"
1306 +
1307 #: apply.c
1308 #, c-format
1309 msgid ""
@@ -1176,6 +1315,11 @@ msgid_plural ""
1315 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1316 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1317
1318 +#: apply.c
1319 +#, c-format
1320 +msgid "git diff header lacks filename information at %s:%d"
1321 +msgstr "git diff 头缺少文件名信息（%s:%d）"
1322 +
1323 #: apply.c
1324 #, c-format
1325 msgid "git diff header lacks filename information (line %d)"
@@ -1188,8 +1332,8 @@ msgstr "recount：意外的行：%.*s"
1332
1333 #: apply.c
1334 #, c-format
1191 -msgid "patch fragment without header at line %d: %.*s"
1192 -msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1335 +msgid "patch fragment without header at %s:%d: %.*s"
1336 +msgstr "在 %s:%d 的补丁片段缺少头信息：%.*s"
1337
1338 #: apply.c
1339 msgid "new file depends on old contents"
@@ -1201,8 +1345,8 @@ msgstr "删除的文件仍有内容"
1345
1346 #: apply.c
1347 #, c-format
1204 -msgid "corrupt patch at line %d"
1205 -msgstr "补丁在第 %d 行损坏"
1348 +msgid "corrupt patch at %s:%d"
1349 +msgstr "补丁在 %s:%d 损坏"
1350
1351 #: apply.c
1352 #, c-format
@@ -1221,18 +1365,18 @@ msgstr "** 警告：文件 %s 成为空文件但并未删除"
1365
1366 #: apply.c
1367 #, c-format
1224 -msgid "corrupt binary patch at line %d: %.*s"
1225 -msgstr "二进制补丁在第 %d 行损坏：%.*s"
1368 +msgid "corrupt binary patch at %s:%d: %.*s"
1369 +msgstr "二进制补丁在 %s:%d 损坏：%.*s"
1370
1371 #: apply.c
1372 #, c-format
1229 -msgid "unrecognized binary patch at line %d"
1230 -msgstr "未能识别的二进制补丁位于第 %d 行"
1373 +msgid "unrecognized binary patch at %s:%d"
1374 +msgstr "在 %s:%d 处无法识别的二进制补丁"
1375
1376 #: apply.c
1377 #, c-format
1234 -msgid "patch with only garbage at line %d"
1235 -msgstr "补丁文件的第 %d 行只有垃圾数据"
1378 +msgid "patch with only garbage at %s:%d"
1379 +msgstr "补丁在 %s:%d 处仅有无效内容"
1380
1381 #: apply.c
1382 #, c-format
@@ -1548,6 +1692,16 @@ msgstr "输入中没有合法补丁（可用 \"--allow-empty\" 允许）"
1692 msgid "unable to read index file"
1693 msgstr "无法读取索引文件"
1694
1695 +#: apply.c
1696 +#, c-format
1697 +msgid "option -p expects a non-negative integer, got '%s'"
1698 +msgstr "选项 -p 需要非负整数，得到的是 '%s'"
1699 +
1700 +#: apply.c
1701 +#, c-format
1702 +msgid "unable to normalize directory: '%s'"
1703 +msgstr "无法规范化目录：'%s'"
1704 +
1705 #: apply.c
1706 #, c-format
1707 msgid "can't open patch '%s': %s"
@@ -1816,7 +1970,7 @@ msgstr "文件未找到：%s"
1970 #: archive.c
1971 #, c-format
1972 msgid "Not a regular file: %s"
1819 -msgstr "不是一个常规文件：%s"
1973 +msgstr "不是一个普通文件：%s"
1974
1975 #: archive.c
1976 #, c-format
@@ -2391,6 +2545,10 @@ msgstr "交互式拣选"
2545 msgid "select hunks interactively"
2546 msgstr "交互式挑选数据块"
2547
2548 +#: builtin/add.c builtin/checkout.c builtin/reset.c builtin/stash.c
2549 +msgid "auto advance to the next file when selecting hunks interactively"
2550 +msgstr "在交互式选择补丁块时自动前进到下一个文件"
2551 +
2552 #: builtin/add.c
2553 msgid "edit current diff and apply"
2554 msgstr "编辑当前差异并应用"
@@ -2518,7 +2676,7 @@ msgid "index file corrupt"
2676 msgstr "索引文件损坏"
2677
2678 #: builtin/add.c builtin/am.c builtin/checkout.c builtin/clone.c
2521 -#: builtin/commit.c builtin/stash.c merge.c rerere.c
2679 +#: builtin/commit.c builtin/history.c builtin/stash.c merge.c rerere.c
2680 msgid "unable to write new index file"
2681 msgstr "无法写新的索引文件"
2682
@@ -2534,7 +2692,7 @@ msgstr "用于 '%2$s' 的动作 '%1$s' 无效"
2692 msgid "invalid value for '%s': '%s'"
2693 msgstr "'%s' 的值无效：'%s'"
2694
2537 -#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c
2695 +#: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c trailer.c
2696 #, c-format
2697 msgid "could not read '%s'"
2698 msgstr "无法读取 '%s'"
@@ -2683,7 +2841,7 @@ msgstr "git write-tree 无法写入树对象"
2841 msgid "applying to an empty history"
2842 msgstr "正应用到一个空历史上"
2843
2686 -#: builtin/am.c builtin/commit.c builtin/merge.c builtin/replay.c sequencer.c
2844 +#: builtin/am.c builtin/commit.c builtin/merge.c replay.c sequencer.c
2845 msgid "failed to write commit object"
2846 msgstr "无法写提交对象"
2847
@@ -3010,6 +3168,12 @@ msgstr "单次请求的最少对象数量"
3168 msgid "Restrict the missing objects to the current sparse-checkout"
3169 msgstr "将缺少的对象限制在当前的稀疏检出中"
3170
3171 +#: builtin/backfill.c builtin/diff-pairs.c builtin/log.c builtin/replay.c
3172 +#: builtin/shortlog.c bundle.c
3173 +#, c-format
3174 +msgid "unrecognized argument: %s"
3175 +msgstr "未识别的参数：%s"
3176 +
3177 #: builtin/bisect.c
3178 msgid ""
3179 "git bisect start [--term-(bad|new)=<term-new> --term-(good|old)=<term-old>]\n"
@@ -3639,12 +3803,12 @@ msgstr "分支 '%s' 未找到"
3803 #: builtin/branch.c
3804 #, c-format
3805 msgid "Deleted remote-tracking branch %s (was %s).\n"
3642 -msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
3806 +msgstr "已删除远程跟踪分支 %s（原为 %s）。\n"
3807
3808 #: builtin/branch.c
3809 #, c-format
3810 msgid "Deleted branch %s (was %s).\n"
3647 -msgstr "已删除分支 %s（曾为 %s）。\n"
3811 +msgstr "已删除分支 %s（原为 %s）。\n"
3812
3813 #: builtin/branch.c builtin/tag.c
3814 msgid "unable to parse format string"
@@ -4497,22 +4661,6 @@ msgstr "将内容写入临时文件"
4661 msgid "copy out the files from named stage"
4662 msgstr "从指定暂存区中拷出文件"
4663
4500 -#: builtin/checkout.c
4501 -msgid "git checkout [<options>] <branch>"
4502 -msgstr "git checkout [<选项>] <分支>"
4503 -
4504 -#: builtin/checkout.c
4505 -msgid "git checkout [<options>] [<branch>] -- <file>..."
4506 -msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
4507 -
4508 -#: builtin/checkout.c
4509 -msgid "git switch [<options>] [<branch>]"
4510 -msgstr "git switch [<选项>] [<分支>]"
4511 -
4512 -#: builtin/checkout.c
4513 -msgid "git restore [<options>] [--source=<branch>] <file>..."
4514 -msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
4515 -
4664 #: builtin/checkout.c
4665 #, c-format
4666 msgid "path '%s' does not have our version"
@@ -4732,23 +4880,24 @@ msgstr ""
4880 "请使用 --（和可选的 --no-guess）来消除歧义"
4881
4882 #: builtin/checkout.c
4883 +#, c-format
4884 msgid ""
4885 "If you meant to check out a remote tracking branch on, e.g. 'origin',\n"
4886 "you can do so by fully qualifying the name with the --track option:\n"
4887 "\n"
4739 -" git checkout --track origin/<name>\n"
4888 +" git %s --track origin/<name>\n"
4889 "\n"
4890 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
4891 "one remote, e.g. the 'origin' remote, consider setting\n"
4892 "checkout.defaultRemote=origin in your config."
4893 msgstr ""
4745 -"如果您想要检出一个远程跟踪分支，例如在 'origin' 上的，您可以使用分支\n"
4746 -"全名和 --track 选项：\n"
4894 +"若您想检出远程跟踪分支（例如在 'origin' 上），可以使用 --track 选项写出完整名"
4895 +"称：\n"
4896 "\n"
4748 -" git checkout --track origin/<名称>\n"
4897 +" git %s --track origin/<名称>\n"
4898 "\n"
4750 -"如果您希望在检出模糊的简短分支名 <名称> 时总是偏好某个远程（如 'origin'），\n"
4751 -"可以在配置中设置 checkout.defaultRemote=origin。"
4899 +"若希望在检出含义模糊的 <名称> 时总是偏好某个远程（例如 'origin'），\n"
4900 +"可在配置中设置 checkout.defaultRemote=origin。"
4901
4902 #: builtin/checkout.c
4903 #, c-format
@@ -4929,6 +5078,22 @@ msgstr "对尚未合并的文件检出他们的版本"
5078 msgid "do not limit pathspecs to sparse entries only"
5079 msgstr "对路径规格不只限于稀疏条目"
5080
5081 +#: builtin/checkout.c
5082 +msgid "git checkout [<options>] <branch>"
5083 +msgstr "git checkout [<选项>] <分支>"
5084 +
5085 +#: builtin/checkout.c
5086 +msgid "git checkout [<options>] [<branch>] -- <file>..."
5087 +msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
5088 +
5089 +#: builtin/checkout.c
5090 +msgid "git switch [<options>] [<branch>]"
5091 +msgstr "git switch [<选项>] [<分支>]"
5092 +
5093 +#: builtin/checkout.c
5094 +msgid "git restore [<options>] [--source=<branch>] <file>..."
5095 +msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
5096 +
5097 #: builtin/checkout.c
5098 #, c-format
5099 msgid "options '-%c', '-%c', and '%s' cannot be used together"
@@ -6008,7 +6173,8 @@ msgstr "无法读取 SQUASH_MSG"
6173 msgid "could not read MERGE_MSG"
6174 msgstr "无法读取 MERGE_MSG"
6175
6011 -#: builtin/commit.c bundle.c rerere.c sequencer.c
6176 +#: builtin/commit.c builtin/history.c builtin/submodule--helper.c bundle.c
6177 +#: rerere.c sequencer.c
6178 #, c-format
6179 msgid "could not open '%s'"
6180 msgstr "无法打开 '%s'"
@@ -6310,11 +6476,11 @@ msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交"
6476 msgid "the commit is authored by me now (used with -C/-c/--amend)"
6477 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
6478
6313 -#: builtin/commit.c builtin/interpret-trailers.c builtin/tag.c
6479 +#: builtin/commit.c builtin/interpret-trailers.c builtin/rebase.c builtin/tag.c
6480 msgid "trailer"
6481 msgstr "尾注"
6482
6317 -#: builtin/commit.c builtin/tag.c
6483 +#: builtin/commit.c builtin/rebase.c builtin/tag.c
6484 msgid "add custom trailer(s)"
6485 msgstr "添加自定义尾注"
6486
@@ -6401,7 +6567,7 @@ msgstr "无法读取 MERGE_MODE"
6567 msgid "could not read commit message: %s"
6568 msgstr "无法读取提交说明：%s"
6569
6404 -#: builtin/commit.c
6570 +#: builtin/commit.c builtin/history.c
6571 #, c-format
6572 msgid "Aborting commit due to empty commit message.\n"
6573 msgstr "由于提交说明为空，终止提交。\n"
@@ -7139,12 +7305,6 @@ msgstr "无法解析对象 ID：%s"
7305 msgid "git diff-pairs -z [<diff-options>]"
7306 msgstr "git diff-pairs -z [<差异选项>]"
7307
7142 -#: builtin/diff-pairs.c builtin/log.c builtin/replay.c builtin/shortlog.c
7143 -#: bundle.c
7144 -#, c-format
7145 -msgid "unrecognized argument: %s"
7146 -msgstr "未识别的参数：%s"
7147 -
7308 #: builtin/diff-pairs.c
7309 msgid "working without -z is not supported"
7310 msgstr "不支持在不带 -z 参数的情况下工作"
@@ -7418,14 +7578,6 @@ msgstr "正在剥离提交 %s 的签名"
7578 msgid "encountered signed commit %s; use --signed-commits=<mode> to handle it"
7579 msgstr "遇到已签名提交 %s；使用 --signed-commits=<模式> 来处理"
7580
7421 -#: builtin/fast-export.c
7422 -msgid ""
7423 -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7424 -"commits=<mode>"
7425 -msgstr ""
7426 -"在 git fast-export 的 --signed-commits=<模式> 中，'strip-if-invalid' 不是有效"
7427 -"模式"
7428 -
7581 #: builtin/fast-export.c
7582 #, c-format
7583 msgid ""
@@ -7455,14 +7607,6 @@ msgstr "正在从标签 %s 中剥离签名"
7607 msgid "encountered signed tag %s; use --signed-tags=<mode> to handle it"
7608 msgstr "遇到已签名标签 %s；使用 --signed-tags=<模式> 来处理"
7609
7458 -#: builtin/fast-export.c
7459 -msgid ""
7460 -"'strip-if-invalid' is not a valid mode for git fast-export with --signed-"
7461 -"tags=<mode>"
7462 -msgstr ""
7463 -"在 git fast-export 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模"
7464 -"式"
7465 -
7610 #: builtin/fast-export.c
7611 #, c-format
7612 msgid ""
@@ -7984,6 +8128,41 @@ msgstr ""
8128 "正在剥离提交的无效签名\n"
8129 " 据称由 %s 提供"
8130
8131 +#: builtin/fast-import.c
8132 +#, c-format
8133 +msgid ""
8134 +"replacing invalid signature for commit '%.100s...'\n"
8135 +" allegedly by %s"
8136 +msgstr ""
8137 +"正在替换提交 '%.100s...' 的无效签名\n"
8138 +" 据称由 %s 签署"
8139 +
8140 +#: builtin/fast-import.c
8141 +#, c-format
8142 +msgid ""
8143 +"replacing invalid signature for commit '%.*s'\n"
8144 +" allegedly by %s"
8145 +msgstr ""
8146 +"正在替换提交 '%.*s' 的无效签名\n"
8147 +" 据称由 %s 签署"
8148 +
8149 +#: builtin/fast-import.c
8150 +#, c-format
8151 +msgid ""
8152 +"replacing invalid signature for commit\n"
8153 +" allegedly by %s"
8154 +msgstr ""
8155 +"正在替换提交的无效签名\n"
8156 +" 据称由 %s 签署"
8157 +
8158 +#: builtin/fast-import.c
8159 +msgid "signing commits in interoperability mode is unsupported"
8160 +msgstr "互操作模式下不支持为提交签名"
8161 +
8162 +#: builtin/fast-import.c
8163 +msgid "failed to sign commit object"
8164 +msgstr "无法为提交对象签名"
8165 +
8166 #: builtin/fast-import.c
8167 msgid "expected committer but didn't get one"
8168 msgstr "预期提交者但未获得"
@@ -8014,14 +8193,6 @@ msgstr "正在剥离标签 '%s' 的签名"
8193 msgid "encountered signed tag; use --signed-tags=<mode> to handle it"
8194 msgstr "遇到已签名标签；使用 --signed-tags=<模式> 来处理它"
8195
8017 -#: builtin/fast-import.c
8018 -msgid ""
8019 -"'strip-if-invalid' is not a valid mode for git fast-import with --signed-"
8020 -"tags=<mode>"
8021 -msgstr ""
8022 -"在 git fast-import 的 --signed-tags=<模式> 中，'strip-if-invalid' 不是有效模"
8023 -"式"
8024 -
8196 #: builtin/fast-import.c
8197 #, c-format
8198 msgid "expected 'from' command, got '%s'"
@@ -9209,7 +9380,7 @@ msgstr "分开打包未引用的对象"
9380
9381 #: builtin/gc.c builtin/repack.c
9382 msgid "with --cruft, limit the size of new cruft packs"
9212 -msgstr "使用 --cruft，限制新 cruft 包的总大小"
9383 +msgstr "使用 --cruft，限制新废弃包的总大小"
9384
9385 #: builtin/gc.c
9386 msgid "be more thorough (increased runtime)"
@@ -9968,13 +10139,185 @@ msgstr "用法：%s%s"
10139 msgid "'git help config' for more information"
10140 msgstr "'git help config' 获取更多信息"
10141
10142 +#: builtin/history.c
10143 +msgid "git history reword <commit> [--dry-run] [--update-refs=(branches|head)]"
10144 +msgstr "git history reword <提交> [--dry-run] [--update-refs=(branches|head)]"
10145 +
10146 +#: builtin/history.c
10147 +msgid ""
10148 +"git history split <commit> [--dry-run] [--update-refs=(branches|head)] [--] "
10149 +"[<pathspec>...]"
10150 +msgstr ""
10151 +"git history split <提交> [--dry-run] [--update-refs=(branches|head)] [--] [<"
10152 +"路径规格>...]"
10153 +
10154 +#: builtin/history.c
10155 +#, c-format
10156 +msgid ""
10157 +"Please enter the commit message for the %s changes. Lines starting\n"
10158 +"with '%s' will be ignored, and an empty message aborts the commit.\n"
10159 +msgstr ""
10160 +"请输入针对 %s 变更的提交说明。以 '%s' 开头的行将被忽略，空说明将中止提交。\n"
10161 +
10162 +#: builtin/history.c
10163 +#, c-format
10164 +msgid "Aborting commit as launching the editor failed.\n"
10165 +msgstr "启动编辑器失败，正在中止提交。\n"
10166 +
10167 +#: builtin/history.c
10168 +#, c-format
10169 +msgid "unable to parse parent commit %s"
10170 +msgstr "无法解析父提交 %s"
10171 +
10172 +#: builtin/history.c
10173 +#, c-format
10174 +msgid "%s expects one of 'branches' or 'head'"
10175 +msgstr "%s 需要 'branches' 或 'head' 之一"
10176 +
10177 +#: builtin/history.c replay.c
10178 +msgid "error preparing revisions"
10179 +msgstr "准备版本时错误"
10180 +
10181 +#: builtin/history.c replay.c
10182 +msgid "replaying merge commits is not supported yet!"
10183 +msgstr "目前还不支持重放合并提交！"
10184 +
10185 +#: builtin/history.c
10186 +msgid "cannot look up HEAD"
10187 +msgstr "无法查找 HEAD"
10188 +
10189 +#: builtin/history.c
10190 +msgid "cannot determine descendance"
10191 +msgstr "无法确定祖先关系"
10192 +
10193 +#: builtin/history.c
10194 +msgid ""
10195 +"rewritten commit must be an ancestor of HEAD when using --update-refs=head"
10196 +msgstr "使用 --update-refs=head 时，重写后的提交必须是 HEAD 的祖先"
10197 +
10198 +#: builtin/history.c builtin/replay.c
10199 +#, c-format
10200 +msgid "failed to begin ref transaction: %s"
10201 +msgstr "无法开始引用事务：%s"
10202 +
10203 +#: builtin/history.c builtin/replay.c
10204 +#, c-format
10205 +msgid "failed to update ref '%s': %s"
10206 +msgstr "无法更新引用 '%s'：%s"
10207 +
10208 +#: builtin/history.c builtin/replay.c
10209 +#, c-format
10210 +msgid "failed to commit ref transaction: %s"
10211 +msgstr "无法提交引用事务：%s"
10212 +
10213 +#: builtin/history.c
10214 +msgid "perform a dry-run without updating any refs"
10215 +msgstr "试运行（不更新任何引用）"
10216 +
10217 +#: builtin/history.c
10218 +msgid "command expects a single revision"
10219 +msgstr "该命令需要一个版本"
10220 +
10221 +#: builtin/history.c
10222 +#, c-format
10223 +msgid "commit cannot be found: %s"
10224 +msgstr "找不到提交：%s"
10225 +
10226 +#: builtin/history.c
10227 +msgid "failed writing reworded commit"
10228 +msgstr "写入重写后的提交失败"
10229 +
10230 +#: builtin/history.c
10231 +msgid "failed replaying descendants"
10232 +msgstr "重放后代提交失败"
10233 +
10234 +#: builtin/history.c
10235 +msgid "unable to populate index with tree"
10236 +msgstr "无法用树填充索引"
10237 +
10238 +#: builtin/history.c
10239 +msgid "unable to acquire index lock"
10240 +msgstr "无法获取索引锁"
10241 +
10242 +#: builtin/history.c
10243 +msgid "failed reading temporary index"
10244 +msgstr "读取临时索引失败"
10245 +
10246 +#: builtin/history.c
10247 +msgid "failed split tree"
10248 +msgstr "拆分树失败"
10249 +
10250 +#: builtin/history.c
10251 +msgid "split commit is empty"
10252 +msgstr "拆分得到的提交为空"
10253 +
10254 +#: builtin/history.c
10255 +msgid "split commit tree matches original commit"
10256 +msgstr "拆分提交的树与原始提交相同"
10257 +
10258 +#: builtin/history.c
10259 +msgid "failed writing first commit"
10260 +msgstr "写入第一个提交失败"
10261 +
10262 +#: builtin/history.c
10263 +msgid "failed writing second commit"
10264 +msgstr "写入第二个提交失败"
10265 +
10266 +#: builtin/history.c
10267 +msgid "command expects a committish"
10268 +msgstr "该命令需要一个提交号"
10269 +
10270 +#: builtin/history.c
10271 +msgid "cannot split up merge commit"
10272 +msgstr "无法拆分合并提交"
10273 +
10274 +#: builtin/hook.c
10275 +msgid ""
10276 +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-"
10277 +"stdin=<path>] <hook-name> [-- <hook-args>]"
10278 +msgstr ""
10279 +"git hook run [--allow-unknown-hook-name] [--ignore-missing] [--to-stdin=<路径"
10280 +">] <钩子名称> [-- <钩子参数>]"
10281 +
10282 +#: builtin/hook.c
10283 +msgid ""
10284 +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <hook-name>"
10285 +msgstr ""
10286 +"git hook list [--allow-unknown-hook-name] [-z] [--show-scope] <钩子名称>"
10287 +
10288 +#: builtin/hook.c
10289 +msgid "use NUL as line terminator"
10290 +msgstr "使用 NUL 作为行终止符"
10291 +
10292 +#: builtin/hook.c
10293 +msgid "show the config scope that defined each hook"
10294 +msgstr "显示定义每个钩子的配置作用域"
10295 +
10296 #: builtin/hook.c
10297 +msgid "allow running a hook with a non-native hook name"
10298 +msgstr "允许使用非原生钩子名称运行钩子"
10299 +
10300 +#: builtin/hook.c
10301 +msgid "you must specify a hook event name to list"
10302 +msgstr "列出时必须指定钩子事件名称"
10303 +
10304 +#: builtin/hook.c
10305 +#, c-format
10306 msgid ""
9973 -"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
9974 -"args>]"
10307 +"unknown hook event '%s';\n"
10308 +"use --allow-unknown-hook-name to allow non-native hook names"
10309 msgstr ""
9976 -"git hook run [--ignore-missing] [--to-stdin=<路径>] <钩子名称> [-- <钩子参数"
9977 -">]"
10310 +"未知的钩子事件 '%s'；\n"
10311 +"请使用 --allow-unknown-hook-name 以允许非原生钩子名称"
10312 +
10313 +#: builtin/hook.c
10314 +#, c-format
10315 +msgid "no hooks found for event '%s'"
10316 +msgstr "未找到事件 '%s' 的钩子"
10317 +
10318 +#: builtin/hook.c
10319 +msgid "hook from hookdir"
10320 +msgstr "来自 hookdir 的钩子"
10321
10322 #: builtin/hook.c
10323 msgid "silently ignore missing requested <hook-name>"
@@ -10357,25 +10700,6 @@ msgstr ""
10700 " [(--trailer (<键|键别名>)[(=|:)<值>])...]\n"
10701 " [--parse] [<文件>...]"
10702
10360 -#: builtin/interpret-trailers.c wrapper.c
10361 -#, c-format
10362 -msgid "could not stat %s"
10363 -msgstr "无法对 %s 调用 stat"
10364 -
10365 -#: builtin/interpret-trailers.c
10366 -#, c-format
10367 -msgid "file %s is not a regular file"
10368 -msgstr "文件 %s 不是一个普通文件"
10369 -
10370 -#: builtin/interpret-trailers.c
10371 -#, c-format
10372 -msgid "file %s is not writable by user"
10373 -msgstr "文件 %s 用户不可写"
10374 -
10375 -#: builtin/interpret-trailers.c
10376 -msgid "could not open temporary file"
10377 -msgstr "无法打开临时文件"
10378 -
10703 #: builtin/interpret-trailers.c
10704 #, c-format
10705 msgid "could not read input file '%s'"
@@ -10387,6 +10711,11 @@ msgstr "无法自标准输入读取"
10711
10712 #: builtin/interpret-trailers.c
10713 #, c-format
10714 +msgid "could not write to temporary file '%s'"
10715 +msgstr "无法写入临时文件 '%s'"
10716 +
10717 +#: builtin/interpret-trailers.c trailer.c
10718 +#, c-format
10719 msgid "could not rename temporary file to %s"
10720 msgstr "无法重命名临时文件为 %s"
10721
@@ -10419,8 +10748,8 @@ msgid "output only the trailers"
10748 msgstr "只输出尾注"
10749
10750 #: builtin/interpret-trailers.c
10422 -msgid "do not apply trailer.* configuration variables"
10423 -msgstr "不应用 trailer.* 配置变量"
10751 +msgid "do not apply trailer.<key-alias> configuration variables"
10752 +msgstr "不应用 trailer.<键别名> 配置变量"
10753
10754 #: builtin/interpret-trailers.c
10755 msgid "reformat multiline trailer values as single-line values"
@@ -10447,24 +10776,26 @@ msgid "no input file given for in-place editing"
10776 msgstr "没有给出要原位编辑的文件"
10777
10778 #: builtin/last-modified.c
10450 -msgid "last-modified can only operate on one tree at a time"
10451 -msgstr "last-modified 一次只能在一个树对象上操作"
10779 +msgid "last-modified can only operate on one commit at a time"
10780 +msgstr "last-modified 一次只能处理一个提交"
10781
10782 #: builtin/last-modified.c
10783 #, c-format
10455 -msgid "unknown last-modified argument: %s"
10456 -msgstr "未知的 last-modified 参数：%s"
10784 +msgid "revision argument '%s' is a %s, not a commit-ish"
10785 +msgstr "版本参数 '%s' 是 %s，不是提交号"
10786
10787 #: builtin/last-modified.c
10459 -msgid "unable to setup last-modified"
10460 -msgstr "无法设置 last-modified"
10788 +#, c-format
10789 +msgid "unknown last-modified argument: %s"
10790 +msgstr "未知的 last-modified 参数：%s"
10791
10792 #: builtin/last-modified.c
10793 msgid ""
10464 -"git last-modified [--recursive] [--show-trees] [<revision-range>] [[--] "
10465 -"<path>...]"
10794 +"git last-modified [--recursive] [--show-trees] [--max-depth=<depth>] [-z]\n"
10795 +" [<revision-range>] [[--] <pathspec>...]"
10796 msgstr ""
10467 -"git last-modified [--recursive] [--show-trees] [<版本范围>] [[--] <路径>...]"
10797 +"git last-modified [--recursive] [--show-trees] [--max-depth=<深度>] [-z]\n"
10798 +" [<版本范围>] [[--] <路径规格>...]"
10799
10800 #: builtin/last-modified.c builtin/ls-tree.c
10801 msgid "recurse into subtrees"
@@ -10474,6 +10805,14 @@ msgstr "递归到子树"
10805 msgid "show tree entries when recursing into subtrees"
10806 msgstr "递归进入子目录时，显示树的条目"
10807
10808 +#: builtin/last-modified.c diff.c
10809 +msgid "maximum tree depth to recurse"
10810 +msgstr "递归的最大树深度"
10811 +
10812 +#: builtin/last-modified.c
10813 +msgid "lines are separated with NUL character"
10814 +msgstr "行以 NUL 字符分隔"
10815 +
10816 #: builtin/log.c
10817 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
10818 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
@@ -10561,6 +10900,20 @@ msgstr "%s：从描述生成附函的模式无效"
10900 msgid "format.headers without value"
10901 msgstr "format.headers 没有值"
10902
10903 +#: builtin/log.c config.c
10904 +#, c-format
10905 +msgid "bad boolean config value '%s' for '%s'"
10906 +msgstr "配置变量 '%2$s' 的布尔值 '%1$s' 无效"
10907 +
10908 +#: builtin/log.c
10909 +#, c-format
10910 +msgid ""
10911 +"'%s' used to accept any value and treat that as 'true'.\n"
10912 +"Now it only accepts boolean values, like what '%s' does.\n"
10913 +msgstr ""
10914 +"'%s' 过去接受任意值并将其视为 'true'。\n"
10915 +"现在只接受布尔值，行为与 '%s' 相同。\n"
10916 +
10917 #: builtin/log.c
10918 #, c-format
10919 msgid "cannot open patch file %s"
@@ -10587,6 +10940,11 @@ msgstr "附函需要邮件地址格式"
10940 msgid "failed to create cover-letter file"
10941 msgstr "无法创建附函文件"
10942
10943 +#: builtin/log.c
10944 +#, c-format
10945 +msgid "'%s' is not a valid format string"
10946 +msgstr "'%s' 不是有效的格式字符串"
10947 +
10948 #: builtin/log.c
10949 #, c-format
10950 msgid "insane in-reply-to: %s"
@@ -10665,6 +11023,14 @@ msgstr "打印补丁到标准输出"
11023 msgid "generate a cover letter"
11024 msgstr "生成一封附函"
11025
11026 +#: builtin/log.c
11027 +msgid "format-spec"
11028 +msgstr "格式规格"
11029 +
11030 +#: builtin/log.c
11031 +msgid "format spec used for the commit list in the cover letter"
11032 +msgstr "附函中提交列表所用的格式规格"
11033 +
11034 #: builtin/log.c
11035 msgid "use simple number sequence for output file names"
11036 msgstr "使用简单的数字序列作为输出文件名"
@@ -11781,11 +12147,21 @@ msgstr "允许创建一个以上的树"
12147
12148 #: builtin/multi-pack-index.c
12149 msgid ""
11784 -"git multi-pack-index [<options>] write [--preferred-pack=<pack>][--refs-"
11785 -"snapshot=<path>]"
12150 +"git multi-pack-index [<options>] write [--preferred-pack=<pack>]\n"
12151 +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
12152 +" [--refs-snapshot=<path>]"
12153 msgstr ""
11787 -"git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<"
11788 -"路径>]"
12154 +"git multi-pack-index [<选项>] write [--preferred-pack=<包>]\n"
12155 +" [--[no-]bitmap] [--[no-]incremental] [--[no-]stdin-packs]\n"
12156 +" [--refs-snapshot=<路径>]"
12157 +
12158 +#: builtin/multi-pack-index.c
12159 +msgid ""
12160 +"git multi-pack-index [<options>] compact [--[no-]incremental]\n"
12161 +" [--[no-]bitmap] <from> <to>"
12162 +msgstr ""
12163 +"git multi-pack-index [<选项>] compact [--[no-]incremental]\n"
12164 +" [--[no-]bitmap] <源> <目标>"
12165
12166 #: builtin/multi-pack-index.c
12167 msgid "git multi-pack-index [<options>] verify"
@@ -11831,6 +12207,20 @@ msgstr "写入只包括给定索引的多包索引"
12207 msgid "refs snapshot for selecting bitmap commits"
12208 msgstr "用于选择位图提交的引用快照"
12209
12210 +#: builtin/multi-pack-index.c
12211 +#, c-format
12212 +msgid "could not find MIDX: %s"
12213 +msgstr "找不到 MIDX：%s"
12214 +
12215 +#: builtin/multi-pack-index.c
12216 +msgid "MIDX compaction endpoints must be unique"
12217 +msgstr "MIDX 压缩的端点必须唯一"
12218 +
12219 +#: builtin/multi-pack-index.c
12220 +#, c-format
12221 +msgid "MIDX %s must be an ancestor of %s"
12222 +msgstr "MIDX %s 必须是 %s 的祖先"
12223 +
12224 #: builtin/multi-pack-index.c
12225 msgid ""
12226 "during repack, collect pack-files of smaller size into a batch that is "
@@ -12582,13 +12972,13 @@ msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
12972
12973 #: builtin/pack-objects.c
12974 #, c-format
12585 -msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
12586 -msgstr "包文件 %s 是承诺者，但已给出 --exclude-promisor-objects"
12975 +msgid "could not find pack '%s'"
12976 +msgstr "无法找到包 '%s'"
12977
12978 #: builtin/pack-objects.c
12979 #, c-format
12590 -msgid "could not find pack '%s'"
12591 -msgstr "无法找到包 '%s'"
12980 +msgid "packfile %s is a promisor but --exclude-promisor-objects was given"
12981 +msgstr "包文件 %s 是承诺者，但已给出 --exclude-promisor-objects"
12982
12983 #: builtin/pack-objects.c
12984 #, c-format
@@ -12625,10 +13015,6 @@ msgstr ""
13015 "预期对象 ID，却得到垃圾数据：\n"
13016 " %s"
13017
12628 -#: builtin/pack-objects.c reachable.c
12629 -msgid "could not load cruft pack .mtimes"
12630 -msgstr "无法载入废弃包 .mtimes"
12631 -
13018 #: builtin/pack-objects.c
13019 msgid "cannot open pack index"
13020 msgstr "无法打开包文件索引"
@@ -15331,61 +15717,34 @@ msgstr "--convert-graft-file 不带参数"
15717 msgid "only one pattern can be given with -l"
15718 msgstr "只能为 -l 提供一个模式"
15719
15334 -#: builtin/replay.c
15335 -#, c-format
15336 -msgid "'%s' is not a valid commit-ish for %s"
15337 -msgstr "'%s' 不是 %s 的有效提交号"
15338 -
15339 -#: builtin/replay.c
15340 -msgid "need some commits to replay"
15341 -msgstr "需要一些提交来重放"
15342 -
15343 -#: builtin/replay.c
15344 -msgid "all positive revisions given must be references"
15345 -msgstr "提供的所有正向版本必须为引用"
15346 -
15347 -#: builtin/replay.c
15348 -msgid "argument to --advance must be a reference"
15349 -msgstr "--advance 的参数必须是引用"
15350 -
15351 -#: builtin/replay.c
15352 -msgid ""
15353 -"cannot advance target with multiple sources because ordering would be ill-"
15354 -"defined"
15355 -msgstr "无法使用多个源推进目标，因为无法明确如何排序"
15356 -
15720 #: builtin/replay.c
15721 #, c-format
15722 msgid "invalid %s value: '%s'"
15723 msgstr "无效的 %s 值：'%s'"
15724
15725 #: builtin/replay.c
15363 -msgid ""
15364 -"(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance "
15365 -"<branch>) [--ref-action[=<mode>]] <revision-range>"
15366 -msgstr ""
15367 -"（试验中！）git replay ([--contained] --onto <新基线> | --advance <分支>) [--"
15368 -"ref-action[=<模式>]] <版本范围>"
15369 -
15370 -#: builtin/replay.c
15371 -msgid "make replay advance given branch"
15372 -msgstr "重放时演进给定的分支"
15726 +msgid "update all branches that point at commits in <revision-range>"
15727 +msgstr "更新指向 <版本范围> 中提交的所有分支"
15728
15729 #: builtin/replay.c
15730 msgid "replay onto given commit"
15731 msgstr "重放到给定提交"
15732
15733 #: builtin/replay.c
15379 -msgid "update all branches that point at commits in <revision-range>"
15380 -msgstr "更新指向 <版本范围> 中提交的所有分支"
15734 +msgid "make replay advance given branch"
15735 +msgstr "在给定分支上重放并演进该分支"
15736 +
15737 +#: builtin/replay.c
15738 +msgid "revert commits onto given branch"
15739 +msgstr "在给定分支上还原提交"
15740
15741 #: builtin/replay.c
15742 msgid "control ref update behavior (update|print)"
15743 msgstr "控制引用更新行为（update|print）"
15744
15745 #: builtin/replay.c
15387 -msgid "option --onto or --advance is mandatory"
15388 -msgstr "选项 --onto 或 --advance 必须指定其一"
15746 +msgid "exactly one of --onto, --advance, or --revert is required"
15747 +msgstr "必须指定 --onto、--advance 或 --revert 之一"
15748
15749 #: builtin/replay.c
15750 #, c-format
@@ -15395,38 +15754,15 @@ msgid ""
15754 msgstr ""
15755 "一些版本遍历选项将被覆盖，如 'struct rev_info' 中的 '%s' 位将被强制设定"
15756
15398 -#: builtin/replay.c
15399 -#, c-format
15400 -msgid "failed to begin ref transaction: %s"
15401 -msgstr "无法开始引用事务：%s"
15402 -
15403 -#: builtin/replay.c
15404 -msgid "error preparing revisions"
15405 -msgstr "准备版本时错误"
15406 -
15407 -#: builtin/replay.c
15408 -msgid "replaying down from root commit is not supported yet!"
15409 -msgstr "目前还不支持从根提交向下重放！"
15410 -
15411 -#: builtin/replay.c
15412 -msgid "replaying merge commits is not supported yet!"
15413 -msgstr "目前还不支持重放合并提交！"
15414 -
15415 -#: builtin/replay.c
15416 -#, c-format
15417 -msgid "failed to update ref '%s': %s"
15418 -msgstr "无法更新引用 '%s'：%s"
15419 -
15420 -#: builtin/replay.c
15421 -#, c-format
15422 -msgid "failed to commit ref transaction: %s"
15423 -msgstr "无法提交引用事务：%s"
15424 -
15757 #: builtin/repo.c
15758 #, c-format
15759 msgid "key '%s' not found"
15760 msgstr "未找到键 '%s'"
15761
15762 +#: builtin/repo.c
15763 +msgid "--keys can only be used with --format=lines or --format=nul"
15764 +msgstr "--keys 只能与 --format=lines 或 --format=nul 一起使用"
15765 +
15766 #: builtin/repo.c
15767 #, c-format
15768 msgid "invalid format '%s'"
@@ -15444,6 +15780,14 @@ msgstr "和 --format=nul 同义"
15780 msgid "print all keys/values"
15781 msgstr "打印所有键/值"
15782
15783 +#: builtin/repo.c
15784 +msgid "show keys"
15785 +msgstr "显示键"
15786 +
15787 +#: builtin/repo.c
15788 +msgid "--keys cannot be used with a <key> or --all"
15789 +msgstr "--keys 不能与 <键> 或 --all 一起使用"
15790 +
15791 #: builtin/repo.c
15792 msgid "unsupported output format"
15793 msgstr "不支持的输出格式"
@@ -15500,6 +15844,22 @@ msgstr "展开后大小"
15844 msgid "Disk size"
15845 msgstr "磁盘大小"
15846
15847 +#: builtin/repo.c
15848 +msgid "Largest objects"
15849 +msgstr "最大的对象"
15850 +
15851 +#: builtin/repo.c
15852 +msgid "Maximum size"
15853 +msgstr "最大大小"
15854 +
15855 +#: builtin/repo.c
15856 +msgid "Maximum parents"
15857 +msgstr "最大父提交数"
15858 +
15859 +#: builtin/repo.c
15860 +msgid "Maximum entries"
15861 +msgstr "最大条目数"
15862 +
15863 #: builtin/repo.c
15864 msgid "Repository structure"
15865 msgstr "仓库结构"
@@ -16215,6 +16575,55 @@ msgstr "哈希算法"
16575 msgid "Unknown hash algorithm"
16576 msgstr "未知的哈希算法"
16577
16578 +#: builtin/show-index.c
16579 +msgid "assuming SHA-1; use --object-format to override"
16580 +msgstr "假定使用 SHA-1；使用 --object-format 可覆盖"
16581 +
16582 +#: builtin/show-index.c
16583 +msgid "unable to read header"
16584 +msgstr "无法读取头信息"
16585 +
16586 +#: builtin/show-index.c
16587 +msgid "unknown index version"
16588 +msgstr "未知的索引版本"
16589 +
16590 +#: builtin/show-index.c
16591 +msgid "unable to read index"
16592 +msgstr "无法读取索引"
16593 +
16594 +#: builtin/show-index.c
16595 +msgid "corrupt index file"
16596 +msgstr "索引文件损坏"
16597 +
16598 +#: builtin/show-index.c
16599 +#, c-format
16600 +msgid "unable to read entry %u/%u"
16601 +msgstr "无法读取条目 %u/%u"
16602 +
16603 +#: builtin/show-index.c
16604 +#, c-format
16605 +msgid "unable to read sha1 %u/%u"
16606 +msgstr "无法读取 sha1 %u/%u"
16607 +
16608 +#: builtin/show-index.c
16609 +#, c-format
16610 +msgid "unable to read crc %u/%u"
16611 +msgstr "无法读取 crc %u/%u"
16612 +
16613 +#: builtin/show-index.c
16614 +#, c-format
16615 +msgid "unable to read 32b offset %u/%u"
16616 +msgstr "无法读取 32 位偏移 %u/%u"
16617 +
16618 +#: builtin/show-index.c
16619 +msgid "inconsistent 64b offset index"
16620 +msgstr "64 位偏移索引不一致"
16621 +
16622 +#: builtin/show-index.c
16623 +#, c-format
16624 +msgid "unable to read 64b offset %u"
16625 +msgstr "无法读取 64 位偏移 %u"
16626 +
16627 #: builtin/show-ref.c
16628 msgid ""
16629 "git show-ref [--head] [-d | --dereference]\n"
@@ -16508,21 +16917,6 @@ msgstr "git stash branch <分支名> [<储藏>]"
16917 msgid "git stash store [(-m | --message) <message>] [-q | --quiet] <commit>"
16918 msgstr "git stash store [(-m | --message) <消息>] [-q | --quiet] <提交>"
16919
16511 -#: builtin/stash.c
16512 -msgid ""
16513 -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
16514 -"| --quiet]\n"
16515 -" [-u | --include-untracked] [-a | --all] [(-m | --message) "
16516 -"<message>]\n"
16517 -" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
16518 -" [--] [<pathspec>...]]"
16519 -msgstr ""
16520 -"git stash [push [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q "
16521 -"| --quiet]\n"
16522 -" [-u | --include-untracked] [-a | --all] [(-m | --message) <消息>]\n"
16523 -" [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n"
16524 -" [--] [<路径规格>...]]"
16525 -
16920 #: builtin/stash.c
16921 msgid ""
16922 "git stash save [-p | --patch] [-S | --staged] [-k | --[no-]keep-index] [-q | "
@@ -16854,6 +17248,10 @@ msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游
17248 msgid "could not get a repository handle for submodule '%s'"
17249 msgstr "无法获得子模组 '%s' 的仓库句柄"
17250
17251 +#: builtin/submodule--helper.c
17252 +msgid "git submodule--helper get-default-remote <path>"
17253 +msgstr "git submodule--helper get-default-remote <路径>"
17254 +
17255 #: builtin/submodule--helper.c
17256 #, c-format
17257 msgid "No url found for submodule path '%s' in .gitmodules"
@@ -16895,6 +17293,16 @@ msgstr "递归进入嵌套子模组中"
17293 msgid "git submodule foreach [--quiet] [--recursive] [--] <command>"
17294 msgstr "git submodule foreach [--quiet] [--recursive] [--] <命令>"
17295
17296 +#: builtin/submodule--helper.c
17297 +#, c-format
17298 +msgid ""
17299 +"failed to set a valid default config for 'submodule.%s.gitdir'. Please "
17300 +"ensure it is set, for example by running something like: 'git config "
17301 +"submodule.%s.gitdir .git/modules/%s'"
17302 +msgstr ""
17303 +"无法为 'submodule.%s.gitdir' 设置有效的默认配置。请确保已设置，例如运行类"
17304 +"似：'git config submodule.%s.gitdir .git/modules/%s'"
17305 +
17306 #: builtin/submodule--helper.c
17307 #, c-format
17308 msgid "Failed to register url for submodule path '%s'"
@@ -17001,6 +17409,30 @@ msgstr "git submodule summary [<选项>] [<提交>] [--] [<路径>]"
17409 msgid "could not fetch a revision for HEAD"
17410 msgstr "无法为 HEAD 获取一个版本"
17411
17412 +#: builtin/submodule--helper.c
17413 +msgid "git submodule--helper gitdir <name>"
17414 +msgstr "git submodule--helper gitdir <名称>"
17415 +
17416 +#: builtin/submodule--helper.c
17417 +msgid ""
17418 +"could not set core.repositoryformatversion to 1.\n"
17419 +"Please set it for migration to work, for example:\n"
17420 +"git config core.repositoryformatversion 1"
17421 +msgstr ""
17422 +"无法将 core.repositoryformatversion 设为 1。\n"
17423 +"请进行设置以便迁移，例如：\n"
17424 +"git config core.repositoryformatversion 1"
17425 +
17426 +#: builtin/submodule--helper.c
17427 +msgid ""
17428 +"could not enable submodulePathConfig extension. It is required\n"
17429 +"for migration to work. Please enable it in the root repo:\n"
17430 +"git config extensions.submodulePathConfig true"
17431 +msgstr ""
17432 +"无法启用 submodulePathConfig 扩展。迁移需要此扩展。\n"
17433 +"请在根仓库中启用：\n"
17434 +"git config extensions.submodulePathConfig true"
17435 +
17436 #: builtin/submodule--helper.c
17437 #, c-format
17438 msgid "Synchronizing submodule url for '%s'\n"
@@ -17110,11 +17542,6 @@ msgstr "无法识别 submodule.alternateErrorStrategy 的取值 '%s'"
17542 msgid "Value '%s' for submodule.alternateLocation is not recognized"
17543 msgstr "无法识别 submodule.alternateLocation 的取值 '%s'"
17544
17113 -#: builtin/submodule--helper.c submodule.c
17114 -#, c-format
17115 -msgid "refusing to create/use '%s' in another submodule's git dir"
17116 -msgstr "拒绝在另一个子模组的 git 目录中创建/使用 '%s'"
17117 -
17545 #: builtin/submodule--helper.c
17546 #, c-format
17547 msgid "directory not empty: '%s'"
@@ -17125,6 +17552,15 @@ msgstr "目录非空：'%s'"
17552 msgid "clone of '%s' into submodule path '%s' failed"
17553 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
17554
17555 +#: builtin/submodule--helper.c submodule.c
17556 +#, c-format
17557 +msgid ""
17558 +"refusing to create/use '%s' in another submodule's git dir. Enabling "
17559 +"extensions.submodulePathConfig should fix this."
17560 +msgstr ""
17561 +"拒绝在另一子模组的 git 目录中创建/使用 '%s'。启用 "
17562 +"extensions.submodulePathConfig 应可解决此问题。"
17563 +
17564 #: builtin/submodule--helper.c
17565 #, c-format
17566 msgid "could not get submodule directory for '%s'"
@@ -17609,7 +18045,7 @@ msgstr "未发现标签 '%s'。"
18045 #: builtin/tag.c
18046 #, c-format
18047 msgid "Deleted tag '%s' (was %s)\n"
17612 -msgstr "已删除标签 '%s'（曾为 %s）\n"
18048 +msgstr "已删除标签 '%s'（原为 %s）\n"
18049
18050 #: builtin/tag.c
18051 #, c-format
@@ -17771,7 +18207,7 @@ msgstr "无效的清理模式 %s"
18207 #: builtin/tag.c
18208 #, c-format
18209 msgid "Updated tag '%s' (was %s)\n"
17774 -msgstr "已更新标签 '%s'（曾为 %s）\n"
18210 +msgstr "已更新标签 '%s'（原为 %s）\n"
18211
18212 #: builtin/unpack-objects.c
18213 msgid "pack exceeds maximum allowed size"
@@ -18224,8 +18660,8 @@ msgid "report pruned working trees"
18660 msgstr "报告清除的工作区"
18661
18662 #: builtin/worktree.c
18227 -msgid "expire working trees older than <time>"
18228 -msgstr "将早于 <时间> 的工作区过期"
18663 +msgid "prune missing working trees older than <time>"
18664 +msgstr "清除早于 <时间> 的缺失工作区"
18665
18666 #: builtin/worktree.c
18667 #, c-format
@@ -18305,15 +18741,8 @@ msgid "Preparing worktree (detached HEAD %s)"
18741 msgstr "准备工作区（分离头指针 %s）"
18742
18743 #: builtin/worktree.c
18308 -#, c-format
18309 -msgid ""
18310 -"HEAD points to an invalid (or orphaned) reference.\n"
18311 -"HEAD path: '%s'\n"
18312 -"HEAD contents: '%s'"
18313 -msgstr ""
18314 -"HEAD 指向了一个无效的（或孤立的）引用。\n"
18315 -"HEAD 路径： '%s'\n"
18316 -"HEAD 内容： '%s'"
18744 +msgid "HEAD points to an invalid (or orphaned) reference.\n"
18745 +msgstr "HEAD 指向了一个无效的（或孤立的）引用。\n"
18746
18747 #: builtin/worktree.c
18748 msgid ""
@@ -18386,8 +18815,8 @@ msgid "show extended annotations and reasons, if available"
18815 msgstr "显示扩展的注释和原因（如果有）"
18816
18817 #: builtin/worktree.c
18389 -msgid "add 'prunable' annotation to worktrees older than <time>"
18390 -msgstr "向早于 <时间> 的工作区添加“可修剪”注释"
18818 +msgid "add 'prunable' annotation to missing worktrees older than <time>"
18819 +msgstr "为早于 <时间> 的缺失工作区添加 'prunable' 标注"
18820
18821 #: builtin/worktree.c
18822 msgid "terminate records with a NUL character"
@@ -19006,6 +19435,10 @@ msgstr "从一个文件计算对象 ID，并支持可选地创建一个对象"
19435 msgid "Display help information about Git"
19436 msgstr "显示 Git 的帮助信息"
19437
19438 +#: command-list.h
19439 +msgid "EXPERIMENTAL: Rewrite history"
19440 +msgstr "实验性：重写历史"
19441 +
19442 #: command-list.h
19443 msgid "Run git hooks"
19444 msgstr "运行 git 钩子"
@@ -19144,8 +19577,8 @@ msgid "Pack heads and tags for efficient repository access"
19577 msgstr "打包分支和标签以实现高效的仓库访问"
19578
19579 #: command-list.h
19147 -msgid "Compute unique ID for a patch"
19148 -msgstr "计算一个补丁的唯一 ID"
19580 +msgid "Compute unique IDs for patches"
19581 +msgstr "计算补丁的唯一 ID"
19582
19583 #: command-list.h
19584 msgid "Prune all unreachable objects from the object database"
@@ -19837,6 +20270,11 @@ msgstr "正在校验提交图中的提交"
20270 msgid "could not parse commit %s"
20271 msgstr "无法解析提交 %s"
20272
20273 +#: commit.c object.c
20274 +#, c-format
20275 +msgid "object %s is a %s, not a %s"
20276 +msgstr "对象 %s 是一个 %s，不是一个 %s"
20277 +
20278 #: commit.c
20279 #, c-format
20280 msgid "%s %s is not a commit!"
@@ -20328,11 +20766,6 @@ msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
20766 msgid "bad numeric config value '%s' for '%s' in %s: %s"
20767 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
20768
20331 -#: config.c
20332 -#, c-format
20333 -msgid "bad boolean config value '%s' for '%s'"
20334 -msgstr "配置变量 '%2$s' 的布尔值 '%1$s' 无效"
20335 -
20769 #: config.c
20770 #, c-format
20771 msgid "failed to expand user dir in: '%s'"
@@ -21139,6 +21572,10 @@ msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
21572 msgid "unknown value after ws-error-highlight=%.*s"
21573 msgstr "ws-error-highlight=%.*s 之后未知的值"
21574
21575 +#: diff.c
21576 +msgid "--find-object requires a git repository"
21577 +msgstr "--find-object 需要 git 仓库"
21578 +
21579 #: diff.c
21580 #, c-format
21581 msgid "unable to resolve '%s'"
@@ -21614,10 +22051,6 @@ msgstr "通过差异类型选择文件"
22051 msgid "<depth>"
22052 msgstr "<深度>"
22053
21617 -#: diff.c
21618 -msgid "maximum tree depth to recurse"
21619 -msgstr "递归的最大树深度"
21620 -
22054 #: diff.c
22055 msgid "<file>"
22056 msgstr "<文件>"
@@ -22045,6 +22478,11 @@ msgstr "处理要获取的引用出错：%d"
22478 msgid "git fetch-pack: expected response end packet"
22479 msgstr "git fetch-pack：预期响应结束包"
22480
22481 +#: fetch-pack.c
22482 +#, c-format
22483 +msgid "couldn't resolve 'auto' filter '%s': %s"
22484 +msgstr "无法解析 'auto' 过滤器 '%s'：%s"
22485 +
22486 #: fetch-pack.c
22487 msgid "no matching remote head"
22488 msgstr "没有匹配的远程头引用"
@@ -22541,6 +22979,18 @@ msgstr ""
22979 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
22980 "配置 `git config set advice.ignoredHook false` 来关闭这条警告。"
22981
22982 +#: hook.c
22983 +#, c-format
22984 +msgid "disabled hook '%s' has no command configured"
22985 +msgstr "已禁用的钩子 '%s' 未配置命令"
22986 +
22987 +#: hook.c
22988 +#, c-format
22989 +msgid ""
22990 +"'hook.%s.command' must be configured or 'hook.%s.event' must be removed; "
22991 +"aborting."
22992 +msgstr "必须配置 'hook.%s.command'，或移除 'hook.%s.event'；正在中止。"
22993 +
22994 #: http-fetch.c
22995 msgid "not a git repository"
22996 msgstr "不是 Git 仓库"
@@ -22602,6 +23052,23 @@ msgstr ""
23052 " 请求：%s\n"
23053 " 重定向：%s"
23054
23055 +#: http.c
23056 +#, c-format
23057 +msgid ""
23058 +"response requested a delay greater than http.maxRetryTime (%ld > %ld seconds)"
23059 +msgstr "响应请求的延迟超过 http.maxRetryTime（%ld > %ld 秒）"
23060 +
23061 +#: http.c
23062 +#, c-format
23063 +msgid ""
23064 +"configured http.retryAfter exceeds http.maxRetryTime (%ld > %ld seconds)"
23065 +msgstr "配置的 http.retryAfter 超过了 http.maxRetryTime（%ld > %ld 秒）"
23066 +
23067 +#: http.c
23068 +#, c-format
23069 +msgid "rate limited, waiting %ld seconds before retry"
23070 +msgstr "速率受限，等待 %ld 秒后重试"
23071 +
23072 #: http.h
23073 #, c-format
23074 msgid ""
@@ -22699,6 +23166,10 @@ msgstr ""
23166 "通过 'git config imap.folder <文件夹>' 设置目标文件夹。\n"
23167 "(例如：'git config imap.folder Drafts')"
23168
23169 +#: list-objects-filter-options.c
23170 +msgid "'auto' filter not supported by this command"
23171 +msgstr "此命令不支持 'auto' 过滤器"
23172 +
23173 #: list-objects-filter-options.c
23174 msgid "expected 'tree:<depth>'"
23175 msgstr "期望 'tree:<深度>'"
@@ -22722,6 +23193,10 @@ msgstr "无效的过滤器表达式 '%s'"
23193 msgid "must escape char in sub-filter-spec: '%c'"
23194 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
23195
23196 +#: list-objects-filter-options.c
23197 +msgid "an 'auto' filter cannot be combined"
23198 +msgstr "'auto' 过滤器不能与其他过滤器组合"
23199 +
23200 #: list-objects-filter-options.c
23201 msgid "expected something after combine:"
23202 msgstr "期望在组合后有一些东西："
@@ -22730,6 +23205,10 @@ msgstr "期望在组合后有一些东西："
23205 msgid "multiple filter-specs cannot be combined"
23206 msgstr "不能混用多种过滤规格"
23207
23208 +#: list-objects-filter-options.c
23209 +msgid "an 'auto' filter is incompatible with any other filter"
23210 +msgstr "'auto' 过滤器与任何其他过滤器不兼容"
23211 +
23212 #: list-objects-filter-options.c
23213 msgid "unable to upgrade repository format to support partial clone"
23214 msgstr "无法升级仓库格式以支持部分克隆"
@@ -22767,23 +23246,46 @@ msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一
23246 msgid "unable to load root tree for commit %s"
23247 msgstr "无法为提交 %s 加载根树"
23248
23249 +#: lockfile.c
23250 +#, c-format
23251 +msgid "could not write lock pid file '%s'"
23252 +msgstr "无法写入锁 PID 文件 '%s'"
23253 +
23254 +#: lockfile.c
23255 +#, c-format
23256 +msgid "malformed lock pid file '%s'"
23257 +msgstr "锁 PID 文件 '%s' 格式错误"
23258 +
23259 #: lockfile.c
23260 #, c-format
23261 msgid ""
22773 -"Unable to create '%s.lock': %s.\n"
23262 +"Unable to create '%s': %s.\n"
23263 "\n"
22775 -"Another git process seems to be running in this repository, e.g.\n"
22776 -"an editor opened by 'git commit'. Please make sure all processes\n"
22777 -"are terminated then try again. If it still fails, a git process\n"
22778 -"may have crashed in this repository earlier:\n"
22779 -"remove the file manually to continue."
23264 msgstr ""
22781 -"无法创建 '%s.lock'：%s。\n"
23265 +"无法创建 '%s'：%s。\n"
23266 "\n"
22783 -"似乎另一个 Git 进程在这个仓库中运行，例如：'git commit' 命令打\n"
22784 -"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n"
22785 -"可能之前有一个 Git 进程在这个仓库中异常退出：\n"
22786 -"手动删除这个文件再继续。"
23267 +
23268 +#: lockfile.c
23269 +#, c-format
23270 +msgid ""
23271 +"Lock may be held by process %<PRIuMAX>; if no git process is running, the "
23272 +"lock file may be stale (PIDs can be reused)"
23273 +msgstr ""
23274 +"锁可能仍由进程 %<PRIuMAX> 持有；若无 git 进程在运行，锁文件可能已过期（PID 可"
23275 +"能被复用）"
23276 +
23277 +#: lockfile.c
23278 +#, c-format
23279 +msgid ""
23280 +"Lock was held by process %<PRIuMAX>, which is no longer running; the lock "
23281 +"file appears to be stale"
23282 +msgstr "锁曾由进程 %<PRIuMAX> 持有，但该进程已不再运行；锁文件看起来已过期"
23283 +
23284 +#: lockfile.c
23285 +msgid ""
23286 +"Another git process seems to be running in this repository, or the lock file "
23287 +"may be stale"
23288 +msgstr "另一 git 进程似乎正在此仓库中运行，或者锁文件可能已过期"
23289
23290 #: lockfile.c
23291 #, c-format
@@ -22946,8 +23448,8 @@ msgid ""
23448 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
23449 "%s; moving it to %s."
23450 msgstr ""
22949 -"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
22950 -"动到 %5$s。"
23451 +"路径已更新：%1$s 在 %3$s 中被重命名为 %2$s，而其所在目录又在 %4$s 中被重命"
23452 +"名，因此将其移动到 %5$s。"
23453
23454 #: merge-ort.c
23455 #, c-format
@@ -23131,8 +23633,17 @@ msgid "malformed line: %s"
23633 msgstr "格式错误的行：%s"
23634
23635 #: midx-write.c
23134 -msgid "could not load pack"
23135 -msgstr "无法载入包"
23636 +#, c-format
23637 +msgid "could not load pack %d"
23638 +msgstr "无法载入包 %d"
23639 +
23640 +#: midx-write.c
23641 +msgid "too many packs, unable to compact"
23642 +msgstr "包过多，无法压缩"
23643 +
23644 +#: midx-write.c pack-revindex.c
23645 +msgid "could not determine preferred pack"
23646 +msgstr "无法确定首选包"
23647
23648 #: midx-write.c
23649 #, c-format
@@ -23144,6 +23655,15 @@ msgstr "无法将 '%s' 链接至 '%s'"
23655 msgid "failed to clear multi-pack-index at %s"
23656 msgstr "无法清理位于 %s 的多包索引"
23657
23658 +#: midx-write.c
23659 +#, c-format
23660 +msgid "unknown MIDX version: %d"
23661 +msgstr "未知的 MIDX 版本：%d"
23662 +
23663 +#: midx-write.c
23664 +msgid "cannot perform MIDX compaction with v1 format"
23665 +msgstr "无法在 v1 格式下执行 MIDX 压缩"
23666 +
23667 #: midx-write.c
23668 msgid "ignoring existing multi-pack-index; checksum mismatch"
23669 msgstr "忽略已存在的多包索引，校验码不匹配"
@@ -23846,11 +24366,6 @@ msgstr "无效的对象名 '%.*s'。"
24366 msgid "invalid object type \"%s\""
24367 msgstr "无效的对象类型 \"%s\""
24368
23849 -#: object.c
23850 -#, c-format
23851 -msgid "object %s is a %s, not a %s"
23852 -msgstr "对象 %s 是一个 %s，不是一个 %s"
23853 -
24369 #: object.c
24370 #, c-format
24371 msgid "object %s has unknown type id %d"
@@ -23861,6 +24376,11 @@ msgstr "对象 %s 有未知的类型 id %d"
24376 msgid "unable to parse object: %s"
24377 msgstr "无法解析对象：%s"
24378
24379 +#: object.c
24380 +#, c-format
24381 +msgid "unable to open object stream for %s"
24382 +msgstr "无法打开 %s 的对象流"
24383 +
24384 #: object.c
24385 #, c-format
24386 msgid "hash mismatch %s"
@@ -23881,18 +24401,6 @@ msgstr "无法规范化备用对象路径：%s"
24401 msgid "%s: ignoring alternate object stores, nesting too deep"
24402 msgstr "%s：忽略备用对象库，嵌套太深"
24403
23884 -#: odb.c
23885 -msgid "unable to fdopen alternates lockfile"
23886 -msgstr "无法 fdopen alternates 的锁文件"
23887 -
23888 -#: odb.c
23889 -msgid "unable to read alternates file"
23890 -msgstr "无法读取 alternates 文件"
23891 -
23892 -#: odb.c
23893 -msgid "unable to move new alternates file into place"
23894 -msgstr "无法将新的 alternates 文件移动到位"
23895 -
24404 #: odb.c
24405 #, c-format
24406 msgid "path '%s' does not exist"
@@ -23948,6 +24456,18 @@ msgstr "缺少 %s 到 %s 的映射"
24456 msgid "%s is not a valid '%s' object"
24457 msgstr "%s 不是有效的 '%s' 对象"
24458
24459 +#: odb/source-files.c
24460 +msgid "unable to fdopen alternates lockfile"
24461 +msgstr "无法 fdopen alternates 的锁文件"
24462 +
24463 +#: odb/source-files.c
24464 +msgid "unable to read alternates file"
24465 +msgstr "无法读取 alternates 文件"
24466 +
24467 +#: odb/source-files.c
24468 +msgid "unable to move new alternates file into place"
24469 +msgstr "无法将新的 alternates 文件移动到位"
24470 +
24471 #: pack-bitmap-write.c
24472 #, c-format
24473 msgid "duplicate entry when writing bitmap index: %s"
@@ -24207,10 +24727,6 @@ msgstr "在 %<PRIu64> 的反向索引位置无效：%<PRIu32> != %<PRIu32>"
24727 msgid "multi-pack-index reverse-index chunk is the wrong size"
24728 msgstr "多包索引的反向索引块大小错误"
24729
24210 -#: pack-revindex.c
24211 -msgid "could not determine preferred pack"
24212 -msgstr "无法确定首选包"
24213 -
24730 #: pack-write.c
24731 msgid "cannot both write and verify reverse index"
24732 msgstr "不能同时写入和校验反向索引"
@@ -24239,6 +24755,11 @@ msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
24755 msgid "packfile %s cannot be mapped%s"
24756 msgstr "包文件 %s 无法被映射%s"
24757
24758 +#: packfile.c
24759 +#, c-format
24760 +msgid "could not load .mtimes for cruft pack '%s'"
24761 +msgstr "无法为废弃包 '%s' 载入 .mtimes"
24762 +
24763 #: packfile.c
24764 #, c-format
24765 msgid "offset before start of pack index for %s (corrupt index?)"
@@ -24659,6 +25180,11 @@ msgstr "无法创建线程 lstat：%s"
25180 msgid "unable to parse --pretty format"
25181 msgstr "无法解析 --pretty 格式"
25182
25183 +#: pretty.c
25184 +#, c-format
25185 +msgid "%s is not supported by this command"
25186 +msgstr "此命令不支持 %s"
25187 +
25188 #: promisor-remote.c
25189 msgid "lazy fetching disabled; some objects may not be available"
25190 msgstr "已禁用延迟获取，某些对象可能不可用"
@@ -24710,6 +25236,25 @@ msgstr "远程信息中的无效元素 '%s'"
25236 msgid "server advertised a promisor remote without a name or URL: %s"
25237 msgstr "服务器通告了一个没有名称或 URL 的承诺者远程：%s"
25238
25239 +#: promisor-remote.c
25240 +#, c-format
25241 +msgid ""
25242 +"Storing new %s from server for remote '%s'.\n"
25243 +" '%s' -> '%s'\n"
25244 +msgstr ""
25245 +"正在为远程 '%2$s' 存储来自服务器新的 %1$s。\n"
25246 +" '%3$s' -> '%4$s'\n"
25247 +
25248 +#: promisor-remote.c
25249 +#, c-format
25250 +msgid "invalid filter '%s' for remote '%s' will not be stored: %s"
25251 +msgstr "远程 '%2$s' 的无效过滤器 '%1$s' 将不会保存：%3$s"
25252 +
25253 +#: promisor-remote.c
25254 +#, c-format
25255 +msgid "invalid token '%s' for remote '%s' will not be stored"
25256 +msgstr "远程 '%2$s' 的无效令牌 '%1$s' 将不会保存"
25257 +
25258 #: promisor-remote.c
25259 #, c-format
25260 msgid "unknown '%s' value for '%s' config option"
@@ -24720,6 +25265,11 @@ msgstr "配置项 '%2$s' 为未知的取值 '%1$s'"
25265 msgid "accepted promisor remote '%s' not found"
25266 msgstr "未找到已接受的承诺者远程 '%s'"
25267
25268 +#: promisor-remote.c
25269 +#, c-format
25270 +msgid "promisor remote '%s' advertised invalid filter '%s': %s"
25271 +msgstr "promisor 远程 '%s'通告了无效的过滤器 '%s'：%s"
25272 +
25273 #: protocol-caps.c
25274 msgid "object-info: expected flush after arguments"
25275 msgstr "object-info：在参数之后应有一个 flush 包"
@@ -24859,7 +25409,7 @@ msgstr "无法在对象数据库中创建空的数据对象"
25409 #: read-cache.c
25410 #, c-format
25411 msgid "%s: can only add regular files, symbolic links or git-directories"
24862 -msgstr "%s：只能添加常规文件、符号链接或 Git 目录"
25412 +msgstr "%s：只能添加普通文件、符号链接或 Git 目录"
25413
25414 #: read-cache.c
25415 #, c-format
@@ -25024,6 +25574,15 @@ msgstr "无法修复 '%s' 的权限位"
25574 msgid "%s: cannot drop to stage #0"
25575 msgstr "%s：无法落到暂存区 #0"
25576
25577 +#: read-cache.c
25578 +#, c-format
25579 +msgid ""
25580 +"Skipping submodule due to ignore=all: %s\n"
25581 +"Use --force if you really want to add the submodule."
25582 +msgstr ""
25583 +"由于 ignore=all 而跳过子模组：%s\n"
25584 +"若确实要添加该子模组，请使用 --force。"
25585 +
25586 #: read-cache.c
25587 #, c-format
25588 msgid "unexpected diff status %c"
@@ -25458,6 +26017,11 @@ msgstr "不是一个引用日志：%s"
26017 msgid "no reflog for '%s'"
26018 msgstr "没有 '%s' 的引用日志"
26019
26020 +#: refs.c
26021 +#, c-format
26022 +msgid "in '%s' phase, update aborted by the reference-transaction hook"
26023 +msgstr "在 '%s' 阶段，reference-transaction 钩子中止了更新"
26024 +
26025 #: refs.c
26026 msgid "Checking references consistency"
26027 msgstr "正在检查引用一致性"
@@ -25586,10 +26150,6 @@ msgstr "不允许对引用 '%s' 多次更新"
26150 msgid "ref updates forbidden inside quarantine environment"
26151 msgstr "在隔离环境中禁止更新引用"
26152
25589 -#: refs.c
25590 -msgid "ref updates aborted by hook"
25591 -msgstr "引用更新被钩子中止"
25592 -
26153 #: refs.c
26154 #, c-format
26155 msgid "'%s' exists; cannot create '%s'"
@@ -25819,6 +26379,16 @@ msgstr "'%s' 鉴权失败"
26379 msgid "unable to access '%s' with http.pinnedPubkey configuration: %s"
26380 msgstr "无法以 http.pinnedPubkey 设置访问 '%s'：%s"
26381
26382 +#: remote-curl.c
26383 +#, c-format
26384 +msgid "rate limited by '%s', please try again in %ld seconds"
26385 +msgstr "被 '%s' 限制速率，请在 %ld 秒后重试"
26386 +
26387 +#: remote-curl.c
26388 +#, c-format
26389 +msgid "rate limited by '%s', please try again later"
26390 +msgstr "被 '%s' 限制速率，请稍后再试"
26391 +
26392 #: remote-curl.c
26393 #, c-format
26394 msgid "unable to access '%s': %s"
@@ -26148,12 +26718,10 @@ msgstr "* 在本地忽略异常的引用 '%s'"
26718
26719 #: remote.c
26720 #, c-format
26151 -msgid "Your branch is based on '%s', but the upstream is gone.\n"
26152 -msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
26153 -
26154 -#: remote.c
26155 -msgid " (use \"git branch --unset-upstream\" to fixup)\n"
26156 -msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
26721 +msgid ""
26722 +"ignoring value '%s' for status.compareBranches, only @{upstream} and @{push} "
26723 +"are supported"
26724 +msgstr "忽略 status.compareBranches 的值 '%s'，仅支持 @{upstream} 和 @{push}"
26725
26726 #: remote.c
26727 #, c-format
@@ -26215,6 +26783,15 @@ msgid ""
26783 " (use \"git pull\" if you want to integrate the remote branch with yours)\n"
26784 msgstr " （如果您想将远程分支与您的更改合并，请使用 \"git pull\"）\n"
26785
26786 +#: remote.c
26787 +#, c-format
26788 +msgid "Your branch is based on '%s', but the upstream is gone.\n"
26789 +msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
26790 +
26791 +#: remote.c
26792 +msgid " (use \"git branch --unset-upstream\" to fixup)\n"
26793 +msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
26794 +
26795 #: remote.c
26796 #, c-format
26797 msgid "cannot parse expected object name '%s'"
@@ -26309,6 +26886,40 @@ msgstr "重复的替换引用：%s"
26886 msgid "replace depth too high for object %s"
26887 msgstr "对象 %s 的替换层级太深"
26888
26889 +#: replay.c
26890 +#, c-format
26891 +msgid "'%s' is not a valid commit-ish for %s"
26892 +msgstr "'%s' 不是 %s 的有效提交号"
26893 +
26894 +#: replay.c
26895 +#, c-format
26896 +msgid "argument to %s must be a reference"
26897 +msgstr "%s 的参数必须是引用"
26898 +
26899 +#: replay.c
26900 +#, c-format
26901 +msgid ""
26902 +"'%s' cannot be used with multiple revision ranges because the ordering would "
26903 +"be ill-defined"
26904 +msgstr "不能与多个版本范围一起使用 '%s'，否则顺序将无法明确界定"
26905 +
26906 +#: replay.c
26907 +msgid "need some commits to replay"
26908 +msgstr "需要一些提交来重放"
26909 +
26910 +#: replay.c
26911 +msgid "all positive revisions given must be references"
26912 +msgstr "提供的所有正向版本必须为引用"
26913 +
26914 +#: replay.c sequencer.c
26915 +#, c-format
26916 +msgid "'%s' is not a valid refname"
26917 +msgstr "'%s' 不是一个有效的引用名"
26918 +
26919 +#: repository.c
26920 +msgid "compatibility hash algorithm support requires Rust"
26921 +msgstr "兼容性哈希算法的支持需要 Rust"
26922 +
26923 #: rerere.c
26924 msgid "corrupt MERGE_RR"
26925 msgstr "损坏的 MERGE_RR"
@@ -27193,11 +27804,6 @@ msgstr "git %s：无法刷新索引"
27804 msgid "'%s' is not a valid label"
27805 msgstr "'%s' 不是一个有效的标签"
27806
27196 -#: sequencer.c
27197 -#, c-format
27198 -msgid "'%s' is not a valid refname"
27199 -msgstr "'%s' 不是一个有效的引用名"
27200 -
27807 #: sequencer.c
27808 #, c-format
27809 msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
@@ -27304,6 +27910,18 @@ msgstr "无法在回退中执行拣选。"
27910 msgid "cannot revert during a cherry-pick."
27911 msgstr "无法在拣选中执行回退。"
27912
27913 +#: sequencer.c
27914 +msgid "trailers file contains empty line"
27915 +msgstr "尾注文件包含空行"
27916 +
27917 +#: sequencer.c
27918 +msgid "trailers file is empty"
27919 +msgstr "尾注文件为空"
27920 +
27921 +#: sequencer.c
27922 +msgid "cannot read trailers files"
27923 +msgstr "无法读取尾注文件"
27924 +
27925 #: sequencer.c
27926 msgid "unusable squash-onto"
27927 msgstr "不可用的 squash-onto"
@@ -27888,6 +28506,16 @@ msgstr ""
28506 "\n"
28507 "\tgit config --global --add safe.directory %s"
28508
28509 +#: setup.c
28510 +#, c-format
28511 +msgid "error reading '%s'"
28512 +msgstr "读取 '%s' 时出错"
28513 +
28514 +#: setup.c
28515 +#, c-format
28516 +msgid "not a regular file: '%s'"
28517 +msgstr "不是普通文件：'%s'"
28518 +
28519 #: setup.c
28520 msgid "Unable to read current working directory"
28521 msgstr "无法读取当前工作目录"
@@ -27916,6 +28544,11 @@ msgstr ""
28544 msgid "cannot use bare repository '%s' (safe.bareRepository is '%s')"
28545 msgstr "无法使用纯仓库 '%s' （safe.bareRepository 为 '%s'）"
28546
28547 +#: setup.c
28548 +#, c-format
28549 +msgid "unknown ref storage format: '%s'"
28550 +msgstr "未知的引用存储格式：'%s'"
28551 +
28552 #: setup.c
28553 #, c-format
28554 msgid ""
@@ -28322,11 +28955,6 @@ msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
28955 msgid "could not lookup name for submodule '%s'"
28956 msgstr "无法查询子模组 '%s' 的名称"
28957
28325 -#: submodule.c
28326 -#, c-format
28327 -msgid "refusing to move '%s' into an existing git dir"
28328 -msgstr "拒绝移动 '%s' 到现存 Git 目录中"
28329 -
28958 #: submodule.c
28959 #, c-format
28960 msgid ""
@@ -28347,6 +28975,29 @@ msgstr "无法在 .. 中启动 ls-files"
28975 msgid "ls-tree returned unexpected return code %d"
28976 msgstr "ls-tree 返回意外返回码 %d"
28977
28978 +#: submodule.c
28979 +#, c-format
28980 +msgid ""
28981 +"the 'submodule.%s.gitdir' config does not exist for module '%s'. Please "
28982 +"ensure it is set, for example by running something like: 'git config "
28983 +"submodule.%s.gitdir .git/modules/%s'. For details see the "
28984 +"extensions.submodulePathConfig documentation."
28985 +msgstr ""
28986 +"模块 '%2$s' 缺少 'submodule.%1$s.gitdir' 配置。请确保已设置，例如运行类"
28987 +"似：'git config submodule.%3$s.gitdir .git/modules/%4$s'。详细信息请参见 "
28988 +"extensions.submodulePathConfig 文档。"
28989 +
28990 +#: submodule.c
28991 +msgid ""
28992 +"enabling extensions.submodulePathConfig might fix the following error, if "
28993 +"it's not already enabled."
28994 +msgstr "若尚未启用，启用 extensions.submodulePathConfig 可能修复以下错误。"
28995 +
28996 +#: submodule.c
28997 +#, c-format
28998 +msgid "refusing to create/use '%s' in another submodule's git dir."
28999 +msgstr "拒绝在另一子模组的 git 目录中创建/使用 '%s'。"
29000 +
29001 #: symlinks.c
29002 #, c-format
29003 msgid "failed to lstat '%s'"
@@ -28417,6 +29068,11 @@ msgstr "提交 %s 没有标记为可达"
29068 msgid "too many commits marked reachable"
29069 msgstr "太多提交标记为可达"
29070
29071 +#: t/helper/test-read-midx.c
29072 +#, c-format
29073 +msgid "could not find MIDX with checksum %s"
29074 +msgstr "找不到校验和为 %s 的 MIDX"
29075 +
29076 #: t/helper/test-read-midx.c
29077 msgid "could not determine MIDX preferred pack"
29078 msgstr "无法确定多包索引的首选包"
@@ -28536,6 +29192,34 @@ msgstr "键 '%2$s' 的未知取值 '%1$s'"
29192 msgid "empty trailer token in trailer '%.*s'"
29193 msgstr "尾注 '%.*s' 的键为空"
29194
29195 +#: trailer.c
29196 +msgid "empty --trailer argument"
29197 +msgstr "空的 --trailer 参数"
29198 +
29199 +#: trailer.c
29200 +#, c-format
29201 +msgid "invalid trailer '%s': missing key before separator"
29202 +msgstr "无效的尾注 '%s'：分隔符前缺少键"
29203 +
29204 +#: trailer.c wrapper.c
29205 +#, c-format
29206 +msgid "could not stat %s"
29207 +msgstr "无法对 %s 调用 stat"
29208 +
29209 +#: trailer.c
29210 +#, c-format
29211 +msgid "file %s is not a regular file"
29212 +msgstr "文件 %s 不是一个普通文件"
29213 +
29214 +#: trailer.c
29215 +#, c-format
29216 +msgid "file %s is not writable by user"
29217 +msgstr "文件 %s 用户不可写"
29218 +
29219 +#: trailer.c
29220 +msgid "could not write to temporary file"
29221 +msgstr "无法写入临时文件"
29222 +
29223 #: transport-helper.c
29224 msgid "full write to remote helper failed"
29225 msgstr "完整写入远程助手失败"
@@ -30169,8 +30853,13 @@ msgid ""
30853 msgstr "如下文件含 8bit 内容，但没有声明一个 Content-Transfer-Encoding。\n"
30854
30855 #: git-send-email.perl
30172 -msgid "Which 8bit encoding should I declare [UTF-8]? "
30173 -msgstr "要声明哪种 8bit 编码格式 [UTF-8]？"
30856 +msgid "Declare which 8bit encoding to use [default: UTF-8]? "
30857 +msgstr "声明要使用的 8 位编码 [默认：UTF-8]？ "
30858 +
30859 +#: git-send-email.perl
30860 +#, perl-format
30861 +msgid "'%s' does not appear to be a valid charset name. Use it anyway [y/N]? "
30862 +msgstr "'%s' 似乎不是有效的字符集名称。仍要使用吗 [y/N]？ "
30863
30864 #: git-send-email.perl
30865 #, perl-format
@@ -30214,6 +30903,11 @@ msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
30903 msgid "CA path \"%s\" does not exist"
30904 msgstr "CA 路径 \"%s\" 不存在"
30905
30906 +#: git-send-email.perl
30907 +#, perl-format
30908 +msgid "Only client key \"%s\" specified"
30909 +msgstr "仅指定了客户端密钥 \"%s\""
30910 +
30911 #: git-send-email.perl
30912 msgid ""
30913 " The Cc list above has been expanded by additional\n"