3f0812f68d · matheusbsbs/matheus-bagliano

@@ -7,8 +7,8 @@ msgid ""

7 msgstr ""

8 "Project-Id-Version: git 1.7.10\n"

9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"

10 -"POT-Creation-Date: 2012-03-16 20:18+0800\n"

11 -"PO-Revision-Date: 2012-03-26 07:00+0100\n"

10 +"POT-Creation-Date: 2012-05-15 06:31+0800\n"

11 +"PO-Revision-Date: 2012-05-28 22:35+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"

@@ -17,7 +17,7 @@ msgstr ""

17 "Content-Transfer-Encoding: 8bit\n"

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19

20 -#: advice.c:34

20 +#: advice.c:40

21 #, c-format

22 msgid "hint: %.*s\n"

23 msgstr "tips: %.*s\n"

@@ -26,7 +26,7 @@ msgstr "tips: %.*s\n"

26 #. * Message used both when 'git commit' fails and when

27 #. * other commands doing a merge do.

28 #.

29 -#: advice.c:64

29 +#: advice.c:70

30 msgid ""

31 "Fix them up in the work tree,\n"

32 "and then use 'git add/rm <file>' as\n"

@@ -85,32 +85,32 @@ msgstr ""

85 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"

86 "%s"

87

88 -#: diff.c:1336

88 +#: diff.c:1400

89 msgid " 0 files changed\n"

90 msgstr " 0 filer ändrade\n"

91

92 -#: diff.c:1340

92 +#: diff.c:1404

93 #, c-format

94 msgid " %d file changed"

95 msgid_plural " %d files changed"

96 msgstr[0] " %d fil ändrad"

97 msgstr[1] " %d filer ändrade"

98

99 -#: diff.c:1357

99 +#: diff.c:1421

100 #, c-format

101 msgid ", %d insertion(+)"

102 msgid_plural ", %d insertions(+)"

103 msgstr[0] ", %d tillägg(+)"

104 msgstr[1] ", %d tillägg(+)"

105

106 -#: diff.c:1368

106 +#: diff.c:1432

107 #, c-format

108 msgid ", %d deletion(-)"

109 msgid_plural ", %d deletions(-)"

110 msgstr[0] ", %d borttagning(-)"

111 msgstr[1] ", %d borttagningar(-)"

112

113 -#: diff.c:3424

113 +#: diff.c:3439

114 #, c-format

115 msgid ""

116 "Failed to parse --dirstat/-X option parameter:\n"

@@ -187,14 +187,14 @@ msgstr[1] ""

187 "Din gren och \"%s\" har divergerat,\n"

188 "och har %d respektive %d olika incheckningar.\n"

189

190 -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985

191 -#: builtin/merge.c:1095 builtin/merge.c:1105

190 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978

191 +#: builtin/merge.c:1088 builtin/merge.c:1098

192 #, c-format

193 msgid "Could not open '%s' for writing"

194 msgstr "Kunde inte öppna \"%s\" för skrivning"

195

196 -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867

197 -#: builtin/merge.c:1097 builtin/merge.c:1110

196 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868

197 +#: builtin/merge.c:1090 builtin/merge.c:1103

198 #, c-format

199 msgid "Could not write to '%s'"

200 msgstr "Kunde inte skriva till \"%s\""

@@ -291,7 +291,7 @@ msgid "could not apply %s... %s"

291 msgstr "kunde inte applicera %s... %s"

292

293 #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713

294 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348

294 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347

295 #: builtin/shortlog.c:181

296 msgid "revision walk setup failed"

297 msgstr "misslyckades skapa revisionstraversering"

@@ -999,7 +999,7 @@ msgid "path '%s' is unmerged"

999 msgstr "sökvägen \"%s\" har inte slagits ihop"

1000

1001 #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

1002 -#: builtin/merge.c:811

1002 +#: builtin/merge.c:812

1003 msgid "unable to write new index file"

1004 msgstr "kunde inte skriva ny indexfil"

1005

@@ -1089,71 +1089,71 @@ msgstr ""

1089 " git branch nytt_grennamn %s\n"

1090 "\n"

1091

1092 -#: builtin/checkout.c:692

1092 +#: builtin/checkout.c:693

1093 msgid "internal error in revision walk"

1094 msgstr "internt fel vid genomgång av revisioner (revision walk)"

1095

1096 -#: builtin/checkout.c:696

1096 +#: builtin/checkout.c:697

1097 msgid "Previous HEAD position was"

1098 msgstr "Tidigare position för HEAD var"

1099

1100 -#: builtin/checkout.c:722

1100 +#: builtin/checkout.c:723

1101 msgid "You are on a branch yet to be born"

1102 msgstr "Du är på en gren som ännu inte är född"

1103

1104 #. case (1)

1105 -#: builtin/checkout.c:853

1105 +#: builtin/checkout.c:854

1106 #, c-format

1107 msgid "invalid reference: %s"

1108 msgstr "felaktig referens: %s"

1109

1110 #. case (1): want a tree

1111 -#: builtin/checkout.c:892

1111 +#: builtin/checkout.c:893

1112 #, c-format

1113 msgid "reference is not a tree: %s"

1114 msgstr "referensen är inte ett träd: %s"

1115

1116 -#: builtin/checkout.c:972

1116 +#: builtin/checkout.c:973

1117 msgid "-B cannot be used with -b"

1118 msgstr "-B kan inte användas med -b"

1119

1120 -#: builtin/checkout.c:981

1120 +#: builtin/checkout.c:982

1121 msgid "--patch is incompatible with all other options"

1122 msgstr "--patch är inkompatibel med alla andra flaggor"

1123

1124 -#: builtin/checkout.c:984

1124 +#: builtin/checkout.c:985

1125 msgid "--detach cannot be used with -b/-B/--orphan"

1126 msgstr "--detcah kan inte användas med -b/-B/--orphan"

1127

1128 -#: builtin/checkout.c:986

1128 +#: builtin/checkout.c:987

1129 msgid "--detach cannot be used with -t"

1130 msgstr "--detach kan inte användas med -t"

1131

1132 -#: builtin/checkout.c:992

1132 +#: builtin/checkout.c:993

1133 msgid "--track needs a branch name"

1134 msgstr "--track behöver ett namn på en gren"

1135

1136 -#: builtin/checkout.c:999

1136 +#: builtin/checkout.c:1000

1137 msgid "Missing branch name; try -b"

1138 msgstr "Grennamn saknas; försök med -b"

1139

1140 -#: builtin/checkout.c:1005

1140 +#: builtin/checkout.c:1006

1141 msgid "--orphan and -b|-B are mutually exclusive"

1142 msgstr "--orphan och -b|-B kan inte användas samtidigt"

1143

1144 -#: builtin/checkout.c:1007

1144 +#: builtin/checkout.c:1008

1145 msgid "--orphan cannot be used with -t"

1146 msgstr "--orphan kan inte användas med -t"

1147

