5676f96b75 · matheusbsbs/matheus-bagliano

@@ -1,14 +1,14 @@

1 # Swedish translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016.

4 +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.

5 #

6 msgid ""

7 msgstr ""

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

8 +"Project-Id-Version: git 2.12.0\n"

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

10 -"POT-Creation-Date: 2016-11-25 22:50+0800\n"

11 -"PO-Revision-Date: 2016-11-25 22:59+0800\n"

10 +"POT-Creation-Date: 2017-02-04 13:02+0800\n"

11 +"PO-Revision-Date: 2017-02-11 20:13+0100\n"

12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"

13 "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n"

14 "Language: sv\n"

@@ -70,7 +70,7 @@ msgstr ""

70 msgid "Exiting because of an unresolved conflict."

71 msgstr "Avslutar på grund av olöst konflikgt."

72

73 -#: advice.c:114 builtin/merge.c:1181

73 +#: advice.c:114 builtin/merge.c:1206

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

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

76

@@ -543,7 +543,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

543 msgid "truncating .rej filename to %.*s.rej"

544 msgstr "trunkerar .rej-filnamnet till %.*s.rej"

545

546 -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989

546 +#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

547 #, c-format

548 msgid "cannot open %s"

549 msgstr "kan inte öppna %s"

@@ -597,15 +597,16 @@ msgid_plural "%d lines applied after fixing whitespace errors."

597 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."

598 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

599

600 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431

600 +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

601 msgid "Unable to write new index file"

602 msgstr "Kunde inte skriva ny indexfil"

603

604 #: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

605 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

606 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407

607 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592

608 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947

606 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

607 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

608 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104

609 +#: git-add--interactive.perl:239

610 msgid "path"

611 msgstr "sökväg"

612

@@ -706,8 +707,8 @@ msgid "allow overlapping hunks"

707 msgstr "tillåt överlappande stycken"

708

709 #: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

709 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593

710 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114

710 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

711 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

712 msgid "be verbose"

713 msgstr "var pratsam"

714

@@ -746,7 +747,7 @@ msgstr ""

747 msgid "git archive --remote <repo> [--exec <cmd>] --list"

748 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

749

749 -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327

750 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300

751 #, c-format

752 msgid "pathspec '%s' did not match any files"

753 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

@@ -767,11 +768,11 @@ msgstr "prefix"

768 msgid "prepend prefix to each pathname in the archive"

769 msgstr "lägg till prefix till varje sökväg i arkivet"

770

770 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603

771 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987

772 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101

773 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401

774 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153

771 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

772 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

773 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542

774 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

775 +#: parse-options.h:153

776 msgid "file"

777 msgstr "fil"

778

@@ -804,7 +805,7 @@ msgid "list supported archive formats"

805 msgstr "visa understödda arkivformat"

806

807 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88

807 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953

808 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969

809 msgid "repo"

810 msgstr "arkiv"

811

@@ -900,12 +901,12 @@ msgstr ""

901 #: bisect.c:750

902 #, c-format

903 msgid ""

903 -"Some %s revs are not ancestor of the %s rev.\n"

904 +"Some %s revs are not ancestors of the %s rev.\n"

905 "git bisect cannot work properly in this case.\n"

906 "Maybe you mistook %s and %s revs?\n"

907 msgstr ""

908 "Några %s-revisioner är inte föräldrar till %s-revisionen.\n"

908 -"git bisect kan inte arbeta korrekt i detta fall.\n"

909 +"git bisect kan inte fungera korrekt i detta fall.\n"

910 "Kanske du skrev fel %s- och %s-revisioner?\n"

911

912 #: bisect.c:763

@@ -930,7 +931,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n"

931 msgid "a %s revision is needed"

932 msgstr "en %s-revision behövs"

933

933 -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

934 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262

935 #, c-format

936 msgid "could not create file '%s'"

937 msgstr "kunde inte skapa filen \"%s\""

@@ -1122,7 +1123,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

1123 msgid "unrecognized header: %s%s (%d)"

1124 msgstr "okänt huvud: %s%s (%d)"

1125

1125 -#: bundle.c:87 sequencer.c:963 builtin/commit.c:777

1126 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777

1127 #, c-format

1128 msgid "could not open '%s'"

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

@@ -1131,10 +1132,10 @@ msgstr "kunde inte öppna \"%s\""

1132 msgid "Repository lacks these prerequisite commits:"

1133 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"

1134

1134 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374

1135 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348

1135 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290

1136 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348

1137 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909

1137 -#: builtin/merge.c:356 builtin/shortlog.c:170

1138 +#: builtin/merge.c:360 builtin/shortlog.c:177

1139 msgid "revision walk setup failed"

1140 msgstr "misslyckades skapa revisionstraversering"

1141

@@ -1173,7 +1174,7 @@ msgstr "rev-list dog"

1174 msgid "ref '%s' is excluded by the rev-list options"

1175 msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"

1176

1176 -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273

1177 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282

1178 #, c-format

1179 msgid "unrecognized argument: %s"

1180 msgstr "okänt argument: %s"

@@ -1191,13 +1192,13 @@ msgstr "kan inte skapa \"%s\""

1192 msgid "index-pack died"

1193 msgstr "index-pack dog"

1194

1194 -#: color.c:290

1195 +#: color.c:300

1196 #, c-format

1197 msgid "invalid color value: %.*s"

1198 msgstr "felaktigt färgvärde: %.*s"

1199

1199 -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493

1200 -#: builtin/am.c:2127

1200 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457

1201 +#: builtin/am.c:1493 builtin/am.c:2127

1202 #, c-format

1203 msgid "could not parse %s"

1204 msgstr "kunde inte tolka %s"

@@ -1221,130 +1222,140 @@ msgstr ""

1222 msgid "memory exhausted"

1223 msgstr "minnet slut"

1224

1224 -#: config.c:516

1225 +#: config.c:518

1226 #, c-format

1227 msgid "bad config line %d in blob %s"

1228 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"

1229

1229 -#: config.c:520

1230 +#: config.c:522

1231 #, c-format

1232 msgid "bad config line %d in file %s"

1233 msgstr "felaktig konfigurationsfil rad %d i filen %s"

1234

1234 -#: config.c:524

1235 +#: config.c:526

1236 #, c-format

1237 msgid "bad config line %d in standard input"

1238 msgstr "felaktig konfigurationsfil rad %d i standard in"

1239

1239 -#: config.c:528

1240 +#: config.c:530

1241 #, c-format

1242 msgid "bad config line %d in submodule-blob %s"

1243 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"

1244

1244 -#: config.c:532

1245 +#: config.c:534

1246 #, c-format

1247 msgid "bad config line %d in command line %s"

1248 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

1249

1249 -#: config.c:536

1250 +#: config.c:538

1251 #, c-format

1252 msgid "bad config line %d in %s"

1253 msgstr "felaktig konfigurationsfil rad %d i %s"

1254

1254 -#: config.c:655

1255 +#: config.c:657

1256 msgid "out of range"

1257 msgstr "utanför intervallet"

1258

1258 -#: config.c:655

1259 +#: config.c:657

1260 msgid "invalid unit"

1261 msgstr "ogiltig enhet"

1262

1262 -#: config.c:661

1263 +#: config.c:663

1264 #, c-format

1265 msgid "bad numeric config value '%s' for '%s': %s"

1266 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

1267

1267 -#: config.c:666

1268 +#: config.c:668

1269 #, c-format

1270 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1271 msgstr ""

1272 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"

1273

1273 -#: config.c:669

1274 +#: config.c:671

1275 #, c-format

1276 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1277 msgstr ""

1278 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"

1279

1279 -#: config.c:672

1280 +#: config.c:674

1281 #, c-format

1282 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1283 msgstr ""

1284 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"

1285

1285 -#: config.c:675

1286 +#: config.c:677

1287 #, c-format

1288 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1289 msgstr ""

1290 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"

1291 "en %s: %s"

1292

1292 -#: config.c:678

1293 +#: config.c:680

1294 #, c-format

1295 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1296 msgstr ""

1297 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "

1298 "%s: %s"

1299

1299 -#: config.c:681

1300 +#: config.c:683

1301 #, c-format

1302 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1303 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"

1304

1304 -#: config.c:768

1305 +#: config.c:770

1306 #, c-format

1307 msgid "failed to expand user dir in: '%s'"

1308 msgstr "misslyckades expandera användarkatalog i: \"%s\""

1309

1309 -#: config.c:852 config.c:863

1310 +#: config.c:865 config.c:876

1311 #, c-format

1312 msgid "bad zlib compression level %d"

1313 msgstr "felaktigt zlib-komprimeringsgrad %d"

1314

1314 -#: config.c:978

1315 +#: config.c:993

1316 #, c-format

1317 msgid "invalid mode for object creation: %s"

1318 msgstr "felaktigt läge för skapande av objekt: %s"

1319

1319 -#: config.c:1312

1320 +#: config.c:1149

1321 +#, c-format

1322 +msgid "bad pack compression level %d"

1323 +msgstr "felaktig paketkomprimeringsgrad %d"

1324 +

1325 +#: config.c:1339

1326 msgid "unable to parse command-line config"

1327 msgstr "kan inte tolka kommandoradskonfiguration"

1328

1323 -#: config.c:1362

1329 +#: config.c:1389

1330 msgid "unknown error occurred while reading the configuration files"

1331 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"

1332

1327 -#: config.c:1716

1333 +#: config.c:1743

1334 #, c-format

1335 msgid "unable to parse '%s' from command-line config"

1336 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"

1337

1332 -#: config.c:1718

1338 +#: config.c:1745

1339 #, c-format

1340 msgid "bad config variable '%s' in file '%s' at line %d"

1341 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"

1342

1337 -#: config.c:1777

1343 +#: config.c:1804

1344 #, c-format

1345 msgid "%s has multiple values"

1346 msgstr "%s har flera värden"

1347

1342 -#: config.c:2311

1348 +#: config.c:2225 config.c:2450

1349 +#, c-format

1350 +msgid "fstat on %s failed"

1351 +msgstr "fstat misslyckades på %s"

1352 +

1353 +#: config.c:2343

1354 #, c-format

1355 msgid "could not set '%s' to '%s'"

1356 msgstr "kunde inte ställa in \"%s\" till \"%s\""

1357

1347 -#: config.c:2313

1358 +#: config.c:2345

1359 #, c-format

1360 msgid "could not unset '%s'"

1361 msgstr "kunde inte ta bort inställning för \"%s\""

@@ -1367,7 +1378,7 @@ msgstr ""

1378

1379 # Vague original, not networking-related, but rather related to the actual

1380 # objects in the database.

1370 -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

1381 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140

1382 msgid "Checking connectivity"

1383 msgstr "Kontrollerar konnektivitet"

1384

@@ -1503,12 +1514,12 @@ msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

1514 msgid " Unknown dirstat parameter '%s'\n"

1515 msgstr " Okänd dirstat-parameter \"%s\"\n"

1516

1506 -#: diff.c:283

1517 +#: diff.c:281

1518 #, c-format

1519 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

1520 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""

1521

1511 -#: diff.c:346

1522 +#: diff.c:344

1523 #, c-format

1524 msgid ""

1525 "Found errors in 'diff.dirstat' config variable:\n"

@@ -1517,20 +1528,20 @@ msgstr ""

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

1529 "%s"

1530

1520 -#: diff.c:3087

1531 +#: diff.c:3085

1532 #, c-format

1533 msgid "external diff died, stopping at %s"

1534 msgstr "extern diff dog, stannar vid %s"

1535

1525 -#: diff.c:3412

1536 +#: diff.c:3411

1537 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

1538 msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"

1539

1529 -#: diff.c:3502

1540 +#: diff.c:3501

1541 msgid "--follow requires exactly one pathspec"

1542 msgstr "--follow kräver exakt en sökvägsangivelse"

1543

1533 -#: diff.c:3665

1544 +#: diff.c:3664

1545 #, c-format

1546 msgid ""

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

@@ -1539,35 +1550,40 @@ msgstr ""

1550 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"

1551 "%s"

1552

1542 -#: diff.c:3679

1553 +#: diff.c:3678

1554 #, c-format

1555 msgid "Failed to parse --submodule option parameter: '%s'"

1556 msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""

1557

1547 -#: diff.c:4700

1558 +#: diff.c:4695

1559 msgid "inexact rename detection was skipped due to too many files."

1560 msgstr ""

1561 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer"

1562

1552 -#: diff.c:4703

1563 +#: diff.c:4698

1564 msgid "only found copies from modified paths due to too many files."

1565 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

1566

1556 -#: diff.c:4706

1567 +#: diff.c:4701

1568 #, c-format

1569 msgid ""

1570 "you may want to set your %s variable to at least %d and retry the command."

1571 msgstr ""

1572 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."

1573

1563 -#: dir.c:1866

1574 +#: dir.c:1863

1575 msgid "failed to get kernel name and information"

1576 msgstr "misslyckades hämta kärnans namn och information"

1577

1567 -#: dir.c:1985

1578 +#: dir.c:1982

1579 msgid "Untracked cache is disabled on this system or location."

1580 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."

1581

1582 +#: dir.c:2760

1583 +#, c-format

1584 +msgid "could not migrate git directory from '%s' to '%s'"

1585 +msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

1586 +

1587 #: fetch-pack.c:213

1588 msgid "git fetch-pack: expected shallow list"

1589 msgstr "git fetch-pack: förväntade grund lista"

@@ -1748,35 +1764,40 @@ msgstr "kunde inte skapa temporära fil"

1764 msgid "failed writing detached signature to '%s'"

1765 msgstr "misslyckades skriva fristående signatur till \"%s\""

1766

1751 -#: grep.c:1782

1767 +#: graph.c:96

1768 +#, c-format

1769 +msgid "ignore invalid color '%.*s' in log.graphColors"

1770 +msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

1771 +

1772 +#: grep.c:1794

1773 #, c-format

1774 msgid "'%s': unable to read %s"

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

1776

1756 -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155

1777 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

1778 #, c-format

1779 msgid "failed to stat '%s'"

1780 msgstr "misslyckades ta status på \"%s\""

1781

1761 -#: grep.c:1810

1782 +#: grep.c:1822

1783 #, c-format

1784 msgid "'%s': short read"

1785 msgstr "\"%s\": kort läsning"

1786

1766 -#: help.c:203

1787 +#: help.c:218

1788 #, c-format

1789 msgid "available git commands in '%s'"

1790 msgstr "git-kommandon tillgängliga i \"%s\""

1791

1771 -#: help.c:210

1792 +#: help.c:225

1793 msgid "git commands available from elsewhere on your $PATH"

1794 msgstr "git-kommandon från andra platser i din $PATH"

1795

1775 -#: help.c:241

1796 +#: help.c:256

1797 msgid "These are common Git commands used in various situations:"

1798 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

1799

1779 -#: help.c:306

1800 +#: help.c:321

1801 #, c-format

1802 msgid ""

1803 "'%s' appears to be a git command, but we were not\n"

@@ -1785,11 +1806,11 @@ msgstr ""

1806 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

1807 "köra det. Kanske git-%s är trasigt?"

1808

1788 -#: help.c:361

1809 +#: help.c:376

1810 msgid "Uh oh. Your system reports no Git commands at all."

1811 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

1812

1792 -#: help.c:383

1813 +#: help.c:398

1814 #, c-format

1815 msgid ""

1816 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -1798,17 +1819,17 @@ msgstr ""

1819 "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"

1820 "Fortsätter under förutsättningen att du menade \"%s\""

1821

1801 -#: help.c:388

1822 +#: help.c:403

1823 #, c-format

1824 msgid "in %0.1f seconds automatically..."

1825 msgstr "automatiskt om %0.1f sekunder..."

1826

1806 -#: help.c:395

1827 +#: help.c:410

1828 #, c-format

1829 msgid "git: '%s' is not a git command. See 'git --help'."

1830 msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."

1831

1811 -#: help.c:399 help.c:465

1832 +#: help.c:414 help.c:480

1833 msgid ""

1834 "\n"

1835 "Did you mean this?"

@@ -1822,7 +1843,7 @@ msgstr[1] ""

1843 "\n"

1844 "Menade du ett av dessa?"

1845

1825 -#: help.c:461

1846 +#: help.c:476

1847 #, c-format

1848 msgid "%s: %s - %s"

1849 msgstr "%s: %s - %s"

@@ -1891,69 +1912,69 @@ msgstr "kunde inte skriva ny indexfil"

1912 msgid "(bad commit)\n"

1913 msgstr "(felaktig incheckning)\n"

1914

1894 -#: merge-recursive.c:231

1915 +#: merge-recursive.c:231 merge-recursive.c:239

1916 #, c-format

1917 msgid "addinfo_cache failed for path '%s'"

1918 msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

1919

1899 -#: merge-recursive.c:301

1920 +#: merge-recursive.c:303

1921 msgid "error building trees"

1922 msgstr "fel vid byggande av träd"

1923

1903 -#: merge-recursive.c:720

1924 +#: merge-recursive.c:727

1925 #, c-format

1926 msgid "failed to create path '%s'%s"

1927 msgstr "misslyckades skapa sökvägen \"%s\"%s"

1928

1908 -#: merge-recursive.c:731

1929 +#: merge-recursive.c:738

1930 #, c-format

1931 msgid "Removing %s to make room for subdirectory\n"

1932 msgstr "Tar bort %s för att göra plats för underkatalog\n"

1933

1913 -#: merge-recursive.c:745 merge-recursive.c:764

1934 +#: merge-recursive.c:752 merge-recursive.c:771

1935 msgid ": perhaps a D/F conflict?"

1936 msgstr ": kanske en K/F-konflikt?"

1937

1917 -#: merge-recursive.c:754

1938 +#: merge-recursive.c:761

1939 #, c-format

1940 msgid "refusing to lose untracked file at '%s'"

1941 msgstr "vägrar förlora ospårad fil vid \"%s\""

1942

1922 -#: merge-recursive.c:796 builtin/cat-file.c:34

1943 +#: merge-recursive.c:803 builtin/cat-file.c:34

1944 #, c-format

1945 msgid "cannot read object %s '%s'"

1946 msgstr "kan inte läsa objektet %s: \"%s\""

1947

1927 -#: merge-recursive.c:798

1948 +#: merge-recursive.c:805

1949 #, c-format

1950 msgid "blob expected for %s '%s'"

1951 msgstr "blob förväntades för %s \"%s\""

1952

1932 -#: merge-recursive.c:822

1953 +#: merge-recursive.c:829

1954 #, c-format

1955 msgid "failed to open '%s': %s"

1956 msgstr "misslyckades öppna \"%s\": %s"

1957

1937 -#: merge-recursive.c:833

1958 +#: merge-recursive.c:840

1959 #, c-format

1960 msgid "failed to symlink '%s': %s"

1961 msgstr "misslyckades skapa symboliska länken \"%s\": %s"

1962

1942 -#: merge-recursive.c:838

1963 +#: merge-recursive.c:845

1964 #, c-format

1965 msgid "do not know what to do with %06o %s '%s'"

1966 msgstr "vet inte hur %06o %s \"%s\" skall hanteras"

1967

1947 -#: merge-recursive.c:978

1968 +#: merge-recursive.c:985

1969 msgid "Failed to execute internal merge"

1970 msgstr "Misslyckades exekvera intern sammanslagning"

1971

1951 -#: merge-recursive.c:982

1972 +#: merge-recursive.c:989

1973 #, c-format

1974 msgid "Unable to add %s to database"

1975 msgstr "Kunde inte lägga till %s till databasen"

1976

1956 -#: merge-recursive.c:1081 merge-recursive.c:1095

1977 +#: merge-recursive.c:1088 merge-recursive.c:1102

1978 #, c-format

1979 msgid ""

1980 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -1962,7 +1983,7 @@ msgstr ""

1983 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

1984 "i trädet."

1985

1965 -#: merge-recursive.c:1087 merge-recursive.c:1100

1986 +#: merge-recursive.c:1094 merge-recursive.c:1107

1987 #, c-format

1988 msgid ""

1989 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "

@@ -1971,20 +1992,20 @@ msgstr ""

1992 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "

1993 "i trädet vid %s."

1994

1974 -#: merge-recursive.c:1143

1995 +#: merge-recursive.c:1150

1996 msgid "rename"

1997 msgstr "namnbyte"

1998

1978 -#: merge-recursive.c:1143

1999 +#: merge-recursive.c:1150

2000 msgid "renamed"

2001 msgstr "namnbytt"

2002

1982 -#: merge-recursive.c:1200

2003 +#: merge-recursive.c:1207

2004 #, c-format

2005 msgid "%s is a directory in %s adding as %s instead"

2006 msgstr "%s är en katalog i %s lägger till som %s istället"

2007

1987 -#: merge-recursive.c:1225

2008 +#: merge-recursive.c:1232

2009 #, c-format

2010 msgid ""

2011 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"

@@ -1993,135 +2014,135 @@ msgstr ""

2014 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "

2015 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"

2016

1996 -#: merge-recursive.c:1230

2017 +#: merge-recursive.c:1237

2018 msgid " (left unresolved)"

2019 msgstr " (lämnad olöst)"

2020

2000 -#: merge-recursive.c:1292

2021 +#: merge-recursive.c:1299

2022 #, c-format

2023 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

2024 msgstr ""

2025 "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"

2026

2006 -#: merge-recursive.c:1325

2027 +#: merge-recursive.c:1332

2028 #, c-format

2029 msgid "Renaming %s to %s and %s to %s instead"

2030 msgstr "Byter namn på %s till %s och %s till %s istället"

2031

2011 -#: merge-recursive.c:1531

2032 +#: merge-recursive.c:1538

2033 #, c-format

2034 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2035 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"

2036

2016 -#: merge-recursive.c:1546

2037 +#: merge-recursive.c:1553

2038 #, c-format

2039 msgid "Adding merged %s"

2040 msgstr "Lägger till sammanslagen %s"

2041

2021 -#: merge-recursive.c:1553 merge-recursive.c:1766

2042 +#: merge-recursive.c:1560 merge-recursive.c:1774

