9d66d5eae4 · matheusbsbs/matheus-bagliano

@@ -5,10 +5,10 @@

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2021-05-17 16:02+0800\n"

11 -"PO-Revision-Date: 2021-05-20 13:31+0100\n"

10 +"POT-Creation-Date: 2021-08-03 17:06+0800\n"

11 +"PO-Revision-Date: 2021-08-09 20:35+0100\n"

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

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

14 "Language: sv\n"

@@ -24,7 +24,7 @@ msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

26 #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493

27 -#: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528

27 +#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

28 #: builtin/rebase.c:1953

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

@@ -53,7 +53,7 @@ msgstr "Uppdatera"

53 msgid "could not stage '%s'"

54 msgstr "kunde inte köa \"%s\""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687

56 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

@@ -111,12 +111,12 @@ msgstr[1] "lade till %d sökvägar\n"

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorerar ej sammanslagen: %s"

113

114 -#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369

114 +#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr "Endast binära filer ändrade.\n"

118

119 -#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371

119 +#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

@@ -193,11 +193,11 @@ msgstr "markera en numrerad post"

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

196 -#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896

196 +#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

200 -#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893

200 +#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr "Vad nu"

203

@@ -209,12 +209,12 @@ msgstr "köad"

209 msgid "unstaged"

210 msgstr "ej köad"

211

212 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308

213 -#: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128

212 +#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

213 +#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

214 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

215 -#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819

216 -#: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327

217 -#: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573

215 +#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1818

216 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

218 #: git-add--interactive.perl:213

219 msgid "path"

220 msgstr "sökväg"

@@ -223,7 +223,7 @@ msgstr "sökväg"

223 msgid "could not refresh index"

224 msgstr "kunde inte uppdatera indexet"

225

226 -#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803

226 +#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Hej då.\n"

@@ -524,34 +524,34 @@ msgstr ""

524 "a - applicera stycket och alla följande i filen\n"

525 "d - applicera inte stycket eller något av de följande i filen\n"

526

527 -#: add-patch.c:342

527 +#: add-patch.c:343

528 #, c-format

529 msgid "could not parse hunk header '%.*s'"

530 msgstr "kunde inte tolka styckehuvudet \"%.*s\""

531

532 -#: add-patch.c:361 add-patch.c:365

532 +#: add-patch.c:362 add-patch.c:366

533 #, c-format

534 msgid "could not parse colored hunk header '%.*s'"

535 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""

536

537 -#: add-patch.c:419

537 +#: add-patch.c:420

538 msgid "could not parse diff"

539 msgstr "kunde inte tolka diff"

540

541 -#: add-patch.c:438

541 +#: add-patch.c:439

542 msgid "could not parse colored diff"

543 msgstr "kunde inte tolka färgad diff"

544

545 -#: add-patch.c:452

545 +#: add-patch.c:453

546 #, c-format

547 msgid "failed to run '%s'"

548 msgstr "misslyckades att köra \"%s\""

549

550 -#: add-patch.c:611

550 +#: add-patch.c:612

551 msgid "mismatched output from interactive.diffFilter"

552 msgstr "omaka utdata från interactive.diffFilter"

553

554 -#: add-patch.c:612

554 +#: add-patch.c:613

555 msgid ""

556 "Your filter must maintain a one-to-one correspondence\n"

557 "between its input and output lines."

@@ -559,7 +559,7 @@ msgstr ""

559 "Alla rader i indata måste ha en motsvarande rad i utdata från\n"

560 "ditt filter."

561

562 -#: add-patch.c:790

562 +#: add-patch.c:791

563 #, c-format

564 msgid ""

565 "expected context line #%d in\n"

@@ -568,7 +568,7 @@ msgstr ""

568 "förväntade sammanhangsrad %d i\n"

569 "%.*s"

570

571 -#: add-patch.c:805

571 +#: add-patch.c:806

572 #, c-format

573 msgid ""

574 "hunks do not overlap:\n"

@@ -581,11 +581,11 @@ msgstr ""

581 "\tavslutas inte med:\n"

582 "%.*s"

583

584 -#: add-patch.c:1081 git-add--interactive.perl:1115

584 +#: add-patch.c:1082 git-add--interactive.perl:1115

585 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

586 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"

587

588 -#: add-patch.c:1085

588 +#: add-patch.c:1086

589 #, c-format

590 msgid ""

591 "---\n"

@@ -599,7 +599,7 @@ msgstr ""

599 "Rader som börjar med %c kommer att tas bort.\n"

600

601 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

602 -#: add-patch.c:1099 git-add--interactive.perl:1129

602 +#: add-patch.c:1100 git-add--interactive.perl:1129

603 msgid ""

604 "If it does not apply cleanly, you will be given an opportunity to\n"

605 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -609,11 +609,11 @@ msgstr ""

609 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"

610 "redigeringen och stycket lämnas oförändrat.\n"

611

612 -#: add-patch.c:1132

612 +#: add-patch.c:1133

613 msgid "could not parse hunk header"

614 msgstr "kunde inte tolka styckehuvud"

615

616 -#: add-patch.c:1177

616 +#: add-patch.c:1178

617 msgid "'git apply --cached' failed"

618 msgstr "\"git apply --cached\" misslyckades"

619

@@ -629,26 +629,26 @@ msgstr "\"git apply --cached\" misslyckades"

629 #. Consider translating (saying "no" discards!) as

630 #. (saying "n" for "no" discards!) if the translation

631 #. of the word "no" does not start with n.

632 -#: add-patch.c:1246 git-add--interactive.perl:1242

632 +#: add-patch.c:1247 git-add--interactive.perl:1242

633 msgid ""

634 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

635 msgstr ""

636 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "

637 "[y/n]? "

638

639 -#: add-patch.c:1289

639 +#: add-patch.c:1290

640 msgid "The selected hunks do not apply to the index!"

641 msgstr "Markerade stycken kan inte appliceras på indexet!"

642

643 -#: add-patch.c:1290 git-add--interactive.perl:1346

643 +#: add-patch.c:1291 git-add--interactive.perl:1346

644 msgid "Apply them to the worktree anyway? "

645 msgstr "Applicera dem på arbetskatalogen trots det? "

646

647 -#: add-patch.c:1297 git-add--interactive.perl:1349

647 +#: add-patch.c:1298 git-add--interactive.perl:1349

648 msgid "Nothing was applied.\n"

649 msgstr "Ingenting applicerades.\n"

650

651 -#: add-patch.c:1354

651 +#: add-patch.c:1355

652 msgid ""

653 "j - leave this hunk undecided, see next undecided hunk\n"

654 "J - leave this hunk undecided, see next hunk\n"

@@ -670,69 +670,69 @@ msgstr ""

670 "e - redigera aktuellt stycke manuellt\n"

671 "? - visa hjälp\n"

672

673 -#: add-patch.c:1516 add-patch.c:1526

673 +#: add-patch.c:1517 add-patch.c:1527

674 msgid "No previous hunk"

675 msgstr "Inget föregående stycke"

676

677 -#: add-patch.c:1521 add-patch.c:1531

677 +#: add-patch.c:1522 add-patch.c:1532

678 msgid "No next hunk"

679 msgstr "Inget följande stycke"

680

681 -#: add-patch.c:1537

681 +#: add-patch.c:1538

682 msgid "No other hunks to goto"

683 msgstr "Inga andra stycken att gå till"

684

685 -#: add-patch.c:1548 git-add--interactive.perl:1606

685 +#: add-patch.c:1549 git-add--interactive.perl:1606

686 msgid "go to which hunk (<ret> to see more)? "

687 msgstr "gå till vilket stycke (<ret> för att se fler)? "

688

689 -#: add-patch.c:1549 git-add--interactive.perl:1608

689 +#: add-patch.c:1550 git-add--interactive.perl:1608

690 msgid "go to which hunk? "

691 msgstr "gå till vilket stycke? "

692

693 -#: add-patch.c:1560

693 +#: add-patch.c:1561

694 #, c-format

695 msgid "Invalid number: '%s'"

696 msgstr "Ogiltigt siffervärde: \"%s\""

697

698 -#: add-patch.c:1565

698 +#: add-patch.c:1566

699 #, c-format

700 msgid "Sorry, only %d hunk available."

701 msgid_plural "Sorry, only %d hunks available."

702 msgstr[0] "Beklagar, det finns bara %d stycke."

703 msgstr[1] "Beklagar, det finns bara %d stycken."

704

705 -#: add-patch.c:1574

705 +#: add-patch.c:1575

706 msgid "No other hunks to search"

707 msgstr "Inga andra stycken att söka efter"

708

709 -#: add-patch.c:1580 git-add--interactive.perl:1661

709 +#: add-patch.c:1581 git-add--interactive.perl:1661

710 msgid "search for regex? "

711 msgstr "sök efter reguljärt uttryck? "

712

713 -#: add-patch.c:1595

713 +#: add-patch.c:1596

714 #, c-format

715 msgid "Malformed search regexp %s: %s"

716 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"

717

718 -#: add-patch.c:1612

718 +#: add-patch.c:1613

719 msgid "No hunk matches the given pattern"

720 msgstr "Inga stycken motsvarar givet mönster"

721

722 -#: add-patch.c:1619

722 +#: add-patch.c:1620

723 msgid "Sorry, cannot split this hunk"

724 msgstr "Beklagar, kan inte dela stycket"

725

726 -#: add-patch.c:1623

726 +#: add-patch.c:1624

727 #, c-format

728 msgid "Split into %d hunks."

729 msgstr "Dela i %d stycken."

730

731 -#: add-patch.c:1627

731 +#: add-patch.c:1628

732 msgid "Sorry, cannot edit this hunk"

733 msgstr "Beklagar, kan inte redigera stycket"

734

735 -#: add-patch.c:1679

735 +#: add-patch.c:1680

736 msgid "'git apply' failed"

737 msgstr "\"git apply\" misslyckades"

738

@@ -1189,8 +1189,8 @@ msgstr "%s: fel typ"

1189 msgid "%s has type %o, expected %o"

1190 msgstr "%s har typen %o, förväntade %o"

1191

1192 -#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890

1193 -#: read-cache.c:1351

1192 +#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1193 +#: read-cache.c:1353

1194 #, c-format

1195 msgid "invalid path '%s'"

1196 msgstr "ogiltig sökväg \"%s\""

@@ -1280,7 +1280,7 @@ msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"

1280 msgid "unable to add cache entry for %s"

1281 msgstr "kan inte lägga till cachepost för %s"

1282

1283 -#: apply.c:4376 builtin/bisect--helper.c:523

1283 +#: apply.c:4376 builtin/bisect--helper.c:525

1284 #, c-format

1285 msgid "failed to write to '%s'"

1286 msgstr "misslyckades skriva till \"%s\""

@@ -1370,7 +1370,7 @@ msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1372

1373 -#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423

1373 +#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1374 msgid "Unable to write new index file"

1375 msgstr "Kunde inte skriva ny indexfil"

1376

@@ -1382,7 +1382,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

1382 msgid "apply changes matching the given path"

1383 msgstr "tillämpa ändringar som motsvarar given sökväg"

1384

1385 -#: apply.c:5000 builtin/am.c:2317

1385 +#: apply.c:5000 builtin/am.c:2318

1386 msgid "num"

1387 msgstr "antal"

1388

@@ -1448,9 +1448,9 @@ msgstr "sökvägar avdelas med NUL-tecken"

1448 msgid "ensure at least <n> lines of context match"

1449 msgstr "se till att åtminstone <n> rader sammanhang är lika"

1450

1451 -#: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296

1451 +#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1452 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1453 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831

1453 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1454 #: builtin/rebase.c:1347

1455 msgid "action"

1456 msgstr "åtgärd"

@@ -1480,8 +1480,8 @@ msgid "allow overlapping hunks"

1480 msgstr "tillåt överlappande stycken"

1481

1482 #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1483 -#: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755

1484 -#: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128

1483 +#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1484 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1485 msgid "be verbose"

1486 msgstr "var pratsam"

1487

@@ -1493,7 +1493,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1493 msgid "do not trust the line counts in the hunk headers"

1494 msgstr "lite inte på antalet linjer i styckehuvuden"

1495

1496 -#: apply.c:5059 builtin/am.c:2305

1496 +#: apply.c:5059 builtin/am.c:2306

1497 msgid "root"

1498 msgstr "rot"

1499

@@ -1535,7 +1535,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s"

1535 msgid "path too long (%d chars, SHA1: %s): %s"

1536 msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"

1537

1538 -#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1538 +#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368

1539 #, c-format

1540 msgid "deflate error (%d)"

1541 msgstr "fel i deflate (%d)"

@@ -1570,13 +1570,13 @@ msgid "cannot read %s"

1570 msgstr "kan inte läsa %s"

1571

1572 #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1573 -#: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833

1573 +#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1574 #: builtin/merge.c:1143

1575 #, c-format

1576 msgid "could not read '%s'"

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

1578

1579 -#: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328

1579 +#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1580 #, c-format

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

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

@@ -1618,7 +1618,7 @@ msgstr "fmt"

1618 msgid "archive format"

1619 msgstr "arkivformat"

1620

1621 -#: archive.c:553 builtin/log.c:1772

1621 +#: archive.c:553 builtin/log.c:1775

1622 msgid "prefix"

1623 msgstr "prefix"

1624

@@ -1629,7 +1629,7 @@ msgstr "lägg till prefix till varje sökväg i arkivet"

1629 #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1630 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1631 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1632 -#: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105

1632 +#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1633 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1634 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1635 msgid "file"

@@ -1660,7 +1660,7 @@ msgid "list supported archive formats"

1660 msgstr "visa understödda arkivformat"

1661

1662 #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1663 -#: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336

1663 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1664 msgid "repo"

1665 msgstr "arkiv"

1666

@@ -1668,7 +1668,7 @@ msgstr "arkiv"

1668 msgid "retrieve the archive from remote repository <repo>"

1669 msgstr "hämta arkivet från fjärrarkivet <arkiv>"

1670

1671 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718

1671 +#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1672 #: builtin/notes.c:498

1673 msgid "command"

1674 msgstr "kommando"

@@ -1855,11 +1855,11 @@ msgstr ""

1855 "--reverse och --first-parent tillsammans kräver att du anger senaste "

1856 "incheckningen"

1857

1858 -#: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333

1859 -#: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411

1860 -#: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344

1861 -#: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646

1862 -#: builtin/pack-objects.c:3661 builtin/shortlog.c:255

1858 +#: blame.c:2820 bundle.c:224 ref-filter.c:2274 remote.c:2041 sequencer.c:2333

1859 +#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1860 +#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1861 +#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1862 +#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1863 msgid "revision walk setup failed"

1864 msgstr "misslyckades skapa revisionstraversering"

1865

@@ -2023,118 +2023,118 @@ msgstr "\"%s\" är redan utcheckad på \"%s\""

2023 msgid "HEAD of working tree %s is not updated"

2024 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

2025

2026 -#: bundle.c:41

2026 +#: bundle.c:44

2027 #, c-format

2028 msgid "unrecognized bundle hash algorithm: %s"

2029 msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""

2030

2031 -#: bundle.c:45

2031 +#: bundle.c:48

2032 #, c-format

2033 msgid "unknown capability '%s'"

2034 msgstr "okänd kapabilitet \"%s\""

2035

2036 -#: bundle.c:71

2036 +#: bundle.c:74

2037 #, c-format

2038 msgid "'%s' does not look like a v2 or v3 bundle file"

2039 msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"

2040

2041 -#: bundle.c:110

2041 +#: bundle.c:113

2042 #, c-format

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

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

2045

2046 -#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2046 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2047 #: builtin/commit.c:861

2048 #, c-format

2049 msgid "could not open '%s'"

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

2051

2052 -#: bundle.c:189

2052 +#: bundle.c:198

2053 msgid "Repository lacks these prerequisite commits:"

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

2055

2056 -#: bundle.c:192

2056 +#: bundle.c:201

2057 msgid "need a repository to verify a bundle"

2058 msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."

2059

2060 -#: bundle.c:243

2060 +#: bundle.c:257

2061 #, c-format

2062 msgid "The bundle contains this ref:"

2063 msgid_plural "The bundle contains these %d refs:"

2064 msgstr[0] "Paketet (bundlen) innehåller denna referens:"

2065 msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"

2066

2067 -#: bundle.c:250

2067 +#: bundle.c:264

2068 msgid "The bundle records a complete history."

2069 msgstr "Paketet (bundlen) beskriver en komplett historik."

2070

2071 -#: bundle.c:252

2071 +#: bundle.c:266

2072 #, c-format

2073 msgid "The bundle requires this ref:"

2074 msgid_plural "The bundle requires these %d refs:"

2075 msgstr[0] "Paketet (bundlen) kräver denna referens:"

2076 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

2077

2078 -#: bundle.c:319

2078 +#: bundle.c:333

2079 msgid "unable to dup bundle descriptor"

2080 msgstr "kan inte duplicera pakethandtag"

2081

2082 -#: bundle.c:326

2082 +#: bundle.c:340

2083 msgid "Could not spawn pack-objects"

2084 msgstr "Kunde inte starta pack-objects"

2085

2086 -#: bundle.c:337

2086 +#: bundle.c:351

2087 msgid "pack-objects died"

2088 msgstr "pack-objects misslyckades"

2089

2090 -#: bundle.c:386

2090 +#: bundle.c:400

2091 #, c-format

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

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

2094

2095 -#: bundle.c:490

2095 +#: bundle.c:504

2096 #, c-format

2097 msgid "unsupported bundle version %d"

2098 msgstr "version %d för paket (bundle) stöds ej"

2099

2100 -#: bundle.c:492

2100 +#: bundle.c:506

2101 #, c-format

2102 msgid "cannot write bundle version %d with algorithm %s"

2103 msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"

2104

2105 -#: bundle.c:510 builtin/log.c:210 builtin/log.c:1935 builtin/shortlog.c:396

2105 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2106 #, c-format

2107 msgid "unrecognized argument: %s"

2108 msgstr "okänt argument: %s"

2109

2110 -#: bundle.c:539

2110 +#: bundle.c:553

2111 msgid "Refusing to create empty bundle."

2112 msgstr "Vägrar skapa ett tomt paket (bundle)."

2113

2114 -#: bundle.c:549

2114 +#: bundle.c:563

2115 #, c-format

2116 msgid "cannot create '%s'"

2117 msgstr "kan inte skapa \"%s\""

2118

2119 -#: bundle.c:574

2119 +#: bundle.c:588

2120 msgid "index-pack died"

2121 msgstr "index-pack dog"

2122

2123 -#: chunk-format.c:113

2123 +#: chunk-format.c:117

2124 msgid "terminating chunk id appears earlier than expected"

2125 msgstr "avslutande stycke-id förekommer tidigare än förväntat"

2126

2127 -#: chunk-format.c:122

2127 +#: chunk-format.c:126

2128 #, c-format

2129 msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"

2130 msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"

2131

2132 -#: chunk-format.c:129

2132 +#: chunk-format.c:133

2133 #, c-format

2134 msgid "duplicate chunk ID %<PRIx32> found"

2135 msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"

2136

2137 -#: chunk-format.c:143

2137 +#: chunk-format.c:147

2138 #, c-format

2139 msgid "final chunk has non-zero id %<PRIx32>"

2140 msgstr "avslutande stycke har id %<PRIx32> som inte är noll"

@@ -2202,12 +2202,12 @@ msgstr "kunde inte hitta incheckningen %s"

2202 msgid "commit-graph requires overflow generation data but has none"

2203 msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"

2204

2205 -#: commit-graph.c:1075 builtin/am.c:1340

2205 +#: commit-graph.c:1075 builtin/am.c:1341

2206 #, c-format

2207 msgid "unable to parse commit %s"

2208 msgstr "kunde inte tolka incheckningen %s"

2209

2210 -#: commit-graph.c:1337 builtin/pack-objects.c:2897

2210 +#: commit-graph.c:1337 builtin/pack-objects.c:3057

2211 #, c-format

2212 msgid "unable to get type of object %s"

2213 msgstr "kunde inte hämta typ för objektet %s"

@@ -2269,7 +2269,7 @@ msgstr "Söker ytterligare kanter i incheckingsgraf"

2269 msgid "failed to write correct number of base graph ids"

2270 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"

2271

2272 -#: commit-graph.c:1812 midx.c:906

2272 +#: commit-graph.c:1812 midx.c:911

2273 #, c-format

2274 msgid "unable to create leading directories of %s"

2275 msgstr "kunde inte skapa inledande kataloger för %s"

@@ -2319,59 +2319,60 @@ msgstr ""

2319 msgid "too many commits to write graph"

2320 msgstr "för många incheckningar för att skriva graf"

2321

2322 -#: commit-graph.c:2450

2322 +#: commit-graph.c:2449

2323 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2324 msgstr ""

2325 -"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"

2325 +"filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "

2326 +"trasig"

2327

2327 -#: commit-graph.c:2460

2328 +#: commit-graph.c:2459

2329 #, c-format

2330 msgid "commit-graph has incorrect OID order: %s then %s"

2331 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"

2332

2332 -#: commit-graph.c:2470 commit-graph.c:2485

2333 +#: commit-graph.c:2469 commit-graph.c:2484

2334 #, c-format

2335 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2336 msgstr ""