1148 -#: builtin/checkout.c:1017

1148 +#: builtin/checkout.c:1018

1149 msgid "git checkout: -f and -m are incompatible"

1150 msgstr "git checkout: -f och -m är inkompatibla"

1151

1152 -#: builtin/checkout.c:1051

1152 +#: builtin/checkout.c:1052

1153 msgid "invalid path specification"

1154 msgstr "felaktig sökvägsangivelse"

1155

1156 -#: builtin/checkout.c:1059

1156 +#: builtin/checkout.c:1060

1157 #, c-format

1158 msgid ""

1159 "git checkout: updating paths is incompatible with switching branches.\n"

@@ -1162,15 +1162,15 @@ msgstr ""

1162 "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"

1163 "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?"

1164

1165 -#: builtin/checkout.c:1061

1165 +#: builtin/checkout.c:1062

1166 msgid "git checkout: updating paths is incompatible with switching branches."

1167 msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."

1168

1169 -#: builtin/checkout.c:1066

1169 +#: builtin/checkout.c:1067

1170 msgid "git checkout: --detach does not take a path argument"

1171 msgstr "git checkout: --detach tar inte en sökväg som argument"

1172

1173 -#: builtin/checkout.c:1069

1173 +#: builtin/checkout.c:1070

1174 msgid ""

1175 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

1176 "checking out of the index."

@@ -1178,11 +1178,11 @@ msgstr ""

1178 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

1179 "du checkar ut från indexet."

1180

1181 -#: builtin/checkout.c:1088

1181 +#: builtin/checkout.c:1089

1182 msgid "Cannot switch branch to a non-commit."

1183 msgstr "Kan inte växla gren på en icke-incheckning."

1184

1185 -#: builtin/checkout.c:1091

1185 +#: builtin/checkout.c:1092

1186 msgid "--ours/--theirs is incompatible with switching branches."

1187 msgstr "--ours/--theirs är inkompatibla med att byta gren."

1188

@@ -1445,67 +1445,67 @@ msgstr "kan inte läsa indexet"

1445 msgid "unable to write temporary index file"

1446 msgstr "kunde inte skriva temporär indexfil"

1447

1448 -#: builtin/commit.c:550 builtin/commit.c:556

1448 +#: builtin/commit.c:561 builtin/commit.c:567

1449 #, c-format

1450 msgid "invalid commit: %s"

1451 msgstr "felaktig incheckning: %s"

1452

1453 -#: builtin/commit.c:579

1453 +#: builtin/commit.c:590

1454 msgid "malformed --author parameter"

1455 msgstr "felformad \"--author\"-flagga"

1456

1457 -#: builtin/commit.c:635

1457 +#: builtin/commit.c:651

1458 #, c-format

1459 msgid "Malformed ident string: '%s'"

1460 msgstr "Felaktig indragningssträng: \"%s\""

1461

1462 -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000

1462 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033

1463 #, c-format

1464 msgid "could not lookup commit %s"

1465 msgstr "kunde inte slå upp incheckningen %s"

1466

1467 -#: builtin/commit.c:682 builtin/shortlog.c:296

1467 +#: builtin/commit.c:701 builtin/shortlog.c:296

1468 #, c-format

1469 msgid "(reading log message from standard input)\n"

1470 msgstr "(läser loggmeddelande från standard in)\n"

1471

1472 -#: builtin/commit.c:684

1472 +#: builtin/commit.c:703

1473 msgid "could not read log from standard input"

1474 msgstr "kunde inte läsa logg från standard in"

1475

1476 -#: builtin/commit.c:688

1476 +#: builtin/commit.c:707

1477 #, c-format

1478 msgid "could not read log file '%s'"

1479 msgstr "kunde inte läsa loggfilen \"%s\""

1480

1481 -#: builtin/commit.c:694

1481 +#: builtin/commit.c:713

1482 msgid "commit has empty message"

1483 msgstr "incheckningen har ett tomt meddelande"

1484

1485 -#: builtin/commit.c:710

1485 +#: builtin/commit.c:729

1486 msgid "could not read MERGE_MSG"

1487 msgstr "kunde inte läsa MERGE_MSG"

1488

1489 -#: builtin/commit.c:714

1489 +#: builtin/commit.c:733

1490 msgid "could not read SQUASH_MSG"

1491 msgstr "kunde inte läsa SQUASH_MSG"

1492

1493 -#: builtin/commit.c:718

1493 +#: builtin/commit.c:737

1494 #, c-format

1495 msgid "could not read '%s'"

1496 msgstr "kunde inte läsa \"%s\""

1497

1498 -#: builtin/commit.c:746

1498 +#: builtin/commit.c:765

1499 #, c-format

1500 msgid "could not open '%s'"

1501 msgstr "kunde inte öppna \"%s\""

1502

1503 -#: builtin/commit.c:770

1503 +#: builtin/commit.c:789

1504 msgid "could not write commit template"

1505 msgstr "kunde inte skriva incheckningsmall"

1506

1507 # %s är "merge" eller "cherry-pick"

1508 -#: builtin/commit.c:783

1508 +#: builtin/commit.c:799

1509 #, c-format

1510 msgid ""

1511 "\n"

@@ -1520,11 +1520,11 @@ msgstr ""

1520 "\t%s\n"

1521 "och försöker igen.\n"

1522

1523 -#: builtin/commit.c:796

1523 +#: builtin/commit.c:812

1524 msgid "Please enter the commit message for your changes."

1525 msgstr "Ange ett incheckningsmeddelande för dina ändringar."

1526

1527 -#: builtin/commit.c:799

1527 +#: builtin/commit.c:815

1528 msgid ""

1529 " Lines starting\n"

1530 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -1532,7 +1532,7 @@ msgstr ""

1532 " Rader som inleds\n"

1533 "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

1534

1535 -#: builtin/commit.c:804

1535 +#: builtin/commit.c:820

1536 msgid ""

1537 " Lines starting\n"

1538 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -1542,151 +1542,156 @@ msgstr ""

1542 "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

1543 "Ett tomt meddelande avbryter incheckningen.\n"

1544

1545 -#: builtin/commit.c:816

1545 +#: builtin/commit.c:832

1546 #, c-format

1547 msgid "%sAuthor: %s"

1548 msgstr "%sFörfattare: %s"

1549

1550 -#: builtin/commit.c:823

1550 +#: builtin/commit.c:839

1551 #, c-format

1552 msgid "%sCommitter: %s"

1553 msgstr "%sIncheckare: %s"

1554

1555 -#: builtin/commit.c:843

1555 +#: builtin/commit.c:859

1556 msgid "Cannot read index"

1557 msgstr "Kan inte läsa indexet"

1558

1559 -#: builtin/commit.c:880

1559 +#: builtin/commit.c:896

1560 msgid "Error building trees"

1561 msgstr "Fel vid byggande av träd"

1562

1563 -#: builtin/commit.c:895 builtin/tag.c:357

1563 +#: builtin/commit.c:911 builtin/tag.c:357