2043 #, c-format

2044 msgid "Adding as %s instead"

2045 msgstr "Lägger till som %s istället"

2046

2026 -#: merge-recursive.c:1610

2047 +#: merge-recursive.c:1617

2048 #, c-format

2049 msgid "cannot read object %s"

2050 msgstr "kan inte läsa objektet %s"

2051

2031 -#: merge-recursive.c:1613

2052 +#: merge-recursive.c:1620

2053 #, c-format

2054 msgid "object %s is not a blob"

2055 msgstr "objektet %s är inte en blob"

2056

2036 -#: merge-recursive.c:1666

2057 +#: merge-recursive.c:1673

2058 msgid "modify"

2059 msgstr "ändra"

2060

2040 -#: merge-recursive.c:1666

2061 +#: merge-recursive.c:1673

2062 msgid "modified"

2063 msgstr "ändrad"

2064

2044 -#: merge-recursive.c:1676

2065 +#: merge-recursive.c:1683

2066 msgid "content"

2067 msgstr "innehåll"

2068

2048 -#: merge-recursive.c:1683

2069 +#: merge-recursive.c:1690

2070 msgid "add/add"

2071 msgstr "tillägg/tillägg"

2072

2052 -#: merge-recursive.c:1718

2073 +#: merge-recursive.c:1726

2074 #, c-format

2075 msgid "Skipped %s (merged same as existing)"

2076 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

2077

2057 -#: merge-recursive.c:1732

2078 +#: merge-recursive.c:1740

2079 #, c-format

2080 msgid "Auto-merging %s"

2081 msgstr "Slår ihop %s automatiskt"

2082

2062 -#: merge-recursive.c:1736 git-submodule.sh:924

2083 +#: merge-recursive.c:1744 git-submodule.sh:930

2084 msgid "submodule"

2085 msgstr "undermodul"

2086

2066 -#: merge-recursive.c:1737

2087 +#: merge-recursive.c:1745

2088 #, c-format

2089 msgid "CONFLICT (%s): Merge conflict in %s"

2090 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

2091

2071 -#: merge-recursive.c:1831

2092 +#: merge-recursive.c:1839

2093 #, c-format

2094 msgid "Removing %s"

2095 msgstr "Tar bort %s"

2096

2076 -#: merge-recursive.c:1857

2097 +#: merge-recursive.c:1865

2098 msgid "file/directory"

2099 msgstr "fil/katalog"

2100

2080 -#: merge-recursive.c:1863

2101 +#: merge-recursive.c:1871

2102 msgid "directory/file"

2103 msgstr "katalog/fil"

2104

2084 -#: merge-recursive.c:1868

2105 +#: merge-recursive.c:1877

2106 #, c-format

2107 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2108 msgstr ""

2109 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"

2110

2090 -#: merge-recursive.c:1877

2111 +#: merge-recursive.c:1886

2112 #, c-format

2113 msgid "Adding %s"

2114 msgstr "Lägger till %s"

2115

2095 -#: merge-recursive.c:1914

2116 +#: merge-recursive.c:1923

2117 msgid "Already up-to-date!"

2118 msgstr "Redan à jour!"

2119

2099 -#: merge-recursive.c:1923

2120 +#: merge-recursive.c:1932

2121 #, c-format

2122 msgid "merging of trees %s and %s failed"

2123 msgstr "sammanslagning av träden %s och %s misslyckades"

2124

2104 -#: merge-recursive.c:2006

2125 +#: merge-recursive.c:2015

2126 msgid "Merging:"

2127 msgstr "Slår ihop:"

2128

2108 -#: merge-recursive.c:2019

2129 +#: merge-recursive.c:2028

2130 #, c-format

2131 msgid "found %u common ancestor:"

2132 msgid_plural "found %u common ancestors:"

2133 msgstr[0] "hittade %u gemensam förfader:"

2134 msgstr[1] "hittade %u gemensamma förfäder:"

2135

2115 -#: merge-recursive.c:2058

2136 +#: merge-recursive.c:2067

2137 msgid "merge returned no commit"

2138 msgstr "sammanslagningen returnerade ingen incheckning"

2139

2119 -#: merge-recursive.c:2121

2140 +#: merge-recursive.c:2130

2141 #, c-format

2142 msgid "Could not parse object '%s'"

2143 msgstr "Kunde inte tolka objektet \"%s\""

2144

2124 -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

2145 +#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

2146 msgid "Unable to write index."

2147 msgstr "Kunde inte skriva indexet."

2148

@@ -2203,12 +2224,12 @@ msgstr "felformat objektnamn \"%s\""

2224 msgid "Could not make %s writable by group"

2225 msgstr "Kunde inte göra %s skrivbar för gruppen"

2226

2206 -#: pathspec.c:133

2227 +#: pathspec.c:142

2228 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

2229 msgstr ""

2230 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"

2231

2211 -#: pathspec.c:143

2232 +#: pathspec.c:149

2233 msgid ""

2234 "global 'literal' pathspec setting is incompatible with all other global "

2235 "pathspec settings"

@@ -2216,46 +2237,51 @@ msgstr ""

2237 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "

2238 "globala sökvägsinställningar"

2239

2219 -#: pathspec.c:177

2240 +#: pathspec.c:188

2241 msgid "invalid parameter for pathspec magic 'prefix'"

2242 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""

2243

2223 -#: pathspec.c:183

2244 +#: pathspec.c:201

2245 #, c-format

2246 msgid "Invalid pathspec magic '%.*s' in '%s'"

2247 msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\""

2248

2228 -#: pathspec.c:187

2249 +#: pathspec.c:206

2250 #, c-format

2251 msgid "Missing ')' at the end of pathspec magic in '%s'"

2252 msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""

2253

2233 -#: pathspec.c:205

2254 +#: pathspec.c:238

2255 #, c-format

2256 msgid "Unimplemented pathspec magic '%c' in '%s'"

2257 msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats"

2258

2238 -#: pathspec.c:230

2259 +#: pathspec.c:293 pathspec.c:315

2260 +#, c-format

2261 +msgid "Pathspec '%s' is in submodule '%.*s'"

2262 +msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

2263 +

2264 +#: pathspec.c:350

2265 #, c-format

2266 msgid "%s: 'literal' and 'glob' are incompatible"

2267 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

2268

2243 -#: pathspec.c:241

2269 +#: pathspec.c:363

2270 #, c-format

2271 msgid "%s: '%s' is outside repository"

2272 msgstr "%s: \"%s\" är utanför arkivet"

2273

2248 -#: pathspec.c:291

2274 +#: pathspec.c:451

2275 #, c-format

2250 -msgid "Pathspec '%s' is in submodule '%.*s'"

2251 -msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

2276 +msgid "'%s' (mnemonic: '%c')"

2277 +msgstr "\"%s\" (minnesstöd: \"%c\")"

2278

2253 -#: pathspec.c:353

2279 +#: pathspec.c:461

2280 #, c-format

2281 msgid "%s: pathspec magic not supported by this command: %s"

2282 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"

2283

2258 -#: pathspec.c:408

2284 +#: pathspec.c:511

2285 msgid ""

2286 "empty strings as pathspecs will be made invalid in upcoming releases. please "

2287 "use . instead if you meant to match all paths"

@@ -2263,12 +2289,12 @@ msgstr ""

2289 "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "

2290 "utgåva. använd istället . om du vill träffa alla sökvägar"

2291

2266 -#: pathspec.c:440

2292 +#: pathspec.c:535

2293 #, c-format

2294 msgid "pathspec '%s' is beyond a symbolic link"

2295 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

2296

2271 -#: pathspec.c:449

2297 +#: pathspec.c:544

2298 msgid ""

2299 "There is nothing to exclude from by :(exclude) patterns.\n"

2300 "Perhaps you forgot to add either ':/' or '.' ?"

@@ -2276,11 +2302,11 @@ msgstr ""

2302 "Ingenting att exkludera från med :(exkludera)-mönster.\n"

2303 "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

2304

2279 -#: pretty.c:971

2305 +#: pretty.c:982

2306 msgid "unable to parse --pretty format"

2307 msgstr "kunde inte tolka format för --pretty"

2308

2283 -#: read-cache.c:1315

2309 +#: read-cache.c:1307

2310 #, c-format

2311 msgid ""

2312 "index.version set, but the value is invalid.\n"

@@ -2289,7 +2315,7 @@ msgstr ""

2315 "index.version satt, men värdet är ogiltigt.\n"

2316 "Använder version %i"

2317

2292 -#: read-cache.c:1325

2318 +#: read-cache.c:1317

2319 #, c-format

2320 msgid ""

2321 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2298,7 +2324,7 @@ msgstr ""

2324 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"

2325 "Använder version %i"

2326

2301 -#: refs.c:576 builtin/merge.c:840

2327 +#: refs.c:576 builtin/merge.c:844

2328 #, c-format

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

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

@@ -2318,227 +2344,232 @@ msgstr "kunde inte ta bort referenser: %s"

2344 msgid "could not remove reference %s"

2345 msgstr "kunde inte ta bort referensen %s"

2346

2321 -#: ref-filter.c:55

2347 +#: ref-filter.c:56

2348 #, c-format

2349 msgid "expected format: %%(color:<color>)"

2350 msgstr "förväntat format: %%(color:<color>)"

2351

2326 -#: ref-filter.c:57

2352 +#: ref-filter.c:58

2353 #, c-format

2354 msgid "unrecognized color: %%(color:%s)"

2355 msgstr "okänd färg: %%(color:%s)"

2356

2331 -#: ref-filter.c:71

2357 +#: ref-filter.c:72

2358 #, c-format

2359 msgid "unrecognized format: %%(%s)"

2360 msgstr "okänt format: %%(%s)"

2361

2336 -#: ref-filter.c:77

2362 +#: ref-filter.c:78

2363 #, c-format

2364 msgid "%%(body) does not take arguments"

2365 msgstr "%%(body) tar inte argument"

2366

2341 -#: ref-filter.c:84

2367 +#: ref-filter.c:85

2368 #, c-format

2369 msgid "%%(subject) does not take arguments"

2370 msgstr "%%(subject) tar inte argument"

2371

2346 -#: ref-filter.c:101

2372 +#: ref-filter.c:92

2373 +#, c-format

2374 +msgid "%%(trailers) does not take arguments"

2375 +msgstr "%%(trailers) tar inte argument"

2376 +

2377 +#: ref-filter.c:111

2378 #, c-format

2379 msgid "positive value expected contents:lines=%s"

2380 msgstr "positivt värde förväntat contents:lines=%s"

2381

2351 -#: ref-filter.c:103

2382 +#: ref-filter.c:113

2383 #, c-format

2384 msgid "unrecognized %%(contents) argument: %s"

2385 msgstr "okänt %%(contents)-argument: %s"

2386

2356 -#: ref-filter.c:113

2387 +#: ref-filter.c:123

2388 #, c-format

2389 msgid "unrecognized %%(objectname) argument: %s"

2390 msgstr "okänt %%(objectname)-argument: %s"

2391

2361 -#: ref-filter.c:135

2392 +#: ref-filter.c:145

2393 #, c-format

2394 msgid "expected format: %%(align:<width>,<position>)"

2395 msgstr "förväntat format: %%(align:<bredd>,<position>)"

2396

2366 -#: ref-filter.c:147

2397 +#: ref-filter.c:157

2398 #, c-format

2399 msgid "unrecognized position:%s"

2400 msgstr "okänd position:%s"

2401

2371 -#: ref-filter.c:151

2402 +#: ref-filter.c:161

2403 #, c-format

2404 msgid "unrecognized width:%s"

2405 msgstr "okänd bredd:%s"

2406

2376 -#: ref-filter.c:157

2407 +#: ref-filter.c:167

2408 #, c-format

2409 msgid "unrecognized %%(align) argument: %s"

2410 msgstr "okänt %%(align)-argument: %s"

2411

2381 -#: ref-filter.c:161

2412 +#: ref-filter.c:171

2413 #, c-format

2414 msgid "positive width expected with the %%(align) atom"

2415 msgstr "positiv bredd förväntad med atomen %%(align)"

2416

2386 -#: ref-filter.c:244

2417 +#: ref-filter.c:255

2418 #, c-format

2419 msgid "malformed field name: %.*s"

2420 msgstr "felformat fältnamn: %.*s"

2421

2391 -#: ref-filter.c:270

2422 +#: ref-filter.c:281

2423 #, c-format

2424 msgid "unknown field name: %.*s"

2425 msgstr "okänt fältnamn: %.*s"

2426

2396 -#: ref-filter.c:372

2427 +#: ref-filter.c:383

2428 #, c-format

2429 msgid "format: %%(end) atom used without corresponding atom"

2430 msgstr "format: atomen %%(end) använd utan motsvarande atom"

2431

2401 -#: ref-filter.c:424

2432 +#: ref-filter.c:435

2433 #, c-format

2434 msgid "malformed format string %s"

2435 msgstr "felformad formatsträng %s"

2436

2406 -#: ref-filter.c:878

2437 +#: ref-filter.c:898

2438 msgid ":strip= requires a positive integer argument"

2439 msgstr ":strip= kräver ett positivt heltalsargument"

2440

2410 -#: ref-filter.c:883

2441 +#: ref-filter.c:903

2442 #, c-format

2443 msgid "ref '%s' does not have %ld components to :strip"

2444 msgstr "referensen \"%s\" har inte %ld komponenter för :strip"

2445

2415 -#: ref-filter.c:1046

2446 +#: ref-filter.c:1066

2447 #, c-format

2448 msgid "unknown %.*s format %s"

2449 msgstr "okänt \"%.*s\"-format %s"

2450

2420 -#: ref-filter.c:1066 ref-filter.c:1097

2451 +#: ref-filter.c:1086 ref-filter.c:1117

2452 #, c-format

2453 msgid "missing object %s for %s"

2454 msgstr "objektet %s saknas för %s"

2455

2425 -#: ref-filter.c:1069 ref-filter.c:1100

2456 +#: ref-filter.c:1089 ref-filter.c:1120

2457 #, c-format

2458 msgid "parse_object_buffer failed on %s for %s"

2459 msgstr "parse_object_buffer misslyckades på %s för %s"

2460

2430 -#: ref-filter.c:1311

2461 +#: ref-filter.c:1343

2462 #, c-format

2463 msgid "malformed object at '%s'"

2464 msgstr "felformat objekt vid \"%s\""

2465

2435 -#: ref-filter.c:1373

2466 +#: ref-filter.c:1410

2467 #, c-format

2468 msgid "ignoring ref with broken name %s"

2469 msgstr "ignorerar referens med trasigt namn %s"

2470

2440 -#: ref-filter.c:1378

2471 +#: ref-filter.c:1415

2472 #, c-format

2473 msgid "ignoring broken ref %s"

2474 msgstr "ignorerar trasig referens %s"

2475

2445 -#: ref-filter.c:1633

2476 +#: ref-filter.c:1670

2477 #, c-format

2478 msgid "format: %%(end) atom missing"

2479 msgstr "format: atomen %%(end) saknas"

2480

2450 -#: ref-filter.c:1687

2481 +#: ref-filter.c:1734

2482 #, c-format

2483 msgid "malformed object name %s"

2484 msgstr "felformat objektnamn %s"

2485

2455 -#: remote.c:746

2486 +#: remote.c:754

2487 #, c-format

2488 msgid "Cannot fetch both %s and %s to %s"

2489 msgstr "Kan inte hämta både %s och %s till %s"

2490

2460 -#: remote.c:750

2491 +#: remote.c:758

2492 #, c-format

2493 msgid "%s usually tracks %s, not %s"

2494 msgstr "%s spårar vanligtvis %s, inte %s"

2495

2465 -#: remote.c:754

2496 +#: remote.c:762

2497 #, c-format

2498 msgid "%s tracks both %s and %s"

2499 msgstr "%s spårar både %s och %s"

2500

2470 -#: remote.c:762

2501 +#: remote.c:770

2502 msgid "Internal error"

2503 msgstr "Internt fel"

2504

2474 -#: remote.c:1677 remote.c:1720

2505 +#: remote.c:1685 remote.c:1787

2506 msgid "HEAD does not point to a branch"

2507 msgstr "HEAD pekar inte på en gren"

2508

2478 -#: remote.c:1686

2509 +#: remote.c:1694

2510 #, c-format

2511 msgid "no such branch: '%s'"

2512 msgstr "okänd gren: \"%s\""

2513

2483 -#: remote.c:1689

2514 +#: remote.c:1697

2515 #, c-format

2516 msgid "no upstream configured for branch '%s'"

2517 msgstr "ingen standarduppström angiven för grenen \"%s\""

2518

2488 -#: remote.c:1695

2519 +#: remote.c:1703

2520 #, c-format

2521 msgid "upstream branch '%s' not stored as a remote-tracking branch"

2522 msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

2523

2493 -#: remote.c:1710

2524 +#: remote.c:1718

2525 #, c-format

2526 msgid "push destination '%s' on remote '%s' has no local tracking branch"

2527 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"

2528

2498 -#: remote.c:1725

2529 +#: remote.c:1730

2530 #, c-format

2531 msgid "branch '%s' has no remote for pushing"

2532 msgstr "grenen \"%s\" har ingen fjärr för \"push\""

2533

2503 -#: remote.c:1736

2534 +#: remote.c:1741

2535 #, c-format

2536 msgid "push refspecs for '%s' do not include '%s'"

2537 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""

2538

2508 -#: remote.c:1749

2539 +#: remote.c:1754

2540 msgid "push has no destination (push.default is 'nothing')"

2541 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"

2542

2512 -#: remote.c:1771

2543 +#: remote.c:1776

2544 msgid "cannot resolve 'simple' push to a single destination"

2545 msgstr "\"enkel push\" motsvarar flera olika mål"

2546

2516 -#: remote.c:2073

2547 +#: remote.c:2081

2548 #, c-format

2549 msgid "Your branch is based on '%s', but the upstream is gone.\n"

2550 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"

2551

2521 -#: remote.c:2077

2552 +#: remote.c:2085

2553 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

2554 msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"

2555

2525 -#: remote.c:2080

2556 +#: remote.c:2088

2557 #, c-format

2558 msgid "Your branch is up-to-date with '%s'.\n"

2559 msgstr "Din gren är à jour med \"%s\".\n"

2560

2530 -#: remote.c:2084

2561 +#: remote.c:2092

2562 #, c-format

2563 msgid "Your branch is ahead of '%s' by %d commit.\n"

2564 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

2565 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"

2566 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"

2567

2537 -#: remote.c:2090

2568 +#: remote.c:2098

2569 msgid " (use \"git push\" to publish your local commits)\n"

2570 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"

2571

2541 -#: remote.c:2093

2572 +#: remote.c:2101

2573 #, c-format

2574 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

2575 msgid_plural ""

@@ -2548,11 +2579,11 @@ msgstr[0] ""

2579 msgstr[1] ""

2580 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"

2581

2551 -#: remote.c:2101

2582 +#: remote.c:2109

2583 msgid " (use \"git pull\" to update your local branch)\n"

2584 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"

2585

2555 -#: remote.c:2104

2586 +#: remote.c:2112

2587 #, c-format

2588 msgid ""

2589 "Your branch and '%s' have diverged,\n"

@@ -2567,7 +2598,7 @@ msgstr[1] ""

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

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

2600

2570 -#: remote.c:2114

2601 +#: remote.c:2122

2602 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

2603 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"

2604

@@ -2584,11 +2615,11 @@ msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

2615 msgid "--first-parent is incompatible with --bisect"

2616 msgstr "--first-parent är inkompatibelt med --bisect"

2617

2587 -#: run-command.c:106

2618 +#: run-command.c:125

2619 msgid "open /dev/null failed"

2620 msgstr "misslyckades öppna /dev/null"

2621

2591 -#: run-command.c:108

2622 +#: run-command.c:127

2623 #, c-format

2624 msgid "dup2(%d,%d) failed"

2625 msgstr "dup2(%d,%d) misslyckades"

@@ -2617,15 +2648,24 @@ msgstr "mottagarsidan stöder inte push med --atomic"

2648 msgid "the receiving end does not support push options"

2649 msgstr "mottagarsidan stöder inte push-flaggor"

2650

2620 -#: sequencer.c:171

2651 +#: sequencer.c:215

2652 msgid "revert"

2653 msgstr "revert"

2654

2624 -#: sequencer.c:171

2655 +#: sequencer.c:217

2656 msgid "cherry-pick"

2657 msgstr "cherry-pick"

2658

2628 -#: sequencer.c:228

2659 +#: sequencer.c:219

2660 +msgid "rebase -i"

2661 +msgstr "rebase -i"

2662 +

2663 +#: sequencer.c:221

2664 +#, c-format

2665 +msgid "Unknown action: %d"

2666 +msgstr "Okänd funktion: %d"

2667 +

2668 +#: sequencer.c:278

2669 msgid ""

2670 "after resolving the conflicts, mark the corrected paths\n"

2671 "with 'git add <paths>' or 'git rm <paths>'"

@@ -2633,7 +2673,7 @@ msgstr ""

2673 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

2674 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""

2675

2636 -#: sequencer.c:231

2676 +#: sequencer.c:281

2677 msgid ""

2678 "after resolving the conflicts, mark the corrected paths\n"

2679 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -2643,60 +2683,63 @@ msgstr ""

2683 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"

2684 "och checka in resultatet med \"git commit\""

2685

2646 -#: sequencer.c:244 sequencer.c:1209

2686 +#: sequencer.c:294 sequencer.c:1667

2687 #, c-format

2688 msgid "could not lock '%s'"

2689 msgstr "kunde inte låsa \"%s\""

2690

2651 -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214

2691 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686

2692 #, c-format

2693 msgid "could not write to '%s'"

2694 msgstr "kunde inte skriva till \"%s\""

2695

2656 -#: sequencer.c:251

2696 +#: sequencer.c:301

2697 #, c-format

2698 msgid "could not write eol to '%s'"

2699 msgstr "kunde inte skriva radslut till \"%s\""