2337 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"

2338

2338 -#: commit-graph.c:2477

2339 +#: commit-graph.c:2476

2340 #, c-format

2341 msgid "failed to parse commit %s from commit-graph"

2342 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"

2343

2343 -#: commit-graph.c:2495

2344 +#: commit-graph.c:2494

2345 msgid "Verifying commits in commit graph"

2346 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2347

2347 -#: commit-graph.c:2510

2348 +#: commit-graph.c:2509

2349 #, c-format

2350 msgid "failed to parse commit %s from object database for commit-graph"

2351 msgstr ""

2352 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"

2353

2353 -#: commit-graph.c:2517

2354 +#: commit-graph.c:2516

2355 #, c-format

2356 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2357 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"

2358

2358 -#: commit-graph.c:2527

2359 +#: commit-graph.c:2526

2360 #, c-format

2361 msgid "commit-graph parent list for commit %s is too long"

2362 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"

2363

2363 -#: commit-graph.c:2536

2364 +#: commit-graph.c:2535

2365 #, c-format

2366 msgid "commit-graph parent for %s is %s != %s"

2367 msgstr "incheckningsgrafens förälder för %s är %s != %s"

2368

2368 -#: commit-graph.c:2550

2369 +#: commit-graph.c:2549

2370 #, c-format

2371 msgid "commit-graph parent list for commit %s terminates early"

2372 msgstr ""

2373 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"

2374

2374 -#: commit-graph.c:2555

2375 +#: commit-graph.c:2554

2376 #, c-format

2377 msgid ""

2378 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

@@ -2379,7 +2380,7 @@ msgstr ""

2380 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"

2381 "noll på annan plats"

2382

2382 -#: commit-graph.c:2559

2383 +#: commit-graph.c:2558

2384 #, c-format

2385 msgid ""

2386 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

@@ -2387,22 +2388,22 @@ msgstr ""

2388 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "

2389 "%s, men noll på annan plats"

2390

2390 -#: commit-graph.c:2576

2391 +#: commit-graph.c:2575

2392 #, c-format

2393 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2394 msgstr ""

2395 "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "

2396 "%<PRIuMAX>"

2397

2397 -#: commit-graph.c:2582

2398 +#: commit-graph.c:2581

2399 #, c-format

2400 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2401 msgstr ""

2402 "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"

2403 "= %<PRIuMAX>"

2404

2404 -#: commit.c:52 sequencer.c:3088 builtin/am.c:371 builtin/am.c:416

2405 -#: builtin/am.c:421 builtin/am.c:1419 builtin/am.c:2066 builtin/replace.c:457

2405 +#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2406 +#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2407 #, c-format

2408 msgid "could not parse %s"

2409 msgstr "kunde inte tolka %s"

@@ -2693,7 +2694,7 @@ msgstr "felformat värde för %s: %s"

2694 msgid "must be one of nothing, matching, simple, upstream or current"

2695 msgstr "måste vara en av nothing, matching, simple, upstream eller current"

2696

2696 -#: config.c:1687 builtin/pack-objects.c:3924

2697 +#: config.c:1687 builtin/pack-objects.c:4084

2698 #, c-format

2699 msgid "bad pack compression level %d"

2700 msgstr "felaktig paketkomprimeringsgrad %d"

@@ -2713,110 +2714,111 @@ msgstr "referensen \"%s\" pekar inte på en blob"

2714 msgid "unable to resolve config blob '%s'"

2715 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""

2716

2716 -#: config.c:1873

2717 +#: config.c:1874

2718 #, c-format

2719 msgid "failed to parse %s"

2720 msgstr "kunde inte tolka %s"

2721

2721 -#: config.c:1929

2722 +#: config.c:1930

2723 msgid "unable to parse command-line config"

2724 msgstr "kan inte tolka kommandoradskonfiguration"

2725

2725 -#: config.c:2293

2726 +#: config.c:2294

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

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

2729

2729 -#: config.c:2467

2730 +#: config.c:2468

2731 #, c-format

2732 msgid "Invalid %s: '%s'"

2733 msgstr "Felaktigt %s: \"%s\""

2734

2734 -#: config.c:2512

2735 +#: config.c:2513

2736 #, c-format

2737 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2737 -msgstr "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"

2738 +msgstr ""

2739 +"värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"

2740

2739 -#: config.c:2558

2741 +#: config.c:2559

2742 #, c-format

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

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

2745

2744 -#: config.c:2560

2746 +#: config.c:2561

2747 #, c-format

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

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

2750

2749 -#: config.c:2644

2751 +#: config.c:2645

2752 #, c-format

2753 msgid "invalid section name '%s'"

2754 msgstr "felaktigt sektionsnamn \"%s\""

2755

2754 -#: config.c:2676

2756 +#: config.c:2677

2757 #, c-format

2758 msgid "%s has multiple values"

2759 msgstr "%s har flera värden"

2760

2759 -#: config.c:2705

2761 +#: config.c:2706

2762 #, c-format

2763 msgid "failed to write new configuration file %s"

2764 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""

2765

2764 -#: config.c:2957 config.c:3283

2766 +#: config.c:2958 config.c:3285

2767 #, c-format

2768 msgid "could not lock config file %s"

2769 msgstr "kunde inte låsa konfigurationsfilen %s"

2770

2769 -#: config.c:2968

2771 +#: config.c:2969

2772 #, c-format

2773 msgid "opening %s"

2774 msgstr "öppnar %s"

2775

2774 -#: config.c:3005 builtin/config.c:361

2776 +#: config.c:3006 builtin/config.c:361

2777 #, c-format

2778 msgid "invalid pattern: %s"

2779 msgstr "ogiltigt mönster: %s"

2780

2779 -#: config.c:3030

2781 +#: config.c:3031

2782 #, c-format

2783 msgid "invalid config file %s"

2784 msgstr "ogiltig konfigurationsfil: \"%s\""

2785

2784 -#: config.c:3043 config.c:3296

2786 +#: config.c:3044 config.c:3298

2787 #, c-format

2788 msgid "fstat on %s failed"

2789 msgstr "fstat misslyckades på %s"

2790

2789 -#: config.c:3054

2791 +#: config.c:3055

2792 #, c-format

2791 -msgid "unable to mmap '%s'"

2792 -msgstr "kunde inte utföra mmap på \"%s\""

2793 +msgid "unable to mmap '%s'%s"

2794 +msgstr "kunde inte utföra mmap på \"%s\"%s"

2795

2794 -#: config.c:3063 config.c:3301

2796 +#: config.c:3065 config.c:3303

2797 #, c-format

2798 msgid "chmod on %s failed"

2799 msgstr "chmod misslyckades på %s"

2800

2799 -#: config.c:3148 config.c:3398

2801 +#: config.c:3150 config.c:3400

2802 #, c-format

2803 msgid "could not write config file %s"

2804 msgstr "kunde inte skriva konfigurationsfilen %s"

2805

2804 -#: config.c:3182

2806 +#: config.c:3184

2807 #, c-format

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

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

2810

2809 -#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2811 +#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2812 #, c-format

2813 msgid "could not unset '%s'"

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

2815

2814 -#: config.c:3274

2816 +#: config.c:3276

2817 #, c-format

2818 msgid "invalid section name: %s"

2819 msgstr "felaktigt namn på stycke: %s"

2820

2819 -#: config.c:3441

2821 +#: config.c:3443

2822 #, c-format

2823 msgid "missing value for '%s'"

2824 msgstr "värde saknas för \"%s\""

@@ -2995,7 +2997,7 @@ msgstr "kunde inte grena (fork)"

2997

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

2999 # objects in the database.

2998 -#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45

3000 +#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3001 msgid "Checking connectivity"

3002 msgstr "Kontrollerar konnektivitet"

3003

@@ -3259,36 +3261,36 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"

3261 msgid "Marked %d islands, done.\n"

3262 msgstr "Markerade %d öar, klar.\n"

3263

3262 -#: diff-merges.c:80

3264 +#: diff-merges.c:70

3265 #, c-format

3266 msgid "unknown value for --diff-merges: %s"

3267 msgstr "okänt värde för --diff-merges: %s"

3268

3267 -#: diff-lib.c:538

3269 +#: diff-lib.c:557

3270 msgid "--merge-base does not work with ranges"

3271 msgstr "--merge-base fungerar inte med intervall"

3272

3271 -#: diff-lib.c:540

3273 +#: diff-lib.c:559

3274 msgid "--merge-base only works with commits"

3275 msgstr "--merge-base fungerar bara med incheckningar"

3276

3275 -#: diff-lib.c:557

3277 +#: diff-lib.c:576

3278 msgid "unable to get HEAD"

3279 msgstr "kan inte hämta HEAD"

3280

3279 -#: diff-lib.c:564

3281 +#: diff-lib.c:583

3282 msgid "no merge base found"

3283 msgstr "ingen sammanslagningsbas hittades"

3284

3283 -#: diff-lib.c:566

3285 +#: diff-lib.c:585

3286 msgid "multiple merge bases found"

3287 msgstr "flera sammanslagningsbaser hittades"

3288

3287 -#: diff-no-index.c:238

3289 +#: diff-no-index.c:237

3290 msgid "git diff --no-index [<options>] <path> <path>"

3291 msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"

3292

3291 -#: diff-no-index.c:263

3293 +#: diff-no-index.c:262

3294 msgid ""

3295 "Not a git repository. Use --no-index to compare two paths outside a working "

3296 "tree"

@@ -3346,35 +3348,50 @@ msgstr ""

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

3349 "%s"

3350

3349 -#: diff.c:4278

3351 +#: diff.c:4282

3352 #, c-format

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

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

3355

3354 -#: diff.c:4630

3356 +#: diff.c:4634

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

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

3359

3358 -#: diff.c:4633

3360 +#: diff.c:4637

3361 msgid "-G, -S and --find-object are mutually exclusive"

3362 msgstr "-G, -S och --find-object är ömsesidigt uteslutande"

3363

3362 -#: diff.c:4712

3364 +#: diff.c:4640

3365 +msgid ""

3366 +"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3367 +msgstr ""

3368 +"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "

3369 +"-S"

3370 +

3371 +#: diff.c:4643

3372 +msgid ""

3373 +"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3374 +"with -G and -S"

3375 +msgstr ""

3376 +"---pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"

3377 +"all med -G och -S"

3378 +

3379 +#: diff.c:4722

3380 msgid "--follow requires exactly one pathspec"

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

3382

3366 -#: diff.c:4760

3383 +#: diff.c:4770

3384 #, c-format

3385 msgid "invalid --stat value: %s"

3386 msgstr "ogiltigt värde för --stat: %s"

3387

3371 -#: diff.c:4765 diff.c:4770 diff.c:4775 diff.c:4780 diff.c:5308

3388 +#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3389 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3390 #, c-format

3391 msgid "%s expects a numerical value"

3392 msgstr "%s förväntar ett numeriskt värde"

3393

3377 -#: diff.c:4797

3394 +#: diff.c:4807

3395 #, c-format

3396 msgid ""

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

@@ -3383,42 +3400,42 @@ msgstr ""

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

3401 "%s"

3402

3386 -#: diff.c:4882

3403 +#: diff.c:4892

3404 #, c-format

3405 msgid "unknown change class '%c' in --diff-filter=%s"

3406 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"

3407

3391 -#: diff.c:4906

3408 +#: diff.c:4916

3409 #, c-format

3410 msgid "unknown value after ws-error-highlight=%.*s"

3411 msgstr "okänt värde efter ws-error-highlight=%.*s"

3412

3396 -#: diff.c:4920

3413 +#: diff.c:4930

3414 #, c-format

3415 msgid "unable to resolve '%s'"

3416 msgstr "kunde inte slå upp \"%s\""

3417

3401 -#: diff.c:4970 diff.c:4976

3418 +#: diff.c:4980 diff.c:4986

3419 #, c-format

3420 msgid "%s expects <n>/<m> form"

3421 msgstr "%s förväntar formen <n>/<m>"

3422

3406 -#: diff.c:4988

3423 +#: diff.c:4998

3424 #, c-format

3425 msgid "%s expects a character, got '%s'"

3426 msgstr "%s förväntar ett tecken, fick \"%s\""

3427

3411 -#: diff.c:5009

3428 +#: diff.c:5019

3429 #, c-format

3430 msgid "bad --color-moved argument: %s"

3431 msgstr "felaktigt argument till --color-moved: %s"

3432

3416 -#: diff.c:5028

3433 +#: diff.c:5038

3434 #, c-format

3435 msgid "invalid mode '%s' in --color-moved-ws"

3436 msgstr "ogiltigt läge %s\" i --color-moved-ws"

3437

3421 -#: diff.c:5068

3438 +#: diff.c:5078

3439 msgid ""

3440 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3441 "\"histogram\""

@@ -3426,154 +3443,154 @@ msgstr ""

3443 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "

3444 "\"histogram\""

3445

3429 -#: diff.c:5104 diff.c:5124

3446 +#: diff.c:5114 diff.c:5134

3447 #, c-format

3448 msgid "invalid argument to %s"

3449 msgstr "ogiltigt argument för %s"

3450

3434 -#: diff.c:5228

3451 +#: diff.c:5238

3452 #, c-format

3453 msgid "invalid regex given to -I: '%s'"

3454 msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""

3455

3439 -#: diff.c:5277

3456 +#: diff.c:5287

3457 #, c-format

3458 msgid "failed to parse --submodule option parameter: '%s'"

3459 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""

3460

3444 -#: diff.c:5333

3461 +#: diff.c:5343

3462 #, c-format

3463 msgid "bad --word-diff argument: %s"

3464 msgstr "felaktigt argument --word-diff: %s"

3465

3449 -#: diff.c:5369

3466 +#: diff.c:5379

3467 msgid "Diff output format options"

3468 msgstr "Formatflaggor för diff-utdata"

3469

3453 -#: diff.c:5371 diff.c:5377

3470 +#: diff.c:5381 diff.c:5387

3471 msgid "generate patch"

3472 msgstr "skapar patch"

3473

3457 -#: diff.c:5374 builtin/log.c:179

3474 +#: diff.c:5384 builtin/log.c:179

3475 msgid "suppress diff output"

3476 msgstr "undertryck diff-utdata"

3477

3461 -#: diff.c:5379 diff.c:5493 diff.c:5500

3478 +#: diff.c:5389 diff.c:5503 diff.c:5510

3479 msgid "<n>"

3480 msgstr "<n>"

3481

3465 -#: diff.c:5380 diff.c:5383

3482 +#: diff.c:5390 diff.c:5393

3483 msgid "generate diffs with <n> lines context"

3484 msgstr "skapa diffar med <n> rader sammanhang"

3485

3469 -#: diff.c:5385

3486 +#: diff.c:5395

3487 msgid "generate the diff in raw format"

3488 msgstr "generera diff i råformat"

3489

3473 -#: diff.c:5388

3490 +#: diff.c:5398

3491 msgid "synonym for '-p --raw'"

3492 msgstr "synonym till \"-p --raw\""

3493

3477 -#: diff.c:5392

3494 +#: diff.c:5402

3495 msgid "synonym for '-p --stat'"

3496 msgstr "synonym till \"-p --stat\""

3497

3481 -#: diff.c:5396

3498 +#: diff.c:5406

3499 msgid "machine friendly --stat"

3500 msgstr "maskinläsbar --stat"

3501

3485 -#: diff.c:5399

3502 +#: diff.c:5409

3503 msgid "output only the last line of --stat"

3504 msgstr "skriv bara ut den sista raden för --stat"

3505

3489 -#: diff.c:5401 diff.c:5409

3506 +#: diff.c:5411 diff.c:5419

3507 msgid "<param1,param2>..."

3508 msgstr "<param1,param2>..."

3509

3493 -#: diff.c:5402

3510 +#: diff.c:5412

3511 msgid ""

3512 "output the distribution of relative amount of changes for each sub-directory"

3513 msgstr ""

3514 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3515

3499 -#: diff.c:5406

3516 +#: diff.c:5416

3517 msgid "synonym for --dirstat=cumulative"

3518 msgstr "synonym för --dirstat=cumulative"

3519

3503 -#: diff.c:5410

3520 +#: diff.c:5420

3521 msgid "synonym for --dirstat=files,param1,param2..."

3522 msgstr "synonym för --dirstat=filer,param1,param2..."

3523

3507 -#: diff.c:5414

3524 +#: diff.c:5424

3525 msgid "warn if changes introduce conflict markers or whitespace errors"

3526 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3527

3511 -#: diff.c:5417

3528 +#: diff.c:5427

3529 msgid "condensed summary such as creations, renames and mode changes"

3530 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3531

3515 -#: diff.c:5420

3532 +#: diff.c:5430

3533 msgid "show only names of changed files"

3534 msgstr "visa endast namnen på ändrade filer"

3535

3519 -#: diff.c:5423

3536 +#: diff.c:5433

3537 msgid "show only names and status of changed files"

3538 msgstr "visa endast namn och status för ändrade filer"

3539

3523 -#: diff.c:5425

3540 +#: diff.c:5435

3541 msgid "<width>[,<name-width>[,<count>]]"

3542 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3543

3527 -#: diff.c:5426

3544 +#: diff.c:5436

3545 msgid "generate diffstat"

3546 msgstr "skapa diffstat"

3547

3531 -#: diff.c:5428 diff.c:5431 diff.c:5434

3548 +#: diff.c:5438 diff.c:5441 diff.c:5444

3549 msgid "<width>"

3550 msgstr "<bredd>"

3551

3535 -#: diff.c:5429

3552 +#: diff.c:5439

3553 msgid "generate diffstat with a given width"

3554 msgstr "generera en diffstat med given bredd"

3555

3539 -#: diff.c:5432

3556 +#: diff.c:5442

3557 msgid "generate diffstat with a given name width"

3558 msgstr "generera en diffstat med given namnbredd"

3559

3543 -#: diff.c:5435

3560 +#: diff.c:5445

3561 msgid "generate diffstat with a given graph width"

3562 msgstr "generera en diffstat med given grafbredd"

3563

3547 -#: diff.c:5437

3564 +#: diff.c:5447

3565 msgid "<count>"

3566 msgstr "<antal>"

3567

3551 -#: diff.c:5438

3568 +#: diff.c:5448

3569 msgid "generate diffstat with limited lines"

3570 msgstr "generera diffstat med begränsade rader"

3571

3555 -#: diff.c:5441

3572 +#: diff.c:5451

3573 msgid "generate compact summary in diffstat"

3574 msgstr "skapa kompakt översikt i diffstat"

3575

3559 -#: diff.c:5444

3576 +#: diff.c:5454

3577 msgid "output a binary diff that can be applied"

3578 msgstr "skapa en binärdiff som kan appliceras"

3579

3563 -#: diff.c:5447

3580 +#: diff.c:5457

3581 msgid "show full pre- and post-image object names on the \"index\" lines"

3582 msgstr ""

3583 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3584

3568 -#: diff.c:5449

3585 +#: diff.c:5459

3586 msgid "show colored diff"

3587 msgstr "visa färgad diff"

3588

3572 -#: diff.c:5450

3589 +#: diff.c:5460

3590 msgid "<kind>"

3591 msgstr "<typ>"

3592

3576 -#: diff.c:5451

3593 +#: diff.c:5461

3594 msgid ""

3595 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3596 "diff"

@@ -3581,7 +3598,7 @@ msgstr ""

3598 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3599 "\"new\" (nya) rader i diffen"

3600

3584 -#: diff.c:5454

3601 +#: diff.c:5464

3602 msgid ""

3603 "do not munge pathnames and use NULs as output field terminators in --raw or "

3604 "--numstat"

@@ -3589,87 +3606,87 @@ msgstr ""

3606 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3607 "eller --numstat"

3608

3592 -#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572

3609 +#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3610 msgid "<prefix>"

3611 msgstr "<prefix>"

3612

3596 -#: diff.c:5458

3613 +#: diff.c:5468

3614 msgid "show the given source prefix instead of \"a/\""

3615 msgstr "visa givet källprefix istället för \"a/\""

3616

3600 -#: diff.c:5461

3617 +#: diff.c:5471

3618 msgid "show the given destination prefix instead of \"b/\""

3619 msgstr "visa givet målprefix istället för \"b/\""

3620

3604 -#: diff.c:5464

3621 +#: diff.c:5474

3622 msgid "prepend an additional prefix to every line of output"

3623 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3624

3608 -#: diff.c:5467

3625 +#: diff.c:5477

3626 msgid "do not show any source or destination prefix"

3627 msgstr "visa inte käll- eller målprefix"

3628

3612 -#: diff.c:5470

3629 +#: diff.c:5480

3630 msgid "show context between diff hunks up to the specified number of lines"

3631 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3632

3616 -#: diff.c:5474 diff.c:5479 diff.c:5484

3633 +#: diff.c:5484 diff.c:5489 diff.c:5494

3634 msgid "<char>"

3635 msgstr "<tecken>"

3636

3620 -#: diff.c:5475

3637 +#: diff.c:5485

3638 msgid "specify the character to indicate a new line instead of '+'"

3639 msgstr "ange tecken för att ange ny rad istället för \"+\""

3640

3624 -#: diff.c:5480

3641 +#: diff.c:5490

3642 msgid "specify the character to indicate an old line instead of '-'"

3643 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3644

3628 -#: diff.c:5485