1564 #, c-format

1565 msgid "Please supply the message using either -m or -F option.\n"

1566 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

1567

1568 -#: builtin/commit.c:975

1568 +#: builtin/commit.c:1008

1569 #, c-format

1570 msgid "No existing author found with '%s'"

1571 msgstr "Hittade ingen befintlig författare med \"%s\""

1572

1573 -#: builtin/commit.c:990 builtin/commit.c:1182

1573 +#: builtin/commit.c:1023 builtin/commit.c:1217

1574 #, c-format

1575 msgid "Invalid untracked files mode '%s'"

1576 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

1577

1578 -#: builtin/commit.c:1030

1578 +#: builtin/commit.c:1063

1579 msgid "Using both --reset-author and --author does not make sense"

1580 msgstr "Kan inte använda både --reset-author och --author"

1581

1582 -#: builtin/commit.c:1041

1582 +#: builtin/commit.c:1074

1583 msgid "You have nothing to amend."

1584 msgstr "Du har inget att utöka."

1585

1586 -#: builtin/commit.c:1043

1586 +#: builtin/commit.c:1076

1587 #, c-format

1588 msgid "You are in the middle of a %s -- cannot amend."

1589 msgstr "Du är i mitten av en %s -- kan inte utöka."

1590

1591 -#: builtin/commit.c:1045

1591 +#: builtin/commit.c:1078

1592 msgid "Options --squash and --fixup cannot be used together"

1593 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

1594

1595 -#: builtin/commit.c:1055

1595 +#: builtin/commit.c:1088

1596 msgid "Only one of -c/-C/-F/--fixup can be used."

1597 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

1598

1599 -#: builtin/commit.c:1057

1599 +#: builtin/commit.c:1090

1600 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

1601 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

1602

1603 -#: builtin/commit.c:1063

1603 +#: builtin/commit.c:1098

1604 msgid "--reset-author can be used only with -C, -c or --amend."

1605 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

1606

1607 -#: builtin/commit.c:1080

1607 +#: builtin/commit.c:1115

1608 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

1609 msgstr ""

1610 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

1611

1612 -#: builtin/commit.c:1082

1612 +#: builtin/commit.c:1117

1613 msgid "No paths with --include/--only does not make sense."

1614 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

1615

1616 -#: builtin/commit.c:1084

1616 +#: builtin/commit.c:1119

1617 msgid "Clever... amending the last one with dirty index."

1618 msgstr "Smart... utöka den senaste med smutsigt index."

1619

1620 -#: builtin/commit.c:1086

1620 +#: builtin/commit.c:1121

1621 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

1622 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

1623

1624 -#: builtin/commit.c:1096 builtin/tag.c:556

1624 +#: builtin/commit.c:1131 builtin/tag.c:556

1625 #, c-format

1626 msgid "Invalid cleanup mode %s"

1627 msgstr "Felaktigt städningsläge %s"

1628

1629 -#: builtin/commit.c:1101

1629 +#: builtin/commit.c:1136

1630 msgid "Paths with -a does not make sense."

1631 msgstr "Kan inte ange sökvägar med -a."

1632

1633 -#: builtin/commit.c:1280

1633 +#: builtin/commit.c:1315

1634 msgid "couldn't look up newly created commit"

1635 msgstr "kunde inte slå upp en precis skapad incheckning"

1636

1637 -#: builtin/commit.c:1282

1637 +#: builtin/commit.c:1317

1638 msgid "could not parse newly created commit"

1639 msgstr "kunde inte tolka en precis skapad incheckning"

1640

1641 -#: builtin/commit.c:1323

1641 +#: builtin/commit.c:1358

1642 msgid "detached HEAD"

1643 msgstr "frånkopplad HEAD"

1644

1645 -#: builtin/commit.c:1325

1645 +#: builtin/commit.c:1360

1646 msgid " (root-commit)"

1647 msgstr " (rotincheckning)"

1648

1649 -#: builtin/commit.c:1415

1649 +#: builtin/commit.c:1450

1650 msgid "could not parse HEAD commit"

1651 msgstr "kunde inte tolka HEAD:s incheckning"

1652

1653 -#: builtin/commit.c:1452 builtin/merge.c:509

1653 +#: builtin/commit.c:1487 builtin/merge.c:509

1654 #, c-format

1655 msgid "could not open '%s' for reading"

1656 msgstr "kunde inte öppna \"%s\" för läsning"

1657

1658 -#: builtin/commit.c:1459

1658 +#: builtin/commit.c:1494

1659 #, c-format

1660 msgid "Corrupt MERGE_HEAD file (%s)"

1661 msgstr "Trasig MERGE_HEAD-fil (%s)"

1662

1663 -#: builtin/commit.c:1466

1663 +#: builtin/commit.c:1501

1664 msgid "could not read MERGE_MODE"

1665 msgstr "kunde inte läsa MERGE_MODE"

1666

1667 -#: builtin/commit.c:1485

1667 +#: builtin/commit.c:1520

1668 #, c-format

1669 msgid "could not read commit message: %s"

1670 msgstr "kunde inte läsa incheckningsmeddelande: %s"

1671

1672 -#: builtin/commit.c:1499

1672 +#: builtin/commit.c:1534

1673 +#, c-format

1674 +msgid "Aborting commit; you did not edit the message.\n"

1675 +msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

1676 +

1677 +#: builtin/commit.c:1539

1678 #, c-format

1679 msgid "Aborting commit due to empty commit message.\n"

1680 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

1681

1677 -#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968

1682 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

1683 msgid "failed to write commit object"

1684 msgstr "kunde inte skriva incheckningsobjekt"

1685

1681 -#: builtin/commit.c:1535

1686 +#: builtin/commit.c:1575

1687 msgid "cannot lock HEAD ref"

1688 msgstr "kunde inte låsa HEAD-referens"

1689

1685 -#: builtin/commit.c:1539

1690 +#: builtin/commit.c:1579

1691 msgid "cannot update HEAD ref"

1692 msgstr "kunde inte uppdatera HEAD-referens"

1693

1689 -#: builtin/commit.c:1550

1694 +#: builtin/commit.c:1590

1695 msgid ""

1696 "Repository has been updated, but unable to write\n"

1697 "new_index file. Check that disk is not full or quota is\n"

@@ -1819,68 +1824,72 @@ msgstr "ej hanterat objekt \"%s\" angavs."

1824 msgid "Couldn't find remote ref HEAD"

1825 msgstr "Kunde inte hitta fjärr-referensen HEAD"

1826

1822 -#: builtin/fetch.c:252

1827 +#: builtin/fetch.c:253

1828 #, c-format

1829 msgid "object %s not found"

1830 msgstr "objektet %s hittades inte"

1831

1827 -#: builtin/fetch.c:258

1832 +#: builtin/fetch.c:259

1833 msgid "[up to date]"

1834 msgstr "[àjour]"

1835

1831 -#: builtin/fetch.c:272