2700

2661 -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216

2701 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674

2702 #, c-format

2703 msgid "failed to finalize '%s'."

2704 msgstr "misslyckades färdigställa \"%s\"."

2705

2666 -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032

2706 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259

2707 +#: builtin/commit.c:749 builtin/merge.c:1036

2708 #, c-format

2709 msgid "could not read '%s'"

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

2711

2671 -#: sequencer.c:305

2712 +#: sequencer.c:355

2713 #, c-format

2714 msgid "your local changes would be overwritten by %s."

2715 msgstr "dina lokala ändringar skulle skrivas över av %s."

2716

2676 -#: sequencer.c:309

2717 +#: sequencer.c:359

2718 msgid "commit your changes or stash them to proceed."

2719 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."

2720

2680 -#: sequencer.c:324

2721 +#: sequencer.c:388

2722 #, c-format

2723 msgid "%s: fast-forward"

2724 msgstr "%s: snabbspola"

2725

2685 -#. TRANSLATORS: %s will be "revert" or "cherry-pick"

2686 -#: sequencer.c:399

2726 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or

2727 +#. * "rebase -i".

2728 +#.

2729 +#: sequencer.c:470

2730 #, c-format

2731 msgid "%s: Unable to write new index file"

2732 msgstr "%s: Kunde inte skriva ny indexfil"

2733

2691 -#: sequencer.c:418

2734 +#: sequencer.c:489

2735 msgid "could not resolve HEAD commit\n"

2736 msgstr "kunde inte bestämma HEAD:s incheckning\n"

2737

2695 -#: sequencer.c:438

2738 +#: sequencer.c:509

2739 msgid "unable to update cache tree\n"

2740 msgstr "kan inte uppdatera cacheträd\n"

2741

2699 -#: sequencer.c:483

2742 +#: sequencer.c:592

2743 #, c-format

2744 msgid ""

2745 "you have staged changes in your working tree\n"

@@ -2725,172 +2768,394 @@ msgstr ""

2768 "\n"

2769 " git rebase --continue\n"

2770

2728 -#: sequencer.c:567

2771 +#: sequencer.c:688

2772 #, c-format

2773 msgid "could not parse commit %s\n"

2774 msgstr "kunde inte tolka incheckningen %s\n"

2775

2733 -#: sequencer.c:572

2776 +#: sequencer.c:693

2777 #, c-format

2778 msgid "could not parse parent commit %s\n"

2779 msgstr "kunde inte tolka föräldraincheckningen %s\n"

2780

2738 -#: sequencer.c:656

2781 +#: sequencer.c:815

2782 +#, c-format

2783 +msgid ""

2784 +"unexpected 1st line of squash message:\n"

2785 +"\n"

2786 +"\t%.*s"

2787 +msgstr ""

2788 +"oväntad första rad i squash-meddelande:\n"

2789 +"\n"

2790 +"\t%.*s"

2791 +

2792 +#: sequencer.c:821

2793 +#, c-format

2794 +msgid ""

2795 +"invalid 1st line of squash message:\n"

2796 +"\n"

2797 +"\t%.*s"

2798 +msgstr ""

2799 +"ogiltig första rad i squash-meddelande:\n"

2800 +"\n"

2801 +"\t%.*s"

2802 +

2803 +#: sequencer.c:827 sequencer.c:852

2804 +#, c-format

2805 +msgid "This is a combination of %d commits."

2806 +msgstr "Det här är en kombination av %d incheckningar."

2807 +

2808 +#: sequencer.c:836

2809 +msgid "need a HEAD to fixup"

2810 +msgstr "behöver en HEAD-incheckning att rätta"

2811 +

2812 +#: sequencer.c:838

2813 +msgid "could not read HEAD"

2814 +msgstr "kunde inte läsa HEAD"

2815 +

2816 +#: sequencer.c:840

2817 +msgid "could not read HEAD's commit message"

2818 +msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

2819 +

2820 +#: sequencer.c:846

2821 +#, c-format

2822 +msgid "cannot write '%s'"

2823 +msgstr "kan inte skriva \"%s\""

2824 +

2825 +#: sequencer.c:855 git-rebase--interactive.sh:445

2826 +msgid "This is the 1st commit message:"

2827 +msgstr "Det här är 1:a incheckningsmeddelandet:"

2828 +

2829 +#: sequencer.c:863

2830 +#, c-format

2831 +msgid "could not read commit message of %s"

2832 +msgstr "kunde inte läsa incheckningsmeddelande för %s"

2833 +

2834 +#: sequencer.c:870

2835 +#, c-format

2836 +msgid "This is the commit message #%d:"

2837 +msgstr "Det här är incheckningsmeddelande %d:"

2838 +

2839 +#: sequencer.c:875

2840 +#, c-format

2841 +msgid "The commit message #%d will be skipped:"

2842 +msgstr "Incheckningsmeddelande %d kommer hoppas över:"

2843 +

2844 +#: sequencer.c:880

2845 +#, c-format

2846 +msgid "unknown command: %d"

2847 +msgstr "okänt kommando: %d"

2848 +

2849 +#: sequencer.c:946

2850 msgid "your index file is unmerged."

2851 msgstr "din indexfil har inte slagits ihop."

2852

2742 -#: sequencer.c:675

2853 +#: sequencer.c:964

2854 #, c-format

2855 msgid "commit %s is a merge but no -m option was given."

2856 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."

2857

2747 -#: sequencer.c:683

2858 +#: sequencer.c:972

2859 #, c-format

2860 msgid "commit %s does not have parent %d"

2861 msgstr "incheckning %s har inte förälder %d"

2862

2752 -#: sequencer.c:687

2863 +#: sequencer.c:976

2864 #, c-format

2865 msgid "mainline was specified but commit %s is not a merge."

2866 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

2867

2868 +#: sequencer.c:982

2869 +#, c-format

2870 +msgid "cannot get commit message for %s"

2871 +msgstr "kan inte hämta incheckningsmeddelande för %s"

2872 +

2873 #. TRANSLATORS: The first %s will be a "todo" command like

2874 #. "revert" or "pick", the second %s a SHA1.

2759 -#: sequencer.c:700

2875 +#: sequencer.c:1001

2876 #, c-format

2877 msgid "%s: cannot parse parent commit %s"

2878 msgstr "%s: kan inte tolka föräldraincheckningen %s"

2879

2764 -#: sequencer.c:705

2880 +#: sequencer.c:1063 sequencer.c:1812

2881 #, c-format

2766 -msgid "cannot get commit message for %s"

2767 -msgstr "kan inte hämta incheckningsmeddelande för %s"

2882 +msgid "could not rename '%s' to '%s'"

2883 +msgstr "kunde inte byta namn på \"%s\" till \"%s\""

2884

2769 -#: sequencer.c:797

2885 +#: sequencer.c:1114

2886 #, c-format

2887 msgid "could not revert %s... %s"

2888 msgstr "kunde inte ångra %s... %s"

2889

2774 -#: sequencer.c:798

2890 +#: sequencer.c:1115

2891 #, c-format

2892 msgid "could not apply %s... %s"

2893 msgstr "kunde inte tillämpa %s... %s"

2894

2779 -#: sequencer.c:833

2895 +#: sequencer.c:1157

2896 msgid "empty commit set passed"

2897 msgstr "den angivna uppsättningen incheckningar är tom"

2898

2783 -#: sequencer.c:843

2899 +#: sequencer.c:1167

2900 #, c-format

2901 msgid "git %s: failed to read the index"

2902 msgstr "git %s: misslyckades läsa indexet"

2903

2788 -#: sequencer.c:850

2904 +#: sequencer.c:1174

2905 #, c-format

2906 msgid "git %s: failed to refresh the index"

2907 msgstr "git %s: misslyckades uppdatera indexet"

2908

2793 -#: sequencer.c:944

2909 +#: sequencer.c:1294

2910 #, c-format

2911 msgid "invalid line %d: %.*s"

2912 msgstr "ogiltig rad %d: %.*s"

2913

2798 -#: sequencer.c:950

2799 -msgid "no commits parsed."

2800 -msgstr "inga incheckningar lästes."

2914 +#: sequencer.c:1302

2915 +#, c-format

2916 +msgid "cannot '%s' without a previous commit"

2917 +msgstr "Kan inte utföra \"%s\" utan en föregående incheckning"

2918

2802 -#: sequencer.c:966

2919 +#: sequencer.c:1334

2920 #, c-format

2921 msgid "could not read '%s'."

2922 msgstr "kunde inte läsa \"%s\"."

2923

2807 -#: sequencer.c:972

2924 +#: sequencer.c:1341

2925 +msgid "please fix this using 'git rebase --edit-todo'."

2926 +msgstr "rätta det med \"git rebase --edit-todo\"."

2927 +

2928 +#: sequencer.c:1343

2929 #, c-format

2930 msgid "unusable instruction sheet: '%s'"

2931 msgstr "oanvändbart manus: %s"

2932

2812 -#: sequencer.c:983

2933 +#: sequencer.c:1348

2934 +msgid "no commits parsed."

2935 +msgstr "inga incheckningar lästes."

2936 +

2937 +#: sequencer.c:1359

2938 msgid "cannot cherry-pick during a revert."

2939 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

2940

2816 -#: sequencer.c:985

2941 +#: sequencer.c:1361

2942 msgid "cannot revert during a cherry-pick."

2943 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

2944

2820 -#: sequencer.c:1028

2945 +#: sequencer.c:1424

2946 #, c-format

2947 msgid "invalid key: %s"

2948 msgstr "felaktig nyckel: %s"

2949

2825 -#: sequencer.c:1031

2950 +#: sequencer.c:1427

2951 #, c-format

2952 msgid "invalid value for %s: %s"

2953 msgstr "felaktigt värde för %s: %s"

2954

2830 -#: sequencer.c:1063

2955 +#: sequencer.c:1484

2956 #, c-format

2957 msgid "malformed options sheet: '%s'"

2958 msgstr "trasigt manus: %s"

2959

2835 -#: sequencer.c:1101

2960 +#: sequencer.c:1522

2961 msgid "a cherry-pick or revert is already in progress"

2962 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"

2963

2839 -#: sequencer.c:1102

2964 +#: sequencer.c:1523

2965 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

2966 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

2967

2843 -#: sequencer.c:1106

2968 +#: sequencer.c:1526

2969 #, c-format

2970 msgid "could not create sequencer directory '%s'"

2971 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

2972

2848 -#: sequencer.c:1120

2973 +#: sequencer.c:1540

2974 msgid "could not lock HEAD"

2975 msgstr "kunde inte låsa HEAD"

2976

2852 -#: sequencer.c:1151 sequencer.c:1289

2977 +#: sequencer.c:1596 sequencer.c:2150

2978 msgid "no cherry-pick or revert in progress"

2979 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"

2980

2856 -#: sequencer.c:1153

2981 +#: sequencer.c:1598

2982 msgid "cannot resolve HEAD"

2983 msgstr "kan inte bestämma HEAD"

2984

2860 -#: sequencer.c:1155 sequencer.c:1189

2985 +#: sequencer.c:1600 sequencer.c:1634

2986 msgid "cannot abort from a branch yet to be born"

2987 msgstr "kan inte avbryta från en gren som ännu inte är född"

2988

2864 -#: sequencer.c:1175 builtin/grep.c:578

2989 +#: sequencer.c:1620 builtin/grep.c:904

2990 #, c-format

2991 msgid "cannot open '%s'"

2992 msgstr "kan inte öppna \"%s\""

2993

2869 -#: sequencer.c:1177

2994 +#: sequencer.c:1622

2995 #, c-format

2996 msgid "cannot read '%s': %s"

2997 msgstr "kan inte läsa \"%s\": %s"

2998

2874 -#: sequencer.c:1178

2999 +#: sequencer.c:1623

3000 msgid "unexpected end of file"

3001 msgstr "oväntat filslut"

3002

2878 -#: sequencer.c:1184

3003 +#: sequencer.c:1629

3004 #, c-format

3005 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

3006 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

3007

2883 -#: sequencer.c:1354

3008 +#: sequencer.c:1640

3009 +msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3010 +msgstr ""

3011 +"Du verkar ha flyttat HEAD.\n"

3012 +"Spolar inte tillbaka, kontrollera HEAD!"

3013 +

3014 +#: sequencer.c:1777 sequencer.c:2049

3015 +msgid "cannot read HEAD"

3016 +msgstr "kan inte läsa HEAD"

3017 +

3018 +#: sequencer.c:1817 builtin/difftool.c:574

3019 +#, c-format

3020 +msgid "could not copy '%s' to '%s'"

3021 +msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3022 +

3023 +#: sequencer.c:1833

3024 +msgid "could not read index"

3025 +msgstr "Kunde inte läsa indexet"

3026 +

3027 +#: sequencer.c:1838

3028 +#, c-format

3029 +msgid ""

3030 +"execution failed: %s\n"

3031 +"%sYou can fix the problem, and then run\n"

3032 +"\n"

3033 +" git rebase --continue\n"

3034 +"\n"

3035 +msgstr ""

3036 +"körningen misslyckades: %s\n"

3037 +"%sDu kan rätta problemet och sedan köra\n"

3038 +"\n"

3039 +"\tgit rebase --continue\n"

3040 +"\n"

3041 +

3042 +#: sequencer.c:1844

3043 +msgid "and made changes to the index and/or the working tree\n"

3044 +msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3045 +

3046 +#: sequencer.c:1850

3047 +#, c-format

3048 +msgid ""

3049 +"execution succeeded: %s\n"

3050 +"but left changes to the index and/or the working tree\n"

3051 +"Commit or stash your changes, and then run\n"

3052 +"\n"

3053 +" git rebase --continue\n"

3054 +"\n"

3055 +msgstr ""

3056 +"körningen lyckades: %s\n"

3057 +"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"

3058 +"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"

3059 +"\n"

3060 +"\tgit rebase --continue\n"

3061 +"\n"

3062 +

3063 +#: sequencer.c:1905 git-rebase.sh:168

3064 +#, c-format

3065 +msgid "Applied autostash."

3066 +msgstr "Tillämpade autostash."

3067 +

3068 +#: sequencer.c:1917

3069 +#, c-format

3070 +msgid "cannot store %s"

3071 +msgstr "kan inte spara %s"

3072 +

3073 +#: sequencer.c:1919 git-rebase.sh:172

3074 +#, c-format

3075 +msgid ""

3076 +"Applying autostash resulted in conflicts.\n"

3077 +"Your changes are safe in the stash.\n"

3078 +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"

3079 +msgstr ""

3080 +"Tillämpning av autostash gav konflikter.\n"

3081 +"Dina ändringar är säkra i stashen.\n"

3082 +"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3083 +

3084 +#: sequencer.c:2000

3085 +#, c-format

3086 +msgid "stopped at %s... %.*s"

3087 +msgstr "stoppade på %s... %.*s"

3088 +

3089 +#: sequencer.c:2027

3090 +#, c-format

3091 +msgid "unknown command %d"

3092 +msgstr "okänt kommando %d"

3093 +

3094 +#: sequencer.c:2057

3095 +msgid "could not read orig-head"

3096 +msgstr "Kunde inte läsa orig-head"

3097 +

3098 +#: sequencer.c:2061

3099 +msgid "could not read 'onto'"

3100 +msgstr "kunde inte läsa \"onto\""

3101 +

3102 +#: sequencer.c:2068

3103 +#, c-format

3104 +msgid "could not update %s"

3105 +msgstr "kunde inte uppdatera %s"

3106 +

3107 +#: sequencer.c:2075

3108 +#, c-format

3109 +msgid "could not update HEAD to %s"

3110 +msgstr "kunde inte uppdatera HEAD till %s"

3111 +

3112 +#: sequencer.c:2159

3113 +msgid "cannot rebase: You have unstaged changes."

3114 +msgstr "kan inte ombasera: Du har oköade ändringar."

3115 +

3116 +#: sequencer.c:2164

3117 +msgid "could not remove CHERRY_PICK_HEAD"

3118 +msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3119 +

3120 +#: sequencer.c:2173

3121 +msgid "cannot amend non-existing commit"

3122 +msgstr "kan inte lägga till incheckning som inte finns"

3123 +

3124 +#: sequencer.c:2175

3125 +#, c-format

3126 +msgid "invalid file: '%s'"

3127 +msgstr "ogiltig fil: \"%s\""

3128 +

3129 +#: sequencer.c:2177

3130 +#, c-format

3131 +msgid "invalid contents: '%s'"

3132 +msgstr "ogiltigt innehåll: \"%s\""

3133 +

3134 +#: sequencer.c:2180

3135 +msgid ""

3136 +"\n"

3137 +"You have uncommitted changes in your working tree. Please, commit them\n"

3138 +"first and then run 'git rebase --continue' again."

3139 +msgstr ""

3140 +"\n"

3141 +"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3142 +"först och kör sedan \"git rebase --continute\" igen."

3143 +

3144 +#: sequencer.c:2190

3145 +msgid "could not commit staged changes."

3146 +msgstr "kunde inte checka in köade ändringar."

3147 +

3148 +#: sequencer.c:2270

3149 #, c-format

3150 msgid "%s: can't cherry-pick a %s"

3151 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""

3152

2888 -#: sequencer.c:1358

3153 +#: sequencer.c:2274

3154 #, c-format

3155 msgid "%s: bad revision"

3156 msgstr "%s: felaktig revision"

3157

2893 -#: sequencer.c:1391

3158 +#: sequencer.c:2307

3159 msgid "can't revert as initial commit"

3160 msgstr "kan inte ångra som första incheckning"

3161

@@ -2927,29 +3192,29 @@ msgstr ""

3192 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3193 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3194

2930 -#: setup.c:468

3195 +#: setup.c:470

3196 #, c-format

3197 msgid "Expected git repo version <= %d, found %d"

3198 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

3199

2935 -#: setup.c:476

3200 +#: setup.c:478

3201 msgid "unknown repository extensions found:"

3202 msgstr "okända arkivutökningar hittades:"

3203

2939 -#: setup.c:762

3204 +#: setup.c:768

3205 #, c-format

3206 msgid "Not a git repository (or any of the parent directories): %s"

3207 msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3208

2944 -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

3209 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643

3210 msgid "Cannot come back to cwd"

3211 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

3212

2948 -#: setup.c:845

3213 +#: setup.c:852

3214 msgid "Unable to read current working directory"

3215 msgstr "Kan inte läsa aktuell arbetskatalog"

3216

2952 -#: setup.c:920

3217 +#: setup.c:927

3218 #, c-format

3219 msgid ""

3220 "Not a git repository (or any parent up to mount point %s)\n"

@@ -2959,12 +3224,12 @@ msgstr ""

3224 "monteringspunkten %s)\n"

3225 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

3226

2962 -#: setup.c:927

3227 +#: setup.c:934

3228 #, c-format

3229 msgid "Cannot change to '%s/..'"

3230 msgstr "kan inte byta till \"%s/..\""

3231

2967 -#: setup.c:989

3232 +#: setup.c:996

3233 #, c-format

3234 msgid ""

3235 "Problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -2973,41 +3238,41 @@ msgstr ""

3238 "Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3239 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

3240

2976 -#: sha1_file.c:473

3241 +#: sha1_file.c:490

3242 #, c-format

3243 msgid "path '%s' does not exist"

3244 msgstr "sökvägen \"%s\" finns inte"

3245

2981 -#: sha1_file.c:499

3246 +#: sha1_file.c:516

3247 #, c-format

3248 msgid "reference repository '%s' as a linked checkout is not supported yet."

3249 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

3250

2986 -#: sha1_file.c:505

3251 +#: sha1_file.c:522

3252 #, c-format

3253 msgid "reference repository '%s' is not a local repository."

3254 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3255

2991 -#: sha1_file.c:511

3256 +#: sha1_file.c:528

3257 #, c-format

3258 msgid "reference repository '%s' is shallow"

3259 msgstr "referensarkivet \"%s\" är grunt"

3260

2996 -#: sha1_file.c:519

3261 +#: sha1_file.c:536

3262 #, c-format

3263 msgid "reference repository '%s' is grafted"

3264 msgstr "referensarkivet \"%s\" är ympat"

3265

3001 -#: sha1_file.c:1159

3266 +#: sha1_file.c:1176

3267 msgid "offset before end of packfile (broken .idx?)"

3268 msgstr "offset före slutet av packfilen (trasig .idx?)"

3269

3005 -#: sha1_file.c:2592

3270 +#: sha1_file.c:2637

3271 #, c-format

3272 msgid "offset before start of pack index for %s (corrupt index?)"

3273 msgstr "offset före slutet av packindex för %s (trasigt index?)"

3274

3010 -#: sha1_file.c:2596

3275 +#: sha1_file.c:2641

3276 #, c-format

3277 msgid "offset beyond end of pack index for %s (truncated index?)"

3278 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -3043,90 +3308,135 @@ msgstr ""

3308 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

3309 "genom att köra \"git config advice.objectNameWarning false\""

3310

3046 -#: submodule.c:64 submodule.c:98

3311 +#: submodule.c:65 submodule.c:99

3312 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

3313 msgstr ""

3314 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

3315 "sammanslagningskonflikter först"

3316

3052 -#: submodule.c:68 submodule.c:102

3317 +#: submodule.c:69 submodule.c:103

3318 #, c-format

3319 msgid "Could not find section in .gitmodules where path=%s"

3320 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

3321

3057 -#: submodule.c:76

3322 +#: submodule.c:77

3323 #, c-format

3324 msgid "Could not update .gitmodules entry %s"

3325 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

3326

3062 -#: submodule.c:109

3327 +#: submodule.c:110

3328 #, c-format

3329 msgid "Could not remove .gitmodules entry for %s"

3330 msgstr "Kunde inte ta bort .gitmodules-posten för %s"

3331

3067 -#: submodule.c:120

3332 +#: submodule.c:121

3333 msgid "staging updated .gitmodules failed"

3334 msgstr "misslyckades köa uppdaterad .gitmodules"

3335

3071 -#: submodule.c:158

3336 +#: submodule.c:159

