@matheusbsbs / matheus-bagliano / commits / 51eeaf4aa7

l10n: sv.po: Update Swedish translation (4674t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

Peter Krefting committed Aug 17, 2019 at 20:16 UTC 51eeaf4aa7c5f7562b5019aa3ea568a4eb77f681
1 file changed +509 -497
po/sv.po
+509 -497
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 2.23.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2019-07-30 09:59+0800\n"
11 -"PO-Revision-Date: 2019-07-31 12:40+0200\n"
10 +"POT-Creation-Date: 2019-08-10 20:12+0800\n"
11 +"PO-Revision-Date: 2019-08-17 17:28+0100\n"
12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
14 "Language: sv\n"
@@ -16,7 +16,7 @@ msgstr ""
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19 -"X-Generator: Poedit 2.0.2\n"
19 +"X-Generator: Gtranslator 2.91.7\n"
20
21 #: advice.c:109
22 #, c-format
@@ -576,7 +576,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
576 msgid "truncating .rej filename to %.*s.rej"
577 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
578
579 -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
579 +#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168
580 #, c-format
581 msgid "cannot open %s"
582 msgstr "kan inte öppna %s"
@@ -717,7 +717,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika"
717
718 #: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
719 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
720 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
720 +#: builtin/pack-objects.c:3330 builtin/rebase.c:1421
721 msgid "action"
722 msgstr "åtgärd"
723
@@ -747,7 +747,7 @@ msgstr "tillåt överlappande stycken"
747
748 #: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
749 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
750 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
750 +#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128
751 msgid "be verbose"
752 msgstr "var pratsam"
753
@@ -818,7 +818,7 @@ msgstr "fmt"
818 msgid "archive format"
819 msgstr "arkivformat"
820
821 -#: archive.c:458 builtin/log.c:1597
821 +#: archive.c:458 builtin/log.c:1580
822 msgid "prefix"
823 msgstr "prefix"
824
@@ -941,7 +941,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s"
941 msgid "path too long (%d chars, SHA1: %s): %s"
942 msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
943
944 -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
944 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
945 #, c-format
946 msgid "deflate error (%d)"
947 msgstr "fel i deflate (%d)"
@@ -1104,9 +1104,9 @@ msgstr ""
1104 "incheckningen"
1105
1106 #: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
1107 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
1108 -#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
1109 -#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
1107 +#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963
1108 +#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411
1109 +#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163
1110 #: builtin/shortlog.c:192
1111 msgid "revision walk setup failed"
1112 msgstr "misslyckades skapa revisionstraversering"
@@ -1334,7 +1334,7 @@ msgstr "rev-list dog"
1334 msgid "ref '%s' is excluded by the rev-list options"
1335 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
1336
1337 -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
1337 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306
1338 #, c-format
1339 msgid "unrecognized argument: %s"
1340 msgstr "okänt argument: %s"
@@ -1472,180 +1472,180 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
1472 msgid "unable to find all commit-graph files"
1473 msgstr "kan inte hitta alla incheckingsgraffiler"
1474
1475 -#: commit-graph.c:553 commit-graph.c:613
1475 +#: commit-graph.c:554 commit-graph.c:614
1476 msgid "invalid commit position. commit-graph is likely corrupt"
1477 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
1478
1479 -#: commit-graph.c:574
1479 +#: commit-graph.c:575
1480 #, c-format
1481 msgid "could not find commit %s"
1482 msgstr "kunde inte hitta incheckningen %s"
1483
1484 -#: commit-graph.c:1001 builtin/pack-objects.c:2651
1484 +#: commit-graph.c:1002 builtin/pack-objects.c:2657
1485 #, c-format
1486 msgid "unable to get type of object %s"
1487 msgstr "kunde inte hämta typ för objektet %s"
1488
1489 -#: commit-graph.c:1033
1489 +#: commit-graph.c:1034
1490 msgid "Loading known commits in commit graph"
1491 msgstr "Läser in kända incheckningar i incheckningsgraf"
1492
1493 -#: commit-graph.c:1050
1493 +#: commit-graph.c:1051
1494 msgid "Expanding reachable commits in commit graph"
1495 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
1496
1497 -#: commit-graph.c:1069
1497 +#: commit-graph.c:1070
1498 msgid "Clearing commit marks in commit graph"
1499 msgstr "Rensar incheckningsmärken i incheckningsgraf"
1500
1501 -#: commit-graph.c:1088
1501 +#: commit-graph.c:1089
1502 msgid "Computing commit graph generation numbers"
1503 msgstr "Beräknar generationsvärden för incheckningsgraf"
1504
1505 -#: commit-graph.c:1162
1505 +#: commit-graph.c:1163
1506 #, c-format
1507 msgid "Finding commits for commit graph in %d pack"
1508 msgid_plural "Finding commits for commit graph in %d packs"
1509 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
1510 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
1511
1512 -#: commit-graph.c:1175
1512 +#: commit-graph.c:1176
1513 #, c-format
1514 msgid "error adding pack %s"
1515 msgstr "fel vid tillägg av paketet %s"
1516
1517 -#: commit-graph.c:1179
1517 +#: commit-graph.c:1180
1518 #, c-format
1519 msgid "error opening index for %s"
1520 msgstr "fel vid öppning av indexet för %s"
1521
1522 -#: commit-graph.c:1203
1522 +#: commit-graph.c:1204
1523 #, c-format
1524 msgid "Finding commits for commit graph from %d ref"
1525 msgid_plural "Finding commits for commit graph from %d refs"
1526 msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
1527 msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
1528
1529 -#: commit-graph.c:1237
1529 +#: commit-graph.c:1238
1530 msgid "Finding commits for commit graph among packed objects"
1531 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
1532
1533 -#: commit-graph.c:1252
1533 +#: commit-graph.c:1253
1534 msgid "Counting distinct commits in commit graph"
1535 msgstr "Räknar olika incheckningar i incheckningsgraf"
1536
1537 -#: commit-graph.c:1283
1537 +#: commit-graph.c:1284
1538 msgid "Finding extra edges in commit graph"
1539 msgstr "Söker ytterligare kanter i incheckingsgraf"
1540
1541 -#: commit-graph.c:1331
1541 +#: commit-graph.c:1332
1542 msgid "failed to write correct number of base graph ids"
1543 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
1544
1545 -#: commit-graph.c:1364 midx.c:811
1545 +#: commit-graph.c:1365 midx.c:811
1546 #, c-format
1547 msgid "unable to create leading directories of %s"
1548 msgstr "kunde inte skapa inledande kataloger för %s"
1549
1550 -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
1550 +#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240
1551 #, c-format
1552 msgid "unable to create '%s'"
1553 msgstr "kunde inte skapa \"%s\""
1554
1555 -#: commit-graph.c:1436
1555 +#: commit-graph.c:1437
1556 #, c-format
1557 msgid "Writing out commit graph in %d pass"
1558 msgid_plural "Writing out commit graph in %d passes"
1559 msgstr[0] "Skriver ut incheckningsgraf i %d pass"
1560 msgstr[1] "Skriver ut incheckningsgraf i %d pass"
1561
1562 -#: commit-graph.c:1477
1562 +#: commit-graph.c:1478
1563 msgid "unable to open commit-graph chain file"
1564 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
1565
1566 -#: commit-graph.c:1489
1566 +#: commit-graph.c:1490
1567 msgid "failed to rename base commit-graph file"
1568 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
1569
1570 -#: commit-graph.c:1509
1570 +#: commit-graph.c:1510
1571 msgid "failed to rename temporary commit-graph file"
1572 msgstr "kunde inte byta namn på temporär incheckningsgraffil"
1573
1574 -#: commit-graph.c:1620
1574 +#: commit-graph.c:1621
1575 msgid "Scanning merged commits"
1576 msgstr "Söker sammanslagna incheckningar"
1577
1578 -#: commit-graph.c:1631
1578 +#: commit-graph.c:1632
1579 #, c-format
1580 msgid "unexpected duplicate commit id %s"
1581 msgstr "oväntat duplicerat inchecknings-id %s"
1582
1583 -#: commit-graph.c:1656
1583 +#: commit-graph.c:1657
1584 msgid "Merging commit-graph"
1585 msgstr "Slår ihop incheckningsgraf"
1586
1587 -#: commit-graph.c:1842
1587 +#: commit-graph.c:1844
1588 #, c-format
1589 msgid "the commit graph format cannot write %d commits"
1590 msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
1591
1592 -#: commit-graph.c:1853
1592 +#: commit-graph.c:1855
1593 msgid "too many commits to write graph"
1594 msgstr "för många incheckningar för att skriva graf"
1595
1596 -#: commit-graph.c:1943
1596 +#: commit-graph.c:1945
1597 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
1598 msgstr ""
1599 "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
1600
1601 -#: commit-graph.c:1953
1601 +#: commit-graph.c:1955
1602 #, c-format
1603 msgid "commit-graph has incorrect OID order: %s then %s"
1604 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
1605
1606 -#: commit-graph.c:1963 commit-graph.c:1978
1606 +#: commit-graph.c:1965 commit-graph.c:1980
1607 #, c-format
1608 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
1609 msgstr ""
1610 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
1611
1612 -#: commit-graph.c:1970
1612 +#: commit-graph.c:1972
1613 #, c-format
1614 msgid "failed to parse commit %s from commit-graph"
1615 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
1616
1617 -#: commit-graph.c:1987
1617 +#: commit-graph.c:1989
1618 msgid "Verifying commits in commit graph"
1619 msgstr "Bekräftar incheckningar i incheckningsgrafen"
1620
1621 -#: commit-graph.c:2000
1621 +#: commit-graph.c:2002
1622 #, c-format
1623 msgid "failed to parse commit %s from object database for commit-graph"
1624 msgstr ""
1625 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
1626
1627 -#: commit-graph.c:2007
1627 +#: commit-graph.c:2009
1628 #, c-format
1629 msgid "root tree OID for commit %s in commit-graph is %s != %s"
1630 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
1631
1632 -#: commit-graph.c:2017
1632 +#: commit-graph.c:2019
1633 #, c-format
1634 msgid "commit-graph parent list for commit %s is too long"
1635 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
1636
1637 -#: commit-graph.c:2026
1637 +#: commit-graph.c:2028
1638 #, c-format
1639 msgid "commit-graph parent for %s is %s != %s"
1640 msgstr "incheckningsgrafens förälder för %s är %s != %s"
1641
1642 -#: commit-graph.c:2039
1642 +#: commit-graph.c:2041
1643 #, c-format
1644 msgid "commit-graph parent list for commit %s terminates early"
1645 msgstr ""
1646 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
1647
1648 -#: commit-graph.c:2044
1648 +#: commit-graph.c:2046
1649 #, c-format
1650 msgid ""
1651 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1653,7 +1653,7 @@ msgstr ""
1653 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
1654 "noll på annan plats"
1655
1656 -#: commit-graph.c:2048
1656 +#: commit-graph.c:2050
1657 #, c-format
1658 msgid ""
1659 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1661,12 +1661,12 @@ msgstr ""
1661 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
1662 "%s, men noll på annan plats"
1663
1664 -#: commit-graph.c:2063
1664 +#: commit-graph.c:2065
1665 #, c-format
1666 msgid "commit-graph generation for commit %s is %u != %u"
1667 msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
1668
1669 -#: commit-graph.c:2069
1669 +#: commit-graph.c:2071
1670 #, c-format
1671 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
1672 msgstr ""
@@ -1705,289 +1705,289 @@ msgstr "relativa konfigureringsinkluderingar måste komma från filer"
1705 msgid "relative config include conditionals must come from files"
1706 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
1707
1708 -#: config.c:375
1708 +#: config.c:376
1709 #, c-format
1710 msgid "key does not contain a section: %s"
1711 msgstr "nyckeln innehåller inte ett stycke: %s"
1712
1713 -#: config.c:381
1713 +#: config.c:382
1714 #, c-format
1715 msgid "key does not contain variable name: %s"
1716 msgstr "nyckeln innehåller inte variabelnamn: %s"
1717
1718 -#: config.c:405 sequencer.c:2463
1718 +#: config.c:406 sequencer.c:2463
1719 #, c-format
1720 msgid "invalid key: %s"
1721 msgstr "felaktig nyckel: %s"
1722
1723 -#: config.c:411
1723 +#: config.c:412
1724 #, c-format
1725 msgid "invalid key (newline): %s"
1726 msgstr "ogiltig nyckel (nyradstecken): %s"
1727
1728 -#: config.c:447 config.c:459
1728 +#: config.c:448 config.c:460
1729 #, c-format
1730 msgid "bogus config parameter: %s"
1731 msgstr "falsk konfigureringsparameter: %s"
1732
1733 -#: config.c:494
1733 +#: config.c:495
1734 #, c-format
1735 msgid "bogus format in %s"
1736 msgstr "felaktigt format i %s"
1737
1738 -#: config.c:820
1738 +#: config.c:821
1739 #, c-format
1740 msgid "bad config line %d in blob %s"
1741 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
1742
1743 -#: config.c:824
1743 +#: config.c:825
1744 #, c-format
1745 msgid "bad config line %d in file %s"
1746 msgstr "felaktig konfigurationsfil rad %d i filen %s"
1747
1748 -#: config.c:828
1748 +#: config.c:829
1749 #, c-format
1750 msgid "bad config line %d in standard input"
1751 msgstr "felaktig konfigurationsfil rad %d i standard in"
1752
1753 -#: config.c:832
1753 +#: config.c:833
1754 #, c-format
1755 msgid "bad config line %d in submodule-blob %s"
1756 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
1757
1758 -#: config.c:836
1758 +#: config.c:837
1759 #, c-format
1760 msgid "bad config line %d in command line %s"
1761 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
1762
1763 -#: config.c:840
1763 +#: config.c:841
1764 #, c-format
1765 msgid "bad config line %d in %s"
1766 msgstr "felaktig konfigurationsfil rad %d i %s"
1767
1768 -#: config.c:977
1768 +#: config.c:978
1769 msgid "out of range"
1770 msgstr "utanför intervallet"
1771
1772 -#: config.c:977
1772 +#: config.c:978
1773 msgid "invalid unit"
1774 msgstr "ogiltig enhet"
1775
1776 -#: config.c:978
1776 +#: config.c:979
1777 #, c-format
1778 msgid "bad numeric config value '%s' for '%s': %s"
1779 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
1780
1781 -#: config.c:997
1781 +#: config.c:998
1782 #, c-format
1783 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
1784 msgstr ""
1785 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
1786
1787 -#: config.c:1000
1787 +#: config.c:1001
1788 #, c-format
1789 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
1790 msgstr ""
1791 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
1792
1793 -#: config.c:1003
1793 +#: config.c:1004
1794 #, c-format
1795 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
1796 msgstr ""
1797 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
1798
1799 -#: config.c:1006
1799 +#: config.c:1007
1800 #, c-format
1801 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
1802 msgstr ""
1803 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
1804 "en %s: %s"
1805
1806 -#: config.c:1009
1806 +#: config.c:1010
1807 #, c-format
1808 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
1809 msgstr ""
1810 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
1811 "%s: %s"
1812
1813 -#: config.c:1012
1813 +#: config.c:1013
1814 #, c-format
1815 msgid "bad numeric config value '%s' for '%s' in %s: %s"
1816 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
1817
1818 -#: config.c:1107
1818 +#: config.c:1108
1819 #, c-format
1820 msgid "failed to expand user dir in: '%s'"
1821 msgstr "misslyckades expandera användarkatalog i: \"%s\""
1822
1823 -#: config.c:1116
1823 +#: config.c:1117
1824 #, c-format
1825 msgid "'%s' for '%s' is not a valid timestamp"
1826 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
1827
1828 -#: config.c:1207
1828 +#: config.c:1208
1829 #, c-format
1830 msgid "abbrev length out of range: %d"
1831 msgstr "förkortningslängd utanför intervallet: %d"
1832
1833 -#: config.c:1221 config.c:1232
1833 +#: config.c:1222 config.c:1233
1834 #, c-format
1835 msgid "bad zlib compression level %d"
1836 msgstr "felaktigt zlib-komprimeringsgrad %d"
1837
1838 -#: config.c:1324
1838 +#: config.c:1325
1839 msgid "core.commentChar should only be one character"
1840 msgstr "core.commentChar kan bara vara ett tecken"
1841
1842 -#: config.c:1357
1842 +#: config.c:1358
1843 #, c-format
1844 msgid "invalid mode for object creation: %s"
1845 msgstr "felaktigt läge för skapande av objekt: %s"
1846
1847 -#: config.c:1429
1847 +#: config.c:1430
1848 #, c-format
1849 msgid "malformed value for %s"
1850 msgstr "felformat värde för %s"
1851
1852 -#: config.c:1455
1852 +#: config.c:1456
1853 #, c-format
1854 msgid "malformed value for %s: %s"
1855 msgstr "felformat värde för %s: %s"
1856
1857 -#: config.c:1456
1857 +#: config.c:1457
1858 msgid "must be one of nothing, matching, simple, upstream or current"
1859 msgstr "måste vara en av nothing, matching, simple, upstream eller current"
1860
1861 -#: config.c:1517 builtin/pack-objects.c:3399
1861 +#: config.c:1518 builtin/pack-objects.c:3410
1862 #, c-format
1863 msgid "bad pack compression level %d"
1864 msgstr "felaktig paketkomprimeringsgrad %d"
1865
1866 -#: config.c:1638
1866 +#: config.c:1639
1867 #, c-format
1868 msgid "unable to load config blob object '%s'"
1869 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
1870
1871 -#: config.c:1641
1871 +#: config.c:1642
1872 #, c-format
1873 msgid "reference '%s' does not point to a blob"
1874 msgstr "referensen \"%s\" pekar inte på en blob"
1875
1876 -#: config.c:1658
1876 +#: config.c:1659
1877 #, c-format
1878 msgid "unable to resolve config blob '%s'"
1879 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
1880
1881 -#: config.c:1688
1881 +#: config.c:1689
1882 #, c-format
1883 msgid "failed to parse %s"
1884 msgstr "kunde inte tolka %s"
1885
1886 -#: config.c:1744
1886 +#: config.c:1745
1887 msgid "unable to parse command-line config"
1888 msgstr "kan inte tolka kommandoradskonfiguration"
1889
1890 -#: config.c:2093
1890 +#: config.c:2094
1891 msgid "unknown error occurred while reading the configuration files"
1892 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
1893
1894 -#: config.c:2263
1894 +#: config.c:2264
1895 #, c-format
1896 msgid "Invalid %s: '%s'"
1897 msgstr "Felaktigt %s: \"%s\""
1898
1899 -#: config.c:2306
1899 +#: config.c:2307
1900 #, c-format
1901 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
1902 msgstr ""
1903 "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
1904
1905 -#: config.c:2332
1905 +#: config.c:2333
1906 #, c-format
1907 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
1908 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
1909
1910 -#: config.c:2378
1910 +#: config.c:2379
1911 #, c-format
1912 msgid "unable to parse '%s' from command-line config"
1913 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
1914
1915 -#: config.c:2380
1915 +#: config.c:2381
1916 #, c-format
1917 msgid "bad config variable '%s' in file '%s' at line %d"
1918 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
1919
1920 -#: config.c:2461
1920 +#: config.c:2462
1921 #, c-format
1922 msgid "invalid section name '%s'"
1923 msgstr "felaktigt sektionsnamn \"%s\""
1924
1925 -#: config.c:2493
1925 +#: config.c:2494
1926 #, c-format
1927 msgid "%s has multiple values"
1928 msgstr "%s har flera värden"
1929
1930 -#: config.c:2522
1930 +#: config.c:2523
1931 #, c-format
1932 msgid "failed to write new configuration file %s"
1933 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
1934
1935 -#: config.c:2774 config.c:3098
1935 +#: config.c:2775 config.c:3099
1936 #, c-format
1937 msgid "could not lock config file %s"
1938 msgstr "kunde inte låsa konfigurationsfilen %s"
1939
1940 -#: config.c:2785
1940 +#: config.c:2786
1941 #, c-format
1942 msgid "opening %s"
1943 msgstr "öppnar %s"
1944
1945 -#: config.c:2820 builtin/config.c:328
1945 +#: config.c:2821 builtin/config.c:328
1946 #, c-format
1947 msgid "invalid pattern: %s"
1948 msgstr "ogiltigt mönster: %s"
1949
1950 -#: config.c:2845
1950 +#: config.c:2846
1951 #, c-format
1952 msgid "invalid config file %s"
1953 msgstr "ogiltig konfigurationsfil: \"%s\""
1954
1955 -#: config.c:2858 config.c:3111
1955 +#: config.c:2859 config.c:3112
1956 #, c-format
1957 msgid "fstat on %s failed"
1958 msgstr "fstat misslyckades på %s"
1959
1960 -#: config.c:2869
1960 +#: config.c:2870
1961 #, c-format
1962 msgid "unable to mmap '%s'"
1963 msgstr "kunde inte utföra mmap på \"%s\""
1964
1965 -#: config.c:2878 config.c:3116
1965 +#: config.c:2879 config.c:3117
1966 #, c-format
1967 msgid "chmod on %s failed"
1968 msgstr "chmod misslyckades på %s"
1969
1970 -#: config.c:2963 config.c:3213
1970 +#: config.c:2964 config.c:3214
1971 #, c-format
1972 msgid "could not write config file %s"
1973 msgstr "kunde inte skriva konfigurationsfilen %s"
1974
1975 -#: config.c:2997
1975 +#: config.c:2998
1976 #, c-format
1977 msgid "could not set '%s' to '%s'"
1978 msgstr "kunde inte ställa in \"%s\" till \"%s\""
1979
1980 -#: config.c:2999 builtin/remote.c:782
1980 +#: config.c:3000 builtin/remote.c:782
1981 #, c-format
1982 msgid "could not unset '%s'"
1983 msgstr "kunde inte ta bort inställning för \"%s\""
1984
1985 -#: config.c:3089
1985 +#: config.c:3090
1986 #, c-format
1987 msgid "invalid section name: %s"
1988 msgstr "felaktigt namn på stycke: %s"
1989
1990 -#: config.c:3256
1990 +#: config.c:3257
1991 #, c-format
1992 msgid "missing value for '%s'"
1993 msgstr "värde saknas för \"%s\""
@@ -2563,7 +2563,7 @@ msgstr "Formatflaggor för diff-utdata"
2563 msgid "generate patch"
2564 msgstr "skapar patch"
2565
2566 -#: diff.c:5275 builtin/log.c:182
2566 +#: diff.c:5275 builtin/log.c:172
2567 msgid "suppress diff output"
2568 msgstr "undertryck diff-utdata"
2569
@@ -3812,7 +3812,7 @@ msgstr "namnbyte"
3812 msgid "renamed"
3813 msgstr "namnbytt"
3814
3815 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
3815 +#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094
3816 #, c-format
3817 msgid "Refusing to lose dirty file at %s"
3818 msgstr "Vägrar förlora lortig fil vid \"%s\""
@@ -3903,52 +3903,52 @@ msgstr ""
3903 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
3904 "bytt namn."
3905
3906 -#: merge-recursive.c:2937
3906 +#: merge-recursive.c:2938
3907 #, c-format
3908 msgid "cannot read object %s"
3909 msgstr "kan inte läsa objektet %s"
3910
3911 -#: merge-recursive.c:2940
3911 +#: merge-recursive.c:2941
3912 #, c-format
3913 msgid "object %s is not a blob"
3914 msgstr "objektet %s är inte en blob"
3915
3916 -#: merge-recursive.c:3004
3916 +#: merge-recursive.c:3005
3917 msgid "modify"
3918 msgstr "ändra"
3919
3920 -#: merge-recursive.c:3004
3920 +#: merge-recursive.c:3005
3921 msgid "modified"
3922 msgstr "ändrad"
3923
3924 -#: merge-recursive.c:3016
3924 +#: merge-recursive.c:3017
3925 msgid "content"
3926 msgstr "innehåll"
3927
3928 -#: merge-recursive.c:3020
3928 +#: merge-recursive.c:3021
3929 msgid "add/add"
3930 msgstr "tillägg/tillägg"
3931
3932 -#: merge-recursive.c:3043
3932 +#: merge-recursive.c:3044
3933 #, c-format
3934 msgid "Skipped %s (merged same as existing)"
3935 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
3936
3937 -#: merge-recursive.c:3065 git-submodule.sh:937
3937 +#: merge-recursive.c:3066 git-submodule.sh:937
3938 msgid "submodule"
3939 msgstr "undermodul"
3940
3941 -#: merge-recursive.c:3066
3941 +#: merge-recursive.c:3067
3942 #, c-format
3943 msgid "CONFLICT (%s): Merge conflict in %s"
3944 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
3945
3946 -#: merge-recursive.c:3096
3946 +#: merge-recursive.c:3097
3947 #, c-format
3948 msgid "Adding as %s instead"
3949 msgstr "Lägger till som %s istället"
3950
3951 -#: merge-recursive.c:3178
3951 +#: merge-recursive.c:3179
3952 #, c-format
3953 msgid ""
3954 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -3957,7 +3957,7 @@ msgstr ""
3957 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
3958 "flyttar den till %s."
3959
3960 -#: merge-recursive.c:3181
3960 +#: merge-recursive.c:3182
3961 #, c-format
3962 msgid ""
3963 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -3966,7 +3966,7 @@ msgstr ""
3966 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
3967 "%s, föreslår att den bör flyttas till%s."
3968
3969 -#: merge-recursive.c:3185
3969 +#: merge-recursive.c:3186
3970 #, c-format
3971 msgid ""
3972 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -3975,7 +3975,7 @@ msgstr ""
3975 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
3976 "namn i %s; flyttar den till %s."
3977
3978 -#: merge-recursive.c:3188
3978 +#: merge-recursive.c:3189
3979 #, c-format
3980 msgid ""
3981 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -3984,36 +3984,36 @@ msgstr ""
3984 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
3985 "bytte namn i %s; flyttar den till %s."
3986
3987 -#: merge-recursive.c:3302
3987 +#: merge-recursive.c:3303
3988 #, c-format
3989 msgid "Removing %s"
3990 msgstr "Tar bort %s"
3991
3992 -#: merge-recursive.c:3325
3992 +#: merge-recursive.c:3326
3993 msgid "file/directory"
3994 msgstr "fil/katalog"
3995
3996 -#: merge-recursive.c:3330
3996 +#: merge-recursive.c:3331
3997 msgid "directory/file"
3998 msgstr "katalog/fil"
3999
4000 -#: merge-recursive.c:3337
4000 +#: merge-recursive.c:3338
4001 #, c-format
4002 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
4003 msgstr ""
4004 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
4005
4006 -#: merge-recursive.c:3346
4006 +#: merge-recursive.c:3347
4007 #, c-format
4008 msgid "Adding %s"
4009 msgstr "Lägger till %s"
4010
4011 -#: merge-recursive.c:3355
4011 +#: merge-recursive.c:3356
4012 #, c-format
4013 msgid "CONFLICT (add/add): Merge conflict in %s"
4014 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
4015
4016 -#: merge-recursive.c:3393
4016 +#: merge-recursive.c:3394
4017 #, c-format
4018 msgid ""
4019 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4023,36 +4023,36 @@ msgstr ""
4023 "sammanslagning:\n"
4024 " %s"
4025
4026 -#: merge-recursive.c:3404
4026 +#: merge-recursive.c:3405
4027 msgid "Already up to date!"
4028 msgstr "Redan à jour!"
4029
4030 -#: merge-recursive.c:3413
4030 +#: merge-recursive.c:3414
4031 #, c-format
4032 msgid "merging of trees %s and %s failed"
4033 msgstr "sammanslagning av träden %s och %s misslyckades"
4034
4035 -#: merge-recursive.c:3512
4035 +#: merge-recursive.c:3513
4036 msgid "Merging:"
4037 msgstr "Slår ihop:"
4038
4039 -#: merge-recursive.c:3525
4039 +#: merge-recursive.c:3526
4040 #, c-format
4041 msgid "found %u common ancestor:"
4042 msgid_plural "found %u common ancestors:"
4043 msgstr[0] "hittade %u gemensam förfader:"
4044 msgstr[1] "hittade %u gemensamma förfäder:"
4045
4046 -#: merge-recursive.c:3564
4046 +#: merge-recursive.c:3565
4047 msgid "merge returned no commit"
4048 msgstr "sammanslagningen returnerade ingen incheckning"
4049
4050 -#: merge-recursive.c:3630
4050 +#: merge-recursive.c:3631
4051 #, c-format
4052 msgid "Could not parse object '%s'"
4053 msgstr "Kunde inte tolka objektet \"%s\""
4054
4055 -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
4055 +#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869
4056 msgid "Unable to write index."
4057 msgstr "Kunde inte skriva indexet."
4058
@@ -5610,7 +5610,7 @@ msgstr "kan inte ta bort lös länk \"%s\""
5610 msgid "Recorded preimage for '%s'"
5611 msgstr "Sparade förhandsbild för \"%s\""
5612
5613 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
5613 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1773
5614 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
5615 #, c-format
5616 msgid "could not create directory '%s'"
@@ -6837,195 +6837,195 @@ msgstr "referensarkivet \"%s\" är ympat"
6837 msgid "invalid line while parsing alternate refs: %s"
6838 msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
6839
6840 -#: sha1-file.c:943
6840 +#: sha1-file.c:944
6841 #, c-format
6842 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
6843 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
6844
6845 -#: sha1-file.c:968
6845 +#: sha1-file.c:969
6846 msgid "mmap failed"
6847 msgstr "mmap misslyckades"
6848
6849 -#: sha1-file.c:1132
6849 +#: sha1-file.c:1133
6850 #, c-format
6851 msgid "object file %s is empty"
6852 msgstr "objektfilen %s är tom"
6853
6854 -#: sha1-file.c:1256 sha1-file.c:2395
6854 +#: sha1-file.c:1257 sha1-file.c:2396
6855 #, c-format
6856 msgid "corrupt loose object '%s'"
6857 msgstr "trasigt löst objekt \"%s\""
6858
6859 -#: sha1-file.c:1258 sha1-file.c:2399
6859 +#: sha1-file.c:1259 sha1-file.c:2400
6860 #, c-format
6861 msgid "garbage at end of loose object '%s'"
6862 msgstr "skräp i slutet av löst objekt \"%s\""
6863
6864 -#: sha1-file.c:1300
6864 +#: sha1-file.c:1301
6865 msgid "invalid object type"
6866 msgstr "felaktig objekttyp"
6867
6868 -#: sha1-file.c:1384
6868 +#: sha1-file.c:1385
6869 #, c-format
6870 msgid "unable to unpack %s header with --allow-unknown-type"
6871 msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
6872
6873 -#: sha1-file.c:1387
6873 +#: sha1-file.c:1388
6874 #, c-format
6875 msgid "unable to unpack %s header"
6876 msgstr "kan inte packa upp %s-huvudet"
6877
6878 -#: sha1-file.c:1393
6878 +#: sha1-file.c:1394
6879 #, c-format
6880 msgid "unable to parse %s header with --allow-unknown-type"
6881 msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
6882
6883 -#: sha1-file.c:1396
6883 +#: sha1-file.c:1397
6884 #, c-format
6885 msgid "unable to parse %s header"
6886 msgstr "kan inte tolka %s-huvud"
6887
6888 -#: sha1-file.c:1587
6888 +#: sha1-file.c:1588
6889 #, c-format
6890 msgid "failed to read object %s"
6891 msgstr "misslyckades läsa objektet %s"
6892
6893 -#: sha1-file.c:1591
6893 +#: sha1-file.c:1592
6894 #, c-format
6895 msgid "replacement %s not found for %s"
6896 msgstr "ersättningen %s hittades inte för %s"
6897
6898 -#: sha1-file.c:1595
6898 +#: sha1-file.c:1596
6899 #, c-format
6900 msgid "loose object %s (stored in %s) is corrupt"
6901 msgstr "löst objekt %s (lagrat i %s) är trasigt"
6902
6903 -#: sha1-file.c:1599
6903 +#: sha1-file.c:1600
6904 #, c-format
6905 msgid "packed object %s (stored in %s) is corrupt"
6906 msgstr "packat objekt %s (lagrat i %s) är trasigt"
6907
6908 -#: sha1-file.c:1702
6908 +#: sha1-file.c:1703
6909 #, c-format
6910 msgid "unable to write file %s"
6911 msgstr "kunde inte skriva filen %s"
6912
6913 -#: sha1-file.c:1709
6913 +#: sha1-file.c:1710
6914 #, c-format
6915 msgid "unable to set permission to '%s'"
6916 msgstr "kan inte sätta behörigheten till \"%s\""
6917
6918 -#: sha1-file.c:1716
6918 +#: sha1-file.c:1717
6919 msgid "file write error"
6920 msgstr "fel vid skrivning av fil"
6921
6922 -#: sha1-file.c:1735
6922 +#: sha1-file.c:1736
6923 msgid "error when closing loose object file"
6924 msgstr "fel vid stängning av fil för löst objekt"
6925
6926 -#: sha1-file.c:1800
6926 +#: sha1-file.c:1801
6927 #, c-format
6928 msgid "insufficient permission for adding an object to repository database %s"
6929 msgstr ""
6930 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
6931
6932 -#: sha1-file.c:1802
6932 +#: sha1-file.c:1803
6933 msgid "unable to create temporary file"
6934 msgstr "kan inte skapa temporär fil"
6935
6936 -#: sha1-file.c:1826
6936 +#: sha1-file.c:1827
6937 msgid "unable to write loose object file"
6938 msgstr "kunde inte skriva fil för löst objekt"
6939
6940 -#: sha1-file.c:1832
6940 +#: sha1-file.c:1833
6941 #, c-format
6942 msgid "unable to deflate new object %s (%d)"
6943 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
6944
6945 -#: sha1-file.c:1836
6945 +#: sha1-file.c:1837
6946 #, c-format
6947 msgid "deflateEnd on object %s failed (%d)"
6948 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
6949
6950 -#: sha1-file.c:1840
6950 +#: sha1-file.c:1841
6951 #, c-format
6952 msgid "confused by unstable object source data for %s"
6953 msgstr "förvirrad av instabil objektkälldata för %s"
6954
6955 -#: sha1-file.c:1850 builtin/pack-objects.c:920
6955 +#: sha1-file.c:1851 builtin/pack-objects.c:925
6956 #, c-format
6957 msgid "failed utime() on %s"
6958 msgstr "\"utime()\" misslyckades på %s"
6959
6960 -#: sha1-file.c:1925
6960 +#: sha1-file.c:1926
6961 #, c-format
6962 msgid "cannot read object for %s"
6963 msgstr "kan inte läsa objekt för %s"
6964
6965 -#: sha1-file.c:1965
6965 +#: sha1-file.c:1966
6966 msgid "corrupt commit"
6967 msgstr "trasik incheckning"
6968
6969 -#: sha1-file.c:1973
6969 +#: sha1-file.c:1974
6970 msgid "corrupt tag"
6971 msgstr "trasig tagg"
6972
6973 -#: sha1-file.c:2072
6973 +#: sha1-file.c:2073
6974 #, c-format
6975 msgid "read error while indexing %s"
6976 msgstr "läsfel vid indexering av %s"
6977
6978 -#: sha1-file.c:2075
6978 +#: sha1-file.c:2076
6979 #, c-format
6980 msgid "short read while indexing %s"
6981 msgstr "för lite lästes vid indexering av %s"
6982
6983 -#: sha1-file.c:2148 sha1-file.c:2157
6983 +#: sha1-file.c:2149 sha1-file.c:2158
6984 #, c-format
6985 msgid "%s: failed to insert into database"
6986 msgstr "%s: misslyckades lägga in i databasen"
6987
6988 -#: sha1-file.c:2163
6988 +#: sha1-file.c:2164
6989 #, c-format
6990 msgid "%s: unsupported file type"
6991 msgstr "%s: filtypen stöds ej"
6992
6993 -#: sha1-file.c:2187
6993 +#: sha1-file.c:2188
6994 #, c-format
6995 msgid "%s is not a valid object"
6996 msgstr "%s är inte ett giltigt objekt"
6997
6998 -#: sha1-file.c:2189
6998 +#: sha1-file.c:2190
6999 #, c-format
7000 msgid "%s is not a valid '%s' object"
7001 msgstr "%s är inte ett giltigt \"%s\"-objekt"
7002
7003 -#: sha1-file.c:2216 builtin/index-pack.c:155
7003 +#: sha1-file.c:2217 builtin/index-pack.c:155
7004 #, c-format
7005 msgid "unable to open %s"
7006 msgstr "kan inte öppna %s"
7007
7008 -#: sha1-file.c:2406 sha1-file.c:2458
7008 +#: sha1-file.c:2407 sha1-file.c:2459
7009 #, c-format
7010 msgid "hash mismatch for %s (expected %s)"
7011 msgstr "hash stämmer inte för %s (förväntade %s)"
7012
7013 -#: sha1-file.c:2430
7013 +#: sha1-file.c:2431
7014 #, c-format
7015 msgid "unable to mmap %s"
7016 msgstr "kan inte utföra \"mmap\" för %s"
7017
7018 -#: sha1-file.c:2435
7018 +#: sha1-file.c:2436
7019 #, c-format
7020 msgid "unable to unpack header of %s"
7021 msgstr "kan inte packa upp huvud för %s"
7022
7023 -#: sha1-file.c:2441
7023 +#: sha1-file.c:2442
7024 #, c-format
7025 msgid "unable to parse header of %s"
7026 msgstr "kan inte tolka huvud för %s"
7027
7028 -#: sha1-file.c:2452
7028 +#: sha1-file.c:2453
7029 #, c-format
7030 msgid "unable to unpack contents of %s"
7031 msgstr "kan inte tolka innehåll i %s"
@@ -8836,7 +8836,7 @@ msgid "allow fall back on 3way merging if needed"
8836 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
8837
8838 #: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
8839 -#: builtin/repack.c:307 builtin/stash.c:806
8839 +#: builtin/repack.c:296 builtin/stash.c:806
8840 msgid "be quiet"
8841 msgstr "var tyst"
8842
@@ -8881,14 +8881,14 @@ msgstr "sänd det genom git-apply"
8881 #: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
8882 #: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
8883 #: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
8884 -#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
8884 +#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313
8885 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
8886 #: parse-options.h:141 parse-options.h:162 parse-options.h:312
8887 msgid "n"
8888 msgstr "n"
8889
8890 #: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
8891 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
8891 +#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38
8892 msgid "format"
8893 msgstr "format"
8894
@@ -9200,7 +9200,8 @@ msgstr "felaktigt HEAD - Jag behöver ett HEAD"
9200 #: builtin/bisect--helper.c:526
9201 #, c-format
9202 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
9203 -msgstr "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
9203 +msgstr ""
9204 +"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
9205
9206 # cogito-relaterat
9207 #: builtin/bisect--helper.c:547
@@ -9387,7 +9388,7 @@ msgstr "Visa författarens e-post istället för namn (Standard: av)"
9388 msgid "Ignore whitespace differences"
9389 msgstr "Ignorera ändringar i blanksteg"
9390
9390 -#: builtin/blame.c:861 builtin/log.c:1646
9391 +#: builtin/blame.c:861 builtin/log.c:1629
9392 msgid "rev"
9393 msgstr "rev"
9394
@@ -9783,7 +9784,7 @@ msgid "sorting and filtering are case insensitive"
9784 msgstr "sortering och filtrering skiljer gemener och VERSALER"
9785
9786 #: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
9786 -#: builtin/verify-tag.c:39
9787 +#: builtin/verify-tag.c:38
9788 msgid "format to use for the output"
9789 msgstr "format att använda för utdata"
9790
@@ -10460,7 +10461,7 @@ msgstr "tvinga förloppsrapportering"
10461 msgid "perform a 3-way merge with the new branch"
10462 msgstr "utför en 3-vägssammanslagning för den nya grenen"
10463
10463 -#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
10464 +#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318
10465 msgid "style"
10466 msgstr "stil"
10467
@@ -10541,7 +10542,8 @@ msgstr "felaktig sökvägsangivelse"
10542 #: builtin/checkout.c:1638
10543 #, c-format
10544 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
10544 -msgstr "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
10545 +msgstr ""
10546 +"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
10547
10548 #: builtin/checkout.c:1642
10549 #, c-format
@@ -10628,8 +10630,8 @@ msgid "throw away local modifications"
10630 msgstr "kasta bort lokala ändringar"
10631
10632 #: builtin/checkout.c:1772
10631 -msgid "where the checkout from"
10632 -msgstr "källa till utcheckning"
10633 +msgid "which tree-ish to checkout from"
10634 +msgstr "vilken träd-igt att checka ut från"
10635
10636 #: builtin/checkout.c:1774
10637 msgid "restore the index"
@@ -10802,7 +10804,7 @@ msgid "remove whole directories"
10804 msgstr "ta bort hela kataloger"
10805
10806 #: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
10805 -#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
10807 +#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178
10808 #: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
10809 #: builtin/show-ref.c:179
10810 msgid "pattern"
@@ -10899,7 +10901,7 @@ msgid "use --reference only while cloning"
10901 msgstr "använd --reference endast under kloningen"
10902
10903 #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
10902 -#: builtin/pack-objects.c:3308 builtin/repack.c:330
10904 +#: builtin/pack-objects.c:3314 builtin/repack.c:319
10905 msgid "name"
10906 msgstr "namn"
10907
@@ -10924,7 +10926,7 @@ msgstr "djup"
10926 msgid "create a shallow clone of that depth"
10927 msgstr "skapa en grund klon på detta djup"
10928
10927 -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
10929 +#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303
10930 msgid "time"
10931 msgstr "tid"
10932
@@ -11106,7 +11108,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
11108 msgid "repository '%s' does not exist"
11109 msgstr "arkivet \"%s\" finns inte"
11110
11109 -#: builtin/clone.c:977 builtin/fetch.c:1653
11111 +#: builtin/clone.c:977 builtin/fetch.c:1660
11112 #, c-format
11113 msgid "depth %s is not a positive number"
11114 msgstr "djupet %s är inte ett positivt tal"
@@ -11228,7 +11230,7 @@ msgstr ""
11230 msgid "duplicate parent %s ignored"
11231 msgstr "duplicerad förälder %s ignorerades"
11232
11231 -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
11233 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
11234 #, c-format
11235 msgid "not a valid object name %s"
11236 msgstr "objektnamnet är inte giltigt: %s"
@@ -11718,7 +11720,7 @@ msgstr ""
11720 msgid "the commit is authored by me now (used with -C/-c/--amend)"
11721 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
11722
11721 -#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
11723 +#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289
11724 #: builtin/pull.c:163 builtin/revert.c:110
11725 msgid "add Signed-off-by:"
11726 msgstr "lägg till Signed-off-by:"
@@ -11840,7 +11842,7 @@ msgstr ""
11842
11843 #: builtin/commit-graph.c:54 builtin/commit-graph.c:100
11844 #: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
11843 -#: builtin/log.c:1601
11845 +#: builtin/log.c:1584
11846 msgid "dir"
11847 msgstr "kat"
11848
@@ -12591,7 +12593,7 @@ msgstr "Använd done-funktionen för att avsluta strömmen"
12593 msgid "Skip output of blob data"
12594 msgstr "Hoppa över skrivning av blob-data"
12595
12594 -#: builtin/fast-export.c:1145 builtin/log.c:1649
12596 +#: builtin/fast-export.c:1145 builtin/log.c:1632
12597 msgid "refspec"
12598 msgstr "referensspecifikation"
12599
@@ -12791,22 +12793,46 @@ msgstr "tvingad uppdatering"
12793 msgid "non-fast-forward"
12794 msgstr "ej snabbspolad"
12795
12794 -#: builtin/fetch.c:879
12796 +#: builtin/fetch.c:854
12797 +msgid ""
12798 +"Fetch normally indicates which branches had a forced update,\n"
12799 +"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
12800 +"flag or run 'git config fetch.showForcedUpdates true'."
12801 +msgstr ""
12802 +"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
12803 +"slagits\n"
12804 +"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
12805 +"\"git config fetch.showForcedUpdates true\"."
12806 +
12807 +#: builtin/fetch.c:858
12808 +#, c-format
12809 +msgid ""
12810 +"It took %.2f seconds to check forced updates. You can use\n"
12811 +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
12812 +"false'\n"
12813 +" to avoid this check.\n"
12814 +msgstr ""
12815 +"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n"
12816 +"\"--no-show-forced-updates\" eller köra \"git config fetch."
12817 +"showForcedUpdates\n"
12818 +"false\" för att undvika testet.\n"
12819 +
12820 +#: builtin/fetch.c:888
12821 #, c-format
12822 msgid "%s did not send all necessary objects\n"
12823 msgstr "%s sände inte alla nödvändiga objekt\n"
12824
12799 -#: builtin/fetch.c:900
12825 +#: builtin/fetch.c:909
12826 #, c-format
12827 msgid "reject %s because shallow roots are not allowed to be updated"
12828 msgstr "avvisa %s då grunda rötter inte kan uppdateras"
12829
12804 -#: builtin/fetch.c:991 builtin/fetch.c:1124
12830 +#: builtin/fetch.c:1000 builtin/fetch.c:1131
12831 #, c-format
12832 msgid "From %.*s\n"
12833 msgstr "Från %.*s\n"
12834
12809 -#: builtin/fetch.c:1002
12835 +#: builtin/fetch.c:1011
12836 #, c-format
12837 msgid ""
12838 "some local refs could not be updated; try running\n"
@@ -12815,81 +12841,50 @@ msgstr ""
12841 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"
12842 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
12843
12818 -#: builtin/fetch.c:1008
12819 -msgid ""
12820 -"Fetch normally indicates which branches had a forced update, but that check "
12821 -"has been disabled."
12822 -msgstr ""
12823 -"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men "
12824 -"det testet har slagits av."
12825 -
12826 -#: builtin/fetch.c:1009
12827 -msgid ""
12828 -"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
12829 -"showForcedUpdates true'."
12830 -msgstr ""
12831 -"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör "
12832 -"\"git config fetch.showForcedUpdates true\"."
12833 -
12834 -#: builtin/fetch.c:1011
12835 -#, c-format
12836 -msgid ""
12837 -"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
12838 -"updates'\n"
12839 -msgstr ""
12840 -"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda "
12841 -"\"--no-show-forced-updates\"\n"
12842 -
12843 -#: builtin/fetch.c:1013
12844 -msgid ""
12845 -"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
12846 -msgstr ""
12847 -"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n"
12848 -
12849 -#: builtin/fetch.c:1094
12844 +#: builtin/fetch.c:1101
12845 #, c-format
12846 msgid " (%s will become dangling)"
12847 msgstr " (%s kommer bli dinglande)"
12848
12854 -#: builtin/fetch.c:1095
12849 +#: builtin/fetch.c:1102
12850 #, c-format
12851 msgid " (%s has become dangling)"
12852 msgstr " (%s har blivit dinglande)"
12853
12859 -#: builtin/fetch.c:1127
12854 +#: builtin/fetch.c:1134
12855 msgid "[deleted]"
12856 msgstr "[borttagen]"
12857
12863 -#: builtin/fetch.c:1128 builtin/remote.c:1036
12858 +#: builtin/fetch.c:1135 builtin/remote.c:1036
12859 msgid "(none)"
12860 msgstr "(ingen)"
12861
12867 -#: builtin/fetch.c:1151
12862 +#: builtin/fetch.c:1158
12863 #, c-format
12864 msgid "Refusing to fetch into current branch %s of non-bare repository"
12865 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
12866
12872 -#: builtin/fetch.c:1170
12867 +#: builtin/fetch.c:1177
12868 #, c-format
12869 msgid "Option \"%s\" value \"%s\" is not valid for %s"
12870 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
12871
12877 -#: builtin/fetch.c:1173
12872 +#: builtin/fetch.c:1180
12873 #, c-format
12874 msgid "Option \"%s\" is ignored for %s\n"
12875 msgstr "Flaggan \"%s\" ignoreras för %s\n"
12876
12882 -#: builtin/fetch.c:1477
12877 +#: builtin/fetch.c:1484
12878 #, c-format
12879 msgid "Fetching %s\n"
12880 msgstr "Hämtar %s\n"
12881
12887 -#: builtin/fetch.c:1479 builtin/remote.c:100
12882 +#: builtin/fetch.c:1486 builtin/remote.c:100
12883 #, c-format
12884 msgid "Could not fetch %s"
12885 msgstr "Kunde inte hämta %s"
12886
12892 -#: builtin/fetch.c:1525
12887 +#: builtin/fetch.c:1532
12888 msgid ""
12889 "--filter can only be used with the remote configured in extensions."
12890 "partialClone"
@@ -12897,7 +12892,7 @@ msgstr ""
12892 "--filter kan endast användas med fjärren konfigurerad i extensions."
12893 "partialClone"
12894
12900 -#: builtin/fetch.c:1549
12895 +#: builtin/fetch.c:1556
12896 msgid ""
12897 "No remote repository specified. Please, specify either a URL or a\n"
12898 "remote name from which new revisions should be fetched."
@@ -12905,44 +12900,44 @@ msgstr ""
12900 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
12901 "fjärrarkiv som nya incheckningar skall hämtas från."
12902
12908 -#: builtin/fetch.c:1586
12903 +#: builtin/fetch.c:1593
12904 msgid "You need to specify a tag name."
12905 msgstr "Du måste ange namnet på en tagg."
12906
12912 -#: builtin/fetch.c:1637
12907 +#: builtin/fetch.c:1644
12908 msgid "Negative depth in --deepen is not supported"
12909 msgstr "Negativa djup stöds inte i --deepen"
12910
12916 -#: builtin/fetch.c:1639
12911 +#: builtin/fetch.c:1646
12912 msgid "--deepen and --depth are mutually exclusive"
12913 msgstr "--deepen och --depth är ömsesidigt uteslutande"
12914
12920 -#: builtin/fetch.c:1644
12915 +#: builtin/fetch.c:1651
12916 msgid "--depth and --unshallow cannot be used together"
12917 msgstr "--depth och --unshallow kan inte användas samtidigt"
12918
12924 -#: builtin/fetch.c:1646
12919 +#: builtin/fetch.c:1653
12920 msgid "--unshallow on a complete repository does not make sense"
12921 msgstr "--unshallow kan inte användas på ett komplett arkiv"
12922
12928 -#: builtin/fetch.c:1662
12923 +#: builtin/fetch.c:1669
12924 msgid "fetch --all does not take a repository argument"
12925 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
12926
12932 -#: builtin/fetch.c:1664
12927 +#: builtin/fetch.c:1671
12928 msgid "fetch --all does not make sense with refspecs"
12929 msgstr "fetch --all kan inte anges med referensspecifikationer"
12930
12936 -#: builtin/fetch.c:1673
12931 +#: builtin/fetch.c:1680
12932 #, c-format
12933 msgid "No such remote or remote group: %s"
12934 msgstr "Fjärren eller fjärrgruppen finns inte: %s"
12935
12941 -#: builtin/fetch.c:1680
12936 +#: builtin/fetch.c:1687
12937 msgid "Fetching a group and specifying refspecs does not make sense"
12938 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
12939
12945 -#: builtin/fetch.c:1696
12940 +#: builtin/fetch.c:1703
12941 msgid ""
12942 "--filter can only be used with the remote configured in extensions."
12943 "partialclone"
@@ -13402,7 +13397,7 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
13397 #. grep.threads
13398 #.
13399 #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
13405 -#: builtin/pack-objects.c:2722
13400 +#: builtin/pack-objects.c:2728
13401 #, c-format
13402 msgid "no threads support, ignoring %s"
13403 msgstr "trådstöd saknas, ignorerar %s"
@@ -13627,11 +13622,11 @@ msgstr "kan inte slå upp revision: %s"
13622 msgid "invalid option combination, ignoring --threads"
13623 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
13624
13630 -#: builtin/grep.c:1068 builtin/pack-objects.c:3405
13625 +#: builtin/grep.c:1068 builtin/pack-objects.c:3416
13626 msgid "no threads support, ignoring --threads"
13627 msgstr "trådstöd saknas, ignorerar --threads"
13628
13634 -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
13629 +#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725
13630 #, c-format
13631 msgid "invalid number of threads specified (%d)"
13632 msgstr "felaktigt antal trådar angivet (%d)"
@@ -13837,7 +13832,7 @@ msgstr "indataläsfel"
13832 msgid "used more bytes than were available"
13833 msgstr "använde fler byte än tillgängligt"
13834
13840 -#: builtin/index-pack.c:288 builtin/pack-objects.c:600
13835 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604
13836 msgid "pack too large for current definition of off_t"
13837 msgstr "paket för stort för nuvarande definition av off_t"
13838
@@ -13903,8 +13898,8 @@ msgstr "allvarlig inflate-inkonsekvens"
13898 msgid "SHA1 COLLISION FOUND WITH %s !"
13899 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
13900
13906 -#: builtin/index-pack.c:738 builtin/pack-objects.c:153
13907 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
13901 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157
13902 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
13903 #, c-format
13904 msgid "unable to read %s"
13905 msgstr "kunde inte läsa %s"
@@ -13965,7 +13960,7 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()"
13960 msgid "Resolving deltas"
13961 msgstr "Analyserar delta"
13962
13968 -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
13963 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497
13964 #, c-format
13965 msgid "unable to create thread: %s"
13966 msgstr "kunde inte skapa tråd: %s"
@@ -14030,7 +14025,7 @@ msgstr "kan inte spara paketfil"
14025 msgid "cannot store index file"
14026 msgstr "kan inte spara indexfil"
14027
14033 -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
14028 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736
14029 #, c-format
14030 msgid "bad pack.indexversion=%<PRIu32>"
14031 msgstr "felaktig pack.indexversion=%<PRIu32>"
@@ -14277,128 +14272,108 @@ msgstr "git show [<flaggor>] <objekt>..."
14272 msgid "invalid --decorate option: %s"
14273 msgstr "ogiltig flagga för --decorate: %s"
14274
14280 -#: builtin/log.c:160
14281 -msgid ""
14282 -"log.mailmap is not set; its implicit value will change in an\n"
14283 -"upcoming release. To squelch this message and preserve current\n"
14284 -"behaviour, set the log.mailmap configuration value to false.\n"
14285 -"\n"
14286 -"To squelch this message and adopt the new behaviour now, set the\n"
14287 -"log.mailmap configuration value to true.\n"
14288 -"\n"
14289 -"See 'git help config' and search for 'log.mailmap' for further information."
14290 -msgstr ""
14291 -"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
14292 -"version. För att dölja det här meddelandet och behålla nuvarande\n"
14293 -"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
14294 -"\n"
14295 -"För att dölja det här meddelandet och använda det nya beteendet,\n"
14296 -"sätt konfigurationsvariabeln log.mailmap till true.\n"
14297 -"\n"
14298 -"Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
14299 -
14300 -#: builtin/log.c:183
14275 +#: builtin/log.c:173
14276 msgid "show source"
14277 msgstr "visa källkod"
14278
14304 -#: builtin/log.c:184
14279 +#: builtin/log.c:174
14280 msgid "Use mail map file"
14281 msgstr "Använd e-postmappningsfil"
14282
14308 -#: builtin/log.c:186
14283 +#: builtin/log.c:176
14284 msgid "only decorate refs that match <pattern>"
14285 msgstr "dekorera endast referenser som motsvarar <mönster>"
14286
14312 -#: builtin/log.c:188
14287 +#: builtin/log.c:178
14288 msgid "do not decorate refs that match <pattern>"
14289 msgstr "dekorera inte referenser som motsvarar <mönster>"
14290
14316 -#: builtin/log.c:189
14291 +#: builtin/log.c:179
14292 msgid "decorate options"
14293 msgstr "dekoreringsflaggor"
14294
14320 -#: builtin/log.c:192
14295 +#: builtin/log.c:182
14296 msgid "Process line range n,m in file, counting from 1"
14297 msgstr "Behandla radintervallet n,m i filen, med början på 1"
14298
14324 -#: builtin/log.c:297
14299 +#: builtin/log.c:280
14300 #, c-format
14301 msgid "Final output: %d %s\n"
14302 msgstr "Slututdata: %d %s\n"
14303
14329 -#: builtin/log.c:551
14304 +#: builtin/log.c:534
14305 #, c-format
14306 msgid "git show %s: bad file"
14307 msgstr "git show %s: felaktig fil"
14308
14334 -#: builtin/log.c:566 builtin/log.c:660
14309 +#: builtin/log.c:549 builtin/log.c:643
14310 #, c-format
14311 msgid "could not read object %s"
14312 msgstr "kunde inte läsa objektet %s"
14313
14339 -#: builtin/log.c:685
14314 +#: builtin/log.c:668
14315 #, c-format
14316 msgid "unknown type: %d"
14317 msgstr "okänd typ: %d"
14318
14344 -#: builtin/log.c:808
14319 +#: builtin/log.c:791
14320 msgid "format.headers without value"
14321 msgstr "format.headers utan värde"
14322
14348 -#: builtin/log.c:925
14323 +#: builtin/log.c:908
14324 msgid "name of output directory is too long"
14325 msgstr "namnet på utdatakatalogen är för långt"
14326
14352 -#: builtin/log.c:941
14327 +#: builtin/log.c:924
14328 #, c-format
14329 msgid "cannot open patch file %s"
14330 msgstr "kan inte öppna patchfilen %s"
14331
14357 -#: builtin/log.c:958
14332 +#: builtin/log.c:941
14333 msgid "need exactly one range"
14334 msgstr "behöver precis ett intervall"
14335
14361 -#: builtin/log.c:968
14336 +#: builtin/log.c:951
14337 msgid "not a range"
14338 msgstr "inte ett intervall"
14339
14365 -#: builtin/log.c:1091
14340 +#: builtin/log.c:1074
14341 msgid "cover letter needs email format"
14342 msgstr "omslagsbrevet behöver e-postformat"
14343
14369 -#: builtin/log.c:1097
14344 +#: builtin/log.c:1080
14345 msgid "failed to create cover-letter file"
14346 msgstr "misslyckades skapa fil för omslagsbrev"
14347
14373 -#: builtin/log.c:1176
14348 +#: builtin/log.c:1159
14349 #, c-format
14350 msgid "insane in-reply-to: %s"
14351 msgstr "tokigt in-reply-to: %s"
14352
14378 -#: builtin/log.c:1203
14353 +#: builtin/log.c:1186
14354 msgid "git format-patch [<options>] [<since> | <revision-range>]"
14355 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
14356
14382 -#: builtin/log.c:1261
14357 +#: builtin/log.c:1244
14358 msgid "two output directories?"
14359 msgstr "två utdatakataloger?"
14360
14386 -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
14361 +#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113
14362 #, c-format
14363 msgid "unknown commit %s"
14364 msgstr "okänd incheckning %s"
14365
14391 -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
14366 +#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207
14367 #: builtin/replace.c:210
14368 #, c-format
14369 msgid "failed to resolve '%s' as a valid ref"
14370 msgstr "misslyckades slå upp \"%s\" som en giltig referens"
14371
14397 -#: builtin/log.c:1387
14372 +#: builtin/log.c:1370
14373 msgid "could not find exact merge base"
14374 msgstr "kunde inte hitta exakt sammanslagningsbas"
14375
14401 -#: builtin/log.c:1391
14376 +#: builtin/log.c:1374
14377 msgid ""
14378 "failed to get upstream, if you want to record base commit automatically,\n"
14379 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -14408,267 +14383,267 @@ msgstr ""
14383 "använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
14384 "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
14385
14411 -#: builtin/log.c:1411
14386 +#: builtin/log.c:1394
14387 msgid "failed to find exact merge base"
14388 msgstr "kunde inte hitta exakt sammanslagningsbas"
14389
14415 -#: builtin/log.c:1422
14390 +#: builtin/log.c:1405
14391 msgid "base commit should be the ancestor of revision list"
14392 msgstr "basincheckningen bör vara förfader till revisionslistan"
14393
14419 -#: builtin/log.c:1426
14394 +#: builtin/log.c:1409
14395 msgid "base commit shouldn't be in revision list"
14396 msgstr "basincheckningen bör inte vara i revisionslistan"
14397
14423 -#: builtin/log.c:1479
14398 +#: builtin/log.c:1462
14399 msgid "cannot get patch id"
14400 msgstr "kan inte hämta patch-id"
14401
14427 -#: builtin/log.c:1531
14402 +#: builtin/log.c:1514
14403 msgid "failed to infer range-diff ranges"
14404 msgstr "misslyckades räkna ut intervall range-diff"
14405
14431 -#: builtin/log.c:1576
14406 +#: builtin/log.c:1559
14407 msgid "use [PATCH n/m] even with a single patch"
14408 msgstr "använd [PATCH n/m] även för en ensam patch"
14409
14435 -#: builtin/log.c:1579
14410 +#: builtin/log.c:1562
14411 msgid "use [PATCH] even with multiple patches"
14412 msgstr "använd [PATCH] även för flera patchar"
14413
14439 -#: builtin/log.c:1583
14414 +#: builtin/log.c:1566
14415 msgid "print patches to standard out"
14416 msgstr "skriv patcharna på standard ut"
14417
14443 -#: builtin/log.c:1585
14418 +#: builtin/log.c:1568
14419 msgid "generate a cover letter"
14420 msgstr "generera ett följebrev"
14421
14447 -#: builtin/log.c:1587
14422 +#: builtin/log.c:1570
14423 msgid "use simple number sequence for output file names"
14424 msgstr "använd enkel nummersekvens för utdatafilnamn"
14425
14451 -#: builtin/log.c:1588
14426 +#: builtin/log.c:1571
14427 msgid "sfx"
14428 msgstr "sfx"
14429
14455 -#: builtin/log.c:1589
14430 +#: builtin/log.c:1572
14431 msgid "use <sfx> instead of '.patch'"
14432 msgstr "använd <sfx> istället för \".patch\""
14433
14459 -#: builtin/log.c:1591
14434 +#: builtin/log.c:1574
14435 msgid "start numbering patches at <n> instead of 1"
14436 msgstr "börja numrera patchar på <n> istället för 1"
14437
14463 -#: builtin/log.c:1593
14438 +#: builtin/log.c:1576
14439 msgid "mark the series as Nth re-roll"
14440 msgstr "markera serien som N:te försök"
14441
14467 -#: builtin/log.c:1595
14442 +#: builtin/log.c:1578
14443 msgid "Use [RFC PATCH] instead of [PATCH]"
14444 msgstr "Använd [RFC PATCH] istället för [PATCH]"
14445
14471 -#: builtin/log.c:1598
14446 +#: builtin/log.c:1581
14447 msgid "Use [<prefix>] instead of [PATCH]"
14448 msgstr "Använd [<prefix>] istället för [PATCH]"
14449
14475 -#: builtin/log.c:1601
14450 +#: builtin/log.c:1584
14451 msgid "store resulting files in <dir>"
14452 msgstr "spara filerna i <katalog>"
14453
14479 -#: builtin/log.c:1604
14454 +#: builtin/log.c:1587
14455 msgid "don't strip/add [PATCH]"
14456 msgstr "ta inte bort eller lägg till [PATCH]"
14457
14483 -#: builtin/log.c:1607
14458 +#: builtin/log.c:1590
14459 msgid "don't output binary diffs"
14460 msgstr "skriv inte binära diffar"
14461
14487 -#: builtin/log.c:1609
14462 +#: builtin/log.c:1592
14463 msgid "output all-zero hash in From header"
14464 msgstr "använd hashvärde med nollor i From-huvud"
14465
14491 -#: builtin/log.c:1611
14466 +#: builtin/log.c:1594
14467 msgid "don't include a patch matching a commit upstream"
14468 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
14469
14495 -#: builtin/log.c:1613
14470 +#: builtin/log.c:1596
14471 msgid "show patch format instead of default (patch + stat)"
14472 msgstr "visa patchformat istället för standard (patch + stat)"
14473
14499 -#: builtin/log.c:1615
14474 +#: builtin/log.c:1598
14475 msgid "Messaging"
14476 msgstr "E-post"
14477
14503 -#: builtin/log.c:1616
14478 +#: builtin/log.c:1599
14479 msgid "header"
14480 msgstr "huvud"
14481
14507 -#: builtin/log.c:1617
14482 +#: builtin/log.c:1600
14483 msgid "add email header"
14484 msgstr "lägg till e-posthuvud"
14485
14511 -#: builtin/log.c:1618 builtin/log.c:1620
14486 +#: builtin/log.c:1601 builtin/log.c:1603
14487 msgid "email"
14488 msgstr "epost"
14489
14515 -#: builtin/log.c:1618
14490 +#: builtin/log.c:1601
14491 msgid "add To: header"
14492 msgstr "lägg till mottagarhuvud (\"To:\")"
14493
14519 -#: builtin/log.c:1620
14494 +#: builtin/log.c:1603
14495 msgid "add Cc: header"
14496 msgstr "lägg till kopiehuvud (\"Cc:\")"
14497
14523 -#: builtin/log.c:1622
14498 +#: builtin/log.c:1605
14499 msgid "ident"
14500 msgstr "ident"
14501
14527 -#: builtin/log.c:1623
14502 +#: builtin/log.c:1606
14503 msgid "set From address to <ident> (or committer ident if absent)"
14504 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
14505
14531 -#: builtin/log.c:1625
14506 +#: builtin/log.c:1608
14507 msgid "message-id"
14508 msgstr "meddelande-id"
14509
14535 -#: builtin/log.c:1626
14510 +#: builtin/log.c:1609
14511 msgid "make first mail a reply to <message-id>"
14512 msgstr "gör det första brevet ett svar till <meddelande-id>"
14513
14539 -#: builtin/log.c:1627 builtin/log.c:1630
14514 +#: builtin/log.c:1610 builtin/log.c:1613
14515 msgid "boundary"
14516 msgstr "gräns"
14517
14543 -#: builtin/log.c:1628
14518 +#: builtin/log.c:1611
14519 msgid "attach the patch"
14520 msgstr "bifoga patchen"
14521
14547 -#: builtin/log.c:1631
14522 +#: builtin/log.c:1614
14523 msgid "inline the patch"
14524 msgstr "gör patchen ett inline-objekt"
14525
14551 -#: builtin/log.c:1635
14526 +#: builtin/log.c:1618
14527 msgid "enable message threading, styles: shallow, deep"
14528 msgstr "aktivera brevtrådning, typer: shallow, deep"
14529
14555 -#: builtin/log.c:1637
14530 +#: builtin/log.c:1620
14531 msgid "signature"
14532 msgstr "signatur"
14533
14559 -#: builtin/log.c:1638
14534 +#: builtin/log.c:1621
14535 msgid "add a signature"
14536 msgstr "lägg till signatur"
14537
14563 -#: builtin/log.c:1639
14538 +#: builtin/log.c:1622
14539 msgid "base-commit"
14540 msgstr "basincheckning"
14541
14567 -#: builtin/log.c:1640
14542 +#: builtin/log.c:1623
14543 msgid "add prerequisite tree info to the patch series"
14544 msgstr "lägg till förhandskrävd trädinfo i patchserien"
14545
14571 -#: builtin/log.c:1642
14546 +#: builtin/log.c:1625
14547 msgid "add a signature from a file"
14548 msgstr "lägg till signatur från fil"
14549
14575 -#: builtin/log.c:1643
14550 +#: builtin/log.c:1626
14551 msgid "don't print the patch filenames"
14552 msgstr "visa inte filnamn för patchar"
14553
14579 -#: builtin/log.c:1645
14554 +#: builtin/log.c:1628
14555 msgid "show progress while generating patches"
14556 msgstr "visa förloppsindikator medan patchar skapas"
14557
14583 -#: builtin/log.c:1647
14558 +#: builtin/log.c:1630
14559 msgid "show changes against <rev> in cover letter or single patch"
14560 msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
14561
14587 -#: builtin/log.c:1650
14562 +#: builtin/log.c:1633
14563 msgid "show changes against <refspec> in cover letter or single patch"
14564 msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
14565
14591 -#: builtin/log.c:1652
14566 +#: builtin/log.c:1635
14567 msgid "percentage by which creation is weighted"
14568 msgstr "procent som skapelse vägs med"
14569
14595 -#: builtin/log.c:1727
14570 +#: builtin/log.c:1710
14571 #, c-format
14572 msgid "invalid ident line: %s"
14573 msgstr "ogiltig ident-rad: %s"
14574
14600 -#: builtin/log.c:1742
14575 +#: builtin/log.c:1725
14576 msgid "-n and -k are mutually exclusive"
14577 msgstr "-n och -k kan inte användas samtidigt"
14578
14604 -#: builtin/log.c:1744
14579 +#: builtin/log.c:1727
14580 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
14581 msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
14582
14608 -#: builtin/log.c:1752
14583 +#: builtin/log.c:1735
14584 msgid "--name-only does not make sense"
14585 msgstr "kan inte använda --name-only"
14586
14612 -#: builtin/log.c:1754
14587 +#: builtin/log.c:1737
14588 msgid "--name-status does not make sense"
14589 msgstr "kan inte använda --name-status"
14590
14616 -#: builtin/log.c:1756
14591 +#: builtin/log.c:1739
14592 msgid "--check does not make sense"
14593 msgstr "kan inte använda --check"
14594
14620 -#: builtin/log.c:1788
14595 +#: builtin/log.c:1771
14596 msgid "standard output, or directory, which one?"
14597 msgstr "standard ut, eller katalog, vilken skall det vara?"
14598
14624 -#: builtin/log.c:1877
14599 +#: builtin/log.c:1860
14600 msgid "--interdiff requires --cover-letter or single patch"
14601 msgstr "--interdiff kräver --cover-letter eller ensam patch"
14602
14628 -#: builtin/log.c:1881
14603 +#: builtin/log.c:1864
14604 msgid "Interdiff:"
14605 msgstr "Interdiff:"
14606
14632 -#: builtin/log.c:1882
14607 +#: builtin/log.c:1865
14608 #, c-format
14609 msgid "Interdiff against v%d:"
14610 msgstr "Interdiff mot v%d:"
14611
14637 -#: builtin/log.c:1888
14612 +#: builtin/log.c:1871
14613 msgid "--creation-factor requires --range-diff"
14614 msgstr "--creation-factor kräver --range-diff"
14615
14641 -#: builtin/log.c:1892
14616 +#: builtin/log.c:1875
14617 msgid "--range-diff requires --cover-letter or single patch"
14618 msgstr "--range-diff kräver --cover-letter eller ensam patch"
14619
14645 -#: builtin/log.c:1900
14620 +#: builtin/log.c:1883
14621 msgid "Range-diff:"
14622 msgstr "Intervall-diff:"
14623
14649 -#: builtin/log.c:1901
14624 +#: builtin/log.c:1884
14625 #, c-format
14626 msgid "Range-diff against v%d:"
14627 msgstr "Intervall-diff mot v%d:"
14628
14654 -#: builtin/log.c:1912
14629 +#: builtin/log.c:1895
14630 #, c-format
14631 msgid "unable to read signature file '%s'"
14632 msgstr "kunde inte läsa signaturfil \"%s\""
14633
14659 -#: builtin/log.c:1948
14634 +#: builtin/log.c:1931
14635 msgid "Generating patches"
14636 msgstr "Skapar patchar"
14637
14663 -#: builtin/log.c:1992
14638 +#: builtin/log.c:1975
14639 msgid "failed to create output files"
14640 msgstr "misslyckades skapa utdatafiler"
14641
14667 -#: builtin/log.c:2051
14642 +#: builtin/log.c:2034
14643 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
14644 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
14645
14671 -#: builtin/log.c:2105
14646 +#: builtin/log.c:2088
14647 #, c-format
14648 msgid ""
14649 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15499,7 +15474,7 @@ msgstr "%s, källa=%s, mål=%s"
15474 msgid "Renaming %s to %s\n"
15475 msgstr "Byter namn på %s till %s\n"
15476
15502 -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
15477 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510
15478 #, c-format
15479 msgid "renaming '%s' failed"
15480 msgstr "misslyckades byta namn på \"%s\""
@@ -15976,125 +15951,125 @@ msgid ""
15951 msgstr ""
15952 "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
15953
15979 -#: builtin/pack-objects.c:424
15954 +#: builtin/pack-objects.c:428
15955 #, c-format
15956 msgid "bad packed object CRC for %s"
15957 msgstr "felaktig CRC för packat objekt %s"
15958
15984 -#: builtin/pack-objects.c:435
15959 +#: builtin/pack-objects.c:439
15960 #, c-format
15961 msgid "corrupt packed object for %s"
15962 msgstr "trasigt packat objekt för %s"
15963
15989 -#: builtin/pack-objects.c:566
15964 +#: builtin/pack-objects.c:570
15965 #, c-format
15966 msgid "recursive delta detected for object %s"
15967 msgstr "rekursivt delta upptäcktes för objektet %s"
15968
15994 -#: builtin/pack-objects.c:777
15969 +#: builtin/pack-objects.c:781
15970 #, c-format
15971 msgid "ordered %u objects, expected %<PRIu32>"
15972 msgstr "ordnade %u objekt, förväntade %<PRIu32>"
15973
15999 -#: builtin/pack-objects.c:790
15974 +#: builtin/pack-objects.c:794
15975 #, c-format
15976 msgid "packfile is invalid: %s"
15977 msgstr "packfil är ogiltig: %s"
15978
16004 -#: builtin/pack-objects.c:794
15979 +#: builtin/pack-objects.c:798
15980 #, c-format
15981 msgid "unable to open packfile for reuse: %s"
15982 msgstr "kan inte öppna packfil för återanvändning: %s"
15983
16009 -#: builtin/pack-objects.c:798
15984 +#: builtin/pack-objects.c:802
15985 msgid "unable to seek in reused packfile"
15986 msgstr "kan inte söka i återanvänd packfil"
15987
16013 -#: builtin/pack-objects.c:809
15988 +#: builtin/pack-objects.c:813
15989 msgid "unable to read from reused packfile"
15990 msgstr "kan inte läsa från återanvänd packfil"
15991
16017 -#: builtin/pack-objects.c:837
15992 +#: builtin/pack-objects.c:841
15993 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
15994 msgstr ""
15995 "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
15996
16022 -#: builtin/pack-objects.c:850
15997 +#: builtin/pack-objects.c:854
15998 msgid "Writing objects"
15999 msgstr "Skriver objekt"
16000
16026 -#: builtin/pack-objects.c:912 builtin/update-index.c:89
16001 +#: builtin/pack-objects.c:917 builtin/update-index.c:89
16002 #, c-format
16003 msgid "failed to stat %s"
16004 msgstr "misslyckades ta status på %s"
16005
16031 -#: builtin/pack-objects.c:965
16006 +#: builtin/pack-objects.c:970
16007 #, c-format
16008 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
16009 msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
16010
16036 -#: builtin/pack-objects.c:1161
16011 +#: builtin/pack-objects.c:1166
16012 msgid "disabling bitmap writing, as some objects are not being packed"
16013 msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
16014
16040 -#: builtin/pack-objects.c:1591
16015 +#: builtin/pack-objects.c:1597
16016 #, c-format
16017 msgid "delta base offset overflow in pack for %s"
16018 msgstr "deltabasoffset utanför gränsen i pack för %s"
16019
16045 -#: builtin/pack-objects.c:1600
16020 +#: builtin/pack-objects.c:1606
16021 #, c-format
16022 msgid "delta base offset out of bound for %s"
16023 msgstr "deltabasoffset utanför gränsvärden för %s"
16024
16050 -#: builtin/pack-objects.c:1869
16025 +#: builtin/pack-objects.c:1875
16026 msgid "Counting objects"
16027 msgstr "Räknar objekt"
16028
16054 -#: builtin/pack-objects.c:1999
16029 +#: builtin/pack-objects.c:2005
16030 #, c-format
16031 msgid "unable to get size of %s"
16032 msgstr "kan inte hämta storlek på %s"
16033
16059 -#: builtin/pack-objects.c:2014
16034 +#: builtin/pack-objects.c:2020
16035 #, c-format
16036 msgid "unable to parse object header of %s"
16037 msgstr "kunde inte tolka objekthuvud för %s"
16038
16064 -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
16065 -#: builtin/pack-objects.c:2110
16039 +#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106
16040 +#: builtin/pack-objects.c:2116
16041 #, c-format
16042 msgid "object %s cannot be read"
16043 msgstr "objektet %s kunde inte läsas"
16044
16070 -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
16045 +#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120
16046 #, c-format
16047 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
16048 msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
16049
16075 -#: builtin/pack-objects.c:2124
16050 +#: builtin/pack-objects.c:2130
16051 msgid "suboptimal pack - out of memory"
16052 msgstr "icke-optimalt pack - minnet slut"
16053
16079 -#: builtin/pack-objects.c:2450
16054 +#: builtin/pack-objects.c:2456
16055 #, c-format
16056 msgid "Delta compression using up to %d threads"
16057 msgstr "Deltakomprimering använder upp till %d trådar"
16058
16084 -#: builtin/pack-objects.c:2582
16059 +#: builtin/pack-objects.c:2588
16060 #, c-format
16061 msgid "unable to pack objects reachable from tag %s"
16062 msgstr "kan inte packa objekt nåbara från taggen %s"
16063
16089 -#: builtin/pack-objects.c:2669
16064 +#: builtin/pack-objects.c:2675
16065 msgid "Compressing objects"
16066 msgstr "Komprimerar objekt"
16067
16093 -#: builtin/pack-objects.c:2675
16068 +#: builtin/pack-objects.c:2681
16069 msgid "inconsistency with delta count"
16070 msgstr "deltaräknaren är inkonsekvent"
16071
16097 -#: builtin/pack-objects.c:2756
16072 +#: builtin/pack-objects.c:2762
16073 #, c-format
16074 msgid ""
16075 "expected edge object ID, got garbage:\n"
@@ -16103,7 +16078,7 @@ msgstr ""
16078 "förväntade kant-objekt-id, fick skräp:\n"
16079 " %s"
16080
16106 -#: builtin/pack-objects.c:2762
16081 +#: builtin/pack-objects.c:2768
16082 #, c-format
16083 msgid ""
16084 "expected object ID, got garbage:\n"
@@ -16112,239 +16087,243 @@ msgstr ""
16087 "förväntade objekt-id, fick skräp:\n"
16088 " %s"
16089
16115 -#: builtin/pack-objects.c:2860
16090 +#: builtin/pack-objects.c:2866
16091 msgid "invalid value for --missing"
16092 msgstr "ogiltigt värde för --missing"
16093
16119 -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
16094 +#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033
16095 msgid "cannot open pack index"
16096 msgstr "kan inte öppna paketfilen"
16097
16123 -#: builtin/pack-objects.c:2950
16098 +#: builtin/pack-objects.c:2956
16099 #, c-format
16100 msgid "loose object at %s could not be examined"
16101 msgstr "lösa objekt på %s kunde inte underökas"
16102
16128 -#: builtin/pack-objects.c:3035
16103 +#: builtin/pack-objects.c:3041
16104 msgid "unable to force loose object"
16105 msgstr "kan inte tvinga lösa objekt"
16106
16132 -#: builtin/pack-objects.c:3127
16107 +#: builtin/pack-objects.c:3133
16108 #, c-format
16109 msgid "not a rev '%s'"
16110 msgstr "inte en referens \"%s\""
16111
16137 -#: builtin/pack-objects.c:3130
16112 +#: builtin/pack-objects.c:3136
16113 #, c-format
16114 msgid "bad revision '%s'"
16115 msgstr "felaktig revision \"%s\""
16116
16142 -#: builtin/pack-objects.c:3155
16117 +#: builtin/pack-objects.c:3161
16118 msgid "unable to add recent objects"
16119 msgstr "kan inte lägga till nya objekt"
16120
16146 -#: builtin/pack-objects.c:3208
16121 +#: builtin/pack-objects.c:3214
16122 #, c-format
16123 msgid "unsupported index version %s"
16124 msgstr "indexversionen %s stöds ej"
16125
16151 -#: builtin/pack-objects.c:3212
16126 +#: builtin/pack-objects.c:3218
16127 #, c-format
16128 msgid "bad index version '%s'"
16129 msgstr "felaktig indexversion \"%s\""
16130
16156 -#: builtin/pack-objects.c:3242
16131 +#: builtin/pack-objects.c:3248
16132 msgid "do not show progress meter"
16133 msgstr "visa inte förloppsindikator"
16134
16160 -#: builtin/pack-objects.c:3244
16135 +#: builtin/pack-objects.c:3250
16136 msgid "show progress meter"
16137 msgstr "visa förloppsindikator"
16138
16164 -#: builtin/pack-objects.c:3246
16139 +#: builtin/pack-objects.c:3252
16140 msgid "show progress meter during object writing phase"
16141 msgstr "visa förloppsindikator under objektskrivningsfasen"
16142
16168 -#: builtin/pack-objects.c:3249
16143 +#: builtin/pack-objects.c:3255
16144 msgid "similar to --all-progress when progress meter is shown"
16145 msgstr "som --all-progress när förloppsindikatorn visas"
16146
16172 -#: builtin/pack-objects.c:3250
16147 +#: builtin/pack-objects.c:3256
16148 msgid "<version>[,<offset>]"
16149 msgstr "<version>[,<offset>]"
16150
16176 -#: builtin/pack-objects.c:3251
16151 +#: builtin/pack-objects.c:3257
16152 msgid "write the pack index file in the specified idx format version"
16153 msgstr "skriv paketindexfilen i angiven indexformatversion"
16154
16180 -#: builtin/pack-objects.c:3254
16155 +#: builtin/pack-objects.c:3260
16156 msgid "maximum size of each output pack file"
16157 msgstr "maximal storlek på varje utdatapaketfil"
16158
16184 -#: builtin/pack-objects.c:3256
16159 +#: builtin/pack-objects.c:3262
16160 msgid "ignore borrowed objects from alternate object store"
16161 msgstr "ignorera lånade objekt från alternativa objektlager"
16162
16188 -#: builtin/pack-objects.c:3258
16163 +#: builtin/pack-objects.c:3264
16164 msgid "ignore packed objects"
16165 msgstr "ignorera packade objekt"
16166
16192 -#: builtin/pack-objects.c:3260
16167 +#: builtin/pack-objects.c:3266
16168 msgid "limit pack window by objects"
16169 msgstr "begränsa paketfönster efter objekt"
16170
16196 -#: builtin/pack-objects.c:3262
16171 +#: builtin/pack-objects.c:3268
16172 msgid "limit pack window by memory in addition to object limit"
16173 msgstr "begränsa paketfönster efter minne förutom objektgräns"
16174
16200 -#: builtin/pack-objects.c:3264
16175 +#: builtin/pack-objects.c:3270
16176 msgid "maximum length of delta chain allowed in the resulting pack"
16177 msgstr "maximal längd på deltakedja tillåten i slutligt paket"
16178
16204 -#: builtin/pack-objects.c:3266
16179 +#: builtin/pack-objects.c:3272
16180 msgid "reuse existing deltas"
16181 msgstr "återanvänd befintliga delta"
16182
16208 -#: builtin/pack-objects.c:3268
16183 +#: builtin/pack-objects.c:3274
16184 msgid "reuse existing objects"
16185 msgstr "återanvänd befintliga objekt"
16186
16212 -#: builtin/pack-objects.c:3270
16187 +#: builtin/pack-objects.c:3276
16188 msgid "use OFS_DELTA objects"
16189 msgstr "använd OFS_DELTA-objekt"
16190
16216 -#: builtin/pack-objects.c:3272
16191 +#: builtin/pack-objects.c:3278
16192 msgid "use threads when searching for best delta matches"
16193 msgstr "använd trådar vid sökning efter bästa deltaträffar"
16194
16220 -#: builtin/pack-objects.c:3274
16195 +#: builtin/pack-objects.c:3280
16196 msgid "do not create an empty pack output"
16197 msgstr "försök inte skapa tom paketutdata"
16198
16224 -#: builtin/pack-objects.c:3276
16199 +#: builtin/pack-objects.c:3282
16200 msgid "read revision arguments from standard input"
16201 msgstr "läs revisionsargument från standard in"
16202
16228 -#: builtin/pack-objects.c:3278
16203 +#: builtin/pack-objects.c:3284
16204 msgid "limit the objects to those that are not yet packed"
16205 msgstr "begränsa objekt till dem som ännu inte packats"
16206
16232 -#: builtin/pack-objects.c:3281
16207 +#: builtin/pack-objects.c:3287
16208 msgid "include objects reachable from any reference"
16209 msgstr "inkludera objekt som kan nås från någon referens"
16210
16236 -#: builtin/pack-objects.c:3284
16211 +#: builtin/pack-objects.c:3290
16212 msgid "include objects referred by reflog entries"
16213 msgstr "inkludera objekt som refereras från referensloggposter"
16214
16240 -#: builtin/pack-objects.c:3287
16215 +#: builtin/pack-objects.c:3293
16216 msgid "include objects referred to by the index"
16217 msgstr "inkludera objekt som refereras från indexet"
16218
16244 -#: builtin/pack-objects.c:3290
16219 +#: builtin/pack-objects.c:3296
16220 msgid "output pack to stdout"
16221 msgstr "skriv paket på standard ut"
16222
16248 -#: builtin/pack-objects.c:3292
16223 +#: builtin/pack-objects.c:3298
16224 msgid "include tag objects that refer to objects to be packed"
16225 msgstr "inkludera taggobjekt som refererar objekt som skall packas"
16226
16252 -#: builtin/pack-objects.c:3294
16227 +#: builtin/pack-objects.c:3300
16228 msgid "keep unreachable objects"
16229 msgstr "behåll onåbara objekt"
16230
16256 -#: builtin/pack-objects.c:3296
16231 +#: builtin/pack-objects.c:3302
16232 msgid "pack loose unreachable objects"
16233 msgstr "packa lösa onåbara objekt"
16234
16260 -#: builtin/pack-objects.c:3298
16235 +#: builtin/pack-objects.c:3304
16236 msgid "unpack unreachable objects newer than <time>"
16237 msgstr "packa upp onåbara objekt nyare än <tid>"
16238
16264 -#: builtin/pack-objects.c:3301
16239 +#: builtin/pack-objects.c:3307
16240 msgid "use the sparse reachability algorithm"
16241 msgstr "använd gles-nåbarhetsalgoritmen"
16242
16268 -#: builtin/pack-objects.c:3303
16243 +#: builtin/pack-objects.c:3309
16244 msgid "create thin packs"
16245 msgstr "skapa tunna paket"
16246
16272 -#: builtin/pack-objects.c:3305
16247 +#: builtin/pack-objects.c:3311
16248 msgid "create packs suitable for shallow fetches"
16249 msgstr "skapa packfiler lämpade för grunda hämtningar"
16250
16276 -#: builtin/pack-objects.c:3307
16251 +#: builtin/pack-objects.c:3313
16252 msgid "ignore packs that have companion .keep file"
16253 msgstr "ignorera paket som har tillhörande .keep-fil"
16254
16280 -#: builtin/pack-objects.c:3309
16255 +#: builtin/pack-objects.c:3315
16256 msgid "ignore this pack"
16257 msgstr "ignorera detta paket"
16258
16284 -#: builtin/pack-objects.c:3311
16259 +#: builtin/pack-objects.c:3317
16260 msgid "pack compression level"
16261 msgstr "komprimeringsgrad för paket"
16262
16288 -#: builtin/pack-objects.c:3313
16263 +#: builtin/pack-objects.c:3319
16264 msgid "do not hide commits by grafts"
16265 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
16266
16292 -#: builtin/pack-objects.c:3315
16267 +#: builtin/pack-objects.c:3321
16268 msgid "use a bitmap index if available to speed up counting objects"
16269 msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
16270
16296 -#: builtin/pack-objects.c:3317
16271 +#: builtin/pack-objects.c:3323
16272 msgid "write a bitmap index together with the pack index"
16273 msgstr "använd bitkartindex tillsammans med packindexet"
16274
16300 -#: builtin/pack-objects.c:3320
16275 +#: builtin/pack-objects.c:3327
16276 +msgid "write a bitmap index if possible"
16277 +msgstr "skriv bitkartindex om möjligt"
16278 +
16279 +#: builtin/pack-objects.c:3331
16280 msgid "handling for missing objects"
16281 msgstr "hantering av saknade objekt"
16282
16304 -#: builtin/pack-objects.c:3323
16283 +#: builtin/pack-objects.c:3334
16284 msgid "do not pack objects in promisor packfiles"
16285 msgstr "packa inte objekt i kontraktspackfiler"
16286
16308 -#: builtin/pack-objects.c:3325
16287 +#: builtin/pack-objects.c:3336
16288 msgid "respect islands during delta compression"
16289 msgstr "respektera öar under deltakomprimering"
16290
16312 -#: builtin/pack-objects.c:3350
16291 +#: builtin/pack-objects.c:3361
16292 #, c-format
16293 msgid "delta chain depth %d is too deep, forcing %d"
16294 msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
16295
16317 -#: builtin/pack-objects.c:3355
16296 +#: builtin/pack-objects.c:3366
16297 #, c-format
16298 msgid "pack.deltaCacheLimit is too high, forcing %d"
16299 msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
16300
16322 -#: builtin/pack-objects.c:3409
16301 +#: builtin/pack-objects.c:3420
16302 msgid "--max-pack-size cannot be used to build a pack for transfer"
16303 msgstr ""
16304 "--max-pack-size kan inte användas för att bygga ett paket som skall överföras"
16305
16327 -#: builtin/pack-objects.c:3411
16306 +#: builtin/pack-objects.c:3422
16307 msgid "minimum pack size limit is 1 MiB"
16308 msgstr "minsta packstorlek är 1 MiB"
16309
16331 -#: builtin/pack-objects.c:3416
16310 +#: builtin/pack-objects.c:3427
16311 msgid "--thin cannot be used to build an indexable pack"
16312 msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
16313
16335 -#: builtin/pack-objects.c:3419
16314 +#: builtin/pack-objects.c:3430
16315 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
16316 msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
16317
16339 -#: builtin/pack-objects.c:3425
16318 +#: builtin/pack-objects.c:3436
16319 msgid "cannot use --filter without --stdout"
16320 msgstr "kan inte använda --filter utan --stdout"
16321
16343 -#: builtin/pack-objects.c:3486
16322 +#: builtin/pack-objects.c:3497
16323 msgid "Enumerating objects"
16324 msgstr "Räknar upp objekt"
16325
16347 -#: builtin/pack-objects.c:3516
16326 +#: builtin/pack-objects.c:3527
16327 #, c-format
16328 msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
16329 msgstr ""
@@ -18264,112 +18243,112 @@ msgstr ""
18243 "Använd --no-write-bitmap-index eller inaktivera inställningen\n"
18244 "pack.writebitmaps"
18245
18267 -#: builtin/repack.c:201
18246 +#: builtin/repack.c:190
18247 msgid "could not start pack-objects to repack promisor objects"
18248 msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
18249
18271 -#: builtin/repack.c:240 builtin/repack.c:418
18250 +#: builtin/repack.c:229 builtin/repack.c:408
18251 msgid "repack: Expecting full hex object ID lines only from pack-objects."
18252 msgstr ""
18253 "repack: Förväntar kompletta hex-objekt-ID-rader endast från pack-objects."
18254
18276 -#: builtin/repack.c:257
18255 +#: builtin/repack.c:246
18256 msgid "could not finish pack-objects to repack promisor objects"
18257 msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
18258
18280 -#: builtin/repack.c:295
18259 +#: builtin/repack.c:284
18260 msgid "pack everything in a single pack"
18261 msgstr "packa allt i ett enda paket"
18262
18284 -#: builtin/repack.c:297
18263 +#: builtin/repack.c:286
18264 msgid "same as -a, and turn unreachable objects loose"
18265 msgstr "samma som -a, och gör onåbara objekt lösa"
18266
18288 -#: builtin/repack.c:300
18267 +#: builtin/repack.c:289
18268 msgid "remove redundant packs, and run git-prune-packed"
18269 msgstr "ta bort överflödiga paket, och kör git-prune-packed"
18270
18292 -#: builtin/repack.c:302
18271 +#: builtin/repack.c:291
18272 msgid "pass --no-reuse-delta to git-pack-objects"
18273 msgstr "sänd --no-reuse-delta till git-pack-objects"
18274
18296 -#: builtin/repack.c:304
18275 +#: builtin/repack.c:293
18276 msgid "pass --no-reuse-object to git-pack-objects"
18277 msgstr "sänd --no-reuse-object till git-pack-objects"
18278
18300 -#: builtin/repack.c:306
18279 +#: builtin/repack.c:295
18280 msgid "do not run git-update-server-info"
18281 msgstr "kör inte git-update-server-info"
18282
18304 -#: builtin/repack.c:309
18283 +#: builtin/repack.c:298
18284 msgid "pass --local to git-pack-objects"
18285 msgstr "sänd --local till git-pack-objects"
18286
18308 -#: builtin/repack.c:311
18287 +#: builtin/repack.c:300
18288 msgid "write bitmap index"
18289 msgstr "skriv bitkartindex"
18290
18312 -#: builtin/repack.c:313
18291 +#: builtin/repack.c:302
18292 msgid "pass --delta-islands to git-pack-objects"
18293 msgstr "sänd --delta-islands till git-pack-objects"
18294
18316 -#: builtin/repack.c:314
18295 +#: builtin/repack.c:303
18296 msgid "approxidate"
18297 msgstr "cirkadatum"
18298
18320 -#: builtin/repack.c:315
18299 +#: builtin/repack.c:304
18300 msgid "with -A, do not loosen objects older than this"
18301 msgstr "med -A, lös inte upp objekt äldre än detta"
18302
18324 -#: builtin/repack.c:317
18303 +#: builtin/repack.c:306
18304 msgid "with -a, repack unreachable objects"
18305 msgstr "med -a, packa om onåbara objekt"
18306
18328 -#: builtin/repack.c:319
18307 +#: builtin/repack.c:308
18308 msgid "size of the window used for delta compression"
18309 msgstr "storlek på fönster använt för deltakomprimering"
18310
18332 -#: builtin/repack.c:320 builtin/repack.c:326
18311 +#: builtin/repack.c:309 builtin/repack.c:315
18312 msgid "bytes"
18313 msgstr "byte"
18314
18336 -#: builtin/repack.c:321
18315 +#: builtin/repack.c:310
18316 msgid "same as the above, but limit memory size instead of entries count"
18317 msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
18318
18340 -#: builtin/repack.c:323
18319 +#: builtin/repack.c:312
18320 msgid "limits the maximum delta depth"
18321 msgstr "begränsa maximalt deltadjup"
18322
18344 -#: builtin/repack.c:325
18323 +#: builtin/repack.c:314
18324 msgid "limits the maximum number of threads"
18325 msgstr "begränsar maximalt antal trådar"
18326
18348 -#: builtin/repack.c:327
18327 +#: builtin/repack.c:316
18328 msgid "maximum size of each packfile"
18329 msgstr "maximal storlek på varje paketfil"
18330
18352 -#: builtin/repack.c:329
18331 +#: builtin/repack.c:318
18332 msgid "repack objects in packs marked with .keep"
18333 msgstr "packa om objekt i paket märkta med .keep"
18334
18356 -#: builtin/repack.c:331
18335 +#: builtin/repack.c:320
18336 msgid "do not repack this pack"
18337 msgstr "packa inte om detta paket"
18338
18360 -#: builtin/repack.c:341
18339 +#: builtin/repack.c:330
18340 msgid "cannot delete packs in a precious-objects repo"
18341 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
18342
18364 -#: builtin/repack.c:345
18343 +#: builtin/repack.c:334
18344 msgid "--keep-unreachable and -A are incompatible"
18345 msgstr "--keep-unreachable och -A kan inte användas samtidigt"
18346
18368 -#: builtin/repack.c:427
18347 +#: builtin/repack.c:417
18348 msgid "Nothing new to pack."
18349 msgstr "Inget nytt att packa."
18350
18372 -#: builtin/repack.c:488
18351 +#: builtin/repack.c:478
18352 #, c-format
18353 msgid ""
18354 "WARNING: Some packs in use have been renamed by\n"
@@ -18388,7 +18367,7 @@ msgstr ""
18367 "VARNING: namnet misslyckades också.\n"
18368 "VARNING: Byt namn på dem i %s manuellt:\n"
18369
18391 -#: builtin/repack.c:536
18370 +#: builtin/repack.c:526
18371 #, c-format
18372 msgid "failed to remove '%s'"
18373 msgstr "misslyckades ta bort \"%s\""
@@ -20471,15 +20450,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
20450 msgid "interrupt transfer after <n> seconds of inactivity"
20451 msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
20452
20474 -#: builtin/verify-commit.c:20
20453 +#: builtin/verify-commit.c:19
20454 msgid "git verify-commit [-v | --verbose] <commit>..."
20455 msgstr "git verify-commit [-v | --verbose] <incheckning>..."
20456
20478 -#: builtin/verify-commit.c:69
20457 +#: builtin/verify-commit.c:68
20458 msgid "print commit contents"
20459 msgstr "visa innehåll för incheckning"
20460
20482 -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
20461 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
20462 msgid "print raw gpg status output"
20463 msgstr "visa råa gpg-statusdata"
20464
@@ -20495,11 +20474,11 @@ msgstr "pratsam"
20474 msgid "show statistics only"
20475 msgstr "visa endast statistik"
20476
20498 -#: builtin/verify-tag.c:19
20477 +#: builtin/verify-tag.c:18
20478 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
20479 msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
20480
20502 -#: builtin/verify-tag.c:37
20481 +#: builtin/verify-tag.c:36
20482 msgid "print tag contents"
20483 msgstr "visa innehåll för tag"
20484
@@ -20940,17 +20919,17 @@ msgstr "okänt skrivfel på standard ut"
20919 msgid "close failed on standard output"
20920 msgstr "stäng misslyckades på standard ut"
20921
20943 -#: git.c:796
20922 +#: git.c:793
20923 #, c-format
20924 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
20925 msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
20926
20948 -#: git.c:846
20927 +#: git.c:843
20928 #, c-format
20929 msgid "cannot handle %s as a builtin"
20930 msgstr "kan inte hantera %s som inbyggd"
20931
20953 -#: git.c:859
20932 +#: git.c:856
20933 #, c-format
20934 msgid ""
20935 "usage: %s\n"
@@ -20959,13 +20938,13 @@ msgstr ""
20938 "användning: %s\n"
20939 "\n"
20940
20962 -#: git.c:879
20941 +#: git.c:876
20942 #, c-format
20943 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
20944 msgstr ""
20945 "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
20946
20968 -#: git.c:891
20947 +#: git.c:888
20948 #, c-format
20949 msgid "failed to run command '%s': %s\n"
20950 msgstr "misslyckades köra kommandot \"%s\": %s\n"
@@ -21170,11 +21149,11 @@ msgstr "fältnamn att sortera på"
21149 msgid "update the index with reused conflict resolution if possible"
21150 msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
21151
21173 -#: wt-status.h:68
21152 +#: wt-status.h:67
21153 msgid "HEAD detached at "
21154 msgstr "HEAD frånkopplad vid "
21155
21177 -#: wt-status.h:69
21156 +#: wt-status.h:68
21157 msgid "HEAD detached from "
21158 msgstr "HEAD frånkopplad från "
21159
@@ -23524,6 +23503,39 @@ msgstr ""
23503 msgid "Do you really want to send %s? [y|N]: "
23504 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
23505
23506 +#~ msgid ""
23507 +#~ "Fetch normally indicates which branches had a forced update, but that "
23508 +#~ "check has been disabled."
23509 +#~ msgstr ""
23510 +#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, "
23511 +#~ "men det testet har slagits av."
23512 +
23513 +#~ msgid ""
23514 +#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
23515 +#~ msgstr ""
23516 +#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika "
23517 +#~ "testet.\n"
23518 +
23519 +#~ msgid ""
23520 +#~ "log.mailmap is not set; its implicit value will change in an\n"
23521 +#~ "upcoming release. To squelch this message and preserve current\n"
23522 +#~ "behaviour, set the log.mailmap configuration value to false.\n"
23523 +#~ "\n"
23524 +#~ "To squelch this message and adopt the new behaviour now, set the\n"
23525 +#~ "log.mailmap configuration value to true.\n"
23526 +#~ "\n"
23527 +#~ "See 'git help config' and search for 'log.mailmap' for further "
23528 +#~ "information."
23529 +#~ msgstr ""
23530 +#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
23531 +#~ "version. För att dölja det här meddelandet och behålla nuvarande\n"
23532 +#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
23533 +#~ "\n"
23534 +#~ "För att dölja det här meddelandet och använda det nya beteendet,\n"
23535 +#~ "sätt konfigurationsvariabeln log.mailmap till true.\n"
23536 +#~ "\n"
23537 +#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
23538 +
23539 #~ msgid "Server supports multi_ack_detailed"
23540 #~ msgstr "Servern stöder \"multi_ack_detailed\""
23541