3645 +#: diff.c:5495

3646 msgid "specify the character to indicate a context instead of ' '"

3647 msgstr "ange tecken för att ange sammanhang istället för \" \""

3648

3632 -#: diff.c:5488

3649 +#: diff.c:5498

3650 msgid "Diff rename options"

3651 msgstr "Diff-namnbytesflaggor"

3652

3636 -#: diff.c:5489

3653 +#: diff.c:5499

3654 msgid "<n>[/<m>]"

3655 msgstr "<n>[/<m>]"

3656

3640 -#: diff.c:5490

3657 +#: diff.c:5500

3658 msgid "break complete rewrite changes into pairs of delete and create"

3659 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3660

3644 -#: diff.c:5494

3661 +#: diff.c:5504

3662 msgid "detect renames"

3663 msgstr "detektera namnändringar"

3664

3648 -#: diff.c:5498

3665 +#: diff.c:5508

3666 msgid "omit the preimage for deletes"

3667 msgstr "ta bort för-version för borttagningar"

3668

3652 -#: diff.c:5501

3669 +#: diff.c:5511

3670 msgid "detect copies"

3671 msgstr "detektera kopior"

3672

3656 -#: diff.c:5505

3673 +#: diff.c:5515

3674 msgid "use unmodified files as source to find copies"

3675 msgstr "använd oförändrade som källa för att hitta kopior"

3676

3660 -#: diff.c:5507

3677 +#: diff.c:5517

3678 msgid "disable rename detection"

3679 msgstr "inaktivera detektering av namnbyten"

3680

3664 -#: diff.c:5510

3681 +#: diff.c:5520

3682 msgid "use empty blobs as rename source"

3683 msgstr "använd tomma blob:ar som namnändringskälla"

3684

3668 -#: diff.c:5512

3685 +#: diff.c:5522

3686 msgid "continue listing the history of a file beyond renames"

3687 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3688

3672 -#: diff.c:5515

3689 +#: diff.c:5525

3690 msgid ""

3691 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3692 "given limit"

@@ -3677,163 +3694,163 @@ msgstr ""

3694 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3695 "given gräns"

3696

3680 -#: diff.c:5517

3697 +#: diff.c:5527

3698 msgid "Diff algorithm options"

3699 msgstr "Alternativ för diff-algoritm"

3700

3684 -#: diff.c:5519

3701 +#: diff.c:5529

3702 msgid "produce the smallest possible diff"

3703 msgstr "skapa minsta möjliga diff"

3704

3688 -#: diff.c:5522

3705 +#: diff.c:5532

3706 msgid "ignore whitespace when comparing lines"

3707 msgstr "ignorera blanktecken vid radjämförelse"

3708

3692 -#: diff.c:5525

3709 +#: diff.c:5535

3710 msgid "ignore changes in amount of whitespace"

3711 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3712

3696 -#: diff.c:5528

3713 +#: diff.c:5538

3714 msgid "ignore changes in whitespace at EOL"

3715 msgstr "ignorera blanktecken vid radslut"

3716

3700 -#: diff.c:5531

3717 +#: diff.c:5541

3718 msgid "ignore carrier-return at the end of line"

3719 msgstr "ignorera CR-tecken vid radslut"

3720

3704 -#: diff.c:5534

3721 +#: diff.c:5544

3722 msgid "ignore changes whose lines are all blank"

3723 msgstr "ignorera ändringar i rader som är helt blanka"

3724

3708 -#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606

3725 +#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3726 msgid "<regex>"

3727 msgstr "<reguttr>"

3728

3712 -#: diff.c:5537

3729 +#: diff.c:5547

3730 msgid "ignore changes whose all lines match <regex>"

3731 msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"

3732

3716 -#: diff.c:5540

3733 +#: diff.c:5550

3734 msgid "heuristic to shift diff hunk boundaries for easy reading"

3735 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3736

3720 -#: diff.c:5543

3737 +#: diff.c:5553

3738 msgid "generate diff using the \"patience diff\" algorithm"

3739 msgstr "skapa diffar med algoritmen \"patience diff\""

3740

3724 -#: diff.c:5547

3741 +#: diff.c:5557

3742 msgid "generate diff using the \"histogram diff\" algorithm"

3743 msgstr "skapa diffar med algoritmen \"histogram diff\""

3744

3728 -#: diff.c:5549

3745 +#: diff.c:5559

3746 msgid "<algorithm>"

3747 msgstr "<algoritm>"

3748

3732 -#: diff.c:5550

3749 +#: diff.c:5560

3750 msgid "choose a diff algorithm"

3751 msgstr "välj en diff-algoritm"

3752

3736 -#: diff.c:5552

3753 +#: diff.c:5562

3754 msgid "<text>"

3755 msgstr "<text>"

3756

3740 -#: diff.c:5553

3757 +#: diff.c:5563

3758 msgid "generate diff using the \"anchored diff\" algorithm"

3759 msgstr "skapa diffar med algoritmen \"anchored diff\""

3760

3744 -#: diff.c:5555 diff.c:5564 diff.c:5567

3761 +#: diff.c:5565 diff.c:5574 diff.c:5577

3762 msgid "<mode>"

3763 msgstr "<läge>"

3764

3748 -#: diff.c:5556

3765 +#: diff.c:5566

3766 msgid "show word diff, using <mode> to delimit changed words"

3767 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3768

3752 -#: diff.c:5559

3769 +#: diff.c:5569

3770 msgid "use <regex> to decide what a word is"

3771 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3772

3756 -#: diff.c:5562

3773 +#: diff.c:5572

3774 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3775 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3776

3760 -#: diff.c:5565

3777 +#: diff.c:5575

3778 msgid "moved lines of code are colored differently"

3779 msgstr "flyttade kodrader färgas på annat sätt"

3780

3764 -#: diff.c:5568

3781 +#: diff.c:5578

3782 msgid "how white spaces are ignored in --color-moved"

3783 msgstr "hur blanktecken ignoreras i --color-moved"

3784

3768 -#: diff.c:5571

3785 +#: diff.c:5581

3786 msgid "Other diff options"

3787 msgstr "Andra diff-flaggor"

3788

3772 -#: diff.c:5573

3789 +#: diff.c:5583

3790 msgid "when run from subdir, exclude changes outside and show relative paths"

3791 msgstr ""

3792 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3793 "sökvägar"

3794

3778 -#: diff.c:5577

3795 +#: diff.c:5587

3796 msgid "treat all files as text"

3797 msgstr "hantera alla filer som text"

3798

3782 -#: diff.c:5579

3799 +#: diff.c:5589

3800 msgid "swap two inputs, reverse the diff"

3801 msgstr "växla två indatafiler, vänd diffen"

3802

3786 -#: diff.c:5581

3803 +#: diff.c:5591

3804 msgid "exit with 1 if there were differences, 0 otherwise"

3805 msgstr "avsluta med 1 vid ändringar, annars 0"

3806

3790 -#: diff.c:5583

3807 +#: diff.c:5593

3808 msgid "disable all output of the program"

3809 msgstr "slå av alla utdata från programmet"

3810

3794 -#: diff.c:5585

3811 +#: diff.c:5595

3812 msgid "allow an external diff helper to be executed"

3813 msgstr "tillåt köra en extern diff-hjälpare"

3814

3798 -#: diff.c:5587

3815 +#: diff.c:5597

3816 msgid "run external text conversion filters when comparing binary files"

3817 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3818

3802 -#: diff.c:5589

3819 +#: diff.c:5599

3820 msgid "<when>"

3821 msgstr "<när>"

3822

3806 -#: diff.c:5590

3823 +#: diff.c:5600

3824 msgid "ignore changes to submodules in the diff generation"

3825 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3826

3810 -#: diff.c:5593

3827 +#: diff.c:5603

3828 msgid "<format>"

3829 msgstr "<format>"

3830

3814 -#: diff.c:5594

3831 +#: diff.c:5604

3832 msgid "specify how differences in submodules are shown"

3833 msgstr "ange hur ändringar i undermoduler visas"

3834

3818 -#: diff.c:5598

3835 +#: diff.c:5608

3836 msgid "hide 'git add -N' entries from the index"

3837 msgstr "dölj \"git add -N\"-poster från indexet"

3838

3822 -#: diff.c:5601

3839 +#: diff.c:5611

3840 msgid "treat 'git add -N' entries as real in the index"

3841 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3842

3826 -#: diff.c:5603

3843 +#: diff.c:5613

3844 msgid "<string>"

3845 msgstr "<sträng>"

3846

3830 -#: diff.c:5604

3847 +#: diff.c:5614

3848 msgid ""

3849 "look for differences that change the number of occurrences of the specified "

3850 "string"

3851 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3852

3836 -#: diff.c:5607

3853 +#: diff.c:5617

3854 msgid ""

3855 "look for differences that change the number of occurrences of the specified "

3856 "regex"

@@ -3841,66 +3858,66 @@ msgstr ""

3858 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3859 "uttryck"

3860

3844 -#: diff.c:5610

3861 +#: diff.c:5620

3862 msgid "show all changes in the changeset with -S or -G"

3863 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3864

3848 -#: diff.c:5613

3865 +#: diff.c:5623

3866 msgid "treat <string> in -S as extended POSIX regular expression"

3867 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3868

3852 -#: diff.c:5616

3869 +#: diff.c:5626

3870 msgid "control the order in which files appear in the output"

3871 msgstr "styr ordningen i vilken filer visas i utdata"

3872

3856 -#: diff.c:5617 diff.c:5620

3873 +#: diff.c:5627 diff.c:5630

3874 msgid "<path>"

3875 msgstr "<sökväg>"

3876

3860 -#: diff.c:5618

3877 +#: diff.c:5628

3878 msgid "show the change in the specified path first"

3879 msgstr "visa ändringen i angiven sökväg först"

3880

3864 -#: diff.c:5621

3881 +#: diff.c:5631

3882 msgid "skip the output to the specified path"

3883 msgstr "hoppa över utdata fram till angiven sökväg"

3884

3868 -#: diff.c:5623

3885 +#: diff.c:5633

3886 msgid "<object-id>"

3887 msgstr "<objekt-id>"

3888

3872 -#: diff.c:5624

3889 +#: diff.c:5634

3890 msgid ""

3891 "look for differences that change the number of occurrences of the specified "

3892 "object"

3893 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3894

3878 -#: diff.c:5626

3895 +#: diff.c:5636

3896 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3897 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3898

3882 -#: diff.c:5627

3899 +#: diff.c:5637

3900 msgid "select files by diff type"

3901 msgstr "välj filter efter diff-typ"

3902

3886 -#: diff.c:5629

3903 +#: diff.c:5639

3904 msgid "<file>"

3905 msgstr "<fil>"

3906

3890 -#: diff.c:5630

3907 +#: diff.c:5640

3908 msgid "Output to a specific file"

3909 msgstr "Skriv utdata till en specifik fil"

3910

3894 -#: diff.c:6287

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

3911 +#: diff.c:6298

3912 +msgid "exhaustive rename detection was skipped due to too many files."

3913 msgstr ""

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

3914 +"uttömmande namnbytesdetektering hoppades över på grund av för många filer."

3915

3899 -#: diff.c:6290

3916 +#: diff.c:6301

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

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

3919

3903 -#: diff.c:6293

3920 +#: diff.c:6304

3921 #, c-format

3922 msgid ""

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

@@ -3912,7 +3929,7 @@ msgstr ""

3929 msgid "failed to read orderfile '%s'"

3930 msgstr "kunde inte läsa orderfilen \"%s\""

3931

3915 -#: diffcore-rename.c:1418

3932 +#: diffcore-rename.c:1510

3933 msgid "Performing inexact rename detection"

3934 msgstr "Utför onöjaktig namnbytesdetektering"

3935

@@ -3921,61 +3938,61 @@ msgstr "Utför onöjaktig namnbytesdetektering"

3938 msgid "No such path '%s' in the diff"

3939 msgstr "Sökvägen \"%s\" finns inte i diffen"

3940

3924 -#: dir.c:578

3941 +#: dir.c:593

3942 #, c-format

3943 msgid "pathspec '%s' did not match any file(s) known to git"

3944 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"

3945

3929 -#: dir.c:718 dir.c:747 dir.c:760

3946 +#: dir.c:733 dir.c:762 dir.c:775

3947 #, c-format

3948 msgid "unrecognized pattern: '%s'"

3949 msgstr "okänt mönster: %s"

3950

3934 -#: dir.c:777 dir.c:791

3951 +#: dir.c:792 dir.c:806

3952 #, c-format

3953 msgid "unrecognized negative pattern: '%s'"

3954 msgstr "okänt negativt mönster: %s"

3955

3939 -#: dir.c:809

3956 +#: dir.c:824

3957 #, c-format

3958 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3959 msgstr ""

3960 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "

3961 "gånger"

3962

3946 -#: dir.c:819

3963 +#: dir.c:834

3964 msgid "disabling cone pattern matching"

3965 msgstr "inaktiverar konmönstermatchning"

3966

3950 -#: dir.c:1206

3967 +#: dir.c:1221

3968 #, c-format

3969 msgid "cannot use %s as an exclude file"

3970 msgstr "kan inte använda %s som exkluderingsfil"

3971

3955 -#: dir.c:2314

3972 +#: dir.c:2358

3973 #, c-format

3974 msgid "could not open directory '%s'"

3975 msgstr "kunde inte öppna katalogen \"%s\""

3976

3960 -#: dir.c:2614

3977 +#: dir.c:2660

3978 msgid "failed to get kernel name and information"

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

3980

3964 -#: dir.c:2738

3981 +#: dir.c:2784

3982 msgid "untracked cache is disabled on this system or location"

3983 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3984

3968 -#: dir.c:3543

3985 +#: dir.c:3617

3986 #, c-format

3987 msgid "index file corrupt in repo %s"

3988 msgstr "indexfilen trasig i arkivet %s"

3989

3973 -#: dir.c:3590 dir.c:3595

3990 +#: dir.c:3664 dir.c:3669

3991 #, c-format

3992 msgid "could not create directories for %s"

3993 msgstr "kunde inte skapa kataloger för %s"

3994

3978 -#: dir.c:3624

3995 +#: dir.c:3698

3996 #, c-format

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

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

@@ -3985,11 +4002,11 @@ msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

4002 msgid "hint: Waiting for your editor to close the file...%c"

4003 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

4004

3988 -#: entry.c:179

4005 +#: entry.c:176

4006 msgid "Filtering content"

4007 msgstr "Filtrerar innehåll"

4008

3992 -#: entry.c:500

4009 +#: entry.c:497

4010 #, c-format

4011 msgid "could not stat file '%s'"

4012 msgstr "kunde inte ta status på filen \"%s\""

@@ -4164,7 +4181,7 @@ msgstr "inga gemensamma incheckningar"

4181 msgid "source repository is shallow, reject to clone."

4182 msgstr "källarkivet är grunt, tillåter inte kloning."

4183

4167 -#: fetch-pack.c:1128 fetch-pack.c:1651

4184 +#: fetch-pack.c:1128 fetch-pack.c:1660

4185 msgid "git fetch-pack: fetch failed."

4186 msgstr "git fetch-patch: hämtning misslyckades."

4187

@@ -4186,7 +4203,7 @@ msgstr "Servern stöder inte grunda förfrågningar"

4203 msgid "Server supports filter"

4204 msgstr "Servern stöder filter"

4205

4189 -#: fetch-pack.c:1329 fetch-pack.c:2034

4206 +#: fetch-pack.c:1329 fetch-pack.c:2043

4207 msgid "unable to write request to remote"

4208 msgstr "kunde inte skriva anrop till fjärren"

4209

@@ -4243,24 +4260,24 @@ msgstr "fel vid hantering av önskade referenser: %d"

4260 msgid "git fetch-pack: expected response end packet"

4261 msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4262

4246 -#: fetch-pack.c:1930

4263 +#: fetch-pack.c:1939

4264 msgid "no matching remote head"

4265 msgstr "inget motsvarande fjärrhuvud"

4266

4250 -#: fetch-pack.c:1953 builtin/clone.c:697

4267 +#: fetch-pack.c:1962 builtin/clone.c:697

4268 msgid "remote did not send all necessary objects"

4269 msgstr "fjärren sände inte alla nödvändiga objekt"

4270

4254 -#: fetch-pack.c:2056

4271 +#: fetch-pack.c:2065

4272 msgid "unexpected 'ready' from remote"

4273 msgstr "oväntat \"ready\" från fjärr"

4274

4258 -#: fetch-pack.c:2079

4275 +#: fetch-pack.c:2088

4276 #, c-format

4277 msgid "no such remote ref %s"

4278 msgstr "ingen sådan fjärreferens: %s"

4279

4263 -#: fetch-pack.c:2082

4280 +#: fetch-pack.c:2091

4281 #, c-format

4282 msgid "Server does not allow request for unadvertised object %s"

4283 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

@@ -4280,8 +4297,8 @@ msgstr "gpg misslyckades signera data"

4297

4298 #: graph.c:98

4299 #, c-format

4283 -msgid "ignore invalid color '%.*s' in log.graphColors"

4284 -msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

4300 +msgid "ignored invalid color '%.*s' in log.graphColors"

4301 +msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"

4302

4303 #: grep.c:531

4304 msgid ""

@@ -4291,18 +4308,18 @@ msgstr ""

4308 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"

4309 "P under PCRE v2"

4310

4294 -#: grep.c:1893

4311 +#: grep.c:1895

4312 #, c-format

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

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

4315

4299 -#: grep.c:1910 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4316 +#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4317 #: builtin/rm.c:136

4318 #, c-format

4319 msgid "failed to stat '%s'"

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

4321

4305 -#: grep.c:1921

4322 +#: grep.c:1923

4323 #, c-format

4324 msgid "'%s': short read"

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

@@ -4541,7 +4558,7 @@ msgstr "sparse:sökväg-filter stöds inte längre"

4558

4559 #: list-objects-filter-options.c:105

4560 #, c-format

4544 -msgid "'%s' for 'object:type=<type>' isnot a valid object type"

4561 +msgid "'%s' for 'object:type=<type>' is not a valid object type"

4562 msgstr "\"%s\" för \"object:type=<typ>\" är inte en giltig objekttyp"

4563

4564 #: list-objects-filter-options.c:124

@@ -4586,7 +4603,7 @@ msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"

4603 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4604 msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"

4605

4589 -#: list-objects.c:395

4606 +#: list-objects.c:398

4607 #, c-format

4608 msgid "unable to load root tree for commit %s"

4609 msgstr "kunde inte läsa in rot-trädet för incheckningen %s"

@@ -4634,34 +4651,34 @@ msgstr "citerad CRLF upptäcktes"

4651 msgid "bad action '%s' for '%s'"

4652 msgstr "felaktig funktion \"%s\" för \"%s\""

4653

4637 -#: merge-ort.c:1116 merge-recursive.c:1205

4654 +#: merge-ort.c:1228 merge-recursive.c:1206

4655 #, c-format

4656 msgid "Failed to merge submodule %s (not checked out)"

4657 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

4658

4642 -#: merge-ort.c:1125 merge-recursive.c:1212

4659 +#: merge-ort.c:1237 merge-recursive.c:1213

4660 #, c-format

4661 msgid "Failed to merge submodule %s (commits not present)"

4662 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

4663

4647 -#: merge-ort.c:1134 merge-recursive.c:1219

4664 +#: merge-ort.c:1246 merge-recursive.c:1220

4665 #, c-format

4666 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

4667 msgstr ""

4668 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

4669 "sammanslagningsbasen)"

4670

4654 -#: merge-ort.c:1144 merge-ort.c:1151

4671 +#: merge-ort.c:1256 merge-ort.c:1263

4672 #, c-format

4673 msgid "Note: Fast-forwarding submodule %s to %s"

4674 msgstr "Obs: Snabbspolar undermodulen %s till %s"

4675

4659 -#: merge-ort.c:1172

4676 +#: merge-ort.c:1284

4677 #, c-format

4678 msgid "Failed to merge submodule %s"

4679 msgstr "Misslyckades slå ihop undermodulen %s"

4680

4664 -#: merge-ort.c:1179

4681 +#: merge-ort.c:1291

4682 #, c-format

4683 msgid ""

4684 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4670,7 +4687,7 @@ msgstr ""

4687 "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"

4688 "%s\n"

4689

4673 -#: merge-ort.c:1183 merge-recursive.c:1273

4690 +#: merge-ort.c:1295 merge-recursive.c:1274

4691 #, c-format

4692 msgid ""

4693 "If this is correct simply add it to the index for example\n"

@@ -4687,7 +4704,7 @@ msgstr ""

4704 "\n"

4705 "vilket godtar lösningen.\n"

4706

4690 -#: merge-ort.c:1196

4707 +#: merge-ort.c:1308

4708 #, c-format

4709 msgid ""

4710 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4697,21 +4714,21 @@ msgstr ""

4714 "finns:\n"

4715 "%s"

4716

4700 -#: merge-ort.c:1415 merge-recursive.c:1362

4717 +#: merge-ort.c:1527 merge-recursive.c:1363

4718 msgid "Failed to execute internal merge"

4719 msgstr "Misslyckades exekvera intern sammanslagning"

4720

4704 -#: merge-ort.c:1420 merge-recursive.c:1367