3337 msgid "negative values not allowed for submodule.fetchJobs"

3338 msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"

3339

3075 -#: submodule-config.c:358

3340 +#: submodule.c:1184

3341 +#, c-format

3342 +msgid "could not start 'git status in submodule '%s'"

3343 +msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

3344 +

3345 +#: submodule.c:1197

3346 +#, c-format

3347 +msgid "could not run 'git status in submodule '%s'"

3348 +msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

3349 +

3350 +#: submodule.c:1398

3351 +#, c-format

3352 +msgid ""

3353 +"relocate_gitdir for submodule '%s' with more than one worktree not supported"

3354 +msgstr ""

3355 +"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

3356 +"stöds ej"

3357 +

3358 +#: submodule.c:1410 submodule.c:1471

3359 +#, c-format

3360 +msgid "could not lookup name for submodule '%s'"

3361 +msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

3362 +

3363 +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640

3364 +#: builtin/submodule--helper.c:650

3365 +#, c-format

3366 +msgid "could not create directory '%s'"

3367 +msgstr "kunde inte skapa katalogen \"%s\""

3368 +

3369 +#: submodule.c:1420

3370 +#, c-format

3371 +msgid ""

3372 +"Migrating git directory of '%s%s' from\n"

3373 +"'%s' to\n"

3374 +"'%s'\n"

3375 +msgstr ""

3376 +"Migrerar git-katalogen för \"%s%s\" från\n"

3377 +"\"%s\" till\n"

3378 +"\"%s\"\n"

3379 +

3380 +#: submodule.c:1512

3381 +#, c-format

3382 +msgid "could not recurse into submodule '%s'"

3383 +msgstr "kunde inte rekursera in i undermodulen \"%s\""

3384 +

3385 +#: submodule-config.c:360

3386 #, c-format

3387 msgid "invalid value for %s"

3388 msgstr "ogiltigt värde för %s"

3389

3080 -#: trailer.c:238

3390 +#: trailer.c:240

3391 #, c-format

3392 msgid "running trailer command '%s' failed"

3393 msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""

3394

3085 -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537

3086 -#: trailer.c:541

3395 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539

3396 +#: trailer.c:543

3397 #, c-format

3398 msgid "unknown value '%s' for key '%s'"

3399 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

3400

3091 -#: trailer.c:523 trailer.c:528 builtin/remote.c:289

3401 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289

3402 #, c-format

3403 msgid "more than one %s"

3404 msgstr "mer än en %s"

3405

3096 -#: trailer.c:672

3406 +#: trailer.c:702

3407 #, c-format

3408 msgid "empty trailer token in trailer '%.*s'"

3409 msgstr "tom släpradssymbol i släpraden \"%.*s\""

3410

3101 -#: trailer.c:695

3411 +#: trailer.c:722

3412 #, c-format

3413 msgid "could not read input file '%s'"

3414 msgstr "kunde inte läsa indatafilen \"%s\""

3415

3106 -#: trailer.c:698

3416 +#: trailer.c:725

3417 msgid "could not read from stdin"

3418 msgstr "Kunde inte läsa från standard in"

3419

3110 -#: trailer.c:929 builtin/am.c:44

3420 +#: trailer.c:949 builtin/am.c:44

3421 #, c-format

3422 msgid "could not stat %s"

3423 msgstr "kunde inte ta status på %s"

3424

3115 -#: trailer.c:931

3425 +#: trailer.c:951

3426 #, c-format

3427 msgid "file %s is not a regular file"

3428 msgstr "filen %s är inte en normal fil"

3429

3120 -#: trailer.c:933

3430 +#: trailer.c:953

3431 #, c-format

3432 msgid "file %s is not writable by user"

3433 msgstr "filen %s är inte skrivbar av användaren"

3434

3125 -#: trailer.c:945

3435 +#: trailer.c:965

3436 msgid "could not open temporary file"

3437 msgstr "kunde inte öppna temporär file"

3438

3129 -#: trailer.c:983

3439 +#: trailer.c:1001

3440 #, c-format

3441 msgid "could not rename temporary file to %s"

3442 msgstr "kunde inte byta namn på temporär fil till %s"

@@ -3141,7 +3451,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

3451 msgid "transport: invalid depth option '%s'"

3452 msgstr "transport: ogiltig flagga för depth: %s"

3453

3144 -#: transport.c:817

3454 +#: transport.c:885

3455 #, c-format

3456 msgid ""

3457 "The following submodule paths contain changes that can\n"

@@ -3150,7 +3460,7 @@ msgstr ""

3460 "Följande undermodulsökvägar innehåller ändringar som\n"

3461 "inte kan hittas av fjärrarna:\n"

3462

3153 -#: transport.c:821

3463 +#: transport.c:889

3464 #, c-format

3465 msgid ""

3466 "\n"

@@ -3177,7 +3487,7 @@ msgstr ""

3487 "för att sända dem till fjärren.\n"

3488 "\n"

3489

3180 -#: transport.c:829

3490 +#: transport.c:897

3491 msgid "Aborting."

3492 msgstr "Avbryter."

3493

@@ -3202,7 +3512,7 @@ msgstr "tomt filnamn i trädpost"

3512 msgid "too-short tree file"

3513 msgstr "trädfil för kort"

3514

3205 -#: unpack-trees.c:64

3515 +#: unpack-trees.c:99

3516 #, c-format

3517 msgid ""

3518 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3211,7 +3521,7 @@ msgstr ""

3521 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3522 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3523

3214 -#: unpack-trees.c:66

3524 +#: unpack-trees.c:101

3525 #, c-format

3526 msgid ""

3527 "Your local changes to the following files would be overwritten by checkout:\n"

@@ -3220,7 +3530,7 @@ msgstr ""

3530 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

3531 "%%s"

3532

3223 -#: unpack-trees.c:69

3533 +#: unpack-trees.c:104

3534 #, c-format

3535 msgid ""

3536 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3230,7 +3540,7 @@ msgstr ""

3540 "sammanslagning:\n"

3541 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

3542

3233 -#: unpack-trees.c:71

3543 +#: unpack-trees.c:106

3544 #, c-format

3545 msgid ""

3546 "Your local changes to the following files would be overwritten by merge:\n"

@@ -3240,7 +3550,7 @@ msgstr ""

3550 "sammanslagning:\n"

3551 "%%s"

3552

3243 -#: unpack-trees.c:74

3553 +#: unpack-trees.c:109

3554 #, c-format

3555 msgid ""

3556 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3249,7 +3559,7 @@ msgstr ""

3559 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

3560 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

3561

3252 -#: unpack-trees.c:76

3562 +#: unpack-trees.c:111

3563 #, c-format

3564 msgid ""

3565 "Your local changes to the following files would be overwritten by %s:\n"

@@ -3258,17 +3568,17 @@ msgstr ""

3568 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

3569 "%%s"

3570

3261 -#: unpack-trees.c:81

3571 +#: unpack-trees.c:116

3572 #, c-format

3573 msgid ""

3264 -"Updating the following directories would lose untracked files in it:\n"

3574 +"Updating the following directories would lose untracked files in them:\n"

3575 "%s"

3576 msgstr ""

3577 "Uppdatering av följande kataloger gör att ospårade filer går förlorade i "

3578 "dem:\n"

3579 "%s"

3580

3271 -#: unpack-trees.c:85

3581 +#: unpack-trees.c:120

3582 #, c-format

3583 msgid ""

3584 "The following untracked working tree files would be removed by checkout:\n"

@@ -3277,7 +3587,7 @@ msgstr ""

3587 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

3588 "%%sFlytta eller ta bort dem innan du byter gren."

3589

3280 -#: unpack-trees.c:87

3590 +#: unpack-trees.c:122

3591 #, c-format

3592 msgid ""

3593 "The following untracked working tree files would be removed by checkout:\n"

@@ -3286,7 +3596,7 @@ msgstr ""

3596 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

3597 "%%s"

3598

3289 -#: unpack-trees.c:90

3599 +#: unpack-trees.c:125

3600 #, c-format

3601 msgid ""

3602 "The following untracked working tree files would be removed by merge:\n"

@@ -3296,7 +3606,7 @@ msgstr ""

3606 "sammanslagningen:\n"

3607 "%%sFlytta eller ta bort dem innan du slår samman."

3608

3299 -#: unpack-trees.c:92

3609 +#: unpack-trees.c:127

3610 #, c-format

3611 msgid ""

3612 "The following untracked working tree files would be removed by merge:\n"

@@ -3306,7 +3616,7 @@ msgstr ""

3616 "sammanslagningen:\n"

3617 "%%s"

3618

3309 -#: unpack-trees.c:95

3619 +#: unpack-trees.c:130

3620 #, c-format

3621 msgid ""

3622 "The following untracked working tree files would be removed by %s:\n"

@@ -3315,7 +3625,7 @@ msgstr ""

3625 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

3626 "%%sFlytta eller ta bort dem innan du \"%s\"."

3627

3318 -#: unpack-trees.c:97

3628 +#: unpack-trees.c:132

3629 #, c-format

3630 msgid ""

3631 "The following untracked working tree files would be removed by %s:\n"

@@ -3324,7 +3634,7 @@ msgstr ""

3634 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

3635 "%%s"

3636

3327 -#: unpack-trees.c:102

3637 +#: unpack-trees.c:137

3638 #, c-format

3639 msgid ""

3640 "The following untracked working tree files would be overwritten by "

@@ -3335,7 +3645,7 @@ msgstr ""

3645 "utcheckningen:\n"

3646 "%%sFlytta eller ta bort dem innan du byter gren."

3647

3338 -#: unpack-trees.c:104

3648 +#: unpack-trees.c:139

3649 #, c-format

3650 msgid ""

3651 "The following untracked working tree files would be overwritten by "

@@ -3346,7 +3656,7 @@ msgstr ""

3656 "utcheckningen:\n"

3657 "%%s"

3658

3349 -#: unpack-trees.c:107

3659 +#: unpack-trees.c:142

3660 #, c-format

3661 msgid ""

3662 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3356,7 +3666,7 @@ msgstr ""

3666 "sammanslagningen:\n"

3667 "%%sFlytta eller ta bort dem innan du byter gren."

3668

3359 -#: unpack-trees.c:109

3669 +#: unpack-trees.c:144

3670 #, c-format

3671 msgid ""

3672 "The following untracked working tree files would be overwritten by merge:\n"

@@ -3366,7 +3676,7 @@ msgstr ""

3676 "sammanslagningen:\n"

3677 "%%s"

3678

3369 -#: unpack-trees.c:112

3679 +#: unpack-trees.c:147

3680 #, c-format

3681 msgid ""

3682 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3375,7 +3685,7 @@ msgstr ""

3685 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

3686 "%%sFlytta eller ta bort dem innan du \"%s\"."

3687

3378 -#: unpack-trees.c:114

3688 +#: unpack-trees.c:149

3689 #, c-format

3690 msgid ""

3691 "The following untracked working tree files would be overwritten by %s:\n"

@@ -3384,12 +3694,12 @@ msgstr ""

3694 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

3695 "%%s"

3696

3387 -#: unpack-trees.c:121

3697 +#: unpack-trees.c:156

3698 #, c-format

3699 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

3700 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."

3701

3392 -#: unpack-trees.c:124

3702 +#: unpack-trees.c:159

3703 #, c-format

3704 msgid ""

3705 "Cannot update sparse checkout: the following entries are not up-to-date:\n"

@@ -3398,7 +3708,7 @@ msgstr ""

3708 "Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"

3709 "%s"

3710

3401 -#: unpack-trees.c:126

3711 +#: unpack-trees.c:161

3712 #, c-format

3713 msgid ""

3714 "The following working tree files would be overwritten by sparse checkout "

@@ -3409,7 +3719,7 @@ msgstr ""

3719 "utcheckning:\n"

3720 "%s"

3721

3412 -#: unpack-trees.c:128

3722 +#: unpack-trees.c:163

3723 #, c-format

3724 msgid ""

3725 "The following working tree files would be removed by sparse checkout "

@@ -3420,12 +3730,12 @@ msgstr ""

3730 "utcheckning:\n"

3731 "%s"

3732

3423 -#: unpack-trees.c:205

3733 +#: unpack-trees.c:240

3734 #, c-format

3735 msgid "Aborting\n"

3736 msgstr "Avbryter\n"

3737

3428 -#: unpack-trees.c:237

3738 +#: unpack-trees.c:270

3739 msgid "Checking out files"

3740 msgstr "Checkar ut filer"

3741

@@ -3474,7 +3784,7 @@ msgid "could not open '%s' for writing"

3784 msgstr "kunde inte öppna \"%s\" för skrivning"

3785

3786 #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759

3477 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029

3787 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033

3788 #: builtin/pull.c:341

3789 #, c-format

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

@@ -3688,63 +3998,67 @@ msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

3998 msgid " (use \"git am --abort\" to restore the original branch)"

3999 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

4000

3691 -#: wt-status.c:1172

4001 +#: wt-status.c:1176

4002 +msgid "git-rebase-todo is missing."

4003 +msgstr "git-rebase-todo saknas."

4004 +

4005 +#: wt-status.c:1178

4006 msgid "No commands done."

4007 msgstr "Inga kommandon utförda."

4008

3695 -#: wt-status.c:1175

4009 +#: wt-status.c:1181

4010 #, c-format

4011 msgid "Last command done (%d command done):"

4012 msgid_plural "Last commands done (%d commands done):"

4013 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

4014 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

4015

3702 -#: wt-status.c:1186

4016 +#: wt-status.c:1192

4017 #, c-format

4018 msgid " (see more in file %s)"

4019 msgstr " (se fler i filen %s)"

4020

3707 -#: wt-status.c:1191

4021 +#: wt-status.c:1197

4022 msgid "No commands remaining."

4023 msgstr "Inga kommandon återstår."

4024

3711 -#: wt-status.c:1194

4025 +#: wt-status.c:1200

4026 #, c-format

4027 msgid "Next command to do (%d remaining command):"

4028 msgid_plural "Next commands to do (%d remaining commands):"

4029 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

4030 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

4031

3718 -#: wt-status.c:1202

4032 +#: wt-status.c:1208

4033 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4034 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

4035

3722 -#: wt-status.c:1215

4036 +#: wt-status.c:1221

4037 #, c-format

4038 msgid "You are currently rebasing branch '%s' on '%s'."

4039 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

4040

3727 -#: wt-status.c:1220

4041 +#: wt-status.c:1226

4042 msgid "You are currently rebasing."

4043 msgstr "Du håller på med en ombasering."

4044

3731 -#: wt-status.c:1234

4045 +#: wt-status.c:1240

4046 msgid " (fix conflicts and then run \"git rebase --continue\")"

4047 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

4048

3735 -#: wt-status.c:1236

4049 +#: wt-status.c:1242

4050 msgid " (use \"git rebase --skip\" to skip this patch)"

4051 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

4052

3739 -#: wt-status.c:1238

4053 +#: wt-status.c:1244

4054 msgid " (use \"git rebase --abort\" to check out the original branch)"

4055 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

4056

3743 -#: wt-status.c:1244

4057 +#: wt-status.c:1250

4058 msgid " (all conflicts fixed: run \"git rebase --continue\")"

4059 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

4060

3747 -#: wt-status.c:1248

4061 +#: wt-status.c:1254

4062 #, c-format

4063 msgid ""

4064 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -3752,122 +4066,122 @@ msgstr ""

4066 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

4067 "ovanpå \"%s\"."

4068

3755 -#: wt-status.c:1253

4069 +#: wt-status.c:1259

4070 msgid "You are currently splitting a commit during a rebase."

4071 msgstr "Du håller på att dela upp en incheckning i en ombasering."

4072

3759 -#: wt-status.c:1256

4073 +#: wt-status.c:1262

4074 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

4075 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

4076

3763 -#: wt-status.c:1260

4077 +#: wt-status.c:1266

4078 #, c-format

4079 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4080 msgstr ""

4081 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

4082 "ovanpå \"%s\"."

4083

3770 -#: wt-status.c:1265

4084 +#: wt-status.c:1271

4085 msgid "You are currently editing a commit during a rebase."

4086 msgstr "Du håller på att redigera en incheckning under en ombasering."

4087

3774 -#: wt-status.c:1268

4088 +#: wt-status.c:1274

4089 msgid " (use \"git commit --amend\" to amend the current commit)"

4090 msgstr ""

4091 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

4092

3779 -#: wt-status.c:1270

4093 +#: wt-status.c:1276

4094 msgid ""

4095 " (use \"git rebase --continue\" once you are satisfied with your changes)"

4096 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

4097

3784 -#: wt-status.c:1280

4098 +#: wt-status.c:1286

4099 #, c-format

4100 msgid "You are currently cherry-picking commit %s."

4101 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

4102

3789 -#: wt-status.c:1285

4103 +#: wt-status.c:1291

4104 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4105 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

4106

3793 -#: wt-status.c:1288

4107 +#: wt-status.c:1294

4108 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4109 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

4110

3797 -#: wt-status.c:1290

4111 +#: wt-status.c:1296

4112 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4113 msgstr ""

4114 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

4115 "operationen)"

4116

3803 -#: wt-status.c:1299

4117 +#: wt-status.c:1305

4118 #, c-format

4119 msgid "You are currently reverting commit %s."

4120 msgstr "Du håller på med att ångra incheckningen %s."

4121

3808 -#: wt-status.c:1304

4122 +#: wt-status.c:1310

4123 msgid " (fix conflicts and run \"git revert --continue\")"

4124 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

4125

3812 -#: wt-status.c:1307

4126 +#: wt-status.c:1313

4127 msgid " (all conflicts fixed: run \"git revert --continue\")"

4128 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

4129

3816 -#: wt-status.c:1309

4130 +#: wt-status.c:1315

4131 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4132 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

4133

3820 -#: wt-status.c:1320

4134 +#: wt-status.c:1326

4135 #, c-format

4136 msgid "You are currently bisecting, started from branch '%s'."

4137 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

4138

3825 -#: wt-status.c:1324

4139 +#: wt-status.c:1330

4140 msgid "You are currently bisecting."

4141 msgstr "Du håller på med en \"bisect\"."

4142

3829 -#: wt-status.c:1327

4143 +#: wt-status.c:1333

4144 msgid " (use \"git bisect reset\" to get back to the original branch)"

4145 msgstr ""

4146 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

4147

3834 -#: wt-status.c:1524

4148 +#: wt-status.c:1530

4149 msgid "On branch "

4150 msgstr "På grenen "

4151

3838 -#: wt-status.c:1530

4152 +#: wt-status.c:1536

4153 msgid "interactive rebase in progress; onto "

4154 msgstr "interaktiv ombasering pågår; ovanpå"

4155

3842 -#: wt-status.c:1532

4156 +#: wt-status.c:1538

4157 msgid "rebase in progress; onto "

4158 msgstr "ombasering pågår; ovanpå"

4159

3846 -#: wt-status.c:1537

4160 +#: wt-status.c:1543

4161 msgid "HEAD detached at "

4162 msgstr "HEAD frånkopplad vid "

4163

3850 -#: wt-status.c:1539

4164 +#: wt-status.c:1545

4165 msgid "HEAD detached from "

4166 msgstr "HEAD frånkopplad från "

4167

3854 -#: wt-status.c:1542

4168 +#: wt-status.c:1548

4169 msgid "Not currently on any branch."

4170 msgstr "Inte på någon gren för närvarande."

4171

3858 -#: wt-status.c:1560

4172 +#: wt-status.c:1566

4173 msgid "Initial commit"

4174 msgstr "Första incheckning"

4175

3862 -#: wt-status.c:1574

4176 +#: wt-status.c:1580

4177 msgid "Untracked files"

4178 msgstr "Ospårade filer"

4179

3866 -#: wt-status.c:1576

4180 +#: wt-status.c:1582

4181 msgid "Ignored files"

4182 msgstr "Ignorerade filer"

4183

3870 -#: wt-status.c:1580

4184 +#: wt-status.c:1586

4185 #, c-format

4186 msgid ""

4187 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -3879,32 +4193,32 @@ msgstr ""

4193 "lägga till nya filer själv (se \"git help status\")."

4194

4195 # %s är nästa sträng eller tom.

3882 -#: wt-status.c:1586

4196 +#: wt-status.c:1592

4197 #, c-format

4198 msgid "Untracked files not listed%s"

4199 msgstr "Ospårade filer visas ej%s"

4200

3887 -#: wt-status.c:1588

4201 +#: wt-status.c:1594

4202 msgid " (use -u option to show untracked files)"

4203 msgstr " (använd flaggan -u för att visa ospårade filer)"

4204

3891 -#: wt-status.c:1594

4205 +#: wt-status.c:1600

4206 msgid "No changes"

4207 msgstr "Inga ändringar"

4208

3895 -#: wt-status.c:1599

4209 +#: wt-status.c:1605

4210 #, c-format

4211 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

4212 msgstr ""

4213 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

4214 "\")\n"

4215

3902 -#: wt-status.c:1602

4216 +#: wt-status.c:1608

4217 #, c-format

4218 msgid "no changes added to commit\n"

4219 msgstr "inga ändringar att checka in\n"

4220

3907 -#: wt-status.c:1605

4221 +#: wt-status.c:1611

4222 #, c-format

4223 msgid ""

4224 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -3913,62 +4227,62 @@ msgstr ""

4227 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

4228 "\")\n"

4229

3916 -#: wt-status.c:1608

4230 +#: wt-status.c:1614

4231 #, c-format

4232 msgid "nothing added to commit but untracked files present\n"

4233 msgstr "inget köat för incheckning, men ospårade filer finns\n"

4234

3921 -#: wt-status.c:1611

4235 +#: wt-status.c:1617

4236 #, c-format

4237 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

4238 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

4239

3926 -#: wt-status.c:1614 wt-status.c:1619

4240 +#: wt-status.c:1620 wt-status.c:1625

4241 #, c-format

4242 msgid "nothing to commit\n"

4243 msgstr "inget att checka in\n"

4244

3931 -#: wt-status.c:1617

