@matheusbsbs / matheus-bagliano / commits / c160d03fbb

l10n: zh_CN.po: translate 2 new messages

Translate 2 new messages came from git.pot update in ccfca8d (l10n: Update git.pot (2 new, 4 removed messages)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Sep 5, 2012 at 07:27 UTC c160d03fbbc8aada9f57ee5b4cb775852c69b5f4
1 file changed +371 -341
po/zh_CN.po
+371 -341
@@ -12,8 +12,8 @@ msgid ""
12 msgstr ""
13 "Project-Id-Version: Git\n"
14 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
15 -"POT-Creation-Date: 2012-08-06 23:47+0800\n"
16 -"PO-Revision-Date: 2012-08-07 01:07+0800\n"
15 +"POT-Creation-Date: 2012-09-05 06:20+0800\n"
16 +"PO-Revision-Date: 2012-09-07 17:56+0800\n"
17 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
18 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
19 "Language: zh_CN\n"
@@ -62,7 +62,7 @@ msgid "Repository lacks these prerequisite commits:"
62 msgstr "版本库缺少这些必备的提交："
63
64 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
65 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
65 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347
66 #: builtin/shortlog.c:181
67 msgid "revision walk setup failed"
68 msgstr "版本遍历设置失败"
@@ -89,7 +89,7 @@ msgstr[1] "这个包需要 %d 个这些引用"
89 msgid "rev-list died"
90 msgstr "rev-list 终止"
91
92 -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
92 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284
93 #, c-format
94 msgid "unrecognized argument: %s"
95 msgstr "未能识别的参数：%s"
@@ -236,32 +236,32 @@ msgstr ""
236 "发现配置变量 'diff.dirstat' 中的错误：\n"
237 "%s"
238
239 -#: diff.c:1400
239 +#: diff.c:1401
240 msgid " 0 files changed"
241 msgstr " 0 个文件被修改"
242
243 -#: diff.c:1404
243 +#: diff.c:1405
244 #, c-format
245 msgid " %d file changed"
246 msgid_plural " %d files changed"
247 msgstr[0] " %d 个文件被修改"
248 msgstr[1] " %d 个文件被修改"
249
250 -#: diff.c:1421
250 +#: diff.c:1422
251 #, c-format
252 msgid ", %d insertion(+)"
253 msgid_plural ", %d insertions(+)"
254 msgstr[0] "，插入 %d 行(+)"
255 msgstr[1] "，插入 %d 行(+)"
256
257 -#: diff.c:1432
257 +#: diff.c:1433
258 #, c-format
259 msgid ", %d deletion(-)"
260 msgid_plural ", %d deletions(-)"
261 msgstr[0] "，删除 %d 行(-)"
262 msgstr[1] "，删除 %d 行(-)"
263
264 -#: diff.c:3461
264 +#: diff.c:3460
265 #, c-format
266 msgid ""
267 "Failed to parse --dirstat/-X option parameter:\n"
@@ -366,74 +366,66 @@ msgstr "为路径 '%s' addinfo_cache 失败"
366 msgid "error building trees"
367 msgstr "无法创建树"
368
369 -#: merge-recursive.c:497
370 -msgid "diff setup failed"
371 -msgstr "diff 设置失败"
372 -
373 -#: merge-recursive.c:627
374 -msgid "merge-recursive: disk full?"
375 -msgstr "merge-recursive：磁盘已满？"
376 -
377 -#: merge-recursive.c:690
369 +#: merge-recursive.c:672
370 #, c-format
371 msgid "failed to create path '%s'%s"
372 msgstr "无法创建路径 '%s'%s"
373
382 -#: merge-recursive.c:701
374 +#: merge-recursive.c:683
375 #, c-format
376 msgid "Removing %s to make room for subdirectory\n"
377 msgstr "删除 %s 以便为子目录留出空间\n"
378
379 #. something else exists
380 #. .. but not some other error (who really cares what?)
389 -#: merge-recursive.c:715 merge-recursive.c:736
381 +#: merge-recursive.c:697 merge-recursive.c:718
382 msgid ": perhaps a D/F conflict?"
383 msgstr "：可能是一个目录/文件冲突？"
384
393 -#: merge-recursive.c:726
385 +#: merge-recursive.c:708
386 #, c-format
387 msgid "refusing to lose untracked file at '%s'"
388 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
389
398 -#: merge-recursive.c:766
390 +#: merge-recursive.c:748
391 #, c-format
392 msgid "cannot read object %s '%s'"
393 msgstr "不能读取对象 %s '%s'"
394
403 -#: merge-recursive.c:768
395 +#: merge-recursive.c:750
396 #, c-format
397 msgid "blob expected for %s '%s'"
398 msgstr "%s '%s' 应为二进制对象（blob）"
399
408 -#: merge-recursive.c:791 builtin/clone.c:302
400 +#: merge-recursive.c:773 builtin/clone.c:302
401 #, c-format
402 msgid "failed to open '%s'"
403 msgstr "无法打开 '%s'"
404
413 -#: merge-recursive.c:799
405 +#: merge-recursive.c:781
406 #, c-format
407 msgid "failed to symlink '%s'"
408 msgstr "无法创建符号链接 '%s'"
409
418 -#: merge-recursive.c:802
410 +#: merge-recursive.c:784
411 #, c-format
412 msgid "do not know what to do with %06o %s '%s'"
413 msgstr "不知道如何处理 %06o %s '%s'"
414
423 -#: merge-recursive.c:939
415 +#: merge-recursive.c:921
416 msgid "Failed to execute internal merge"
417 msgstr "无法执行内部合并"
418
427 -#: merge-recursive.c:943
419 +#: merge-recursive.c:925
420 #, c-format
421 msgid "Unable to add %s to database"
422 msgstr "不能添加 %s 至对象库"
423
432 -#: merge-recursive.c:959
424 +#: merge-recursive.c:941
425 msgid "unsupported object type in the tree"
426 msgstr "在树中有不支持的对象类型"
427
436 -#: merge-recursive.c:1038 merge-recursive.c:1052
428 +#: merge-recursive.c:1020 merge-recursive.c:1034
429 #, c-format
430 msgid ""
431 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -442,7 +434,7 @@ msgstr ""
434 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
435 "的版本被保留。"
436
445 -#: merge-recursive.c:1044 merge-recursive.c:1057
437 +#: merge-recursive.c:1026 merge-recursive.c:1039
438 #, c-format
439 msgid ""
440 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -451,20 +443,20 @@ msgstr ""
443 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
444 "的版本保留于 %8$s 中。"
445
454 -#: merge-recursive.c:1098
446 +#: merge-recursive.c:1080
447 msgid "rename"
448 msgstr "重命名"
449
458 -#: merge-recursive.c:1098
450 +#: merge-recursive.c:1080
451 msgid "renamed"
452 msgstr "重命名"
453
462 -#: merge-recursive.c:1154
454 +#: merge-recursive.c:1136
455 #, c-format
456 msgid "%s is a directory in %s adding as %s instead"
457 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
458
467 -#: merge-recursive.c:1176
459 +#: merge-recursive.c:1158
460 #, c-format
461 msgid ""
462 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -473,144 +465,144 @@ msgstr ""
465 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
466 "\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
467
476 -#: merge-recursive.c:1181
468 +#: merge-recursive.c:1163
469 msgid " (left unresolved)"
470 msgstr "（留下未解决）"
471
480 -#: merge-recursive.c:1235
472 +#: merge-recursive.c:1217
473 #, c-format
474 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
475 msgstr ""
476 "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->"
477 "%5$s"
478
487 -#: merge-recursive.c:1265
479 +#: merge-recursive.c:1247
480 #, c-format
481 msgid "Renaming %s to %s and %s to %s instead"
482 msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
483
492 -#: merge-recursive.c:1464
484 +#: merge-recursive.c:1446
485 #, c-format
486 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
487 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
488
497 -#: merge-recursive.c:1474
489 +#: merge-recursive.c:1456
490 #, c-format
491 msgid "Adding merged %s"
492 msgstr "添加合并后的 %s"
493
502 -#: merge-recursive.c:1479 merge-recursive.c:1677
494 +#: merge-recursive.c:1461 merge-recursive.c:1659
495 #, c-format
496 msgid "Adding as %s instead"
497 msgstr "而是以 %s 为名添加"
498
507 -#: merge-recursive.c:1530
499 +#: merge-recursive.c:1512
500 #, c-format
501 msgid "cannot read object %s"
502 msgstr "不能读取对象 %s"
503
512 -#: merge-recursive.c:1533
504 +#: merge-recursive.c:1515
505 #, c-format
506 msgid "object %s is not a blob"
507 msgstr "对象 %s 不是一个二进制对象（blob）"
508
517 -#: merge-recursive.c:1581
509 +#: merge-recursive.c:1563
510 msgid "modify"
511 msgstr "修改"
512
521 -#: merge-recursive.c:1581
513 +#: merge-recursive.c:1563
514 msgid "modified"
515 msgstr "修改"
516
525 -#: merge-recursive.c:1591
517 +#: merge-recursive.c:1573
518 msgid "content"
519 msgstr "内容"
520
529 -#: merge-recursive.c:1598
521 +#: merge-recursive.c:1580
522 msgid "add/add"
523 msgstr "添加/添加"
524
533 -#: merge-recursive.c:1632
525 +#: merge-recursive.c:1614
526 #, c-format
527 msgid "Skipped %s (merged same as existing)"
528 msgstr "略过 %s（已经做过相同合并）"
529
538 -#: merge-recursive.c:1646
530 +#: merge-recursive.c:1628
531 #, c-format
532 msgid "Auto-merging %s"
533 msgstr "自动合并 %s"
534
543 -#: merge-recursive.c:1650 git-submodule.sh:844
535 +#: merge-recursive.c:1632 git-submodule.sh:869
536 msgid "submodule"
537 msgstr "子模组"
538
547 -#: merge-recursive.c:1651
539 +#: merge-recursive.c:1633
540 #, c-format
541 msgid "CONFLICT (%s): Merge conflict in %s"
542 msgstr "冲突（%s）：合并冲突于 %s"
543
552 -#: merge-recursive.c:1741
544 +#: merge-recursive.c:1723
545 #, c-format
546 msgid "Removing %s"
547 msgstr "删除 %s"
548
557 -#: merge-recursive.c:1766
549 +#: merge-recursive.c:1748
550 msgid "file/directory"
551 msgstr "文件/目录"
552
561 -#: merge-recursive.c:1772
553 +#: merge-recursive.c:1754
554 msgid "directory/file"
555 msgstr "目录/文件"
556
565 -#: merge-recursive.c:1777
557 +#: merge-recursive.c:1759
558 #, c-format
559 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
560 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
561
570 -#: merge-recursive.c:1787
562 +#: merge-recursive.c:1769
563 #, c-format
564 msgid "Adding %s"
565 msgstr "添加 %s"
566
575 -#: merge-recursive.c:1804
567 +#: merge-recursive.c:1786
568 msgid "Fatal merge failure, shouldn't happen."
569 msgstr "严重的合并错误，不应发生。"
570
579 -#: merge-recursive.c:1823
571 +#: merge-recursive.c:1805
572 msgid "Already up-to-date!"
573 msgstr "已经是最新的！"
574
583 -#: merge-recursive.c:1832
575 +#: merge-recursive.c:1814
576 #, c-format
577 msgid "merging of trees %s and %s failed"
578 msgstr "无法合并树 %s 和 %s"
579
588 -#: merge-recursive.c:1862
580 +#: merge-recursive.c:1844
581 #, c-format
582 msgid "Unprocessed path??? %s"
583 msgstr "未处理的路径??? %s"
584
593 -#: merge-recursive.c:1907
585 +#: merge-recursive.c:1889
586 msgid "Merging:"
587 msgstr "合并："
588
597 -#: merge-recursive.c:1920
589 +#: merge-recursive.c:1902
590 #, c-format
591 msgid "found %u common ancestor:"
592 msgid_plural "found %u common ancestors:"
593 msgstr[0] "发现 %u 个共同祖先："
594 msgstr[1] "发现 %u 个共同祖先："
595
604 -#: merge-recursive.c:1957
596 +#: merge-recursive.c:1939
597 msgid "merge returned no commit"
598 msgstr "合并未返回提交"
599
608 -#: merge-recursive.c:2014
600 +#: merge-recursive.c:1996
601 #, c-format
602 msgid "Could not parse object '%s'"
603 msgstr "不能解析对象 '%s'"
604
613 -#: merge-recursive.c:2026 builtin/merge.c:697
605 +#: merge-recursive.c:2008 builtin/merge.c:696
606 msgid "Unable to write index."
607 msgstr "不能写入索引。"
608
@@ -666,14 +658,14 @@ msgstr[1] ""
658 "您的分支和 '%s' 出现了偏离，\n"
659 "并且各自分别有 %d 和 %d 处不同的提交。\n"
660
669 -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
670 -#: builtin/merge.c:1088 builtin/merge.c:1098
661 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977
662 +#: builtin/merge.c:1087 builtin/merge.c:1097
663 #, c-format
664 msgid "Could not open '%s' for writing"
665 msgstr "不能为写入打开 '%s'"
666
675 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
676 -#: builtin/merge.c:1090 builtin/merge.c:1103
667 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867
668 +#: builtin/merge.c:1089 builtin/merge.c:1102
669 #, c-format
670 msgid "Could not write to '%s'"
671 msgstr "不能写入 '%s'"
@@ -874,7 +866,7 @@ msgstr "不能解析 HEAD"
866 msgid "cannot abort from a branch yet to be born"
867 msgstr "不能从尚未建立的分支终止"
868
877 -#: sequencer.c:805 builtin/apply.c:3988
869 +#: sequencer.c:805 builtin/apply.c:3987
870 #, c-format
871 msgid "cannot open %s: %s"
872 msgstr "不能打开 %s：%s"
@@ -1309,6 +1301,11 @@ msgstr "领先 "
1301 msgid ", behind "
1302 msgstr "，落后 "
1303
1304 +#: compat/precompose_utf8.c:58 builtin/clone.c:341
1305 +#, c-format
1306 +msgid "failed to unlink '%s'"
1307 +msgstr "无法删除 '%s'"
1308 +
1309 #: builtin/add.c:62
1310 #, c-format
1311 msgid "unexpected diff status %c"
@@ -1409,7 +1406,7 @@ msgstr "也许您想要执行 'git add .'？\n"
1406 msgid "index file corrupt"
1407 msgstr "索引文件损坏"
1408
1412 -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
1409 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260
1410 msgid "Unable to write new index file"
1411 msgstr "无法写入新索引文件"
1412
@@ -1427,52 +1424,52 @@ msgstr "未能识别的空白字符选项 '%s'"
1424 msgid "unrecognized whitespace ignore option '%s'"
1425 msgstr "未能识别的空白字符忽略选项 '%s'"
1426
1430 -#: builtin/apply.c:824
1427 +#: builtin/apply.c:823
1428 #, c-format
1429 msgid "Cannot prepare timestamp regexp %s"
1430 msgstr "无法准备时间戳正则表达式 %s"
1431
1435 -#: builtin/apply.c:833
1432 +#: builtin/apply.c:832
1433 #, c-format
1434 msgid "regexec returned %d for input: %s"
1435 msgstr "regexec 返回 %d，输入为：%s"
1436
1440 -#: builtin/apply.c:914
1437 +#: builtin/apply.c:913
1438 #, c-format
1439 msgid "unable to find filename in patch at line %d"
1440 msgstr "不能在补丁的第 %d 行找到文件名"
1441
1445 -#: builtin/apply.c:946
1442 +#: builtin/apply.c:945
1443 #, c-format
1444 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
1445 msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s"
1446
1450 -#: builtin/apply.c:950
1447 +#: builtin/apply.c:949
1448 #, c-format
1449 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
1450 msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
1451
1455 -#: builtin/apply.c:951
1452 +#: builtin/apply.c:950
1453 #, c-format
1454 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
1455 msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
1456
1460 -#: builtin/apply.c:958
1457 +#: builtin/apply.c:957
1458 #, c-format
1459 msgid "git apply: bad git-diff - expected /dev/null on line %d"
1460 msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行"
1461
1465 -#: builtin/apply.c:1403
1462 +#: builtin/apply.c:1402
1463 #, c-format
1464 msgid "recount: unexpected line: %.*s"
1465 msgstr "recount：意外的行：%.*s"
1466
1470 -#: builtin/apply.c:1460
1467 +#: builtin/apply.c:1459
1468 #, c-format
1469 msgid "patch fragment without header at line %d: %.*s"
1470 msgstr "第 %d 行的补丁片段没有头信息：%.*s"
1471
1475 -#: builtin/apply.c:1477
1472 +#: builtin/apply.c:1476
1473 #, c-format
1474 msgid ""
1475 "git diff header lacks filename information when removing %d leading pathname "
@@ -1483,82 +1480,82 @@ msgid_plural ""
1480 msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1481 msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
1482
1486 -#: builtin/apply.c:1637
1483 +#: builtin/apply.c:1636
1484 msgid "new file depends on old contents"
1485 msgstr "新文件依赖旧内容"
1486
1490 -#: builtin/apply.c:1639
1487 +#: builtin/apply.c:1638
1488 msgid "deleted file still has contents"
1489 msgstr "删除的文件仍有内容"
1490
1494 -#: builtin/apply.c:1665
1491 +#: builtin/apply.c:1664
1492 #, c-format
1493 msgid "corrupt patch at line %d"
1494 msgstr "补丁损坏位于第 %d 行"
1495
1499 -#: builtin/apply.c:1701
1496 +#: builtin/apply.c:1700
1497 #, c-format
1498 msgid "new file %s depends on old contents"
1499 msgstr "新文件 %s 依赖旧内容"
1500
1504 -#: builtin/apply.c:1703
1501 +#: builtin/apply.c:1702
1502 #, c-format
1503 msgid "deleted file %s still has contents"
1504 msgstr "删除的文件 %s 仍有内容"
1505
1509 -#: builtin/apply.c:1706
1506 +#: builtin/apply.c:1705
1507 #, c-format
1508 msgid "** warning: file %s becomes empty but is not deleted"
1509 msgstr "** 警告：文件 %s 成为空文件但并未删除"
1510
1514 -#: builtin/apply.c:1852
1511 +#: builtin/apply.c:1851
1512 #, c-format
1513 msgid "corrupt binary patch at line %d: %.*s"
1514 msgstr "二进制补丁在第 %d 行损坏：%.*s"
1515
1516 #. there has to be one hunk (forward hunk)
1520 -#: builtin/apply.c:1881
1517 +#: builtin/apply.c:1880
1518 #, c-format
1519 msgid "unrecognized binary patch at line %d"
1520 msgstr "未能识别的二进制补丁位于第 %d 行"
1521
1525 -#: builtin/apply.c:1967
1522 +#: builtin/apply.c:1966
1523 #, c-format
1524 msgid "patch with only garbage at line %d"
1525 msgstr "补丁文件的第 %d 行只有垃圾数据"
1526
1530 -#: builtin/apply.c:2057
1527 +#: builtin/apply.c:2056
1528 #, c-format
1529 msgid "unable to read symlink %s"
1530 msgstr "无法读取符号链接 %s"
1531
1535 -#: builtin/apply.c:2061
1532 +#: builtin/apply.c:2060
1533 #, c-format
1534 msgid "unable to open or read %s"
1535 msgstr "不能打开或读取 %s"
1536
1540 -#: builtin/apply.c:2132
1537 +#: builtin/apply.c:2131
1538 msgid "oops"
1539 msgstr "哎哟"
1540
1544 -#: builtin/apply.c:2654
1541 +#: builtin/apply.c:2653
1542 #, c-format
1543 msgid "invalid start of line: '%c'"
1544 msgstr "无效的行首字符：'%c'"
1545
1549 -#: builtin/apply.c:2772
1546 +#: builtin/apply.c:2771
1547 #, c-format
1548 msgid "Hunk #%d succeeded at %d (offset %d line)."
1549 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
1550 msgstr[0] "块 #%d 成功应用于 %d (偏移 %d 行）"
1551 msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行）"
1552
1556 -#: builtin/apply.c:2784
1553 +#: builtin/apply.c:2783
1554 #, c-format
1555 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
1556 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
1557
1561 -#: builtin/apply.c:2790
1558 +#: builtin/apply.c:2789
1559 #, c-format
1560 msgid ""
1561 "while searching for:\n"
@@ -1567,321 +1564,321 @@ msgstr ""
1564 "当查询：\n"
1565 "%.*s"
1566
1570 -#: builtin/apply.c:2809
1567 +#: builtin/apply.c:2808
1568 #, c-format
1569 msgid "missing binary patch data for '%s'"
1570 msgstr "缺失 '%s' 的二进制补丁数据"
1571
1575 -#: builtin/apply.c:2912
1572 +#: builtin/apply.c:2911
1573 #, c-format
1574 msgid "binary patch does not apply to '%s'"
1575 msgstr "二进制补丁未应用到 '%s'"
1576
1580 -#: builtin/apply.c:2918
1577 +#: builtin/apply.c:2917
1578 #, c-format
1579 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1580 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）"
1581
1585 -#: builtin/apply.c:2939
1582 +#: builtin/apply.c:2938
1583 #, c-format
1584 msgid "patch failed: %s:%ld"
1585 msgstr "打补丁失败：%s:%ld"
1586
1590 -#: builtin/apply.c:3061
1587 +#: builtin/apply.c:3060
1588 #, c-format
1589 msgid "cannot checkout %s"
1590 msgstr "不能检出 %s"
1591
1595 -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
1592 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158
1593 #, c-format
1594 msgid "read of %s failed"
1595 msgstr "读取 %s 失败"
1596
1600 -#: builtin/apply.c:3139 builtin/apply.c:3361
1597 +#: builtin/apply.c:3138 builtin/apply.c:3360
1598 #, c-format
1599 msgid "path %s has been renamed/deleted"
1600 msgstr "路径 %s 已经被重命名/删除"
1601
1605 -#: builtin/apply.c:3220 builtin/apply.c:3375
1602 +#: builtin/apply.c:3219 builtin/apply.c:3374
1603 #, c-format
1604 msgid "%s: does not exist in index"
1605 msgstr "%s：不存在于索引中"
1606
1610 -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
1607 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388
1608 #, c-format
1609 msgid "%s: %s"
1610 msgstr "%s：%s"
1611
1615 -#: builtin/apply.c:3229 builtin/apply.c:3383
1612 +#: builtin/apply.c:3228 builtin/apply.c:3382
1613 #, c-format
1614 msgid "%s: does not match index"
1615 msgstr "%s：和索引不匹配"
1616
1620 -#: builtin/apply.c:3331
1617 +#: builtin/apply.c:3330
1618 msgid "removal patch leaves file contents"
1619 msgstr "移除补丁仍留下了文件内容"
1620
1624 -#: builtin/apply.c:3400
1621 +#: builtin/apply.c:3399
1622 #, c-format
1623 msgid "%s: wrong type"
1624 msgstr "%s：错误类型"
1625
1629 -#: builtin/apply.c:3402
1626 +#: builtin/apply.c:3401
1627 #, c-format
1628 msgid "%s has type %o, expected %o"
1629 msgstr "%s 的类型是 %o，预期是 %o"
1630
1634 -#: builtin/apply.c:3503
1631 +#: builtin/apply.c:3502
1632 #, c-format
1633 msgid "%s: already exists in index"
1634 msgstr "%s：已经存在于索引中"
1635
1639 -#: builtin/apply.c:3506
1636 +#: builtin/apply.c:3505
1637 #, c-format
1638 msgid "%s: already exists in working directory"
1639 msgstr "%s：已经存在于工作区中"
1640
1644 -#: builtin/apply.c:3526
1641 +#: builtin/apply.c:3525
1642 #, c-format
1643 msgid "new mode (%o) of %s does not match old mode (%o)"
1644 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
1645
1649 -#: builtin/apply.c:3531
1646 +#: builtin/apply.c:3530
1647 #, c-format
1648 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1649 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
1650
1654 -#: builtin/apply.c:3539
1651 +#: builtin/apply.c:3538
1652 #, c-format
1653 msgid "%s: patch does not apply"
1654 msgstr "%s：补丁未应用"
1655
1659 -#: builtin/apply.c:3552
1656 +#: builtin/apply.c:3551
1657 #, c-format
1658 msgid "Checking patch %s..."
1659 msgstr "检查补丁 %s..."
1660
1664 -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
1661 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158
1662 #, c-format
1663 msgid "make_cache_entry failed for path '%s'"
1664 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
1665
1669 -#: builtin/apply.c:3750
1666 +#: builtin/apply.c:3749
1667 #, c-format
1668 msgid "unable to remove %s from index"
1669 msgstr "不能从索引中移除 %s"
1670
1674 -#: builtin/apply.c:3778
1671 +#: builtin/apply.c:3777
1672 #, c-format
1673 msgid "corrupt patch for subproject %s"
1674 msgstr "子项目 %s 损坏的补丁"
1675
1679 -#: builtin/apply.c:3782
1676 +#: builtin/apply.c:3781
1677 #, c-format
1678 msgid "unable to stat newly created file '%s'"
1679 msgstr "不能枚举新建文件 '%s' 的状态"
1680
1684 -#: builtin/apply.c:3787
1681 +#: builtin/apply.c:3786
1682 #, c-format
1683 msgid "unable to create backing store for newly created file %s"
1684 msgstr "不能为新建文件 %s 创建后端存储"
1685
1689 -#: builtin/apply.c:3790 builtin/apply.c:3898
1686 +#: builtin/apply.c:3789 builtin/apply.c:3897
1687 #, c-format
1688 msgid "unable to add cache entry for %s"
1689 msgstr "无法为 %s 添加缓存条目"
1690
1694 -#: builtin/apply.c:3823
1691 +#: builtin/apply.c:3822
1692 #, c-format
1693 msgid "closing file '%s'"
1694 msgstr "关闭文件 '%s'"
1695
1699 -#: builtin/apply.c:3872
1696 +#: builtin/apply.c:3871
1697 #, c-format
1698 msgid "unable to write file '%s' mode %o"
1699 msgstr "不能写文件 '%s' 权限 %o"
1700
1704 -#: builtin/apply.c:3959
1701 +#: builtin/apply.c:3958
1702 #, c-format
1703 msgid "Applied patch %s cleanly."
1704 msgstr "成功应用补丁 %s。"
1705
1709 -#: builtin/apply.c:3967
1706 +#: builtin/apply.c:3966
1707 msgid "internal error"
1708 msgstr "内部错误"
1709
1710 #. Say this even without --verbose
1714 -#: builtin/apply.c:3970
1711 +#: builtin/apply.c:3969
1712 #, c-format
1713 msgid "Applying patch %%s with %d reject..."
1714 msgid_plural "Applying patch %%s with %d rejects..."
1715 msgstr[0] "应用补丁 %%s 时 %d 个被拒绝..."
1716 msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
1717
1721 -#: builtin/apply.c:3980
1718 +#: builtin/apply.c:3979
1719 #, c-format
1720 msgid "truncating .rej filename to %.*s.rej"
1721 msgstr "截短 .rej 文件名为 %.*s.rej"
1722
1726 -#: builtin/apply.c:4001
1723 +#: builtin/apply.c:4000
1724 #, c-format
1725 msgid "Hunk #%d applied cleanly."
1726 msgstr "第 #%d 个片段成功应用。"
1727
1731 -#: builtin/apply.c:4004
1728 +#: builtin/apply.c:4003
1729 #, c-format
1730 msgid "Rejected hunk #%d."
1731 msgstr "拒绝第 #%d 个片段。"
1732
1736 -#: builtin/apply.c:4154
1733 +#: builtin/apply.c:4153
1734 msgid "unrecognized input"
1735 msgstr "未能识别的输入"
1736
1740 -#: builtin/apply.c:4165
1737 +#: builtin/apply.c:4164
1738 msgid "unable to read index file"
1739 msgstr "无法读取索引文件"
1740
1744 -#: builtin/apply.c:4284 builtin/apply.c:4287
1741 +#: builtin/apply.c:4283 builtin/apply.c:4286
1742 msgid "path"
1743 msgstr "路径"
1744
1748 -#: builtin/apply.c:4285
1745 +#: builtin/apply.c:4284
1746 msgid "don't apply changes matching the given path"
1747 msgstr "不要应用与给出路径向匹配的变更"
1748
1752 -#: builtin/apply.c:4288
1749 +#: builtin/apply.c:4287
1750 msgid "apply changes matching the given path"
1751 msgstr "应用与给出路径向匹配的变更"
1752
1756 -#: builtin/apply.c:4290
1753 +#: builtin/apply.c:4289
1754 msgid "num"
1755 msgstr "数字"
1756
1760 -#: builtin/apply.c:4291
1757 +#: builtin/apply.c:4290
1758 msgid "remove <num> leading slashes from traditional diff paths"
1759 msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
1760
1764 -#: builtin/apply.c:4294
1761 +#: builtin/apply.c:4293
1762 msgid "ignore additions made by the patch"
1763 msgstr "忽略补丁中的添加的文件"
1764
1768 -#: builtin/apply.c:4296
1765 +#: builtin/apply.c:4295
1766 msgid "instead of applying the patch, output diffstat for the input"
1767 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
1768
1772 -#: builtin/apply.c:4300
1769 +#: builtin/apply.c:4299
1770 msgid "shows number of added and deleted lines in decimal notation"
1771 msgstr "以数字方式显示添加或删除行的数量"
1772
1776 -#: builtin/apply.c:4302
1773 +#: builtin/apply.c:4301
1774 msgid "instead of applying the patch, output a summary for the input"
1775 msgstr "不应用补丁，而是显示输入的概要"
1776
1780 -#: builtin/apply.c:4304
1777 +#: builtin/apply.c:4303
1778 msgid "instead of applying the patch, see if the patch is applicable"
1779 msgstr "不应用补丁，而是查看补丁是否可应用"
1780
1784 -#: builtin/apply.c:4306
1781 +#: builtin/apply.c:4305
1782 msgid "make sure the patch is applicable to the current index"
1783 msgstr "确认补丁可以应用到当前索引"
1784
1788 -#: builtin/apply.c:4308
1785 +#: builtin/apply.c:4307
1786 msgid "apply a patch without touching the working tree"
1787 msgstr "应用补丁而不修改工作区"
1788
1792 -#: builtin/apply.c:4310
1789 +#: builtin/apply.c:4309
1790 msgid "also apply the patch (use with --stat/--summary/--check)"
1791 msgstr "还应用此补丁（使用 --stat/--summary/--check 参数）"
1792
1796 -#: builtin/apply.c:4312
1793 +#: builtin/apply.c:4311
1794 msgid "attempt three-way merge if a patch does not apply"
1795 msgstr "如果一个补丁不能应用则尝试三路合并"
1796
1800 -#: builtin/apply.c:4314
1797 +#: builtin/apply.c:4313
1798 msgid "build a temporary index based on embedded index information"
1799 msgstr "创建一个临时索引基于嵌入的索引信息"
1800
1804 -#: builtin/apply.c:4316
1801 +#: builtin/apply.c:4315
1802 msgid "paths are separated with NUL character"
1803 msgstr "路径以 NUL 字符分隔"
1804
1808 -#: builtin/apply.c:4319
1805 +#: builtin/apply.c:4318
1806 msgid "ensure at least <n> lines of context match"
1807 msgstr "确保至少匹配 <n> 行上下文"
1808
1812 -#: builtin/apply.c:4320
1809 +#: builtin/apply.c:4319
1810 msgid "action"
1811 msgstr "动作"
1812
1816 -#: builtin/apply.c:4321
1813 +#: builtin/apply.c:4320
1814 msgid "detect new or modified lines that have whitespace errors"
1815 msgstr "检查新增和修改的行中间的空白字符滥用"
1816
1820 -#: builtin/apply.c:4324 builtin/apply.c:4327
1817 +#: builtin/apply.c:4323 builtin/apply.c:4326
1818 msgid "ignore changes in whitespace when finding context"
1819 msgstr "查找上下文时忽略空白字符的变更"
1820
1824 -#: builtin/apply.c:4330
1821 +#: builtin/apply.c:4329
1822 msgid "apply the patch in reverse"
1823 msgstr "反向应用补丁"
1824
1828 -#: builtin/apply.c:4332
1825 +#: builtin/apply.c:4331
1826 msgid "don't expect at least one line of context"
1827 msgstr "无需至少一行上下文"
1828
1832 -#: builtin/apply.c:4334
1829 +#: builtin/apply.c:4333
1830 msgid "leave the rejected hunks in corresponding *.rej files"
1831 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
1832
1836 -#: builtin/apply.c:4336
1833 +#: builtin/apply.c:4335
1834 msgid "allow overlapping hunks"
1835 msgstr "允许重叠的补丁片段"
1836
1840 -#: builtin/apply.c:4337
1837 +#: builtin/apply.c:4336
1838 msgid "be verbose"
1839 msgstr "冗长输出"
1840
1844 -#: builtin/apply.c:4339
1841 +#: builtin/apply.c:4338
1842 msgid "tolerate incorrectly detected missing new-line at the end of file"
1843 msgstr "宽容不正确的文件末尾换行符"
1844
1848 -#: builtin/apply.c:4342
1845 +#: builtin/apply.c:4341
1846 msgid "do not trust the line counts in the hunk headers"
1847 msgstr "不信任补丁片段的头信息中的行号"
1848
1852 -#: builtin/apply.c:4344
1849 +#: builtin/apply.c:4343
1850 msgid "root"
1851 msgstr "根目录"
1852
1856 -#: builtin/apply.c:4345
1853 +#: builtin/apply.c:4344
1854 msgid "prepend <root> to all filenames"
1855 msgstr "为所有文件名前添加 <根目录>"
1856
1860 -#: builtin/apply.c:4367
1857 +#: builtin/apply.c:4366
1858 msgid "--3way outside a repository"
1859 msgstr "--3way 在一个版本库之外"
1860
1864 -#: builtin/apply.c:4375
1861 +#: builtin/apply.c:4374
1862 msgid "--index outside a repository"
1863 msgstr "--index 在一个版本库之外"
1864
1868 -#: builtin/apply.c:4378
1865 +#: builtin/apply.c:4377
1866 msgid "--cached outside a repository"
1867 msgstr "--cached 在一个版本库之外"
1868
1872 -#: builtin/apply.c:4394
1869 +#: builtin/apply.c:4393
1870 #, c-format
1871 msgid "can't open patch '%s'"
1872 msgstr "不能打开补丁 '%s'"
1873
1877 -#: builtin/apply.c:4408
1874 +#: builtin/apply.c:4407
1875 #, c-format
1876 msgid "squelched %d whitespace error"
1877 msgid_plural "squelched %d whitespace errors"
1878 msgstr[0] "抑制下仍有 %d 个空白字符误用"
1879 msgstr[1] "抑制下仍有 %d 个空白字符误用"
1880
1884 -#: builtin/apply.c:4414 builtin/apply.c:4424
1881 +#: builtin/apply.c:4413 builtin/apply.c:4423
1882 #, c-format
1883 msgid "%d line adds whitespace errors."
1884 msgid_plural "%d lines add whitespace errors."
@@ -2143,7 +2140,7 @@ msgstr "path '%s'：无法合并"
2140 msgid "Unable to add merge result for '%s'"
2141 msgstr "无法为 '%s' 添加合并结果"
2142
2146 -#: builtin/checkout.c:235 builtin/checkout.c:393
2143 +#: builtin/checkout.c:235 builtin/checkout.c:392
2144 msgid "corrupt index file"
2145 msgstr "损坏的索引文件"
2146
@@ -2152,61 +2149,57 @@ msgstr "损坏的索引文件"
2149 msgid "path '%s' is unmerged"
2150 msgstr "路径 '%s' 未合并"
2151
2155 -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
2156 -#: builtin/merge.c:812
2152 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586
2153 +#: builtin/merge.c:811
2154 msgid "unable to write new index file"
2155 msgstr "无法写新的索引文件"
2156
2160 -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
2161 -msgid "diff_setup_done failed"
2162 -msgstr "diff_setup_done 失败"
2163 -
2164 -#: builtin/checkout.c:415
2157 +#: builtin/checkout.c:414
2158 msgid "you need to resolve your current index first"
2159 msgstr "您需要先解决当前索引的冲突"
2160
2168 -#: builtin/checkout.c:534
2161 +#: builtin/checkout.c:533
2162 #, c-format
2163 msgid "Can not do reflog for '%s'\n"
2164 msgstr "不能对 '%s' 执行 reflog 操作\n"
2165
2173 -#: builtin/checkout.c:567
2166 +#: builtin/checkout.c:566
2167 msgid "HEAD is now at"
2168 msgstr "HEAD 目前位于"
2169
2177 -#: builtin/checkout.c:574
2170 +#: builtin/checkout.c:573
2171 #, c-format
2172 msgid "Reset branch '%s'\n"
2173 msgstr "重置分支 '%s'\n"
2174
2182 -#: builtin/checkout.c:577
2175 +#: builtin/checkout.c:576
2176 #, c-format
2177 msgid "Already on '%s'\n"
2178 msgstr "已经位于 '%s'\n"
2179
2187 -#: builtin/checkout.c:581
2180 +#: builtin/checkout.c:580
2181 #, c-format
2182 msgid "Switched to and reset branch '%s'\n"
2183 msgstr "切换并重置分支 '%s'\n"
2184
2192 -#: builtin/checkout.c:583
2185 +#: builtin/checkout.c:582
2186 #, c-format
2187 msgid "Switched to a new branch '%s'\n"
2188 msgstr "切换到一个新分支 '%s'\n"
2189
2197 -#: builtin/checkout.c:585
2190 +#: builtin/checkout.c:584
2191 #, c-format
2192 msgid "Switched to branch '%s'\n"
2193 msgstr "切换到分支 '%s'\n"
2194
2195 # 译者：注意保持前导空格
2203 -#: builtin/checkout.c:641
2196 +#: builtin/checkout.c:640
2197 #, c-format
2198 msgid " ... and %d more.\n"
2199 msgstr " ... 及其它 %d 个。\n"
2200
2201 #. The singular version
2209 -#: builtin/checkout.c:647
2202 +#: builtin/checkout.c:646
2203 #, c-format
2204 msgid ""
2205 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -2227,7 +2220,7 @@ msgstr[1] ""
2220 "\n"
2221 "%s\n"
2222
2230 -#: builtin/checkout.c:665
2223 +#: builtin/checkout.c:664
2224 #, c-format
2225 msgid ""
2226 "If you want to keep them by creating a new branch, this may be a good time\n"
@@ -2242,71 +2235,71 @@ msgstr ""
2235 " git branch new_branch_name %s\n"
2236 "\n"
2237
2245 -#: builtin/checkout.c:695
2238 +#: builtin/checkout.c:694
2239 msgid "internal error in revision walk"
2240 msgstr "在版本遍历时遇到内部错误"
2241
2249 -#: builtin/checkout.c:699
2242 +#: builtin/checkout.c:698
2243 msgid "Previous HEAD position was"
2244 msgstr "之前的 HEAD 位置是"
2245
2253 -#: builtin/checkout.c:725 builtin/checkout.c:920
2246 +#: builtin/checkout.c:724 builtin/checkout.c:919
2247 msgid "You are on a branch yet to be born"
2248 msgstr "您位于一个尚未初始化的分支"
2249
2250 #. case (1)
2258 -#: builtin/checkout.c:856
2251 +#: builtin/checkout.c:855
2252 #, c-format
2253 msgid "invalid reference: %s"
2254 msgstr "无效引用：%s"
2255
2256 #. case (1): want a tree
2264 -#: builtin/checkout.c:895
2257 +#: builtin/checkout.c:894
2258 #, c-format
2259 msgid "reference is not a tree: %s"
2260 msgstr "引用不是一个树：%s"
2261
2269 -#: builtin/checkout.c:977
2262 +#: builtin/checkout.c:976
2263 msgid "-B cannot be used with -b"
2264 msgstr "-B 不能和 -b 同时使用"
2265
2273 -#: builtin/checkout.c:986
2266 +#: builtin/checkout.c:985
2267 msgid "--patch is incompatible with all other options"
2268 msgstr "--patch 选项和其他选项不兼容"
2269
2277 -#: builtin/checkout.c:989
2270 +#: builtin/checkout.c:988
2271 msgid "--detach cannot be used with -b/-B/--orphan"
2272 msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
2273
2281 -#: builtin/checkout.c:991
2274 +#: builtin/checkout.c:990
2275 msgid "--detach cannot be used with -t"
2276 msgstr "--detach 不能和 -t 同时使用"
2277
2285 -#: builtin/checkout.c:997
2278 +#: builtin/checkout.c:996
2279 msgid "--track needs a branch name"
2280 msgstr "--track 需要一个分支名"
2281
2289 -#: builtin/checkout.c:1004
2282 +#: builtin/checkout.c:1003
2283 msgid "Missing branch name; try -b"
2284 msgstr "缺少分支名；尝试 -b"
2285
2293 -#: builtin/checkout.c:1010
2286 +#: builtin/checkout.c:1009
2287 msgid "--orphan and -b|-B are mutually exclusive"
2288 msgstr "--orphan 和 -b|-B 互斥"
2289
2297 -#: builtin/checkout.c:1012
2290 +#: builtin/checkout.c:1011
2291 msgid "--orphan cannot be used with -t"
2292 msgstr "--orphan 不能和 -t 同时使用"
2293
2301 -#: builtin/checkout.c:1022
2294 +#: builtin/checkout.c:1021
2295 msgid "git checkout: -f and -m are incompatible"
2296 msgstr "git checkout：-f 和 -m 不兼容"
2297
2305 -#: builtin/checkout.c:1056
2298 +#: builtin/checkout.c:1055
2299 msgid "invalid path specification"
2300 msgstr "无效的路径规格"
2301
2309 -#: builtin/checkout.c:1064
2302 +#: builtin/checkout.c:1063
2303 #, c-format
2304 msgid ""
2305 "git checkout: updating paths is incompatible with switching branches.\n"
@@ -2315,26 +2308,26 @@ msgstr ""
2308 "git checkout：更新路径和切换分支不兼容。\n"
2309 "您是想要检出 '%s' 但未能将其解析为提交么？"
2310
2318 -#: builtin/checkout.c:1066
2311 +#: builtin/checkout.c:1065
2312 msgid "git checkout: updating paths is incompatible with switching branches."
2313 msgstr "git checkout：更新路径和切换分支不兼容。"
2314
2322 -#: builtin/checkout.c:1071
2315 +#: builtin/checkout.c:1070
2316 msgid "git checkout: --detach does not take a path argument"
2317 msgstr "git checkout：--detach 不跟路径参数"
2318
2326 -#: builtin/checkout.c:1074
2319 +#: builtin/checkout.c:1073
2320 msgid ""
2321 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
2322 "checking out of the index."
2323 msgstr ""
2324 "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
2325
2333 -#: builtin/checkout.c:1093
2326 +#: builtin/checkout.c:1092
2327 msgid "Cannot switch branch to a non-commit."
2328 msgstr "无法切换分支到一个非提交。"
2329
2337 -#: builtin/checkout.c:1096
2330 +#: builtin/checkout.c:1095
2331 msgid "--ours/--theirs is incompatible with switching branches."
2332 msgstr "--ours/--theirs 和切换分支不兼容。"
2333
@@ -2390,7 +2383,7 @@ msgstr "引用版本库 '%s' 不是一个本地目录。"
2383 msgid "failed to create directory '%s'"
2384 msgstr "无法创建目录 '%s'"
2385
2393 -#: builtin/clone.c:308 builtin/diff.c:75
2386 +#: builtin/clone.c:308 builtin/diff.c:77
2387 #, c-format
2388 msgid "failed to stat '%s'"
2389 msgstr "无法枚举 '%s' 状态"
@@ -2405,11 +2398,6 @@ msgstr "%s 存在且不是一个目录"
2398 msgid "failed to stat %s\n"
2399 msgstr "无法枚举 %s 状态\n"
2400
2408 -#: builtin/clone.c:341
2409 -#, c-format
2410 -msgid "failed to unlink '%s'"
2411 -msgstr "无法删除 '%s'"
2412 -
2401 #: builtin/clone.c:346
2402 #, c-format
2403 msgid "failed to create link '%s'"
@@ -2796,7 +2784,7 @@ msgstr "（根提交）"
2784 msgid "could not parse HEAD commit"
2785 msgstr "不能解析 HEAD 提交"
2786
2799 -#: builtin/commit.c:1487 builtin/merge.c:509
2787 +#: builtin/commit.c:1487 builtin/merge.c:508
2788 #, c-format
2789 msgid "could not open '%s' for reading"
2790 msgstr "不能为读入打开 '%s'"
@@ -2825,7 +2813,7 @@ msgstr "终止提交；您未更改来自模版的提交说明。\n"
2813 msgid "Aborting commit due to empty commit message.\n"
2814 msgstr "终止提交因为提交说明为空。\n"
2815
2828 -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
2816 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960
2817 msgid "failed to write commit object"
2818 msgstr "无法写提交对象"
2819
@@ -2930,36 +2918,36 @@ msgstr "没有发现名称，无法描述任何东西。"
2918 msgid "--dirty is incompatible with committishes"
2919 msgstr "--dirty 不能与提交同时使用"
2920
2933 -#: builtin/diff.c:77
2921 +#: builtin/diff.c:79
2922 #, c-format
2923 msgid "'%s': not a regular file or symlink"
2924 msgstr "'%s'：不是一个正规文件或符号链接"
2925
2938 -#: builtin/diff.c:220
2926 +#: builtin/diff.c:224
2927 #, c-format
2928 msgid "invalid option: %s"
2929 msgstr "无效选项：%s"
2930
2943 -#: builtin/diff.c:297
2931 +#: builtin/diff.c:301
2932 msgid "Not a git repository"
2933 msgstr "不是一个 git 版本库"
2934
2947 -#: builtin/diff.c:341
2935 +#: builtin/diff.c:344
2936 #, c-format
2937 msgid "invalid object '%s' given."
2938 msgstr "提供了无效对象 '%s'。"
2939
2952 -#: builtin/diff.c:346
2940 +#: builtin/diff.c:349
2941 #, c-format
2942 msgid "more than %d trees given: '%s'"
2943 msgstr "提供了超过 %d 个树对象：'%s'"
2944
2957 -#: builtin/diff.c:356
2945 +#: builtin/diff.c:359
2946 #, c-format
2947 msgid "more than two blobs given: '%s'"
2948 msgstr "提供了超过两个二进制对象（blob）：'%s'"
2949
2962 -#: builtin/diff.c:364
2950 +#: builtin/diff.c:367
2951 #, c-format
2952 msgid "unhandled object '%s' given."
2953 msgstr "提供了无法处理的对象 '%s'。"
@@ -3154,57 +3142,57 @@ msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
3142 msgid "grep: failed to create thread: %s"
3143 msgstr "grep：无法创建线程：%s"
3144
3157 -#: builtin/grep.c:402
3145 +#: builtin/grep.c:454
3146 #, c-format
3147 msgid "Failed to chdir: %s"
3148 msgstr "无法切换目录：%s"
3149
3162 -#: builtin/grep.c:478 builtin/grep.c:512
3150 +#: builtin/grep.c:530 builtin/grep.c:564
3151 #, c-format
3152 msgid "unable to read tree (%s)"
3153 msgstr "无法读取树（%s）"
3154
3167 -#: builtin/grep.c:526
3155 +#: builtin/grep.c:578
3156 #, c-format
3157 msgid "unable to grep from object of type %s"
3158 msgstr "无法抓取来自于 %s 类型的对象"
3159
3172 -#: builtin/grep.c:584
3160 +#: builtin/grep.c:636
3161 #, c-format
3162 msgid "switch `%c' expects a numerical value"
3163 msgstr "开关 `%c' 期望一个数字值"
3164
3177 -#: builtin/grep.c:601
3165 +#: builtin/grep.c:653
3166 #, c-format
3167 msgid "cannot open '%s'"
3168 msgstr "不能打开 '%s'"
3169
3182 -#: builtin/grep.c:885
3170 +#: builtin/grep.c:917
3171 msgid "no pattern given."
3172 msgstr "未提供模式匹配。"
3173
3186 -#: builtin/grep.c:899
3174 +#: builtin/grep.c:931
3175 #, c-format
3176 msgid "bad object %s"
3177 msgstr "坏对象 %s"
3178
3191 -#: builtin/grep.c:940
3179 +#: builtin/grep.c:972
3180 msgid "--open-files-in-pager only works on the worktree"
3181 msgstr "--open-files-in-pager 仅用于工作区"
3182
3195 -#: builtin/grep.c:963
3183 +#: builtin/grep.c:995
3184 msgid "--cached or --untracked cannot be used with --no-index."
3185 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
3186
3199 -#: builtin/grep.c:968
3187 +#: builtin/grep.c:1000
3188 msgid "--no-index or --untracked cannot be used with revs."
3189 msgstr "--no-index 或 --untracked 不能和版本同时使用。"
3190
3203 -#: builtin/grep.c:971
3191 +#: builtin/grep.c:1003
3192 msgid "--[no-]exclude-standard cannot be used for tracked contents."
3193 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
3194
3207 -#: builtin/grep.c:979
3195 +#: builtin/grep.c:1011
3196 msgid "both --cached and trees are given."
3197 msgstr "同时给出了 --cached 和树对象。"
3198
@@ -3699,64 +3687,64 @@ msgstr "只需要一个范围。"
3687 msgid "Not a range."
3688 msgstr "不是一个范围。"
3689
3702 -#: builtin/log.c:792
3690 +#: builtin/log.c:789
3691 msgid "Cover letter needs email format"
3692 msgstr "信封需要邮件地址格式"
3693
3706 -#: builtin/log.c:865
3694 +#: builtin/log.c:862
3695 #, c-format
3696 msgid "insane in-reply-to: %s"
3697 msgstr "不正常的 in-reply-to：%s"
3698
3711 -#: builtin/log.c:938
3699 +#: builtin/log.c:935
3700 msgid "Two output directories?"
3701 msgstr "两个输出目录？"
3702
3715 -#: builtin/log.c:1160
3703 +#: builtin/log.c:1157
3704 #, c-format
3705 msgid "bogus committer info %s"
3706 msgstr "虚假的提交者信息 %s"
3707
3720 -#: builtin/log.c:1205
3708 +#: builtin/log.c:1202
3709 msgid "-n and -k are mutually exclusive."
3710 msgstr "-n 和 -k 互斥。"
3711
3724 -#: builtin/log.c:1207
3712 +#: builtin/log.c:1204
3713 msgid "--subject-prefix and -k are mutually exclusive."
3714 msgstr "--subject-prefix 和 -k 互斥。"
3715
3728 -#: builtin/log.c:1215
3716 +#: builtin/log.c:1212
3717 msgid "--name-only does not make sense"
3718 msgstr "--name-only 无意义"
3719
3732 -#: builtin/log.c:1217
3720 +#: builtin/log.c:1214
3721 msgid "--name-status does not make sense"
3722 msgstr "--name-status 无意义"
3723
3736 -#: builtin/log.c:1219
3724 +#: builtin/log.c:1216
3725 msgid "--check does not make sense"
3726 msgstr "--check 无意义"
3727
3740 -#: builtin/log.c:1242
3728 +#: builtin/log.c:1239
3729 msgid "standard output, or directory, which one?"
3730 msgstr "标准输出或目录，哪一个？"
3731
3744 -#: builtin/log.c:1244
3732 +#: builtin/log.c:1241
3733 #, c-format
3734 msgid "Could not create directory '%s'"
3735 msgstr "不能创建目录 '%s'"
3736
3749 -#: builtin/log.c:1397
3737 +#: builtin/log.c:1394
3738 msgid "Failed to create output files"
3739 msgstr "无法创建输出文件"
3740
3753 -#: builtin/log.c:1501
3741 +#: builtin/log.c:1498
3742 #, c-format
3743 msgid ""
3744 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
3745 msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n"
3746
3759 -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
3747 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525
3748 #, c-format
3749 msgid "Unknown commit %s"
3750 msgstr "未知提交 %s"
@@ -3820,49 +3808,49 @@ msgstr "完成 SQUASH_MSG"
3808 msgid "No merge message -- not updating HEAD\n"
3809 msgstr "无合并信息 -- 未更新 HEAD\n"
3810
3823 -#: builtin/merge.c:437
3811 +#: builtin/merge.c:436
3812 #, c-format
3813 msgid "'%s' does not point to a commit"
3814 msgstr "'%s' 没有指向一个提交"
3815
3828 -#: builtin/merge.c:536
3816 +#: builtin/merge.c:535
3817 #, c-format
3818 msgid "Bad branch.%s.mergeoptions string: %s"
3819 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
3820
3833 -#: builtin/merge.c:629
3821 +#: builtin/merge.c:628
3822 msgid "git write-tree failed to write a tree"
3823 msgstr "git write-tree 无法写入一树对象"
3824
3837 -#: builtin/merge.c:679
3825 +#: builtin/merge.c:678
3826 msgid "failed to read the cache"
3827 msgstr "无法读取缓存"
3828
3841 -#: builtin/merge.c:710
3829 +#: builtin/merge.c:709
3830 msgid "Not handling anything other than two heads merge."
3831 msgstr "不能处理两个头合并之外的任何操作。"
3832
3845 -#: builtin/merge.c:724
3833 +#: builtin/merge.c:723
3834 #, c-format
3835 msgid "Unknown option for merge-recursive: -X%s"
3836 msgstr "merge-recursive 的未知选项：-X%s"
3837
3850 -#: builtin/merge.c:738
3838 +#: builtin/merge.c:737
3839 #, c-format
3840 msgid "unable to write %s"
3841 msgstr "不能写 %s"
3842
3855 -#: builtin/merge.c:877
3843 +#: builtin/merge.c:876
3844 #, c-format
3845 msgid "Could not read from '%s'"
3846 msgstr "不能从 '%s' 读取"
3847
3860 -#: builtin/merge.c:886
3848 +#: builtin/merge.c:885
3849 #, c-format
3850 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
3851 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
3852
3865 -#: builtin/merge.c:892
3853 +#: builtin/merge.c:891
3854 msgid ""
3855 "Please enter a commit message to explain why this merge is necessary,\n"
3856 "especially if it merges an updated upstream into a topic branch.\n"
@@ -3875,52 +3863,52 @@ msgstr ""
3863 "\n"
3864 "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
3865
3878 -#: builtin/merge.c:916
3866 +#: builtin/merge.c:915
3867 msgid "Empty commit message."
3868 msgstr "空提交信息。"
3869
3882 -#: builtin/merge.c:928
3870 +#: builtin/merge.c:927
3871 #, c-format
3872 msgid "Wonderful.\n"
3873 msgstr "太棒了。\n"
3874
3887 -#: builtin/merge.c:993
3875 +#: builtin/merge.c:992
3876 #, c-format
3877 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
3878 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
3879
3892 -#: builtin/merge.c:1009
3880 +#: builtin/merge.c:1008
3881 #, c-format
3882 msgid "'%s' is not a commit"
3883 msgstr "'%s' 不是一个提交"
3884
3897 -#: builtin/merge.c:1050
3885 +#: builtin/merge.c:1049
3886 msgid "No current branch."
3887 msgstr "没有当前分支。"
3888
3901 -#: builtin/merge.c:1052
3889 +#: builtin/merge.c:1051
3890 msgid "No remote for the current branch."
3891 msgstr "当前分支没有对应的远程版本库。"
3892
3905 -#: builtin/merge.c:1054
3893 +#: builtin/merge.c:1053
3894 msgid "No default upstream defined for the current branch."
3895 msgstr "当前分支没有定义默认的上游分支。"
3896
3909 -#: builtin/merge.c:1059
3897 +#: builtin/merge.c:1058
3898 #, c-format
3899 msgid "No remote tracking branch for %s from %s"
3900 msgstr "%s 没有来自 %s 的远程跟踪分支"
3901
3914 -#: builtin/merge.c:1146 builtin/merge.c:1303
3902 +#: builtin/merge.c:1145 builtin/merge.c:1302
3903 #, c-format
3904 msgid "%s - not something we can merge"
3905 msgstr "%s - 不能被合并"
3906
3919 -#: builtin/merge.c:1214
3907 +#: builtin/merge.c:1213
3908 msgid "There is no merge to abort (MERGE_HEAD missing)."
3909 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
3910
3923 -#: builtin/merge.c:1230 git-pull.sh:31
3911 +#: builtin/merge.c:1229 git-pull.sh:31
3912 msgid ""
3913 "You have not concluded your merge (MERGE_HEAD exists).\n"
3914 "Please, commit your changes before you can merge."
@@ -3928,11 +3916,11 @@ msgstr ""
3916 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
3917 "请在合并前先提交您的修改。"
3918
3931 -#: builtin/merge.c:1233 git-pull.sh:34
3919 +#: builtin/merge.c:1232 git-pull.sh:34
3920 msgid "You have not concluded your merge (MERGE_HEAD exists)."
3921 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
3922
3935 -#: builtin/merge.c:1237
3923 +#: builtin/merge.c:1236
3924 msgid ""
3925 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
3926 "Please, commit your changes before you can merge."
@@ -3940,79 +3928,79 @@ msgstr ""
3928 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
3929 "请在合并前先提交您的修改。"
3930
3943 -#: builtin/merge.c:1240
3931 +#: builtin/merge.c:1239
3932 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
3933 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
3934
3947 -#: builtin/merge.c:1249
3935 +#: builtin/merge.c:1248
3936 msgid "You cannot combine --squash with --no-ff."
3937 msgstr "您不能将 --squash 与 --no-ff 同时使用。"
3938
3951 -#: builtin/merge.c:1254
3939 +#: builtin/merge.c:1253
3940 msgid "You cannot combine --no-ff with --ff-only."
3941 msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
3942
3955 -#: builtin/merge.c:1261
3943 +#: builtin/merge.c:1260
3944 msgid "No commit specified and merge.defaultToUpstream not set."
3945 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
3946
3959 -#: builtin/merge.c:1293
3947 +#: builtin/merge.c:1292
3948 msgid "Can merge only exactly one commit into empty head"
3949 msgstr "只能将一个提交合并到空分支上"
3950
3963 -#: builtin/merge.c:1296
3951 +#: builtin/merge.c:1295
3952 msgid "Squash commit into empty head not supported yet"
3953 msgstr "尚不支持到空分支的压缩提交"
3954
3967 -#: builtin/merge.c:1298
3955 +#: builtin/merge.c:1297
3956 msgid "Non-fast-forward commit does not make sense into an empty head"
3957 msgstr "到空分支的非快进式提交没有意义"
3958
3971 -#: builtin/merge.c:1413
3959 +#: builtin/merge.c:1412
3960 #, c-format
3961 msgid "Updating %s..%s\n"
3962 msgstr "更新 %s..%s\n"
3963
3976 -#: builtin/merge.c:1451
3964 +#: builtin/merge.c:1450
3965 #, c-format
3966 msgid "Trying really trivial in-index merge...\n"
3967 msgstr "尝试非常小的索引内合并...\n"
3968
3981 -#: builtin/merge.c:1458
3969 +#: builtin/merge.c:1457
3970 #, c-format
3971 msgid "Nope.\n"
3972 msgstr "无。\n"
3973
3986 -#: builtin/merge.c:1490
3974 +#: builtin/merge.c:1489
3975 msgid "Not possible to fast-forward, aborting."
3976 msgstr "无法快进，终止。"
3977
3990 -#: builtin/merge.c:1513 builtin/merge.c:1592
3978 +#: builtin/merge.c:1512 builtin/merge.c:1591
3979 #, c-format
3980 msgid "Rewinding the tree to pristine...\n"
3981 msgstr "将树回滚至原始状态...\n"
3982
3995 -#: builtin/merge.c:1517
3983 +#: builtin/merge.c:1516
3984 #, c-format
3985 msgid "Trying merge strategy %s...\n"
3986 msgstr "尝试合并策略 %s...\n"
3987
4000 -#: builtin/merge.c:1583
3988 +#: builtin/merge.c:1582
3989 #, c-format
3990 msgid "No merge strategy handled the merge.\n"
3991 msgstr "没有合并策略处理此合并。\n"
3992
4005 -#: builtin/merge.c:1585
3993 +#: builtin/merge.c:1584
3994 #, c-format
3995 msgid "Merge with strategy %s failed.\n"
3996 msgstr "使用策略 %s 合并失败。\n"
3997
4010 -#: builtin/merge.c:1594
3998 +#: builtin/merge.c:1593
3999 #, c-format
4000 msgid "Using the %s to prepare resolving by hand.\n"
4001 msgstr "使用 %s 以准备手工解决。\n"
4002
4015 -#: builtin/merge.c:1606
4003 +#: builtin/merge.c:1605
4004 #, c-format
4005 msgid "Automatic merge went well; stopped before committing as requested\n"
4006 msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -4340,12 +4328,44 @@ msgstr ""
4328 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
4329 "而没有告诉我要推送什么、更新哪个远程分支。"
4330
4343 -#: builtin/push.c:174
4331 +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短
4332 +#: builtin/push.c:151
4333 +msgid ""
4334 +"push.default is unset; its implicit value is changing in\n"
4335 +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
4336 +"and maintain the current behavior after the default changes, use:\n"
4337 +"\n"
4338 +" git config --global push.default matching\n"
4339 +"\n"
4340 +"To squelch this message and adopt the new behavior now, use:\n"
4341 +"\n"
4342 +" git config --global push.default simple\n"
4343 +"\n"
4344 +"See 'git help config' and search for 'push.default' for further "
4345 +"information.\n"
4346 +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
4347 +"'current' instead of 'simple' if you sometimes use older versions of Git)"
4348 +msgstr ""
4349 +"push.default 未设置，它的默认值将会在 Git 2.0 由 'matching'\n"
4350 +"修改为 'simple'。若要不再显示本信息并在其默认值改变后维持当前使用习惯，\n"
4351 +"进行如下设置：\n"
4352 +"\n"
4353 +" git config --global push.default matching\n"
4354 +"\n"
4355 +"若要不再显示本信息并从现在开始采用新的使用习惯，设置：\n"
4356 +"\n"
4357 +" git config --global push.default simple\n"
4358 +"\n"
4359 +"参见 'git help config' 并查找 'push.default' 以获取更多信息。\n"
4360 +"（'simple' 模式由 Git 1.7.11 版本引入。如果您有时要使用老版本的 Git，\n"
4361 +"为保持兼容，请用 'current' 代替 'simple' 模式）"
4362 +
4363 +#: builtin/push.c:199
4364 msgid ""
4365 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
4366 msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。"
4367
4348 -#: builtin/push.c:181
4368 +#: builtin/push.c:206
4369 msgid ""
4370 "Updates were rejected because the tip of your current branch is behind\n"
4371 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
@@ -4356,18 +4376,19 @@ msgstr ""
4376 "再次推送前，先与远程变更合并（如 'git pull'）。详见\n"
4377 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4378
4359 -#: builtin/push.c:187
4379 +#: builtin/push.c:212
4380 msgid ""
4381 "Updates were rejected because a pushed branch tip is behind its remote\n"
4382 "counterpart. If you did not intend to push that branch, you may want to\n"
4363 -"specify branches to push or set the 'push.default' configuration\n"
4364 -"variable to 'current' or 'upstream' to push only the current branch."
4383 +"specify branches to push or set the 'push.default' configuration variable\n"
4384 +"to 'simple', 'current' or 'upstream' to push only the current branch."
4385 msgstr ""
4386 "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
4387 "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n"
4368 -"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
4388 +"配置变量 'push.default' 设置为 'simple'、'current' 或 'upstream'\n"
4389 +"以便只推送当前分支。"
4390
4370 -#: builtin/push.c:193
4391 +#: builtin/push.c:218
4392 msgid ""
4393 "Updates were rejected because a pushed branch tip is behind its remote\n"
4394 "counterpart. Check out this branch and merge the remote changes\n"
@@ -4378,22 +4399,22 @@ msgstr ""
4399 "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n"
4400 "'git push --help' 中的 'Note about fast-forwards' 小节。"
4401
4381 -#: builtin/push.c:233
4402 +#: builtin/push.c:258
4403 #, c-format
4404 msgid "Pushing to %s\n"
4405 msgstr "推送到 %s\n"
4406
4386 -#: builtin/push.c:237
4407 +#: builtin/push.c:262
4408 #, c-format
4409 msgid "failed to push some refs to '%s'"
4410 msgstr "无法推送一些引用到 '%s'"
4411
4391 -#: builtin/push.c:269
4412 +#: builtin/push.c:294
4413 #, c-format
4414 msgid "bad repository '%s'"
4415 msgstr "坏的版本库 '%s'"
4416
4396 -#: builtin/push.c:270
4417 +#: builtin/push.c:295
4418 msgid ""
4419 "No configured push destination.\n"
4420 "Either specify the URL from the command-line or configure a remote "
@@ -4414,31 +4435,31 @@ msgstr ""
4435 "\n"
4436 " git push <name>\n"
4437
4417 -#: builtin/push.c:285
4438 +#: builtin/push.c:310
4439 msgid "--all and --tags are incompatible"
4440 msgstr "--all 和 --tags 不兼容"
4441
4421 -#: builtin/push.c:286
4442 +#: builtin/push.c:311
4443 msgid "--all can't be combined with refspecs"
4444 msgstr "--all 不能和引用表达式同时使用"
4445
4425 -#: builtin/push.c:291
4446 +#: builtin/push.c:316
4447 msgid "--mirror and --tags are incompatible"
4448 msgstr "--mirror 和 --tags 不兼容"
4449
4429 -#: builtin/push.c:292
4450 +#: builtin/push.c:317
4451 msgid "--mirror can't be combined with refspecs"
4452 msgstr "--mirror 不能和引用表达式同时使用"
4453
4433 -#: builtin/push.c:297
4454 +#: builtin/push.c:322
4455 msgid "--all and --mirror are incompatible"
4456 msgstr "--all 和 --mirror 不兼容"
4457
4437 -#: builtin/push.c:385
4458 +#: builtin/push.c:410
4459 msgid "--delete is incompatible with --all, --mirror and --tags"
4460 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
4461
4441 -#: builtin/push.c:387
4462 +#: builtin/push.c:412
4463 msgid "--delete doesn't make sense without any refs"
4464 msgstr "--delete 未接任何引用没有意义"
4465
@@ -5796,32 +5817,32 @@ msgstr "（为恢复数据输入 \"git stash apply\"）"
5817 msgid "cannot strip one component off url '$remoteurl'"
5818 msgstr "无法从 url '$remoteurl' 剥离一个组件"
5819
5799 -#: git-submodule.sh:145
5820 +#: git-submodule.sh:167
5821 #, sh-format
5822 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
5823 msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
5824
5804 -#: git-submodule.sh:189
5825 +#: git-submodule.sh:211
5826 #, sh-format
5827 msgid "Clone of '$url' into submodule path '$sm_path' failed"
5828 msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
5829
5809 -#: git-submodule.sh:201
5830 +#: git-submodule.sh:223
5831 #, sh-format
5832 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
5833 msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
5834
5814 -#: git-submodule.sh:290
5835 +#: git-submodule.sh:312
5836 #, sh-format
5837 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
5838 msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
5839
5819 -#: git-submodule.sh:307
5840 +#: git-submodule.sh:329
5841 #, sh-format
5842 msgid "'$sm_path' already exists in the index"
5843 msgstr "'$sm_path' 已经存在于索引中"
5844
5824 -#: git-submodule.sh:311
5845 +#: git-submodule.sh:333
5846 #, sh-format
5847 msgid ""
5848 "The following path is ignored by one of your .gitignore files:\n"
@@ -5832,62 +5853,62 @@ msgstr ""
5853 "$sm_path\n"
5854 "如果您确实想添加它，使用 -f 参数。"
5855
5835 -#: git-submodule.sh:322
5856 +#: git-submodule.sh:344
5857 #, sh-format
5858 msgid "Adding existing repo at '$sm_path' to the index"
5859 msgstr "添加位于 '$sm_path' 的现存版本库到索引"
5860
5840 -#: git-submodule.sh:324
5861 +#: git-submodule.sh:346
5862 #, sh-format
5863 msgid "'$sm_path' already exists and is not a valid git repo"
5864 msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
5865
5845 -#: git-submodule.sh:338
5866 +#: git-submodule.sh:360
5867 #, sh-format
5868 msgid "Unable to checkout submodule '$sm_path'"
5869 msgstr "不能检出子模组 '$sm_path'"
5870
5850 -#: git-submodule.sh:343
5871 +#: git-submodule.sh:365
5872 #, sh-format
5873 msgid "Failed to add submodule '$sm_path'"
5874 msgstr "无法添加子模组 '$sm_path'"
5875
5855 -#: git-submodule.sh:348
5876 +#: git-submodule.sh:370
5877 #, sh-format
5878 msgid "Failed to register submodule '$sm_path'"
5879 msgstr "无法注册子模组 '$sm_path'"
5880
5860 -#: git-submodule.sh:390
5881 +#: git-submodule.sh:413
5882 #, sh-format
5883 msgid "Entering '$prefix$sm_path'"
5884 msgstr "正在进入 '$prefix$sm_path'"
5885
5865 -#: git-submodule.sh:404
5886 +#: git-submodule.sh:427
5887 #, sh-format
5888 msgid "Stopping at '$sm_path'; script returned non-zero status."
5889 msgstr "停止于 '$sm_path'，脚本返回非零值。"
5890
5870 -#: git-submodule.sh:447
5891 +#: git-submodule.sh:471
5892 #, sh-format
5893 msgid "No url found for submodule path '$sm_path' in .gitmodules"
5894 msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
5895
5875 -#: git-submodule.sh:456
5896 +#: git-submodule.sh:480
5897 #, sh-format
5898 msgid "Failed to register url for submodule path '$sm_path'"
5899 msgstr "无法为子模组路径 '$sm_path' 注册 url"
5900
5880 -#: git-submodule.sh:458
5901 +#: git-submodule.sh:482
5902 #, sh-format
5903 msgid "Submodule '$name' ($url) registered for path '$sm_path'"
5904 msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
5905
5885 -#: git-submodule.sh:466
5906 +#: git-submodule.sh:490
5907 #, sh-format
5908 msgid "Failed to register update mode for submodule path '$sm_path'"
5909 msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
5910
5890 -#: git-submodule.sh:565
5911 +#: git-submodule.sh:590
5912 #, sh-format
5913 msgid ""
5914 "Submodule path '$sm_path' not initialized\n"
@@ -5896,92 +5917,101 @@ msgstr ""
5917 "子模组路径 '$sm_path' 没有初始化\n"
5918 "也许您想用 'update --init'？"
5919
5899 -#: git-submodule.sh:578
5920 +#: git-submodule.sh:603
5921 #, sh-format
5922 msgid "Unable to find current revision in submodule path '$sm_path'"
5923 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
5924
5904 -#: git-submodule.sh:597
5925 +#: git-submodule.sh:622
5926 #, sh-format
5927 msgid "Unable to fetch in submodule path '$sm_path'"
5928 msgstr "无法在子模组路径 '$sm_path' 中获取"
5929
5909 -#: git-submodule.sh:611
5930 +#: git-submodule.sh:636
5931 #, sh-format
5932 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
5933 msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
5934
5914 -#: git-submodule.sh:612
5935 +#: git-submodule.sh:637
5936 #, sh-format
5937 msgid "Submodule path '$sm_path': rebased into '$sha1'"
5938 msgstr "子模组路径 '$sm_path'：变基至 '$sha1'"
5939
5919 -#: git-submodule.sh:617
5940 +#: git-submodule.sh:642
5941 #, sh-format
5942 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
5943 msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
5944
5924 -#: git-submodule.sh:618
5945 +#: git-submodule.sh:643
5946 #, sh-format
5947 msgid "Submodule path '$sm_path': merged in '$sha1'"
5948 msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'"
5949
5929 -#: git-submodule.sh:623
5950 +#: git-submodule.sh:648
5951 #, sh-format
5952 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
5953 msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
5954
5934 -#: git-submodule.sh:624
5955 +#: git-submodule.sh:649
5956 #, sh-format
5957 msgid "Submodule path '$sm_path': checked out '$sha1'"
5958 msgstr "子模组路径 '$sm_path'：检出 '$sha1'"
5959
5939 -#: git-submodule.sh:646 git-submodule.sh:969
5960 +#: git-submodule.sh:671 git-submodule.sh:995
5961 #, sh-format
5962 msgid "Failed to recurse into submodule path '$sm_path'"
5963 msgstr "无法递归进子模组路径 '$sm_path'"
5964
5944 -#: git-submodule.sh:754
5965 +#: git-submodule.sh:779
5966 msgid "The --cached option cannot be used with the --files option"
5967 msgstr "选项 --cached 不能和选项 --files 同时使用"
5968
5969 #. unexpected type
5949 -#: git-submodule.sh:794
5970 +#: git-submodule.sh:819
5971 #, sh-format
5972 msgid "unexpected mode $mod_dst"
5973 msgstr "意外的模式 $mod_dst"
5974
5975 # 译者：注意保持前导空格
5955 -#: git-submodule.sh:812
5976 +#: git-submodule.sh:837
5977 #, sh-format
5978 msgid " Warn: $name doesn't contain commit $sha1_src"
5979 msgstr " 警告：$name 未包含提交 $sha1_src"
5980
5981 # 译者：注意保持前导空格
5961 -#: git-submodule.sh:815
5982 +#: git-submodule.sh:840
5983 #, sh-format
5984 msgid " Warn: $name doesn't contain commit $sha1_dst"
5985 msgstr " 警告：$name 未包含提交 $sha1_dst"
5986
5987 # 译者：注意保持前导空格
5967 -#: git-submodule.sh:818
5988 +#: git-submodule.sh:843
5989 #, sh-format
5990 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
5991 msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst"
5992
5972 -#: git-submodule.sh:843
5993 +#: git-submodule.sh:868
5994 msgid "blob"
5995 msgstr "二进制对象"
5996
5976 -#: git-submodule.sh:881
5997 +#: git-submodule.sh:906
5998 msgid "# Submodules changed but not updated:"
5999 msgstr "# 子模组已修改但尚未更新："
6000
5980 -#: git-submodule.sh:883
6001 +#: git-submodule.sh:908
6002 msgid "# Submodule changes to be committed:"
6003 msgstr "要提交的子模组变更："
6004
5984 -#: git-submodule.sh:1027
6005 +#: git-submodule.sh:1054
6006 #, sh-format
6007 msgid "Synchronizing submodule url for '$name'"
6008 msgstr "为 '$name' 同步子模组 url"
6009 +
6010 +#~ msgid "diff setup failed"
6011 +#~ msgstr "diff 设置失败"
6012 +
6013 +#~ msgid "merge-recursive: disk full?"
6014 +#~ msgstr "merge-recursive：磁盘已满？"
6015 +
6016 +#~ msgid "diff_setup_done failed"
6017 +#~ msgstr "diff_setup_done 失败"