4721 +#: merge-ort.c:1532 merge-recursive.c:1368

4722 #, c-format

4723 msgid "Unable to add %s to database"

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

4725

4709 -#: merge-ort.c:1427 merge-recursive.c:1400

4726 +#: merge-ort.c:1539 merge-recursive.c:1401

4727 #, c-format

4728 msgid "Auto-merging %s"

4729 msgstr "Slår ihop %s automatiskt"

4730

4714 -#: merge-ort.c:1566 merge-recursive.c:2122

4731 +#: merge-ort.c:1678 merge-recursive.c:2123

4732 #, c-format

4733 msgid ""

4734 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -4720,7 +4737,7 @@ msgstr ""

4737 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

4738 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

4739

4723 -#: merge-ort.c:1576 merge-recursive.c:2132

4740 +#: merge-ort.c:1688 merge-recursive.c:2133

4741 #, c-format

4742 msgid ""

4743 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -4729,7 +4746,7 @@ msgstr ""

4746 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

4747 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

4748

4732 -#: merge-ort.c:1634

4749 +#: merge-ort.c:1746

4750 #, c-format

4751 msgid ""

4752 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4740,7 +4757,7 @@ msgstr ""

4757 "den har namnbytts till flera andra kataloger, utan att någon destination "

4758 "fick en majoritet av filerna."

4759

4743 -#: merge-ort.c:1788 merge-recursive.c:2468

4760 +#: merge-ort.c:1900 merge-recursive.c:2469

4761 #, c-format

4762 msgid ""

4763 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -4749,7 +4766,7 @@ msgstr ""

4766 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

4767 "bytt namn."

4768

4752 -#: merge-ort.c:1932 merge-recursive.c:3244

4769 +#: merge-ort.c:2044 merge-recursive.c:3252

4770 #, c-format

4771 msgid ""

4772 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4758,7 +4775,7 @@ msgstr ""

4775 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

4776 "flyttar den till %s."

4777

4761 -#: merge-ort.c:1939 merge-recursive.c:3251

4778 +#: merge-ort.c:2051 merge-recursive.c:3259

4779 #, c-format

4780 msgid ""

4781 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4767,7 +4784,7 @@ msgstr ""

4784 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

4785 "namn i %s; flyttar den till %s."

4786

4770 -#: merge-ort.c:1952 merge-recursive.c:3247

4787 +#: merge-ort.c:2064 merge-recursive.c:3255

4788 #, c-format

4789 msgid ""

4790 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4776,7 +4793,7 @@ msgstr ""

4793 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

4794 "%s, föreslår att den bör flyttas till%s."

4795

4779 -#: merge-ort.c:1960 merge-recursive.c:3254

4796 +#: merge-ort.c:2072 merge-recursive.c:3262

4797 #, c-format

4798 msgid ""

4799 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4785,13 +4802,13 @@ msgstr ""

4802 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

4803 "bytte namn i %s; flyttar den till %s."

4804

4788 -#: merge-ort.c:2103

4805 +#: merge-ort.c:2228

4806 #, c-format

4807 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4808 msgstr ""

4809 "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."

4810

4794 -#: merge-ort.c:2198

4811 +#: merge-ort.c:2323

4812 #, c-format

4813 msgid ""

4814 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4802,23 +4819,23 @@ msgstr ""

4819 "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "

4820 "nästlade konfliktmarkörer."

4821

4805 -#: merge-ort.c:2217 merge-ort.c:2241

4822 +#: merge-ort.c:2342 merge-ort.c:2366

4823 #, c-format

4824 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4825 msgstr ""

4826 "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."

4827

4811 -#: merge-ort.c:2550 merge-recursive.c:3002

4828 +#: merge-ort.c:2819 merge-recursive.c:3013

4829 #, c-format

4830 msgid "cannot read object %s"

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

4832

4816 -#: merge-ort.c:2553 merge-recursive.c:3005

4833 +#: merge-ort.c:2822 merge-recursive.c:3016

4834 #, c-format

4835 msgid "object %s is not a blob"

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

4837

4821 -#: merge-ort.c:2981

4838 +#: merge-ort.c:3250

4839 #, c-format

4840 msgid ""

4841 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

@@ -4827,7 +4844,7 @@ msgstr ""

4844 "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "

4845 "till %s istället."

4846

4830 -#: merge-ort.c:3055

4847 +#: merge-ort.c:3326

4848 #, c-format

4849 msgid ""

4850 "CONFLICT (distinct types): %s had different types on each side; renamed both "

@@ -4836,7 +4853,7 @@ msgstr ""

4853 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "

4854 "så att de kan protokollföras någonstans."

4855

4839 -#: merge-ort.c:3062

4856 +#: merge-ort.c:3333

4857 #, c-format

4858 msgid ""

4859 "CONFLICT (distinct types): %s had different types on each side; renamed one "

@@ -4845,24 +4862,24 @@ msgstr ""

4862 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "

4863 "så att de kan protokollföras någonstans."

4864

4848 -#: merge-ort.c:3162 merge-recursive.c:3081

4865 +#: merge-ort.c:3433 merge-recursive.c:3092

4866 msgid "content"

4867 msgstr "innehåll"

4868

4852 -#: merge-ort.c:3164 merge-recursive.c:3085

4869 +#: merge-ort.c:3435 merge-recursive.c:3096

4870 msgid "add/add"

4871 msgstr "tillägg/tillägg"

4872

4856 -#: merge-ort.c:3166 merge-recursive.c:3130

4873 +#: merge-ort.c:3437 merge-recursive.c:3141

4874 msgid "submodule"

4875 msgstr "undermodul"

4876

4860 -#: merge-ort.c:3168 merge-recursive.c:3131

4877 +#: merge-ort.c:3439 merge-recursive.c:3142

4878 #, c-format

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

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

4881

4865 -#: merge-ort.c:3198

4882 +#: merge-ort.c:3470

4883 #, c-format

4884 msgid ""

4885 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4871,7 +4888,7 @@ msgstr ""

4888 "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "

4889 "lämnad i trädet."

4890

4874 -#: merge-ort.c:3433

4891 +#: merge-ort.c:3757

4892 #, c-format

4893 msgid ""

4894 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4883,12 +4900,12 @@ msgstr ""

4900 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

4901 #. base, and 2-3) the trees for the two trees we're merging.

4902 #.

4886 -#: merge-ort.c:3730

4903 +#: merge-ort.c:4116

4904 #, c-format

4905 msgid "collecting merge info failed for trees %s, %s, %s"

4906 msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"

4907

4891 -#: merge-ort-wrappers.c:13 merge-recursive.c:3699

4908 +#: merge-ort-wrappers.c:13 merge-recursive.c:3707

4909 #, c-format

4910 msgid ""

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

@@ -4898,109 +4915,109 @@ msgstr ""

4915 "sammanslagning:\n"

4916 " %s"

4917

4901 -#: merge-ort-wrappers.c:33 merge-recursive.c:3465 builtin/merge.c:402

4918 +#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402

4919 msgid "Already up to date."

4920 msgstr "Redan à jour."

4921

4905 -#: merge-recursive.c:356

4922 +#: merge-recursive.c:357

4923 msgid "(bad commit)\n"

4924 msgstr "(felaktig incheckning)\n"

4925

4909 -#: merge-recursive.c:379

4926 +#: merge-recursive.c:380

4927 #, c-format

4928 msgid "add_cacheinfo failed for path '%s'; merge aborting."

4929 msgstr ""

4930 "add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

4931

4915 -#: merge-recursive.c:388

4932 +#: merge-recursive.c:389

4933 #, c-format

4934 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

4935 msgstr ""

4936 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "

4937 "sammanslagningen."

4938

4922 -#: merge-recursive.c:876

4939 +#: merge-recursive.c:877

4940 #, c-format

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

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

4943

4927 -#: merge-recursive.c:887

4944 +#: merge-recursive.c:888

4945 #, c-format

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

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

4948

4932 -#: merge-recursive.c:901 merge-recursive.c:920

4949 +#: merge-recursive.c:902 merge-recursive.c:921

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

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

4952

4936 -#: merge-recursive.c:910

4953 +#: merge-recursive.c:911

4954 #, c-format

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

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

4957

4941 -#: merge-recursive.c:951 builtin/cat-file.c:41

4958 +#: merge-recursive.c:952 builtin/cat-file.c:41

4959 #, c-format

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

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

4962

4946 -#: merge-recursive.c:956

4963 +#: merge-recursive.c:957

4964 #, c-format

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

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

4967

4951 -#: merge-recursive.c:981

4968 +#: merge-recursive.c:982

4969 #, c-format

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

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

4972

4956 -#: merge-recursive.c:992

4973 +#: merge-recursive.c:993

4974 #, c-format

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

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

4977

4961 -#: merge-recursive.c:997

4978 +#: merge-recursive.c:998

4979 #, c-format

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

4981 msgstr "vet inte hur %06o %s \"%s\" ska hanteras"

4982

4966 -#: merge-recursive.c:1227 merge-recursive.c:1239

4983 +#: merge-recursive.c:1228 merge-recursive.c:1240

4984 #, c-format

4985 msgid "Fast-forwarding submodule %s to the following commit:"

4986 msgstr "Snabbspolar undermodulen %s till följande incheckning:"

4987

4971 -#: merge-recursive.c:1230 merge-recursive.c:1242

4988 +#: merge-recursive.c:1231 merge-recursive.c:1243

4989 #, c-format

4990 msgid "Fast-forwarding submodule %s"

4991 msgstr "Snabbspolar undermodulen %s"

4992

4976 -#: merge-recursive.c:1265

4993 +#: merge-recursive.c:1266

4994 #, c-format

4995 msgid "Failed to merge submodule %s (merge following commits not found)"

4996 msgstr ""

4997 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "

4998 "hittades inte)"

4999

4983 -#: merge-recursive.c:1269

5000 +#: merge-recursive.c:1270

5001 #, c-format

5002 msgid "Failed to merge submodule %s (not fast-forward)"

5003 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"

5004

4988 -#: merge-recursive.c:1270

5005 +#: merge-recursive.c:1271

5006 msgid "Found a possible merge resolution for the submodule:\n"

5007 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"

5008

4992 -#: merge-recursive.c:1282

5009 +#: merge-recursive.c:1283

5010 #, c-format

5011 msgid "Failed to merge submodule %s (multiple merges found)"

5012 msgstr ""

5013 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

5014

4998 -#: merge-recursive.c:1424

5015 +#: merge-recursive.c:1425

5016 #, c-format

5017 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

5018 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

5019

5003 -#: merge-recursive.c:1496

5020 +#: merge-recursive.c:1497

5021 #, c-format

5022 msgid ""

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

@@ -5009,7 +5026,7 @@ msgstr ""

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

5027 "i trädet."

5028

5012 -#: merge-recursive.c:1501

5029 +#: merge-recursive.c:1502

5030 #, c-format

5031 msgid ""

5032 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5018,7 +5035,7 @@ msgstr ""

5035 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

5036 "%s lämnad i trädet."

5037

5021 -#: merge-recursive.c:1508

5038 +#: merge-recursive.c:1509

5039 #, c-format

5040 msgid ""

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

@@ -5027,7 +5044,7 @@ msgstr ""

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

5045 "i trädet vid %s."

5046

5030 -#: merge-recursive.c:1513

5047 +#: merge-recursive.c:1514

5048 #, c-format

5049 msgid ""

5050 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -5036,40 +5053,40 @@ msgstr ""

5053 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

5054 "%s lämnad i trädet vid %s."

5055

5039 -#: merge-recursive.c:1548

5056 +#: merge-recursive.c:1549

5057 msgid "rename"

5058 msgstr "namnbyte"

5059

5043 -#: merge-recursive.c:1548

5060 +#: merge-recursive.c:1549

5061 msgid "renamed"

5062 msgstr "namnbytt"

5063

5047 -#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158

5064 +#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169

5065 #, c-format

5066 msgid "Refusing to lose dirty file at %s"

5067 msgstr "Vägrar förlora lortig fil vid \"%s\""

5068

5052 -#: merge-recursive.c:1609

5069 +#: merge-recursive.c:1610

5070 #, c-format

5071 msgid "Refusing to lose untracked file at %s, even though it's in the way."

5072 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

5073

5057 -#: merge-recursive.c:1667

5074 +#: merge-recursive.c:1668

5075 #, c-format

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

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

5078

5062 -#: merge-recursive.c:1698

5079 +#: merge-recursive.c:1699

5080 #, c-format

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

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

5083

5067 -#: merge-recursive.c:1703

5084 +#: merge-recursive.c:1704

5085 #, c-format

5086 msgid "Refusing to lose untracked file at %s; adding as %s instead"

5087 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

5088

5072 -#: merge-recursive.c:1730

5089 +#: merge-recursive.c:1731

5090 #, c-format

5091 msgid ""

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

@@ -5078,17 +5095,17 @@ msgstr ""

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

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

5097

5081 -#: merge-recursive.c:1735

5098 +#: merge-recursive.c:1736

5099 msgid " (left unresolved)"

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

5101

5085 -#: merge-recursive.c:1827

5102 +#: merge-recursive.c:1828

5103 #, c-format

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

5105 msgstr ""

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

5107

5091 -#: merge-recursive.c:2090

5108 +#: merge-recursive.c:2091

5109 #, c-format

5110 msgid ""

5111 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -5099,7 +5116,7 @@ msgstr ""

5116 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

5117 "destination fick en majoritet av filerna."

5118

5102 -#: merge-recursive.c:2224

5119 +#: merge-recursive.c:2225

5120 #, c-format

5121 msgid ""

5122 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -5108,79 +5125,79 @@ msgstr ""

5125 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

5126 "%s->%s i %s"

5127

5111 -#: merge-recursive.c:3069

5128 +#: merge-recursive.c:3080

5129 msgid "modify"

5130 msgstr "ändra"

5131

5115 -#: merge-recursive.c:3069

5132 +#: merge-recursive.c:3080

5133 msgid "modified"

5134 msgstr "ändrad"

5135

5119 -#: merge-recursive.c:3108

5136 +#: merge-recursive.c:3119

5137 #, c-format

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

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

5140

5124 -#: merge-recursive.c:3161

5141 +#: merge-recursive.c:3172

5142 #, c-format

5143 msgid "Adding as %s instead"

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

5145

5129 -#: merge-recursive.c:3368

5146 +#: merge-recursive.c:3376

5147 #, c-format

5148 msgid "Removing %s"

5149 msgstr "Tar bort %s"

5150

5134 -#: merge-recursive.c:3391

5151 +#: merge-recursive.c:3399

5152 msgid "file/directory"

5153 msgstr "fil/katalog"

5154

5138 -#: merge-recursive.c:3396

5155 +#: merge-recursive.c:3404

5156 msgid "directory/file"

5157 msgstr "katalog/fil"

5158

5142 -#: merge-recursive.c:3403

5159 +#: merge-recursive.c:3411

5160 #, c-format

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

5162 msgstr ""

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

5164

5148 -#: merge-recursive.c:3412

5165 +#: merge-recursive.c:3420

5166 #, c-format

5167 msgid "Adding %s"

5168 msgstr "Lägger till %s"

5169

5153 -#: merge-recursive.c:3421

5170 +#: merge-recursive.c:3429

5171 #, c-format

5172 msgid "CONFLICT (add/add): Merge conflict in %s"

5173 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

5174

5158 -#: merge-recursive.c:3474

5175 +#: merge-recursive.c:3482

5176 #, c-format

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

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

5179

5163 -#: merge-recursive.c:3568

5180 +#: merge-recursive.c:3576

5181 msgid "Merging:"

5182 msgstr "Slår ihop:"

5183

5167 -#: merge-recursive.c:3581

5184 +#: merge-recursive.c:3589

5185 #, c-format

5186 msgid "found %u common ancestor:"

5187 msgid_plural "found %u common ancestors:"

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

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

5190

5174 -#: merge-recursive.c:3631

5191 +#: merge-recursive.c:3639

5192 msgid "merge returned no commit"

5193 msgstr "sammanslagningen returnerade ingen incheckning"

5194

5178 -#: merge-recursive.c:3796

5195 +#: merge-recursive.c:3804

5196 #, c-format

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

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

5199

5183 -#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900

5200 +#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900

5201 #: builtin/stash.c:473

5202 msgid "Unable to write index."

5203 msgstr "Kunde inte skriva indexet."

@@ -5189,7 +5206,7 @@ msgstr "Kunde inte skriva indexet."

5206 msgid "failed to read the cache"

5207 msgstr "misslyckades läsa cachen"

5208

5192 -#: merge.c:109 rerere.c:704 builtin/am.c:1931 builtin/am.c:1965

5209 +#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5210 #: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821

5211 #: builtin/stash.c:267

5212 msgid "unable to write new index file"

@@ -5264,107 +5281,115 @@ msgstr "misslyckades öppna paketindexet \"%s\""

5281 msgid "failed to locate object %d in packfile"

5282 msgstr "misslyckades hitta objekt %d i paketfilen"

5283

5267 -#: midx.c:880 builtin/index-pack.c:1535

5284 +#: midx.c:880 builtin/index-pack.c:1533

5285 msgid "cannot store reverse index file"

5286 msgstr "kan inte spara reverse-index-fil"

5287

5271 -#: midx.c:933

5288 +#: midx.c:920

5289 +msgid "ignoring existing multi-pack-index; checksum mismatch"

5290 +msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"

5291 +

5292 +#: midx.c:943

5293 msgid "Adding packfiles to multi-pack-index"

5294 msgstr "Lägger till paketfiler till multi-pack-index"

5295

5275 -#: midx.c:979

5296 +#: midx.c:989

5297 #, c-format

5298 msgid "did not see pack-file %s to drop"

5299 msgstr "såg inte paketfilen %s som skulle kastas"

5300

5280 -#: midx.c:1024

5301 +#: midx.c:1034

5302 #, c-format

5303 msgid "unknown preferred pack: '%s'"

5304 msgstr "okänt föredraget paket: %s"

5305

5285 -#: midx.c:1029

5306 +#: midx.c:1039

5307 #, c-format

5308 msgid "preferred pack '%s' is expired"

5309 msgstr "föredraget paket \"%s\" har löpt ut"

5310

5290 -#: midx.c:1045

5311 +#: midx.c:1055

5312 msgid "no pack files to index."

5313 msgstr "inga paketfiler att indexera."

5314

5294 -#: midx.c:1125 builtin/clean.c:37

5315 +#: midx.c:1135 builtin/clean.c:37

5316 #, c-format

5317 msgid "failed to remove %s"

5318 msgstr "misslyckades ta bort %s"

5319

5299 -#: midx.c:1156

5320 +#: midx.c:1166

5321 #, c-format

5322 msgid "failed to clear multi-pack-index at %s"

5323 msgstr "misslyckades städa multi-pack-index på %s"

5324

5304 -#: midx.c:1214

5325 +#: midx.c:1225

5326 msgid "multi-pack-index file exists, but failed to parse"

5327 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"

5328

5308 -#: midx.c:1222

5329 +#: midx.c:1233

5330 +msgid "incorrect checksum"

5331 +msgstr "felaktig kontrollsumma"

5332 +

5333 +#: midx.c:1236

5334 msgid "Looking for referenced packfiles"

5335 msgstr "Ser efter refererade packfiler"

5336

5312 -#: midx.c:1237

5337 +#: midx.c:1251

5338 #, c-format

5339 msgid ""

5340 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5341 msgstr ""

5342 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5343

5319 -#: midx.c:1242

5344 +#: midx.c:1256

5345 msgid "the midx contains no oid"

5346 msgstr "midx saknar oid"

5347

5323 -#: midx.c:1251

5348 +#: midx.c:1265

5349 msgid "Verifying OID order in multi-pack-index"

5350 msgstr "Bekräftar OID-ordning i multi-pack-index"

5351

5327 -#: midx.c:1260

5352 +#: midx.c:1274

5353 #, c-format

5354 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5355 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

5356

5332 -#: midx.c:1280

5357 +#: midx.c:1294

5358 msgid "Sorting objects by packfile"

5359 msgstr "Sorterar objekt efter packfil"

5360

5336 -#: midx.c:1287

5361 +#: midx.c:1301

5362 msgid "Verifying object offsets"

5363 msgstr "Bekräftar offset för objekt"

5364

5340 -#: midx.c:1303

5365 +#: midx.c:1317

5366 #, c-format

5367 msgid "failed to load pack entry for oid[%d] = %s"

5368 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

5369

5345 -#: midx.c:1309

5370 +#: midx.c:1323

5371 #, c-format

5372 msgid "failed to load pack-index for packfile %s"

5373 msgstr "misslyckades läsa paketindex för paketfil %s"

5374

5350 -#: midx.c:1318

5375 +#: midx.c:1332

5376 #, c-format

5377 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5378 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5379

5355 -#: midx.c:1343

5380 +#: midx.c:1357

5381 msgid "Counting referenced objects"

5382 msgstr "Räknar refererade objekt"

5383

5359 -#: midx.c:1353

5384 +#: midx.c:1367

5385 msgid "Finding and deleting unreferenced packfiles"

5386 msgstr "Ser efter och tar bort orefererade packfiler"

5387

5363 -#: midx.c:1544

5388 +#: midx.c:1558

5389 msgid "could not start pack-objects"

5390 msgstr "kunde inte starta pack-objects"