4245 +#: wt-status.c:1623

4246 #, c-format

4247 msgid "nothing to commit (use -u to show untracked files)\n"

4248 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

4249

3936 -#: wt-status.c:1621

4250 +#: wt-status.c:1627

4251 #, c-format

4252 msgid "nothing to commit, working tree clean\n"

4253 msgstr "inget att checka in, arbetskatalogen ren\n"

4254

3941 -#: wt-status.c:1728

4255 +#: wt-status.c:1734

4256 msgid "Initial commit on "

4257 msgstr "Första incheckning på "

4258

3945 -#: wt-status.c:1732

4259 +#: wt-status.c:1738

4260 msgid "HEAD (no branch)"

4261 msgstr "HEAD (ingen gren)"

4262

3949 -#: wt-status.c:1761

4263 +#: wt-status.c:1767

4264 msgid "gone"

4265 msgstr "försvunnen"

4266

3953 -#: wt-status.c:1763 wt-status.c:1771

4267 +#: wt-status.c:1769 wt-status.c:1777

4268 msgid "behind "

4269 msgstr "efter "

4270

3957 -#: wt-status.c:1766 wt-status.c:1769

4271 +#: wt-status.c:1772 wt-status.c:1775

4272 msgid "ahead "

4273 msgstr "före "

4274

4275 #. TRANSLATORS: the action is e.g. "pull with rebase"

3962 -#: wt-status.c:2270

4276 +#: wt-status.c:2277

4277 #, c-format

4278 msgid "cannot %s: You have unstaged changes."

4279 msgstr "kan inte %s: Du har oköade ändringar."

4280

3967 -#: wt-status.c:2276

4281 +#: wt-status.c:2283

4282 msgid "additionally, your index contains uncommitted changes."

4283 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

4284

3971 -#: wt-status.c:2278

4285 +#: wt-status.c:2285

4286 #, c-format

4287 msgid "cannot %s: Your index contains uncommitted changes."

4288 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

@@ -4000,7 +4314,7 @@ msgstr "ta bort \"%s\"\n"

4314 msgid "Unstaged changes after refreshing the index:"

4315 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

4316

4003 -#: builtin/add.c:209 builtin/rev-parse.c:840

4317 +#: builtin/add.c:209 builtin/rev-parse.c:845

4318 msgid "Could not read the index"

4319 msgstr "Kunde inte läsa indexet"

4320

@@ -4035,9 +4349,9 @@ msgstr "Kunde inte tillämpa \"%s\""

4349 msgid "The following paths are ignored by one of your .gitignore files:\n"

4350 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

4351

4038 -#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111

4039 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521

4040 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162

4352 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123

4353 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524

4354 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162

4355 msgid "dry run"

4356 msgstr "testkörning"

4357

@@ -4045,7 +4359,7 @@ msgstr "testkörning"

4359 msgid "interactive picking"

4360 msgstr "plocka interaktivt"

4361

4048 -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286

4362 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286

4363 msgid "select hunks interactively"

4364 msgstr "välj stycken interaktivt"

4365

@@ -4127,7 +4441,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"

4441

4442 #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279

4443 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350

4130 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

4444 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271

4445 #: builtin/submodule--helper.c:244

4446 msgid "index file corrupt"

4447 msgstr "indexfilen trasig"

@@ -4250,7 +4564,7 @@ msgstr ""

4564 msgid "Failed to merge in the changes."

4565 msgstr "Misslyckades slå ihop ändringarna."

4566

4253 -#: builtin/am.c:1686 builtin/merge.c:628

4567 +#: builtin/am.c:1686 builtin/merge.c:632

4568 msgid "git write-tree failed to write a tree"

4569 msgstr "git write-tree misslyckades skriva ett träd"

4570

@@ -4258,8 +4572,8 @@ msgstr "git write-tree misslyckades skriva ett träd"

4572 msgid "applying to an empty history"

4573 msgstr "tillämpar på en tom historik"

4574

4261 -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798

4262 -#: builtin/merge.c:823

4575 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802

4576 +#: builtin/merge.c:827

4577 msgid "failed to write commit object"

4578 msgstr "kunde inte skriva incheckningsobjekt"

4579

@@ -4371,7 +4685,7 @@ msgid "allow fall back on 3way merging if needed"

4685 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

4686

4687 #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57

4374 -#: builtin/repack.c:172

4688 +#: builtin/repack.c:178

4689 msgid "be quiet"

4690 msgstr "var tyst"

4691

@@ -4414,15 +4728,15 @@ msgid "pass it through git-apply"

4728 msgstr "sänd det genom git-apply"

4729

4730 #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665

4417 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135

4418 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185

4419 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340

4731 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135

4732 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191

4733 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355

4734 #: parse-options.h:132 parse-options.h:134 parse-options.h:245

4735 msgid "n"

4736 msgstr "n"

4737

4738 #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438

4425 -#: builtin/tag.c:372

4739 +#: builtin/tag.c:387 builtin/verify-tag.c:38

4740 msgid "format"

4741 msgstr "format"

4742

@@ -4458,8 +4772,8 @@ msgstr "ljug om incheckningsdatum"

4772 msgid "use current timestamp for author date"

4773 msgstr "använd nuvarande tidsstämpel för författardatum"

4774

4461 -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229

4462 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355

4775 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233

4776 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370

4777 msgid "key-id"

4778 msgstr "nyckel-id"

4779

@@ -4560,118 +4874,111 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

4874 msgid "<rev-opts> are documented in git-rev-list(1)"

4875 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

4876

4563 -#: builtin/blame.c:1781

4877 +#: builtin/blame.c:1786

4878 msgid "Blaming lines"

4879 msgstr "Klandra rader"

4880

4567 -#: builtin/blame.c:2577

4881 +#: builtin/blame.c:2582

4882 msgid "Show blame entries as we find them, incrementally"

4883 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

4884

4571 -#: builtin/blame.c:2578

4885 +#: builtin/blame.c:2583

4886 msgid "Show blank SHA-1 for boundary commits (Default: off)"

4887 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

4888

4575 -#: builtin/blame.c:2579

4889 +#: builtin/blame.c:2584

4890 msgid "Do not treat root commits as boundaries (Default: off)"

4891 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

4892

4579 -#: builtin/blame.c:2580

4893 +#: builtin/blame.c:2585

4894 msgid "Show work cost statistics"

4895 msgstr "Visa statistik över arbetskostnad"

4896

4583 -#: builtin/blame.c:2581

4897 +#: builtin/blame.c:2586

4898 msgid "Force progress reporting"

4899 msgstr "Tvinga förloppsrapportering"

4900

4587 -#: builtin/blame.c:2582

4901 +#: builtin/blame.c:2587

4902 msgid "Show output score for blame entries"

4903 msgstr "Visa utdatapoäng för klandringsposter"

4904

4591 -#: builtin/blame.c:2583

4905 +#: builtin/blame.c:2588

4906 msgid "Show original filename (Default: auto)"

4907 msgstr "Visa originalfilnamn (Standard: auto)"

4908

4595 -#: builtin/blame.c:2584

4909 +#: builtin/blame.c:2589

4910 msgid "Show original linenumber (Default: off)"

4911 msgstr "Visa ursprungligt radnummer (Standard: av)"

4912

4599 -#: builtin/blame.c:2585

4913 +#: builtin/blame.c:2590

4914 msgid "Show in a format designed for machine consumption"

4915 msgstr "Visa i ett format avsett för maskinkonsumtion"

4916

4603 -#: builtin/blame.c:2586

4917 +#: builtin/blame.c:2591

4918 msgid "Show porcelain format with per-line commit information"

4919 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

4920

4607 -#: builtin/blame.c:2587

4921 +#: builtin/blame.c:2592

4922 msgid "Use the same output mode as git-annotate (Default: off)"

4923 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

4924

4611 -#: builtin/blame.c:2588

4925 +#: builtin/blame.c:2593

4926 msgid "Show raw timestamp (Default: off)"

4927 msgstr "Visa rå tidsstämpel (Standard: av)"

4928

4615 -#: builtin/blame.c:2589

4929 +#: builtin/blame.c:2594

4930 msgid "Show long commit SHA1 (Default: off)"

4931 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

4932

4619 -#: builtin/blame.c:2590

4933 +#: builtin/blame.c:2595

4934 msgid "Suppress author name and timestamp (Default: off)"

4935 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

4936

4623 -#: builtin/blame.c:2591

4937 +#: builtin/blame.c:2596

4938 msgid "Show author email instead of name (Default: off)"

4939 msgstr "Visa författarens e-post istället för namn (Standard: av)"

4940

4627 -#: builtin/blame.c:2592

4941 +#: builtin/blame.c:2597

4942 msgid "Ignore whitespace differences"

4943 msgstr "Ignorera ändringar i blanksteg"

4944

4631 -#: builtin/blame.c:2599

4632 -msgid "Use an experimental indent-based heuristic to improve diffs"

4633 -msgstr ""

4634 -"Använd en experimentell indenteringsbaserad algoritm för att förbättra diffar"

4635 -

4636 -#: builtin/blame.c:2600

4637 -msgid "Use an experimental blank-line-based heuristic to improve diffs"

4638 -msgstr ""

4639 -"Använd en experimentell algoritm baserad på tomma rader för att förbättra "

4640 -"diffar"

4945 +#: builtin/blame.c:2604

4946 +msgid "Use an experimental heuristic to improve diffs"

4947 +msgstr "Använd en experimentell algoritm för att förbättra diffar"

4948

4642 -#: builtin/blame.c:2602

4949 +#: builtin/blame.c:2606

4950 msgid "Spend extra cycles to find better match"

4951 msgstr "Slösa extra cykler med att hitta bättre träff"

4952

4646 -#: builtin/blame.c:2603

4953 +#: builtin/blame.c:2607

4954 msgid "Use revisions from <file> instead of calling git-rev-list"

4955 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

4956

4650 -#: builtin/blame.c:2604

4957 +#: builtin/blame.c:2608

4958 msgid "Use <file>'s contents as the final image"

4959 msgstr "Använd <fil>s innehåll som slutgiltig bild"

4960

4654 -#: builtin/blame.c:2605 builtin/blame.c:2606

4961 +#: builtin/blame.c:2609 builtin/blame.c:2610

4962 msgid "score"

4963 msgstr "poäng"

4964

4658 -#: builtin/blame.c:2605

4965 +#: builtin/blame.c:2609

4966 msgid "Find line copies within and across files"

4967 msgstr "Hitta kopierade rader inuti och mellan filer"

4968

4662 -#: builtin/blame.c:2606

4969 +#: builtin/blame.c:2610

4970 msgid "Find line movements within and across files"

4971 msgstr "Hitta flyttade rader inuti och mellan filer"

4972

4666 -#: builtin/blame.c:2607

4973 +#: builtin/blame.c:2611

4974 msgid "n,m"

4975 msgstr "n,m"

4976

4670 -#: builtin/blame.c:2607

4977 +#: builtin/blame.c:2611

4978 msgid "Process only line range n,m, counting from 1"

4979 msgstr "Behandla endast radintervallet n,m, med början på 1"

4980

4674 -#: builtin/blame.c:2654

4981 +#: builtin/blame.c:2658

4982 msgid "--progress can't be used with --incremental or porcelain formats"

4983 msgstr "--progress kan inte användas med --incremental eller porslinsformat"

4984

@@ -4681,42 +4988,42 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"

4988 #. takes 22 places, is the longest among various forms of

4989 #. relative timestamps, but your language may need more or

4990 #. fewer display columns.

4684 -#: builtin/blame.c:2700

4991 +#: builtin/blame.c:2706

4992 msgid "4 years, 11 months ago"

4993 msgstr "4 år, 11 månader sedan"

4994

4688 -#: builtin/blame.c:2780

4995 +#: builtin/blame.c:2786

4996 msgid "--contents and --reverse do not blend well."

4997 msgstr "--contents och --reverse fungerar inte så bra tillsammans."

4998

4692 -#: builtin/blame.c:2800

4999 +#: builtin/blame.c:2806

5000 msgid "cannot use --contents with final commit object name"

5001 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"

5002

4696 -#: builtin/blame.c:2805

5003 +#: builtin/blame.c:2811

5004 msgid "--reverse and --first-parent together require specified latest commit"

5005 msgstr ""

5006 "--reverse och --first-parent tillsammans kräver att du anger senaste "

5007 "incheckningen"

5008

4702 -#: builtin/blame.c:2832

5009 +#: builtin/blame.c:2838

5010 msgid ""

5011 "--reverse --first-parent together require range along first-parent chain"

5012 msgstr ""

5013 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"

5014 "kedjan"

5015

4709 -#: builtin/blame.c:2843

5016 +#: builtin/blame.c:2849

5017 #, c-format

5018 msgid "no such path %s in %s"

5019 msgstr "sökvägen %s i %s finns inte"

5020

4714 -#: builtin/blame.c:2854

5021 +#: builtin/blame.c:2860

5022 #, c-format

5023 msgid "cannot read blob %s for path %s"

5024 msgstr "kan inte läsa objektet %s för sökvägen %s"

5025

4719 -#: builtin/blame.c:2873

5026 +#: builtin/blame.c:2879

5027 #, c-format

5028 msgid "file %s has only %lu line"

5029 msgid_plural "file %s has only %lu lines"

@@ -4894,45 +5201,45 @@ msgstr "(HEAD frånkopplat från %s)"

5201 msgid "(no branch)"

5202 msgstr "(ingen gren)"

5203

4897 -#: builtin/branch.c:544

5204 +#: builtin/branch.c:535

5205 #, c-format

5206 msgid "Branch %s is being rebased at %s"

5207 msgstr "Grenen %s ombaseras på %s"

5208

4902 -#: builtin/branch.c:548

5209 +#: builtin/branch.c:539

5210 #, c-format

5211 msgid "Branch %s is being bisected at %s"

5212 msgstr "Grenen %s är i en \"bisect\" på %s"

5213

4907 -#: builtin/branch.c:563

5214 +#: builtin/branch.c:554

5215 msgid "cannot rename the current branch while not on any."

5216 msgstr ""

5217 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

5218

4912 -#: builtin/branch.c:573

5219 +#: builtin/branch.c:564

5220 #, c-format

5221 msgid "Invalid branch name: '%s'"

5222 msgstr "Felaktigt namn på gren: \"%s\""

5223

4917 -#: builtin/branch.c:590

5224 +#: builtin/branch.c:581

5225 msgid "Branch rename failed"

5226 msgstr "Misslyckades byta namn på gren"

5227

4921 -#: builtin/branch.c:594

5228 +#: builtin/branch.c:585

5229 #, c-format

5230 msgid "Renamed a misnamed branch '%s' away"

5231 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

5232

4926 -#: builtin/branch.c:597

5233 +#: builtin/branch.c:588

5234 #, c-format

5235 msgid "Branch renamed to %s, but HEAD is not updated!"

5236 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

5237

4931 -#: builtin/branch.c:604

5238 +#: builtin/branch.c:595

5239 msgid "Branch is renamed, but update of config-file failed"

5240 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

5241

4935 -#: builtin/branch.c:620

5242 +#: builtin/branch.c:611

5243 #, c-format

5244 msgid ""

5245 "Please edit the description for the branch\n"

@@ -4943,204 +5250,208 @@ msgstr ""

5250 " %s\n"

5251 "Rader som inleds med \"%c\" ignoreras.\n"

5252

4946 -#: builtin/branch.c:651

5253 +#: builtin/branch.c:643

5254 msgid "Generic options"

5255 msgstr "Allmänna flaggor"

5256

4950 -#: builtin/branch.c:653

5257 +#: builtin/branch.c:645

5258 msgid "show hash and subject, give twice for upstream branch"

5259 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

5260

4954 -#: builtin/branch.c:654

5261 +#: builtin/branch.c:646

5262 msgid "suppress informational messages"

5263 msgstr "undertryck informationsmeddelanden"

5264

4958 -#: builtin/branch.c:655

5265 +#: builtin/branch.c:647

5266 msgid "set up tracking mode (see git-pull(1))"

5267 msgstr "ställ in spårningsläge (se git-pull(1))"

5268

4962 -#: builtin/branch.c:657

5269 +#: builtin/branch.c:649

5270 msgid "change upstream info"

5271 msgstr "ändra uppströmsinformation"

5272

4966 -#: builtin/branch.c:659

5273 +#: builtin/branch.c:651

5274 msgid "upstream"

5275 msgstr "uppströms"

5276

4970 -#: builtin/branch.c:659

5277 +#: builtin/branch.c:651

5278 msgid "change the upstream info"

5279 msgstr "ändra uppströmsinformationen"

5280

4974 -#: builtin/branch.c:660

5281 +#: builtin/branch.c:652

5282 msgid "Unset the upstream info"

5283 msgstr "ta bort uppströmsinformationen"

5284

4978 -#: builtin/branch.c:661

5285 +#: builtin/branch.c:653

5286 msgid "use colored output"

5287 msgstr "använd färgad utdata"

5288

4982 -#: builtin/branch.c:662

5289 +#: builtin/branch.c:654

5290 msgid "act on remote-tracking branches"

5291 msgstr "arbeta på fjärrspårande grenar"

5292

4986 -#: builtin/branch.c:664 builtin/branch.c:665

5293 +#: builtin/branch.c:656 builtin/branch.c:657

5294 msgid "print only branches that contain the commit"

5295 msgstr "visa endast grenar som innehåller incheckningen"

5296

4990 -#: builtin/branch.c:668

5297 +#: builtin/branch.c:660

5298 msgid "Specific git-branch actions:"

5299 msgstr "Specifika git-branch-åtgärder:"

5300

4994 -#: builtin/branch.c:669

5301 +#: builtin/branch.c:661

5302 msgid "list both remote-tracking and local branches"

5303 msgstr "visa både fjärrspårande och lokala grenar"

5304

4998 -#: builtin/branch.c:671

5305 +#: builtin/branch.c:663

5306 msgid "delete fully merged branch"

5307 msgstr "ta bort helt sammanslagen gren"

5308

5002 -#: builtin/branch.c:672

5309 +#: builtin/branch.c:664

5310 msgid "delete branch (even if not merged)"

5311 msgstr "ta bort gren (även om inte helt sammanslagen)"

5312

5006 -#: builtin/branch.c:673

5313 +#: builtin/branch.c:665

5314 msgid "move/rename a branch and its reflog"

5315 msgstr "flytta/ta bort en gren och dess reflogg"

5316

5010 -#: builtin/branch.c:674

5317 +#: builtin/branch.c:666

5318 msgid "move/rename a branch, even if target exists"

5319 msgstr "flytta/ta bort en gren, även om målet finns"

5320

5014 -#: builtin/branch.c:675

5321 +#: builtin/branch.c:667

5322 msgid "list branch names"

5323 msgstr "lista namn på grenar"

5324

5018 -#: builtin/branch.c:676

5325 +#: builtin/branch.c:668

5326 msgid "create the branch's reflog"

5327 msgstr "skapa grenens reflogg"

5328

5022 -#: builtin/branch.c:678

5329 +#: builtin/branch.c:670

5330 msgid "edit the description for the branch"

5331 msgstr "redigera beskrivning för grenen"

5332

5026 -#: builtin/branch.c:679

5333 +#: builtin/branch.c:671

5334 msgid "force creation, move/rename, deletion"

5335 msgstr "tvinga skapande, flytt/namnändring, borttagande"

5336

5030 -#: builtin/branch.c:680

5337 +#: builtin/branch.c:672

5338 msgid "print only branches that are merged"

5339 msgstr "visa endast sammanslagna grenar"

5340

5034 -#: builtin/branch.c:681

5341 +#: builtin/branch.c:673

5342 msgid "print only branches that are not merged"

5343 msgstr "visa endast ej sammanslagna grenar"

5344

5038 -#: builtin/branch.c:682

5345 +#: builtin/branch.c:674

5346 msgid "list branches in columns"

5347 msgstr "visa grenar i spalter"

5348

5042 -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

5349 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381

5350 msgid "key"

5351 msgstr "nyckel"

5352

5046 -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

5353 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382

5354 msgid "field name to sort on"

5355 msgstr "fältnamn att sortera på"

5356

5050 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404

5357 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404

5358 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570

5052 -#: builtin/tag.c:369

5359 +#: builtin/tag.c:384

5360 msgid "object"

5361 msgstr "objekt"

5362

5056 -#: builtin/branch.c:687

5363 +#: builtin/branch.c:679

5364 msgid "print only branches of the object"

5365 msgstr "visa endast grenar för objektet"

5366

5060 -#: builtin/branch.c:705

5367 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388

5368 +msgid "sorting and filtering are case insensitive"

5369 +msgstr "sortering och filtrering skiljer gemener och VERSALER"

5370 +

5371 +#: builtin/branch.c:698

5372 msgid "Failed to resolve HEAD as a valid ref."

5373 msgstr "Misslyckades slå upp HEAD som giltig referens"

5374

5064 -#: builtin/branch.c:709 builtin/clone.c:706

5375 +#: builtin/branch.c:702 builtin/clone.c:706

5376 msgid "HEAD not found below refs/heads!"

5377 msgstr "HEAD hittades inte under refs/heads!"

5378

5068 -#: builtin/branch.c:729

5379 +#: builtin/branch.c:724

5380 msgid "--column and --verbose are incompatible"

5381 msgstr "--column och --verbose är inkompatibla"

5382

5072 -#: builtin/branch.c:740 builtin/branch.c:782

5383 +#: builtin/branch.c:735 builtin/branch.c:787

5384 msgid "branch name required"

5385 msgstr "grennamn krävs"

5386

5076 -#: builtin/branch.c:758

5387 +#: builtin/branch.c:763

5388 msgid "Cannot give description to detached HEAD"

5389 msgstr "Kan inte beskriva frånkopplad HEAD"

5390

5080 -#: builtin/branch.c:763

5391 +#: builtin/branch.c:768

5392 msgid "cannot edit description of more than one branch"

5393 msgstr "kan inte redigera beskrivning för mer än en gren"

5394

5084 -#: builtin/branch.c:770