1836 +#: builtin/fetch.c:273

1837 #, c-format

1838 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

1839 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

1840

1836 -#: builtin/fetch.c:273 builtin/fetch.c:351

1841 +#: builtin/fetch.c:274 builtin/fetch.c:360

1842 msgid "[rejected]"

1843 msgstr "[refuserad]"

1844

1840 -#: builtin/fetch.c:284

1845 +#: builtin/fetch.c:285

1846 msgid "[tag update]"

1847 msgstr "[uppdaterad tagg]"

1848

1844 -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331

1849 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

1850 msgid " (unable to update local ref)"

1851 msgstr " (kunde inte uppdatera lokal ref)"

1852

1848 -#: builtin/fetch.c:298

1853 +#: builtin/fetch.c:305

1854 msgid "[new tag]"

1855 msgstr "[ny tagg]"

1856

1852 -#: builtin/fetch.c:302

1857 +#: builtin/fetch.c:308

1858 msgid "[new branch]"

1859 msgstr "[ny gren]"

1860

1856 -#: builtin/fetch.c:347

1861 +#: builtin/fetch.c:311

1862 +msgid "[new ref]"

1863 +msgstr "[ny ref]"

1864 +

1865 +#: builtin/fetch.c:356

1866 msgid "unable to update local ref"

1867 msgstr "kunde inte uppdatera lokal ref"

1868

1860 -#: builtin/fetch.c:347

1869 +#: builtin/fetch.c:356

1870 msgid "forced update"

1871 msgstr "tvingad uppdatering"

1872

1864 -#: builtin/fetch.c:353

1873 +#: builtin/fetch.c:362

1874 msgid "(non-fast-forward)"

1875 msgstr "(ej snabbspolad)"

1876

1868 -#: builtin/fetch.c:384 builtin/fetch.c:676

1877 +#: builtin/fetch.c:393 builtin/fetch.c:685

1878 #, c-format

1879 msgid "cannot open %s: %s\n"

1880 msgstr "kan inte öppna %s: %s\n"

1881

1873 -#: builtin/fetch.c:393

1882 +#: builtin/fetch.c:402

1883 #, c-format

1884 msgid "%s did not send all necessary objects\n"

1885 msgstr "%s sände inte alla nödvändiga objekt\n"

1886

1878 -#: builtin/fetch.c:479

1887 +#: builtin/fetch.c:488

1888 #, c-format

1889 msgid "From %.*s\n"

1890 msgstr "Från %.*s\n"

1891

1883 -#: builtin/fetch.c:490

1892 +#: builtin/fetch.c:499

1893 #, c-format

1894 msgid ""

1895 "some local refs could not be updated; try running\n"

@@ -1889,55 +1898,55 @@ msgstr ""

1898 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

1899 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

1900

1892 -#: builtin/fetch.c:540

1901 +#: builtin/fetch.c:549

1902 #, c-format

1903 msgid " (%s will become dangling)\n"

1904 msgstr " (%s kommer bli dinglande)\n"

1905

1897 -#: builtin/fetch.c:541

1906 +#: builtin/fetch.c:550

1907 #, c-format

1908 msgid " (%s has become dangling)\n"

1909 msgstr " (%s har blivit dinglande)\n"

1910

1902 -#: builtin/fetch.c:548

1911 +#: builtin/fetch.c:557

1912 msgid "[deleted]"

1913 msgstr "[borttagen]"

1914

1906 -#: builtin/fetch.c:549

1915 +#: builtin/fetch.c:558

1916 msgid "(none)"

1917 msgstr "(ingen)"

1918

1910 -#: builtin/fetch.c:666

1919 +#: builtin/fetch.c:675

1920 #, c-format

1921 msgid "Refusing to fetch into current branch %s of non-bare repository"

1922 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

1923

1915 -#: builtin/fetch.c:700

1924 +#: builtin/fetch.c:709

1925 #, c-format

1926 msgid "Don't know how to fetch from %s"

1927 msgstr "Vet inte hur man hämtar från %s"

1928

1920 -#: builtin/fetch.c:777

1929 +#: builtin/fetch.c:786

1930 #, c-format

1931 msgid "Option \"%s\" value \"%s\" is not valid for %s"

1932 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

1933

1925 -#: builtin/fetch.c:780

1934 +#: builtin/fetch.c:789

1935 #, c-format

1936 msgid "Option \"%s\" is ignored for %s\n"

1937 msgstr "Flaggan \"%s\" ignoreras för %s\n"

1938

1930 -#: builtin/fetch.c:879

1939 +#: builtin/fetch.c:888

1940 #, c-format

1941 msgid "Fetching %s\n"

1942 msgstr "Hämtar %s\n"

1943

1935 -#: builtin/fetch.c:881

1944 +#: builtin/fetch.c:890

1945 #, c-format

1946 msgid "Could not fetch %s"

1947 msgstr "Kunde inte hämta %s"

1948

1940 -#: builtin/fetch.c:898

1949 +#: builtin/fetch.c:907

1950 msgid ""

1951 "No remote repository specified. Please, specify either a URL or a\n"

1952 "remote name from which new revisions should be fetched."

@@ -1945,24 +1954,24 @@ msgstr ""

1954 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

1955 "fjärrarkiv som nya incheckningar skall hämtas från."

1956

1948 -#: builtin/fetch.c:918

1957 +#: builtin/fetch.c:927

1958 msgid "You need to specify a tag name."

1959 msgstr "Du måste ange namnet på en tagg."

1960

1952 -#: builtin/fetch.c:970

1961 +#: builtin/fetch.c:979

1962 msgid "fetch --all does not take a repository argument"

1963 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

1964

1956 -#: builtin/fetch.c:972

1965 +#: builtin/fetch.c:981

1966 msgid "fetch --all does not make sense with refspecs"

1967 msgstr "fetch --all kan inte anges med referensspecifikationer"

1968

1960 -#: builtin/fetch.c:983

1969 +#: builtin/fetch.c:992

1970 #, c-format

1971 msgid "No such remote or remote group: %s"

1972 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

1973

1965 -#: builtin/fetch.c:991

1974 +#: builtin/fetch.c:1000

1975 msgid "Fetching a group and specifying refspecs does not make sense"

1976 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

1977

@@ -1971,21 +1980,17 @@ msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

1980 msgid "Invalid %s: '%s'"

1981 msgstr "Felaktigt %s: \"%s\""

1982

1974 -#: builtin/gc.c:78

1975 -msgid "Too many options specified"

1976 -msgstr "För många flaggor angavs"

1977 -

1978 -#: builtin/gc.c:103

1983 +#: builtin/gc.c:90

1984 #, c-format

1985 msgid "insanely long object directory %.*s"

1986 msgstr "tokigt lång objektkatalog %.*s"

1987

1983 -#: builtin/gc.c:223

1988 +#: builtin/gc.c:221

1989 #, c-format

1990 msgid "Auto packing the repository for optimum performance.\n"