5391

5367 -#: midx.c:1564

5392 +#: midx.c:1578

5393 msgid "could not finish pack-objects"

5394 msgstr "kunde inte avsluta pack-objects"

5395

@@ -5428,266 +5453,267 @@ msgstr "Felaktigt värde på %s: \"%s\""

5453 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5454 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"

5455

5431 -#: object-file.c:577

5456 +#: object-file.c:584

5457 #, c-format

5458 msgid "unable to normalize alternate object path: %s"

5459 msgstr "kunde inte normalisera supplerande objektsökväg: %s"

5460

5436 -#: object-file.c:649

5461 +#: object-file.c:658

5462 #, c-format

5463 msgid "%s: ignoring alternate object stores, nesting too deep"

5464 msgstr "%s: ignorerar supplerande objektlager, för djup nästling"

5465

5441 -#: object-file.c:656

5466 +#: object-file.c:665

5467 #, c-format

5468 msgid "unable to normalize object directory: %s"

5469 msgstr "kan inte normalisera objektkatalogen: %s"

5470

5446 -#: object-file.c:699

5471 +#: object-file.c:708

5472 msgid "unable to fdopen alternates lockfile"

5473 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"

5474

5450 -#: object-file.c:717

5475 +#: object-file.c:726

5476 msgid "unable to read alternates file"

5477 msgstr "kan inte läsa \"alternates\"-filen"

5478

5454 -#: object-file.c:724

5479 +#: object-file.c:733

5480 msgid "unable to move new alternates file into place"

5481 msgstr "kan inte flytta ny \"alternates\"-fil på plats"

5482

5458 -#: object-file.c:759

5483 +#: object-file.c:768

5484 #, c-format

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

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

5487

5463 -#: object-file.c:780

5488 +#: object-file.c:789

5489 #, c-format

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

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

5492

5468 -#: object-file.c:786

5493 +#: object-file.c:795

5494 #, c-format

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

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

5497

5473 -#: object-file.c:792

5498 +#: object-file.c:801

5499 #, c-format

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

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

5502

5478 -#: object-file.c:800

5503 +#: object-file.c:809

5504 #, c-format

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

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

5507

5483 -#: object-file.c:860

5508 +#: object-file.c:869

5509 #, c-format

5510 msgid "invalid line while parsing alternate refs: %s"

5511 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"

5512

5488 -#: object-file.c:1010

5513 +#: object-file.c:1019

5514 #, c-format

5515 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5516 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"

5517

5493 -#: object-file.c:1031

5494 -msgid "mmap failed"

5495 -msgstr "mmap misslyckades"

5518 +#: object-file.c:1054

5519 +#, c-format

5520 +msgid "mmap failed%s"

5521 +msgstr "mmap misslyckades%s"

5522

5497 -#: object-file.c:1195

5523 +#: object-file.c:1218

5524 #, c-format

5525 msgid "object file %s is empty"

5526 msgstr "objektfilen %s är tom"

5527

5502 -#: object-file.c:1330 object-file.c:2524

5528 +#: object-file.c:1353 object-file.c:2548

5529 #, c-format

5530 msgid "corrupt loose object '%s'"

5531 msgstr "trasigt löst objekt \"%s\""

5532

5507 -#: object-file.c:1332 object-file.c:2528

5533 +#: object-file.c:1355 object-file.c:2552

5534 #, c-format

5535 msgid "garbage at end of loose object '%s'"

5536 msgstr "skräp i slutet av löst objekt \"%s\""

5537

5512 -#: object-file.c:1374

5538 +#: object-file.c:1397

5539 msgid "invalid object type"

5540 msgstr "felaktig objekttyp"

5541

5516 -#: object-file.c:1458

5542 +#: object-file.c:1481

5543 #, c-format

5544 msgid "unable to unpack %s header with --allow-unknown-type"

5545 msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"

5546

5521 -#: object-file.c:1461

5547 +#: object-file.c:1484

5548 #, c-format

5549 msgid "unable to unpack %s header"

5550 msgstr "kan inte packa upp %s-huvudet"

5551

5526 -#: object-file.c:1467

5552 +#: object-file.c:1490

5553 #, c-format

5554 msgid "unable to parse %s header with --allow-unknown-type"

5555 msgstr "kan inte tolka %s-huvud med --allow-unknown-type"

5556

5531 -#: object-file.c:1470

5557 +#: object-file.c:1493

5558 #, c-format

5559 msgid "unable to parse %s header"

5560 msgstr "kan inte tolka %s-huvud"

5561

5536 -#: object-file.c:1697

5562 +#: object-file.c:1717

5563 #, c-format

5564 msgid "failed to read object %s"

5565 msgstr "misslyckades läsa objektet %s"

5566

5541 -#: object-file.c:1701

5567 +#: object-file.c:1721

5568 #, c-format

5569 msgid "replacement %s not found for %s"

5570 msgstr "ersättningen %s hittades inte för %s"

5571

5546 -#: object-file.c:1705

5572 +#: object-file.c:1725

5573 #, c-format

5574 msgid "loose object %s (stored in %s) is corrupt"

5575 msgstr "löst objekt %s (lagrat i %s) är trasigt"

5576

5551 -#: object-file.c:1709

5577 +#: object-file.c:1729

5578 #, c-format

5579 msgid "packed object %s (stored in %s) is corrupt"

5580 msgstr "packat objekt %s (lagrat i %s) är trasigt"

5581

5556 -#: object-file.c:1814

5582 +#: object-file.c:1834

5583 #, c-format

5584 msgid "unable to write file %s"

5585 msgstr "kunde inte skriva filen %s"

5586

5561 -#: object-file.c:1821

5587 +#: object-file.c:1841

5588 #, c-format

5589 msgid "unable to set permission to '%s'"

5590 msgstr "kan inte sätta behörigheten till \"%s\""

5591

5566 -#: object-file.c:1828

5592 +#: object-file.c:1848

5593 msgid "file write error"

5594 msgstr "fel vid skrivning av fil"

5595

5570 -#: object-file.c:1848

5596 +#: object-file.c:1868

5597 msgid "error when closing loose object file"

5598 msgstr "fel vid stängning av fil för löst objekt"

5599

5574 -#: object-file.c:1913

5600 +#: object-file.c:1933

5601 #, c-format

5602 msgid "insufficient permission for adding an object to repository database %s"

5603 msgstr ""

5604 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"

5605

5580 -#: object-file.c:1915

5606 +#: object-file.c:1935

5607 msgid "unable to create temporary file"

5608 msgstr "kan inte skapa temporär fil"

5609

5584 -#: object-file.c:1939

5610 +#: object-file.c:1959

5611 msgid "unable to write loose object file"

5612 msgstr "kunde inte skriva fil för löst objekt"

5613

5588 -#: object-file.c:1945

5614 +#: object-file.c:1965

5615 #, c-format

5616 msgid "unable to deflate new object %s (%d)"

5617 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"

5618

5593 -#: object-file.c:1949

5619 +#: object-file.c:1969

5620 #, c-format

5621 msgid "deflateEnd on object %s failed (%d)"

5622 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"

5623

5598 -#: object-file.c:1953

5624 +#: object-file.c:1973

5625 #, c-format

5626 msgid "confused by unstable object source data for %s"

5627 msgstr "förvirrad av instabil objektkälldata för %s"

5628

5603 -#: object-file.c:1963 builtin/pack-objects.c:1097

5629 +#: object-file.c:1983 builtin/pack-objects.c:1237

5630 #, c-format

5631 msgid "failed utime() on %s"

5632 msgstr "\"utime()\" misslyckades på %s"

5633

5608 -#: object-file.c:2040

5634 +#: object-file.c:2060

5635 #, c-format

5636 msgid "cannot read object for %s"

5637 msgstr "kan inte läsa objekt för %s"

5638

5613 -#: object-file.c:2091

5639 +#: object-file.c:2111

5640 msgid "corrupt commit"

5641 msgstr "trasik incheckning"

5642

5617 -#: object-file.c:2099

5643 +#: object-file.c:2119

5644 msgid "corrupt tag"

5645 msgstr "trasig tagg"

5646

5621 -#: object-file.c:2199

5647 +#: object-file.c:2219

5648 #, c-format

5649 msgid "read error while indexing %s"

5650 msgstr "läsfel vid indexering av %s"

5651

5626 -#: object-file.c:2202

5652 +#: object-file.c:2222

5653 #, c-format

5654 msgid "short read while indexing %s"

5655 msgstr "för lite lästes vid indexering av %s"

5656

5631 -#: object-file.c:2275 object-file.c:2285

5657 +#: object-file.c:2295 object-file.c:2305

5658 #, c-format

5659 msgid "%s: failed to insert into database"

5660 msgstr "%s: misslyckades lägga in i databasen"

5661

5636 -#: object-file.c:2291

5662 +#: object-file.c:2311

5663 #, c-format

5664 msgid "%s: unsupported file type"

5665 msgstr "%s: filtypen stöds ej"

5666

5641 -#: object-file.c:2315

5667 +#: object-file.c:2335

5668 #, c-format

5669 msgid "%s is not a valid object"

5670 msgstr "%s är inte ett giltigt objekt"

5671

5646 -#: object-file.c:2317

5672 +#: object-file.c:2337

5673 #, c-format

5674 msgid "%s is not a valid '%s' object"

5675 msgstr "%s är inte ett giltigt \"%s\"-objekt"

5676

5651 -#: object-file.c:2344 builtin/index-pack.c:192

5677 +#: object-file.c:2364 builtin/index-pack.c:192

5678 #, c-format

5679 msgid "unable to open %s"

5680 msgstr "kan inte öppna %s"

5681

5656 -#: object-file.c:2535 object-file.c:2588

5682 +#: object-file.c:2559 object-file.c:2612

5683 #, c-format

5684 msgid "hash mismatch for %s (expected %s)"

5685 msgstr "hash stämmer inte för %s (förväntade %s)"

5686

5661 -#: object-file.c:2559

5687 +#: object-file.c:2583

5688 #, c-format

5689 msgid "unable to mmap %s"

5690 msgstr "kan inte utföra \"mmap\" för %s"

5691

5666 -#: object-file.c:2564

5692 +#: object-file.c:2588

5693 #, c-format

5694 msgid "unable to unpack header of %s"

5695 msgstr "kan inte packa upp huvud för %s"

5696

5671 -#: object-file.c:2570

5697 +#: object-file.c:2594

5698 #, c-format

5699 msgid "unable to parse header of %s"

5700 msgstr "kan inte tolka huvud för %s"

5701

5676 -#: object-file.c:2581

5702 +#: object-file.c:2605

5703 #, c-format

5704 msgid "unable to unpack contents of %s"

5705 msgstr "kan inte tolka innehåll i %s"

5706

5681 -#: object-name.c:486

5707 +#: object-name.c:480

5708 #, c-format

5709 msgid "short object ID %s is ambiguous"

5710 msgstr "kort objekt-ID %s är tvetydigt"

5711

5686 -#: object-name.c:497

5712 +#: object-name.c:491

5713 msgid "The candidates are:"

5714 msgstr "Kandidaterna är:"

5715

5690 -#: object-name.c:796

5716 +#: object-name.c:790

5717 msgid ""

5718 "Git normally never creates a ref that ends with 40 hex characters\n"

5719 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -5709,22 +5735,22 @@ msgstr ""

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

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

5737

5712 -#: object-name.c:916

5738 +#: object-name.c:910

5739 #, c-format

5740 msgid "log for '%.*s' only goes back to %s"

5741 msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"

5742

5717 -#: object-name.c:924

5743 +#: object-name.c:918

5744 #, c-format

5745 msgid "log for '%.*s' only has %d entries"

5746 msgstr "loggen för \"%.*s\" har bara %d poster"

5747

5722 -#: object-name.c:1702

5748 +#: object-name.c:1696

5749 #, c-format

5750 msgid "path '%s' exists on disk, but not in '%.*s'"

5751 msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""

5752

5727 -#: object-name.c:1708

5753 +#: object-name.c:1702

5754 #, c-format

5755 msgid ""

5756 "path '%s' exists, but not '%s'\n"

@@ -5733,12 +5759,12 @@ msgstr ""

5759 "sökvägen \"%s\" finns, men inte i \"%s\"\n"

5760 "tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"

5761

5736 -#: object-name.c:1717

5762 +#: object-name.c:1711

5763 #, c-format

5764 msgid "path '%s' does not exist in '%.*s'"

5765 msgstr "sökvägen \"%s\" finns inte i \"%.*s\""

5766

5741 -#: object-name.c:1745

5767 +#: object-name.c:1739

5768 #, c-format

5769 msgid ""

5770 "path '%s' is in the index, but not at stage %d\n"

@@ -5747,7 +5773,7 @@ msgstr ""

5773 "sökvägen \"%s\" finns i indexet men inte i etapp %d\n"

5774 "tips: Menade du \":%d:%s\"?"

5775

5750 -#: object-name.c:1761

5776 +#: object-name.c:1755

5777 #, c-format

5778 msgid ""

5779 "path '%s' is in the index, but not '%s'\n"

@@ -5756,21 +5782,21 @@ msgstr ""

5782 "sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"

5783 "tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"

5784

5759 -#: object-name.c:1769

5785 +#: object-name.c:1763

5786 #, c-format

5787 msgid "path '%s' exists on disk, but not in the index"

5788 msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"

5789

5764 -#: object-name.c:1771

5790 +#: object-name.c:1765

5791 #, c-format

5792 msgid "path '%s' does not exist (neither on disk nor in the index)"

5793 msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"

5794

5769 -#: object-name.c:1784

5795 +#: object-name.c:1778

5796 msgid "relative path syntax can't be used outside working tree"

5797 msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"

5798

5773 -#: object-name.c:1922

5799 +#: object-name.c:1916

5800 #, c-format

5801 msgid "invalid object name '%.*s'."

5802 msgstr "felaktigt objektnamn \"%.*s\"."

@@ -5785,27 +5811,27 @@ msgstr "ogiltig objekttyp \"%s\""

5811 msgid "object %s is a %s, not a %s"

5812 msgstr "objektet %s är en %s, inte en %s"

5813

5788 -#: object.c:232

5814 +#: object.c:250

5815 #, c-format

5816 msgid "object %s has unknown type id %d"

5817 msgstr "objektet %s har okänd typ-id %d"

5818

5793 -#: object.c:245

5819 +#: object.c:263

5820 #, c-format

5821 msgid "unable to parse object: %s"

5822 msgstr "kunde inte tolka objektet: %s"

5823

5798 -#: object.c:265 object.c:277

5824 +#: object.c:283 object.c:295

5825 #, c-format

5826 msgid "hash mismatch %s"

5827 msgstr "hashvärde stämmer inte överens %s"

5828

5803 -#: pack-bitmap.c:844 pack-bitmap.c:850 builtin/pack-objects.c:2251

5829 +#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411

5830 #, c-format

5831 msgid "unable to get size of %s"

5832 msgstr "kan inte hämta storlek på %s"

5833

5808 -#: pack-bitmap.c:1547 builtin/rev-list.c:92

5834 +#: pack-bitmap.c:1571 builtin/rev-list.c:92

5835 #, c-format

5836 msgid "unable to get disk usage of %s"

5837 msgstr "kan inte hämta diskanvändning för %s"

@@ -5858,12 +5884,17 @@ msgstr "kunde inte skriva kontraktsfilen \"%s\""

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

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

5886

5861 -#: packfile.c:1937

5887 +#: packfile.c:655

5888 +#, c-format

5889 +msgid "packfile %s cannot be mapped%s"

5890 +msgstr "paketfilen %s kunde inte kopplas%s"

5891 +

5892 +#: packfile.c:1934

5893 #, c-format

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

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

5896

5866 -#: packfile.c:1941

5897 +#: packfile.c:1938

5898 #, c-format

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

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

@@ -6068,8 +6099,8 @@ msgid "unable to write delim packet"

6099 msgstr "kan inte skriva delim-paket"

6100

6101 #: pkt-line.c:106

6071 -msgid "unable to write stateless separator packet"

6072 -msgstr "kan inte skriva tillståndslöst avdelarpaket"

6102 +msgid "unable to write response end packet"

6103 +msgstr "kunde inte skriva svarsavslutningspaket"

6104

6105 #: pkt-line.c:113

6106 msgid "flush packet write failed"

@@ -6128,20 +6159,20 @@ msgstr "kunde inte skapa trådad lstat: %s"

6159 msgid "unable to parse --pretty format"

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

6161

6131 -#: promisor-remote.c:30

6162 +#: promisor-remote.c:31

6163 msgid "promisor-remote: unable to fork off fetch subprocess"

6164 msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"

6165

6135 -#: promisor-remote.c:35 promisor-remote.c:37

6166 +#: promisor-remote.c:38 promisor-remote.c:40

6167 msgid "promisor-remote: could not write to fetch subprocess"

6168 msgstr "promisor-remote: kunde skriva till underprocessen för fetch"

6169

6139 -#: promisor-remote.c:41

6170 +#: promisor-remote.c:44

6171 msgid "promisor-remote: could not close stdin to fetch subprocess"

6172 msgstr ""

6173 "promisor-remote: kunde inte stänga standard in för underprocessen för fetch"

6174

6144 -#: promisor-remote.c:53

6175 +#: promisor-remote.c:54

6176 #, c-format

6177 msgid "promisor remote name cannot begin with '/': %s"

6178 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"

@@ -6162,7 +6193,7 @@ msgstr "kunde inte starta \"log\""

6193 msgid "could not read `log` output"

6194 msgstr "kunde inte läsa utdata från \"log\""

6195

6165 -#: range-diff.c:101 sequencer.c:5551

6196 +#: range-diff.c:101 sequencer.c:5550

6197 #, c-format

6198 msgid "could not parse commit '%s'"

6199 msgstr "kunde inte tolka incheckningen \"%s\""

@@ -6181,64 +6212,64 @@ msgstr ""

6212 msgid "could not parse git header '%.*s'"

6213 msgstr "kunde inte tolka git-huvudet \"%.*s\""

6214

6184 -#: range-diff.c:306

6215 +#: range-diff.c:307

6216 msgid "failed to generate diff"

6217 msgstr "misslyckades skapa diff"

6218

6188 -#: range-diff.c:558

6219 +#: range-diff.c:559

6220 msgid "--left-only and --right-only are mutually exclusive"

6221 msgstr "--left-only och --right-only är ömsesidigt uteslutande"

6222

6192 -#: range-diff.c:561 range-diff.c:563

6223 +#: range-diff.c:562 range-diff.c:564

6224 #, c-format

6225 msgid "could not parse log for '%s'"

6226 msgstr "kunde inte tolka loggen för \"%s\""

6227

6197 -#: read-cache.c:708

6228 +#: read-cache.c:710

6229 #, c-format

6230 msgid "will not add file alias '%s' ('%s' already exists in index)"

6231 msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"

6232

6202 -#: read-cache.c:724

6233 +#: read-cache.c:726

6234 msgid "cannot create an empty blob in the object database"

6235 msgstr "kan inte skapa tom blob i objektdatabasen"

6236

6206 -#: read-cache.c:746

6237 +#: read-cache.c:748

6238 #, c-format

6239 msgid "%s: can only add regular files, symbolic links or git-directories"

6240 msgstr ""

6241 "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"

6242

6212 -#: read-cache.c:751

6243 +#: read-cache.c:753

6244 #, c-format

6245 msgid "'%s' does not have a commit checked out"

6246 msgstr "\"%s\" har inte någon utcheckad incheckning"

6247

6217 -#: read-cache.c:803

6248 +#: read-cache.c:805

6249 #, c-format

6250 msgid "unable to index file '%s'"

6251 msgstr "kan inte indexera filen \"%s\""

6252

6222 -#: read-cache.c:822

6253 +#: read-cache.c:824

6254 #, c-format

6255 msgid "unable to add '%s' to index"

6256 msgstr "kan inte lägga till \"%s\" till indexet"

6257

6227 -#: read-cache.c:833

6258 +#: read-cache.c:835

6259 #, c-format

6260 msgid "unable to stat '%s'"

6261 msgstr "kan inte ta status på \"%s\""

6262

6232 -#: read-cache.c:1356

6263 +#: read-cache.c:1358

6264 #, c-format

6265 msgid "'%s' appears as both a file and as a directory"

6266 msgstr "\"%s\" finns både som en fil och en katalog"

6267

6237 -#: read-cache.c:1571

6268 +#: read-cache.c:1573

6269 msgid "Refresh index"

6270 msgstr "Uppdatera indexet"

6271

6241 -#: read-cache.c:1700

6272 +#: read-cache.c:1705

6273 #, c-format

6274 msgid ""

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

@@ -6247,7 +6278,7 @@ msgstr ""

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

6279 "Använder version %i"

6280

6250 -#: read-cache.c:1710

6281 +#: read-cache.c:1715

6282 #, c-format

6283 msgid ""

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

@@ -6256,143 +6287,143 @@ msgstr ""

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

6288 "Använder version %i"

6289

6259 -#: read-cache.c:1766

6290 +#: read-cache.c:1771

6291 #, c-format

6292 msgid "bad signature 0x%08x"

6293 msgstr "felaktig signatur 0x%08x"

6294

6264 -#: read-cache.c:1769

6295 +#: read-cache.c:1774

6296 #, c-format

