@matheusbsbs / matheus-bagliano / commits / cec74d09d8

l10n: zh_CN v2.40.0 round 1

Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Fangyi Zhou <me@fangyi.io>

Fangyi Zhou committed Mar 7, 2023 at 23:42 UTC cec74d09d86d57de6699ee2829a679810ca11f6b
1 file changed +471 -647
po/zh_CN.po
+471 -647
@@ -139,14 +139,14 @@
139 # upstream | 上游
140 # upstream branch | 上游分支
141 # working tree | 工作区
142 -# Fangyi Zhou <me@fangyi.io>, 2021-2022.
142 +# Fangyi Zhou <me@fangyi.io>, 2021-2023.
143 #
144 msgid ""
145 msgstr ""
146 "Project-Id-Version: Git\n"
147 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
148 -"POT-Creation-Date: 2022-12-01 14:04+0000\n"
149 -"PO-Revision-Date: 2022-12-01 14:17+0000\n"
148 +"POT-Creation-Date: 2023-03-07 23:37+0000\n"
149 +"PO-Revision-Date: 2023-03-07 23:40+0000\n"
150 "Last-Translator: Fangyi Zhou <me@fangyi.io>\n"
151 "Language-Team: GitHub <https://github.com/fangyi-zhou/git-po/>\n"
152 "Language: zh_CN\n"
@@ -165,19 +165,19 @@ msgstr "嗯（%s）？"
165 msgid "could not read index"
166 msgstr "不能读取索引"
167
168 -#: add-interactive.c git-add--interactive.perl
168 +#: add-interactive.c
169 msgid "binary"
170 msgstr "二进制"
171
172 -#: add-interactive.c git-add--interactive.perl
172 +#: add-interactive.c
173 msgid "nothing"
174 msgstr "无"
175
176 -#: add-interactive.c git-add--interactive.perl
176 +#: add-interactive.c
177 msgid "unchanged"
178 msgstr "没有修改"
179
180 -#: add-interactive.c git-add--interactive.perl
180 +#: add-interactive.c
181 msgid "Update"
182 msgstr "更新"
183
@@ -190,15 +190,15 @@ msgstr "不能暂存 '%s'"
190 msgid "could not write index"
191 msgstr "不能写入索引"
192
193 -#: add-interactive.c git-add--interactive.perl
194 -#, c-format, perl-format
193 +#: add-interactive.c
194 +#, c-format
195 msgid "updated %d path\n"
196 msgid_plural "updated %d paths\n"
197 msgstr[0] "更新了 %d 个路径\n"
198 msgstr[1] "更新了 %d 个路径\n"
199
200 -#: add-interactive.c git-add--interactive.perl
201 -#, c-format, perl-format
200 +#: add-interactive.c
201 +#, c-format
202 msgid "note: %s is untracked now.\n"
203 msgstr "说明：%s 现已成为未跟踪的。\n"
204
@@ -207,7 +207,7 @@ msgstr "说明：%s 现已成为未跟踪的。\n"
207 msgid "make_cache_entry failed for path '%s'"
208 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
209
210 -#: add-interactive.c git-add--interactive.perl
210 +#: add-interactive.c
211 msgid "Revert"
212 msgstr "还原"
213
@@ -215,24 +215,24 @@ msgstr "还原"
215 msgid "Could not parse HEAD^{tree}"
216 msgstr "不能解析 HEAD^{tree}"
217
218 -#: add-interactive.c git-add--interactive.perl
219 -#, c-format, perl-format
218 +#: add-interactive.c
219 +#, c-format
220 msgid "reverted %d path\n"
221 msgid_plural "reverted %d paths\n"
222 msgstr[0] "还原了 %d 个路径\n"
223 msgstr[1] "还原了 %d 个路径\n"
224
225 -#: add-interactive.c git-add--interactive.perl
225 +#: add-interactive.c
226 #, c-format
227 msgid "No untracked files.\n"
228 msgstr "没有未跟踪的文件。\n"
229
230 -#: add-interactive.c git-add--interactive.perl
230 +#: add-interactive.c
231 msgid "Add untracked"
232 msgstr "添加未跟踪的"
233
234 -#: add-interactive.c git-add--interactive.perl
235 -#, c-format, perl-format
234 +#: add-interactive.c
235 +#, c-format
236 msgid "added %d path\n"
237 msgid_plural "added %d paths\n"
238 msgstr[0] "增加了 %d 个路径\n"
@@ -243,21 +243,21 @@ msgstr[1] "增加了 %d 个路径\n"
243 msgid "ignoring unmerged: %s"
244 msgstr "忽略未合入的：%s"
245
246 -#: add-interactive.c add-patch.c git-add--interactive.perl
246 +#: add-interactive.c add-patch.c
247 #, c-format
248 msgid "Only binary files changed.\n"
249 msgstr "只有二进制文件被修改。\n"
250
251 -#: add-interactive.c add-patch.c git-add--interactive.perl
251 +#: add-interactive.c add-patch.c
252 #, c-format
253 msgid "No changes.\n"
254 msgstr "没有修改。\n"
255
256 -#: add-interactive.c git-add--interactive.perl
256 +#: add-interactive.c
257 msgid "Patch update"
258 msgstr "补丁更新"
259
260 -#: add-interactive.c git-add--interactive.perl
260 +#: add-interactive.c
261 msgid "Review diff"
262 msgstr "检视 diff"
263
@@ -325,25 +325,25 @@ msgstr "选择一个编号条目"
325 msgid "(empty) select nothing"
326 msgstr "（空）不选择任何内容"
327
328 -#: add-interactive.c builtin/clean.c git-add--interactive.perl
328 +#: add-interactive.c builtin/clean.c
329 msgid "*** Commands ***"
330 msgstr "*** 命令 ***"
331
332 -#: add-interactive.c builtin/clean.c git-add--interactive.perl
332 +#: add-interactive.c builtin/clean.c
333 msgid "What now"
334 msgstr "请选择"
335
336 -#: add-interactive.c git-add--interactive.perl
336 +#: add-interactive.c
337 msgid "staged"
338 msgstr "缓存"
339
340 -#: add-interactive.c git-add--interactive.perl
340 +#: add-interactive.c
341 msgid "unstaged"
342 msgstr "未缓存"
343
344 #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c
345 -#: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c
346 -#: builtin/submodule--helper.c git-add--interactive.perl
345 +#: builtin/diagnose.c builtin/fetch.c builtin/hook.c builtin/merge.c
346 +#: builtin/pull.c builtin/submodule--helper.c
347 msgid "path"
348 msgstr "路径"
349
@@ -351,28 +351,28 @@ msgstr "路径"
351 msgid "could not refresh index"
352 msgstr "不能刷新索引"
353
354 -#: add-interactive.c builtin/clean.c git-add--interactive.perl
354 +#: add-interactive.c builtin/clean.c
355 #, c-format
356 msgid "Bye.\n"
357 msgstr "再见。\n"
358
359 -#: add-patch.c git-add--interactive.perl
360 -#, c-format, perl-format
359 +#: add-patch.c
360 +#, c-format
361 msgid "Stage mode change [y,n,q,a,d%s,?]? "
362 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
363
364 -#: add-patch.c git-add--interactive.perl
365 -#, c-format, perl-format
364 +#: add-patch.c
365 +#, c-format
366 msgid "Stage deletion [y,n,q,a,d%s,?]? "
367 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
368
369 -#: add-patch.c git-add--interactive.perl
370 -#, c-format, perl-format
369 +#: add-patch.c
370 +#, c-format
371 msgid "Stage addition [y,n,q,a,d%s,?]? "
372 msgstr "暂存添加动作 [y,n,q,a,d%s,?]? "
373
374 -#: add-patch.c git-add--interactive.perl
375 -#, c-format, perl-format
374 +#: add-patch.c
375 +#, c-format
376 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
377 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
378
@@ -396,23 +396,23 @@ msgstr ""
396 "a - 暂存该块和本文件中后面的全部块\n"
397 "d - 不暂存该块和本文件中后面的全部块\n"
398
399 -#: add-patch.c git-add--interactive.perl
400 -#, c-format, perl-format
399 +#: add-patch.c
400 +#, c-format
401 msgid "Stash mode change [y,n,q,a,d%s,?]? "
402 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
403
404 -#: add-patch.c git-add--interactive.perl
405 -#, c-format, perl-format
404 +#: add-patch.c
405 +#, c-format
406 msgid "Stash deletion [y,n,q,a,d%s,?]? "
407 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
408
409 -#: add-patch.c git-add--interactive.perl
410 -#, c-format, perl-format
409 +#: add-patch.c
410 +#, c-format
411 msgid "Stash addition [y,n,q,a,d%s,?]? "
412 msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? "
413
414 -#: add-patch.c git-add--interactive.perl
415 -#, c-format, perl-format
414 +#: add-patch.c
415 +#, c-format
416 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
417 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
418
@@ -436,23 +436,23 @@ msgstr ""
436 "a - 贮藏该块和本文件中后面的全部块\n"
437 "d - 不贮藏该块和本文件中后面的全部块\n"
438
439 -#: add-patch.c git-add--interactive.perl
440 -#, c-format, perl-format
439 +#: add-patch.c
440 +#, c-format
441 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
442 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
443
444 -#: add-patch.c git-add--interactive.perl
445 -#, c-format, perl-format
444 +#: add-patch.c
445 +#, c-format
446 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
447 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
448
449 -#: add-patch.c git-add--interactive.perl
450 -#, c-format, perl-format
449 +#: add-patch.c
450 +#, c-format
451 msgid "Unstage addition [y,n,q,a,d%s,?]? "
452 msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? "
453
454 -#: add-patch.c git-add--interactive.perl
455 -#, c-format, perl-format
454 +#: add-patch.c
455 +#, c-format
456 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
457 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
458
@@ -476,23 +476,23 @@ msgstr ""
476 "a - 取消暂存该块和本文件中后面的全部块\n"
477 "d - 不要取消暂存该块和本文件中后面的全部块\n"
478
479 -#: add-patch.c git-add--interactive.perl
480 -#, c-format, perl-format
479 +#: add-patch.c
480 +#, c-format
481 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
482 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
483
484 -#: add-patch.c git-add--interactive.perl
485 -#, c-format, perl-format
484 +#: add-patch.c
485 +#, c-format
486 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
487 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
488
489 -#: add-patch.c git-add--interactive.perl
490 -#, c-format, perl-format
489 +#: add-patch.c
490 +#, c-format
491 msgid "Apply addition to index [y,n,q,a,d%s,?]? "
492 msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? "
493
494 -#: add-patch.c git-add--interactive.perl
495 -#, c-format, perl-format
494 +#: add-patch.c
495 +#, c-format
496 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
497 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
498
@@ -516,23 +516,23 @@ msgstr ""
516 "a - 应用该块和本文件中后面的全部块\n"
517 "d - 不要应用该块和本文件中后面的全部块\n"
518
519 -#: add-patch.c git-add--interactive.perl
520 -#, c-format, perl-format
519 +#: add-patch.c
520 +#, c-format
521 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
522 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
523
524 -#: add-patch.c git-add--interactive.perl
525 -#, c-format, perl-format
524 +#: add-patch.c
525 +#, c-format
526 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
527 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
528
529 -#: add-patch.c git-add--interactive.perl
530 -#, c-format, perl-format
529 +#: add-patch.c
530 +#, c-format
531 msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
532 msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
533
534 -#: add-patch.c git-add--interactive.perl
535 -#, c-format, perl-format
534 +#: add-patch.c
535 +#, c-format
536 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
537 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
538
@@ -556,23 +556,23 @@ msgstr ""
556 "a - 丢弃该块和本文件中后面的全部块\n"
557 "d - 不要丢弃该块和本文件中后面的全部块\n"
558
559 -#: add-patch.c git-add--interactive.perl
560 -#, c-format, perl-format
559 +#: add-patch.c
560 +#, c-format
561 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
562 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
563
564 -#: add-patch.c git-add--interactive.perl
565 -#, c-format, perl-format
564 +#: add-patch.c
565 +#, c-format
566 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
567 msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
568
569 -#: add-patch.c git-add--interactive.perl
570 -#, c-format, perl-format
569 +#: add-patch.c
570 +#, c-format
571 msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
572 msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? "
573
574 -#: add-patch.c git-add--interactive.perl
575 -#, c-format, perl-format
574 +#: add-patch.c
575 +#, c-format
576 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
577 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
578
@@ -590,23 +590,23 @@ msgstr ""
590 "a - 丢弃该块和本文件中后面的全部块\n"
591 "d - 不要丢弃该块和本文件中后面的全部块\n"
592
593 -#: add-patch.c git-add--interactive.perl
594 -#, c-format, perl-format
593 +#: add-patch.c
594 +#, c-format
595 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
596 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
597
598 -#: add-patch.c git-add--interactive.perl
599 -#, c-format, perl-format
598 +#: add-patch.c
599 +#, c-format
600 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
601 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
602
603 -#: add-patch.c git-add--interactive.perl
604 -#, c-format, perl-format
603 +#: add-patch.c
604 +#, c-format
605 msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
606 msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
607
608 -#: add-patch.c git-add--interactive.perl
609 -#, c-format, perl-format
608 +#: add-patch.c
609 +#, c-format
610 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
611 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
612
@@ -624,23 +624,23 @@ msgstr ""
624 "a - 应用该块和本文件中后面的全部块\n"
625 "d - 不要应用该块和本文件中后面的全部块\n"
626
627 -#: add-patch.c git-add--interactive.perl
628 -#, c-format, perl-format
627 +#: add-patch.c
628 +#, c-format
629 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
630 msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
631
632 -#: add-patch.c git-add--interactive.perl
633 -#, c-format, perl-format
632 +#: add-patch.c
633 +#, c-format
634 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
635 msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
636
637 -#: add-patch.c git-add--interactive.perl
638 -#, c-format, perl-format
637 +#: add-patch.c
638 +#, c-format
639 msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
640 msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
641
642 -#: add-patch.c git-add--interactive.perl
643 -#, c-format, perl-format
642 +#: add-patch.c
643 +#, c-format
644 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
645 msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
646
@@ -708,7 +708,7 @@ msgstr ""
708 "\t不是结尾于：\n"
709 "%.*s"
710
711 -#: add-patch.c git-add--interactive.perl
711 +#: add-patch.c
712 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
713 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
714
@@ -725,9 +725,7 @@ msgstr ""
725 "要删除 '%c' 开始的行，删除它们。\n"
726 "以 %c 开始的行将被删除。\n"
727
728 -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
729 -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
730 -#: add-patch.c git-add--interactive.perl
728 +#: add-patch.c
729 msgid ""
730 "If it does not apply cleanly, you will be given an opportunity to\n"
731 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -744,21 +742,13 @@ msgstr "无法解析数据块头信息"
742 msgid "'git apply --cached' failed"
743 msgstr "'git apply --cached' 失败"
744
747 -#. #-#-#-#-# add-patch.c.po #-#-#-#-#
745 #. TRANSLATORS: do not translate [y/n]
746 #. The program will only accept that input at this point.
747 #. Consider translating (saying "no" discards!) as
748 #. (saying "n" for "no" discards!) if the translation
749 #. of the word "no" does not start with n.
750 #.
754 -#. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-#
755 -#. TRANSLATORS: do not translate [y/n]
756 -#. The program will only accept that input
757 -#. at this point.
758 -#. Consider translating (saying "no" discards!) as
759 -#. (saying "n" for "no" discards!) if the translation
760 -#. of the word "no" does not start with n.
761 -#: add-patch.c git-add--interactive.perl
751 +#: add-patch.c
752 msgid ""
753 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
754 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
@@ -767,11 +757,11 @@ msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！
757 msgid "The selected hunks do not apply to the index!"
758 msgstr "选中的块不能应用到索引！"
759
770 -#: add-patch.c git-add--interactive.perl
760 +#: add-patch.c
761 msgid "Apply them to the worktree anyway? "
762 msgstr "无论如何都要应用到工作区么？"
763
774 -#: add-patch.c git-add--interactive.perl
764 +#: add-patch.c
765 msgid "Nothing was applied.\n"
766 msgstr "未应用。\n"
767
@@ -809,11 +799,11 @@ msgstr "没有下一个块"
799 msgid "No other hunks to goto"
800 msgstr "没有其它可供跳转的块"
801
812 -#: add-patch.c git-add--interactive.perl
802 +#: add-patch.c
803 msgid "go to which hunk (<ret> to see more)? "
804 msgstr "跳转到哪个块（<回车> 查看更多）？ "
805
816 -#: add-patch.c git-add--interactive.perl
806 +#: add-patch.c
807 msgid "go to which hunk? "
808 msgstr "跳转到哪个块？"
809
@@ -833,7 +823,7 @@ msgstr[1] "对不起，只有 %d 个可用块。"
823 msgid "No other hunks to search"
824 msgstr "没有其它可供查找的块"
825
836 -#: add-patch.c git-add--interactive.perl
826 +#: add-patch.c
827 msgid "search for regex? "
828 msgstr "使用正则表达式搜索？"
829
@@ -1413,7 +1403,7 @@ msgstr "不能为新建文件 %s 创建后端存储"
1403 msgid "unable to add cache entry for %s"
1404 msgstr "无法为 %s 添加缓存条目"
1405
1416 -#: apply.c builtin/bisect--helper.c builtin/gc.c
1406 +#: apply.c builtin/bisect.c builtin/gc.c
1407 #, c-format
1408 msgid "failed to write to '%s'"
1409 msgstr "无法写入 '%s'"
@@ -1748,7 +1738,7 @@ msgstr "格式"
1738 msgid "archive format"
1739 msgstr "归档格式"
1740
1751 -#: archive.c builtin/log.c
1741 +#: archive.c builtin/log.c parse-options.h
1742 msgid "prefix"
1743 msgstr "前缀"
1744
@@ -1782,6 +1772,15 @@ msgstr "读取工作区中的 .gitattributes"
1772 msgid "report archived files on stderr"
1773 msgstr "在标准错误上报告归档文件"
1774
1775 +#: archive.c builtin/clone.c builtin/fetch.c builtin/pack-objects.c
1776 +#: builtin/pull.c
1777 +msgid "time"
1778 +msgstr "时间"
1779 +
1780 +#: archive.c
1781 +msgid "set modification time of archive entries"
1782 +msgstr "设置归档条目的修改时间"
1783 +
1784 #: archive.c
1785 msgid "set compression level"
1786 msgstr "设置压缩级别"
@@ -1837,6 +1836,15 @@ msgstr "参数不支持此格式 '%s'：-%d"
1836 msgid "%.*s is not a valid attribute name"
1837 msgstr "%.*s 不是一个有效的属性名"
1838
1839 +#: attr.c
1840 +msgid "unable to add additional attribute"
1841 +msgstr "不能添加额外属性"
1842 +
1843 +#: attr.c
1844 +#, c-format
1845 +msgid "ignoring overly long attributes line %d"
1846 +msgstr "忽略过长的属性行 %d"
1847 +
1848 #: attr.c
1849 #, c-format
1850 msgid "%s not allowed: %s:%d"
@@ -1850,6 +1858,21 @@ msgstr ""
1858 "负值模版在 git attributes 中被忽略\n"
1859 "当字符串确实要以感叹号开始时，使用 '\\!'。"
1860
1861 +#: attr.c
1862 +#, c-format
1863 +msgid "cannot fstat gitattributes file '%s'"
1864 +msgstr "无法 fstat gitattributes 文件 '%s'"
1865 +
1866 +#: attr.c
1867 +#, c-format
1868 +msgid "ignoring overly large gitattributes file '%s'"
1869 +msgstr "忽略过大的 gitattributes 文件 '%s'"
1870 +
1871 +#: attr.c
1872 +#, c-format
1873 +msgid "ignoring overly large gitattributes blob '%s'"
1874 +msgstr "忽略过大的 gitattributes 数据对象 '%s'"
1875 +
1876 #: bisect.c
1877 #, c-format
1878 msgid "Badly quoted content in file '%s': %s"
@@ -1982,8 +2005,8 @@ msgid "--reverse and --first-parent together require specified latest commit"
2005 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
2006
2007 #: blame.c builtin/commit.c builtin/log.c builtin/merge.c
1985 -#: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c
1986 -#: ref-filter.c remote.c sequencer.c submodule.c
2008 +#: builtin/pack-objects.c builtin/shortlog.c midx.c pack-bitmap.c ref-filter.c
2009 +#: remote.c sequencer.c submodule.c
2010 msgid "revision walk setup failed"
2011 msgstr "版本遍历初始化失败"
2012
@@ -2161,10 +2184,11 @@ msgstr "子模组 '%s'：无法找到子模组"
2184 #: branch.c
2185 #, c-format
2186 msgid ""
2164 -"You may try updating the submodules using 'git checkout %s && git submodule "
2165 -"update --init'"
2187 +"You may try updating the submodules using 'git checkout --no-recurse-"
2188 +"submodules %s && git submodule update --init'"
2189 msgstr ""
2167 -"你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组"
2190 +"你可以用 'git checkout --no-recurse-submodules %s && git submodule update --"
2191 +"init' 来尝试更新子模组"
2192
2193 #: branch.c
2194 #, c-format
@@ -2208,6 +2232,14 @@ msgstr "删除 '%s'\n"
2232 msgid "Unstaged changes after refreshing the index:"
2233 msgstr "刷新索引之后尚未被暂存的变更："
2234
2235 +#: builtin/add.c
2236 +msgid ""
2237 +"the add.interactive.useBuiltin setting has been removed!\n"
2238 +"See its entry in 'git help config' for details."
2239 +msgstr ""
2240 +"设置 add.interactive.useBuiltin 已经被移除！\n"
2241 +"查看 'git help config' 中的相关条目以获取更多信息。"
2242 +
2243 #: builtin/add.c builtin/rev-parse.c
2244 msgid "Could not read the index"
2245 msgstr "不能读取索引"
@@ -2659,7 +2691,7 @@ msgid ""
2691 "Not rewinding to ORIG_HEAD"
2692 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
2693
2662 -#: builtin/am.c builtin/bisect--helper.c worktree.c
2694 +#: builtin/am.c builtin/bisect.c worktree.c
2695 #, c-format
2696 msgid "failed to read '%s'"
2697 msgstr "无法读取 '%s'"
@@ -2681,6 +2713,10 @@ msgstr "git am [<选项>] (--continue | --skip | --abort)"
2713 msgid "run interactively"
2714 msgstr "以交互式方式运行"
2715
2716 +#: builtin/am.c
2717 +msgid "bypass pre-applypatch and applypatch-msg hooks"
2718 +msgstr "绕过 pre-applypatch 和 applypatch-msg 钩子"
2719 +
2720 #: builtin/am.c
2721 msgid "historical option -- no-op"
2722 msgstr "老的参数 —— 无作用"
@@ -2870,110 +2906,105 @@ msgstr "git archive：协议错误"
2906 msgid "git archive: expected a flush"
2907 msgstr "git archive：应有一个 flush 包"
2908
2873 -#: builtin/bisect--helper.c
2874 -msgid "git bisect--helper --bisect-reset [<commit>]"
2875 -msgstr "git bisect--helper --bisect-reset [<提交>]"
2876 -
2877 -#: builtin/bisect--helper.c
2909 +#: builtin/bisect.c
2910 msgid ""
2879 -"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
2880 -"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] "
2881 -"[<paths>...]"
2911 +"git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>] [--no-"
2912 +"checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]"
2913 msgstr ""
2883 -"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
2884 -"=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]"
2914 +"git bisect start [--term-{new,bad}=<术语> --term-{old,good}=<术语>] [--no-"
2915 +"checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径规格>...]"
2916
2886 -#: builtin/bisect--helper.c
2887 -msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
2888 -msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
2917 +#: builtin/bisect.c
2918 +msgid "git bisect (good|bad) [<rev>...]"
2919 +msgstr "git bisect (good|bad) [<版本>...]"
2920
2890 -#: builtin/bisect--helper.c
2891 -msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
2892 -msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
2921 +#: builtin/bisect.c
2922 +msgid "git bisect skip [(<rev>|<range>)...]"
2923 +msgstr "git bisect skip [(<版本>|<范围>)...]"
2924
2894 -#: builtin/bisect--helper.c
2895 -msgid "git bisect--helper --bisect-replay <filename>"
2896 -msgstr "git bisect--helper --bisect-replay <文件>"
2925 +#: builtin/bisect.c
2926 +msgid "git bisect reset [<commit>]"
2927 +msgstr "git bisect reset [<提交>]"
2928
2898 -#: builtin/bisect--helper.c
2899 -msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
2900 -msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
2929 +#: builtin/bisect.c
2930 +msgid "git bisect replay <logfile>"
2931 +msgstr "git bisect replay <日志文件>"
2932
2902 -#: builtin/bisect--helper.c
2903 -msgid "git bisect--helper --bisect-run <cmd>..."
2904 -msgstr "git bisect--helper --bisect-run <命令>..."
2933 +#: builtin/bisect.c
2934 +msgid "git bisect run <cmd>..."
2935 +msgstr "git bisect run <命令>..."
2936
2906 -#: builtin/bisect--helper.c
2937 +#: builtin/bisect.c
2938 #, c-format
2939 msgid "cannot open file '%s' in mode '%s'"
2940 msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
2941
2911 -#: builtin/bisect--helper.c
2942 +#: builtin/bisect.c
2943 #, c-format
2944 msgid "could not write to file '%s'"
2945 msgstr "不能写入文件 '%s'"
2946
2916 -#: builtin/bisect--helper.c
2947 +#: builtin/bisect.c
2948 #, c-format
2949 msgid "cannot open file '%s' for reading"
2950 msgstr "不能打开文件 '%s' 来读取"
2951
2921 -#: builtin/bisect--helper.c
2952 +#: builtin/bisect.c
2953 #, c-format
2954 msgid "'%s' is not a valid term"
2955 msgstr "'%s' 不是一个有效的术语"
2956
2926 -#: builtin/bisect--helper.c
2957 +#: builtin/bisect.c
2958 #, c-format
2959 msgid "can't use the builtin command '%s' as a term"
2960 msgstr "不能使用内置命令 '%s' 作为术语"
2961
2931 -#: builtin/bisect--helper.c
2962 +#: builtin/bisect.c
2963 #, c-format
2964 msgid "can't change the meaning of the term '%s'"
2965 msgstr "不能修改术语 '%s' 的含义"
2966
2936 -#: builtin/bisect--helper.c
2967 +#: builtin/bisect.c
2968 msgid "please use two different terms"
2969 msgstr "请使用两个不同的术语"
2970
2940 -#: builtin/bisect--helper.c
2971 +#: builtin/bisect.c
2972 #, c-format
2973 msgid "We are not bisecting.\n"
2974 msgstr "我们没有在二分查找。\n"
2975
2945 -#: builtin/bisect--helper.c
2976 +#: builtin/bisect.c
2977 #, c-format
2978 msgid "'%s' is not a valid commit"
2979 msgstr "'%s' 不是一个有效的提交"
2980
2950 -#: builtin/bisect--helper.c
2981 +#: builtin/bisect.c
2982 #, c-format
2983 msgid ""
2984 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
2985 msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
2986
2956 -#: builtin/bisect--helper.c
2987 +#: builtin/bisect.c
2988 #, c-format
2989 msgid "Bad bisect_write argument: %s"
2990 msgstr "坏的 bisect_write 参数：%s"
2991
2961 -#: builtin/bisect--helper.c
2992 +#: builtin/bisect.c
2993 #, c-format
2994 msgid "couldn't get the oid of the rev '%s'"
2995 msgstr "无法获取版本 '%s' 的对象 ID"
2996
2966 -#: builtin/bisect--helper.c
2997 +#: builtin/bisect.c
2998 #, c-format
2999 msgid "couldn't open the file '%s'"
3000 msgstr "无法打开文件 '%s'"
3001
2971 -#: builtin/bisect--helper.c
3002 +#: builtin/bisect.c
3003 #, c-format
3004 msgid "Invalid command: you're currently in a %s/%s bisect"
3005 msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
3006
2976 -#: builtin/bisect--helper.c
3007 +#: builtin/bisect.c
3008 #, c-format
3009 msgid ""
3010 "You need to give me at least one %s and %s revision.\n"
@@ -2982,7 +3013,7 @@ msgstr ""
3013 "您需要给我至少一个 %s 和一个 %s 版本。\n"
3014 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
3015
2985 -#: builtin/bisect--helper.c
3016 +#: builtin/bisect.c
3017 #, c-format
3018 msgid ""
3019 "You need to start by \"git bisect start\".\n"
@@ -2993,7 +3024,7 @@ msgstr ""
3024 "然后需要提供我至少一个 %s 和一个 %s 版本。\n"
3025 "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
3026
2996 -#: builtin/bisect--helper.c
3027 +#: builtin/bisect.c
3028 #, c-format
3029 msgid "bisecting only with a %s commit"
3030 msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -3002,37 +3033,37 @@ msgstr "在只有一个 %s 提交的情况下二分查找"
3033 #. translation. The program will only accept English input
3034 #. at this point.
3035 #.
3005 -#: builtin/bisect--helper.c
3036 +#: builtin/bisect.c
3037 msgid "Are you sure [Y/n]? "
3038 msgstr "您确认么[Y/n]？ "
3039
3009 -#: builtin/bisect--helper.c
3040 +#: builtin/bisect.c
3041 msgid "status: waiting for both good and bad commits\n"
3042 msgstr "状态：正在等待好的和坏的提交\n"
3043
3013 -#: builtin/bisect--helper.c
3044 +#: builtin/bisect.c
3045 #, c-format
3046 msgid "status: waiting for bad commit, %d good commit known\n"
3047 msgid_plural "status: waiting for bad commit, %d good commits known\n"
3048 msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
3049 msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n"
3050
3020 -#: builtin/bisect--helper.c
3051 +#: builtin/bisect.c
3052 msgid "status: waiting for good commit(s), bad commit known\n"
3053 msgstr "状态：正在等待好的提交，已知坏的提交\n"
3054
3024 -#: builtin/bisect--helper.c
3055 +#: builtin/bisect.c
3056 msgid "no terms defined"
3057 msgstr "未定义术语"
3058
3028 -#: builtin/bisect--helper.c
3059 +#: builtin/bisect.c
3060 #, c-format
3061 msgid ""
3062 "Your current terms are %s for the old state\n"
3063 "and %s for the new state.\n"
3064 msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
3065
3035 -#: builtin/bisect--helper.c
3066 +#: builtin/bisect.c
3067 #, c-format
3068 msgid ""
3069 "invalid argument %s for 'git bisect terms'.\n"
@@ -3041,52 +3072,48 @@ msgstr ""
3072 "命令 'git bisect terms' 的参数 %s 无效。\n"
3073 "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
3074
3044 -#: builtin/bisect--helper.c
3075 +#: builtin/bisect.c
3076 msgid "revision walk setup failed\n"
3077 msgstr "版本遍历设置失败\n"
3078
3048 -#: builtin/bisect--helper.c
3079 +#: builtin/bisect.c
3080 #, c-format
3081 msgid "could not open '%s' for appending"
3082 msgstr "无法打开 '%s' 进行追加"
3083
3053 -#: builtin/bisect--helper.c
3084 +#: builtin/bisect.c
3085 msgid "'' is not a valid term"
3086 msgstr "'' 不是一个有效的术语"
3087
3057 -#: builtin/bisect--helper.c
3088 +#: builtin/bisect.c
3089 #, c-format
3090 msgid "unrecognized option: '%s'"
3091 msgstr "未识别的选项：'%s'"
3092
3062 -#: builtin/bisect--helper.c
3093 +#: builtin/bisect.c
3094 #, c-format
3095 msgid "'%s' does not appear to be a valid revision"
3096 msgstr "'%s' 看起来不是一个有效的版本"
3097
3067 -#: builtin/bisect--helper.c
3098 +#: builtin/bisect.c
3099 msgid "bad HEAD - I need a HEAD"
3100 msgstr "坏的 HEAD - 我需要一个 HEAD"
3101
3071 -#: builtin/bisect--helper.c
3102 +#: builtin/bisect.c
3103 #, c-format
3104 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
3105 msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
3106
3076 -#: builtin/bisect--helper.c
3077 -msgid "won't bisect on cg-seek'ed tree"
3078 -msgstr "不会在做了 cg-seek 的树上做二分查找"
3079 -
3080 -#: builtin/bisect--helper.c
3107 +#: builtin/bisect.c
3108 msgid "bad HEAD - strange symbolic ref"
3109 msgstr "坏的 HEAD - 奇怪的符号引用"
3110
3084 -#: builtin/bisect--helper.c
3111 +#: builtin/bisect.c
3112 #, c-format
3113 msgid "invalid ref: '%s'"
3114 msgstr "无效的引用：'%s'"
3115
3089 -#: builtin/bisect--helper.c
3116 +#: builtin/bisect.c
3117 msgid "You need to start by \"git bisect start\"\n"
3118 msgstr "您需要执行 \"git bisect start\" 来开始\n"
3119
@@ -3094,113 +3121,122 @@ msgstr "您需要执行 \"git bisect start\" 来开始\n"
3121 #. translation. The program will only accept English input
3122 #. at this point.
3123 #.
3097 -#: builtin/bisect--helper.c
3124 +#: builtin/bisect.c
3125 msgid "Do you want me to do it for you [Y/n]? "
3126 msgstr "您想让我为您这样做么[Y/n]？ "
3127
3101 -#: builtin/bisect--helper.c
3128 +#: builtin/bisect.c
3129 msgid "Please call `--bisect-state` with at least one argument"
3130 msgstr "请使用至少一个参数调用 `--bisect-state`"
3131
3105 -#: builtin/bisect--helper.c
3132 +#: builtin/bisect.c
3133 #, c-format
3134 msgid "'git bisect %s' can take only one argument."
3135 msgstr "'git bisect %s' 只能带一个参数。"
3136
3110 -#: builtin/bisect--helper.c
3137 +#: builtin/bisect.c
3138 #, c-format
3139 msgid "Bad rev input: %s"
3140 msgstr "坏的版本输入：%s"
3141
3115 -#: builtin/bisect--helper.c
3142 +#: builtin/bisect.c
3143 #, c-format
3144 msgid "Bad rev input (not a commit): %s"
3145 msgstr "坏的版本输入（不是提交）：%s"
3146
3120 -#: builtin/bisect--helper.c
3147 +#: builtin/bisect.c
3148 msgid "We are not bisecting."
3149 msgstr "我们没有在二分查找。"
3150
3124 -#: builtin/bisect--helper.c
3151 +#: builtin/bisect.c
3152 #, c-format
3153 msgid "'%s'?? what are you talking about?"
3154 msgstr "'%s'?? 您在说什么?"
3155
3129 -#: builtin/bisect--helper.c
3156 +#: builtin/bisect.c
3157 #, c-format
3158 msgid "cannot read file '%s' for replaying"
3159 msgstr "不能读取文件 '%s' 来重放"
3160
3134 -#: builtin/bisect--helper.c
3161 +#: builtin/bisect.c
3162 #, c-format
3163 msgid "running %s\n"
3164 msgstr "正在执行 %s\n"
3165
3139 -#: builtin/bisect--helper.c
3166 +#: builtin/bisect.c
3167 msgid "bisect run failed: no command provided."
3168 msgstr "二分查找运行失败：没有提供命令。"
3169
3143 -#: builtin/bisect--helper.c
3170 +#: builtin/bisect.c
3171 #, c-format
3145 -msgid "unable to verify '%s' on good revision"
3146 -msgstr "无法在好版本中验证 '%s'"
3172 +msgid "unable to verify %s on good revision"
3173 +msgstr "无法在好版本中验证 %s"
3174
3148 -#: builtin/bisect--helper.c
3175 +#: builtin/bisect.c
3176 #, c-format
3177 msgid "bogus exit code %d for good revision"
3178 msgstr "好版本返回错误的退出码 %d"
3179
3153 -#: builtin/bisect--helper.c
3180 +#: builtin/bisect.c
3181 #, c-format
3155 -msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128"
3156 -msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128"
3182 +msgid "bisect run failed: exit code %d from %s is < 0 or >= 128"
3183 +msgstr "二分查找运行失败：命令 %2$s 的退出码 %1$d < 0 或 >= 128"
3184
3158 -#: builtin/bisect--helper.c
3185 +#: builtin/bisect.c
3186 #, c-format
3187 msgid "cannot open file '%s' for writing"
3188 msgstr "无法打开文件 '%s' 进行写入"
3189
3163 -#: builtin/bisect--helper.c
3190 +#: builtin/bisect.c
3191 msgid "bisect run cannot continue any more"
3192 msgstr "二分查找不能继续运行"
3193
3167 -#: builtin/bisect--helper.c
3168 -#, c-format
3194 +#: builtin/bisect.c
3195 msgid "bisect run success"
3196 msgstr "二分查找运行成功"
3197
3172 -#: builtin/bisect--helper.c
3173 -#, c-format
3198 +#: builtin/bisect.c
3199 msgid "bisect found first bad commit"
3200 msgstr "二分查找找到了第一个坏的提交"
3201
3177 -#: builtin/bisect--helper.c
3202 +#: builtin/bisect.c
3203 #, c-format
3179 -msgid ""
3180 -"bisect run failed: 'git bisect--helper --bisect-state %s' exited with error "
3181 -"code %d"
3182 -msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d"
3204 +msgid "bisect run failed: 'git bisect %s' exited with error code %d"
3205 +msgstr "二分查找运行失败：'git bisect %s' 退出码为 %d"
3206
3184 -#: builtin/bisect--helper.c
3185 -msgid "--bisect-reset requires either no argument or a commit"
3186 -msgstr "--bisect-reset 无需参数或者需要一个提交"
3187 -
3188 -#: builtin/bisect--helper.c
3189 -msgid "--bisect-terms requires 0 or 1 argument"
3190 -msgstr "--bisect-terms 需要 0 或 1 个参数"
3207 +#: builtin/bisect.c
3208 +#, c-format
3209 +msgid "'%s' requires either no argument or a commit"
3210 +msgstr "'%s' 无需参数或者需要一个提交"
3211
3192 -#: builtin/bisect--helper.c
3193 -msgid "--bisect-next requires 0 arguments"
3194 -msgstr "--bisect-next 需要 0 个参数"
3212 +#: builtin/bisect.c
3213 +#, c-format
3214 +msgid "'%s' requires 0 or 1 argument"
3215 +msgstr "'%s' 无需参数或者需要一个参数"
3216
3196 -#: builtin/bisect--helper.c
3197 -msgid "--bisect-log requires 0 arguments"
3198 -msgstr "--bisect-log 需要 0 个参数"
3217 +#: builtin/bisect.c
3218 +#, c-format
3219 +msgid "'%s' requires 0 arguments"
3220 +msgstr "'%s' 无需参数"
3221
3200 -#: builtin/bisect--helper.c
3222 +#: builtin/bisect.c
3223 msgid "no logfile given"
3224 msgstr "未提供日志文件"
3225
3226 +#: builtin/bisect.c
3227 +#, c-format
3228 +msgid "'%s' failed: no command provided."
3229 +msgstr "'%s' 运行失败：没有提供命令。"
3230 +
3231 +#: builtin/bisect.c
3232 +msgid "need a command"
3233 +msgstr "需要一个命令"
3234 +
3235 +#: builtin/bisect.c builtin/cat-file.c
3236 +#, c-format
3237 +msgid "unknown command: '%s'"
3238 +msgstr "未知命令：'%s'"
3239 +
3240 #: builtin/blame.c
3241 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
3242 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
@@ -3912,6 +3948,10 @@ msgstr "git bundle list-heads <文件> [<引用名>...]"
3948 msgid "git bundle unbundle [--progress] <file> [<refname>...]"
3949 msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]"
3950
3951 +#: builtin/bundle.c
3952 +msgid "need a <file> argument"
3953 +msgstr "需要一个 <文件> 参数"
3954 +
3955 #: builtin/bundle.c builtin/pack-objects.c
3956 msgid "do not show progress meter"
3957 msgstr "不显示进度表"
@@ -3981,11 +4021,6 @@ msgstr "%s 需要参数"
4021 msgid "%s takes no arguments"
4022 msgstr "%s 不需要参数"
4023
3984 -#: builtin/cat-file.c
3985 -#, c-format
3986 -msgid "unknown command: '%s'"
3987 -msgstr "未知命令：'%s'"
3988 -
4024 #: builtin/cat-file.c
4025 msgid "only one batch option may be specified"
4026 msgstr "只能指定一个批处理选项"
@@ -4155,12 +4190,17 @@ msgid "only two arguments allowed in <type> <object> mode, not %d"
4190 msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个"
4191
4192 #: builtin/check-attr.c
4158 -msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
4159 -msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
4193 +msgid ""
4194 +"git check-attr [--source <tree-ish>] [-a | --all | <attr>...] [--] "
4195 +"<pathname>..."
4196 +msgstr ""
4197 +"git check-attr [--source <树对象>] [-a | --all | <属性>...] [--] <路径名>..."
4198
4199 #: builtin/check-attr.c
4162 -msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
4163 -msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
4200 +msgid ""
4201 +"git check-attr --stdin [-z] [--source <tree-ish>] [-a | --all | <attr>...]"
4202 +msgstr ""
4203 +"git check-attr --stdin [-z] [--source <树对象>] [-a | --all | <属性>...]"
4204
4205 #: builtin/check-attr.c
4206 msgid "report all attributes set on file"
@@ -4178,6 +4218,14 @@ msgstr "从标准输入读出文件名"
4218 msgid "terminate input and output records by a NUL character"
4219 msgstr "输入和输出的记录使用 NUL 字符终结"
4220
4221 +#: builtin/check-attr.c
4222 +msgid "<tree-ish>"
4223 +msgstr "<树对象>"
4224 +
4225 +#: builtin/check-attr.c
4226 +msgid "which tree-ish to check attributes at"
4227 +msgstr "要用哪一个树对象来检查属性"
4228 +
4229 #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c
4230 msgid "suppress progress reporting"
4231 msgstr "不显示进度报告"
@@ -4849,7 +4897,7 @@ msgstr "拒绝删除当前工作目录\n"
4897 msgid "Would refuse to remove current working directory\n"
4898 msgstr "将拒绝删除当前工作目录\n"
4899
4852 -#: builtin/clean.c git-add--interactive.perl
4900 +#: builtin/clean.c
4901 #, c-format
4902 msgid ""
4903 "Prompt help:\n"
@@ -4862,7 +4910,7 @@ msgstr ""
4910 "foo - 通过唯一前缀选择一个选项\n"
4911 " - （空）什么也不选择\n"
4912
4865 -#: builtin/clean.c git-add--interactive.perl
4913 +#: builtin/clean.c
4914 #, c-format
4915 msgid ""
4916 "Prompt help:\n"
@@ -4883,8 +4931,8 @@ msgstr ""
4931 "* - 选择所有选项\n"
4932 " - （空）结束选择\n"
4933
4886 -#: builtin/clean.c git-add--interactive.perl
4887 -#, c-format, perl-format
4934 +#: builtin/clean.c
4935 +#, c-format
4936 msgid "Huh (%s)?\n"
4937 msgstr "嗯（%s）？\n"
4938
@@ -5073,10 +5121,6 @@ msgstr "深度"
5121 msgid "create a shallow clone of that depth"
5122 msgstr "创建一个指定深度的浅克隆"
5123
5076 -#: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c
5077 -msgid "time"
5078 -msgstr "时间"
5079 -
5124 #: builtin/clone.c
5125 msgid "create a shallow clone since a specific time"
5126 msgstr "从一个特定时间创建一个浅克隆"
@@ -5364,6 +5408,10 @@ msgstr "无法初始化仓库，跳过归档包 URI"
5408 msgid "failed to fetch objects from bundle URI '%s'"
5409 msgstr "无法从归档包 URI '%s' 获取对象"
5410
5411 +#: builtin/clone.c
5412 +msgid "failed to fetch advertised bundles"
5413 +msgstr "无法获取公布的归档包"
5414 +
5415 #: builtin/clone.c
5416 msgid "remote transport reported error"
5417 msgstr "远程传输报告错误"
@@ -5733,7 +5781,7 @@ msgid ""
5781 "in the current commit message"
5782 msgstr "无法选择一个未被当前提交说明使用的注释字符"
5783
5736 -#: builtin/commit.c
5784 +#: builtin/commit.c builtin/merge-tree.c
5785 #, c-format
5786 msgid "could not lookup commit %s"
5787 msgstr "不能查询提交 %s"
@@ -6035,7 +6083,7 @@ msgstr "日期"
6083 msgid "override date for commit"
6084 msgstr "提交时覆盖日期"
6085
6038 -#: builtin/commit.c parse-options.h ref-filter.h
6086 +#: builtin/commit.c builtin/merge-tree.c parse-options.h ref-filter.h
6087 msgid "commit"
6088 msgstr "提交"
6089
@@ -6186,7 +6234,7 @@ msgstr ""
6234 msgid "git config [<options>]"
6235 msgstr "git config [<选项>]"
6236
6189 -#: builtin/config.c builtin/env--helper.c
6237 +#: builtin/config.c
6238 #, c-format
6239 msgid "unrecognized --type argument, %s"
6240 msgstr "未能识别的 --type 参数，%s"
@@ -6295,11 +6343,11 @@ msgstr "获得颜色设置：配置 [stdout-is-tty]"
6343 msgid "Type"
6344 msgstr "类型"
6345
6298 -#: builtin/config.c builtin/env--helper.c builtin/hash-object.c
6346 +#: builtin/config.c builtin/hash-object.c
6347 msgid "type"
6348 msgstr "类型"
6349
6302 -#: builtin/config.c builtin/env--helper.c
6350 +#: builtin/config.c
6351 msgid "value is given this type"
6352 msgstr "取值为该类型"
6353
@@ -6351,7 +6399,7 @@ msgstr "显示配置的来源（文件、标准输入、数据对象，或命令
6399 msgid "show scope of config (worktree, local, global, system, command)"
6400 msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
6401
6354 -#: builtin/config.c builtin/env--helper.c
6402 +#: builtin/config.c
6403 msgid "value"
6404 msgstr "取值"
6405
@@ -6886,30 +6934,6 @@ msgstr "没有为 --tool=<工具> 参数提供 <工具>"
6934 msgid "no <cmd> given for --extcmd=<cmd>"
6935 msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
6936
6889 -#: builtin/env--helper.c
6890 -msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
6891 -msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>"
6892 -
6893 -#: builtin/env--helper.c
6894 -msgid "default for git_env_*(...) to fall back on"
6895 -msgstr "git_env_*(...) 的默认值"
6896 -
6897 -#: builtin/env--helper.c
6898 -msgid "be quiet only use git_env_*() value as exit code"
6899 -msgstr "安静模式，只使用 git_env_*() 的值作为退出码"
6900 -
6901 -#: builtin/env--helper.c
6902 -#, c-format
6903 -msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
6904 -msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`"
6905 -
6906 -#: builtin/env--helper.c
6907 -#, c-format
6908 -msgid ""
6909 -"option `--default' expects an unsigned long value with `--type=ulong`, not "
6910 -"`%s`"
6911 -msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`"
6912 -
6937 #: builtin/fast-export.c
6938 msgid "git fast-export [<rev-list-opts>]"
6939 msgstr "git fast-export [<rev-list 选项>]"
@@ -7403,6 +7427,11 @@ msgstr "--deepen 不支持负数深度"
7427 msgid "--unshallow on a complete repository does not make sense"
7428 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
7429
7430 +#: builtin/fetch.c
7431 +#, c-format
7432 +msgid "failed to fetch bundles from '%s'"
7433 +msgstr "无法从 '%s' 获取归档包"
7434 +
7435 #: builtin/fetch.c
7436 msgid "fetch --all does not take a repository argument"
7437 msgstr "fetch --all 不能带一个仓库参数"
@@ -8694,13 +8723,21 @@ msgid "'git help config' for more information"
8723 msgstr "'git help config' 获取更多信息"
8724
8725 #: builtin/hook.c
8697 -msgid "git hook run [--ignore-missing] <hook-name> [-- <hook-args>]"
8698 -msgstr "git hook run [--ignore-missing] <钩子名称> [-- <钩子参数>]"
8726 +msgid ""
8727 +"git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-"
8728 +"args>]"
8729 +msgstr ""
8730 +"git hook run [--ignore-missing] [--to-stdin=<路径>] <钩子名称> [-- <钩子参数"
8731 +">]"
8732
8733 #: builtin/hook.c
8734 msgid "silently ignore missing requested <hook-name>"
8735 msgstr "静默地忽略缺失的 <钩子名称>"
8736
8737 +#: builtin/hook.c
8738 +msgid "file to read into hooks' stdin"
8739 +msgstr "读取至钩子标准输入的文件"
8740 +
8741 #: builtin/index-pack.c
8742 #, c-format
8743 msgid "object type mismatch at %s"
@@ -9749,11 +9786,11 @@ msgstr ""
9786 msgid ""
9787 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
9788 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n"
9752 -" [--symref] [<repository> [<refs>...]]"
9789 +" [--symref] [<repository> [<patterns>...]]"
9790 msgstr ""
9791 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n"
9792 " [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n"
9756 -" [--symref] [<仓库> [<引用>...]]"
9793 +" [--symref] [<仓库> [<模式>...]]"
9794
9795 #: builtin/ls-remote.c
9796 msgid "do not print remote URL"
@@ -10072,10 +10109,18 @@ msgstr "允许合并不相关的历史"
10109 msgid "perform multiple merges, one per line of input"
10110 msgstr "实施多个合并，每输入行一个"
10111
10112 +#: builtin/merge-tree.c
10113 +msgid "specify a merge-base for the merge"
10114 +msgstr "指定用于合并的合并基线"
10115 +
10116 #: builtin/merge-tree.c
10117 msgid "--trivial-merge is incompatible with all other options"
10118 msgstr "--trivial-merge 与其他所有选项不兼容"
10119
10120 +#: builtin/merge-tree.c
10121 +msgid "--merge-base is incompatible with --stdin"
10122 +msgstr "--merge-base 与 --stdin 不兼容"
10123 +
10124 #: builtin/merge-tree.c builtin/notes.c
10125 #, c-format
10126 msgid "malformed input line: '%s'."
@@ -12088,7 +12133,7 @@ msgstr "需要远端支持原子事务"
12133 msgid "--delete doesn't make sense without any refs"
12134 msgstr "--delete 未接任何引用没有意义"
12135
12091 -#: builtin/push.c
12136 +#: builtin/push.c t/helper/test-bundle-uri.c
12137 #, c-format
12138 msgid "bad repository '%s'"
12139 msgstr "坏的仓库 '%s'"
@@ -12357,6 +12402,10 @@ msgstr ""
12402 msgid "could not switch to %s"
12403 msgstr "无法切换到 %s"
12404
12405 +#: builtin/rebase.c
12406 +msgid "apply options and merge options cannot be used together"
12407 +msgstr "应用选项和合并选项不能同时使用"
12408 +
12409 #: builtin/rebase.c
12410 #, c-format
12411 msgid ""
@@ -12636,8 +12685,16 @@ msgid "--strategy requires --merge or --interactive"
12685 msgstr "--strategy 需要 --merge 或 --interactive"
12686
12687 #: builtin/rebase.c
12639 -msgid "apply options and merge options cannot be used together"
12640 -msgstr "应用选项和合并选项不能同时使用"
12688 +msgid ""
12689 +"apply options are incompatible with rebase.autosquash. Consider adding --no-"
12690 +"autosquash"
12691 +msgstr "应用的选项与 rebase.autosquash 不兼容。考虑加上 --no-autosquash"
12692 +
12693 +#: builtin/rebase.c
12694 +msgid ""
12695 +"apply options are incompatible with rebase.updateRefs. Consider adding --no-"
12696 +"update-refs"
12697 +msgstr "应用的选项与 rebase.updateRefs 不兼容。考虑加上 --no-update-refs"
12698
12699 #: builtin/rebase.c
12700 #, c-format
@@ -15680,11 +15737,6 @@ msgstr "'%s' 不是一个有效的子模组名称"
15737 msgid "git submodule--helper <command>"
15738 msgstr "git submodule--helper <命令>"
15739
15683 -#: builtin/submodule--helper.c git.c
15684 -#, c-format
15685 -msgid "%s doesn't support --super-prefix"
15686 -msgstr "%s 不支持 --super-prefix"
15687 -
15740 #: builtin/symbolic-ref.c
15741 msgid "git symbolic-ref [-m <reason>] <name> <ref>"
15742 msgstr "git symbolic-ref [-m <理由>] <名称> <引用>"
@@ -16588,6 +16640,11 @@ msgstr "只对调试有用"
16640 msgid "core.fsyncMethod = batch is unsupported on this platform"
16641 msgstr "core.fsyncMethod = batch 不支持本平台"
16642
16643 +#: bundle-uri.c
16644 +#, c-format
16645 +msgid "could not parse bundle list key %s with value '%s'"
16646 +msgstr "不能解析归档包列表键 %s 的值 '%s'"
16647 +
16648 #: bundle-uri.c
16649 #, c-format
16650 msgid "bundle list at '%s' has no mode"
@@ -16601,6 +16658,15 @@ msgstr "无法创建临时文件"
16658 msgid "insufficient capabilities"
16659 msgstr "缺乏能力"
16660
16661 +#: bundle-uri.c
16662 +#, c-format
16663 +msgid "file downloaded from '%s' is not a bundle"
16664 +msgstr "下载自 '%s' 的文件不是归档包"
16665 +
16666 +#: bundle-uri.c
16667 +msgid "failed to store maximum creation token"
16668 +msgstr "无法储存最大的创建令牌"
16669 +
16670 #: bundle-uri.c
16671 #, c-format
16672 msgid "unrecognized bundle mode from URI '%s'"
@@ -16621,6 +16687,15 @@ msgstr "无法从 URI '%s' 下载归档包"
16687 msgid "file at URI '%s' is not a bundle or bundle list"
16688 msgstr "位于 URI '%s' 的文件不是归档包或归档包列表"
16689
16690 +#: bundle-uri.c
16691 +#, c-format
16692 +msgid "bundle-uri: unexpected argument: '%s'"
16693 +msgstr "bundle-uri: 意外的参数：'%s'"
16694 +
16695 +#: bundle-uri.c
16696 +msgid "bundle-uri: expected flush after arguments"
16697 +msgstr "bundle-uri: 在参数之后应有一个 flush"
16698 +
16699 #: bundle-uri.c
16700 msgid "bundle-uri: got an empty line"
16701 msgstr "bundle-uri: 获得了空行"
@@ -16661,6 +16736,12 @@ msgstr "仓库中缺少这些必备的提交："
16736 msgid "need a repository to verify a bundle"
16737 msgstr "需要一个仓库来校验一个归档包"
16738
16739 +#: bundle.c
16740 +msgid ""
16741 +"some prerequisite commits exist in the object store, but are not connected "
16742 +"to the repository's history"
16743 +msgstr "一些前置提交存在于对象储存中，但未连接于本仓库的历史"
16744 +
16745 #: bundle.c
16746 #, c-format
16747 msgid "The bundle contains this ref:"
@@ -18439,17 +18520,26 @@ msgstr "服务器给出未知的对象格式 '%s'"
18520
18521 #: connect.c
18522 #, c-format
18442 -msgid "invalid ls-refs response: %s"
18443 -msgstr "无效的 ls-refs 响应：%s"
18523 +msgid "error on bundle-uri response line %d: %s"
18524 +msgstr "于 bundle-uri 响应行 %d 发生错误：%s"
18525
18526 #: connect.c
18446 -msgid "expected flush after ref listing"
18447 -msgstr "在引用列表之后应该有一个 flush 包"
18527 +msgid "expected flush after bundle-uri listing"
18528 +msgstr "在 bundle-uri 列表之后应该有一个 flush 包"
18529
18530 #: connect.c
18531 msgid "expected response end packet after ref listing"
18532 msgstr "在引用列表之后应该有响应结束包"
18533
18534 +#: connect.c
18535 +#, c-format
18536 +msgid "invalid ls-refs response: %s"
18537 +msgstr "无效的 ls-refs 响应：%s"
18538 +
18539 +#: connect.c
18540 +msgid "expected flush after ref listing"
18541 +msgstr "在引用列表之后应该有一个 flush 包"
18542 +
18543 #: connect.c
18544 #, c-format
18545 msgid "protocol '%s' is not supported"
@@ -19861,16 +19951,14 @@ msgid ""
19951 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19952 "bare]\n"
19953 " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
19864 -" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
19865 -" <command> [<args>]"
19954 +" [--config-env=<name>=<envvar>] <command> [<args>]"
19955 msgstr ""
19867 -"git [-v | --version] [--help] [-C <路径>] [-c <名称>=<取值>]\n"
19956 +"git [-v | --version] [-h | --help] [-C <路径>] [-c <名称>=<取值>]\n"
19957 " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n"
19958 " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
19959 "bare]\n"
19960 " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
19872 -" [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
19873 -" <命令> [<参数>]"
19961 +" [--config-env=<名称>=<环境变量>] <命令> [<参数>]"
19962
19963 #: git.c
19964 msgid ""
@@ -19899,11 +19987,6 @@ msgstr "没有为 '%s' 选项提供目录\n"
19987 msgid "no namespace given for --namespace\n"
19988 msgstr "没有为 --namespace 提供命名空间\n"
19989
19902 -#: git.c
19903 -#, c-format
19904 -msgid "no prefix given for --super-prefix\n"
19905 -msgstr "没有为 --super-prefix 提供前缀\n"
19906 -
19990 #: git.c
19991 #, c-format
19992 msgid "-c expects a configuration string\n"
@@ -20038,8 +20121,13 @@ msgid "gpg.ssh.defaultKeyCommand failed: %s %s"
20121 msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s"
20122
20123 #: gpg-interface.c
20041 -msgid "gpg failed to sign the data"
20042 -msgstr "gpg 无法为数据签名"
20124 +#, c-format
20125 +msgid ""
20126 +"gpg failed to sign the data:\n"
20127 +"%s"
20128 +msgstr ""
20129 +"gpg 无法为数据签名：\n"
20130 +"%s"
20131
20132 #: gpg-interface.c
20133 msgid "user.signingKey needs to be set for ssh signing"
@@ -21384,6 +21472,11 @@ msgstr "损坏的松散对象 '%s'"
21472 msgid "garbage at end of loose object '%s'"
21473 msgstr "松散对象 '%s' 后面有垃圾数据"
21474
21475 +#: object-file.c
21476 +#, c-format
21477 +msgid "unable to open loose object %s"
21478 +msgstr "无法打开松散对象 %s"
21479 +
21480 #: object-file.c
21481 #, c-format
21482 msgid "unable to parse %s header"
@@ -21405,19 +21498,14 @@ msgstr "%s 的头部太长，超出了 %d 字节"
21498
21499 #: object-file.c
21500 #, c-format
21408 -msgid "failed to read object %s"
21409 -msgstr "无法读取对象 %s"
21501 +msgid "loose object %s (stored in %s) is corrupt"
21502 +msgstr "松散对象 %s（保存在 %s）已损坏"
21503
21504 #: object-file.c
21505 #, c-format
21506 msgid "replacement %s not found for %s"
21507 msgstr "找不到 %2$s 的替代 %1$s"
21508
21416 -#: object-file.c
21417 -#, c-format
21418 -msgid "loose object %s (stored in %s) is corrupt"
21419 -msgstr "松散对象 %s（保存在 %s）已损坏"
21420 -
21509 #: object-file.c
21510 #, c-format
21511 msgid "packed object %s (stored in %s) is corrupt"
@@ -21433,10 +21521,6 @@ msgstr "无法写文件 %s"
21521 msgid "unable to set permission to '%s'"
21522 msgstr "无法为 '%s' 设置权限"
21523
21436 -#: object-file.c
21437 -msgid "file write error"
21438 -msgstr "文件写错误"
21439 -
21524 #: object-file.c
21525 msgid "error when closing loose object file"
21526 msgstr "关闭松散对象文件时出错"
@@ -21495,12 +21579,13 @@ msgid "cannot read object for %s"
21579 msgstr "不能读取对象 %s"
21580
21581 #: object-file.c
21498 -msgid "corrupt commit"
21499 -msgstr "损坏的提交"
21582 +#, c-format
21583 +msgid "object fails fsck: %s"
21584 +msgstr "对象 fsck 失败：%s"
21585
21586 #: object-file.c
21502 -msgid "corrupt tag"
21503 -msgstr "损坏的标签"
21587 +msgid "refusing to create malformed object"
21588 +msgstr "拒绝创建格式错误的对象"
21589
21590 #: object-file.c
21591 #, c-format
@@ -21810,11 +21895,6 @@ msgstr "位图包索引中 XOR 偏移值无效"
21895 msgid "cannot fstat bitmap file"
21896 msgstr "不能对位图文件调用 fstat"
21897
21813 -#: pack-bitmap.c
21814 -#, c-format
21815 -msgid "ignoring extra bitmap file: '%s'"
21816 -msgstr "忽略额外的位图文件：'%s'"
21817 -
21898 #: pack-bitmap.c
21899 msgid "checksum doesn't match in MIDX and bitmap"
21900 msgstr "MIDX 和位图中的校验码不匹配"
@@ -22141,6 +22221,10 @@ msgstr "更加安静"
22221 msgid "use <n> digits to display object names"
22222 msgstr "用 <n> 位数字显示对象名"
22223
22224 +#: parse-options.h
22225 +msgid "prefixed path to initial superproject"
22226 +msgstr "用来初始化父项目的前缀路径"
22227 +
22228 #: parse-options.h
22229 msgid "how to strip spaces and #comments from message"
22230 msgstr "设置如何删除提交说明里的空格和#注释"
@@ -22723,6 +22807,16 @@ msgstr "落后 %d"
22807 msgid "ahead %d, behind %d"
22808 msgstr "领先 %d，落后 %d"
22809
22810 +#: ref-filter.c
22811 +#, c-format
22812 +msgid "%%(%.*s) does not take arguments"
22813 +msgstr "%%(%.*s) 不带参数"
22814 +
22815 +#: ref-filter.c
22816 +#, c-format
22817 +msgid "unrecognized %%(%.*s) argument: %s"
22818 +msgstr "未能识别的 %%(%.*s) 参数：%s"
22819 +
22820 #: ref-filter.c
22821 #, c-format
22822 msgid "expected format: %%(color:<color>)"
@@ -22743,26 +22837,6 @@ msgstr "期望整数值 refname:lstrip=%s"
22837 msgid "Integer value expected refname:rstrip=%s"
22838 msgstr "期望整数值 refname:rstrip=%s"
22839
22746 -#: ref-filter.c
22747 -#, c-format
22748 -msgid "unrecognized %%(%s) argument: %s"
22749 -msgstr "未能识别的 %%(%s) 参数：%s"
22750 -
22751 -#: ref-filter.c
22752 -#, c-format
22753 -msgid "%%(objecttype) does not take arguments"
22754 -msgstr "%%(objecttype) 不带参数"
22755 -
22756 -#: ref-filter.c
22757 -#, c-format
22758 -msgid "%%(deltabase) does not take arguments"
22759 -msgstr "%%(deltabase) 不带参数"
22760 -
22761 -#: ref-filter.c
22762 -#, c-format
22763 -msgid "%%(body) does not take arguments"
22764 -msgstr "%%(body) 不带参数"
22765 -
22840 #: ref-filter.c
22841 #, c-format
22842 msgid "expected %%(trailers:key=<value>)"
@@ -22783,11 +22857,6 @@ msgstr "期望一个正数 contents:lines=%s"
22857 msgid "positive value expected '%s' in %%(%s)"
22858 msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
22859
22786 -#: ref-filter.c
22787 -#, c-format
22788 -msgid "unrecognized email option: %s"
22789 -msgstr "未识别的邮件选项：%s"
22790 -
22860 #: ref-filter.c
22861 #, c-format
22862 msgid "expected format: %%(align:<width>,<position>)"
@@ -22805,13 +22874,13 @@ msgstr "未能识别的宽度：%s"
22874
22875 #: ref-filter.c
22876 #, c-format
22808 -msgid "positive width expected with the %%(align) atom"
22809 -msgstr "元素 %%(align) 需要一个正数的宽度"
22877 +msgid "unrecognized %%(%s) argument: %s"
22878 +msgstr "未能识别的 %%(%s) 参数：%s"
22879
22880 #: ref-filter.c
22881 #, c-format
22813 -msgid "%%(rest) does not take arguments"
22814 -msgstr "%%(rest) 不带参数"
22882 +msgid "positive width expected with the %%(align) atom"
22883 +msgstr "元素 %%(align) 需要一个正数的宽度"
22884
22885 #: ref-filter.c
22886 #, c-format
@@ -24315,6 +24384,26 @@ msgstr "git %s：无法读取索引"
24384 msgid "git %s: failed to refresh the index"
24385 msgstr "git %s：无法刷新索引"
24386
24387 +#: sequencer.c
24388 +#, c-format
24389 +msgid "'%s' is not a valid label"
24390 +msgstr "'%s' 不是一个有效的标签"
24391 +
24392 +#: sequencer.c
24393 +#, c-format
24394 +msgid "'%s' is not a valid refname"
24395 +msgstr "'%s' 不是一个有效的引用名"
24396 +
24397 +#: sequencer.c
24398 +#, c-format
24399 +msgid "update-ref requires a fully qualified refname e.g. refs/heads/%s"
24400 +msgstr "update-ref 需要一个完整的引用名，例如：refs/heads/%s"
24401 +
24402 +#: sequencer.c
24403 +#, c-format
24404 +msgid "invalid command '%.*s'"
24405 +msgstr "无效命令 '%.*s'"
24406 +
24407 #: sequencer.c
24408 #, c-format
24409 msgid "%s does not accept arguments: '%s'"
@@ -25274,6 +25363,19 @@ msgstr "ls-tree 返回未知返回值 %d"
25363 msgid "failed to lstat '%s'"
25364 msgstr "无法执行 lstat '%s'"
25365
25366 +#: t/helper/test-bundle-uri.c
25367 +msgid "no remote configured to get bundle URIs from"
25368 +msgstr "没有远程被设置为可以获取归档包 URI"
25369 +
25370 +#: t/helper/test-bundle-uri.c
25371 +#, c-format
25372 +msgid "remote '%s' has no configured URL"
25373 +msgstr "远程 '%s' 没有设置 URL"
25374 +
25375 +#: t/helper/test-bundle-uri.c
25376 +msgid "could not get the bundle-uri list"
25377 +msgstr "无法获取 bundle-uri 列表"
25378 +
25379 #: t/helper/test-cache-tree.c
25380 msgid "test-tool cache-tree <options> (control|prime|update)"
25381 msgstr "test-tool cache-tree <选项> (control|prime|update)"
@@ -25710,6 +25812,14 @@ msgstr "正在终止。"
25812 msgid "failed to push all needed submodules"
25813 msgstr "不能推送全部需要的子模组"
25814
25815 +#: transport.c
25816 +msgid "bundle-uri operation not supported by protocol"
25817 +msgstr "协议不支持 bundle-uri 操作"
25818 +
25819 +#: transport.c
25820 +msgid "could not retrieve server-advertised bundle-uri list"
25821 +msgstr "无法获取服务器公布的 bundle-uri 列表"
25822 +
25823 #: tree-walk.c
25824 msgid "too-short tree object"
25825 msgstr "太短的树对象"
@@ -26627,12 +26737,20 @@ msgstr "忽略的文件"
26737 #: wt-status.c
26738 #, c-format
26739 msgid ""
26630 -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
26631 -"may speed it up, but you have to be careful not to forget to add\n"
26632 -"new files yourself (see 'git help status')."
26740 +"It took %.2f seconds to enumerate untracked files,\n"
26741 +"but the results were cached, and subsequent runs may be faster."
26742 msgstr ""
26634 -"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
26635 -"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
26743 +"枚举未追踪的文件花了 %.2f 秒，\n"
26744 +"结果已被缓存，后续的执行会更快。"
26745 +
26746 +#: wt-status.c
26747 +#, c-format
26748 +msgid "It took %.2f seconds to enumerate untracked files."
26749 +msgstr "枚举未追踪的文件花了 %.2f 秒。"
26750 +
26751 +#: wt-status.c
26752 +msgid "See 'git help status' for information on how to improve this."
26753 +msgstr "参见 'git help status' 来获取如何改善的信息。"
26754
26755 #: wt-status.c
26756 #, c-format
@@ -26805,300 +26923,6 @@ msgstr "您需要在工作区的顶级目录中运行这个命令。"
26923 msgid "Unable to determine absolute path of git directory"
26924 msgstr "不能确定 git 目录的绝对路径"
26925
26808 -#. TRANSLATORS: you can adjust this to align "git add -i" status menu
26809 -#: git-add--interactive.perl
26810 -#, perl-format
26811 -msgid "%12s %12s %s"
26812 -msgstr "%12s %12s %s"
26813 -
26814 -#: git-add--interactive.perl
26815 -#, perl-format
26816 -msgid "touched %d path\n"
26817 -msgid_plural "touched %d paths\n"
26818 -msgstr[0] "触碰了 %d 个路径\n"
26819 -msgstr[1] "触碰了 %d 个路径\n"
26820 -
26821 -#: git-add--interactive.perl
26822 -msgid ""
26823 -"If the patch applies cleanly, the edited hunk will immediately be\n"
26824 -"marked for staging."
26825 -msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
26826 -
26827 -#: git-add--interactive.perl
26828 -msgid ""
26829 -"If the patch applies cleanly, the edited hunk will immediately be\n"
26830 -"marked for stashing."
26831 -msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
26832 -
26833 -#: git-add--interactive.perl
26834 -msgid ""
26835 -"If the patch applies cleanly, the edited hunk will immediately be\n"
26836 -"marked for unstaging."
26837 -msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
26838 -
26839 -#: git-add--interactive.perl
26840 -msgid ""
26841 -"If the patch applies cleanly, the edited hunk will immediately be\n"
26842 -"marked for applying."
26843 -msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
26844 -
26845 -#: git-add--interactive.perl
26846 -msgid ""
26847 -"If the patch applies cleanly, the edited hunk will immediately be\n"
26848 -"marked for discarding."
26849 -msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
26850 -
26851 -#: git-add--interactive.perl
26852 -#, perl-format
26853 -msgid "failed to open hunk edit file for writing: %s"
26854 -msgstr "无法为写入打开块编辑文件：%s"
26855 -
26856 -#: git-add--interactive.perl
26857 -#, perl-format
26858 -msgid ""
26859 -"---\n"
26860 -"To remove '%s' lines, make them ' ' lines (context).\n"
26861 -"To remove '%s' lines, delete them.\n"
26862 -"Lines starting with %s will be removed.\n"
26863 -msgstr ""
26864 -"---\n"
26865 -"要删除 '%s' 开始的行，使其成为 ' ' 开始的行（上下文）。\n"
26866 -"要删除 '%s' 开始的行，删除它们。\n"
26867 -"以 %s 开始的行将被删除。\n"
26868 -
26869 -#: git-add--interactive.perl
26870 -#, perl-format
26871 -msgid "failed to open hunk edit file for reading: %s"
26872 -msgstr "无法读取块编辑文件：%s"
26873 -
26874 -#: git-add--interactive.perl
26875 -msgid ""
26876 -"y - stage this hunk\n"
26877 -"n - do not stage this hunk\n"
26878 -"q - quit; do not stage this hunk or any of the remaining ones\n"
26879 -"a - stage this hunk and all later hunks in the file\n"
26880 -"d - do not stage this hunk or any of the later hunks in the file"
26881 -msgstr ""
26882 -"y - 暂存该块\n"
26883 -"n - 不要暂存该块\n"
26884 -"q - 退出。不暂存该块及后面的全部块\n"
26885 -"a - 暂存该块和本文件中后面的全部块\n"
26886 -"d - 不暂存该块和本文件中后面的全部块"
26887 -
26888 -#: git-add--interactive.perl
26889 -msgid ""
26890 -"y - stash this hunk\n"
26891 -"n - do not stash this hunk\n"
26892 -"q - quit; do not stash this hunk or any of the remaining ones\n"
26893 -"a - stash this hunk and all later hunks in the file\n"
26894 -"d - do not stash this hunk or any of the later hunks in the file"
26895 -msgstr ""
26896 -"y - 贮藏该块\n"
26897 -"n - 不要贮藏该块\n"
26898 -"q - 退出。不贮藏该块及后面的全部块\n"
26899 -"a - 贮藏该块和本文件中后面的全部块\n"
26900 -"d - 不贮藏该块和本文件中后面的全部块"
26901 -
26902 -#: git-add--interactive.perl
26903 -msgid ""
26904 -"y - unstage this hunk\n"
26905 -"n - do not unstage this hunk\n"
26906 -"q - quit; do not unstage this hunk or any of the remaining ones\n"
26907 -"a - unstage this hunk and all later hunks in the file\n"
26908 -"d - do not unstage this hunk or any of the later hunks in the file"
26909 -msgstr ""
26910 -"y - 不暂存该块\n"
26911 -"n - 不要不暂存该块\n"
26912 -"q - 退出。不要不暂存该块及后面的全部块\n"
26913 -"a - 不暂存该块和本文件中后面的全部块\n"
26914 -"d - 不要不暂存该块和本文件中后面的全部块"
26915 -
26916 -#: git-add--interactive.perl
26917 -msgid ""
26918 -"y - apply this hunk to index\n"
26919 -"n - do not apply this hunk to index\n"
26920 -"q - quit; do not apply this hunk or any of the remaining ones\n"
26921 -"a - apply this hunk and all later hunks in the file\n"
26922 -"d - do not apply this hunk or any of the later hunks in the file"
26923 -msgstr ""
26924 -"y - 在索引中应用该块\n"
26925 -"n - 不要在索引中应用该块\n"
26926 -"q - 退出。不要应用该块及后面的全部块\n"
26927 -"a - 应用该块和本文件中后面的全部块\n"
26928 -"d - 不要应用该块和本文件中后面的全部块"
26929 -
26930 -#: git-add--interactive.perl
26931 -msgid ""
26932 -"y - discard this hunk from worktree\n"
26933 -"n - do not discard this hunk from worktree\n"
26934 -"q - quit; do not discard this hunk or any of the remaining ones\n"
26935 -"a - discard this hunk and all later hunks in the file\n"
26936 -"d - do not discard this hunk or any of the later hunks in the file"
26937 -msgstr ""
26938 -"y - 在工作区中丢弃该块\n"
26939 -"n - 不要在工作区中丢弃该块\n"
26940 -"q - 退出。不要丢弃该块及后面的全部块\n"
26941 -"a - 丢弃该块和本文件中后面的全部块\n"
26942 -"d - 不要丢弃该块和本文件中后面的全部块"
26943 -
26944 -#: git-add--interactive.perl
26945 -msgid ""
26946 -"y - discard this hunk from index and worktree\n"
26947 -"n - do not discard this hunk from index and worktree\n"
26948 -"q - quit; do not discard this hunk or any of the remaining ones\n"
26949 -"a - discard this hunk and all later hunks in the file\n"
26950 -"d - do not discard this hunk or any of the later hunks in the file"
26951 -msgstr ""
26952 -"y - 在索引和工作区中丢弃该块\n"
26953 -"n - 不要在索引和工作区中丢弃该块\n"
26954 -"q - 退出。不要丢弃该块及后面的全部块\n"
26955 -"a - 丢弃该块和本文件中后面的全部块\n"
26956 -"d - 不要丢弃该块和本文件中后面的全部块"
26957 -
26958 -#: git-add--interactive.perl
26959 -msgid ""
26960 -"y - apply this hunk to index and worktree\n"
26961 -"n - do not apply this hunk to index and worktree\n"
26962 -"q - quit; do not apply this hunk or any of the remaining ones\n"
26963 -"a - apply this hunk and all later hunks in the file\n"
26964 -"d - do not apply this hunk or any of the later hunks in the file"
26965 -msgstr ""
26966 -"y - 在索引和工作区中应用该块\n"
26967 -"n - 不要在索引和工作区中应用该块\n"
26968 -"q - 退出。不要应用该块及后面的全部块\n"
26969 -"a - 应用该块和本文件中后面的全部块\n"
26970 -"d - 不要应用该块和本文件中后面的全部块"
26971 -
26972 -#: git-add--interactive.perl
26973 -msgid ""
26974 -"y - apply this hunk to worktree\n"
26975 -"n - do not apply this hunk to worktree\n"
26976 -"q - quit; do not apply this hunk or any of the remaining ones\n"
26977 -"a - apply this hunk and all later hunks in the file\n"
26978 -"d - do not apply this hunk or any of the later hunks in the file"
26979 -msgstr ""
26980 -"y - 在工作区中应用该块\n"
26981 -"n - 不要在工作区中应用该块\n"
26982 -"q - 退出。不要应用该块及后面的全部块\n"
26983 -"a - 应用该块和本文件中后面的全部块\n"
26984 -"d - 不要应用该块和本文件中后面的全部块"
26985 -
26986 -#: git-add--interactive.perl
26987 -msgid ""
26988 -"g - select a hunk to go to\n"
26989 -"/ - search for a hunk matching the given regex\n"
26990 -"j - leave this hunk undecided, see next undecided hunk\n"
26991 -"J - leave this hunk undecided, see next hunk\n"
26992 -"k - leave this hunk undecided, see previous undecided hunk\n"
26993 -"K - leave this hunk undecided, see previous hunk\n"
26994 -"s - split the current hunk into smaller hunks\n"
26995 -"e - manually edit the current hunk\n"
26996 -"? - print help\n"
26997 -msgstr ""
26998 -"g - 选择跳转到一个块\n"
26999 -"/ - 查找和给定正则表达式匹配的块\n"
27000 -"j - 维持该块未决状态，查看下一个未决块\n"
27001 -"J - 维持该块未决状态，查看下一个块\n"
27002 -"k - 维持该块未决状态，查看上一个未决块\n"
27003 -"K - 维持该块未决状态，查看上一个块\n"
27004 -"s - 拆分当前块为更小的块\n"
27005 -"e - 手动编辑当前块\n"
27006 -"? - 显示帮助\n"
27007 -
27008 -#: git-add--interactive.perl
27009 -msgid "The selected hunks do not apply to the index!\n"
27010 -msgstr "选中的块不能应用到索引！\n"
27011 -
27012 -#: git-add--interactive.perl
27013 -#, perl-format
27014 -msgid "ignoring unmerged: %s\n"
27015 -msgstr "忽略未合入的：%s\n"
27016 -
27017 -#: git-add--interactive.perl
27018 -msgid "No other hunks to goto\n"
27019 -msgstr "没有其它可供跳转的块\n"
27020 -
27021 -#: git-add--interactive.perl
27022 -#, perl-format
27023 -msgid "Invalid number: '%s'\n"
27024 -msgstr "无效数字：'%s'\n"
27025 -
27026 -#: git-add--interactive.perl
27027 -#, perl-format
27028 -msgid "Sorry, only %d hunk available.\n"
27029 -msgid_plural "Sorry, only %d hunks available.\n"
27030 -msgstr[0] "对不起，只有 %d 个可用块。\n"
27031 -msgstr[1] "对不起，只有 %d 个可用块。\n"
27032 -
27033 -#: git-add--interactive.perl
27034 -msgid "No other hunks to search\n"
27035 -msgstr "没有其它可供查找的块\n"
27036 -
27037 -#: git-add--interactive.perl
27038 -#, perl-format
27039 -msgid "Malformed search regexp %s: %s\n"
27040 -msgstr "错误的正则表达式 %s：%s\n"
27041 -
27042 -#: git-add--interactive.perl
27043 -msgid "No hunk matches the given pattern\n"
27044 -msgstr "没有和给定模式相匹配的块\n"
27045 -
27046 -#: git-add--interactive.perl
27047 -msgid "No previous hunk\n"
27048 -msgstr "没有前一个块\n"
27049 -
27050 -#: git-add--interactive.perl
27051 -msgid "No next hunk\n"
27052 -msgstr "没有下一个块\n"
27053 -
27054 -#: git-add--interactive.perl
27055 -msgid "Sorry, cannot split this hunk\n"
27056 -msgstr "对不起，不能拆分这个块\n"
27057 -
27058 -#: git-add--interactive.perl
27059 -#, perl-format
27060 -msgid "Split into %d hunk.\n"
27061 -msgid_plural "Split into %d hunks.\n"
27062 -msgstr[0] "拆分为 %d 块。\n"
27063 -msgstr[1] "拆分为 %d 块。\n"
27064 -
27065 -#: git-add--interactive.perl
27066 -msgid "Sorry, cannot edit this hunk\n"
27067 -msgstr "对不起，不能编辑这个块\n"
27068 -
27069 -#. TRANSLATORS: please do not translate the command names
27070 -#. 'status', 'update', 'revert', etc.
27071 -#: git-add--interactive.perl
27072 -msgid ""
27073 -"status - show paths with changes\n"
27074 -"update - add working tree state to the staged set of changes\n"
27075 -"revert - revert staged set of changes back to the HEAD version\n"
27076 -"patch - pick hunks and update selectively\n"
27077 -"diff - view diff between HEAD and index\n"
27078 -"add untracked - add contents of untracked files to the staged set of "
27079 -"changes\n"
27080 -msgstr ""
27081 -"status - 显示含变更的路径\n"
27082 -"update - 添加工作区状态至暂存列表\n"
27083 -"revert - 还原修改的暂存集至 HEAD 版本\n"
27084 -"patch - 挑选块并且有选择地更新\n"
27085 -"diff - 显示 HEAD 和索引间差异\n"
27086 -"add untracked - 添加未跟踪文件的内容至暂存列表\n"
27087 -
27088 -#: git-add--interactive.perl
27089 -msgid "missing --"
27090 -msgstr "缺失 --"
27091 -
27092 -#: git-add--interactive.perl
27093 -#, perl-format
27094 -msgid "unknown --patch mode: %s"
27095 -msgstr "未知的 --patch 模式：%s"
27096 -
27097 -#: git-add--interactive.perl
27098 -#, perl-format
27099 -msgid "invalid argument %s, expecting --"
27100 -msgstr "无效的参数 %s，期望是 --"
27101 -
26926 #: git-send-email.perl
26927 msgid "local zone differs from GMT by a non-minute interval\n"
26928 msgstr "本地时间和 GMT 有不到一分钟间隔\n"