1991 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

1992

1988 -#: builtin/gc.c:226

1993 +#: builtin/gc.c:224

1994 #, c-format

1995 msgid ""

1996 "Auto packing the repository for optimum performance. You may also\n"

@@ -1994,7 +1999,7 @@ msgstr ""

1999 "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"

2000 "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"

2001

1997 -#: builtin/gc.c:256

2002 +#: builtin/gc.c:251

2003 msgid ""

2004 "There are too many unreachable loose objects; run 'git prune' to remove them."

2005 msgstr ""

@@ -2311,56 +2316,56 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

2316 msgid "Unknown commit %s"

2317 msgstr "Okänd incheckning %s"

2318

2314 -#: builtin/merge.c:91

2319 +#: builtin/merge.c:90

2320 msgid "switch `m' requires a value"

2321 msgstr "flaggan \"m\" behöver ett värde"

2322

2318 -#: builtin/merge.c:128

2323 +#: builtin/merge.c:127

2324 #, c-format

2325 msgid "Could not find merge strategy '%s'.\n"

2326 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"

2327

2323 -#: builtin/merge.c:129

2328 +#: builtin/merge.c:128

2329 #, c-format

2330 msgid "Available strategies are:"

2331 msgstr "Tillgängliga strategier är:"

2332

2328 -#: builtin/merge.c:134

2333 +#: builtin/merge.c:133

2334 #, c-format

2335 msgid "Available custom strategies are:"

2336 msgstr "Tillgängliga skräddarsydda strategier är:"

2337

2333 -#: builtin/merge.c:241

2338 +#: builtin/merge.c:240

2339 msgid "could not run stash."

2340 msgstr "kunde köra stash."

2341

2337 -#: builtin/merge.c:246

2342 +#: builtin/merge.c:245

2343 msgid "stash failed"

2344 msgstr "stash misslyckades"

2345

2341 -#: builtin/merge.c:251

2346 +#: builtin/merge.c:250

2347 #, c-format

2348 msgid "not a valid object: %s"

2349 msgstr "inte ett giltigt objekt: %s"

2350

2346 -#: builtin/merge.c:270 builtin/merge.c:287

2351 +#: builtin/merge.c:269 builtin/merge.c:286

2352 msgid "read-tree failed"

2353 msgstr "read-tree misslyckades"

2354

2350 -#: builtin/merge.c:317

2355 +#: builtin/merge.c:316

2356 msgid " (nothing to squash)"

2357 msgstr " (inget att platta till)"

2358

2354 -#: builtin/merge.c:330

2359 +#: builtin/merge.c:329

2360 #, c-format

2361 msgid "Squash commit -- not updating HEAD\n"

2362 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

2363

2359 -#: builtin/merge.c:362

2364 +#: builtin/merge.c:361

2365 msgid "Writing SQUASH_MSG"

2366 msgstr "Skriver SQUASH_MSG"

2367

2363 -#: builtin/merge.c:364

2368 +#: builtin/merge.c:363

2369 msgid "Finishing SQUASH_MSG"

2370 msgstr "Avslutar SQUASH_MSG"

2371

@@ -2387,37 +2392,37 @@ msgstr "git write-tree misslyckades skriva ett träd"

2392 msgid "failed to read the cache"

2393 msgstr "misslyckads läsa cachen"

2394

2390 -#: builtin/merge.c:696

2395 +#: builtin/merge.c:697

2396 msgid "Unable to write index."

2397 msgstr "Kunde inte skriva indexet."

2398

2394 -#: builtin/merge.c:709

2399 +#: builtin/merge.c:710

2400 msgid "Not handling anything other than two heads merge."

2401 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

2402

2398 -#: builtin/merge.c:723

2403 +#: builtin/merge.c:724

2404 #, c-format

2405 msgid "Unknown option for merge-recursive: -X%s"

2406 msgstr "Felaktig flagga för merge-recursive: -X%s"

2407

2403 -#: builtin/merge.c:737

2408 +#: builtin/merge.c:738

2409 #, c-format

2410 msgid "unable to write %s"

2411 msgstr "kunde inte skriva %s"

2412

2408 -#: builtin/merge.c:876

2413 +#: builtin/merge.c:877

2414 #, c-format

2415 msgid "Could not read from '%s'"

2416 msgstr "Kunde inte läsa från \"%s\""

2417

2413 -#: builtin/merge.c:885

2418 +#: builtin/merge.c:886

2419 #, c-format

2420 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

2421 msgstr ""

2422 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

2423 "den.\n"

2424

2420 -#: builtin/merge.c:891

2425 +#: builtin/merge.c:892

2426 msgid ""

2427 "Please enter a commit message to explain why this merge is necessary,\n"

2428 "especially if it merges an updated upstream into a topic branch.\n"

@@ -2432,48 +2437,53 @@ msgstr ""

2437 "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"

2438 "avbryter incheckningen.\n"

2439

2435 -#: builtin/merge.c:915

2440 +#: builtin/merge.c:916

2441 msgid "Empty commit message."

2442 msgstr "Tomt incheckningsmeddelande."

2443

2439 -#: builtin/merge.c:927

2444 +#: builtin/merge.c:928

2445 #, c-format

2446 msgid "Wonderful.\n"

2447 msgstr "Underbart.\n"

2448

2444 -#: builtin/merge.c:1000

2449 +#: builtin/merge.c:993

2450 #, c-format

2451 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

2452 msgstr ""

2453 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

2454

2450 -#: builtin/merge.c:1016

2455 +#: builtin/merge.c:1009

2456 #, c-format

2457 msgid "'%s' is not a commit"

2458 msgstr "\"%s\" är inte en incheckning"

2459

2455 -#: builtin/merge.c:1057

2460 +#: builtin/merge.c:1050

2461 msgid "No current branch."

2462 msgstr "Inte på någon gren."

2463

2459 -#: builtin/merge.c:1059

2464 +#: builtin/merge.c:1052

2465 msgid "No remote for the current branch."

2466 msgstr "Ingen fjärr för aktuell gren."

2467

2463 -#: builtin/merge.c:1061

2468 +#: builtin/merge.c:1054

2469 msgid "No default upstream defined for the current branch."

2470 msgstr "Ingen standarduppström angiven för aktuell gren."

2471

2467 -#: builtin/merge.c:1066

2472 +#: builtin/merge.c:1059

2473 #, c-format

2474 msgid "No remote tracking branch for %s from %s"

2475 msgstr "Ingen fjärrspårande gren för %s från %s"

2476

2472 -#: builtin/merge.c:1188

2477 +#: builtin/merge.c:1146 builtin/merge.c:1303

2478 +#, c-format

2479 +msgid "%s - not something we can merge"

2480 +msgstr "%s - inte något vi kan slå ihop"

2481 +

2482 +#: builtin/merge.c:1214

2483 msgid "There is no merge to abort (MERGE_HEAD missing)."

2484 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

2485

2476 -#: builtin/merge.c:1204 git-pull.sh:31