6297 msgid "bad index version %d"

6298 msgstr "felaktig indexversion %d"

6299

6269 -#: read-cache.c:1778

6300 +#: read-cache.c:1783

6301 msgid "bad index file sha1 signature"

6302 msgstr "felaktig sha1-signatur för indexfil"

6303

6273 -#: read-cache.c:1812

6304 +#: read-cache.c:1817

6305 #, c-format

6306 msgid "index uses %.4s extension, which we do not understand"

6307 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

6308

6278 -#: read-cache.c:1814

6309 +#: read-cache.c:1819

6310 #, c-format

6311 msgid "ignoring %.4s extension"

6312 msgstr "ignorerar filtillägget %.4s"

6313

6283 -#: read-cache.c:1851

6314 +#: read-cache.c:1856

6315 #, c-format

6316 msgid "unknown index entry format 0x%08x"

6317 msgstr "okänt format 0x%08x på indexpost"

6318

6288 -#: read-cache.c:1867

6319 +#: read-cache.c:1872

6320 #, c-format

6321 msgid "malformed name field in the index, near path '%s'"

6322 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

6323

6293 -#: read-cache.c:1924

6324 +#: read-cache.c:1929

6325 msgid "unordered stage entries in index"

6326 msgstr "osorterade köposter i index"

6327

6297 -#: read-cache.c:1927

6328 +#: read-cache.c:1932

6329 #, c-format

6330 msgid "multiple stage entries for merged file '%s'"

6331 msgstr "flera köposter för den sammanslagna filen \"%s\""

6332

6302 -#: read-cache.c:1930

6333 +#: read-cache.c:1935

6334 #, c-format

6335 msgid "unordered stage entries for '%s'"

6336 msgstr "osorterade köposter för \"%s\""

6337

6307 -#: read-cache.c:2036 read-cache.c:2333 rerere.c:549 rerere.c:583 rerere.c:1095

6308 -#: submodule.c:1635 builtin/add.c:575 builtin/check-ignore.c:183

6309 -#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:991

6338 +#: read-cache.c:2041 read-cache.c:2339 rerere.c:549 rerere.c:583 rerere.c:1095

6339 +#: submodule.c:1622 builtin/add.c:575 builtin/check-ignore.c:183

6340 +#: builtin/checkout.c:522 builtin/checkout.c:711 builtin/clean.c:987

6341 #: builtin/commit.c:377 builtin/diff-tree.c:122 builtin/grep.c:505

6342 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:291

6312 -#: builtin/submodule--helper.c:332

6343 +#: builtin/submodule--helper.c:331

6344 msgid "index file corrupt"

6345 msgstr "indexfilen trasig"

6346

6316 -#: read-cache.c:2180

6317 -#, c-format, fuzzy

6347 +#: read-cache.c:2185

6348 +#, c-format

6349 msgid "unable to create load_cache_entries thread: %s"

6319 -msgstr "kunde inte läsa in cache_entries-tråden: %s"

6350 +msgstr "kunde inte skapa tråd för load_cache_entries: %s"

6351

6321 -#: read-cache.c:2193

6322 -#, c-format, fuzzy

6352 +#: read-cache.c:2198

6353 +#, c-format

6354 msgid "unable to join load_cache_entries thread: %s"

6324 -msgstr "kunde inte utföra join på cache_entries-tråden: %s"

6355 +msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"

6356

6326 -#: read-cache.c:2226

6357 +#: read-cache.c:2231

6358 #, c-format

6359 msgid "%s: index file open failed"

6360 msgstr "%s: öppning av indexfilen misslyckades"

6361

6331 -#: read-cache.c:2230

6362 +#: read-cache.c:2235

6363 #, c-format

6364 msgid "%s: cannot stat the open index"

6365 msgstr "%s: kan inte ta startus på det öppna indexet"

6366

6336 -#: read-cache.c:2234

6367 +#: read-cache.c:2239

6368 #, c-format

6369 msgid "%s: index file smaller than expected"

6370 msgstr "%s: indexfilen mindre än förväntat"

6371

6341 -#: read-cache.c:2238

6372 +#: read-cache.c:2243

6373 #, c-format

6343 -msgid "%s: unable to map index file"

6344 -msgstr "%s: kan inte koppla indexfilen"

6374 +msgid "%s: unable to map index file%s"

6375 +msgstr "%s: kan inte koppla indexfilen%s"

6376

6346 -#: read-cache.c:2280

6377 +#: read-cache.c:2286

6378 #, c-format

6379 msgid "unable to create load_index_extensions thread: %s"

6380 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

6381

6351 -#: read-cache.c:2307

6382 +#: read-cache.c:2313

6383 #, c-format

6384 msgid "unable to join load_index_extensions thread: %s"

6385 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

6386

6356 -#: read-cache.c:2345

6387 +#: read-cache.c:2351

6388 #, c-format

6389 msgid "could not freshen shared index '%s'"

6390 msgstr "kunde inte uppdatera delat index \"%s\""

6391

6361 -#: read-cache.c:2392

6392 +#: read-cache.c:2398

6393 #, c-format

6394 msgid "broken index, expect %s in %s, got %s"

6395 msgstr "trasigt index, förväntade %s i %s, fick %s"

6396

6366 -#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6397 +#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145

6398 #, c-format

6399 msgid "could not close '%s'"

6400 msgstr "kunde inte stänga \"%s\""

6401

6371 -#: read-cache.c:3138

6402 +#: read-cache.c:3074

6403 msgid "failed to convert to a sparse-index"

6404 msgstr "misslyckades omvandla till glest index"

6405

6375 -#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441

6406 +#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440

6407 #, c-format

6408 msgid "could not stat '%s'"

6409 msgstr "kunde inte ta status på \"%s\""

6410

6380 -#: read-cache.c:3222

6411 +#: read-cache.c:3158

6412 #, c-format

6413 msgid "unable to open git dir: %s"

6414 msgstr "kunde inte öppna git-katalog: %s"

6415

6385 -#: read-cache.c:3234

6416 +#: read-cache.c:3170

6417 #, c-format

6418 msgid "unable to unlink: %s"

6419 msgstr "misslyckades ta bort länken: %s"

6420

6390 -#: read-cache.c:3263

6421 +#: read-cache.c:3199

6422 #, c-format

6423 msgid "cannot fix permission bits on '%s'"

6424 msgstr "kan inte rätta behörighetsbitar på \"%s\""

6425

6395 -#: read-cache.c:3412

6426 +#: read-cache.c:3348

6427 #, c-format

6428 msgid "%s: cannot drop to stage #0"

6429 msgstr "%s: kan inte återgå till kö 0"

@@ -6516,8 +6547,8 @@ msgstr ""

6547 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

6548 "\n"

6549

6519 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3816

6520 -#: sequencer.c:3842 sequencer.c:5657 builtin/fsck.c:327 builtin/rebase.c:271

6550 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3836

6551 +#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271

6552 #, c-format

6553 msgid "could not write '%s'"

6554 msgstr "kunde inte skriva \"%s\""

@@ -6564,7 +6595,7 @@ msgstr ""

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

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

6597

6567 -#: ref-filter.c:42 wt-status.c:1978

6598 +#: ref-filter.c:42 wt-status.c:2036

6599 msgid "gone"

6600 msgstr "försvunnen"

6601

@@ -6583,248 +6614,248 @@ msgstr "bakom %d"

6614 msgid "ahead %d, behind %d"

6615 msgstr "före %d, bakom %d"

6616

6586 -#: ref-filter.c:175

6617 +#: ref-filter.c:230

6618 #, c-format

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

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

6621

6591 -#: ref-filter.c:177

6622 +#: ref-filter.c:232

6623 #, c-format

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

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

6626

6596 -#: ref-filter.c:199

6627 +#: ref-filter.c:254

6628 #, c-format

6629 msgid "Integer value expected refname:lstrip=%s"

6630 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

6631

6601 -#: ref-filter.c:203

6632 +#: ref-filter.c:258

6633 #, c-format

6634 msgid "Integer value expected refname:rstrip=%s"

6635 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

6636

6606 -#: ref-filter.c:205

6637 +#: ref-filter.c:260

6638 #, c-format

6639 msgid "unrecognized %%(%s) argument: %s"

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

6641

6611 -#: ref-filter.c:260

6642 +#: ref-filter.c:315

6643 #, c-format

6644 msgid "%%(objecttype) does not take arguments"

6645 msgstr "%%(objecttype) tar inte argument"

6646

6616 -#: ref-filter.c:282

6647 +#: ref-filter.c:339

6648 #, c-format

6649 msgid "unrecognized %%(objectsize) argument: %s"

6650 msgstr "okänt %%(objectsize)-argument: %s"

6651

6621 -#: ref-filter.c:290

6652 +#: ref-filter.c:347

6653 #, c-format

6654 msgid "%%(deltabase) does not take arguments"

6655 msgstr "%%(deltabase) tar inte argument"

6656

6626 -#: ref-filter.c:302

6657 +#: ref-filter.c:359

6658 #, c-format

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

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

6661

6631 -#: ref-filter.c:315

6662 +#: ref-filter.c:372

6663 #, c-format

6664 msgid "unrecognized %%(subject) argument: %s"

6665 msgstr "okänt %%(subject)-argument: %s"

6666

6636 -#: ref-filter.c:334

6667 +#: ref-filter.c:391

6668 #, c-format

6669 msgid "expected %%(trailers:key=<value>)"

6670 msgstr "förvändate %%(trailers:nyckel=<värde>)"

6671

6641 -#: ref-filter.c:336

6672 +#: ref-filter.c:393

6673 #, c-format

6674 msgid "unknown %%(trailers) argument: %s"

6675 msgstr "okänt %%(trailers)-argument: %s"

6676

6646 -#: ref-filter.c:367

6677 +#: ref-filter.c:424

6678 #, c-format

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

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

6681

6651 -#: ref-filter.c:369

6682 +#: ref-filter.c:426

6683 #, c-format

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

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

6686

6656 -#: ref-filter.c:384

6687 +#: ref-filter.c:441

6688 #, c-format

6689 msgid "positive value expected '%s' in %%(%s)"

6690 msgstr "positivt värde förväntat \"%s\" i %%(%s)"

6691

6661 -#: ref-filter.c:388

6692 +#: ref-filter.c:445

6693 #, c-format

6694 msgid "unrecognized argument '%s' in %%(%s)"

6695 msgstr "okänt argument \"%s\" i %%(%s)"

6696

6666 -#: ref-filter.c:402

6697 +#: ref-filter.c:459

6698 #, c-format

6699 msgid "unrecognized email option: %s"

6700 msgstr "okänd e-postalternativ: %s"

6701

6671 -#: ref-filter.c:432

6702 +#: ref-filter.c:489

6703 #, c-format

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

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

6706

6676 -#: ref-filter.c:444

6707 +#: ref-filter.c:501

6708 #, c-format

6709 msgid "unrecognized position:%s"

6710 msgstr "okänd position:%s"

6711

6681 -#: ref-filter.c:451

6712 +#: ref-filter.c:508

6713 #, c-format

6714 msgid "unrecognized width:%s"

6715 msgstr "okänd bredd:%s"

6716

6686 -#: ref-filter.c:460

6717 +#: ref-filter.c:517

6718 #, c-format

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

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

6721

6691 -#: ref-filter.c:468

6722 +#: ref-filter.c:525

6723 #, c-format

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

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

6726

6696 -#: ref-filter.c:486

6727 +#: ref-filter.c:543

6728 #, c-format

6729 msgid "unrecognized %%(if) argument: %s"

6730 msgstr "okänt %%(if)-argument: %s"

6731

6701 -#: ref-filter.c:588

6732 +#: ref-filter.c:645

6733 #, c-format

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

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

6736

6706 -#: ref-filter.c:615

6737 +#: ref-filter.c:672

6738 #, c-format

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

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

6741

6711 -#: ref-filter.c:619

6742 +#: ref-filter.c:676

6743 #, c-format

6744 msgid ""

6745 "not a git repository, but the field '%.*s' requires access to object data"

6746 msgstr ""

6747 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

6748

6718 -#: ref-filter.c:743

6749 +#: ref-filter.c:801

6750 #, c-format

6751 msgid "format: %%(if) atom used without a %%(then) atom"

6752 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

6753

6723 -#: ref-filter.c:807

6754 +#: ref-filter.c:865

6755 #, c-format

6756 msgid "format: %%(then) atom used without an %%(if) atom"

6757 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

6758

6728 -#: ref-filter.c:809

6759 +#: ref-filter.c:867

6760 #, c-format

6761 msgid "format: %%(then) atom used more than once"

6762 msgstr "format: atomen %%(then) använd mer än en gång"

6763

6733 -#: ref-filter.c:811

6764 +#: ref-filter.c:869

6765 #, c-format

6766 msgid "format: %%(then) atom used after %%(else)"

6767 msgstr "format: atomen %%(then) använd efter %%(else)"

6768

6738 -#: ref-filter.c:839

6769 +#: ref-filter.c:897

6770 #, c-format

6771 msgid "format: %%(else) atom used without an %%(if) atom"

6772 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

6773

6743 -#: ref-filter.c:841

6774 +#: ref-filter.c:899

6775 #, c-format

6776 msgid "format: %%(else) atom used without a %%(then) atom"

6777 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

6778

6748 -#: ref-filter.c:843

6779 +#: ref-filter.c:901

6780 #, c-format

6781 msgid "format: %%(else) atom used more than once"

6782 msgstr "format: atomen %%(else) använd mer än en gång"

6783

6753 -#: ref-filter.c:858

6784 +#: ref-filter.c:916

6785 #, c-format

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

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

6788

6758 -#: ref-filter.c:915

6789 +#: ref-filter.c:973

6790 #, c-format

6791 msgid "malformed format string %s"

6792 msgstr "felformad formatsträng %s"

6793

6763 -#: ref-filter.c:1556

6794 +#: ref-filter.c:1621

6795 #, c-format

6796 msgid "(no branch, rebasing %s)"

6797 msgstr "(ingen gren, ombaserar %s)"

6798

6768 -#: ref-filter.c:1559

6799 +#: ref-filter.c:1624

6800 #, c-format

6801 msgid "(no branch, rebasing detached HEAD %s)"

6802 msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

6803

6773 -#: ref-filter.c:1562

6804 +#: ref-filter.c:1627

6805 #, c-format

6806 msgid "(no branch, bisect started on %s)"

6807 msgstr "(ingen gren, \"bisect\" startad på %s)"

6808

6778 -#: ref-filter.c:1566

6809 +#: ref-filter.c:1631

6810 #, c-format

6811 msgid "(HEAD detached at %s)"

6812 msgstr "(HEAD frånkopplat vid %s)"

6813

6783 -#: ref-filter.c:1569

6814 +#: ref-filter.c:1634

6815 #, c-format

6816 msgid "(HEAD detached from %s)"

6817 msgstr "(HEAD frånkopplat från %s)"

6818

6788 -#: ref-filter.c:1572

6819 +#: ref-filter.c:1637

6820 msgid "(no branch)"

6821 msgstr "(ingen gren)"

6822

6792 -#: ref-filter.c:1604 ref-filter.c:1813

6823 +#: ref-filter.c:1669 ref-filter.c:1880

6824 #, c-format

6825 msgid "missing object %s for %s"

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

6827

6797 -#: ref-filter.c:1614

6828 +#: ref-filter.c:1679

6829 #, c-format

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

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

6832

6802 -#: ref-filter.c:1997

6833 +#: ref-filter.c:2064

6834 #, c-format

6835 msgid "malformed object at '%s'"

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

6837

6807 -#: ref-filter.c:2086

6838 +#: ref-filter.c:2153

6839 #, c-format

6840 msgid "ignoring ref with broken name %s"

6841 msgstr "ignorerar referens med trasigt namn %s"

6842

6812 -#: ref-filter.c:2091 refs.c:676

6843 +#: ref-filter.c:2158 refs.c:676

6844 #, c-format

6845 msgid "ignoring broken ref %s"

6846 msgstr "ignorerar trasig referens %s"

6847

6817 -#: ref-filter.c:2431

6848 +#: ref-filter.c:2498

6849 #, c-format

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

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

6852

6822 -#: ref-filter.c:2525

6853 +#: ref-filter.c:2592

6854 #, c-format

6855 msgid "malformed object name %s"

6856 msgstr "felformat objektnamn %s"

6857

6827 -#: ref-filter.c:2530

6858 +#: ref-filter.c:2597

6859 #, c-format

6860 msgid "option `%s' must point to a commit"

6861 msgstr "flaggan \"%s\" måste peka på en incheckning"

@@ -7280,8 +7311,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

7311 msgid "Recorded preimage for '%s'"

7312 msgstr "Sparade förhandsbild för \"%s\""

7313

7283 -#: rerere.c:865 submodule.c:2089 builtin/log.c:2000

7284 -#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891

7314 +#: rerere.c:865 submodule.c:2076 builtin/log.c:2002

7315 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

7316 #, c-format

7317 msgid "could not create directory '%s'"

7318 msgstr "kunde inte skapa katalogen \"%s\""

@@ -7319,38 +7350,38 @@ msgstr "kan inte uppdatera katalogen rr-cache"

7350 msgid "could not determine HEAD revision"

7351 msgstr "kunde inte bestämma HEAD-revision"

7352

7322 -#: reset.c:70 reset.c:76 sequencer.c:3669

7353 +#: reset.c:70 reset.c:76 sequencer.c:3689

7354 #, c-format

7355 msgid "failed to find tree of %s"

7356 msgstr "kunde inte hitta trädet för %s."

7357

7327 -#: revision.c:2343

7358 +#: revision.c:2344

7359 msgid "--unpacked=<packfile> no longer supported"

7360 msgstr "--unpacked=<paketfil> stöds inte längre"

7361

7331 -#: revision.c:2683

7362 +#: revision.c:2684

7363 msgid "your current branch appears to be broken"

7364 msgstr "din nuvarande gren verkar vara trasig"

7365

7335 -#: revision.c:2686

7366 +#: revision.c:2687

7367 #, c-format

7368 msgid "your current branch '%s' does not have any commits yet"

7369 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

7370

7340 -#: revision.c:2892

7371 +#: revision.c:2893

7372 msgid "-L does not yet support diff formats besides -p and -s"

7373 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

7374

7344 -#: run-command.c:767

7375 +#: run-command.c:766

7376 msgid "open /dev/null failed"

7377 msgstr "misslyckades öppna /dev/null"

7378

7348 -#: run-command.c:1275

7379 +#: run-command.c:1274

7380 #, c-format

7381 msgid "cannot create async thread: %s"

7382 msgstr "kan inte skapa asynkron tråd: %s"

7383

7353 -#: run-command.c:1345

7384 +#: run-command.c:1344

7385 #, c-format

7386 msgid ""

7387 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -7385,15 +7416,15 @@ msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"

7416 msgid "push negotiation failed; proceeding anyway with push"

7417 msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"

7418

7388 -#: send-pack.c:520

7419 +#: send-pack.c:526

7420 msgid "the receiving end does not support this repository's hash algorithm"

7421 msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"

7422

7392 -#: send-pack.c:529

7423 +#: send-pack.c:535

7424 msgid "the receiving end does not support --signed push"

7425 msgstr "mottagarsidan stöder inte push med --signed"

7426

7396 -#: send-pack.c:531

7427 +#: send-pack.c:537

7428 msgid ""

7429 "not sending a push certificate since the receiving end does not support --"

7430 "signed push"

@@ -7401,11 +7432,11 @@ msgstr ""

7432 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

7433 "signed"

7434

7404 -#: send-pack.c:543

7435 +#: send-pack.c:544

7436 msgid "the receiving end does not support --atomic push"

7437 msgstr "mottagarsidan stöder inte push med --atomic"

7438

7408 -#: send-pack.c:548

7439 +#: send-pack.c:549

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

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

7442

@@ -7465,7 +7496,7 @@ msgid "could not lock '%s'"

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

7497

7498 #: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289

7468 -#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631

7499 +#: sequencer.c:3547 sequencer.c:5566 strbuf.c:1170 wrapper.c:631

7500 #, c-format

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

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

@@ -7476,7 +7507,7 @@ msgid "could not write eol to '%s'"

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

7508

7509 #: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291

7479 -#: sequencer.c:3554

7510 +#: sequencer.c:3555

7511 #, c-format

7512 msgid "failed to finalize '%s'"

7513 msgstr "misslyckades färdigställa \"%s\""

@@ -7526,8 +7557,8 @@ msgstr "ingen nyckel i \"%.*s\""

7557 msgid "unable to dequote value of '%s'"

7558 msgstr "kan inte ta bort citering av värdet \"%s\""

7559

7529 -#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:728

7530 -#: builtin/am.c:820 builtin/merge.c:1140 builtin/rebase.c:910

7560 +#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729

7561 +#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910

7562 #, c-format

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

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

@@ -7675,7 +7706,7 @@ msgstr "kunde inte tolka HEAD"

7706 msgid "HEAD %s is not a commit!"

7707 msgstr "HEAD %s är inte en incheckning!"

7708

7678 -#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692

7709 +#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702

7710 msgid "could not parse HEAD commit"

7711 msgstr "kunde inte tolka HEAD:s incheckning"

7712

@@ -7683,7 +7714,7 @@ msgstr "kunde inte tolka HEAD:s incheckning"