5395 +#: builtin/branch.c:775

5396 #, c-format

5397 msgid "No commit on branch '%s' yet."

5398 msgstr "Inga incheckningar på grenen \"%s\" ännu"

5399

5089 -#: builtin/branch.c:773

5400 +#: builtin/branch.c:778

5401 #, c-format

5402 msgid "No branch named '%s'."

5403 msgstr "Ingen gren vid namnet \"%s\"."

5404

5094 -#: builtin/branch.c:788

5405 +#: builtin/branch.c:793

5406 msgid "too many branches for a rename operation"

5407 msgstr "för många grenar för namnbyte"

5408

5098 -#: builtin/branch.c:793

5409 +#: builtin/branch.c:798

5410 msgid "too many branches to set new upstream"

5411 msgstr "för många grenar för att byta uppström"

5412

5102 -#: builtin/branch.c:797

5413 +#: builtin/branch.c:802

5414 #, c-format

5415 msgid ""

5416 "could not set upstream of HEAD to %s when it does not point to any branch."

5417 msgstr ""

5418 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

5419

5109 -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

5420 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848

5421 #, c-format

5422 msgid "no such branch '%s'"

5423 msgstr "okänd gren \"%s\""

5424

5114 -#: builtin/branch.c:804

5425 +#: builtin/branch.c:809

5426 #, c-format

5427 msgid "branch '%s' does not exist"

5428 msgstr "grenen \"%s\" finns inte"

5429

5119 -#: builtin/branch.c:816

5430 +#: builtin/branch.c:821

5431 msgid "too many branches to unset upstream"

5432 msgstr "för många grenar för att ta bort uppström"

5433

5123 -#: builtin/branch.c:820

5434 +#: builtin/branch.c:825

5435 msgid "could not unset upstream of HEAD when it does not point to any branch."

5436 msgstr ""

5437 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

5438

5128 -#: builtin/branch.c:826

5439 +#: builtin/branch.c:831

5440 #, c-format

5441 msgid "Branch '%s' has no upstream information"

5442 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

5443

5133 -#: builtin/branch.c:840

5444 +#: builtin/branch.c:845

5445 msgid "it does not make sense to create 'HEAD' manually"

5446 msgstr "kan inte skapa \"HEAD\" manuellt"

5447

5137 -#: builtin/branch.c:846

5448 +#: builtin/branch.c:851

5449 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

5450 msgstr ""

5451 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

5452 "grennamn"

5453

5143 -#: builtin/branch.c:849

5454 +#: builtin/branch.c:854

5455 #, c-format

5456 msgid ""

5457 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -5149,7 +5460,7 @@ msgstr ""

5460 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

5461 "eller --set-upstream-to\n"

5462

5152 -#: builtin/branch.c:866

5463 +#: builtin/branch.c:871

5464 #, c-format

5465 msgid ""

5466 "\n"

@@ -5217,7 +5528,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll"

5528 msgid "for blob objects, run filters on object's content"

5529 msgstr "för blob-objekt, kör filger på objektets innehåll"

5530

5220 -#: builtin/cat-file.c:561 git-submodule.sh:923

5531 +#: builtin/cat-file.c:561 git-submodule.sh:929

5532 msgid "blob"

5533 msgstr "blob"

5534

@@ -5274,7 +5585,7 @@ msgstr "läs filnamn från standard in"

5585 msgid "terminate input and output records by a NUL character"

5586 msgstr "avsluta in- och utdataposter med NUL-tecken"

5587

5277 -#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325

5588 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332

5589 msgid "suppress progress reporting"

5590 msgstr "undertryck förloppsrapportering"

5591

@@ -5364,9 +5675,9 @@ msgid "write the content to temporary files"

5675 msgstr "skriv innehåll till temporära filer"

5676

5677 #: builtin/checkout-index.c:174 builtin/column.c:30

5367 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598

5368 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951

5369 -#: builtin/worktree.c:469

5678 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600

5679 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967

5680 +#: builtin/worktree.c:471

5681 msgid "string"

5682 msgstr "sträng"

5683

@@ -5441,50 +5752,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop"

5752 msgid "you need to resolve your current index first"

5753 msgstr "du måste lösa ditt befintliga index först"

5754

5444 -#: builtin/checkout.c:624

5755 +#: builtin/checkout.c:625

5756 #, c-format

5757 msgid "Can not do reflog for '%s': %s\n"

5758 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

5759

5449 -#: builtin/checkout.c:663

5760 +#: builtin/checkout.c:666

5761 msgid "HEAD is now at"

5762 msgstr "HEAD är nu på"

5763

5453 -#: builtin/checkout.c:667 builtin/clone.c:660

5764 +#: builtin/checkout.c:670 builtin/clone.c:660

5765 msgid "unable to update HEAD"

5766 msgstr "kan inte uppdatera HEAD"

5767

5457 -#: builtin/checkout.c:671

5768 +#: builtin/checkout.c:674

5769 #, c-format

5770 msgid "Reset branch '%s'\n"

5771 msgstr "Återställ gren \"%s\"\n"

5772

5462 -#: builtin/checkout.c:674

5773 +#: builtin/checkout.c:677

5774 #, c-format

5775 msgid "Already on '%s'\n"

5776 msgstr "Redan på \"%s\"\n"

5777

5467 -#: builtin/checkout.c:678

5778 +#: builtin/checkout.c:681

5779 #, c-format

5780 msgid "Switched to and reset branch '%s'\n"

5781 msgstr "Växlade till och nollställde grenen \"%s\"\n"

5782

5472 -#: builtin/checkout.c:680 builtin/checkout.c:1069

5783 +#: builtin/checkout.c:683 builtin/checkout.c:1072

5784 #, c-format

5785 msgid "Switched to a new branch '%s'\n"

5786 msgstr "Växlade till en ny gren \"%s\"\n"

5787

5477 -#: builtin/checkout.c:682

5788 +#: builtin/checkout.c:685

5789 #, c-format

5790 msgid "Switched to branch '%s'\n"

5791 msgstr "Växlade till grenen \"%s\"\n"

5792

5482 -#: builtin/checkout.c:733

5793 +#: builtin/checkout.c:736

5794 #, c-format

5795 msgid " ... and %d more.\n"

5796 msgstr " ... och %d till.\n"

5797

5487 -#: builtin/checkout.c:739

5798 +#: builtin/checkout.c:742

5799 #, c-format

5800 msgid ""

5801 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -5507,7 +5818,7 @@ msgstr[1] ""

5818 "\n"

5819 "%s\n"

5820

5510 -#: builtin/checkout.c:758

5821 +#: builtin/checkout.c:761

5822 #, c-format

5823 msgid ""

5824 "If you want to keep it by creating a new branch, this may be a good time\n"

@@ -5534,151 +5845,151 @@ msgstr[1] ""

5845 " git branch <nytt_grennamn> %s\n"

5846 "\n"

5847

5537 -#: builtin/checkout.c:794

5848 +#: builtin/checkout.c:797

5849 msgid "internal error in revision walk"

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

5851

5541 -#: builtin/checkout.c:798

5852 +#: builtin/checkout.c:801

5853 msgid "Previous HEAD position was"

5854 msgstr "Tidigare position för HEAD var"

5855

5545 -#: builtin/checkout.c:825 builtin/checkout.c:1064

5856 +#: builtin/checkout.c:828 builtin/checkout.c:1067

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

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

5859

5549 -#: builtin/checkout.c:970

5860 +#: builtin/checkout.c:973

5861 #, c-format

5862 msgid "only one reference expected, %d given."

5863 msgstr "endast en referens förväntades, %d gavs."

5864

5554 -#: builtin/checkout.c:1010 builtin/worktree.c:214

5865 +#: builtin/checkout.c:1013 builtin/worktree.c:214

5866 #, c-format

5867 msgid "invalid reference: %s"

5868 msgstr "felaktig referens: %s"

5869

5559 -#: builtin/checkout.c:1039

5870 +#: builtin/checkout.c:1042

5871 #, c-format

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

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

5874

5564 -#: builtin/checkout.c:1078

5875 +#: builtin/checkout.c:1081

5876 msgid "paths cannot be used with switching branches"

5877 msgstr "sökvägar kan inte användas vid byte av gren"

5878

5568 -#: builtin/checkout.c:1081 builtin/checkout.c:1085

5879 +#: builtin/checkout.c:1084 builtin/checkout.c:1088

5880 #, c-format

5881 msgid "'%s' cannot be used with switching branches"

5882 msgstr "\"%s\" kan inte användas vid byte av gren"

5883

5573 -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097

5574 -#: builtin/checkout.c:1100

5884 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100

5885 +#: builtin/checkout.c:1103

5886 #, c-format

5887 msgid "'%s' cannot be used with '%s'"

5888 msgstr "\"%s\" kan inte användas med \"%s\""

5889

5579 -#: builtin/checkout.c:1105

5890 +#: builtin/checkout.c:1108

5891 #, c-format

5892 msgid "Cannot switch branch to a non-commit '%s'"

5893 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

5894

5584 -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93

5895 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93

5896 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5897 #: builtin/worktree.c:326

5898 msgid "branch"

5899 msgstr "gren"

5900

5590 -#: builtin/checkout.c:1139

5901 +#: builtin/checkout.c:1142

5902 msgid "create and checkout a new branch"

5903 msgstr "skapa och checka ut en ny gren"

5904

5594 -#: builtin/checkout.c:1141

5905 +#: builtin/checkout.c:1144

5906 msgid "create/reset and checkout a branch"

5907 msgstr "skapa/nollställ och checka ut en gren"

5908

5598 -#: builtin/checkout.c:1142

5909 +#: builtin/checkout.c:1145

5910 msgid "create reflog for new branch"

5911 msgstr "skapa reflogg för ny gren"

5912

5602 -#: builtin/checkout.c:1143 builtin/worktree.c:328

5913 +#: builtin/checkout.c:1146 builtin/worktree.c:328

5914 msgid "detach HEAD at named commit"

5915 msgstr "koppla från HEAD vid namngiven incheckning"

5916

5606 -#: builtin/checkout.c:1144

5917 +#: builtin/checkout.c:1147

5918 msgid "set upstream info for new branch"

5919 msgstr "sätt uppströmsinformation för ny gren"

5920

5610 -#: builtin/checkout.c:1146

5921 +#: builtin/checkout.c:1149

5922 msgid "new-branch"

5923 msgstr "ny-gren"

5924

5614 -#: builtin/checkout.c:1146

5925 +#: builtin/checkout.c:1149

5926 msgid "new unparented branch"

5927 msgstr "ny gren utan förälder"

5928

5618 -#: builtin/checkout.c:1147

5929 +#: builtin/checkout.c:1150

5930 msgid "checkout our version for unmerged files"

5931 msgstr "checka ut vår version för ej sammanslagna filer"

5932

5622 -#: builtin/checkout.c:1149

5933 +#: builtin/checkout.c:1152

5934 msgid "checkout their version for unmerged files"

5935 msgstr "checka ut deras version för ej sammanslagna filer"

5936

5626 -#: builtin/checkout.c:1151

5937 +#: builtin/checkout.c:1154

5938 msgid "force checkout (throw away local modifications)"

5939 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

5940

5630 -#: builtin/checkout.c:1152

5941 +#: builtin/checkout.c:1155

5942 msgid "perform a 3-way merge with the new branch"

5943 msgstr "utför en 3-vägssammanslagning för den nya grenen"

5944

5634 -#: builtin/checkout.c:1153 builtin/merge.c:231

5945 +#: builtin/checkout.c:1156 builtin/merge.c:235

5946 msgid "update ignored files (default)"

5947 msgstr "uppdatera ignorerade filer (standard)"

5948

5638 -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251

5949 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251

5950 msgid "style"

5951 msgstr "stil"

5952

5642 -#: builtin/checkout.c:1155

5953 +#: builtin/checkout.c:1158

5954 msgid "conflict style (merge or diff3)"

5955 msgstr "konfliktstil (merge eller diff3)"

5956

5646 -#: builtin/checkout.c:1158

5957 +#: builtin/checkout.c:1161

5958 msgid "do not limit pathspecs to sparse entries only"

5959 msgstr "begränsa inte sökvägar till endast glesa poster"

5960

5650 -#: builtin/checkout.c:1160

5961 +#: builtin/checkout.c:1163

5962 msgid "second guess 'git checkout <no-such-branch>'"

5963 msgstr "förutspå \"git checkout <gren-saknas>\""

5964

5654 -#: builtin/checkout.c:1162

5965 +#: builtin/checkout.c:1165

5966 msgid "do not check if another worktree is holding the given ref"

5967 msgstr ""

5968 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

5969

5659 -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119

5660 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536

5970 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119

5971 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539

5972 #: builtin/send-pack.c:168

5973 msgid "force progress reporting"

5974 msgstr "tvinga förloppsrapportering"

5975

5665 -#: builtin/checkout.c:1194

5976 +#: builtin/checkout.c:1197

5977 msgid "-b, -B and --orphan are mutually exclusive"

5978 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

5979

5669 -#: builtin/checkout.c:1211

5980 +#: builtin/checkout.c:1214

5981 msgid "--track needs a branch name"

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

5983

5673 -#: builtin/checkout.c:1216

5984 +#: builtin/checkout.c:1219

5985 msgid "Missing branch name; try -b"

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

5987

5677 -#: builtin/checkout.c:1252

5988 +#: builtin/checkout.c:1255

5989 msgid "invalid path specification"

5990 msgstr "felaktig sökvägsangivelse"

5991

5681 -#: builtin/checkout.c:1259

5992 +#: builtin/checkout.c:1262

5993 #, c-format

5994 msgid ""

5995 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -5687,12 +5998,12 @@ msgstr ""

5998 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

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

6000

5690 -#: builtin/checkout.c:1264

6001 +#: builtin/checkout.c:1267

6002 #, c-format

6003 msgid "git checkout: --detach does not take a path argument '%s'"

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

6005

5695 -#: builtin/checkout.c:1268

6006 +#: builtin/checkout.c:1271

6007 msgid ""

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

6009 "checking out of the index."

@@ -5732,19 +6043,21 @@ msgstr "Skulle hoppa över arkivet %s\n"

6043 msgid "failed to remove %s"

6044 msgstr "misslyckades ta bort %s"

6045

5735 -#: builtin/clean.c:291

6046 +#: builtin/clean.c:291 git-add--interactive.perl:623

6047 +#, c-format

6048 msgid ""

6049 "Prompt help:\n"

6050 "1 - select a numbered item\n"

6051 "foo - select item based on unique prefix\n"

5740 -" - (empty) select nothing"

6052 +" - (empty) select nothing\n"

6053 msgstr ""

6054 "Kommandohjälp:\n"

6055 "1 - markera en numrerad post\n"

6056 "foo - markera post baserad på unikt prefix\n"

5745 -" - (tomt) markera ingenting"

6057 +" - (tomt) markera ingenting\n"

6058

5747 -#: builtin/clean.c:295

6059 +#: builtin/clean.c:295 git-add--interactive.perl:632

6060 +#, c-format

6061 msgid ""

6062 "Prompt help:\n"

6063 "1 - select a single item\n"

@@ -5753,7 +6066,7 @@ msgid ""

6066 "foo - select item based on unique prefix\n"

6067 "-... - unselect specified items\n"

6068 "* - choose all items\n"

5756 -" - (empty) finish selecting"

6069 +" - (empty) finish selecting\n"

6070 msgstr ""

6071 "Kommandohjälp:\n"

6072 "1 - markera en ensam post\n"

@@ -5762,12 +6075,13 @@ msgstr ""

6075 "foo - markera post baserad på unikt prefix\n"

6076 "-... - avmarkera specifika poster\n"

6077 "* - välj alla poster\n"

5765 -" - (tomt) avsluta markering"

6078 +" - (tomt) avsluta markering\n"

6079

5767 -#: builtin/clean.c:511

5768 -#, c-format

5769 -msgid "Huh (%s)?"

5770 -msgstr "Vadå (%s)?"

6080 +#: builtin/clean.c:511 git-add--interactive.perl:598

6081 +#: git-add--interactive.perl:603

6082 +#, c-format, perl-format

6083 +msgid "Huh (%s)?\n"

6084 +msgstr "Vadå (%s)?\n"

6085

6086 #: builtin/clean.c:653

6087 #, c-format

@@ -5789,9 +6103,10 @@ msgstr "Välj poster att ta bort"

6103 msgid "Remove %s [y/N]? "

6104 msgstr "Ta bort %s [Y=ja / N=nej]?"

6105

5792 -#: builtin/clean.c:777

5793 -msgid "Bye."

5794 -msgstr "Hej då."

6106 +#: builtin/clean.c:777 git-add--interactive.perl:1669

6107 +#, c-format

6108 +msgid "Bye.\n"

6109 +msgstr "Hej då.\n"

6110

6111 #: builtin/clean.c:785

6112 msgid ""

@@ -5811,11 +6126,11 @@ msgstr ""

6126 "help - denna skärm\n"

6127 "? - hjälp för kommandoval"

6128

5814 -#: builtin/clean.c:812

6129 +#: builtin/clean.c:812 git-add--interactive.perl:1745

6130 msgid "*** Commands ***"

6131 msgstr "*** Kommandon ***"

6132

5818 -#: builtin/clean.c:813

6133 +#: builtin/clean.c:813 git-add--interactive.perl:1742

6134 msgid "What now"

6135 msgstr "Vad nu"

6136

@@ -5845,8 +6160,8 @@ msgstr "städa interaktivt"

6160 msgid "remove whole directories"

6161 msgstr "ta bort hela kataloger"

6162

5848 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725

5849 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182

6163 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6164 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

6165 msgid "pattern"

6166 msgstr "mönster"

6167

@@ -5926,8 +6241,8 @@ msgstr "mallkatalog"

6241 msgid "directory from which templates will be used"

6242 msgstr "katalog att använda mallar från"

6243

5929 -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602

5930 -#: builtin/submodule--helper.c:954

6244 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604

6245 +#: builtin/submodule--helper.c:970

6246 msgid "reference repository"

6247 msgstr "referensarkiv"

6248

@@ -5951,7 +6266,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

6266 msgid "path to git-upload-pack on the remote"

6267 msgstr "sökväg till git-upload-pack på fjärren"

6268

5954 -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668

6269 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999

6270 #: builtin/pull.c:202

6271 msgid "depth"

6272 msgstr "djup"

@@ -5960,7 +6275,7 @@ msgstr "djup"

6275 msgid "create a shallow clone of that depth"

6276 msgstr "skapa en grund klon på detta djup"

6277

5963 -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848

6278 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836

6279 #: parse-options.h:142

6280 msgid "time"

6281 msgstr "tid"

@@ -5974,8 +6289,8 @@ msgid "revision"

6289 msgstr "revision"

6290

6291 #: builtin/clone.c:102 builtin/fetch.c:125

5977 -msgid "deepen history of shallow clone by excluding rev"

5978 -msgstr "fördjupa historik för grund klon genom att exkludera revision"

6292 +msgid "deepen history of shallow clone, excluding rev"

6293 +msgstr "fördjupa historik för grund klon, exkludera revisionen"

6294

6295 #: builtin/clone.c:104

6296 msgid "clone only one branch, HEAD or --branch"

@@ -6001,11 +6316,11 @@ msgstr "nyckel=värde"

6316 msgid "set config inside the new repository"

6317 msgstr "ställ in konfiguration i det nya arkivet"

6318

6004 -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547

6319 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550

6320 msgid "use IPv4 addresses only"

6321 msgstr "använd endast IPv4-adresser"

6322

6008 -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549

6323 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552

6324 msgid "use IPv6 addresses only"

6325 msgstr "använd endast IPv6-adresser"

6326

@@ -6119,7 +6434,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

6434 msgid "repository '%s' does not exist"

6435 msgstr "arkivet \"%s\" finns inte"

6436

6122 -#: builtin/clone.c:905 builtin/fetch.c:1338

6437 +#: builtin/clone.c:905 builtin/fetch.c:1335

6438 #, c-format

6439 msgid "depth %s is not a positive number"

6440 msgstr "djupet %s är inte ett positivt tal"

@@ -6134,8 +6449,9 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

6449 msgid "working tree '%s' already exists."

6450 msgstr "arbetsträdet \"%s\" finns redan."

6451

6137 -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657

6138 -#: builtin/worktree.c:222 builtin/worktree.c:249

6452 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252

6453 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222

6454 +#: builtin/worktree.c:249

6455 #, c-format

6456 msgid "could not create leading directories of '%s'"

6457 msgstr "kunde inte skapa inledande kataloger för \"%s\""

@@ -6405,7 +6721,7 @@ msgstr ""

6721 msgid "could not lookup commit %s"

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

6723

6408 -#: builtin/commit.c:704 builtin/shortlog.c:286

6724 +#: builtin/commit.c:704 builtin/shortlog.c:295

6725 #, c-format

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

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

@@ -6505,7 +6821,7 @@ msgstr "Kan inte läsa indexet"

6821 msgid "Error building trees"

6822 msgstr "Fel vid byggande av träd"

6823

6508 -#: builtin/commit.c:969 builtin/tag.c:266

6824 +#: builtin/commit.c:968 builtin/tag.c:280

6825 #, c-format

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

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

@@ -6516,7 +6832,7 @@ msgid "--author '%s' is not 'Name <email>' and matches no existing author"

6832 msgstr ""

6833 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

6834

6519 -#: builtin/commit.c:1086 builtin/commit.c:1327

6835 +#: builtin/commit.c:1086 builtin/commit.c:1325

6836 #, c-format

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

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

@@ -6567,65 +6883,61 @@ msgid "No paths with --include/--only does not make sense."

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

6884

6885 #: builtin/commit.c:1212

6570 -msgid "Clever... amending the last one with dirty index."

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

6572 -

6573 -#: builtin/commit.c:1214

6886 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

6888

6577 -#: builtin/commit.c:1226 builtin/tag.c:474

6889 +#: builtin/commit.c:1224 builtin/tag.c:495

6890 #, c-format

6891 msgid "Invalid cleanup mode %s"

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