2486 +#: builtin/merge.c:1230 git-pull.sh:31

2487 msgid ""

2488 "You have not concluded your merge (MERGE_HEAD exists).\n"

2489 "Please, commit your changes before you can merge."

@@ -2481,11 +2491,11 @@ msgstr ""

2491 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

2492 "Checka in dina ändringar innan du kan slå ihop."

2493

2484 -#: builtin/merge.c:1207 git-pull.sh:34

2494 +#: builtin/merge.c:1233 git-pull.sh:34

2495 msgid "You have not concluded your merge (MERGE_HEAD exists)."

2496 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

2497

2488 -#: builtin/merge.c:1211

2498 +#: builtin/merge.c:1237

2499 msgid ""

2500 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

2501 "Please, commit your changes before you can merge."

@@ -2493,84 +2503,79 @@ msgstr ""

2503 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

2504 "Checka in dina ändringar innan du kan slå ihop."

2505

2496 -#: builtin/merge.c:1214

2506 +#: builtin/merge.c:1240

2507 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

2508 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

2509

2500 -#: builtin/merge.c:1223

2510 +#: builtin/merge.c:1249

2511 msgid "You cannot combine --squash with --no-ff."

2512 msgstr "Du kan inte kombinera --squash med --no-ff."

2513

2504 -#: builtin/merge.c:1228

2514 +#: builtin/merge.c:1254

2515 msgid "You cannot combine --no-ff with --ff-only."

2516 msgstr "Du kan inte kombinera --no-ff med --ff-only."

2517

2508 -#: builtin/merge.c:1235

2518 +#: builtin/merge.c:1261

2519 msgid "No commit specified and merge.defaultToUpstream not set."

2520 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

2521

2512 -#: builtin/merge.c:1266

2522 +#: builtin/merge.c:1293

2523 msgid "Can merge only exactly one commit into empty head"

2524 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

2525

2516 -#: builtin/merge.c:1269

2526 +#: builtin/merge.c:1296

2527 msgid "Squash commit into empty head not supported yet"

2528 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

2529

2520 -#: builtin/merge.c:1271

2530 +#: builtin/merge.c:1298

2531 msgid "Non-fast-forward commit does not make sense into an empty head"

2532 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

2533

2524 -#: builtin/merge.c:1275 builtin/merge.c:1319

2525 -#, c-format

2526 -msgid "%s - not something we can merge"

2527 -msgstr "%s - inte något vi kan slå ihop"

2528 -

2529 -#: builtin/merge.c:1385

2534 +#: builtin/merge.c:1413

2535 #, c-format

2536 msgid "Updating %s..%s\n"

2537 msgstr "Uppdaterar %s..%s\n"

2538

2534 -#: builtin/merge.c:1423

2539 +#: builtin/merge.c:1451

2540 #, c-format

2541 msgid "Trying really trivial in-index merge...\n"

2542 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

2543

2539 -#: builtin/merge.c:1430

2544 +#: builtin/merge.c:1458

2545 #, c-format

2546 msgid "Nope.\n"

2547 msgstr "Nej.\n"

2548

2544 -#: builtin/merge.c:1462

2549 +#: builtin/merge.c:1490

2550 msgid "Not possible to fast-forward, aborting."

2551 msgstr "Kan inte snabbspola, avbryter."

2552

2548 -#: builtin/merge.c:1485 builtin/merge.c:1562

2553 +#: builtin/merge.c:1513 builtin/merge.c:1592

2554 #, c-format

2555 msgid "Rewinding the tree to pristine...\n"

2556 msgstr "Återspolar trädet till orört...\n"

2557

2553 -#: builtin/merge.c:1489

2558 +#: builtin/merge.c:1517

2559 #, c-format

2560 msgid "Trying merge strategy %s...\n"

2561 msgstr "Försöker sammanslagninsstrategin %s...\n"

2562

2558 -#: builtin/merge.c:1553

2563 +#: builtin/merge.c:1583

2564 #, c-format

2565 msgid "No merge strategy handled the merge.\n"

2566 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

2567

2563 -#: builtin/merge.c:1555

2568 +#: builtin/merge.c:1585

2569 #, c-format

2570 msgid "Merge with strategy %s failed.\n"

2571 msgstr "Sammanslaning med strategin %s misslyckades.\n"

2572

2568 -#: builtin/merge.c:1564

2573 +#: builtin/merge.c:1594

2574 #, c-format

2575 msgid "Using the %s to prepare resolving by hand.\n"

2576 msgstr "Använder %s för att förbereda lösning för hand.\n"

2577

2573 -#: builtin/merge.c:1575

2578 +#: builtin/merge.c:1606

2579 #, c-format

2580 msgid "Automatic merge went well; stopped before committing as requested\n"

2581 msgstr ""

@@ -2796,35 +2801,35 @@ msgstr "Objektet %s har ingen anteckning\n"

2801 msgid "Unknown subcommand: %s"

2802 msgstr "Okänt underkommando: %s"

2803

2799 -#: builtin/pack-objects.c:2310

2804 +#: builtin/pack-objects.c:2315

2805 #, c-format

2806 msgid "unsupported index version %s"

2807 msgstr "indexversionen %s stöds ej"

2808

2804 -#: builtin/pack-objects.c:2314

2809 +#: builtin/pack-objects.c:2319

2810 #, c-format

2811 msgid "bad index version '%s'"

2812 msgstr "felaktig indexversion \"%s\""

2813

2809 -#: builtin/pack-objects.c:2322

2814 +#: builtin/pack-objects.c:2342

2815 #, c-format

2816 msgid "option %s does not accept negative form"

2817 msgstr "flaggan %s godtar inte negativ form"

2818

2814 -#: builtin/pack-objects.c:2326

2819 +#: builtin/pack-objects.c:2346

2820 #, c-format

2821 msgid "unable to parse value '%s' for option %s"

2822 msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"

2823

2819 -#: builtin/push.c:44

2824 +#: builtin/push.c:45

2825 msgid "tag shorthand without <tag>"

2826 msgstr "taggförkortning utan <tagg>"

2827

2823 -#: builtin/push.c:63

2828 +#: builtin/push.c:64

2829 msgid "--delete only accepts plain target ref names"

2830 msgstr "--delete godtar endast enkla målreferensnamn"

2831

2827 -#: builtin/push.c:73

2832 +#: builtin/push.c:84

2833 #, c-format

2834 msgid ""

2835 "You are not currently on a branch.\n"

@@ -2839,7 +2844,7 @@ msgstr ""

2844 "\n"

2845 " git push %s HEAD:<namn-på-fjärrgren>\n"

2846

2842 -#: builtin/push.c:80

2847 +#: builtin/push.c:91

2848 #, c-format

2849 msgid ""

2850 "The current branch %s has no upstream branch.\n"

@@ -2852,48 +2857,82 @@ msgstr ""

2857 "\n"

2858 " git push --set-upstream %s %s\n"

