@matheusbsbs / matheus-bagliano / commits / 466c88fa0e

l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed)

Generate po/git.pot from v2.23.0-rc2 for git v2.23.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>

Jiang Xin committed Aug 10, 2019 at 20:13 UTC 466c88fa0e9382af80cb68f7697ee22c92d739f9
1 file changed +461 -477
po/git.pot
+461 -477
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11 -"POT-Creation-Date: 2019-07-30 09:59+0800\n"
11 +"POT-Creation-Date: 2019-08-10 20:12+0800\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -530,7 +530,7 @@ msgstr[1] ""
530 msgid "truncating .rej filename to %.*s.rej"
531 msgstr ""
532
533 -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
533 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
534 #, c-format
535 msgid "cannot open %s"
536 msgstr ""
@@ -671,7 +671,7 @@ msgstr ""
671
672 #: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
673 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
674 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
674 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
675 msgid "action"
676 msgstr ""
677
@@ -701,7 +701,7 @@ msgstr ""
701
702 #: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
703 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
704 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
704 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
705 msgid "be verbose"
706 msgstr ""
707
@@ -770,7 +770,7 @@ msgstr ""
770 msgid "archive format"
771 msgstr ""
772
773 -#: archive.c:458 builtin/log.c:1597
773 +#: archive.c:458 builtin/log.c:1580
774 msgid "prefix"
775 msgstr ""
776
@@ -893,7 +893,7 @@ msgstr ""
893 msgid "path too long (%d chars, SHA1: %s): %s"
894 msgstr ""
895
896 -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
896 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
897 #, c-format
898 msgid "deflate error (%d)"
899 msgstr ""
@@ -1037,9 +1037,9 @@ msgid "--reverse and --first-parent together require specified latest commit"
1037 msgstr ""
1038
1039 #: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
1040 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
1041 -#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
1042 -#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
1040 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
1041 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
1042 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
1043 #: builtin/shortlog.c:192
1044 msgid "revision walk setup failed"
1045 msgstr ""
@@ -1246,7 +1246,7 @@ msgstr ""
1246 msgid "ref '%s' is excluded by the rev-list options"
1247 msgstr ""
1248
1249 -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
1249 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
1250 #, c-format
1251 msgid "unrecognized argument: %s"
1252 msgstr ""
@@ -1369,193 +1369,193 @@ msgstr ""
1369 msgid "unable to find all commit-graph files"
1370 msgstr ""
1371
1372 -#: commit-graph.c:553 commit-graph.c:613
1372 +#: commit-graph.c:554 commit-graph.c:614
1373 msgid "invalid commit position. commit-graph is likely corrupt"
1374 msgstr ""
1375
1376 -#: commit-graph.c:574
1376 +#: commit-graph.c:575
1377 #, c-format
1378 msgid "could not find commit %s"
1379 msgstr ""
1380
1381 -#: commit-graph.c:1001 builtin/pack-objects.c:2651
1381 +#: commit-graph.c:1002 builtin/pack-objects.c:2657
1382 #, c-format
1383 msgid "unable to get type of object %s"
1384 msgstr ""
1385
1386 -#: commit-graph.c:1033
1386 +#: commit-graph.c:1034
1387 msgid "Loading known commits in commit graph"
1388 msgstr ""
1389
1390 -#: commit-graph.c:1050
1390 +#: commit-graph.c:1051
1391 msgid "Expanding reachable commits in commit graph"
1392 msgstr ""
1393
1394 -#: commit-graph.c:1069
1394 +#: commit-graph.c:1070
1395 msgid "Clearing commit marks in commit graph"
1396 msgstr ""
1397
1398 -#: commit-graph.c:1088
1398 +#: commit-graph.c:1089
1399 msgid "Computing commit graph generation numbers"
1400 msgstr ""
1401
1402 -#: commit-graph.c:1162
1402 +#: commit-graph.c:1163
1403 #, c-format
1404 msgid "Finding commits for commit graph in %d pack"
1405 msgid_plural "Finding commits for commit graph in %d packs"
1406 msgstr[0] ""
1407 msgstr[1] ""
1408
1409 -#: commit-graph.c:1175
1409 +#: commit-graph.c:1176
1410 #, c-format
1411 msgid "error adding pack %s"
1412 msgstr ""
1413
1414 -#: commit-graph.c:1179
1414 +#: commit-graph.c:1180
1415 #, c-format
1416 msgid "error opening index for %s"
1417 msgstr ""
1418
1419 -#: commit-graph.c:1203
1419 +#: commit-graph.c:1204
1420 #, c-format
1421 msgid "Finding commits for commit graph from %d ref"
1422 msgid_plural "Finding commits for commit graph from %d refs"
1423 msgstr[0] ""
1424 msgstr[1] ""
1425
1426 -#: commit-graph.c:1237
1426 +#: commit-graph.c:1238
1427 msgid "Finding commits for commit graph among packed objects"
1428 msgstr ""
1429
1430 -#: commit-graph.c:1252
1430 +#: commit-graph.c:1253
1431 msgid "Counting distinct commits in commit graph"
1432 msgstr ""
1433
1434 -#: commit-graph.c:1283
1434 +#: commit-graph.c:1284
1435 msgid "Finding extra edges in commit graph"
1436 msgstr ""
1437
1438 -#: commit-graph.c:1331
1438 +#: commit-graph.c:1332
1439 msgid "failed to write correct number of base graph ids"
1440 msgstr ""
1441
1442 -#: commit-graph.c:1364 midx.c:811
1442 +#: commit-graph.c:1365 midx.c:811
1443 #, c-format
1444 msgid "unable to create leading directories of %s"
1445 msgstr ""
1446
1447 -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
1447 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
1448 #, c-format
1449 msgid "unable to create '%s'"
1450 msgstr ""
1451
1452 -#: commit-graph.c:1436
1452 +#: commit-graph.c:1437
1453 #, c-format
1454 msgid "Writing out commit graph in %d pass"
1455 msgid_plural "Writing out commit graph in %d passes"
1456 msgstr[0] ""
1457 msgstr[1] ""
1458
1459 -#: commit-graph.c:1477
1459 +#: commit-graph.c:1478
1460 msgid "unable to open commit-graph chain file"
1461 msgstr ""
1462
1463 -#: commit-graph.c:1489
1463 +#: commit-graph.c:1490
1464 msgid "failed to rename base commit-graph file"
1465 msgstr ""
1466
1467 -#: commit-graph.c:1509
1467 +#: commit-graph.c:1510
1468 msgid "failed to rename temporary commit-graph file"
1469 msgstr ""
1470
1471 -#: commit-graph.c:1620
1471 +#: commit-graph.c:1621
1472 msgid "Scanning merged commits"
1473 msgstr ""
1474
1475 -#: commit-graph.c:1631
1475 +#: commit-graph.c:1632
1476 #, c-format
1477 msgid "unexpected duplicate commit id %s"
1478 msgstr ""
1479
1480 -#: commit-graph.c:1656
1480 +#: commit-graph.c:1657
1481 msgid "Merging commit-graph"
1482 msgstr ""
1483
1484 -#: commit-graph.c:1842
1484 +#: commit-graph.c:1844
1485 #, c-format
1486 msgid "the commit graph format cannot write %d commits"
1487 msgstr ""
1488
1489 -#: commit-graph.c:1853
1489 +#: commit-graph.c:1855
1490 msgid "too many commits to write graph"
1491 msgstr ""
1492
1493 -#: commit-graph.c:1943
1493 +#: commit-graph.c:1945
1494 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
1495 msgstr ""
1496
1497 -#: commit-graph.c:1953
1497 +#: commit-graph.c:1955
1498 #, c-format
1499 msgid "commit-graph has incorrect OID order: %s then %s"
1500 msgstr ""
1501
1502 -#: commit-graph.c:1963 commit-graph.c:1978
1502 +#: commit-graph.c:1965 commit-graph.c:1980
1503 #, c-format
1504 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
1505 msgstr ""
1506
1507 -#: commit-graph.c:1970
1507 +#: commit-graph.c:1972
1508 #, c-format
1509 msgid "failed to parse commit %s from commit-graph"
1510 msgstr ""
1511
1512 -#: commit-graph.c:1987
1512 +#: commit-graph.c:1989
1513 msgid "Verifying commits in commit graph"
1514 msgstr ""
1515
1516 -#: commit-graph.c:2000
1516 +#: commit-graph.c:2002
1517 #, c-format
1518 msgid "failed to parse commit %s from object database for commit-graph"
1519 msgstr ""
1520
1521 -#: commit-graph.c:2007
1521 +#: commit-graph.c:2009
1522 #, c-format
1523 msgid "root tree OID for commit %s in commit-graph is %s != %s"
1524 msgstr ""
1525
1526 -#: commit-graph.c:2017
1526 +#: commit-graph.c:2019
1527 #, c-format
1528 msgid "commit-graph parent list for commit %s is too long"
1529 msgstr ""
1530
1531 -#: commit-graph.c:2026
1531 +#: commit-graph.c:2028
1532 #, c-format
1533 msgid "commit-graph parent for %s is %s != %s"
1534 msgstr ""
1535
1536 -#: commit-graph.c:2039
1536 +#: commit-graph.c:2041
1537 #, c-format
1538 msgid "commit-graph parent list for commit %s terminates early"
1539 msgstr ""
1540
1541 -#: commit-graph.c:2044
1541 +#: commit-graph.c:2046
1542 #, c-format
1543 msgid ""
1544 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
1545 msgstr ""
1546
1547 -#: commit-graph.c:2048
1547 +#: commit-graph.c:2050
1548 #, c-format
1549 msgid ""
1550 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
1551 msgstr ""
1552
1553 -#: commit-graph.c:2063
1553 +#: commit-graph.c:2065
1554 #, c-format
1555 msgid "commit-graph generation for commit %s is %u != %u"
1556 msgstr ""
1557
1558 -#: commit-graph.c:2069
1558 +#: commit-graph.c:2071
1559 #, c-format
1560 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
1561 msgstr ""
@@ -1587,281 +1587,281 @@ msgstr ""
1587 msgid "relative config include conditionals must come from files"
1588 msgstr ""
1589
1590 -#: config.c:375
1590 +#: config.c:376
1591 #, c-format
1592 msgid "key does not contain a section: %s"
1593 msgstr ""
1594
1595 -#: config.c:381
1595 +#: config.c:382
1596 #, c-format
1597 msgid "key does not contain variable name: %s"
1598 msgstr ""
1599
1600 -#: config.c:405 sequencer.c:2463
1600 +#: config.c:406 sequencer.c:2463
1601 #, c-format
1602 msgid "invalid key: %s"
1603 msgstr ""
1604
1605 -#: config.c:411
1605 +#: config.c:412
1606 #, c-format
1607 msgid "invalid key (newline): %s"
1608 msgstr ""
1609
1610 -#: config.c:447 config.c:459
1610 +#: config.c:448 config.c:460
1611 #, c-format
1612 msgid "bogus config parameter: %s"
1613 msgstr ""
1614
1615 -#: config.c:494
1615 +#: config.c:495
1616 #, c-format
1617 msgid "bogus format in %s"
1618 msgstr ""
1619
1620 -#: config.c:820
1620 +#: config.c:821
1621 #, c-format
1622 msgid "bad config line %d in blob %s"
1623 msgstr ""
1624
1625 -#: config.c:824
1625 +#: config.c:825
1626 #, c-format
1627 msgid "bad config line %d in file %s"
1628 msgstr ""
1629
1630 -#: config.c:828
1630 +#: config.c:829
1631 #, c-format
1632 msgid "bad config line %d in standard input"
1633 msgstr ""
1634
1635 -#: config.c:832
1635 +#: config.c:833
1636 #, c-format
1637 msgid "bad config line %d in submodule-blob %s"
1638 msgstr ""
1639
1640 -#: config.c:836
1640 +#: config.c:837
1641 #, c-format
1642 msgid "bad config line %d in command line %s"
1643 msgstr ""
1644
1645 -#: config.c:840
1645 +#: config.c:841
1646 #, c-format
1647 msgid "bad config line %d in %s"
1648 msgstr ""
1649
1650 -#: config.c:977
1650 +#: config.c:978
1651 msgid "out of range"
1652 msgstr ""
1653
1654 -#: config.c:977
1654 +#: config.c:978
1655 msgid "invalid unit"
1656 msgstr ""
1657
1658 -#: config.c:978
1658 +#: config.c:979
1659 #, c-format
1660 msgid "bad numeric config value '%s' for '%s': %s"
1661 msgstr ""
1662
1663 -#: config.c:997
1663 +#: config.c:998
1664 #, c-format
1665 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1666 msgstr ""
1667
1668 -#: config.c:1000
1668 +#: config.c:1001
1669 #, c-format
1670 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1671 msgstr ""
1672
1673 -#: config.c:1003
1673 +#: config.c:1004
1674 #, c-format
1675 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1676 msgstr ""
1677
1678 -#: config.c:1006
1678 +#: config.c:1007
1679 #, c-format
1680 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1681 msgstr ""
1682
1683 -#: config.c:1009
1683 +#: config.c:1010
1684 #, c-format
1685 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1686 msgstr ""
1687
1688 -#: config.c:1012
1688 +#: config.c:1013
1689 #, c-format
1690 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1691 msgstr ""
1692
1693 -#: config.c:1107
1693 +#: config.c:1108
1694 #, c-format
1695 msgid "failed to expand user dir in: '%s'"
1696 msgstr ""
1697
1698 -#: config.c:1116
1698 +#: config.c:1117
1699 #, c-format
1700 msgid "'%s' for '%s' is not a valid timestamp"
1701 msgstr ""
1702
1703 -#: config.c:1207
1703 +#: config.c:1208
1704 #, c-format
1705 msgid "abbrev length out of range: %d"
1706 msgstr ""
1707
1708 -#: config.c:1221 config.c:1232
1708 +#: config.c:1222 config.c:1233
1709 #, c-format
1710 msgid "bad zlib compression level %d"
1711 msgstr ""
1712
1713 -#: config.c:1324
1713 +#: config.c:1325
1714 msgid "core.commentChar should only be one character"
1715 msgstr ""
1716
1717 -#: config.c:1357
1717 +#: config.c:1358
1718 #, c-format
1719 msgid "invalid mode for object creation: %s"
1720 msgstr ""
1721
1722 -#: config.c:1429
1722 +#: config.c:1430
1723 #, c-format
1724 msgid "malformed value for %s"
1725 msgstr ""
1726
1727 -#: config.c:1455
1727 +#: config.c:1456
1728 #, c-format
1729 msgid "malformed value for %s: %s"
1730 msgstr ""
1731
1732 -#: config.c:1456
1732 +#: config.c:1457
1733 msgid "must be one of nothing, matching, simple, upstream or current"
1734 msgstr ""
1735
1736 -#: config.c:1517 builtin/pack-objects.c:3399
1736 +#: config.c:1518 builtin/pack-objects.c:3410
1737 #, c-format
1738 msgid "bad pack compression level %d"
1739 msgstr ""
1740
1741 -#: config.c:1638
1741 +#: config.c:1639
1742 #, c-format
1743 msgid "unable to load config blob object '%s'"
1744 msgstr ""
1745
1746 -#: config.c:1641
1746 +#: config.c:1642
1747 #, c-format
1748 msgid "reference '%s' does not point to a blob"
1749 msgstr ""
1750
1751 -#: config.c:1658
1751 +#: config.c:1659
1752 #, c-format
1753 msgid "unable to resolve config blob '%s'"
1754 msgstr ""
1755
1756 -#: config.c:1688
1756 +#: config.c:1689
1757 #, c-format
1758 msgid "failed to parse %s"
1759 msgstr ""
1760
1761 -#: config.c:1744
1761 +#: config.c:1745
1762 msgid "unable to parse command-line config"
1763 msgstr ""
1764
1765 -#: config.c:2093
1765 +#: config.c:2094
1766 msgid "unknown error occurred while reading the configuration files"
1767 msgstr ""
1768
1769 -#: config.c:2263
1769 +#: config.c:2264
1770 #, c-format
1771 msgid "Invalid %s: '%s'"
1772 msgstr ""
1773
1774 -#: config.c:2306
1774 +#: config.c:2307
1775 #, c-format
1776 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1777 msgstr ""
1778
1779 -#: config.c:2332
1779 +#: config.c:2333
1780 #, c-format
1781 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1782 msgstr ""
1783
1784 -#: config.c:2378
1784 +#: config.c:2379
1785 #, c-format
1786 msgid "unable to parse '%s' from command-line config"
1787 msgstr ""
1788
1789 -#: config.c:2380
1789 +#: config.c:2381
1790 #, c-format
1791 msgid "bad config variable '%s' in file '%s' at line %d"
1792 msgstr ""
1793
1794 -#: config.c:2461
1794 +#: config.c:2462
1795 #, c-format
1796 msgid "invalid section name '%s'"
1797 msgstr ""
1798
1799 -#: config.c:2493
1799 +#: config.c:2494
1800 #, c-format
1801 msgid "%s has multiple values"
1802 msgstr ""
1803
1804 -#: config.c:2522
1804 +#: config.c:2523
1805 #, c-format
1806 msgid "failed to write new configuration file %s"
1807 msgstr ""
1808
1809 -#: config.c:2774 config.c:3098
1809 +#: config.c:2775 config.c:3099
1810 #, c-format
1811 msgid "could not lock config file %s"
1812 msgstr ""
1813
1814 -#: config.c:2785
1814 +#: config.c:2786
1815 #, c-format
1816 msgid "opening %s"
1817 msgstr ""
1818
1819 -#: config.c:2820 builtin/config.c:328
1819 +#: config.c:2821 builtin/config.c:328
1820 #, c-format
1821 msgid "invalid pattern: %s"
1822 msgstr ""
1823
1824 -#: config.c:2845
1824 +#: config.c:2846
1825 #, c-format
1826 msgid "invalid config file %s"
1827 msgstr ""
1828
1829 -#: config.c:2858 config.c:3111
1829 +#: config.c:2859 config.c:3112
1830 #, c-format
1831 msgid "fstat on %s failed"
1832 msgstr ""
1833
1834 -#: config.c:2869
1834 +#: config.c:2870
1835 #, c-format
1836 msgid "unable to mmap '%s'"
1837 msgstr ""
1838
1839 -#: config.c:2878 config.c:3116
1839 +#: config.c:2879 config.c:3117
1840 #, c-format
1841 msgid "chmod on %s failed"
1842 msgstr ""
1843
1844 -#: config.c:2963 config.c:3213
1844 +#: config.c:2964 config.c:3214
1845 #, c-format
1846 msgid "could not write config file %s"
1847 msgstr ""
1848
1849 -#: config.c:2997
1849 +#: config.c:2998
1850 #, c-format
1851 msgid "could not set '%s' to '%s'"
1852 msgstr ""
1853
1854 -#: config.c:2999 builtin/remote.c:782
1854 +#: config.c:3000 builtin/remote.c:782
1855 #, c-format
1856 msgid "could not unset '%s'"
1857 msgstr ""
1858
1859 -#: config.c:3089
1859 +#: config.c:3090
1860 #, c-format
1861 msgid "invalid section name: %s"
1862 msgstr ""
1863
1864 -#: config.c:3256
1864 +#: config.c:3257
1865 #, c-format
1866 msgid "missing value for '%s'"
1867 msgstr ""
@@ -2401,7 +2401,7 @@ msgstr ""
2401 msgid "generate patch"
2402 msgstr ""
2403
2404 -#: diff.c:5275 builtin/log.c:182
2404 +#: diff.c:5275 builtin/log.c:172
2405 msgid "suppress diff output"
2406 msgstr ""
2407
@@ -3583,7 +3583,7 @@ msgstr ""
3583 msgid "renamed"
3584 msgstr ""
3585
3586 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
3586 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
3587 #, c-format
3588 msgid "Refusing to lose dirty file at %s"
3589 msgstr ""
@@ -3660,144 +3660,144 @@ msgid ""
3660 "renamed."
3661 msgstr ""
3662
3663 -#: merge-recursive.c:2937
3663 +#: merge-recursive.c:2938
3664 #, c-format
3665 msgid "cannot read object %s"
3666 msgstr ""
3667
3668 -#: merge-recursive.c:2940
3668 +#: merge-recursive.c:2941
3669 #, c-format
3670 msgid "object %s is not a blob"
3671 msgstr ""
3672
3673 -#: merge-recursive.c:3004
3673 +#: merge-recursive.c:3005
3674 msgid "modify"
3675 msgstr ""
3676
3677 -#: merge-recursive.c:3004
3677 +#: merge-recursive.c:3005
3678 msgid "modified"
3679 msgstr ""
3680
3681 -#: merge-recursive.c:3016
3681 +#: merge-recursive.c:3017
3682 msgid "content"
3683 msgstr ""
3684
3685 -#: merge-recursive.c:3020
3685 +#: merge-recursive.c:3021
3686 msgid "add/add"
3687 msgstr ""
3688
3689 -#: merge-recursive.c:3043
3689 +#: merge-recursive.c:3044
3690 #, c-format
3691 msgid "Skipped %s (merged same as existing)"
3692 msgstr ""
3693
3694 -#: merge-recursive.c:3065 git-submodule.sh:937
3694 +#: merge-recursive.c:3066 git-submodule.sh:937
3695 msgid "submodule"
3696 msgstr ""
3697
3698 -#: merge-recursive.c:3066
3698 +#: merge-recursive.c:3067
3699 #, c-format
3700 msgid "CONFLICT (%s): Merge conflict in %s"
3701 msgstr ""
3702
3703 -#: merge-recursive.c:3096
3703 +#: merge-recursive.c:3097
3704 #, c-format
3705 msgid "Adding as %s instead"
3706 msgstr ""
3707
3708 -#: merge-recursive.c:3178
3708 +#: merge-recursive.c:3179
3709 #, c-format
3710 msgid ""
3711 "Path updated: %s added in %s inside a directory that was renamed in %s; "
3712 "moving it to %s."
3713 msgstr ""
3714
3715 -#: merge-recursive.c:3181
3715 +#: merge-recursive.c:3182
3716 #, c-format
3717 msgid ""
3718 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
3719 "in %s, suggesting it should perhaps be moved to %s."
3720 msgstr ""
3721
3722 -#: merge-recursive.c:3185
3722 +#: merge-recursive.c:3186
3723 #, c-format
3724 msgid ""
3725 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
3726 "%s; moving it to %s."
3727 msgstr ""
3728
3729 -#: merge-recursive.c:3188
3729 +#: merge-recursive.c:3189
3730 #, c-format
3731 msgid ""
3732 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
3733 "was renamed in %s, suggesting it should perhaps be moved to %s."
3734 msgstr ""
3735
3736 -#: merge-recursive.c:3302
3736 +#: merge-recursive.c:3303
3737 #, c-format
3738 msgid "Removing %s"
3739 msgstr ""
3740
3741 -#: merge-recursive.c:3325
3741 +#: merge-recursive.c:3326
3742 msgid "file/directory"
3743 msgstr ""
3744
3745 -#: merge-recursive.c:3330
3745 +#: merge-recursive.c:3331
3746 msgid "directory/file"
3747 msgstr ""
3748
3749 -#: merge-recursive.c:3337
3749 +#: merge-recursive.c:3338
3750 #, c-format
3751 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
3752 msgstr ""
3753
3754 -#: merge-recursive.c:3346
3754 +#: merge-recursive.c:3347
3755 #, c-format
3756 msgid "Adding %s"
3757 msgstr ""
3758
3759 -#: merge-recursive.c:3355
3759 +#: merge-recursive.c:3356
3760 #, c-format
3761 msgid "CONFLICT (add/add): Merge conflict in %s"
3762 msgstr ""
3763
3764 -#: merge-recursive.c:3393
3764 +#: merge-recursive.c:3394
3765 #, c-format
3766 msgid ""
3767 "Your local changes to the following files would be overwritten by merge:\n"
3768 " %s"
3769 msgstr ""
3770
3771 -#: merge-recursive.c:3404
3771 +#: merge-recursive.c:3405
3772 msgid "Already up to date!"
3773 msgstr ""
3774
3775 -#: merge-recursive.c:3413
3775 +#: merge-recursive.c:3414
3776 #, c-format
3777 msgid "merging of trees %s and %s failed"
3778 msgstr ""
3779
3780 -#: merge-recursive.c:3512
3780 +#: merge-recursive.c:3513
3781 msgid "Merging:"
3782 msgstr ""
3783
3784 -#: merge-recursive.c:3525
3784 +#: merge-recursive.c:3526
3785 #, c-format
3786 msgid "found %u common ancestor:"
3787 msgid_plural "found %u common ancestors:"
3788 msgstr[0] ""
3789 msgstr[1] ""
3790
3791 -#: merge-recursive.c:3564
3791 +#: merge-recursive.c:3565
3792 msgid "merge returned no commit"
3793 msgstr ""
3794
3795 -#: merge-recursive.c:3630
3795 +#: merge-recursive.c:3631
3796 #, c-format
3797 msgid "Could not parse object '%s'"
3798 msgstr ""
3799
3800 -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
3800 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
3801 msgid "Unable to write index."
3802 msgstr ""
3803
@@ -5266,7 +5266,7 @@ msgstr ""
5266 msgid "Recorded preimage for '%s'"
5267 msgstr ""
5268
5269 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
5269 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
5270 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
5271 #, c-format
5272 msgid "could not create directory '%s'"
@@ -6395,194 +6395,194 @@ msgstr ""
6395 msgid "invalid line while parsing alternate refs: %s"
6396 msgstr ""
6397
6398 -#: sha1-file.c:943
6398 +#: sha1-file.c:944
6399 #, c-format
6400 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
6401 msgstr ""
6402
6403 -#: sha1-file.c:968
6403 +#: sha1-file.c:969
6404 msgid "mmap failed"
6405 msgstr ""
6406
6407 -#: sha1-file.c:1132
6407 +#: sha1-file.c:1133
6408 #, c-format
6409 msgid "object file %s is empty"
6410 msgstr ""
6411
6412 -#: sha1-file.c:1256 sha1-file.c:2395
6412 +#: sha1-file.c:1257 sha1-file.c:2396
6413 #, c-format
6414 msgid "corrupt loose object '%s'"
6415 msgstr ""
6416
6417 -#: sha1-file.c:1258 sha1-file.c:2399
6417 +#: sha1-file.c:1259 sha1-file.c:2400
6418 #, c-format
6419 msgid "garbage at end of loose object '%s'"
6420 msgstr ""
6421
6422 -#: sha1-file.c:1300
6422 +#: sha1-file.c:1301
6423 msgid "invalid object type"
6424 msgstr ""
6425
6426 -#: sha1-file.c:1384
6426 +#: sha1-file.c:1385
6427 #, c-format
6428 msgid "unable to unpack %s header with --allow-unknown-type"
6429 msgstr ""
6430
6431 -#: sha1-file.c:1387
6431 +#: sha1-file.c:1388
6432 #, c-format
6433 msgid "unable to unpack %s header"
6434 msgstr ""
6435
6436 -#: sha1-file.c:1393
6436 +#: sha1-file.c:1394
6437 #, c-format
6438 msgid "unable to parse %s header with --allow-unknown-type"
6439 msgstr ""
6440
6441 -#: sha1-file.c:1396
6441 +#: sha1-file.c:1397
6442 #, c-format
6443 msgid "unable to parse %s header"
6444 msgstr ""
6445
6446 -#: sha1-file.c:1587
6446 +#: sha1-file.c:1588
6447 #, c-format
6448 msgid "failed to read object %s"
6449 msgstr ""
6450
6451 -#: sha1-file.c:1591
6451 +#: sha1-file.c:1592
6452 #, c-format
6453 msgid "replacement %s not found for %s"
6454 msgstr ""
6455
6456 -#: sha1-file.c:1595
6456 +#: sha1-file.c:1596
6457 #, c-format
6458 msgid "loose object %s (stored in %s) is corrupt"
6459 msgstr ""
6460
6461 -#: sha1-file.c:1599
6461 +#: sha1-file.c:1600
6462 #, c-format
6463 msgid "packed object %s (stored in %s) is corrupt"
6464 msgstr ""
6465
6466 -#: sha1-file.c:1702
6466 +#: sha1-file.c:1703
6467 #, c-format
6468 msgid "unable to write file %s"
6469 msgstr ""
6470
6471 -#: sha1-file.c:1709
6471 +#: sha1-file.c:1710
6472 #, c-format
6473 msgid "unable to set permission to '%s'"
6474 msgstr ""
6475
6476 -#: sha1-file.c:1716
6476 +#: sha1-file.c:1717
6477 msgid "file write error"
6478 msgstr ""
6479
6480 -#: sha1-file.c:1735
6480 +#: sha1-file.c:1736
6481 msgid "error when closing loose object file"
6482 msgstr ""
6483
6484 -#: sha1-file.c:1800
6484 +#: sha1-file.c:1801
6485 #, c-format
6486 msgid "insufficient permission for adding an object to repository database %s"
6487 msgstr ""
6488
6489 -#: sha1-file.c:1802
6489 +#: sha1-file.c:1803
6490 msgid "unable to create temporary file"
6491 msgstr ""
6492
6493 -#: sha1-file.c:1826
6493 +#: sha1-file.c:1827
6494 msgid "unable to write loose object file"
6495 msgstr ""
6496
6497 -#: sha1-file.c:1832
6497 +#: sha1-file.c:1833
6498 #, c-format
6499 msgid "unable to deflate new object %s (%d)"
6500 msgstr ""
6501
6502 -#: sha1-file.c:1836
6502 +#: sha1-file.c:1837
6503 #, c-format
6504 msgid "deflateEnd on object %s failed (%d)"
6505 msgstr ""
6506
6507 -#: sha1-file.c:1840
6507 +#: sha1-file.c:1841
6508 #, c-format
6509 msgid "confused by unstable object source data for %s"
6510 msgstr ""
6511
6512 -#: sha1-file.c:1850 builtin/pack-objects.c:920
6512 +#: sha1-file.c:1851 builtin/pack-objects.c:925
6513 #, c-format
6514 msgid "failed utime() on %s"
6515 msgstr ""
6516
6517 -#: sha1-file.c:1925
6517 +#: sha1-file.c:1926
6518 #, c-format
6519 msgid "cannot read object for %s"
6520 msgstr ""
6521
6522 -#: sha1-file.c:1965
6522 +#: sha1-file.c:1966
6523 msgid "corrupt commit"
6524 msgstr ""
6525
6526 -#: sha1-file.c:1973
6526 +#: sha1-file.c:1974
6527 msgid "corrupt tag"
6528 msgstr ""
6529
6530 -#: sha1-file.c:2072
6530 +#: sha1-file.c:2073
6531 #, c-format
6532 msgid "read error while indexing %s"
6533 msgstr ""
6534
6535 -#: sha1-file.c:2075
6535 +#: sha1-file.c:2076
6536 #, c-format
6537 msgid "short read while indexing %s"
6538 msgstr ""
6539
6540 -#: sha1-file.c:2148 sha1-file.c:2157
6540 +#: sha1-file.c:2149 sha1-file.c:2158
6541 #, c-format
6542 msgid "%s: failed to insert into database"
6543 msgstr ""
6544
6545 -#: sha1-file.c:2163
6545 +#: sha1-file.c:2164
6546 #, c-format
6547 msgid "%s: unsupported file type"
6548 msgstr ""
6549
6550 -#: sha1-file.c:2187
6550 +#: sha1-file.c:2188
6551 #, c-format
6552 msgid "%s is not a valid object"
6553 msgstr ""
6554
6555 -#: sha1-file.c:2189
6555 +#: sha1-file.c:2190
6556 #, c-format
6557 msgid "%s is not a valid '%s' object"
6558 msgstr ""
6559
6560 -#: sha1-file.c:2216 builtin/index-pack.c:155
6560 +#: sha1-file.c:2217 builtin/index-pack.c:155
6561 #, c-format
6562 msgid "unable to open %s"
6563 msgstr ""
6564
6565 -#: sha1-file.c:2406 sha1-file.c:2458
6565 +#: sha1-file.c:2407 sha1-file.c:2459
6566 #, c-format
6567 msgid "hash mismatch for %s (expected %s)"
6568 msgstr ""
6569
6570 -#: sha1-file.c:2430
6570 +#: sha1-file.c:2431
6571 #, c-format
6572 msgid "unable to mmap %s"
6573 msgstr ""
6574
6575 -#: sha1-file.c:2435
6575 +#: sha1-file.c:2436
6576 #, c-format
6577 msgid "unable to unpack header of %s"
6578 msgstr ""
6579
6580 -#: sha1-file.c:2441
6580 +#: sha1-file.c:2442
6581 #, c-format
6582 msgid "unable to parse header of %s"
6583 msgstr ""
6584
6585 -#: sha1-file.c:2452
6585 +#: sha1-file.c:2453
6586 #, c-format
6587 msgid "unable to unpack contents of %s"
6588 msgstr ""
@@ -8239,7 +8239,7 @@ msgid "allow fall back on 3way merging if needed"
8239 msgstr ""
8240
8241 #: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
8242 -#: builtin/repack.c:307 builtin/stash.c:806
8242 +#: builtin/repack.c:296 builtin/stash.c:806
8243 msgid "be quiet"
8244 msgstr ""
8245
@@ -8284,14 +8284,14 @@ msgstr ""
8284 #: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
8285 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
8286 #: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
8287 -#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
8287 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
8288 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
8289 #: parse-options.h:141 parse-options.h:162 parse-options.h:312
8290 msgid "n"
8291 msgstr ""
8292
8293 #: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
8294 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
8294 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
8295 msgid "format"
8296 msgstr ""
8297
@@ -8765,7 +8765,7 @@ msgstr ""
8765 msgid "Ignore whitespace differences"
8766 msgstr ""
8767
8768 -#: builtin/blame.c:861 builtin/log.c:1646
8768 +#: builtin/blame.c:861 builtin/log.c:1629
8769 msgid "rev"
8770 msgstr ""
8771
@@ -9151,7 +9151,7 @@ msgid "sorting and filtering are case insensitive"
9151 msgstr ""
9152
9153 #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
9154 -#: builtin/verify-tag.c:39
9154 +#: builtin/verify-tag.c:38
9155 msgid "format to use for the output"
9156 msgstr ""
9157
@@ -9785,7 +9785,7 @@ msgstr ""
9785 msgid "perform a 3-way merge with the new branch"
9786 msgstr ""
9787
9788 -#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
9788 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
9789 msgid "style"
9790 msgstr ""
9791
@@ -9938,7 +9938,7 @@ msgid "throw away local modifications"
9938 msgstr ""
9939
9940 #: builtin/checkout.c:1772
9941 -msgid "where the checkout from"
9941 +msgid "which tree-ish to checkout from"
9942 msgstr ""
9943
9944 #: builtin/checkout.c:1774
@@ -10091,7 +10091,7 @@ msgid "remove whole directories"
10091 msgstr ""
10092
10093 #: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
10094 -#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
10094 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
10095 #: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
10096 #: builtin/show-ref.c:179
10097 msgid "pattern"
@@ -10184,7 +10184,7 @@ msgid "use --reference only while cloning"
10184 msgstr ""
10185
10186 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
10187 -#: builtin/pack-objects.c:3308 builtin/repack.c:330
10187 +#: builtin/pack-objects.c:3314 builtin/repack.c:319
10188 msgid "name"
10189 msgstr ""
10190
@@ -10209,7 +10209,7 @@ msgstr ""
10209 msgid "create a shallow clone of that depth"
10210 msgstr ""
10211
10212 -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
10212 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
10213 msgid "time"
10214 msgstr ""
10215
@@ -10383,7 +10383,7 @@ msgstr ""
10383 msgid "repository '%s' does not exist"
10384 msgstr ""
10385
10386 -#: builtin/clone.c:977 builtin/fetch.c:1653
10386 +#: builtin/clone.c:977 builtin/fetch.c:1660
10387 #, c-format
10388 msgid "depth %s is not a positive number"
10389 msgstr ""
@@ -10501,7 +10501,7 @@ msgstr ""
10501 msgid "duplicate parent %s ignored"
10502 msgstr ""
10503
10504 -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
10504 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
10505 #, c-format
10506 msgid "not a valid object name %s"
10507 msgstr ""
@@ -10947,7 +10947,7 @@ msgstr ""
10947 msgid "the commit is authored by me now (used with -C/-c/--amend)"
10948 msgstr ""
10949
10950 -#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
10950 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
10951 #: builtin/pull.c:163 builtin/revert.c:110
10952 msgid "add Signed-off-by:"
10953 msgstr ""
@@ -11063,7 +11063,7 @@ msgstr ""
11063
11064 #: builtin/commit-graph.c:54 builtin/commit-graph.c:100
11065 #: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
11066 -#: builtin/log.c:1601
11066 +#: builtin/log.c:1584
11067 msgid "dir"
11068 msgstr ""
11069
@@ -11786,7 +11786,7 @@ msgstr ""
11786 msgid "Skip output of blob data"
11787 msgstr ""
11788
11789 -#: builtin/fast-export.c:1145 builtin/log.c:1649
11789 +#: builtin/fast-export.c:1145 builtin/log.c:1632
11790 msgid "refspec"
11791 msgstr ""
11792
@@ -11983,145 +11983,137 @@ msgstr ""
11983 msgid "non-fast-forward"
11984 msgstr ""
11985
11986 -#: builtin/fetch.c:879
11987 -#, c-format
11988 -msgid "%s did not send all necessary objects\n"
11986 +#: builtin/fetch.c:854
11987 +msgid ""
11988 +"Fetch normally indicates which branches had a forced update,\n"
11989 +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
11990 +"flag or run 'git config fetch.showForcedUpdates true'."
11991 msgstr ""
11992
11991 -#: builtin/fetch.c:900
11993 +#: builtin/fetch.c:858
11994 #, c-format
11993 -msgid "reject %s because shallow roots are not allowed to be updated"
11995 +msgid ""
11996 +"It took %.2f seconds to check forced updates. You can use\n"
11997 +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
11998 +"false'\n"
11999 +" to avoid this check.\n"
12000 msgstr ""
12001
11996 -#: builtin/fetch.c:991 builtin/fetch.c:1124
12002 +#: builtin/fetch.c:888
12003 #, c-format
11998 -msgid "From %.*s\n"
12004 +msgid "%s did not send all necessary objects\n"
12005 msgstr ""
12006
12001 -#: builtin/fetch.c:1002
12007 +#: builtin/fetch.c:909
12008 #, c-format
12003 -msgid ""
12004 -"some local refs could not be updated; try running\n"
12005 -" 'git remote prune %s' to remove any old, conflicting branches"
12006 -msgstr ""
12007 -
12008 -#: builtin/fetch.c:1008
12009 -msgid ""
12010 -"Fetch normally indicates which branches had a forced update, but that check "
12011 -"has been disabled."
12009 +msgid "reject %s because shallow roots are not allowed to be updated"
12010 msgstr ""
12011
12014 -#: builtin/fetch.c:1009
12015 -msgid ""
12016 -"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
12017 -"showForcedUpdates true'."
12012 +#: builtin/fetch.c:1000 builtin/fetch.c:1131
12013 +#, c-format
12014 +msgid "From %.*s\n"
12015 msgstr ""
12016
12017 #: builtin/fetch.c:1011
12018 #, c-format
12019 msgid ""
12023 -"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
12024 -"updates'\n"
12025 -msgstr ""
12026 -
12027 -#: builtin/fetch.c:1013
12028 -msgid ""
12029 -"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
12020 +"some local refs could not be updated; try running\n"
12021 +" 'git remote prune %s' to remove any old, conflicting branches"
12022 msgstr ""
12023
12032 -#: builtin/fetch.c:1094
12024 +#: builtin/fetch.c:1101
12025 #, c-format
12026 msgid " (%s will become dangling)"
12027 msgstr ""
12028
12037 -#: builtin/fetch.c:1095
12029 +#: builtin/fetch.c:1102
12030 #, c-format
12031 msgid " (%s has become dangling)"
12032 msgstr ""
12033
12042 -#: builtin/fetch.c:1127
12034 +#: builtin/fetch.c:1134
12035 msgid "[deleted]"
12036 msgstr ""
12037
12046 -#: builtin/fetch.c:1128 builtin/remote.c:1036
12038 +#: builtin/fetch.c:1135 builtin/remote.c:1036
12039 msgid "(none)"
12040 msgstr ""
12041
12050 -#: builtin/fetch.c:1151
12042 +#: builtin/fetch.c:1158
12043 #, c-format
12044 msgid "Refusing to fetch into current branch %s of non-bare repository"
12045 msgstr ""
12046
12055 -#: builtin/fetch.c:1170
12047 +#: builtin/fetch.c:1177
12048 #, c-format
12049 msgid "Option \"%s\" value \"%s\" is not valid for %s"
12050 msgstr ""
12051
12060 -#: builtin/fetch.c:1173
12052 +#: builtin/fetch.c:1180
12053 #, c-format
12054 msgid "Option \"%s\" is ignored for %s\n"
12055 msgstr ""
12056
12065 -#: builtin/fetch.c:1477
12057 +#: builtin/fetch.c:1484
12058 #, c-format
12059 msgid "Fetching %s\n"
12060 msgstr ""
12061
12070 -#: builtin/fetch.c:1479 builtin/remote.c:100
12062 +#: builtin/fetch.c:1486 builtin/remote.c:100
12063 #, c-format
12064 msgid "Could not fetch %s"
12065 msgstr ""
12066
12075 -#: builtin/fetch.c:1525
12067 +#: builtin/fetch.c:1532
12068 msgid ""
12069 "--filter can only be used with the remote configured in extensions."
12070 "partialClone"
12071 msgstr ""
12072
12081 -#: builtin/fetch.c:1549
12073 +#: builtin/fetch.c:1556
12074 msgid ""
12075 "No remote repository specified. Please, specify either a URL or a\n"
12076 "remote name from which new revisions should be fetched."
12077 msgstr ""
12078
12087 -#: builtin/fetch.c:1586
12079 +#: builtin/fetch.c:1593
12080 msgid "You need to specify a tag name."
12081 msgstr ""
12082
12091 -#: builtin/fetch.c:1637
12083 +#: builtin/fetch.c:1644
12084 msgid "Negative depth in --deepen is not supported"
12085 msgstr ""
12086
12095 -#: builtin/fetch.c:1639
12087 +#: builtin/fetch.c:1646
12088 msgid "--deepen and --depth are mutually exclusive"
12089 msgstr ""
12090
12099 -#: builtin/fetch.c:1644
12091 +#: builtin/fetch.c:1651
12092 msgid "--depth and --unshallow cannot be used together"
12093 msgstr ""
12094
12103 -#: builtin/fetch.c:1646
12095 +#: builtin/fetch.c:1653
12096 msgid "--unshallow on a complete repository does not make sense"
12097 msgstr ""
12098
12107 -#: builtin/fetch.c:1662
12099 +#: builtin/fetch.c:1669
12100 msgid "fetch --all does not take a repository argument"
12101 msgstr ""
12102
12111 -#: builtin/fetch.c:1664
12103 +#: builtin/fetch.c:1671
12104 msgid "fetch --all does not make sense with refspecs"
12105 msgstr ""
12106
12115 -#: builtin/fetch.c:1673
12107 +#: builtin/fetch.c:1680
12108 #, c-format
12109 msgid "No such remote or remote group: %s"
12110 msgstr ""
12111
12120 -#: builtin/fetch.c:1680
12112 +#: builtin/fetch.c:1687
12113 msgid "Fetching a group and specifying refspecs does not make sense"
12114 msgstr ""
12115
12124 -#: builtin/fetch.c:1696
12116 +#: builtin/fetch.c:1703
12117 msgid ""
12118 "--filter can only be used with the remote configured in extensions."
12119 "partialclone"
@@ -12562,7 +12554,7 @@ msgstr ""
12554 #. grep.threads
12555 #.
12556 #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
12565 -#: builtin/pack-objects.c:2722
12557 +#: builtin/pack-objects.c:2728
12558 #, c-format
12559 msgid "no threads support, ignoring %s"
12560 msgstr ""
@@ -12787,11 +12779,11 @@ msgstr ""
12779 msgid "invalid option combination, ignoring --threads"
12780 msgstr ""
12781
12790 -#: builtin/grep.c:1068 builtin/pack-objects.c:3405
12782 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416
12783 msgid "no threads support, ignoring --threads"
12784 msgstr ""
12785
12794 -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
12786 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
12787 #, c-format
12788 msgid "invalid number of threads specified (%d)"
12789 msgstr ""
@@ -12990,7 +12982,7 @@ msgstr ""
12982 msgid "used more bytes than were available"
12983 msgstr ""
12984
12993 -#: builtin/index-pack.c:288 builtin/pack-objects.c:600
12985 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604
12986 msgid "pack too large for current definition of off_t"
12987 msgstr ""
12988
@@ -13056,8 +13048,8 @@ msgstr ""
13048 msgid "SHA1 COLLISION FOUND WITH %s !"
13049 msgstr ""
13050
13059 -#: builtin/index-pack.c:738 builtin/pack-objects.c:153
13060 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
13051 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157
13052 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
13053 #, c-format
13054 msgid "unable to read %s"
13055 msgstr ""
@@ -13118,7 +13110,7 @@ msgstr ""
13110 msgid "Resolving deltas"
13111 msgstr ""
13112
13121 -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
13113 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
13114 #, c-format
13115 msgid "unable to create thread: %s"
13116 msgstr ""
@@ -13183,7 +13175,7 @@ msgstr ""
13175 msgid "cannot store index file"
13176 msgstr ""
13177
13186 -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
13178 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
13179 #, c-format
13180 msgid "bad pack.indexversion=%<PRIu32>"
13181 msgstr ""
@@ -13424,387 +13416,375 @@ msgstr ""
13416 msgid "invalid --decorate option: %s"
13417 msgstr ""
13418
13427 -#: builtin/log.c:160
13428 -msgid ""
13429 -"log.mailmap is not set; its implicit value will change in an\n"
13430 -"upcoming release. To squelch this message and preserve current\n"
13431 -"behaviour, set the log.mailmap configuration value to false.\n"
13432 -"\n"
13433 -"To squelch this message and adopt the new behaviour now, set the\n"
13434 -"log.mailmap configuration value to true.\n"
13435 -"\n"
13436 -"See 'git help config' and search for 'log.mailmap' for further information."
13437 -msgstr ""
13438 -
13439 -#: builtin/log.c:183
13419 +#: builtin/log.c:173
13420 msgid "show source"
13421 msgstr ""
13422
13443 -#: builtin/log.c:184
13423 +#: builtin/log.c:174
13424 msgid "Use mail map file"
13425 msgstr ""
13426
13447 -#: builtin/log.c:186
13427 +#: builtin/log.c:176
13428 msgid "only decorate refs that match <pattern>"
13429 msgstr ""
13430
13451 -#: builtin/log.c:188
13431 +#: builtin/log.c:178
13432 msgid "do not decorate refs that match <pattern>"
13433 msgstr ""
13434
13455 -#: builtin/log.c:189
13435 +#: builtin/log.c:179
13436 msgid "decorate options"
13437 msgstr ""
13438
13459 -#: builtin/log.c:192
13439 +#: builtin/log.c:182
13440 msgid "Process line range n,m in file, counting from 1"
13441 msgstr ""
13442
13463 -#: builtin/log.c:297
13443 +#: builtin/log.c:280
13444 #, c-format
13445 msgid "Final output: %d %s\n"
13446 msgstr ""
13447
13468 -#: builtin/log.c:551
13448 +#: builtin/log.c:534
13449 #, c-format
13450 msgid "git show %s: bad file"
13451 msgstr ""
13452
13473 -#: builtin/log.c:566 builtin/log.c:660
13453 +#: builtin/log.c:549 builtin/log.c:643
13454 #, c-format
13455 msgid "could not read object %s"
13456 msgstr ""
13457
13478 -#: builtin/log.c:685
13458 +#: builtin/log.c:668
13459 #, c-format
13460 msgid "unknown type: %d"
13461 msgstr ""
13462
13483 -#: builtin/log.c:808
13463 +#: builtin/log.c:791
13464 msgid "format.headers without value"
13465 msgstr ""
13466
13487 -#: builtin/log.c:925
13467 +#: builtin/log.c:908
13468 msgid "name of output directory is too long"
13469 msgstr ""
13470
13491 -#: builtin/log.c:941
13471 +#: builtin/log.c:924
13472 #, c-format
13473 msgid "cannot open patch file %s"
13474 msgstr ""
13475
13496 -#: builtin/log.c:958
13476 +#: builtin/log.c:941
13477 msgid "need exactly one range"
13478 msgstr ""
13479
13500 -#: builtin/log.c:968
13480 +#: builtin/log.c:951
13481 msgid "not a range"
13482 msgstr ""
13483
13504 -#: builtin/log.c:1091
13484 +#: builtin/log.c:1074
13485 msgid "cover letter needs email format"
13486 msgstr ""
13487
13508 -#: builtin/log.c:1097
13488 +#: builtin/log.c:1080
13489 msgid "failed to create cover-letter file"
13490 msgstr ""
13491
13512 -#: builtin/log.c:1176
13492 +#: builtin/log.c:1159
13493 #, c-format
13494 msgid "insane in-reply-to: %s"
13495 msgstr ""
13496
13517 -#: builtin/log.c:1203
13497 +#: builtin/log.c:1186
13498 msgid "git format-patch [<options>] [<since> | <revision-range>]"
13499 msgstr ""
13500
13521 -#: builtin/log.c:1261
13501 +#: builtin/log.c:1244
13502 msgid "two output directories?"
13503 msgstr ""
13504
13525 -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
13505 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
13506 #, c-format
13507 msgid "unknown commit %s"
13508 msgstr ""
13509
13530 -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
13510 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
13511 #: builtin/replace.c:210
13512 #, c-format
13513 msgid "failed to resolve '%s' as a valid ref"
13514 msgstr ""
13515
13536 -#: builtin/log.c:1387
13516 +#: builtin/log.c:1370
13517 msgid "could not find exact merge base"
13518 msgstr ""
13519
13540 -#: builtin/log.c:1391
13520 +#: builtin/log.c:1374
13521 msgid ""
13522 "failed to get upstream, if you want to record base commit automatically,\n"
13523 "please use git branch --set-upstream-to to track a remote branch.\n"
13524 "Or you could specify base commit by --base=<base-commit-id> manually"
13525 msgstr ""
13526
13547 -#: builtin/log.c:1411
13527 +#: builtin/log.c:1394
13528 msgid "failed to find exact merge base"
13529 msgstr ""
13530
13551 -#: builtin/log.c:1422
13531 +#: builtin/log.c:1405
13532 msgid "base commit should be the ancestor of revision list"
13533 msgstr ""
13534
13555 -#: builtin/log.c:1426
13535 +#: builtin/log.c:1409
13536 msgid "base commit shouldn't be in revision list"
13537 msgstr ""
13538
13559 -#: builtin/log.c:1479
13539 +#: builtin/log.c:1462
13540 msgid "cannot get patch id"
13541 msgstr ""
13542
13563 -#: builtin/log.c:1531
13543 +#: builtin/log.c:1514
13544 msgid "failed to infer range-diff ranges"
13545 msgstr ""
13546
13567 -#: builtin/log.c:1576
13547 +#: builtin/log.c:1559
13548 msgid "use [PATCH n/m] even with a single patch"
13549 msgstr ""
13550
13571 -#: builtin/log.c:1579
13551 +#: builtin/log.c:1562
13552 msgid "use [PATCH] even with multiple patches"
13553 msgstr ""
13554
13575 -#: builtin/log.c:1583
13555 +#: builtin/log.c:1566
13556 msgid "print patches to standard out"
13557 msgstr ""
13558
13579 -#: builtin/log.c:1585
13559 +#: builtin/log.c:1568
13560 msgid "generate a cover letter"
13561 msgstr ""
13562
13583 -#: builtin/log.c:1587
13563 +#: builtin/log.c:1570
13564 msgid "use simple number sequence for output file names"
13565 msgstr ""
13566
13587 -#: builtin/log.c:1588
13567 +#: builtin/log.c:1571
13568 msgid "sfx"
13569 msgstr ""
13570
13591 -#: builtin/log.c:1589
13571 +#: builtin/log.c:1572
13572 msgid "use <sfx> instead of '.patch'"
13573 msgstr ""
13574
13595 -#: builtin/log.c:1591
13575 +#: builtin/log.c:1574
13576 msgid "start numbering patches at <n> instead of 1"
13577 msgstr ""
13578
13599 -#: builtin/log.c:1593
13579 +#: builtin/log.c:1576
13580 msgid "mark the series as Nth re-roll"
13581 msgstr ""
13582
13603 -#: builtin/log.c:1595
13583 +#: builtin/log.c:1578
13584 msgid "Use [RFC PATCH] instead of [PATCH]"
13585 msgstr ""
13586
13607 -#: builtin/log.c:1598
13587 +#: builtin/log.c:1581
13588 msgid "Use [<prefix>] instead of [PATCH]"
13589 msgstr ""
13590
13611 -#: builtin/log.c:1601
13591 +#: builtin/log.c:1584
13592 msgid "store resulting files in <dir>"
13593 msgstr ""
13594
13615 -#: builtin/log.c:1604
13595 +#: builtin/log.c:1587
13596 msgid "don't strip/add [PATCH]"
13597 msgstr ""
13598
13619 -#: builtin/log.c:1607
13599 +#: builtin/log.c:1590
13600 msgid "don't output binary diffs"
13601 msgstr ""
13602
13623 -#: builtin/log.c:1609
13603 +#: builtin/log.c:1592
13604 msgid "output all-zero hash in From header"
13605 msgstr ""
13606
13627 -#: builtin/log.c:1611
13607 +#: builtin/log.c:1594
13608 msgid "don't include a patch matching a commit upstream"
13609 msgstr ""
13610
13631 -#: builtin/log.c:1613
13611 +#: builtin/log.c:1596
13612 msgid "show patch format instead of default (patch + stat)"
13613 msgstr ""
13614
13635 -#: builtin/log.c:1615
13615 +#: builtin/log.c:1598
13616 msgid "Messaging"
13617 msgstr ""
13618
13639 -#: builtin/log.c:1616
13619 +#: builtin/log.c:1599
13620 msgid "header"
13621 msgstr ""
13622
13643 -#: builtin/log.c:1617
13623 +#: builtin/log.c:1600
13624 msgid "add email header"
13625 msgstr ""
13626
13647 -#: builtin/log.c:1618 builtin/log.c:1620
13627 +#: builtin/log.c:1601 builtin/log.c:1603
13628 msgid "email"
13629 msgstr ""
13630
13651 -#: builtin/log.c:1618
13631 +#: builtin/log.c:1601
13632 msgid "add To: header"
13633 msgstr ""
13634
13655 -#: builtin/log.c:1620
13635 +#: builtin/log.c:1603
13636 msgid "add Cc: header"
13637 msgstr ""
13638
13659 -#: builtin/log.c:1622
13639 +#: builtin/log.c:1605
13640 msgid "ident"
13641 msgstr ""
13642
13663 -#: builtin/log.c:1623
13643 +#: builtin/log.c:1606
13644 msgid "set From address to <ident> (or committer ident if absent)"
13645 msgstr ""
13646
13667 -#: builtin/log.c:1625
13647 +#: builtin/log.c:1608
13648 msgid "message-id"
13649 msgstr ""
13650
13671 -#: builtin/log.c:1626
13651 +#: builtin/log.c:1609
13652 msgid "make first mail a reply to <message-id>"
13653 msgstr ""
13654
13675 -#: builtin/log.c:1627 builtin/log.c:1630
13655 +#: builtin/log.c:1610 builtin/log.c:1613
13656 msgid "boundary"
13657 msgstr ""
13658
13679 -#: builtin/log.c:1628
13659 +#: builtin/log.c:1611
13660 msgid "attach the patch"
13661 msgstr ""
13662
13683 -#: builtin/log.c:1631
13663 +#: builtin/log.c:1614
13664 msgid "inline the patch"
13665 msgstr ""
13666
13687 -#: builtin/log.c:1635
13667 +#: builtin/log.c:1618
13668 msgid "enable message threading, styles: shallow, deep"
13669 msgstr ""
13670
13691 -#: builtin/log.c:1637
13671 +#: builtin/log.c:1620
13672 msgid "signature"
13673 msgstr ""
13674
13695 -#: builtin/log.c:1638
13675 +#: builtin/log.c:1621
13676 msgid "add a signature"
13677 msgstr ""
13678
13699 -#: builtin/log.c:1639
13679 +#: builtin/log.c:1622
13680 msgid "base-commit"
13681 msgstr ""
13682
13703 -#: builtin/log.c:1640
13683 +#: builtin/log.c:1623
13684 msgid "add prerequisite tree info to the patch series"
13685 msgstr ""
13686
13707 -#: builtin/log.c:1642
13687 +#: builtin/log.c:1625
13688 msgid "add a signature from a file"
13689 msgstr ""
13690
13711 -#: builtin/log.c:1643
13691 +#: builtin/log.c:1626
13692 msgid "don't print the patch filenames"
13693 msgstr ""
13694
13715 -#: builtin/log.c:1645
13695 +#: builtin/log.c:1628
13696 msgid "show progress while generating patches"
13697 msgstr ""
13698
13719 -#: builtin/log.c:1647
13699 +#: builtin/log.c:1630
13700 msgid "show changes against <rev> in cover letter or single patch"
13701 msgstr ""
13702
13723 -#: builtin/log.c:1650
13703 +#: builtin/log.c:1633
13704 msgid "show changes against <refspec> in cover letter or single patch"
13705 msgstr ""
13706
13727 -#: builtin/log.c:1652
13707 +#: builtin/log.c:1635
13708 msgid "percentage by which creation is weighted"
13709 msgstr ""
13710
13731 -#: builtin/log.c:1727
13711 +#: builtin/log.c:1710
13712 #, c-format
13713 msgid "invalid ident line: %s"
13714 msgstr ""
13715
13736 -#: builtin/log.c:1742
13716 +#: builtin/log.c:1725
13717 msgid "-n and -k are mutually exclusive"
13718 msgstr ""
13719
13740 -#: builtin/log.c:1744
13720 +#: builtin/log.c:1727
13721 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
13722 msgstr ""
13723
13744 -#: builtin/log.c:1752
13724 +#: builtin/log.c:1735
13725 msgid "--name-only does not make sense"
13726 msgstr ""
13727
13748 -#: builtin/log.c:1754
13728 +#: builtin/log.c:1737
13729 msgid "--name-status does not make sense"
13730 msgstr ""
13731
13752 -#: builtin/log.c:1756
13732 +#: builtin/log.c:1739
13733 msgid "--check does not make sense"
13734 msgstr ""
13735
13756 -#: builtin/log.c:1788
13736 +#: builtin/log.c:1771
13737 msgid "standard output, or directory, which one?"
13738 msgstr ""
13739
13760 -#: builtin/log.c:1877
13740 +#: builtin/log.c:1860
13741 msgid "--interdiff requires --cover-letter or single patch"
13742 msgstr ""
13743
13764 -#: builtin/log.c:1881
13744 +#: builtin/log.c:1864
13745 msgid "Interdiff:"
13746 msgstr ""
13747
13768 -#: builtin/log.c:1882
13748 +#: builtin/log.c:1865
13749 #, c-format
13750 msgid "Interdiff against v%d:"
13751 msgstr ""
13752
13773 -#: builtin/log.c:1888
13753 +#: builtin/log.c:1871
13754 msgid "--creation-factor requires --range-diff"
13755 msgstr ""
13756
13777 -#: builtin/log.c:1892
13757 +#: builtin/log.c:1875
13758 msgid "--range-diff requires --cover-letter or single patch"
13759 msgstr ""
13760
13781 -#: builtin/log.c:1900
13761 +#: builtin/log.c:1883
13762 msgid "Range-diff:"
13763 msgstr ""
13764
13785 -#: builtin/log.c:1901
13765 +#: builtin/log.c:1884
13766 #, c-format
13767 msgid "Range-diff against v%d:"
13768 msgstr ""
13769
13790 -#: builtin/log.c:1912
13770 +#: builtin/log.c:1895
13771 #, c-format
13772 msgid "unable to read signature file '%s'"
13773 msgstr ""
13774
13795 -#: builtin/log.c:1948
13775 +#: builtin/log.c:1931
13776 msgid "Generating patches"
13777 msgstr ""
13778
13799 -#: builtin/log.c:1992
13779 +#: builtin/log.c:1975
13780 msgid "failed to create output files"
13781 msgstr ""
13782
13803 -#: builtin/log.c:2051
13783 +#: builtin/log.c:2034
13784 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
13785 msgstr ""
13786
13807 -#: builtin/log.c:2105
13787 +#: builtin/log.c:2088
13788 #, c-format
13789 msgid ""
13790 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14610,7 +14590,7 @@ msgstr ""
14590 msgid "Renaming %s to %s\n"
14591 msgstr ""
14592
14613 -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
14593 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
14594 #, c-format
14595 msgid "renaming '%s' failed"
14596 msgstr ""
@@ -15065,369 +15045,373 @@ msgid ""
15045 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
15046 msgstr ""
15047
15068 -#: builtin/pack-objects.c:424
15048 +#: builtin/pack-objects.c:428
15049 #, c-format
15050 msgid "bad packed object CRC for %s"
15051 msgstr ""
15052
15073 -#: builtin/pack-objects.c:435
15053 +#: builtin/pack-objects.c:439
15054 #, c-format
15055 msgid "corrupt packed object for %s"
15056 msgstr ""
15057
15078 -#: builtin/pack-objects.c:566
15058 +#: builtin/pack-objects.c:570
15059 #, c-format
15060 msgid "recursive delta detected for object %s"
15061 msgstr ""
15062
15083 -#: builtin/pack-objects.c:777
15063 +#: builtin/pack-objects.c:781
15064 #, c-format
15065 msgid "ordered %u objects, expected %<PRIu32>"
15066 msgstr ""
15067
15088 -#: builtin/pack-objects.c:790
15068 +#: builtin/pack-objects.c:794
15069 #, c-format
15070 msgid "packfile is invalid: %s"
15071 msgstr ""
15072
15093 -#: builtin/pack-objects.c:794
15073 +#: builtin/pack-objects.c:798
15074 #, c-format
15075 msgid "unable to open packfile for reuse: %s"
15076 msgstr ""
15077
15098 -#: builtin/pack-objects.c:798
15078 +#: builtin/pack-objects.c:802
15079 msgid "unable to seek in reused packfile"
15080 msgstr ""
15081
15102 -#: builtin/pack-objects.c:809
15082 +#: builtin/pack-objects.c:813
15083 msgid "unable to read from reused packfile"
15084 msgstr ""
15085
15106 -#: builtin/pack-objects.c:837
15086 +#: builtin/pack-objects.c:841
15087 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
15088 msgstr ""
15089
15110 -#: builtin/pack-objects.c:850
15090 +#: builtin/pack-objects.c:854
15091 msgid "Writing objects"
15092 msgstr ""
15093
15114 -#: builtin/pack-objects.c:912 builtin/update-index.c:89
15094 +#: builtin/pack-objects.c:917 builtin/update-index.c:89
15095 #, c-format
15096 msgid "failed to stat %s"
15097 msgstr ""
15098
15119 -#: builtin/pack-objects.c:965
15099 +#: builtin/pack-objects.c:970
15100 #, c-format
15101 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
15102 msgstr ""
15103
15124 -#: builtin/pack-objects.c:1161
15104 +#: builtin/pack-objects.c:1166
15105 msgid "disabling bitmap writing, as some objects are not being packed"
15106 msgstr ""
15107
15128 -#: builtin/pack-objects.c:1591
15108 +#: builtin/pack-objects.c:1597
15109 #, c-format
15110 msgid "delta base offset overflow in pack for %s"
15111 msgstr ""
15112
15133 -#: builtin/pack-objects.c:1600
15113 +#: builtin/pack-objects.c:1606
15114 #, c-format
15115 msgid "delta base offset out of bound for %s"
15116 msgstr ""
15117
15138 -#: builtin/pack-objects.c:1869
15118 +#: builtin/pack-objects.c:1875
15119 msgid "Counting objects"
15120 msgstr ""
15121
15142 -#: builtin/pack-objects.c:1999
15122 +#: builtin/pack-objects.c:2005
15123 #, c-format
15124 msgid "unable to get size of %s"
15125 msgstr ""
15126
15147 -#: builtin/pack-objects.c:2014
15127 +#: builtin/pack-objects.c:2020
15128 #, c-format
15129 msgid "unable to parse object header of %s"
15130 msgstr ""
15131
15152 -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
15153 -#: builtin/pack-objects.c:2110
15132 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
15133 +#: builtin/pack-objects.c:2116
15134 #, c-format
15135 msgid "object %s cannot be read"
15136 msgstr ""
15137
15158 -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
15138 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
15139 #, c-format
15140 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
15141 msgstr ""
15142
15163 -#: builtin/pack-objects.c:2124
15143 +#: builtin/pack-objects.c:2130
15144 msgid "suboptimal pack - out of memory"
15145 msgstr ""
15146
15167 -#: builtin/pack-objects.c:2450
15147 +#: builtin/pack-objects.c:2456
15148 #, c-format
15149 msgid "Delta compression using up to %d threads"
15150 msgstr ""
15151
15172 -#: builtin/pack-objects.c:2582
15152 +#: builtin/pack-objects.c:2588
15153 #, c-format
15154 msgid "unable to pack objects reachable from tag %s"
15155 msgstr ""
15156
15177 -#: builtin/pack-objects.c:2669
15157 +#: builtin/pack-objects.c:2675
15158 msgid "Compressing objects"
15159 msgstr ""
15160
15181 -#: builtin/pack-objects.c:2675
15161 +#: builtin/pack-objects.c:2681
15162 msgid "inconsistency with delta count"
15163 msgstr ""
15164
15185 -#: builtin/pack-objects.c:2756
15165 +#: builtin/pack-objects.c:2762
15166 #, c-format
15167 msgid ""
15168 "expected edge object ID, got garbage:\n"
15169 " %s"
15170 msgstr ""
15171
15192 -#: builtin/pack-objects.c:2762
15172 +#: builtin/pack-objects.c:2768
15173 #, c-format
15174 msgid ""
15175 "expected object ID, got garbage:\n"
15176 " %s"
15177 msgstr ""
15178
15199 -#: builtin/pack-objects.c:2860
15179 +#: builtin/pack-objects.c:2866
15180 msgid "invalid value for --missing"
15181 msgstr ""
15182
15203 -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
15183 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
15184 msgid "cannot open pack index"
15185 msgstr ""
15186
15207 -#: builtin/pack-objects.c:2950
15187 +#: builtin/pack-objects.c:2956
15188 #, c-format
15189 msgid "loose object at %s could not be examined"
15190 msgstr ""
15191
15212 -#: builtin/pack-objects.c:3035
15192 +#: builtin/pack-objects.c:3041
15193 msgid "unable to force loose object"
15194 msgstr ""
15195
15216 -#: builtin/pack-objects.c:3127
15196 +#: builtin/pack-objects.c:3133
15197 #, c-format
15198 msgid "not a rev '%s'"
15199 msgstr ""
15200
15221 -#: builtin/pack-objects.c:3130
15201 +#: builtin/pack-objects.c:3136
15202 #, c-format
15203 msgid "bad revision '%s'"
15204 msgstr ""
15205
15226 -#: builtin/pack-objects.c:3155
15206 +#: builtin/pack-objects.c:3161
15207 msgid "unable to add recent objects"
15208 msgstr ""
15209
15230 -#: builtin/pack-objects.c:3208
15210 +#: builtin/pack-objects.c:3214
15211 #, c-format
15212 msgid "unsupported index version %s"
15213 msgstr ""
15214
15235 -#: builtin/pack-objects.c:3212
15215 +#: builtin/pack-objects.c:3218
15216 #, c-format
15217 msgid "bad index version '%s'"
15218 msgstr ""
15219
15240 -#: builtin/pack-objects.c:3242
15220 +#: builtin/pack-objects.c:3248
15221 msgid "do not show progress meter"
15222 msgstr ""
15223
15244 -#: builtin/pack-objects.c:3244
15224 +#: builtin/pack-objects.c:3250
15225 msgid "show progress meter"
15226 msgstr ""
15227
15248 -#: builtin/pack-objects.c:3246
15228 +#: builtin/pack-objects.c:3252
15229 msgid "show progress meter during object writing phase"
15230 msgstr ""
15231
15252 -#: builtin/pack-objects.c:3249
15232 +#: builtin/pack-objects.c:3255
15233 msgid "similar to --all-progress when progress meter is shown"
15234 msgstr ""
15235
15256 -#: builtin/pack-objects.c:3250
15236 +#: builtin/pack-objects.c:3256
15237 msgid "<version>[,<offset>]"
15238 msgstr ""
15239
15260 -#: builtin/pack-objects.c:3251
15240 +#: builtin/pack-objects.c:3257
15241 msgid "write the pack index file in the specified idx format version"
15242 msgstr ""
15243
15264 -#: builtin/pack-objects.c:3254
15244 +#: builtin/pack-objects.c:3260
15245 msgid "maximum size of each output pack file"
15246 msgstr ""
15247
15268 -#: builtin/pack-objects.c:3256
15248 +#: builtin/pack-objects.c:3262
15249 msgid "ignore borrowed objects from alternate object store"
15250 msgstr ""
15251
15272 -#: builtin/pack-objects.c:3258
15252 +#: builtin/pack-objects.c:3264
15253 msgid "ignore packed objects"
15254 msgstr ""
15255
15276 -#: builtin/pack-objects.c:3260
15256 +#: builtin/pack-objects.c:3266
15257 msgid "limit pack window by objects"
15258 msgstr ""
15259
15280 -#: builtin/pack-objects.c:3262
15260 +#: builtin/pack-objects.c:3268
15261 msgid "limit pack window by memory in addition to object limit"
15262 msgstr ""
15263
15284 -#: builtin/pack-objects.c:3264
15264 +#: builtin/pack-objects.c:3270
15265 msgid "maximum length of delta chain allowed in the resulting pack"
15266 msgstr ""
15267
15288 -#: builtin/pack-objects.c:3266
15268 +#: builtin/pack-objects.c:3272
15269 msgid "reuse existing deltas"
15270 msgstr ""
15271
15292 -#: builtin/pack-objects.c:3268
15272 +#: builtin/pack-objects.c:3274
15273 msgid "reuse existing objects"
15274 msgstr ""
15275
15296 -#: builtin/pack-objects.c:3270
15276 +#: builtin/pack-objects.c:3276
15277 msgid "use OFS_DELTA objects"
15278 msgstr ""
15279
15300 -#: builtin/pack-objects.c:3272
15280 +#: builtin/pack-objects.c:3278
15281 msgid "use threads when searching for best delta matches"
15282 msgstr ""
15283
15304 -#: builtin/pack-objects.c:3274
15284 +#: builtin/pack-objects.c:3280
15285 msgid "do not create an empty pack output"
15286 msgstr ""
15287
15308 -#: builtin/pack-objects.c:3276
15288 +#: builtin/pack-objects.c:3282
15289 msgid "read revision arguments from standard input"
15290 msgstr ""
15291
15312 -#: builtin/pack-objects.c:3278
15292 +#: builtin/pack-objects.c:3284
15293 msgid "limit the objects to those that are not yet packed"
15294 msgstr ""
15295
15316 -#: builtin/pack-objects.c:3281
15296 +#: builtin/pack-objects.c:3287
15297 msgid "include objects reachable from any reference"
15298 msgstr ""
15299
15320 -#: builtin/pack-objects.c:3284
15300 +#: builtin/pack-objects.c:3290
15301 msgid "include objects referred by reflog entries"
15302 msgstr ""
15303
15324 -#: builtin/pack-objects.c:3287
15304 +#: builtin/pack-objects.c:3293
15305 msgid "include objects referred to by the index"
15306 msgstr ""
15307
15328 -#: builtin/pack-objects.c:3290
15308 +#: builtin/pack-objects.c:3296
15309 msgid "output pack to stdout"
15310 msgstr ""
15311
15332 -#: builtin/pack-objects.c:3292
15312 +#: builtin/pack-objects.c:3298
15313 msgid "include tag objects that refer to objects to be packed"
15314 msgstr ""
15315
15336 -#: builtin/pack-objects.c:3294
15316 +#: builtin/pack-objects.c:3300
15317 msgid "keep unreachable objects"
15318 msgstr ""
15319
15340 -#: builtin/pack-objects.c:3296
15320 +#: builtin/pack-objects.c:3302
15321 msgid "pack loose unreachable objects"
15322 msgstr ""
15323
15344 -#: builtin/pack-objects.c:3298
15324 +#: builtin/pack-objects.c:3304
15325 msgid "unpack unreachable objects newer than <time>"
15326 msgstr ""
15327
15348 -#: builtin/pack-objects.c:3301
15328 +#: builtin/pack-objects.c:3307
15329 msgid "use the sparse reachability algorithm"
15330 msgstr ""
15331
15352 -#: builtin/pack-objects.c:3303
15332 +#: builtin/pack-objects.c:3309
15333 msgid "create thin packs"
15334 msgstr ""
15335
15356 -#: builtin/pack-objects.c:3305
15336 +#: builtin/pack-objects.c:3311
15337 msgid "create packs suitable for shallow fetches"
15338 msgstr ""
15339
15360 -#: builtin/pack-objects.c:3307
15340 +#: builtin/pack-objects.c:3313
15341 msgid "ignore packs that have companion .keep file"
15342 msgstr ""
15343
15364 -#: builtin/pack-objects.c:3309
15344 +#: builtin/pack-objects.c:3315
15345 msgid "ignore this pack"
15346 msgstr ""
15347
15368 -#: builtin/pack-objects.c:3311
15348 +#: builtin/pack-objects.c:3317
15349 msgid "pack compression level"
15350 msgstr ""
15351
15372 -#: builtin/pack-objects.c:3313
15352 +#: builtin/pack-objects.c:3319
15353 msgid "do not hide commits by grafts"
15354 msgstr ""
15355
15376 -#: builtin/pack-objects.c:3315
15356 +#: builtin/pack-objects.c:3321
15357 msgid "use a bitmap index if available to speed up counting objects"
15358 msgstr ""
15359
15380 -#: builtin/pack-objects.c:3317
15360 +#: builtin/pack-objects.c:3323
15361 msgid "write a bitmap index together with the pack index"
15362 msgstr ""
15363
15384 -#: builtin/pack-objects.c:3320
15364 +#: builtin/pack-objects.c:3327
15365 +msgid "write a bitmap index if possible"
15366 +msgstr ""
15367 +
15368 +#: builtin/pack-objects.c:3331
15369 msgid "handling for missing objects"
15370 msgstr ""
15371
15388 -#: builtin/pack-objects.c:3323
15372 +#: builtin/pack-objects.c:3334
15373 msgid "do not pack objects in promisor packfiles"
15374 msgstr ""
15375
15392 -#: builtin/pack-objects.c:3325
15376 +#: builtin/pack-objects.c:3336
15377 msgid "respect islands during delta compression"
15378 msgstr ""
15379
15396 -#: builtin/pack-objects.c:3350
15380 +#: builtin/pack-objects.c:3361
15381 #, c-format
15382 msgid "delta chain depth %d is too deep, forcing %d"
15383 msgstr ""
15384
15401 -#: builtin/pack-objects.c:3355
15385 +#: builtin/pack-objects.c:3366
15386 #, c-format
15387 msgid "pack.deltaCacheLimit is too high, forcing %d"
15388 msgstr ""
15389
15406 -#: builtin/pack-objects.c:3409
15390 +#: builtin/pack-objects.c:3420
15391 msgid "--max-pack-size cannot be used to build a pack for transfer"
15392 msgstr ""
15393
15410 -#: builtin/pack-objects.c:3411
15394 +#: builtin/pack-objects.c:3422
15395 msgid "minimum pack size limit is 1 MiB"
15396 msgstr ""
15397
15414 -#: builtin/pack-objects.c:3416
15398 +#: builtin/pack-objects.c:3427
15399 msgid "--thin cannot be used to build an indexable pack"
15400 msgstr ""
15401
15418 -#: builtin/pack-objects.c:3419
15402 +#: builtin/pack-objects.c:3430
15403 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
15404 msgstr ""
15405
15422 -#: builtin/pack-objects.c:3425
15406 +#: builtin/pack-objects.c:3436
15407 msgid "cannot use --filter without --stdout"
15408 msgstr ""
15409
15426 -#: builtin/pack-objects.c:3486
15410 +#: builtin/pack-objects.c:3497
15411 msgid "Enumerating objects"
15412 msgstr ""
15413
15430 -#: builtin/pack-objects.c:3516
15414 +#: builtin/pack-objects.c:3527
15415 #, c-format
15416 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
15417 msgstr ""
@@ -17184,111 +17168,111 @@ msgid ""
17168 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
17169 msgstr ""
17170
17187 -#: builtin/repack.c:201
17171 +#: builtin/repack.c:190
17172 msgid "could not start pack-objects to repack promisor objects"
17173 msgstr ""
17174
17191 -#: builtin/repack.c:240 builtin/repack.c:418
17175 +#: builtin/repack.c:229 builtin/repack.c:408
17176 msgid "repack: Expecting full hex object ID lines only from pack-objects."
17177 msgstr ""
17178
17195 -#: builtin/repack.c:257
17179 +#: builtin/repack.c:246
17180 msgid "could not finish pack-objects to repack promisor objects"
17181 msgstr ""
17182
17199 -#: builtin/repack.c:295
17183 +#: builtin/repack.c:284
17184 msgid "pack everything in a single pack"
17185 msgstr ""
17186
17203 -#: builtin/repack.c:297
17187 +#: builtin/repack.c:286
17188 msgid "same as -a, and turn unreachable objects loose"
17189 msgstr ""
17190
17207 -#: builtin/repack.c:300
17191 +#: builtin/repack.c:289
17192 msgid "remove redundant packs, and run git-prune-packed"
17193 msgstr ""
17194
17211 -#: builtin/repack.c:302
17195 +#: builtin/repack.c:291
17196 msgid "pass --no-reuse-delta to git-pack-objects"
17197 msgstr ""
17198
17215 -#: builtin/repack.c:304
17199 +#: builtin/repack.c:293
17200 msgid "pass --no-reuse-object to git-pack-objects"
17201 msgstr ""
17202
17219 -#: builtin/repack.c:306
17203 +#: builtin/repack.c:295
17204 msgid "do not run git-update-server-info"
17205 msgstr ""
17206
17223 -#: builtin/repack.c:309
17207 +#: builtin/repack.c:298
17208 msgid "pass --local to git-pack-objects"
17209 msgstr ""
17210
17227 -#: builtin/repack.c:311
17211 +#: builtin/repack.c:300
17212 msgid "write bitmap index"
17213 msgstr ""
17214
17231 -#: builtin/repack.c:313
17215 +#: builtin/repack.c:302
17216 msgid "pass --delta-islands to git-pack-objects"
17217 msgstr ""
17218
17235 -#: builtin/repack.c:314
17219 +#: builtin/repack.c:303
17220 msgid "approxidate"
17221 msgstr ""
17222
17239 -#: builtin/repack.c:315
17223 +#: builtin/repack.c:304
17224 msgid "with -A, do not loosen objects older than this"
17225 msgstr ""
17226
17243 -#: builtin/repack.c:317
17227 +#: builtin/repack.c:306
17228 msgid "with -a, repack unreachable objects"
17229 msgstr ""
17230
17247 -#: builtin/repack.c:319
17231 +#: builtin/repack.c:308
17232 msgid "size of the window used for delta compression"
17233 msgstr ""
17234
17251 -#: builtin/repack.c:320 builtin/repack.c:326
17235 +#: builtin/repack.c:309 builtin/repack.c:315
17236 msgid "bytes"
17237 msgstr ""
17238
17255 -#: builtin/repack.c:321
17239 +#: builtin/repack.c:310
17240 msgid "same as the above, but limit memory size instead of entries count"
17241 msgstr ""
17242
17259 -#: builtin/repack.c:323
17243 +#: builtin/repack.c:312
17244 msgid "limits the maximum delta depth"
17245 msgstr ""
17246
17263 -#: builtin/repack.c:325
17247 +#: builtin/repack.c:314
17248 msgid "limits the maximum number of threads"
17249 msgstr ""
17250
17267 -#: builtin/repack.c:327
17251 +#: builtin/repack.c:316
17252 msgid "maximum size of each packfile"
17253 msgstr ""
17254
17271 -#: builtin/repack.c:329
17255 +#: builtin/repack.c:318
17256 msgid "repack objects in packs marked with .keep"
17257 msgstr ""
17258
17275 -#: builtin/repack.c:331
17259 +#: builtin/repack.c:320
17260 msgid "do not repack this pack"
17261 msgstr ""
17262
17279 -#: builtin/repack.c:341
17263 +#: builtin/repack.c:330
17264 msgid "cannot delete packs in a precious-objects repo"
17265 msgstr ""
17266
17283 -#: builtin/repack.c:345
17267 +#: builtin/repack.c:334
17268 msgid "--keep-unreachable and -A are incompatible"
17269 msgstr ""
17270
17287 -#: builtin/repack.c:427
17271 +#: builtin/repack.c:417
17272 msgid "Nothing new to pack."
17273 msgstr ""
17274
17291 -#: builtin/repack.c:488
17275 +#: builtin/repack.c:478
17276 #, c-format
17277 msgid ""
17278 "WARNING: Some packs in use have been renamed by\n"
@@ -17300,7 +17284,7 @@ msgid ""
17284 "WARNING: Please rename them in %s manually:\n"
17285 msgstr ""
17286
17303 -#: builtin/repack.c:536
17287 +#: builtin/repack.c:526
17288 #, c-format
17289 msgid "failed to remove '%s'"
17290 msgstr ""
@@ -19286,15 +19270,15 @@ msgstr ""
19270 msgid "interrupt transfer after <n> seconds of inactivity"
19271 msgstr ""
19272
19289 -#: builtin/verify-commit.c:20
19273 +#: builtin/verify-commit.c:19
19274 msgid "git verify-commit [-v | --verbose] <commit>..."
19275 msgstr ""
19276
19293 -#: builtin/verify-commit.c:69
19277 +#: builtin/verify-commit.c:68
19278 msgid "print commit contents"
19279 msgstr ""
19280
19297 -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
19281 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
19282 msgid "print raw gpg status output"
19283 msgstr ""
19284
@@ -19310,11 +19294,11 @@ msgstr ""
19294 msgid "show statistics only"
19295 msgstr ""
19296
19313 -#: builtin/verify-tag.c:19
19297 +#: builtin/verify-tag.c:18
19298 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
19299 msgstr ""
19300
19317 -#: builtin/verify-tag.c:37
19301 +#: builtin/verify-tag.c:36
19302 msgid "print tag contents"
19303 msgstr ""
19304
@@ -19721,29 +19705,29 @@ msgstr ""
19705 msgid "close failed on standard output"
19706 msgstr ""
19707
19724 -#: git.c:796
19708 +#: git.c:793
19709 #, c-format
19710 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
19711 msgstr ""
19712
19729 -#: git.c:846
19713 +#: git.c:843
19714 #, c-format
19715 msgid "cannot handle %s as a builtin"
19716 msgstr ""
19717
19734 -#: git.c:859
19718 +#: git.c:856
19719 #, c-format
19720 msgid ""
19721 "usage: %s\n"
19722 "\n"
19723 msgstr ""
19724
19741 -#: git.c:879
19725 +#: git.c:876
19726 #, c-format
19727 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
19728 msgstr ""
19729
19746 -#: git.c:891
19730 +#: git.c:888
19731 #, c-format
19732 msgid "failed to run command '%s': %s\n"
19733 msgstr ""
@@ -19945,11 +19929,11 @@ msgstr ""
19929 msgid "update the index with reused conflict resolution if possible"
19930 msgstr ""
19931
19948 -#: wt-status.h:68
19932 +#: wt-status.h:67
19933 msgid "HEAD detached at "
19934 msgstr ""
19935
19952 -#: wt-status.h:69
19936 +#: wt-status.h:68
19937 msgid "HEAD detached from "
19938 msgstr ""
19939