6893

6582 -#: builtin/commit.c:1231

6894 +#: builtin/commit.c:1229

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

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

6897

6586 -#: builtin/commit.c:1341 builtin/commit.c:1617

6898 +#: builtin/commit.c:1339 builtin/commit.c:1612

6899 msgid "show status concisely"

6900 msgstr "visa koncis status"

6901

6590 -#: builtin/commit.c:1343 builtin/commit.c:1619

6902 +#: builtin/commit.c:1341 builtin/commit.c:1614

6903 msgid "show branch information"

6904 msgstr "visa information om gren"

6905

6594 -#: builtin/commit.c:1345

6906 +#: builtin/commit.c:1343

6907 msgid "version"

6908 msgstr "version"

6909

6598 -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522

6599 -#: builtin/worktree.c:440

6910 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525

6911 +#: builtin/worktree.c:442

6912 msgid "machine-readable output"

6913 msgstr "maskinläsbar utdata"

6914

6603 -#: builtin/commit.c:1348 builtin/commit.c:1623

6915 +#: builtin/commit.c:1346 builtin/commit.c:1618

6916 msgid "show status in long format (default)"

6917 msgstr "visa status i långt format (standard)"

6918

6607 -#: builtin/commit.c:1351 builtin/commit.c:1626

6919 +#: builtin/commit.c:1349 builtin/commit.c:1621

6920 msgid "terminate entries with NUL"

6921 msgstr "terminera poster med NUL"

6922

6611 -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981

6612 -#: builtin/fast-export.c:984 builtin/tag.c:353

6923 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981

6924 +#: builtin/fast-export.c:984 builtin/tag.c:368

6925 msgid "mode"

6926 msgstr "läge"

6927

6616 -#: builtin/commit.c:1354 builtin/commit.c:1629

6928 +#: builtin/commit.c:1352 builtin/commit.c:1624

6929 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

6930 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

6931

6620 -#: builtin/commit.c:1357

6932 +#: builtin/commit.c:1355

6933 msgid "show ignored files"

6934 msgstr "visa ignorerade filer"

6935

6624 -#: builtin/commit.c:1358 parse-options.h:155

6936 +#: builtin/commit.c:1356 parse-options.h:155

6937 msgid "when"

6938 msgstr "när"

6939

6628 -#: builtin/commit.c:1359

6940 +#: builtin/commit.c:1357

6941 msgid ""

6942 "ignore changes to submodules, optional when: all, dirty, untracked. "

6943 "(Default: all)"

@@ -6633,201 +6945,201 @@ msgstr ""

6945 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

6946 "(Default: all)"

6947

6636 -#: builtin/commit.c:1361

6948 +#: builtin/commit.c:1359

6949 msgid "list untracked files in columns"

6950 msgstr "visa ospårade filer i spalter"

6951

6640 -#: builtin/commit.c:1437

6952 +#: builtin/commit.c:1435

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

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

6955

6644 -#: builtin/commit.c:1439

6956 +#: builtin/commit.c:1437

6957 msgid "could not parse newly created commit"

6958 msgstr "kunde inte tolka en precis skapad incheckning"

6959

6648 -#: builtin/commit.c:1484

6960 +#: builtin/commit.c:1482

6961 msgid "detached HEAD"

6962 msgstr "frånkopplad HEAD"

6963

6652 -#: builtin/commit.c:1487

6964 +#: builtin/commit.c:1485

6965 msgid " (root-commit)"

6966 msgstr " (rotincheckning)"

6967

6656 -#: builtin/commit.c:1587

6968 +#: builtin/commit.c:1582

6969 msgid "suppress summary after successful commit"

6970 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

6971

6660 -#: builtin/commit.c:1588

6972 +#: builtin/commit.c:1583

6973 msgid "show diff in commit message template"

6974 msgstr "visa diff i mallen för incheckningsmeddelandet"

6975

6664 -#: builtin/commit.c:1590

6976 +#: builtin/commit.c:1585

6977 msgid "Commit message options"

6978 msgstr "Alternativ för incheckningsmeddelande"

6979

6668 -#: builtin/commit.c:1591 builtin/tag.c:351

6980 +#: builtin/commit.c:1586 builtin/tag.c:366

6981 msgid "read message from file"

6982 msgstr "läs meddelande från fil"

6983

6672 -#: builtin/commit.c:1592

6984 +#: builtin/commit.c:1587

6985 msgid "author"

6986 msgstr "författare"

6987

6676 -#: builtin/commit.c:1592

6988 +#: builtin/commit.c:1587

6989 msgid "override author for commit"

6990 msgstr "överstyr författare för incheckningen"

6991

6680 -#: builtin/commit.c:1593 builtin/gc.c:326

6992 +#: builtin/commit.c:1588 builtin/gc.c:333

6993 msgid "date"

6994 msgstr "datum"

6995

6684 -#: builtin/commit.c:1593

6996 +#: builtin/commit.c:1588

6997 msgid "override date for commit"

6998 msgstr "överstyr datum för incheckningen"

6999

6688 -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398

6689 -#: builtin/notes.c:561 builtin/tag.c:349

7000 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398

7001 +#: builtin/notes.c:561 builtin/tag.c:364

7002 msgid "message"

7003 msgstr "meddelande"

7004

6693 -#: builtin/commit.c:1594

7005 +#: builtin/commit.c:1589

7006 msgid "commit message"

7007 msgstr "incheckningsmeddelande"

7008

6697 -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597

6698 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79

7009 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592

7010 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81

7011 msgid "commit"

7012 msgstr "incheckning"

7013

6702 -#: builtin/commit.c:1595

7014 +#: builtin/commit.c:1590

7015 msgid "reuse and edit message from specified commit"

7016 msgstr "återanvänd och redigera meddelande från angiven incheckning"

7017

6706 -#: builtin/commit.c:1596

7018 +#: builtin/commit.c:1591

7019 msgid "reuse message from specified commit"

7020 msgstr "återanvänd meddelande från angiven incheckning"

7021

6710 -#: builtin/commit.c:1597

7022 +#: builtin/commit.c:1592

7023 msgid "use autosquash formatted message to fixup specified commit"

7024 msgstr ""

7025 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

7026

6715 -#: builtin/commit.c:1598

7027 +#: builtin/commit.c:1593

7028 msgid "use autosquash formatted message to squash specified commit"

7029 msgstr ""

7030 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

7031 "incheckning"

7032

6721 -#: builtin/commit.c:1599

7033 +#: builtin/commit.c:1594

7034 msgid "the commit is authored by me now (used with -C/-c/--amend)"

7035 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

7036

6725 -#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86

7037 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86

7038 msgid "add Signed-off-by:"

7039 msgstr "lägg till Signed-off-by:"

7040

6729 -#: builtin/commit.c:1601

7041 +#: builtin/commit.c:1596

7042 msgid "use specified template file"

7043 msgstr "använd angiven mallfil"

7044

6733 -#: builtin/commit.c:1602

7045 +#: builtin/commit.c:1597

7046 msgid "force edit of commit"

7047 msgstr "tvinga redigering av incheckning"

7048

6737 -#: builtin/commit.c:1603

7049 +#: builtin/commit.c:1598

7050 msgid "default"

7051 msgstr "standard"

7052

6741 -#: builtin/commit.c:1603 builtin/tag.c:354

7053 +#: builtin/commit.c:1598 builtin/tag.c:369

7054 msgid "how to strip spaces and #comments from message"

7055 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

7056

6745 -#: builtin/commit.c:1604

7057 +#: builtin/commit.c:1599

7058 msgid "include status in commit message template"

7059 msgstr "inkludera status i mallen för incheckningsmeddelandet"

7060

6749 -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166

7061 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166

7062 #: builtin/revert.c:93

7063 msgid "GPG sign commit"

7064 msgstr "GPG-signera incheckning"

7065

6754 -#: builtin/commit.c:1609

7066 +#: builtin/commit.c:1604

7067 msgid "Commit contents options"

7068 msgstr "Alternativ för incheckningens innehåll"

7069

6758 -#: builtin/commit.c:1610

7070 +#: builtin/commit.c:1605

7071 msgid "commit all changed files"

7072 msgstr "checka in alla ändrade filer"

7073

6762 -#: builtin/commit.c:1611

7074 +#: builtin/commit.c:1606

7075 msgid "add specified files to index for commit"

7076 msgstr "lägg till angivna filer till indexet för incheckning"

7077

6766 -#: builtin/commit.c:1612

7078 +#: builtin/commit.c:1607

7079 msgid "interactively add files"

7080 msgstr "lägg till filer interaktivt"

7081

6770 -#: builtin/commit.c:1613

7082 +#: builtin/commit.c:1608

7083 msgid "interactively add changes"

7084 msgstr "lägg till ändringar interaktivt"

7085

6774 -#: builtin/commit.c:1614

7086 +#: builtin/commit.c:1609

7087 msgid "commit only specified files"

7088 msgstr "checka endast in angivna filer"

7089

6778 -#: builtin/commit.c:1615

7090 +#: builtin/commit.c:1610

7091 msgid "bypass pre-commit and commit-msg hooks"

7092 msgstr "förbigå pre-commit- och commit-msg-krokar"

7093

6782 -#: builtin/commit.c:1616

7094 +#: builtin/commit.c:1611

7095 msgid "show what would be committed"

7096 msgstr "visa vad som skulle checkas in"

7097

6786 -#: builtin/commit.c:1627

7098 +#: builtin/commit.c:1622

7099 msgid "amend previous commit"

7100 msgstr "lägg till föregående incheckning"

7101

6790 -#: builtin/commit.c:1628

7102 +#: builtin/commit.c:1623

7103 msgid "bypass post-rewrite hook"

7104 msgstr "förbigå post-rewrite-krok"

7105

6794 -#: builtin/commit.c:1633

7106 +#: builtin/commit.c:1628

7107 msgid "ok to record an empty change"

7108 msgstr "ok att registrera en tom ändring"

7109

6798 -#: builtin/commit.c:1635

7110 +#: builtin/commit.c:1630

7111 msgid "ok to record a change with an empty message"

7112 msgstr "ok att registrera en ändring med tomt meddelande"

7113

6802 -#: builtin/commit.c:1664

7114 +#: builtin/commit.c:1659

7115 msgid "could not parse HEAD commit"

7116 msgstr "kunde inte tolka HEAD:s incheckning"

7117

6806 -#: builtin/commit.c:1712

7118 +#: builtin/commit.c:1707

7119 #, c-format

7120 msgid "Corrupt MERGE_HEAD file (%s)"

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

7122

6811 -#: builtin/commit.c:1719

7123 +#: builtin/commit.c:1714

7124 msgid "could not read MERGE_MODE"

7125 msgstr "kunde inte läsa MERGE_MODE"

7126

6815 -#: builtin/commit.c:1738

7127 +#: builtin/commit.c:1733

7128 #, c-format

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

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

7131

6820 -#: builtin/commit.c:1749

7132 +#: builtin/commit.c:1744

7133 #, c-format

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

7135 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

7136

6825 -#: builtin/commit.c:1754

7137 +#: builtin/commit.c:1749

7138 #, c-format

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

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

7141

6830 -#: builtin/commit.c:1802

7142 +#: builtin/commit.c:1797

7143 msgid ""

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

7145 "new_index file. Check that disk is not full and quota is\n"

@@ -7180,6 +7492,94 @@ msgstr "mer än två blobbar angavs: \"%s\""

7492 msgid "unhandled object '%s' given."

7493 msgstr "ej hanterat objekt \"%s\" angavs."

7494

7495 +#: builtin/difftool.c:28

7496 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"

7497 +msgstr ""

7498 +"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"

7499 +

7500 +#: builtin/difftool.c:241

7501 +#, c-format

7502 +msgid "failed: %d"

7503 +msgstr "misslyckades: %d"

7504 +

7505 +#: builtin/difftool.c:342

7506 +msgid ""

7507 +"combined diff formats('-c' and '--cc') are not supported in\n"

7508 +"directory diff mode('-d' and '--dir-diff')."

7509 +msgstr ""

7510 +"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"

7511 +"katalogdiffläge (\"-d\" och \"--dir-diff\")."

7512 +

7513 +#: builtin/difftool.c:567

7514 +#, c-format

7515 +msgid "both files modified: '%s' and '%s'."

7516 +msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."

7517 +

7518 +#: builtin/difftool.c:569

7519 +msgid "working tree file has been left."

7520 +msgstr "filen i arbetskatalogen lämnades kvar."

7521 +

7522 +#: builtin/difftool.c:580

7523 +#, c-format

7524 +msgid "temporary files exist in '%s'."

7525 +msgstr "temporära filer finns i \"%s\"."

7526 +

7527 +#: builtin/difftool.c:581

7528 +msgid "you may want to cleanup or recover these."

7529 +msgstr "du kanske vill städa eller rädda dem."

7530 +

7531 +#: builtin/difftool.c:626

7532 +msgid "use `diff.guitool` instead of `diff.tool`"

7533 +msgstr "använd \"diff.guitool\" istället för \"diff.tool\""

7534 +

7535 +#: builtin/difftool.c:628

7536 +msgid "perform a full-directory diff"

7537 +msgstr "utför diff för hela katalogen"

7538 +

7539 +#: builtin/difftool.c:630

7540 +msgid "do not prompt before launching a diff tool"

7541 +msgstr "fråga inte vid start av diff-verktyg"

7542 +

7543 +#: builtin/difftool.c:636

7544 +msgid "use symlinks in dir-diff mode"

7545 +msgstr "använd symboliska länkar i katalogdiffläge"

7546 +

7547 +#: builtin/difftool.c:637

7548 +msgid "<tool>"

7549 +msgstr "<verktyg>"

7550 +

7551 +#: builtin/difftool.c:638

7552 +msgid "use the specified diff tool"

7553 +msgstr "använd angivet diff-verktyg"

7554 +

7555 +#: builtin/difftool.c:640

7556 +msgid "print a list of diff tools that may be used with `--tool`"

7557 +msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""

7558 +

7559 +#: builtin/difftool.c:643

7560 +msgid ""

7561 +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "

7562 +"code"

7563 +msgstr ""

7564 +"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "

7565 +"skilt från noll"

7566 +

7567 +#: builtin/difftool.c:645

7568 +msgid "<command>"

7569 +msgstr "<kommando>"

7570 +

7571 +#: builtin/difftool.c:646

7572 +msgid "specify a custom command for viewing diffs"

7573 +msgstr "ange eget kommando för att visa diffar"

7574 +

7575 +#: builtin/difftool.c:670

7576 +msgid "no <tool> given for --tool=<tool>"

7577 +msgstr "inget <verktyg> angavs för --tool=<verktyg>"

7578 +

7579 +#: builtin/difftool.c:677

7580 +msgid "no <cmd> given for --extcmd=<cmd>"

7581 +msgstr "inget <kommando> angavs för --extcmd=<kommando>"

7582 +

7583 #: builtin/fast-export.c:25

7584 msgid "git fast-export [rev-list-opts]"

7585 msgstr "git fast-export [rev-list-flaggor]"

@@ -7336,77 +7736,77 @@ msgstr "referenskarta"

7736 msgid "specify fetch refmap"

7737 msgstr "ange referenskarta för \"fetch\""

7738

7339 -#: builtin/fetch.c:398

7739 +#: builtin/fetch.c:395

7740 msgid "Couldn't find remote ref HEAD"

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

7742

7343 -#: builtin/fetch.c:514

7743 +#: builtin/fetch.c:511

7744 #, c-format

7745 msgid "configuration fetch.output contains invalid value %s"

7746 msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"

7747

7348 -#: builtin/fetch.c:607

7748 +#: builtin/fetch.c:604

7749 #, c-format

7750 msgid "object %s not found"

7751 msgstr "objektet %s hittades inte"

7752

7353 -#: builtin/fetch.c:611

7753 +#: builtin/fetch.c:608

7754 msgid "[up to date]"

7755 msgstr "[àjour]"

7756

7357 -#: builtin/fetch.c:624 builtin/fetch.c:704

7757 +#: builtin/fetch.c:621 builtin/fetch.c:701

7758 msgid "[rejected]"

7759 msgstr "[refuserad]"

7760

7361 -#: builtin/fetch.c:625

7761 +#: builtin/fetch.c:622

7762 msgid "can't fetch in current branch"

7763 msgstr "kan inte hämta i aktuell gren"

7764

7365 -#: builtin/fetch.c:634

7765 +#: builtin/fetch.c:631

7766 msgid "[tag update]"

7767 msgstr "[uppdaterad tagg]"

7768

7369 -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684

7370 -#: builtin/fetch.c:699

7769 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681

7770 +#: builtin/fetch.c:696

7771 msgid "unable to update local ref"

7772 msgstr "kunde inte uppdatera lokal ref"

7773

7374 -#: builtin/fetch.c:654

7774 +#: builtin/fetch.c:651

7775 msgid "[new tag]"

7776 msgstr "[ny tagg]"

7777

7378 -#: builtin/fetch.c:657

7778 +#: builtin/fetch.c:654

7779 msgid "[new branch]"

7780 msgstr "[ny gren]"

7781

7382 -#: builtin/fetch.c:660

7782 +#: builtin/fetch.c:657

7783 msgid "[new ref]"

7784 msgstr "[ny ref]"

7785

7386 -#: builtin/fetch.c:699

7786 +#: builtin/fetch.c:696

7787 msgid "forced update"

7788 msgstr "tvingad uppdatering"

7789

7390 -#: builtin/fetch.c:704

7790 +#: builtin/fetch.c:701

7791 msgid "non-fast-forward"

7792 msgstr "ej snabbspolad"

7793

7394 -#: builtin/fetch.c:749

7794 +#: builtin/fetch.c:746

7795 #, c-format

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

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

7798

7399 -#: builtin/fetch.c:769

7799 +#: builtin/fetch.c:766

7800 #, c-format

7801 msgid "reject %s because shallow roots are not allowed to be updated"

7802 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

7803

7404 -#: builtin/fetch.c:856 builtin/fetch.c:952

7804 +#: builtin/fetch.c:853 builtin/fetch.c:949

7805 #, c-format

7806 msgid "From %.*s\n"

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

7808

7409 -#: builtin/fetch.c:867

7809 +#: builtin/fetch.c:864

7810 #, c-format

7811 msgid ""

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

@@ -7415,55 +7815,55 @@ msgstr ""

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

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

7817

7418 -#: builtin/fetch.c:922

7818 +#: builtin/fetch.c:919

7819 #, c-format

7820 msgid " (%s will become dangling)"

7821 msgstr " (%s kommer bli dinglande)"

7822

7423 -#: builtin/fetch.c:923

7823 +#: builtin/fetch.c:920

7824 #, c-format

7825 msgid " (%s has become dangling)"

7826 msgstr " (%s har blivit dinglande)"

7827

7428 -#: builtin/fetch.c:955

7828 +#: builtin/fetch.c:952

7829 msgid "[deleted]"

7830 msgstr "[borttagen]"

7831

7432 -#: builtin/fetch.c:956 builtin/remote.c:1020

7832 +#: builtin/fetch.c:953 builtin/remote.c:1020

7833 msgid "(none)"

7834 msgstr "(ingen)"

7835

7436 -#: builtin/fetch.c:979

7836 +#: builtin/fetch.c:976

7837 #, c-format

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

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

7840

7441 -#: builtin/fetch.c:998

7841 +#: builtin/fetch.c:995

7842 #, c-format

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

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

7845

7446 -#: builtin/fetch.c:1001

7846 +#: builtin/fetch.c:998

7847 #, c-format

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

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

7850

7451 -#: builtin/fetch.c:1077

7851 +#: builtin/fetch.c:1074

7852 #, c-format

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

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

7855

7456 -#: builtin/fetch.c:1237

7856 +#: builtin/fetch.c:1234

7857 #, c-format

7858 msgid "Fetching %s\n"

7859 msgstr "Hämtar %s\n"

7860

7461 -#: builtin/fetch.c:1239 builtin/remote.c:96

7861 +#: builtin/fetch.c:1236 builtin/remote.c:96

7862 #, c-format

7863 msgid "Could not fetch %s"

7864 msgstr "Kunde inte hämta %s"

7865

7466 -#: builtin/fetch.c:1257

7866 +#: builtin/fetch.c:1254

7867 msgid ""

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

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

@@ -7471,40 +7871,40 @@ msgstr ""

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

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

7873

7474 -#: builtin/fetch.c:1280

7874 +#: builtin/fetch.c:1277

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

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

7877

7478 -#: builtin/fetch.c:1322

7878 +#: builtin/fetch.c:1319

7879 msgid "Negative depth in --deepen is not supported"

7880 msgstr "Negativa djup stöds inte i --deepen"

7881

7482 -#: builtin/fetch.c:1324

7882 +#: builtin/fetch.c:1321

7883 msgid "--deepen and --depth are mutually exclusive"

7884 msgstr "--deepen och --depth är ömsesidigt uteslutande"

7885

7486 -#: builtin/fetch.c:1329

7886 +#: builtin/fetch.c:1326

7887 msgid "--depth and --unshallow cannot be used together"

7888 msgstr "--depth och --unshallow kan inte användas samtidigt"

7889

7490 -#: builtin/fetch.c:1331

7890 +#: builtin/fetch.c:1328

7891 msgid "--unshallow on a complete repository does not make sense"

7892 msgstr "--unshallow kan inte användas på ett komplett arkiv"

7893

7494 -#: builtin/fetch.c:1353

7894 +#: builtin/fetch.c:1350

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

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

7897

7498 -#: builtin/fetch.c:1355

7898 +#: builtin/fetch.c:1352

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

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

7901

7502 -#: builtin/fetch.c:1366

7902 +#: builtin/fetch.c:1363

7903 #, c-format

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

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

7906

7507 -#: builtin/fetch.c:1374

7907 +#: builtin/fetch.c:1371

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

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

7910

@@ -7570,7 +7970,7 @@ msgstr "citera platshållare passande för Tcl"

7970 msgid "show only <n> matched refs"

7971 msgstr "visa endast <n> träffade refs"

7972