2859

2855 -#: builtin/push.c:88

2860 +#: builtin/push.c:99

2861 #, c-format

2862 msgid "The current branch %s has multiple upstream branches, refusing to push."

2863 msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."

2864

2860 -#: builtin/push.c:111

2865 +#: builtin/push.c:102

2866 +#, c-format

2867 +msgid ""

2868 +"You are pushing to remote '%s', which is not the upstream of\n"

2869 +"your current branch '%s', without telling me what to push\n"

2870 +"to update which remote branch."

2871 +msgstr ""

2872 +"Du sänder till fjärren \"%s\", som inte är uppströms för den\n"

2873 +"aktuella grenen \"%s\", utan att tala om för mig vad som\n"

2874 +"skall sändas för att uppdatera fjärrgrenen."

2875 +

2876 +#: builtin/push.c:131

2877 msgid ""

2878 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

2879 msgstr ""

2880 "Du angav inga referensspecifikationer att sända, och push.default är "

2881 "\"nothing\"."

2882

2867 -#: builtin/push.c:131

2883 +#: builtin/push.c:138

2884 +msgid ""

2885 +"Updates were rejected because the tip of your current branch is behind\n"

2886 +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"

2887 +"before pushing again.\n"

2888 +"See the 'Note about fast-forwards' in 'git push --help' for details."

2889 +msgstr ""

2890 +"Uppdateringar avvisades då änden på din befintliga gren är bakom\n"

2891 +"dess fjärrmotsvarighet. Slå ihop fjärrändringarna (t.ex. \"git pull\")\n"

2892 +"innan du sänder igen.\n"

2893 +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

2894 +

2895 +#: builtin/push.c:144

2896 +msgid ""

2897 +"Updates were rejected because a pushed branch tip is behind its remote\n"

2898 +"counterpart. If you did not intend to push that branch, you may want to\n"

2899 +"specify branches to push or set the 'push.default' configuration\n"

2900 +"variable to 'current' or 'upstream' to push only the current branch."

2901 +msgstr ""

2902 +"Uppdateringar avvisades då änden på en insänd gren är bakom dess\n"

2903 +"fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n"

2904 +"du specificera grenar att sända, eller ändra inställningsvariabeln\n"

2905 +"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n"

2906 +"aktuell gren."

2907 +

2908 +#: builtin/push.c:150

2909 +msgid ""

2910 +"Updates were rejected because a pushed branch tip is behind its remote\n"

2911 +"counterpart. Check out this branch and merge the remote changes\n"

2912 +"(e.g. 'git pull') before pushing again.\n"

2913 +"See the 'Note about fast-forwards' in 'git push --help' for details."

2914 +msgstr ""

2915 +"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n"

2916 +"fjärrmotsvarighet. Checka ut grenen och slå ihop fjärrändringarna (t.ex.\n"

2917 +"\"git pull\") innan du sänder igen.\n"

2918 +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

2919 +

2920 +#: builtin/push.c:190

2921 #, c-format

2922 msgid "Pushing to %s\n"

2923 msgstr "Sänder till %s\n"

2924

2872 -#: builtin/push.c:135

2925 +#: builtin/push.c:194

2926 #, c-format

2927 msgid "failed to push some refs to '%s'"

2928 msgstr "misslyckades sända vissa referenser till \"%s\""

2929

2877 -#: builtin/push.c:143

2878 -#, c-format

2879 -msgid ""

2880 -"To prevent you from losing history, non-fast-forward updates were rejected\n"

2881 -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"

2882 -"'Note about fast-forwards' section of 'git push --help' for details.\n"

2883 -msgstr ""

2884 -"För att förhindra att du tappar historik har icke snabbspolande "

2885 -"uppdateringar\n"

2886 -"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder "

2887 -"igen.\n"

2888 -"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för "

2889 -"detaljer.\n"

2890 -

2891 -#: builtin/push.c:160

2930 +#: builtin/push.c:226

2931 #, c-format

2932 msgid "bad repository '%s'"

2933 msgstr "felaktigt arkiv \"%s\""

2934

2896 -#: builtin/push.c:161

2935 +#: builtin/push.c:227

2936 msgid ""

2937 "No configured push destination.\n"

2938 "Either specify the URL from the command-line or configure a remote "

@@ -2914,31 +2953,31 @@ msgstr ""

2953 "\n"

2954 " git push <namn>\n"

2955

2917 -#: builtin/push.c:176

2956 +#: builtin/push.c:242

2957 msgid "--all and --tags are incompatible"

2958 msgstr "--all och --tags är inkompatibla"

2959

2921 -#: builtin/push.c:177

2960 +#: builtin/push.c:243

2961 msgid "--all can't be combined with refspecs"

2962 msgstr "--all kan inte kombineras med referensspecifikationer"

2963

2925 -#: builtin/push.c:182

2964 +#: builtin/push.c:248

2965 msgid "--mirror and --tags are incompatible"

2966 msgstr "--mirror och --tags är inkompatibla"

2967

2929 -#: builtin/push.c:183

2968 +#: builtin/push.c:249

2969 msgid "--mirror can't be combined with refspecs"

2970 msgstr "--mirror kan inte kombineras med referensspecifikationer"

2971

2933 -#: builtin/push.c:188

2972 +#: builtin/push.c:254

2973 msgid "--all and --mirror are incompatible"

2974 msgstr "--all och --mirror är inkompatibla"

2975

2937 -#: builtin/push.c:274

2976 +#: builtin/push.c:334

2977 msgid "--delete is incompatible with --all, --mirror and --tags"

2978 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

2979

2941 -#: builtin/push.c:276

2980 +#: builtin/push.c:336

2981 msgid "--delete doesn't make sense without any refs"

2982 msgstr "--delete kan inte användas utan referenser"

2983

@@ -3022,20 +3061,20 @@ msgstr "%s återställning tillåts inte i ett naket arkiv"

3061 msgid "Could not reset index file to revision '%s'."

3062 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."

3063

3025 -#: builtin/revert.c:70 builtin/revert.c:91

3064 +#: builtin/revert.c:70 builtin/revert.c:92

3065 #, c-format

3066 msgid "%s: %s cannot be used with %s"

3067 msgstr "%s: %s kan inte användas med %s"

3068

3030 -#: builtin/revert.c:126

3069 +#: builtin/revert.c:127

3070 msgid "program error"

3071 msgstr "programfel"

3072

3034 -#: builtin/revert.c:209

3073 +#: builtin/revert.c:213

3074 msgid "revert failed"

3075 msgstr "\"revert\" misslyckades"

3076

3038 -#: builtin/revert.c:224

3077 +#: builtin/revert.c:228

3078 msgid "cherry-pick failed"

3079 msgstr "\"cherry-pick\" misslyckades"

3080

@@ -3549,68 +3588,68 @@ msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\""

3588 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

3589 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"

3590

3552 -#: git-submodule.sh:247

3591 +#: git-submodule.sh:248