7714 msgid "unable to parse commit author"

7715 msgstr "kunde inte tolka incheckningens författare"

7716

7686 -#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706

7717 +#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706

7718 msgid "git write-tree failed to write a tree"

7719 msgstr "git write-tree misslyckades skriva ett träd"

7720

@@ -7701,12 +7732,13 @@ msgstr "ogiltig författar-identitet \"%s\""

7732 msgid "corrupt author: missing date information"

7733 msgstr "trasig författare: saknar datuminformation"

7734

7704 -#: sequencer.c:1530 builtin/am.c:1641 builtin/commit.c:1806 builtin/merge.c:909

7735 +#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909

7736 #: builtin/merge.c:934 t/helper/test-fast-rebase.c:78

7737 msgid "failed to write commit object"

7738 msgstr "kunde inte skriva incheckningsobjekt"

7739

7709 -#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198

7740 +#: sequencer.c:1557 sequencer.c:4492 t/helper/test-fast-rebase.c:199

7741 +#: t/helper/test-fast-rebase.c:217

7742 #, c-format

7743 msgid "could not update %s"

7744 msgstr "kunde inte uppdatera %s"

@@ -7758,7 +7790,7 @@ msgstr "kan inte skriva \"%s\""

7790 msgid "need a HEAD to fixup"

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

7792

7761 -#: sequencer.c:1936 sequencer.c:3581

7793 +#: sequencer.c:1936 sequencer.c:3582

7794 msgid "could not read HEAD"

7795 msgstr "kunde inte läsa HEAD"

7796

@@ -7899,7 +7931,7 @@ msgstr "oanvändbar squash-onto"

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

7932 msgstr "trasigt manus: \"%s\""

7933

7902 -#: sequencer.c:3012 sequencer.c:4869

7934 +#: sequencer.c:3012 sequencer.c:4868

7935 msgid "empty commit set passed"

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

7937

@@ -7930,7 +7962,7 @@ msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

7962 msgid "could not lock HEAD"

7963 msgstr "kunde inte låsa HEAD"

7964

7933 -#: sequencer.c:3125 sequencer.c:4582

7965 +#: sequencer.c:3125 sequencer.c:4581

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

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

7968

@@ -7942,7 +7974,7 @@ msgstr "kan inte bestämma HEAD"

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

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

7976

7945 -#: sequencer.c:3159 builtin/grep.c:759

7977 +#: sequencer.c:3159 builtin/grep.c:758

7978 #, c-format

7979 msgid "cannot open '%s'"

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

@@ -7992,7 +8024,7 @@ msgstr ""

8024 "har du redan checkat in?\n"

8025 "testa \"git %s --continue\""

8026

7995 -#: sequencer.c:3411 sequencer.c:4473

8027 +#: sequencer.c:3411 sequencer.c:4472

8028 msgid "cannot read HEAD"

8029 msgstr "kan inte läsa HEAD"

8030

@@ -8076,90 +8108,90 @@ msgstr ""

8108 "\tgit rebase --continue\n"

8109 "\n"

8110

8079 -#: sequencer.c:3571

8111 +#: sequencer.c:3572

8112 #, c-format

8113 msgid "illegal label name: '%.*s'"

8114 msgstr "ogiltigt etikettnamn: \"%.*s\""

8115

8084 -#: sequencer.c:3625

8116 +#: sequencer.c:3645

8117 msgid "writing fake root commit"

8118 msgstr "skriver fejkad rotincheckning"

8119

8088 -#: sequencer.c:3630

8120 +#: sequencer.c:3650

8121 msgid "writing squash-onto"

8122 msgstr "skriver squash-onto"

8123

8092 -#: sequencer.c:3714

8124 +#: sequencer.c:3734

8125 #, c-format

8126 msgid "could not resolve '%s'"

8127 msgstr "kunde inte upplösa \"%s\""

8128

8097 -#: sequencer.c:3747

8129 +#: sequencer.c:3767

8130 msgid "cannot merge without a current revision"

8131 msgstr "kan inte slå ihop utan en aktuell incheckning"

8132

8101 -#: sequencer.c:3769

8133 +#: sequencer.c:3789

8134 #, c-format

8135 msgid "unable to parse '%.*s'"

8136 msgstr "kan inte tolka \"%.*s\""

8137

8106 -#: sequencer.c:3778

8138 +#: sequencer.c:3798

8139 #, c-format

8140 msgid "nothing to merge: '%.*s'"

8141 msgstr "inget att slå samman: \"%.*s\""

8142

8111 -#: sequencer.c:3790

8143 +#: sequencer.c:3810

8144 msgid "octopus merge cannot be executed on top of a [new root]"

8145 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

8146

8115 -#: sequencer.c:3806

8147 +#: sequencer.c:3826

8148 #, c-format

8149 msgid "could not get commit message of '%s'"

8150 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

8151

8120 -#: sequencer.c:3989

8152 +#: sequencer.c:4009

8153 #, c-format

8154 msgid "could not even attempt to merge '%.*s'"

8155 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

8156

8125 -#: sequencer.c:4005

8157 +#: sequencer.c:4025

8158 msgid "merge: Unable to write new index file"

8159 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

8160

8129 -#: sequencer.c:4079

8161 +#: sequencer.c:4099

8162 msgid "Cannot autostash"

8163 msgstr "Kan inte utföra \"autostash\""

8164

8133 -#: sequencer.c:4082

8165 +#: sequencer.c:4102

8166 #, c-format

8167 msgid "Unexpected stash response: '%s'"

8168 msgstr "Oväntat svar från stash: \"%s\""

8169

8138 -#: sequencer.c:4088

8170 +#: sequencer.c:4108

8171 #, c-format

8172 msgid "Could not create directory for '%s'"

8173 msgstr "Kunde inte skapa katalog för \"%s\""

8174

8143 -#: sequencer.c:4091

8175 +#: sequencer.c:4111

8176 #, c-format

8177 msgid "Created autostash: %s\n"

8178 msgstr "Skapade autostash: %s\n"

8179

8148 -#: sequencer.c:4095

8180 +#: sequencer.c:4115

8181 msgid "could not reset --hard"

8182 msgstr "kunde inte utföra \"reset --hard\""

8183

8152 -#: sequencer.c:4120

8184 +#: sequencer.c:4140

8185 #, c-format

8186 msgid "Applied autostash.\n"

8187 msgstr "Tillämpade autostash.\n"

8188

8157 -#: sequencer.c:4132

8189 +#: sequencer.c:4152

8190 #, c-format

8191 msgid "cannot store %s"

8192 msgstr "kan inte spara %s"

8193

8162 -#: sequencer.c:4135

8194 +#: sequencer.c:4155

8195 #, c-format

8196 msgid ""

8197 "%s\n"

@@ -8170,29 +8202,29 @@ msgstr ""

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

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

8204

8173 -#: sequencer.c:4140

8205 +#: sequencer.c:4160

8206 msgid "Applying autostash resulted in conflicts."

8207 msgstr "Tillämpning av autostash gav konflikter."

8208

8177 -#: sequencer.c:4141

8209 +#: sequencer.c:4161

8210 msgid "Autostash exists; creating a new stash entry."

8211 msgstr "Autostash finns; skapar ny stash-post."

8212

8181 -#: sequencer.c:4234 git-rebase--preserve-merges.sh:769

8213 +#: sequencer.c:4233 git-rebase--preserve-merges.sh:769

8214 msgid "could not detach HEAD"

8215 msgstr "kunde inte koppla från HEAD"

8216

8185 -#: sequencer.c:4249

8217 +#: sequencer.c:4248

8218 #, c-format

8219 msgid "Stopped at HEAD\n"

8220 msgstr "Stoppade på HEAD\n"

8221

8190 -#: sequencer.c:4251

8222 +#: sequencer.c:4250

8223 #, c-format

8224 msgid "Stopped at %s\n"

8225 msgstr "Stoppade på %s\n"

8226

8195 -#: sequencer.c:4259

8227 +#: sequencer.c:4258

8228 #, c-format

8229 msgid ""

8230 "Could not execute the todo command\n"

@@ -8213,58 +8245,58 @@ msgstr ""

8245 " git rebase --edit-todo\n"

8246 " git rebase --continue\n"

8247

8216 -#: sequencer.c:4305

8248 +#: sequencer.c:4304

8249 #, c-format

8250 msgid "Rebasing (%d/%d)%s"

8251 msgstr "Ombaserar (%d/%d)%s"

8252

8221 -#: sequencer.c:4351

8253 +#: sequencer.c:4350

8254 #, c-format

8255 msgid "Stopped at %s... %.*s\n"

8256 msgstr "Stoppade på %s... %.*s\n"

8257

8226 -#: sequencer.c:4422

8258 +#: sequencer.c:4421

8259 #, c-format

8260 msgid "unknown command %d"

8261 msgstr "okänt kommando %d"

8262

8231 -#: sequencer.c:4481

8263 +#: sequencer.c:4480

8264 msgid "could not read orig-head"

8265 msgstr "kunde inte läsa orig-head"

8266

8235 -#: sequencer.c:4486

8267 +#: sequencer.c:4485

8268 msgid "could not read 'onto'"

8269 msgstr "kunde inte läsa \"onto\""

8270

8239 -#: sequencer.c:4500

8271 +#: sequencer.c:4499

8272 #, c-format

8273 msgid "could not update HEAD to %s"

8274 msgstr "kunde inte uppdatera HEAD till %s"

8275

8244 -#: sequencer.c:4560

8276 +#: sequencer.c:4559

8277 #, c-format

8278 msgid "Successfully rebased and updated %s.\n"

8279 msgstr "Lyckades ombasera och uppdatera %s.\n"

8280

8249 -#: sequencer.c:4612

8281 +#: sequencer.c:4611

8282 msgid "cannot rebase: You have unstaged changes."

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

8284

8253 -#: sequencer.c:4621

8285 +#: sequencer.c:4620

8286 msgid "cannot amend non-existing commit"

8287 msgstr "kan inte lägga till incheckning som inte finns"

8288

8257 -#: sequencer.c:4623

8289 +#: sequencer.c:4622

8290 #, c-format

8291 msgid "invalid file: '%s'"

8292 msgstr "ogiltig fil: \"%s\""

8293

8262 -#: sequencer.c:4625

8294 +#: sequencer.c:4624

8295 #, c-format

8296 msgid "invalid contents: '%s'"

8297 msgstr "ogiltigt innehåll: \"%s\""

8298

8267 -#: sequencer.c:4628

8299 +#: sequencer.c:4627

8300 msgid ""

8301 "\n"

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

@@ -8274,50 +8306,50 @@ msgstr ""

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

8307 "först och kör sedan \"git rebase --continue\" igen."

8308

8277 -#: sequencer.c:4664 sequencer.c:4703

8309 +#: sequencer.c:4663 sequencer.c:4702

8310 #, c-format

8311 msgid "could not write file: '%s'"

8312 msgstr "kunde inte skriva fil: \"%s\""

8313

8282 -#: sequencer.c:4719

8314 +#: sequencer.c:4718

8315 msgid "could not remove CHERRY_PICK_HEAD"

8316 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

8317

8286 -#: sequencer.c:4726

8318 +#: sequencer.c:4725

8319 msgid "could not commit staged changes."

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

8321

8290 -#: sequencer.c:4846

8322 +#: sequencer.c:4845

8323 #, c-format

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

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

8326

8295 -#: sequencer.c:4850

8327 +#: sequencer.c:4849

8328 #, c-format

8329 msgid "%s: bad revision"

8330 msgstr "%s: felaktig revision"

8331

8300 -#: sequencer.c:4885

8332 +#: sequencer.c:4884

8333 msgid "can't revert as initial commit"

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

8335

8304 -#: sequencer.c:5362

8336 +#: sequencer.c:5361

8337 msgid "make_script: unhandled options"

8338 msgstr "make_script: flaggor som inte stöds"

8339

8308 -#: sequencer.c:5365

8340 +#: sequencer.c:5364

8341 msgid "make_script: error preparing revisions"

8342 msgstr "make_script: fel när revisioner skulle förberedas"

8343

8312 -#: sequencer.c:5615 sequencer.c:5632

8344 +#: sequencer.c:5614 sequencer.c:5631

8345 msgid "nothing to do"

8346 msgstr "inget att göra"

8347

8316 -#: sequencer.c:5651

8348 +#: sequencer.c:5650

8349 msgid "could not skip unnecessary pick commands"

8350 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"

8351

8320 -#: sequencer.c:5751

8352 +#: sequencer.c:5750

8353 msgid "the script was already rearranged."

8354 msgstr "skriptet har redan omordnats."

8355

@@ -8368,92 +8400,96 @@ msgstr ""

8400 msgid "unable to set up work tree using invalid config"

8401 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"

8402

8371 -#: setup.c:423

8403 +#: setup.c:423 builtin/rev-parse.c:895

8404 msgid "this operation must be run in a work tree"

8405 msgstr "funktionen måste köras i en arbetskatalog"

8406

8375 -#: setup.c:661

8407 +#: setup.c:658

8408 #, c-format

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

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

8411

8380 -#: setup.c:669

8381 -msgid "unknown repository extensions found:"

8382 -msgstr "okända arkivutökningar hittades:"

8412 +#: setup.c:666

8413 +msgid "unknown repository extension found:"

8414 +msgid_plural "unknown repository extensions found:"

8415 +msgstr[0] "okänd arkivutökning hittades:"

8416 +msgstr[1] "okända arkivutökningar hittades:"

8417

8384 -#: setup.c:681

8385 -msgid "repo version is 0, but v1-only extensions found:"

8386 -msgstr "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"

8418 +#: setup.c:680

8419 +msgid "repo version is 0, but v1-only extension found:"

8420 +msgid_plural "repo version is 0, but v1-only extensions found:"

8421 +msgstr[0] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"

8422 +msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"

8423

8388 -#: setup.c:700

8424 +#: setup.c:701

8425 #, c-format

8426 msgid "error opening '%s'"

8427 msgstr "fel vid öppning av \"%s\""

8428

8393 -#: setup.c:702

8429 +#: setup.c:703

8430 #, c-format

8431 msgid "too large to be a .git file: '%s'"

8432 msgstr "för stor för att vara en .git-fil: \"%s\""

8433

8398 -#: setup.c:704

8434 +#: setup.c:705

8435 #, c-format

8436 msgid "error reading %s"

8437 msgstr "fel vid läsning av %s"

8438

8403 -#: setup.c:706

8439 +#: setup.c:707

8440 #, c-format

8441 msgid "invalid gitfile format: %s"

8442 msgstr "ogiltigt gitfilformat: %s"

8443

8408 -#: setup.c:708

8444 +#: setup.c:709

8445 #, c-format

8446 msgid "no path in gitfile: %s"

8447 msgstr "ingen sökväg i gitfil: %s"

8448

8413 -#: setup.c:710

8449 +#: setup.c:711

8450 #, c-format

8451 msgid "not a git repository: %s"

8452 msgstr "inte ett git-arkiv: %s"

8453

8418 -#: setup.c:812

8454 +#: setup.c:813

8455 #, c-format

8456 msgid "'$%s' too big"

8457 msgstr "\"$%s\" för stor"

8458

8423 -#: setup.c:826

8459 +#: setup.c:827

8460 #, c-format

8461 msgid "not a git repository: '%s'"

8462 msgstr "inte ett git-arkiv: \"%s\""

8463

8428 -#: setup.c:855 setup.c:857 setup.c:888

8464 +#: setup.c:856 setup.c:858 setup.c:889

8465 #, c-format

8466 msgid "cannot chdir to '%s'"

8467 msgstr "kan inte byta katalog (chdir) till \"%s\""

8468

8433 -#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973

8469 +#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974

8470 msgid "cannot come back to cwd"

8471 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"

8472

8437 -#: setup.c:987

8473 +#: setup.c:988

8474 #, c-format

8475 msgid "failed to stat '%*s%s%s'"

8476 msgstr "misslyckades ta status på \"%*ss%s%s\""

8477

8442 -#: setup.c:1225

8478 +#: setup.c:1231

8479 msgid "Unable to read current working directory"

8480 msgstr "Kan inte läsa aktuell arbetskatalog"

8481

8446 -#: setup.c:1234 setup.c:1240

8482 +#: setup.c:1240 setup.c:1246

8483 #, c-format

8484 msgid "cannot change to '%s'"

8485 msgstr "kan inte byta till \"%s\""

8486

8451 -#: setup.c:1245

8487 +#: setup.c:1251

8488 #, c-format

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

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

8491

8456 -#: setup.c:1251

8492 +#: setup.c:1257

8493 #, c-format

8494 msgid ""

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

@@ -8463,7 +8499,7 @@ msgstr ""

8499 "monteringspunkten %s)\n"

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

8501

8466 -#: setup.c:1370

8502 +#: setup.c:1381

8503 #, c-format

8504 msgid ""

8505 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -8472,27 +8508,27 @@ msgstr ""

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

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

8510

8475 -#: setup.c:1417

8511 +#: setup.c:1430

8512 msgid "open /dev/null or dup failed"

8513 msgstr "misslyckades öppna /dev/null eller \"dup\""

8514

8479 -#: setup.c:1432

8515 +#: setup.c:1445

8516 msgid "fork failed"

8517 msgstr "\"fork\" misslyckades"

8518

8483 -#: setup.c:1437 t/helper/test-simple-ipc.c:285

8519 +#: setup.c:1450 t/helper/test-simple-ipc.c:285

8520 msgid "setsid failed"

8521 msgstr "\"setsid\" misslyckades"

8522

8487 -#: sparse-index.c:151

8523 +#: sparse-index.c:162

8524 msgid "attempting to use sparse-index without cone mode"

8525 msgstr "försöker använda glest index utan \"cone\"-läge"

8526

8491 -#: sparse-index.c:156

8527 +#: sparse-index.c:174

8528 msgid "unable to update cache-tree, staying full"

8529 msgstr "kan inte uppdatera cacheträd, behåller fullt läge"

8530

8495 -#: sparse-index.c:239

8531 +#: sparse-index.c:261

8532 #, c-format

8533 msgid "index entry is a directory, but not sparse (%08x)"

8534 msgstr "indexposten är en katalog, men inte gles (%08x)"

@@ -8549,7 +8585,7 @@ msgid_plural "%u bytes/s"

8585 msgstr[0] "%u byte/s"

8586 msgstr[1] "%u bytes/s"

8587

8552 -#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:737

8588 +#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738

8589 #: builtin/rebase.c:866

8590 #, c-format

8591 msgid "could not open '%s' for writing"

@@ -8619,7 +8655,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

8655 msgid "bad --ignore-submodules argument: %s"

8656 msgstr "felaktigt argument till --ignore-submodules: %s"

8657

8622 -#: submodule.c:818

8658 +#: submodule.c:805

8659 #, c-format

8660 msgid ""

8661 "Submodule in commit %s at path: '%s' collides with a submodule named the "

@@ -8628,12 +8664,12 @@ msgstr ""

8664 "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "

8665 "med samma namn. Hoppar över den."

8666

8631 -#: submodule.c:921

8667 +#: submodule.c:908

8668 #, c-format

8669 msgid "submodule entry '%s' (%s) is a %s, not a commit"

8670 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

8671

8636 -#: submodule.c:1006

8672 +#: submodule.c:993

8673 #, c-format

8674 msgid ""

8675 "Could not run 'git rev-list <commits> --not --remotes -n 1' command in "

@@ -8642,36 +8678,36 @@ msgstr ""

8678 "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "

8679 "undermodulen \"%s\""

8680

8645 -#: submodule.c:1129

8681 +#: submodule.c:1116

8682 #, c-format

8683 msgid "process for submodule '%s' failed"

8684 msgstr "process för undermodulen \"%s\" misslyckades"

8685

8650 -#: submodule.c:1158 builtin/branch.c:691 builtin/submodule--helper.c:2470

8686 +#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469

8687 msgid "Failed to resolve HEAD as a valid ref."

8688 msgstr "Misslyckades slå upp HEAD som giltig referens."

8689

8654 -#: submodule.c:1169

8690 +#: submodule.c:1156

8691 #, c-format

8692 msgid "Pushing submodule '%s'\n"

8693 msgstr "Sänder undermodulen \"%s\"\n"

8694

8659 -#: submodule.c:1172

8695 +#: submodule.c:1159

8696 #, c-format

8697 msgid "Unable to push submodule '%s'\n"

8698 msgstr "Kunde inte sända undermodulen \"%s\"\n"

8699

8664 -#: submodule.c:1464

8700 +#: submodule.c:1451

8701 #, c-format

8702 msgid "Fetching submodule %s%s\n"

8703 msgstr "Hämtar undermodulen %s%s\n"

8704

8669 -#: submodule.c:1498

8705 +#: submodule.c:1485

8706 #, c-format

8707 msgid "Could not access submodule '%s'\n"

8708 msgstr "Kunde inte komma åt undermodulen \"%s\"\n"

8709

8674 -#: submodule.c:1653

8710 +#: submodule.c:1640

8711 #, c-format

8712 msgid ""

8713 "Errors during submodule fetch:\n"

@@ -8680,61 +8716,61 @@ msgstr ""

8716 "Fel vid hämtning av undermodul:\n"

8717 "%s"

8718

8683 -#: submodule.c:1678