7573 -#: builtin/for-each-ref.c:37 builtin/tag.c:372

7973 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38

7974 msgid "format to use for the output"

7975 msgstr "format att använda för utdata"

7976

@@ -7590,65 +7990,65 @@ msgstr "visa endast referenser som ej slagits samman"

7990 msgid "print only refs which contain the commit"

7991 msgstr "visa endast referenser som innehåller incheckningen"

7992

7593 -#: builtin/fsck.c:519

7993 +#: builtin/fsck.c:554

7994 msgid "Checking object directories"

7995 msgstr "Kontrollerar objektkataloger"

7996

7597 -#: builtin/fsck.c:588

7997 +#: builtin/fsck.c:646

7998 msgid "git fsck [<options>] [<object>...]"

7999 msgstr "git fsck [<flaggor>] [<objekt>...]"

8000

7601 -#: builtin/fsck.c:594

8001 +#: builtin/fsck.c:652

8002 msgid "show unreachable objects"

8003 msgstr "visa onåbara objekt"

8004

7605 -#: builtin/fsck.c:595

8005 +#: builtin/fsck.c:653

8006 msgid "show dangling objects"

8007 msgstr "visa dinglande objekt"

8008

7609 -#: builtin/fsck.c:596

8009 +#: builtin/fsck.c:654

8010 msgid "report tags"

8011 msgstr "rapportera taggar"

8012

7613 -#: builtin/fsck.c:597

8013 +#: builtin/fsck.c:655

8014 msgid "report root nodes"

8015 msgstr "rapportera rotnoder"

8016

7617 -#: builtin/fsck.c:598

8017 +#: builtin/fsck.c:656

8018 msgid "make index objects head nodes"

8019 msgstr "gör indexojekt till huvudnoder"

8020

7621 -#: builtin/fsck.c:599

8021 +#: builtin/fsck.c:657

8022 msgid "make reflogs head nodes (default)"

8023 msgstr "gör refloggar till huvudnoder (standard)"

8024

7625 -#: builtin/fsck.c:600

8025 +#: builtin/fsck.c:658

8026 msgid "also consider packs and alternate objects"

8027 msgstr "ta även hänsyn till paket och alternativa objekt"

8028

8029 # Vague original, not networking-related, but rather related to the actual

8030 # objects in the database.

7631 -#: builtin/fsck.c:601

8031 +#: builtin/fsck.c:659

8032 msgid "check only connectivity"

8033 msgstr "kontrollera endast konnektivitet"

8034

7635 -#: builtin/fsck.c:602

8035 +#: builtin/fsck.c:660

8036 msgid "enable more strict checking"

8037 msgstr "aktivera striktare kontroll"

8038

7639 -#: builtin/fsck.c:604

8039 +#: builtin/fsck.c:662

8040 msgid "write dangling objects in .git/lost-found"

8041 msgstr "skriv dinglande objekt i .git/lost-found"

8042

7643 -#: builtin/fsck.c:605 builtin/prune.c:107

8043 +#: builtin/fsck.c:663 builtin/prune.c:107

8044 msgid "show progress"

8045 msgstr "visa förlopp"

8046

7647 -#: builtin/fsck.c:606

8047 +#: builtin/fsck.c:664

8048 msgid "show verbose names for reachable objects"

8049 msgstr "visa ordrika namn för nåbara objekt"

8050

7651 -#: builtin/fsck.c:665

8051 +#: builtin/fsck.c:725

8052 msgid "Checking objects"

8053 msgstr "Kontrollerar objekt"

8054

@@ -7666,7 +8066,7 @@ msgstr "Felaktigt %s: \"%s\""

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

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

8068

7669 -#: builtin/gc.c:290

8069 +#: builtin/gc.c:297

8070 #, c-format

8071 msgid ""

8072 "The last gc run reported the following. Please correct the root cause\n"

@@ -7681,38 +8081,38 @@ msgstr ""

8081 "\n"

8082 "%s"

8083

7684 -#: builtin/gc.c:327

8084 +#: builtin/gc.c:334

8085 msgid "prune unreferenced objects"

8086 msgstr "rensa ej refererade objekt"

8087

7688 -#: builtin/gc.c:329

8088 +#: builtin/gc.c:336

8089 msgid "be more thorough (increased runtime)"

8090 msgstr "var mer grundlig (ökar körtiden)"

8091

7692 -#: builtin/gc.c:330

8092 +#: builtin/gc.c:337

8093 msgid "enable auto-gc mode"

8094 msgstr "aktivera auto-gc-läge"

8095

7696 -#: builtin/gc.c:331

8096 +#: builtin/gc.c:338

8097 msgid "force running gc even if there may be another gc running"

8098 msgstr "tvinga gc-körning även om en annan gc kanske körs"

8099

7700 -#: builtin/gc.c:373

8100 +#: builtin/gc.c:380

8101 #, c-format

8102 msgid "Auto packing the repository in background for optimum performance.\n"

8103 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

8104

7705 -#: builtin/gc.c:375

8105 +#: builtin/gc.c:382

8106 #, c-format

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

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

8109

7710 -#: builtin/gc.c:376

8110 +#: builtin/gc.c:383

8111 #, c-format

8112 msgid "See \"git help gc\" for manual housekeeping.\n"

8113 msgstr "Se \"git help gc\" för manuell hushållning.\n"

8114

7715 -#: builtin/gc.c:397

8115 +#: builtin/gc.c:404

8116 #, c-format

8117 msgid ""

8118 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -7720,240 +8120,256 @@ msgstr ""

8120 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

8121 "är fallet)"

8122

7723 -#: builtin/gc.c:441

8123 +#: builtin/gc.c:448

8124 msgid ""

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

8126 msgstr ""

8127 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "

8128 "dem."

8129

7730 -#: builtin/grep.c:23

8130 +#: builtin/grep.c:25

8131 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"

8132 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

8133

7734 -#: builtin/grep.c:219

8134 +#: builtin/grep.c:232

8135 #, c-format

8136 msgid "grep: failed to create thread: %s"

8137 msgstr "grep: misslyckades skapa tråd. %s"

8138

7739 -#: builtin/grep.c:277

8139 +#: builtin/grep.c:290

8140 #, c-format

8141 msgid "invalid number of threads specified (%d) for %s"

8142 msgstr "felaktigt antal trådar angivet (%d) för %s"

8143

7744 -#: builtin/grep.c:453 builtin/grep.c:488

8144 +#: builtin/grep.c:763 builtin/grep.c:804

8145 #, c-format

8146 msgid "unable to read tree (%s)"

8147 msgstr "kunde inte läsa träd (%s)"

8148

7749 -#: builtin/grep.c:503

8149 +#: builtin/grep.c:823

8150 #, c-format

8151 msgid "unable to grep from object of type %s"

8152 msgstr "Kunde inte \"grep\" från objekt av typen %s"

8153

7754 -#: builtin/grep.c:561

8154 +#: builtin/grep.c:887

8155 #, c-format

8156 msgid "switch `%c' expects a numerical value"

8157 msgstr "flaggan \"%c\" antar ett numeriskt värde"

8158

7759 -#: builtin/grep.c:647

8159 +#: builtin/grep.c:973

8160 msgid "search in index instead of in the work tree"

8161 msgstr "sök i indexet istället för i arbetskatalogen"

8162

7763 -#: builtin/grep.c:649

8163 +#: builtin/grep.c:975

8164 msgid "find in contents not managed by git"

8165 msgstr "sök i innehåll som inte hanteras av git"

8166

7767 -#: builtin/grep.c:651

8167 +#: builtin/grep.c:977

8168 msgid "search in both tracked and untracked files"

8169 msgstr "sök i både spårade och ospårade filer"

8170

7771 -#: builtin/grep.c:653

8171 +#: builtin/grep.c:979

8172 msgid "ignore files specified via '.gitignore'"

8173 msgstr "ignorera filer angivna i \".gitignore\""

8174

7775 -#: builtin/grep.c:656

8175 +#: builtin/grep.c:981

8176 +msgid "recursivley search in each submodule"

8177 +msgstr "sök varje undermodul rekursivt"

8178 +

8179 +#: builtin/grep.c:983

8180 +msgid "basename"

8181 +msgstr "basnamn"

8182 +

8183 +#: builtin/grep.c:984

8184 +msgid "prepend parent project's basename to output"

8185 +msgstr "lägg till föräldraprojektets basnamn i utdata"

8186 +

8187 +#: builtin/grep.c:987

8188 msgid "show non-matching lines"

8189 msgstr "visa rader som inte träffas"

8190

7779 -#: builtin/grep.c:658

8191 +#: builtin/grep.c:989

8192 msgid "case insensitive matching"

8193 msgstr "skiftlägesokänslig sökning"

8194

7783 -#: builtin/grep.c:660

8195 +#: builtin/grep.c:991

8196 msgid "match patterns only at word boundaries"

8197 msgstr "matcha endast mönster vid ordgränser"

8198

7787 -#: builtin/grep.c:662

8199 +#: builtin/grep.c:993

8200 msgid "process binary files as text"

8201 msgstr "hantera binärfiler som text"

8202

7791 -#: builtin/grep.c:664

8203 +#: builtin/grep.c:995

8204 msgid "don't match patterns in binary files"

8205 msgstr "träffa inte mönster i binärfiler"

8206

7795 -#: builtin/grep.c:667

8207 +#: builtin/grep.c:998

8208 msgid "process binary files with textconv filters"

8209 msgstr "hantera binärfiler med textconv-filter"

8210

7799 -#: builtin/grep.c:669

8211 +#: builtin/grep.c:1000

8212 msgid "descend at most <depth> levels"

8213 msgstr "gå som mest ned <djup> nivåer"

8214

7803 -#: builtin/grep.c:673

8215 +#: builtin/grep.c:1004

8216 msgid "use extended POSIX regular expressions"

8217 msgstr "använd utökade POSIX-reguljära uttryck"

8218

7807 -#: builtin/grep.c:676

8219 +#: builtin/grep.c:1007

8220 msgid "use basic POSIX regular expressions (default)"

8221 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

8222

7811 -#: builtin/grep.c:679

8223 +#: builtin/grep.c:1010

8224 msgid "interpret patterns as fixed strings"

8225 msgstr "tolka mönster som fixerade strängar"

8226

7815 -#: builtin/grep.c:682

8227 +#: builtin/grep.c:1013

8228 msgid "use Perl-compatible regular expressions"

8229 msgstr "använd Perlkompatibla reguljära uttryck"

8230

7819 -#: builtin/grep.c:685

8231 +#: builtin/grep.c:1016

8232 msgid "show line numbers"

8233 msgstr "visa radnummer"

8234

7823 -#: builtin/grep.c:686

8235 +#: builtin/grep.c:1017

8236 msgid "don't show filenames"

8237 msgstr "visa inte filnamn"

8238

7827 -#: builtin/grep.c:687

8239 +#: builtin/grep.c:1018

8240 msgid "show filenames"

8241 msgstr "visa filnamn"

8242

7831 -#: builtin/grep.c:689

8243 +#: builtin/grep.c:1020

8244 msgid "show filenames relative to top directory"

8245 msgstr "visa filnamn relativa till toppkatalogen"

8246

7835 -#: builtin/grep.c:691

8247 +#: builtin/grep.c:1022

8248 msgid "show only filenames instead of matching lines"

8249 msgstr "visa endast filnamn istället för träffade rader"

8250

7839 -#: builtin/grep.c:693

8251 +#: builtin/grep.c:1024

8252 msgid "synonym for --files-with-matches"

8253 msgstr "synonym för --files-with-matches"

8254

7843 -#: builtin/grep.c:696

8255 +#: builtin/grep.c:1027

8256 msgid "show only the names of files without match"

8257 msgstr "visa endast namn på filer utan träffar"

8258

7847 -#: builtin/grep.c:698

8259 +#: builtin/grep.c:1029

8260 msgid "print NUL after filenames"

8261 msgstr "skriv NUL efter filnamn"

8262

7851 -#: builtin/grep.c:700

8263 +#: builtin/grep.c:1031

8264 msgid "show the number of matches instead of matching lines"

8265 msgstr "visa antal träffar istället för träffade rader"

8266

7855 -#: builtin/grep.c:701

8267 +#: builtin/grep.c:1032

8268 msgid "highlight matches"

8269 msgstr "ljusmarkera träffar"

8270

7859 -#: builtin/grep.c:703

8271 +#: builtin/grep.c:1034

8272 msgid "print empty line between matches from different files"

8273 msgstr "skriv tomma rader mellan träffar från olika filer"

8274

7863 -#: builtin/grep.c:705

8275 +#: builtin/grep.c:1036

8276 msgid "show filename only once above matches from same file"

8277 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

8278

7867 -#: builtin/grep.c:708

8279 +#: builtin/grep.c:1039

8280 msgid "show <n> context lines before and after matches"

8281 msgstr "visa <n> rader sammanhang före och efter träffar"

8282

7871 -#: builtin/grep.c:711

8283 +#: builtin/grep.c:1042

8284 msgid "show <n> context lines before matches"

8285 msgstr "visa <n> rader sammanhang före träffar"

8286

7875 -#: builtin/grep.c:713

8287 +#: builtin/grep.c:1044

8288 msgid "show <n> context lines after matches"

8289 msgstr "visa <n> rader sammanhang efter träffar"

8290

7879 -#: builtin/grep.c:715

8291 +#: builtin/grep.c:1046

8292 msgid "use <n> worker threads"

8293 msgstr "använd <n> jobbtrådar"

8294

7883 -#: builtin/grep.c:716

8295 +#: builtin/grep.c:1047

8296 msgid "shortcut for -C NUM"

8297 msgstr "genväg för -C NUM"

8298

7887 -#: builtin/grep.c:719

8299 +#: builtin/grep.c:1050

8300 msgid "show a line with the function name before matches"

8301 msgstr "visa en rad med funktionsnamnet före träffen"

8302

7891 -#: builtin/grep.c:721

8303 +#: builtin/grep.c:1052

8304 msgid "show the surrounding function"

8305 msgstr "visa den omkringliggande funktionen"

8306

7895 -#: builtin/grep.c:724

8307 +#: builtin/grep.c:1055

8308 msgid "read patterns from file"

8309 msgstr "läs mönster från fil"

8310

7899 -#: builtin/grep.c:726

8311 +#: builtin/grep.c:1057

8312 msgid "match <pattern>"

8313 msgstr "träffa <mönster>"

8314

7903 -#: builtin/grep.c:728

8315 +#: builtin/grep.c:1059

8316 msgid "combine patterns specified with -e"

8317 msgstr "kombinera mönster som anges med -e"

8318

7907 -#: builtin/grep.c:740

8319 +#: builtin/grep.c:1071

8320 msgid "indicate hit with exit status without output"

8321 msgstr "ange träff med slutstatuskod utan utdata"

8322

7911 -#: builtin/grep.c:742

8323 +#: builtin/grep.c:1073

8324 msgid "show only matches from files that match all patterns"

8325 msgstr "visa endast träffar från filer som träffar alla mönster"

8326

7915 -#: builtin/grep.c:744

8327 +#: builtin/grep.c:1075

8328 msgid "show parse tree for grep expression"

8329 msgstr "visa analysträd för grep-uttryck"

8330

7919 -#: builtin/grep.c:748

8331 +#: builtin/grep.c:1079

8332 msgid "pager"

8333 msgstr "bläddrare"

8334

7923 -#: builtin/grep.c:748

8335 +#: builtin/grep.c:1079

8336 msgid "show matching files in the pager"

8337 msgstr "visa träffade filer i filbläddraren"

8338

7927 -#: builtin/grep.c:751

8339 +#: builtin/grep.c:1082

8340 msgid "allow calling of grep(1) (ignored by this build)"

8341 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

8342

7931 -#: builtin/grep.c:814

8343 +#: builtin/grep.c:1146

8344 msgid "no pattern given."

8345 msgstr "inget mönster angavs."

8346

7935 -#: builtin/grep.c:846 builtin/index-pack.c:1480

8347 +#: builtin/grep.c:1178 builtin/index-pack.c:1482

8348 #, c-format

8349 msgid "invalid number of threads specified (%d)"

8350 msgstr "felaktigt antal trådar angivet (%d)"

8351

7940 -#: builtin/grep.c:876

8352 +#: builtin/grep.c:1215

8353 msgid "--open-files-in-pager only works on the worktree"

8354 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

8355

7944 -#: builtin/grep.c:902

8356 +#: builtin/grep.c:1238

8357 +msgid "option not supported with --recurse-submodules."

8358 +msgstr "flaggan stöds inte med --recurse-submodules."

8359 +

8360 +#: builtin/grep.c:1244

8361 msgid "--cached or --untracked cannot be used with --no-index."

8362 msgstr "--cached och --untracked kan inte användas med --no-index."

8363

7948 -#: builtin/grep.c:907

8364 +#: builtin/grep.c:1249

8365 msgid "--no-index or --untracked cannot be used with revs."

8366 msgstr "--no-index och --untracked kan inte användas med revisioner."

8367

7952 -#: builtin/grep.c:910

8368 +#: builtin/grep.c:1252

8369 msgid "--[no-]exclude-standard cannot be used for tracked contents."

8370 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

8371

7956 -#: builtin/grep.c:918

8372 +#: builtin/grep.c:1260

8373 msgid "both --cached and trees are given."

8374 msgstr "både --cached och träd angavs."

8375

@@ -8232,183 +8648,187 @@ msgid "serious inflate inconsistency"

8648 msgstr "allvarlig inflate-inkonsekvens"

8649

8650 #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777

8235 -#: builtin/index-pack.c:811 builtin/index-pack.c:820

8651 +#: builtin/index-pack.c:813 builtin/index-pack.c:822

8652 #, c-format

8653 msgid "SHA1 COLLISION FOUND WITH %s !"

8654 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

8655

8240 -#: builtin/index-pack.c:751 builtin/pack-objects.c:166

8241 -#: builtin/pack-objects.c:258

8656 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164

8657 +#: builtin/pack-objects.c:256

8658 #, c-format

8659 msgid "unable to read %s"

8660 msgstr "kunde inte läsa %s"

8661

8246 -#: builtin/index-pack.c:817

8662 +#: builtin/index-pack.c:819

8663 #, c-format

8664 msgid "cannot read existing object %s"

8665 msgstr "kan inte läsa befintligt objekt %s"

8666

8251 -#: builtin/index-pack.c:831

8667 +#: builtin/index-pack.c:833

8668 #, c-format

8669 msgid "invalid blob object %s"

8670 msgstr "ogiltigt blob-objekt %s"

8671

8256 -#: builtin/index-pack.c:845

8672 +#: builtin/index-pack.c:847

8673 #, c-format

8674 msgid "invalid %s"

8675 msgstr "ogiltigt %s"

8676

8261 -#: builtin/index-pack.c:848

8677 +#: builtin/index-pack.c:850

8678 msgid "Error in object"

8679 msgstr "Fel i objekt"

8680

8265 -#: builtin/index-pack.c:850

8681 +#: builtin/index-pack.c:852

8682 #, c-format

8683 msgid "Not all child objects of %s are reachable"

8684 msgstr "Inte alla barnobjekt för %s kan nås"

8685

8270 -#: builtin/index-pack.c:922 builtin/index-pack.c:953

8686 +#: builtin/index-pack.c:924 builtin/index-pack.c:955

8687 msgid "failed to apply delta"

8688 msgstr "misslyckades tillämpa delta"

8689

8274 -#: builtin/index-pack.c:1123

8690 +#: builtin/index-pack.c:1125

8691 msgid "Receiving objects"

8692 msgstr "Tar emot objekt"

8693

8278 -#: builtin/index-pack.c:1123

8694 +#: builtin/index-pack.c:1125

8695 msgid "Indexing objects"

8696 msgstr "Skapar index för objekt"

8697

8282 -#: builtin/index-pack.c:1155

8698 +#: builtin/index-pack.c:1157

8699 msgid "pack is corrupted (SHA1 mismatch)"

8700 msgstr "paketet är trasigt (SHA1 stämmer inte)"

8701

8286 -#: builtin/index-pack.c:1160

8702 +#: builtin/index-pack.c:1162

8703 msgid "cannot fstat packfile"

8704 msgstr "kan inte utföra \"fstat\" på paketfil"

8705

8290 -#: builtin/index-pack.c:1163

8706 +#: builtin/index-pack.c:1165

8707 msgid "pack has junk at the end"

8708 msgstr "paket har skräp i slutet"

8709

8294 -#: builtin/index-pack.c:1174

8710 +#: builtin/index-pack.c:1176

8711 msgid "confusion beyond insanity in parse_pack_objects()"

8712 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

8713

8298 -#: builtin/index-pack.c:1197

8714 +#: builtin/index-pack.c:1199

8715 msgid "Resolving deltas"

8716 msgstr "Analyserar delta"

8717

8302 -#: builtin/index-pack.c:1208

8718 +#: builtin/index-pack.c:1210

8719 #, c-format

8720 msgid "unable to create thread: %s"

8721 msgstr "kunde inte skapa tråd: %s"

8722

8307 -#: builtin/index-pack.c:1250

8723 +#: builtin/index-pack.c:1252

8724 msgid "confusion beyond insanity"

8725 msgstr "förvirrad bortom vanvett"

8726

8311 -#: builtin/index-pack.c:1256

8727 +#: builtin/index-pack.c:1258

8728 #, c-format

8729 msgid "completed with %d local object"

8730 msgid_plural "completed with %d local objects"

8731 msgstr[0] "slutfördes med %d lokalt objekt"

8732 msgstr[1] "slutfördes med %d lokala objekt"

8733

8318 -#: builtin/index-pack.c:1268

8734 +#: builtin/index-pack.c:1270

8735 #, c-format

8736 msgid "Unexpected tail checksum for %s (disk corruption?)"

8737 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

8738

8323 -#: builtin/index-pack.c:1272

8739 +#: builtin/index-pack.c:1274

8740 #, c-format

8741 msgid "pack has %d unresolved delta"

8742 msgid_plural "pack has %d unresolved deltas"

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