3592 #, sh-format

3593 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

3594 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

3595

3557 -#: git-submodule.sh:264

3596 +#: git-submodule.sh:265

3597 #, sh-format

3598 msgid "'$path' already exists in the index"

3599 msgstr "\"$path\" finns redan i indexet"

3600

3562 -#: git-submodule.sh:281

3601 +#: git-submodule.sh:282

3602 #, sh-format

3603 msgid "'$path' already exists and is not a valid git repo"

3604 msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv"

3605

3567 -#: git-submodule.sh:295

3606 +#: git-submodule.sh:296

3607 #, sh-format

3608 msgid "Unable to checkout submodule '$path'"

3609 msgstr "Kan inte checka ut undermodul \"$path\""

3610

3572 -#: git-submodule.sh:300

3611 +#: git-submodule.sh:301

3612 #, sh-format

3613 msgid "Failed to add submodule '$path'"

3614 msgstr "Misslyckades lägga till underkatalog \"$path\""

3615

3577 -#: git-submodule.sh:305

3616 +#: git-submodule.sh:306

3617 #, sh-format

3618 msgid "Failed to register submodule '$path'"

3619 msgstr "Misslyckades registrera undermodul \"$path\""

3620

3582 -#: git-submodule.sh:347

3621 +#: git-submodule.sh:348

3622 #, sh-format

3623 msgid "Entering '$prefix$path'"

3624 msgstr "Går in i \"$prefix$path\""

3625

3587 -#: git-submodule.sh:359

3626 +#: git-submodule.sh:360

3627 #, sh-format

3628 msgid "Stopping at '$path'; script returned non-zero status."

3629 msgstr "Stoppar på \"$path\"; skriptet returnerade en status skild från noll."

3630

3592 -#: git-submodule.sh:401

3631 +#: git-submodule.sh:402

3632 #, sh-format

3633 msgid "No url found for submodule path '$path' in .gitmodules"

3634 msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules"

3635

3597 -#: git-submodule.sh:410

3636 +#: git-submodule.sh:411

3637 #, sh-format

3638 msgid "Failed to register url for submodule path '$path'"

3639 msgstr "Misslyckades registrera url för underkatalogsökväg \"$path\""

3640

3602 -#: git-submodule.sh:418

3641 +#: git-submodule.sh:419

3642 #, sh-format

3643 msgid "Failed to register update mode for submodule path '$path'"

3644 msgstr ""

3645 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$path\""

3646

3608 -#: git-submodule.sh:420

3647 +#: git-submodule.sh:421

3648 #, sh-format

3649 msgid "Submodule '$name' ($url) registered for path '$path'"

3650 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$path\""

3651

3613 -#: git-submodule.sh:519

3652 +#: git-submodule.sh:520

3653 #, sh-format

3654 msgid ""

3655 "Submodule path '$path' not initialized\n"

@@ -3619,83 +3658,86 @@ msgstr ""

3658 "Undermodulen \"$path\" har inte initierats\n"

3659 "Kanske du vill köra \"update --init\"?"

3660

3622 -#: git-submodule.sh:532

3661 +#: git-submodule.sh:533

3662 #, sh-format

3663 msgid "Unable to find current revision in submodule path '$path'"

3664 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$path\""

3665

3627 -#: git-submodule.sh:551

3666 +#: git-submodule.sh:552

3667 #, sh-format

3668 msgid "Unable to fetch in submodule path '$path'"

3669 msgstr "Kan inte hämta i undermodulsökväg \"$path\""

3670

3632 -#: git-submodule.sh:565

3671 +#: git-submodule.sh:566

3672 #, sh-format

3673 msgid "Unable to rebase '$sha1' in submodule path '$path'"

3674 msgstr "Kan inte göra \"rebase\" av \"$sha1\" i undermodulsökväg \"$path\""

3675

3637 -#: git-submodule.sh:566

3676 +#: git-submodule.sh:567

3677 #, sh-format

3678 msgid "Submodule path '$path': rebased into '$sha1'"

3679 msgstr "Undermodulsökvägen \"$path\": \"rebase\":ad in i \"$sha1\""

3680

3642 -#: git-submodule.sh:571

3681 +#: git-submodule.sh:572

3682 #, sh-format

3683 msgid "Unable to merge '$sha1' in submodule path '$path'"

3684 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$path\""

3685

3647 -#: git-submodule.sh:572

3686 +#: git-submodule.sh:573

3687 #, sh-format

3688 msgid "Submodule path '$path': merged in '$sha1'"

3689 msgstr "Undermodulsökvägen \"$path\": sammanslagen i \"$sha1\""

3690

3652 -#: git-submodule.sh:577

3691 +#: git-submodule.sh:578

3692 #, sh-format

3693 msgid "Unable to checkout '$sha1' in submodule path '$path'"

3694 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$path\""

3695

3657 -#: git-submodule.sh:578

3696 +#: git-submodule.sh:579

3697 #, sh-format

3698 msgid "Submodule path '$path': checked out '$sha1'"

3699 msgstr "Undermodulsökvägen \"$path\": checkade ut \"$sha1\""

3700

3662 -#: git-submodule.sh:600 git-submodule.sh:923

3701 +#: git-submodule.sh:601 git-submodule.sh:924

3702 #, sh-format

3703 msgid "Failed to recurse into submodule path '$path'"

3704 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$path\""

3705

3667 -#: git-submodule.sh:708

3706 +#: git-submodule.sh:709

3707 msgid "--"

3708 msgstr "--"

3709

3671 -#: git-submodule.sh:766

3710 +#: git-submodule.sh:767

3711 #, sh-format

3712 msgid " Warn: $name doesn't contain commit $sha1_src"

3713 msgstr " Varning: $name innehåller inte incheckning $sha1_src"

3714

3676 -#: git-submodule.sh:769

3715 +#: git-submodule.sh:770

3716 #, sh-format

3717 msgid " Warn: $name doesn't contain commit $sha1_dst"

3718 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"

3719

3681 -#: git-submodule.sh:772

3720 +#: git-submodule.sh:773

3721 #, sh-format

3722 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

3723 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"

3724

3686 -#: git-submodule.sh:797

3725 +#: git-submodule.sh:798

3726 msgid "blob"

3727 msgstr "blob"

3728

3690 -#: git-submodule.sh:798

3729 +#: git-submodule.sh:799

3730 msgid "submodule"

3731 msgstr "undermodul"

3732

3694 -#: git-submodule.sh:969

3733 +#: git-submodule.sh:970

3734 #, sh-format

3735 msgid "Synchronizing submodule url for '$name'"

3736 msgstr "Synkroniserar undermodul-url för \"$name\""

3737

3738 +#~ msgid "Too many options specified"

3739 +#~ msgstr "För många flaggor angavs"

3740 +

3741 #~ msgid "# Changed but not updated:"

3742 #~ msgstr "# Ändrade men inte uppdaterade:"

3743

Update Swedish translation (728t0f0u)