8719 +#: submodule.c:1665

8720 #, c-format

8721 msgid "'%s' not recognized as a git repository"

8722 msgstr "\"%s\" känns inte igen som ett git-arkiv"

8723

8688 -#: submodule.c:1695

8724 +#: submodule.c:1682

8725 #, c-format

8726 msgid "Could not run 'git status --porcelain=2' in submodule %s"

8727 msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""

8728

8693 -#: submodule.c:1736

8729 +#: submodule.c:1723

8730 #, c-format

8731 msgid "'git status --porcelain=2' failed in submodule %s"

8732 msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""

8733

8698 -#: submodule.c:1811

8734 +#: submodule.c:1798

8735 #, c-format

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

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

8738

8703 -#: submodule.c:1824

8739 +#: submodule.c:1811

8740 #, c-format

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

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

8743

8708 -#: submodule.c:1839

8744 +#: submodule.c:1826

8745 #, c-format

8746 msgid "Could not unset core.worktree setting in submodule '%s'"

8747 msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""

8748

8713 -#: submodule.c:1866 submodule.c:2176

8749 +#: submodule.c:1853 submodule.c:2163

8750 #, c-format

8751 msgid "could not recurse into submodule '%s'"

8752 msgstr "kunde inte rekursera in i undermodulen \"%s\""

8753

8718 -#: submodule.c:1887

8754 +#: submodule.c:1874

8755 msgid "could not reset submodule index"

8756 msgstr "kunde inte återställa indexet i undermodul"

8757

8722 -#: submodule.c:1929

8758 +#: submodule.c:1916

8759 #, c-format

8760 msgid "submodule '%s' has dirty index"

8761 msgstr "undermodulen \"%s\" har ett smutsigt index"

8762

8727 -#: submodule.c:1981

8763 +#: submodule.c:1968

8764 #, c-format

8765 msgid "Submodule '%s' could not be updated."

8766 msgstr "Undermoduler \"%s\" kunde inte uppdateras."

8767

8732 -#: submodule.c:2049

8768 +#: submodule.c:2036

8769 #, c-format

8770 msgid "submodule git dir '%s' is inside git dir '%.*s'"

8771 msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""

8772

8737 -#: submodule.c:2070

8773 +#: submodule.c:2057

8774 #, c-format

8775 msgid ""

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

@@ -8742,17 +8778,17 @@ msgstr ""

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

8779 "stöds ej"

8780

8745 -#: submodule.c:2082 submodule.c:2141

8781 +#: submodule.c:2069 submodule.c:2128

8782 #, c-format

8783 msgid "could not lookup name for submodule '%s'"

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

8785

8750 -#: submodule.c:2086

8786 +#: submodule.c:2073

8787 #, c-format

8788 msgid "refusing to move '%s' into an existing git dir"

8789 msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"

8790

8755 -#: submodule.c:2093

8791 +#: submodule.c:2080

8792 #, c-format

8793 msgid ""

8794 "Migrating git directory of '%s%s' from\n"

@@ -8763,11 +8799,11 @@ msgstr ""

8799 "\"%s\" till\n"

8800 "\"%s\"\n"

8801

8766 -#: submodule.c:2221

8802 +#: submodule.c:2208

8803 msgid "could not start ls-files in .."

8804 msgstr "kunde inte starta ls-files i .."

8805

8770 -#: submodule.c:2261

8806 +#: submodule.c:2248

8807 #, c-format

8808 msgid "ls-tree returned unexpected return code %d"

8809 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -8804,7 +8840,7 @@ msgstr "tom släpradssymbol i släpraden \"%.*s\""

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

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

8842

8807 -#: trailer.c:766 builtin/mktag.c:88

8843 +#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577

8844 msgid "could not read from stdin"

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

8846

@@ -8896,7 +8932,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"

8932 msgid "invalid remote service path"

8933 msgstr "felaktig sökväg till fjärrtjänst"

8934

8899 -#: transport-helper.c:661 transport.c:1471

8935 +#: transport-helper.c:661 transport.c:1477

8936 msgid "operation not supported by protocol"

8937 msgstr "funktionen stöds inte av protokollet"

8938

@@ -8905,7 +8941,7 @@ msgstr "funktionen stöds inte av protokollet"

8941 msgid "can't connect to subservice %s"

8942 msgstr "kan inte ansluta till undertjänsten %s"

8943

8908 -#: transport-helper.c:693 transport.c:397

8944 +#: transport-helper.c:693 transport.c:400

8945 msgid "--negotiate-only requires protocol v2"

8946 msgstr "--negotiate-only kräver protokoll v2"

8947

@@ -9038,46 +9074,46 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

9074 msgid "could not read bundle '%s'"

9075 msgstr "kunde inte läsa paketet (bundlen) \"%s\""

9076

9041 -#: transport.c:220

9077 +#: transport.c:223

9078 #, c-format

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

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

9081

9046 -#: transport.c:272

9082 +#: transport.c:275

9083 msgid "see protocol.version in 'git help config' for more details"

9084 msgstr "se protocol.version i \"git help config\" för mer information"

9085

9050 -#: transport.c:273

9086 +#: transport.c:276

9087 msgid "server options require protocol version 2 or later"

9088 msgstr "serverflaggor kräver protokollversion 2 eller senare"

9089

9054 -#: transport.c:400

9090 +#: transport.c:403

9091 msgid "server does not support wait-for-done"

9092 msgstr "servern stöder inte wait-for-done"

9093

9058 -#: transport.c:751

9094 +#: transport.c:755

9095 msgid "could not parse transport.color.* config"

9096 msgstr "kunde inte tolka inställningen för transport.color.*"

9097

9062 -#: transport.c:826

9098 +#: transport.c:830

9099 msgid "support for protocol v2 not implemented yet"

9100 msgstr "stöd för protokoll v2 ännu ej implementerat"

9101

9066 -#: transport.c:960

9102 +#: transport.c:965

9103 #, c-format

9104 msgid "unknown value for config '%s': %s"

9105 msgstr "okänt värde för inställningen \"%s\": %s"

9106

9071 -#: transport.c:1026

9107 +#: transport.c:1031

9108 #, c-format

9109 msgid "transport '%s' not allowed"

9110 msgstr "transporten \"%s\" tillåts inte"

9111

9076 -#: transport.c:1079

9112 +#: transport.c:1084

9113 msgid "git-over-rsync is no longer supported"

9114 msgstr "git-over-rsync stöds inte längre"

9115

9080 -#: transport.c:1181

9116 +#: transport.c:1187

9117 #, c-format

9118 msgid ""

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

@@ -9086,7 +9122,7 @@ msgstr ""

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

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

9124

9089 -#: transport.c:1185

9125 +#: transport.c:1191

9126 #, c-format

9127 msgid ""

9128 "\n"

@@ -9113,11 +9149,11 @@ msgstr ""

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

9150 "\n"

9151

9116 -#: transport.c:1193

9152 +#: transport.c:1199

9153 msgid "Aborting."

9154 msgstr "Avbryter."

9155

9120 -#: transport.c:1340

9156 +#: transport.c:1346

9157 msgid "failed to push all needed submodules"

9158 msgstr "kunde inte sända alla nödvändiga undermoduler"

9159

@@ -9392,11 +9428,11 @@ msgstr ""

9428 "sökvägar på ett okänsligt filsystem) och endast en från samma\n"

9429 "kollisionsgrupp finns i arbetskatalogen:\n"

9430

9395 -#: unpack-trees.c:1519

9431 +#: unpack-trees.c:1618

9432 msgid "Updating index flags"

9433 msgstr "Uppdaterar indexflaggor"

9434

9399 -#: unpack-trees.c:2608

9435 +#: unpack-trees.c:2707

9436 #, c-format

9437 msgid "worktree and untracked commit have duplicate entries: %s"

9438 msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"

@@ -9438,99 +9474,99 @@ msgstr "felaktigt \"..\"-sökvägssegment"

9474 msgid "Fetching objects"

9475 msgstr "Hämtar objekt"

9476

9441 -#: worktree.c:238 builtin/am.c:2151

9477 +#: worktree.c:236 builtin/am.c:2152

9478 #, c-format

9479 msgid "failed to read '%s'"

9480 msgstr "misslyckades läsa \"%s\""

9481

9446 -#: worktree.c:304

9482 +#: worktree.c:303

9483 #, c-format

9484 msgid "'%s' at main working tree is not the repository directory"

9485 msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"

9486

9451 -#: worktree.c:315

9487 +#: worktree.c:314

9488 #, c-format

9489 msgid "'%s' file does not contain absolute path to the working tree location"

9490 msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"

9491

9456 -#: worktree.c:327

9492 +#: worktree.c:326

9493 #, c-format

9494 msgid "'%s' does not exist"

9495 msgstr "\"%s\" finns inte"

9496

9461 -#: worktree.c:333

9497 +#: worktree.c:332

9498 #, c-format

9499 msgid "'%s' is not a .git file, error code %d"

9500 msgstr "\"%s\" är inte en .git-fil, felkod %d"

9501

9466 -#: worktree.c:342

9502 +#: worktree.c:341

9503 #, c-format

9504 msgid "'%s' does not point back to '%s'"

9505 msgstr "\"%s\" pekar inte tillbaka till \"%s\""

9506

9471 -#: worktree.c:608

9507 +#: worktree.c:603

9508 msgid "not a directory"

9509 msgstr "inte en katalog"

9510

9475 -#: worktree.c:617

9511 +#: worktree.c:612

9512 msgid ".git is not a file"

9513 msgstr ".git är inte en fil"

9514

9479 -#: worktree.c:619

9515 +#: worktree.c:614

9516 msgid ".git file broken"

9517 msgstr ".git-filen är trasig"

9518

9483 -#: worktree.c:621

9519 +#: worktree.c:616

9520 msgid ".git file incorrect"

9521 msgstr ".git-filen är felaktig"

9522

9487 -#: worktree.c:727

9523 +#: worktree.c:722

9524 msgid "not a valid path"

9525 msgstr "inte en giltig sökväg"

9526

9491 -#: worktree.c:733

9527 +#: worktree.c:728

9528 msgid "unable to locate repository; .git is not a file"

9529 msgstr "hittar inte arkivet; .git är inte en fil"

9530

9495 -#: worktree.c:737

9531 +#: worktree.c:732

9532 msgid "unable to locate repository; .git file does not reference a repository"

9533 msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"

9534

9499 -#: worktree.c:741

9535 +#: worktree.c:736

9536 msgid "unable to locate repository; .git file broken"

9537 msgstr "hittar inte arkivet; .git-filen är trasig"

9538

9503 -#: worktree.c:747

9539 +#: worktree.c:742

9540 msgid "gitdir unreadable"

9541 msgstr "gitdir är oläsbar"

9542

9507 -#: worktree.c:751

9543 +#: worktree.c:746

9544 msgid "gitdir incorrect"

9545 msgstr "gitdir är felaktig"

9546

9511 -#: worktree.c:776

9547 +#: worktree.c:771

9548 msgid "not a valid directory"

9549 msgstr "inte i en giltig katalog"

9550

9515 -#: worktree.c:782

9551 +#: worktree.c:777

9552 msgid "gitdir file does not exist"

9553 msgstr "gitdir-filen existerar inte"

9554

9519 -#: worktree.c:787 worktree.c:796

9555 +#: worktree.c:782 worktree.c:791

9556 #, c-format

9557 msgid "unable to read gitdir file (%s)"

9558 msgstr "kunde inte läsa gitdir-filen (%s)"

9559

9524 -#: worktree.c:806

9560 +#: worktree.c:801

9561 #, c-format

9562 msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"

9563 msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"

9564

9529 -#: worktree.c:814

9565 +#: worktree.c:809

9566 msgid "invalid gitdir file"

9567 msgstr "ogiltig gitdir-fil"

9568

9533 -#: worktree.c:822

9569 +#: worktree.c:817

9570 msgid "gitdir file points to non-existent location"

9571 msgstr "gitdir-filen pekar på en ickeexisterande plats"

9572

@@ -9579,11 +9615,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)

9615 msgid " (use \"git rm <file>...\" to mark resolution)"

9616 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

9617

9582 -#: wt-status.c:211 wt-status.c:1075

9618 +#: wt-status.c:211 wt-status.c:1125

9619 msgid "Changes to be committed:"

9620 msgstr "Ändringar att checka in:"

9621

9586 -#: wt-status.c:234 wt-status.c:1084

9622 +#: wt-status.c:234 wt-status.c:1134

9623 msgid "Changes not staged for commit:"

9624 msgstr "Ändringar ej i incheckningskön:"

9625

@@ -9686,22 +9722,22 @@ msgstr "ändrat innehåll, "

9722 msgid "untracked content, "

9723 msgstr "ospårat innehåll, "

9724

9689 -#: wt-status.c:908

9725 +#: wt-status.c:958

9726 #, c-format

9727 msgid "Your stash currently has %d entry"

9728 msgid_plural "Your stash currently has %d entries"

9729 msgstr[0] "Stashen innehåller just nu %d post"

9730 msgstr[1] "Stashen innehåller just nu %d poster"

9731

9696 -#: wt-status.c:939

9732 +#: wt-status.c:989

9733 msgid "Submodules changed but not updated:"

9734 msgstr "Undermoduler ändrade men inte uppdaterade:"

9735

9700 -#: wt-status.c:941

9736 +#: wt-status.c:991

9737 msgid "Submodule changes to be committed:"

9738 msgstr "Undermodulers ändringar att checka in:"

9739

9704 -#: wt-status.c:1023

9740 +#: wt-status.c:1073

9741 msgid ""

9742 "Do not modify or remove the line above.\n"

9743 "Everything below it will be ignored."

@@ -9709,7 +9745,7 @@ msgstr ""

9745 "Raden ovan får inte ändras eller tas bort.\n"

9746 "Allt under den kommer tas bort."

9747

9712 -#: wt-status.c:1115

9748 +#: wt-status.c:1165

9749 #, c-format

9750 msgid ""

9751 "\n"

@@ -9720,107 +9756,107 @@ msgstr ""

9756 "Det tog %.2f sekunder att räkna före/bakom-värden.\n"

9757 "Du kan använda \"--no-ahead-behind\" för undvika detta.\n"

9758

9723 -#: wt-status.c:1145

9759 +#: wt-status.c:1195

9760 msgid "You have unmerged paths."

9761 msgstr "Du har ej sammanslagna sökvägar."

9762

9727 -#: wt-status.c:1148

9763 +#: wt-status.c:1198

9764 msgid " (fix conflicts and run \"git commit\")"

9765 msgstr " (rätta konflikter och kör \"git commit\")"

9766

9731 -#: wt-status.c:1150

9767 +#: wt-status.c:1200

9768 msgid " (use \"git merge --abort\" to abort the merge)"

9769 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

9770

9735 -#: wt-status.c:1154

9771 +#: wt-status.c:1204

9772 msgid "All conflicts fixed but you are still merging."

9773 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

9774

9739 -#: wt-status.c:1157

9775 +#: wt-status.c:1207

9776 msgid " (use \"git commit\" to conclude merge)"

9777 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

9778

9743 -#: wt-status.c:1166

9779 +#: wt-status.c:1216

9780 msgid "You are in the middle of an am session."

9781 msgstr "Du är i mitten av en körning av \"git am\"."

9782

9747 -#: wt-status.c:1169

9783 +#: wt-status.c:1219

9784 msgid "The current patch is empty."

9785 msgstr "Aktuell patch är tom."

9786

9751 -#: wt-status.c:1173

9787 +#: wt-status.c:1223

9788 msgid " (fix conflicts and then run \"git am --continue\")"

9789 msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

9790

9755 -#: wt-status.c:1175

9791 +#: wt-status.c:1225

9792 msgid " (use \"git am --skip\" to skip this patch)"

9793 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

9794

9759 -#: wt-status.c:1177

9795 +#: wt-status.c:1227

9796 msgid " (use \"git am --abort\" to restore the original branch)"

9797 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

9798

9763 -#: wt-status.c:1310

9799 +#: wt-status.c:1360

9800 msgid "git-rebase-todo is missing."

9801 msgstr "git-rebase-todo saknas."

9802

9767 -#: wt-status.c:1312

9803 +#: wt-status.c:1362

9804 msgid "No commands done."

9805 msgstr "Inga kommandon utförda."

9806

9771 -#: wt-status.c:1315

9807 +#: wt-status.c:1365

9808 #, c-format

9809 msgid "Last command done (%d command done):"

9810 msgid_plural "Last commands done (%d commands done):"

9811 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

9812 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

9813

9778 -#: wt-status.c:1326

9814 +#: wt-status.c:1376

9815 #, c-format

9816 msgid " (see more in file %s)"

9817 msgstr " (se fler i filen %s)"

9818

9783 -#: wt-status.c:1331

9819 +#: wt-status.c:1381

9820 msgid "No commands remaining."

9821 msgstr "Inga kommandon återstår."

9822

9787 -#: wt-status.c:1334

9823 +#: wt-status.c:1384

9824 #, c-format

9825 msgid "Next command to do (%d remaining command):"

9826 msgid_plural "Next commands to do (%d remaining commands):"

9827 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

9828 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

9829

9794 -#: wt-status.c:1342

9830 +#: wt-status.c:1392

9831 msgid " (use \"git rebase --edit-todo\" to view and edit)"

9832 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

9833

9798 -#: wt-status.c:1354

9834 +#: wt-status.c:1404

9835 #, c-format

9836 msgid "You are currently rebasing branch '%s' on '%s'."

9837 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

9838

9803 -#: wt-status.c:1359

9839 +#: wt-status.c:1409

9840 msgid "You are currently rebasing."

9841 msgstr "Du håller på med en ombasering."

9842

9807 -#: wt-status.c:1372

9843 +#: wt-status.c:1422

9844 msgid " (fix conflicts and then run \"git rebase --continue\")"

9845 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

9846

9811 -#: wt-status.c:1374

9847 +#: wt-status.c:1424

9848 msgid " (use \"git rebase --skip\" to skip this patch)"

9849 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

9850

9815 -#: wt-status.c:1376

9851 +#: wt-status.c:1426

9852 msgid " (use \"git rebase --abort\" to check out the original branch)"

9853 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

9854

9819 -#: wt-status.c:1383

9855 +#: wt-status.c:1433

9856 msgid " (all conflicts fixed: run \"git rebase --continue\")"

9857 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

9858

9823 -#: wt-status.c:1387

9859 +#: wt-status.c:1437

9860 #, c-format

9861 msgid ""

9862 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -9828,155 +9864,159 @@ msgstr ""

9864 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

9865 "ovanpå \"%s\"."

9866

9831 -#: wt-status.c:1392

9867 +#: wt-status.c:1442

9868 msgid "You are currently splitting a commit during a rebase."

9869 msgstr "Du håller på att dela upp en incheckning i en ombasering."

9870

9835 -#: wt-status.c:1395

9871 +#: wt-status.c:1445

9872 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

9873 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

9874

9839 -#: wt-status.c:1399

9875 +#: wt-status.c:1449

9876 #, c-format

9877 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

9878 msgstr ""

9879 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

9880 "ovanpå \"%s\"."

9881

9846 -#: wt-status.c:1404

9882 +#: wt-status.c:1454

9883 msgid "You are currently editing a commit during a rebase."

9884 msgstr "Du håller på att redigera en incheckning under en ombasering."

9885

9850 -#: wt-status.c:1407

9886 +#: wt-status.c:1457

9887 msgid " (use \"git commit --amend\" to amend the current commit)"

9888 msgstr ""

9889 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

9890

9855 -#: wt-status.c:1409

9891 +#: wt-status.c:1459

9892 msgid ""

9893 " (use \"git rebase --continue\" once you are satisfied with your changes)"

9894 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

9895

9860 -#: wt-status.c:1420

9896 +#: wt-status.c:1470

9897 msgid "Cherry-pick currently in progress."

9898 msgstr "Cherry-pick pågår."

9899

9864 -#: wt-status.c:1423

9900 +#: wt-status.c:1473

9901 #, c-format

9902 msgid "You are currently cherry-picking commit %s."

9903 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

9904

9869 -#: wt-status.c:1430

9905 +#: wt-status.c:1480

9906 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

9907 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

9908

9873 -#: wt-status.c:1433

9909 +#: wt-status.c:1483

9910 msgid " (run \"git cherry-pick --continue\" to continue)"

9911 msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"

9912

9877 -#: wt-status.c:1436

9913 +#: wt-status.c:1486

9914 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

9915 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

9916

9881 -#: wt-status.c:1438

9917 +#: wt-status.c:1488

9918 msgid " (use \"git cherry-pick --skip\" to skip this patch)"

9919 msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)"

9920

9885 -#: wt-status.c:1440

9921 +#: wt-status.c:1490

9922 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

9923 msgstr ""

9924 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

9925 "operationen)"

9926

9891 -#: wt-status.c:1450

9927 +#: wt-status.c:1500

9928 msgid "Revert currently in progress."

9929 msgstr "Ångring pågår."

9930

9895 -#: wt-status.c:1453

9931 +#: wt-status.c:1503

9932 #, c-format

9933 msgid "You are currently reverting commit %s."

9934 msgstr "Du håller på med att ångra incheckningen %s."

9935

9900 -#: wt-status.c:1459

9936 +#: wt-status.c:1509

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