aa4e5fe40f · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2013-04-30 08:25+0800\n"

11 -"PO-Revision-Date: 2013-04-30 12:22+0100\n"

10 +"POT-Creation-Date: 2013-08-06 14:10+0800\n"

11 +"PO-Revision-Date: 2013-08-06 12:37+0100\n"

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

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

14 "Language: sv\n"

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

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

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

19

20 -#: advice.c:53

20 +#: advice.c:57

21 #, c-format

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

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

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

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

27 #. * other commands doing a merge do.

28 #.

29 -#: advice.c:83

29 +#: advice.c:87

30 msgid ""

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

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

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

65 msgid "archive format"

66 msgstr "arkivformat"

67

68 -#: archive.c:324 builtin/log.c:1126

68 +#: archive.c:324 builtin/log.c:1173

69 msgid "prefix"

70 msgstr "prefix"

71

@@ -73,11 +73,11 @@ msgstr "prefix"

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

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

75

76 -#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371

77 -#: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665

78 -#: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77

79 -#: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536

80 -#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149

76 +#: archive.c:326 builtin/archive.c:88 builtin/blame.c:2292

77 +#: builtin/blame.c:2293 builtin/config.c:56 builtin/fast-export.c:673

78 +#: builtin/fast-export.c:675 builtin/grep.c:714 builtin/hash-object.c:77

79 +#: builtin/ls-files.c:496 builtin/ls-files.c:499 builtin/notes.c:408

80 +#: builtin/notes.c:565 builtin/read-tree.c:108 parse-options.h:152

81 msgid "file"

82 msgstr "fil"

83

@@ -109,7 +109,7 @@ msgstr "komprimera bättre"

109 msgid "list supported archive formats"

110 msgstr "visa understödda arkivformat"

111

112 -#: archive.c:345 builtin/archive.c:90 builtin/clone.c:86

112 +#: archive.c:345 builtin/archive.c:90 builtin/clone.c:85

113 msgid "repo"

114 msgstr "arkiv"

115

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

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

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

119

120 -#: archive.c:347 builtin/archive.c:92 builtin/notes.c:615

120 +#: archive.c:347 builtin/archive.c:92 builtin/notes.c:487

121 msgid "command"

122 msgstr "kommando"

123

@@ -204,17 +204,17 @@ msgstr "Det finns redan en gren som heter \"%s\""

204 msgid "Cannot force update the current branch."

205 msgstr "Kan inte tvinga uppdatering av aktuell gren."

206

207 -#: branch.c:201

207 +#: branch.c:216

208 #, c-format

209 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

210 msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."

211

212 -#: branch.c:203

212 +#: branch.c:218

213 #, c-format

214 msgid "the requested upstream branch '%s' does not exist"

215 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"

216

217 -#: branch.c:205

217 +#: branch.c:220

218 msgid ""

219 "\n"

220 "If you are planning on basing your work on an upstream\n"

@@ -234,26 +234,26 @@ msgstr ""

234 "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"

235 "för att ställa in uppströmskonfigurationen när du sänder in."

236

237 -#: branch.c:250

237 +#: branch.c:265

238 #, c-format

239 msgid "Not a valid object name: '%s'."

240 msgstr "Objektnamnet är inte giltigt: \"%s\"."

241

242 -#: branch.c:270

242 +#: branch.c:285

243 #, c-format

244 msgid "Ambiguous object name: '%s'."

245 msgstr "Objektnamnet är tvetydigt: \"%s\"."

246

247 -#: branch.c:275

247 +#: branch.c:290

248 #, c-format

249 msgid "Not a valid branch point: '%s'."

250 msgstr "Avgreningspunkten är inte giltig: \"%s\""

251

252 -#: branch.c:281

252 +#: branch.c:296

253 msgid "Failed to lock ref for update"

254 msgstr "Misslyckades låsa referens för uppdatering"

255

256 -#: branch.c:299

256 +#: branch.c:314

257 msgid "Failed to write ref"

258 msgstr "Misslyckades skriva referens"

259

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

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

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

269

270 -#: bundle.c:89 builtin/commit.c:676

270 +#: bundle.c:89 builtin/commit.c:697

271 #, c-format

272 msgid "could not open '%s'"

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

@@ -276,9 +276,9 @@ msgstr "kunde inte öppna \"%s\""

276 msgid "Repository lacks these prerequisite commits:"

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

278

279 -#: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300

280 -#: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349

281 -#: builtin/shortlog.c:155

279 +#: bundle.c:164 sequencer.c:661 sequencer.c:1111 builtin/log.c:331

280 +#: builtin/log.c:801 builtin/log.c:1399 builtin/log.c:1625 builtin/merge.c:364

281 +#: builtin/shortlog.c:156

282 msgid "revision walk setup failed"

283 msgstr "misslyckades skapa revisionstraversering"

284

@@ -304,7 +304,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

304 msgid "rev-list died"

305 msgstr "rev-list dog"

306

307 -#: bundle.c:300 builtin/log.c:1255 builtin/shortlog.c:258

307 +#: bundle.c:300 builtin/log.c:1310 builtin/shortlog.c:259

308 #, c-format

309 msgid "unrecognized argument: %s"

310 msgstr "okänt argument: %s"

@@ -335,12 +335,12 @@ msgstr "kan inte skapa \"%s\""

335 msgid "index-pack died"

336 msgstr "index-pack dog"

337

338 -#: commit.c:50

338 +#: commit.c:53

339 #, c-format

340 msgid "could not parse %s"

341 msgstr "kunde inte tolka %s"

342

343 -#: commit.c:52

343 +#: commit.c:55

344 #, c-format

345 msgid "%s %s is not a commit!"

346 msgstr "%s %s är inte en incheckning!"

@@ -349,16 +349,16 @@ msgstr "%s %s är inte en incheckning!"

349 msgid "memory exhausted"

350 msgstr "minnet slut"

351

352 -#: connected.c:39

352 +#: connected.c:60

353 msgid "Could not run 'git rev-list'"

354 msgstr "Kunde inte köra \"git rev-list\""

355

356 -#: connected.c:48

356 +#: connected.c:80

357 #, c-format

358 msgid "failed write to rev-list: %s"

359 msgstr "kunde inte skriva till rev-list: %s"

360

361 -#: connected.c:56

361 +#: connected.c:88

362 #, c-format

363 msgid "failed to close rev-list's stdin: %s"

364 msgstr "kunde inte stänga rev-list:s standard in: %s"

@@ -454,7 +454,7 @@ msgstr ""

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

455 "%s"

456

457 -#: diff.c:3481

457 +#: diff.c:3487

458 #, c-format

459 msgid ""

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

@@ -463,7 +463,7 @@ msgstr ""

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

464 "%s"

465

466 -#: diff.c:3495

466 +#: diff.c:3501

467 #, c-format

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

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

@@ -505,20 +505,20 @@ msgstr "\"%s\": %s"

505 msgid "'%s': short read %s"

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

507

508 -#: help.c:212

508 +#: help.c:210

509 #, c-format

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

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

512

513 -#: help.c:219

513 +#: help.c:217

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

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

516

517 -#: help.c:235

517 +#: help.c:233

518 msgid "The most commonly used git commands are:"

519 msgstr "De mest använda git-kommandona är:"

520

521 -#: help.c:292

521 +#: help.c:290

522 #, c-format

523 msgid ""

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

@@ -527,11 +527,11 @@ msgstr ""

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

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

529

530 -#: help.c:349

530 +#: help.c:347

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

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

533

534 -#: help.c:371

534 +#: help.c:369

535 #, c-format

536 msgid ""

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

@@ -540,17 +540,17 @@ msgstr ""

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

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

542

543 -#: help.c:376

543 +#: help.c:374

544 #, c-format

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

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

547

548 -#: help.c:383

548 +#: help.c:381

549 #, c-format

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

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

552

553 -#: help.c:387

553 +#: help.c:385 help.c:444

554 msgid ""

555 "\n"

556 "Did you mean this?"

@@ -564,12 +564,17 @@ msgstr[1] ""

564 "\n"

565 "Menade du ett av dessa?"

566

567 +#: help.c:440

568 +#, c-format

569 +msgid "%s: %s - %s"

570 +msgstr "%s: %s - %s"

571 +

572 #: merge.c:56

573 msgid "failed to read the cache"

574 msgstr "misslyckads läsa cachen"

575

576 #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566

572 -#: builtin/clone.c:645

577 +#: builtin/clone.c:656

578 msgid "unable to write new index file"

579 msgstr "kunde inte skriva ny indexfil"

580

@@ -583,70 +588,70 @@ msgstr "(felaktig incheckning)\n"

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

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

590

586 -#: merge-recursive.c:268

591 +#: merge-recursive.c:269

592 msgid "error building trees"

593 msgstr "fel vid byggande av träd"

594

590 -#: merge-recursive.c:672

595 +#: merge-recursive.c:673

596 #, c-format

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

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

599

595 -#: merge-recursive.c:683

600 +#: merge-recursive.c:684

601 #, c-format

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

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

604

605 #. something else exists

606 #. .. but not some other error (who really cares what?)

602 -#: merge-recursive.c:697 merge-recursive.c:718

607 +#: merge-recursive.c:698 merge-recursive.c:719

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

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

610

606 -#: merge-recursive.c:708

611 +#: merge-recursive.c:709

612 #, c-format

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

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

615

611 -#: merge-recursive.c:748

616 +#: merge-recursive.c:749

617 #, c-format

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

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

620

616 -#: merge-recursive.c:750

621 +#: merge-recursive.c:751

622 #, c-format

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

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

625

621 -#: merge-recursive.c:773 builtin/clone.c:313

626 +#: merge-recursive.c:774 builtin/clone.c:312

627 #, c-format

628 msgid "failed to open '%s'"

629 msgstr "misslyckades öppna \"%s\""

630

626 -#: merge-recursive.c:781

631 +#: merge-recursive.c:782

632 #, c-format

633 msgid "failed to symlink '%s'"

634 msgstr "misslyckades ta skapa symboliska länken \"%s\""

635

631 -#: merge-recursive.c:784

636 +#: merge-recursive.c:785

637 #, c-format

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

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

640

636 -#: merge-recursive.c:922

641 +#: merge-recursive.c:923

642 msgid "Failed to execute internal merge"

643 msgstr "Misslyckades exekvera intern sammanslagning"

644

640 -#: merge-recursive.c:926

645 +#: merge-recursive.c:927

646 #, c-format

647 msgid "Unable to add %s to database"

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

649

645 -#: merge-recursive.c:942

650 +#: merge-recursive.c:943

651 msgid "unsupported object type in the tree"

652 msgstr "objekttyp som ej stöds upptäcktes i trädet"

653

649 -#: merge-recursive.c:1021 merge-recursive.c:1035

654 +#: merge-recursive.c:1022 merge-recursive.c:1036

655 #, c-format

656 msgid ""

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

@@ -655,7 +660,7 @@ msgstr ""

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

661 "i trädet."

662

658 -#: merge-recursive.c:1027 merge-recursive.c:1040

663 +#: merge-recursive.c:1028 merge-recursive.c:1041

664 #, c-format

665 msgid ""

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

@@ -664,20 +669,20 @@ msgstr ""

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

670 "i trädet vid %s."

671

667 -#: merge-recursive.c:1081

672 +#: merge-recursive.c:1082

673 msgid "rename"

674 msgstr "namnbyte"

675

671 -#: merge-recursive.c:1081

676 +#: merge-recursive.c:1082

677 msgid "renamed"

678 msgstr "namnbytt"

679

675 -#: merge-recursive.c:1137

680 +#: merge-recursive.c:1138

681 #, c-format

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

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

684

680 -#: merge-recursive.c:1159

685 +#: merge-recursive.c:1160

686 #, c-format

687 msgid ""

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

@@ -686,148 +691,169 @@ msgstr ""

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

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

693

689 -#: merge-recursive.c:1164

694 +#: merge-recursive.c:1165

695 msgid " (left unresolved)"

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

697

693 -#: merge-recursive.c:1218

698 +#: merge-recursive.c:1219

699 #, c-format

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

701 msgstr ""

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

703

699 -#: merge-recursive.c:1248

704 +#: merge-recursive.c:1249

705 #, c-format

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

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

708

704 -#: merge-recursive.c:1447

709 +#: merge-recursive.c:1448

710 #, c-format

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

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

713

709 -#: merge-recursive.c:1457

714 +#: merge-recursive.c:1458

715 #, c-format

716 msgid "Adding merged %s"

717 msgstr "Lägger till sammanslagen %s"

718

714 -#: merge-recursive.c:1462 merge-recursive.c:1660

719 +#: merge-recursive.c:1463 merge-recursive.c:1661

720 #, c-format

721 msgid "Adding as %s instead"

722 msgstr "Lägger till som %s iställer"

723

719 -#: merge-recursive.c:1513

724 +#: merge-recursive.c:1514

725 #, c-format

726 msgid "cannot read object %s"

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

728

724 -#: merge-recursive.c:1516

729 +#: merge-recursive.c:1517

730 #, c-format

731 msgid "object %s is not a blob"

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

733

729 -#: merge-recursive.c:1564

734 +#: merge-recursive.c:1565

735 msgid "modify"

736 msgstr "ändra"

737

733 -#: merge-recursive.c:1564

738 +#: merge-recursive.c:1565

739 msgid "modified"

740 msgstr "ändrad"

741

737 -#: merge-recursive.c:1574

742 +#: merge-recursive.c:1575

743 msgid "content"

744 msgstr "innehåll"

745

741 -#: merge-recursive.c:1581

746 +#: merge-recursive.c:1582

747 msgid "add/add"

748 msgstr "tillägg/tillägg"

749

745 -#: merge-recursive.c:1615

750 +#: merge-recursive.c:1616

751 #, c-format

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

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

754

750 -#: merge-recursive.c:1629

755 +#: merge-recursive.c:1630

756 #, c-format

757 msgid "Auto-merging %s"

758 msgstr "Slår ihop %s automatiskt"

759

755 -#: merge-recursive.c:1633 git-submodule.sh:1029

760 +#: merge-recursive.c:1634 git-submodule.sh:1118

761 msgid "submodule"

762 msgstr "undermodul"

763

759 -#: merge-recursive.c:1634

764 +#: merge-recursive.c:1635

765 #, c-format

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

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

768

764 -#: merge-recursive.c:1724

769 +#: merge-recursive.c:1725

770 #, c-format

771 msgid "Removing %s"

772 msgstr "Tar bort %s"

773

769 -#: merge-recursive.c:1749

774 +#: merge-recursive.c:1750

775 msgid "file/directory"

776 msgstr "fil/katalog"

777

773 -#: merge-recursive.c:1755

778 +#: merge-recursive.c:1756

779 msgid "directory/file"

780 msgstr "katalog/fil"

781

777 -#: merge-recursive.c:1760

782 +#: merge-recursive.c:1761

783 #, c-format

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

785 msgstr ""

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

787

783 -#: merge-recursive.c:1770

788 +#: merge-recursive.c:1771

789 #, c-format

790 msgid "Adding %s"

791 msgstr "Lägger till %s"

792

788 -#: merge-recursive.c:1787

793 +#: merge-recursive.c:1788

794 msgid "Fatal merge failure, shouldn't happen."

795 msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."

796

792 -#: merge-recursive.c:1806

797 +#: merge-recursive.c:1807

798 msgid "Already up-to-date!"

799 msgstr "Redan à jour!"

800

796 -#: merge-recursive.c:1815

801 +#: merge-recursive.c:1816

802 #, c-format

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

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

805

801 -#: merge-recursive.c:1845

806 +#: merge-recursive.c:1846

807 #, c-format

808 msgid "Unprocessed path??? %s"

809 msgstr "Obehandlad sökväg??? %s"

810

806 -#: merge-recursive.c:1890

811 +#: merge-recursive.c:1891

812 msgid "Merging:"

813 msgstr "Slår ihop:"

814

810 -#: merge-recursive.c:1903

815 +#: merge-recursive.c:1904

816 #, c-format

817 msgid "found %u common ancestor:"

818 msgid_plural "found %u common ancestors:"

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

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

821

817 -#: merge-recursive.c:1940

822 +#: merge-recursive.c:1941

823 msgid "merge returned no commit"

824 msgstr "sammanslagningen returnerade ingen incheckning"

825

821 -#: merge-recursive.c:1997

826 +#: merge-recursive.c:1998

827 #, c-format

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

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

830

826 -#: merge-recursive.c:2009 builtin/merge.c:658

831 +#: merge-recursive.c:2010 builtin/merge.c:672

832 msgid "Unable to write index."

833 msgstr "Kunde inte skriva indexet."

834

830 -#: object.c:195

835 +#: notes-utils.c:40

836 +msgid "Cannot commit uninitialized/unreferenced notes tree"

837 +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

838 +

839 +#: notes-utils.c:81

840 +#, c-format

841 +msgid "Bad notes.rewriteMode value: '%s'"

842 +msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

843 +

844 +#: notes-utils.c:91

845 +#, c-format

846 +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

847 +msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

848 +

849 +#. TRANSLATORS: The first %s is the name of the

850 +#. environment variable, the second %s is its value

851 +#: notes-utils.c:118

852 +#, c-format

853 +msgid "Bad %s value: '%s'"

854 +msgstr "Felaktigt värde på %s: \"%s\""

855 +

856 +#: object.c:204

857 #, c-format

858 msgid "unable to parse object: %s"

859 msgstr "kunde inte tolka objektet: %s"

@@ -867,18 +893,18 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""

893 msgid "'%s' is beyond a symbolic link"

894 msgstr "\"%s\" är på andra sidan av en symbolisk länk"

895

870 -#: remote.c:1781

896 +#: remote.c:1788

897 #, c-format

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

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

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

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

902

877 -#: remote.c:1787

903 +#: remote.c:1794

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

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

906

881 -#: remote.c:1790

907 +#: remote.c:1797

908 #, c-format

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

910 msgid_plural ""

@@ -888,11 +914,11 @@ msgstr[0] ""

914 msgstr[1] ""

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

916

891 -#: remote.c:1798

917 +#: remote.c:1805

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

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

920

895 -#: remote.c:1801

921 +#: remote.c:1808

922 #, c-format

923 msgid ""

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

@@ -907,18 +933,27 @@ msgstr[1] ""

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

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

935

910 -#: remote.c:1811

936 +#: remote.c:1818

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

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

939

914 -#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

915 -#: builtin/merge.c:1009

940 +#: run-command.c:80

941 +msgid "open /dev/null failed"

942 +msgstr "misslyckades öppna /dev/null"

943 +

944 +#: run-command.c:82

945 +#, c-format

946 +msgid "dup2(%d,%d) failed"

947 +msgstr "dup2(%d,%d) misslyckades"

948 +

949 +#: sequencer.c:206 builtin/merge.c:790 builtin/merge.c:903

950 +#: builtin/merge.c:1013 builtin/merge.c:1023

951 #, c-format

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

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

954

920 -#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

921 -#: builtin/merge.c:1001 builtin/merge.c:1014

955 +#: sequencer.c:208 builtin/merge.c:350 builtin/merge.c:793

956 +#: builtin/merge.c:1015 builtin/merge.c:1028

957 #, c-format

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

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

@@ -941,7 +976,7 @@ msgstr ""

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

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

978

944 -#: sequencer.c:245 sequencer.c:859 sequencer.c:942

979 +#: sequencer.c:245 sequencer.c:869 sequencer.c:952

980 #, c-format

981 msgid "Could not write to %s"

982 msgstr "Kunde inte skriva till %s"

@@ -964,215 +999,237 @@ msgid "Commit your changes or stash them to proceed."

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

1000

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

967 -#: sequencer.c:319

1002 +#: sequencer.c:324

1003 #, c-format

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

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

1006

972 -#: sequencer.c:350

1007 +#: sequencer.c:355

1008 msgid "Could not resolve HEAD commit\n"

1009 msgstr "Kunde inte bestämma HEAD:s incheckning\n"

1010

976 -#: sequencer.c:371

1011 +#: sequencer.c:377

1012 msgid "Unable to update cache tree\n"

1013 msgstr "Kan inte uppdatera cacheträd\n"

1014

980 -#: sequencer.c:416

1015 +#: sequencer.c:422

1016 #, c-format

1017 msgid "Could not parse commit %s\n"

1018 msgstr "Kunde inte tolka incheckningen %s\n"

1019

985 -#: sequencer.c:421

1020 +#: sequencer.c:427

1021 #, c-format

1022 msgid "Could not parse parent commit %s\n"

1023 msgstr "Kunde inte tolka föräldraincheckningen %s\n"

1024

990 -#: sequencer.c:487

1025 +#: sequencer.c:493

1026 msgid "Your index file is unmerged."

1027 msgstr "Din indexfil har inte slagits ihop."

1028

994 -#: sequencer.c:506

1029 +#: sequencer.c:512

1030 #, c-format

1031 msgid "Commit %s is a merge but no -m option was given."

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

1033

999 -#: sequencer.c:514

1034 +#: sequencer.c:520

1035 #, c-format

1036 msgid "Commit %s does not have parent %d"

1037 msgstr "Incheckning %s har inte förälder %d"

1038

1004 -#: sequencer.c:518

1039 +#: sequencer.c:524

1040 #, c-format

1041 msgid "Mainline was specified but commit %s is not a merge."

1042 msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"

1043

1044 #. TRANSLATORS: The first %s will be "revert" or

1045 #. "cherry-pick", the second %s a SHA1

1011 -#: sequencer.c:531

1046 +#: sequencer.c:537

1047 #, c-format

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

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

1050

1016 -#: sequencer.c:535

1051 +#: sequencer.c:541

1052 #, c-format

1053 msgid "Cannot get commit message for %s"

1054 msgstr "Kan inte hämta incheckningsmeddelande för %s"

1055

1021 -#: sequencer.c:621

1056 +#: sequencer.c:627

1057 #, c-format

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

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

1060

1026 -#: sequencer.c:622

1061 +#: sequencer.c:628

1062 #, c-format

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

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

1065

1031 -#: sequencer.c:654

1066 +#: sequencer.c:664

1067 msgid "empty commit set passed"

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

1069

1035 -#: sequencer.c:662

1070 +#: sequencer.c:672

1071 #, c-format

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

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

1074

1040 -#: sequencer.c:667

1075 +#: sequencer.c:677

1076 #, c-format

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

1078 msgstr "git %s: misslyckades uppdatera indexet"

1079

1045 -#: sequencer.c:725

1080 +#: sequencer.c:735

1081 #, c-format

1082 msgid "Cannot %s during a %s"

1083 msgstr "kan inte %s under en %s"

1084

1050 -#: sequencer.c:747

1085 +#: sequencer.c:757

1086 #, c-format

1087 msgid "Could not parse line %d."

1088 msgstr "Kan inte tolka rad %d."

1089

1055 -#: sequencer.c:752

1090 +#: sequencer.c:762

1091 msgid "No commits parsed."

1092 msgstr "Inga incheckningar lästes."

1093

1059 -#: sequencer.c:765

1094 +#: sequencer.c:775

1095 #, c-format

1096 msgid "Could not open %s"

1097 msgstr "Kunde inte öppna %s"

1098

1064 -#: sequencer.c:769

1099 +#: sequencer.c:779

1100 #, c-format

1101 msgid "Could not read %s."

1102 msgstr "kunde inte läsa %s."

1103

1069 -#: sequencer.c:776

1104 +#: sequencer.c:786

1105 #, c-format

1106 msgid "Unusable instruction sheet: %s"

1107 msgstr "Oanvändbart manus: %s"

1108

1074 -#: sequencer.c:804

1109 +#: sequencer.c:814

1110 #, c-format

1111 msgid "Invalid key: %s"

1112 msgstr "Felaktig nyckel: %s"

1113

1079 -#: sequencer.c:807

1114 +#: sequencer.c:817

1115 #, c-format

1116 msgid "Invalid value for %s: %s"

1117 msgstr "Felaktigt värde för %s: %s"

1118

1084 -#: sequencer.c:819

1119 +#: sequencer.c:829

1120 #, c-format

1121 msgid "Malformed options sheet: %s"

1122 msgstr "Trasigt manus: %s"

1123

1089 -#: sequencer.c:840

1124 +#: sequencer.c:850

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

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

1127

1093 -#: sequencer.c:841

1128 +#: sequencer.c:851

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

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

1131

1097 -#: sequencer.c:845

1132 +#: sequencer.c:855

1133 #, c-format

1134 msgid "Could not create sequencer directory %s"

1135 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

1136

1102 -#: sequencer.c:861 sequencer.c:946

1137 +#: sequencer.c:871 sequencer.c:956

1138 #, c-format

1139 msgid "Error wrapping up %s."

1140 msgstr "Fel vid ombrytning av %s."

1141

1107 -#: sequencer.c:880 sequencer.c:1014

1142 +#: sequencer.c:890 sequencer.c:1024

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

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

1145

1111 -#: sequencer.c:882

1146 +#: sequencer.c:892

1147 msgid "cannot resolve HEAD"

1148 msgstr "kan inte bestämma HEAD"

1149

1115 -#: sequencer.c:884

1150 +#: sequencer.c:894

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

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

1153

1119 -#: sequencer.c:906 builtin/apply.c:4060

1154 +#: sequencer.c:916 builtin/apply.c:4061

1155 #, c-format

1156 msgid "cannot open %s: %s"

1157 msgstr "kan inte öppna %s: %s"

1158

1124 -#: sequencer.c:909

1159 +#: sequencer.c:919

1160 #, c-format

1161 msgid "cannot read %s: %s"

1162 msgstr "kan inte läsa %s: %s"

1163

1129 -#: sequencer.c:910

1164 +#: sequencer.c:920

1165 msgid "unexpected end of file"

1166 msgstr "oväntat filslut"

1167

1133 -#: sequencer.c:916

1168 +#: sequencer.c:926

1169 #, c-format

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

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

1172

1138 -#: sequencer.c:939

1173 +#: sequencer.c:949

1174 #, c-format

1175 msgid "Could not format %s."

1176 msgstr "Kunde inte formatera %s."

1177

1143 -#: sequencer.c:1083

1178 +#: sequencer.c:1092

1179 #, c-format

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

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

1182

1148 -#: sequencer.c:1085

1183 +#: sequencer.c:1095

1184 #, c-format

1185 msgid "%s: bad revision"

1186 msgstr "%s: felaktig revision"

1187

1153 -#: sequencer.c:1119

1188 +#: sequencer.c:1129

1189 msgid "Can't revert as initial commit"

1190 msgstr "Kan inte ångra som första incheckning"

1191

1157 -#: sequencer.c:1120

1192 +#: sequencer.c:1130

1193 msgid "Can't cherry-pick into empty head"

1194 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"

1195

1161 -#: sha1_name.c:1036

1196 +#: sha1_name.c:440

1197 +msgid ""

1198 +"Git normally never creates a ref that ends with 40 hex characters\n"

1199 +"because it will be ignored when you just specify 40-hex. These refs\n"

1200 +"may be created by mistake. For example,\n"

1201 +"\n"

1202 +" git checkout -b $br $(git rev-parse ...)\n"

1203 +"\n"

1204 +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"

1205 +"examine these refs and maybe delete them. Turn this message off by\n"

1206 +"running \"git config advice.objectNameWarning false\""

1207 +msgstr ""

1208 +"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"

1209 +"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"

1210 +"referenser kan skapas av misstag. Till exempel, för\n"

1211 +"\n"

1212 +" git checkout -b $br $(git rev-parse ...)\n"

1213 +"\n"

1214 +"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"

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

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

1217 +

1218 +#: sha1_name.c:1097

1219 msgid "HEAD does not point to a branch"

1220 msgstr "HEAD pekar inte på en gren"

1221

1165 -#: sha1_name.c:1039

1222 +#: sha1_name.c:1100

1223 #, c-format

1224 msgid "No such branch: '%s'"

1225 msgstr "Okänd gren: \"%s\""

1226

1170 -#: sha1_name.c:1041

1227 +#: sha1_name.c:1102

1228 #, c-format

1229 msgid "No upstream configured for branch '%s'"

1230 msgstr "Ingen standarduppström angiven för grenen \"%s\""

1231

1175 -#: sha1_name.c:1044

1232 +#: sha1_name.c:1106

1233 #, c-format

1234 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

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

@@ -1182,166 +1239,166 @@ msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

1239 msgid "unable to access '%s': %s"

1240 msgstr "kan inte komma åt \"%s\": %s"

1241

1185 -#: wrapper.c:423

1242 +#: wrapper.c:429

1243 #, c-format

1244 msgid "unable to access '%s'"

1245 msgstr "kan inte komma åt \"%s\""

1246

1190 -#: wrapper.c:434

1247 +#: wrapper.c:440

1248 #, c-format

1249 msgid "unable to look up current user in the passwd file: %s"

1250 msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

1251

1195 -#: wrapper.c:435

1252 +#: wrapper.c:441

1253 msgid "no such user"

1254 msgstr "okänd användare"

1255

1199 -#: wt-status.c:140

1256 +#: wt-status.c:141

1257 msgid "Unmerged paths:"

1258 msgstr "Ej sammanslagna sökvägar:"

1259

1203 -#: wt-status.c:167 wt-status.c:194

1260 +#: wt-status.c:168 wt-status.c:195

1261 #, c-format

1262 msgid " (use \"git reset %s <file>...\" to unstage)"

1263 msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"

1264

1208 -#: wt-status.c:169 wt-status.c:196

1265 +#: wt-status.c:170 wt-status.c:197

1266 msgid " (use \"git rm --cached <file>...\" to unstage)"

1267 msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

1268

1212 -#: wt-status.c:173

1269 +#: wt-status.c:174

1270 msgid " (use \"git add <file>...\" to mark resolution)"

1271 msgstr " (använd \"git add <fil>...\" för att ange lösning)"

1272

1216 -#: wt-status.c:175 wt-status.c:179

1273 +#: wt-status.c:176 wt-status.c:180

1274 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

1275 msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

1276

1220 -#: wt-status.c:177

1277 +#: wt-status.c:178

1278 msgid " (use \"git rm <file>...\" to mark resolution)"

1279 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

1280

1224 -#: wt-status.c:188

1281 +#: wt-status.c:189

1282 msgid "Changes to be committed:"

1283 msgstr "Ändringar att checka in:"

1284

1228 -#: wt-status.c:206

1285 +#: wt-status.c:207

1286 msgid "Changes not staged for commit:"

1287 msgstr "Ändringar ej i incheckningskön:"

1288

1232 -#: wt-status.c:210

1289 +#: wt-status.c:211

1290 msgid " (use \"git add <file>...\" to update what will be committed)"

1291 msgstr ""

1292 " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

1293

1237 -#: wt-status.c:212

1294 +#: wt-status.c:213

1295 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

1296 msgstr ""

1297 " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"

1298

1242 -#: wt-status.c:213

1299 +#: wt-status.c:214

1300 msgid ""

1301 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

1302 msgstr ""

1303 " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

1304 "arbetskatalogen)"

1305

1249 -#: wt-status.c:215

1306 +#: wt-status.c:216

1307 msgid " (commit or discard the untracked or modified content in submodules)"

1308 msgstr ""

1309 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

1310

1254 -#: wt-status.c:227

1311 +#: wt-status.c:228

1312 #, c-format

1313 msgid " (use \"git %s <file>...\" to include in what will be committed)"

1314 msgstr ""

1315 " (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"

1316

1260 -#: wt-status.c:244

1317 +#: wt-status.c:245

1318 msgid "bug"

1319 msgstr "programfel"

1320

1264 -#: wt-status.c:249

1321 +#: wt-status.c:250

1322 msgid "both deleted:"

1323 msgstr "borttaget av bägge:"

1324

1268 -#: wt-status.c:250

1325 +#: wt-status.c:251

1326 msgid "added by us:"

1327 msgstr "tillagt av oss:"

1328

1272 -#: wt-status.c:251

1329 +#: wt-status.c:252

1330 msgid "deleted by them:"

1331 msgstr "borttaget av dem:"

1332

1276 -#: wt-status.c:252

1333 +#: wt-status.c:253

1334 msgid "added by them:"

1335 msgstr "tillagt av dem:"

1336

1280 -#: wt-status.c:253

1337 +#: wt-status.c:254

1338 msgid "deleted by us:"

1339 msgstr "borttaget av oss:"

1340

1284 -#: wt-status.c:254

1341 +#: wt-status.c:255

1342 msgid "both added:"

1343 msgstr "tillagt av bägge:"

1344

1288 -#: wt-status.c:255

1345 +#: wt-status.c:256

1346 msgid "both modified:"

1347 msgstr "ändrat av bägge:"

1348

1292 -#: wt-status.c:285

1349 +#: wt-status.c:286

1350 msgid "new commits, "

1351 msgstr "nya incheckningar, "

1352

1296 -#: wt-status.c:287

1353 +#: wt-status.c:288

1354 msgid "modified content, "

1355 msgstr "ändrat innehåll, "

1356

1300 -#: wt-status.c:289

1357 +#: wt-status.c:290

1358 msgid "untracked content, "

1359 msgstr "ospårat innehåll, "

1360

1304 -#: wt-status.c:306

1361 +#: wt-status.c:307

1362 #, c-format

1363 msgid "new file: %s"

1364 msgstr "ny fil: %s"

1365

1309 -#: wt-status.c:309

1366 +#: wt-status.c:310

1367 #, c-format

1368 msgid "copied: %s -> %s"

1369 msgstr "kopierad: %s -> %s"

1370

1314 -#: wt-status.c:312

1371 +#: wt-status.c:313

1372 #, c-format

1373 msgid "deleted: %s"

1374 msgstr "borttagen: %s"

1375

1319 -#: wt-status.c:315

1376 +#: wt-status.c:316

1377 #, c-format

1378 msgid "modified: %s"

1379 msgstr "ändrad: %s"

1380

1324 -#: wt-status.c:318

1381 +#: wt-status.c:319

1382 #, c-format

1383 msgid "renamed: %s -> %s"

1384 msgstr "namnbyte: %s -> %s"

1385

1329 -#: wt-status.c:321

1386 +#: wt-status.c:322

1387 #, c-format

1388 msgid "typechange: %s"

1389 msgstr "typbyte: %s"

1390

1334 -#: wt-status.c:324

1391 +#: wt-status.c:325

1392 #, c-format

1393 msgid "unknown: %s"

1394 msgstr "okänd: %s"

1395

1339 -#: wt-status.c:327

1396 +#: wt-status.c:328

1397 #, c-format

1398 msgid "unmerged: %s"

1399 msgstr "osammansl.: %s"

1400

1344 -#: wt-status.c:330

1401 +#: wt-status.c:331

1402 #, c-format

1403 msgid "bug: unhandled diff status %c"

1404 msgstr "programfel: diff-status %c ej hanterad"

@@ -1350,7 +1407,7 @@ msgstr "programfel: diff-status %c ej hanterad"

1407 msgid "You have unmerged paths."

1408 msgstr "Du har ej sammanslagna sökvägar."

1409

1353 -#: wt-status.c:806 wt-status.c:958

1410 +#: wt-status.c:806

1411 msgid " (fix conflicts and run \"git commit\")"

1412 msgstr " (rätta konflikter och kör \"git commit\")"

1413

@@ -1371,8 +1428,8 @@ msgid "The current patch is empty."

1428 msgstr "Aktuell patch är tom."

1429

1430 #: wt-status.c:829

1374 -msgid " (fix conflicts and then run \"git am --resolved\")"

1375 -msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"

1431 +msgid " (fix conflicts and then run \"git am --continue\")"

1432 +msgstr " (rätta konflikter och kör sedan \"git am --continue\")"

1433

1434 #: wt-status.c:831

1435 msgid " (use \"git am --skip\" to skip this patch)"

@@ -1448,37 +1505,47 @@ msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändring

1505 msgid "You are currently cherry-picking."

1506 msgstr "Du håller på med en \"cherry-pick\"."

1507

1508 +#: wt-status.c:958

1509 +msgid " (fix conflicts and run \"git cherry-pick --continue\")"

1510 +msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

1511 +

1512 #: wt-status.c:961

1452 -msgid " (all conflicts fixed: run \"git commit\")"

1453 -msgstr " (alla konflikter har rättats: kör \"git commit\")"

1513 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

1514 +msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

1515

1455 -#: wt-status.c:970

1516 +#: wt-status.c:963

1517 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

1518 +msgstr ""

1519 +" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

1520 +"operationen)"

1521 +

1522 +#: wt-status.c:972

1523 #, c-format

1524 msgid "You are currently reverting commit %s."

1525 msgstr "Du håller på med att ångra incheckningen %s."

1526

1460 -#: wt-status.c:975

1527 +#: wt-status.c:977

1528 msgid " (fix conflicts and run \"git revert --continue\")"

1529 msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"

1530

1464 -#: wt-status.c:978

1531 +#: wt-status.c:980

1532 msgid " (all conflicts fixed: run \"git revert --continue\")"

1533 msgstr " (alla konflikter rättade: kör \"git revert --continue\")"

1534

1468 -#: wt-status.c:980

1535 +#: wt-status.c:982

1536 msgid " (use \"git revert --abort\" to cancel the revert operation)"

1537 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

1538

1472 -#: wt-status.c:991

1539 +#: wt-status.c:993

1540 #, c-format

1541 msgid "You are currently bisecting, started from branch '%s'."

1542 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

1543

1477 -#: wt-status.c:995

1544 +#: wt-status.c:997

1545 msgid "You are currently bisecting."

1546 msgstr "Du håller på med en \"bisect\"."

1547

1481 -#: wt-status.c:998

1548 +#: wt-status.c:1000

1549 msgid " (use \"git bisect reset\" to get back to the original branch)"

1550 msgstr ""

1551 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

@@ -1487,31 +1554,35 @@ msgstr ""

1554 msgid "On branch "

1555 msgstr "På grenen "

1556

1490 -#: wt-status.c:1184

1557 +#: wt-status.c:1180

1558 +msgid "rebase in progress; onto "

1559 +msgstr "ombasering pågår; ovanpå"

1560 +

1561 +#: wt-status.c:1187

1562 msgid "HEAD detached at "

1563 msgstr "HEAD frånkopplad vid "

1564

1494 -#: wt-status.c:1186

1565 +#: wt-status.c:1189

1566 msgid "HEAD detached from "

1567 msgstr "HEAD frånkopplad från "

1568

1498 -#: wt-status.c:1189

1569 +#: wt-status.c:1192

1570 msgid "Not currently on any branch."

1571 msgstr "Inte på någon gren för närvarande."

1572

1502 -#: wt-status.c:1206

1573 +#: wt-status.c:1209

1574 msgid "Initial commit"

1575 msgstr "Första incheckning"

1576

1506 -#: wt-status.c:1220

1577 +#: wt-status.c:1223

1578 msgid "Untracked files"

1579 msgstr "Ospårade filer"

1580

1510 -#: wt-status.c:1222

1581 +#: wt-status.c:1225

1582 msgid "Ignored files"

1583 msgstr "Ignorerade filer"

1584

1514 -#: wt-status.c:1226

1585 +#: wt-status.c:1229

1586 #, c-format

1587 msgid ""

1588 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -1523,32 +1594,32 @@ msgstr ""

1594 "lägga till nya filer själv (se \"git help status\")."

1595

1596 # %s är nästa sträng eller tom.

1526 -#: wt-status.c:1232

1597 +#: wt-status.c:1235

1598 #, c-format

1599 msgid "Untracked files not listed%s"

1600 msgstr "Ospårade filer visas ej%s"

1601

1531 -#: wt-status.c:1234

1602 +#: wt-status.c:1237

1603 msgid " (use -u option to show untracked files)"

1604 msgstr " (använd flaggan -u för att visa ospårade filer)"

1605

1535 -#: wt-status.c:1240

1606 +#: wt-status.c:1243

1607 msgid "No changes"

1608 msgstr "Inga ändringar"

1609

1539 -#: wt-status.c:1245

1610 +#: wt-status.c:1248

1611 #, c-format

1612 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

1613 msgstr ""

1614 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

1615 "\")\n"

1616

1546 -#: wt-status.c:1248

1617 +#: wt-status.c:1251

1618 #, c-format

1619 msgid "no changes added to commit\n"

1620 msgstr "inga ändringar att checka in\n"

1621

1551 -#: wt-status.c:1251

1622 +#: wt-status.c:1254

1623 #, c-format

1624 msgid ""

1625 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -1557,52 +1628,52 @@ msgstr ""

1628 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

1629 "\")\n"

1630

1560 -#: wt-status.c:1254

1631 +#: wt-status.c:1257

1632 #, c-format

1633 msgid "nothing added to commit but untracked files present\n"

1634 msgstr "inget köat för incheckning, men ospårade filer finns\n"

1635

1565 -#: wt-status.c:1257

1636 +#: wt-status.c:1260

1637 #, c-format

1638 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

1639 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

1640

1570 -#: wt-status.c:1260 wt-status.c:1265

1641 +#: wt-status.c:1263 wt-status.c:1268

1642 #, c-format

1643 msgid "nothing to commit\n"

1644 msgstr "inget att checka in\n"

1645

1575 -#: wt-status.c:1263

1646 +#: wt-status.c:1266

1647 #, c-format

1648 msgid "nothing to commit (use -u to show untracked files)\n"

1649 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

1650

1580 -#: wt-status.c:1267

1651 +#: wt-status.c:1270

1652 #, c-format

1653 msgid "nothing to commit, working directory clean\n"

1654 msgstr "inget att checka in, arbetskatalogen ren\n"

1655

1585 -#: wt-status.c:1375

1656 +#: wt-status.c:1378

1657 msgid "HEAD (no branch)"

1658 msgstr "HEAD (ingen gren)"

1659

1589 -#: wt-status.c:1381

1660 +#: wt-status.c:1384

1661 msgid "Initial commit on "

1662 msgstr "Första incheckning på "

1663

1593 -#: wt-status.c:1396

1664 +#: wt-status.c:1399

1665 msgid "behind "

1666 msgstr "efter "

1667

1597 -#: wt-status.c:1399 wt-status.c:1402

1668 +#: wt-status.c:1402 wt-status.c:1405

1669 msgid "ahead "

1670 msgstr "före "

1671

1601 -#: wt-status.c:1404

1672 +#: wt-status.c:1407

1673 msgid ", behind "

1674 msgstr ", efter "

1675

1605 -#: compat/precompose_utf8.c:58 builtin/clone.c:352

1676 +#: compat/precompose_utf8.c:58 builtin/clone.c:351

1677 #, c-format

1678 msgid "failed to unlink '%s'"

1679 msgstr "misslyckades ta bort länken \"%s\""

@@ -1688,7 +1759,7 @@ msgstr ""

1759 msgid "unexpected diff status %c"

1760 msgstr "diff-status %c förväntades inte"

1761

1691 -#: builtin/add.c:149 builtin/commit.c:233

1762 +#: builtin/add.c:149 builtin/commit.c:252

1763 msgid "updating files failed"

1764 msgstr "misslyckades uppdatera filer"

1765

@@ -1701,7 +1772,7 @@ msgstr "ta bort \"%s\"\n"

1772 msgid "Unstaged changes after refreshing the index:"

1773 msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"

1774

1704 -#: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275

1775 +#: builtin/add.c:256 builtin/add.c:573 builtin/rm.c:337

1776 #, c-format

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

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

@@ -1710,127 +1781,127 @@ msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

1781 msgid "Could not read the index"

1782 msgstr "Kunde inte läsa indexet"

1783

1713 -#: builtin/add.c:349

1784 +#: builtin/add.c:350

1785 #, c-format

1786 msgid "Could not open '%s' for writing."

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

1788

1718 -#: builtin/add.c:353

1789 +#: builtin/add.c:354

1790 msgid "Could not write patch"

1791 msgstr "Kunde inte skriva patch"

1792

1722 -#: builtin/add.c:358

1793 +#: builtin/add.c:359

1794 #, c-format

1795 msgid "Could not stat '%s'"

1796 msgstr "Kunde inte ta status på \"%s\""

1797

1727 -#: builtin/add.c:360

1798 +#: builtin/add.c:361

1799 msgid "Empty patch. Aborted."

1800 msgstr "Tom patch. Avbryter."

1801

1731 -#: builtin/add.c:366

1802 +#: builtin/add.c:367

1803 #, c-format

1804 msgid "Could not apply '%s'"

1805 msgstr "Kunde inte tillämpa \"%s\""

1806

1736 -#: builtin/add.c:376

1807 +#: builtin/add.c:377

1808 msgid "The following paths are ignored by one of your .gitignore files:\n"

1809 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

1810

1740 -#: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63

1741 -#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253

1742 -#: builtin/rm.c:206

1811 +#: builtin/add.c:394 builtin/clean.c:875 builtin/fetch.c:78 builtin/mv.c:63

1812 +#: builtin/prune-packed.c:73 builtin/push.c:451 builtin/remote.c:1253

1813 +#: builtin/rm.c:268

1814 msgid "dry run"

1815 msgstr "testkörning"

1816

1746 -#: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19

1747 -#: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613

1748 -#: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112

1817 +#: builtin/add.c:395 builtin/apply.c:4410 builtin/check-ignore.c:19

1818 +#: builtin/commit.c:1220 builtin/count-objects.c:95 builtin/fsck.c:613

1819 +#: builtin/log.c:1573 builtin/mv.c:62 builtin/read-tree.c:113

1820 msgid "be verbose"

1821 msgstr "var pratsam"

1822

1752 -#: builtin/add.c:396

1823 +#: builtin/add.c:397

1824 msgid "interactive picking"

1825 msgstr "plocka interaktivt"

1826

1756 -#: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258

1827 +#: builtin/add.c:398 builtin/checkout.c:1073 builtin/reset.c:261

1828 msgid "select hunks interactively"

1829 msgstr "välj stycken interaktivt"

1830

1760 -#: builtin/add.c:398

1831 +#: builtin/add.c:399

1832 msgid "edit current diff and apply"

1833 msgstr "redigera aktuell diff och applicera"

1834

1764 -#: builtin/add.c:399

1835 +#: builtin/add.c:400

1836 msgid "allow adding otherwise ignored files"

1837 msgstr "tillåt lägga till annars ignorerade filer"

1838

1768 -#: builtin/add.c:400

1839 +#: builtin/add.c:401

1840 msgid "update tracked files"

1841 msgstr "uppdatera spårade filer"

1842

1772 -#: builtin/add.c:401

1843 +#: builtin/add.c:402

1844 msgid "record only the fact that the path will be added later"

1845 msgstr "registrera endast att sökvägen kommer läggas till senare"

1846

1776 -#: builtin/add.c:402

1847 +#: builtin/add.c:403

1848 msgid "add changes from all tracked and untracked files"

1849 msgstr "lägg till ändringar från alla spårade och ospårade filer"

1850

1851 #. takes no arguments

1781 -#: builtin/add.c:405

1852 +#: builtin/add.c:406

1853 msgid "ignore paths removed in the working tree (same as --no-all)"

1854 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"

1855

1785 -#: builtin/add.c:407

1856 +#: builtin/add.c:408

1857 msgid "don't add, only refresh the index"

1858 msgstr "lägg inte till, uppdatera endast indexet"

1859

1789 -#: builtin/add.c:408

1860 +#: builtin/add.c:409

1861 msgid "just skip files which cannot be added because of errors"

1862 msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"

1863

1793 -#: builtin/add.c:409

1864 +#: builtin/add.c:410

1865 msgid "check if - even missing - files are ignored in dry run"

1866 msgstr "se om - även saknade - filer ignoreras i testkörning"

1867

1797 -#: builtin/add.c:431

1868 +#: builtin/add.c:432

1869 #, c-format

1870 msgid "Use -f if you really want to add them.\n"

1871 msgstr "Använd -f om du verkligen vill lägga till dem.\n"

1872

1802 -#: builtin/add.c:432

1873 +#: builtin/add.c:433

1874 msgid "no files added"

1875 msgstr "inga filer har lagts till"

1876

1806 -#: builtin/add.c:438

1877 +#: builtin/add.c:439

1878 msgid "adding files failed"

1879 msgstr "misslyckades lägga till filer"

1880

1810 -#: builtin/add.c:477

1881 +#: builtin/add.c:478

1882 msgid "-A and -u are mutually incompatible"

1883 msgstr "-A och -u är ömsesidigt inkompatibla"

1884

1814 -#: builtin/add.c:495

1885 +#: builtin/add.c:496

1886 msgid "Option --ignore-missing can only be used together with --dry-run"

1887 msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"

1888

1818 -#: builtin/add.c:525

1889 +#: builtin/add.c:526

1890 #, c-format

1891 msgid "Nothing specified, nothing added.\n"

1892 msgstr "Inget angivet, inget tillagt.\n"

1893

1823 -#: builtin/add.c:526

1894 +#: builtin/add.c:527

1895 #, c-format

1896 msgid "Maybe you wanted to say 'git add .'?\n"

1897 msgstr "Kanske menade du att skriva \"git add .\"?\n"

1898

1828 -#: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204

1829 -#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1899 +#: builtin/add.c:533 builtin/check-ignore.c:161 builtin/clean.c:919

1900 +#: builtin/commit.c:312 builtin/mv.c:82 builtin/rm.c:297

1901 msgid "index file corrupt"

1902 msgstr "indexfilen trasig"

1903

1833 -#: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1904 +#: builtin/add.c:605 builtin/apply.c:4506 builtin/mv.c:229 builtin/rm.c:432

1905 msgid "Unable to write new index file"

1906 msgstr "Kunde inte skriva ny indexfil"

1907

@@ -2014,293 +2085,293 @@ msgstr "patch misslyckades: %s:%ld"

2085 msgid "cannot checkout %s"

2086 msgstr "kan inte checka ut %s"

2087

2017 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

2088 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2089 #, c-format

2090 msgid "read of %s failed"

2091 msgstr "misslyckades läsa %s"

2092

2022 -#: builtin/apply.c:3173 builtin/apply.c:3395

2093 +#: builtin/apply.c:3174 builtin/apply.c:3396

2094 #, c-format

2095 msgid "path %s has been renamed/deleted"

2096 msgstr "sökvägen %s har ändrat namn/tagits bort"

2097

2027 -#: builtin/apply.c:3254 builtin/apply.c:3409

2098 +#: builtin/apply.c:3255 builtin/apply.c:3410

2099 #, c-format

2100 msgid "%s: does not exist in index"

2101 msgstr "%s: finns inte i indexet"

2102

2032 -#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

2103 +#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2104 #, c-format

2105 msgid "%s: %s"

2106 msgstr "%s: %s"

2107

2037 -#: builtin/apply.c:3263 builtin/apply.c:3417

2108 +#: builtin/apply.c:3264 builtin/apply.c:3418

2109 #, c-format

2110 msgid "%s: does not match index"

2111 msgstr "%s: motsvarar inte indexet"

2112

2042 -#: builtin/apply.c:3365

2113 +#: builtin/apply.c:3366

2114 msgid "removal patch leaves file contents"

2115 msgstr "patch för borttagning lämnar kvar filinnehåll"

2116

2046 -#: builtin/apply.c:3434

2117 +#: builtin/apply.c:3435

2118 #, c-format

2119 msgid "%s: wrong type"

2120 msgstr "%s: fel typ"

2121

2051 -#: builtin/apply.c:3436

2122 +#: builtin/apply.c:3437

2123 #, c-format

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

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

2126

2056 -#: builtin/apply.c:3537

2127 +#: builtin/apply.c:3538

2128 #, c-format

2129 msgid "%s: already exists in index"

2130 msgstr "%s: finns redan i indexet"

2131

2061 -#: builtin/apply.c:3540

2132 +#: builtin/apply.c:3541

2133 #, c-format

2134 msgid "%s: already exists in working directory"

2135 msgstr "%s: finns redan i arbetskatalogen"

2136

2066 -#: builtin/apply.c:3560

2137 +#: builtin/apply.c:3561

2138 #, c-format

2139 msgid "new mode (%o) of %s does not match old mode (%o)"

2140 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"

2141

2071 -#: builtin/apply.c:3565

2142 +#: builtin/apply.c:3566

2143 #, c-format

2144 msgid "new mode (%o) of %s does not match old mode (%o) of %s"

2145 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"

2146

2076 -#: builtin/apply.c:3573

2147 +#: builtin/apply.c:3574

2148 #, c-format

2149 msgid "%s: patch does not apply"

2150 msgstr "%s: patchen kan inte tillämpas"

2151

2081 -#: builtin/apply.c:3586

2152 +#: builtin/apply.c:3587

2153 #, c-format

2154 msgid "Checking patch %s..."

2155 msgstr "Kontrollerar patchen %s..."

2156

2086 -#: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124

2157 +#: builtin/apply.c:3680 builtin/checkout.c:216 builtin/reset.c:127

2158 #, c-format

2159 msgid "make_cache_entry failed for path '%s'"

2160 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""

2161

2091 -#: builtin/apply.c:3822

2162 +#: builtin/apply.c:3823

2163 #, c-format

2164 msgid "unable to remove %s from index"

2165 msgstr "kan inte ta bort %s från indexet"

2166

2096 -#: builtin/apply.c:3850

2167 +#: builtin/apply.c:3851

2168 #, c-format

2098 -msgid "corrupt patch for subproject %s"

2099 -msgstr "trasig patch för underprojektet %s"

2169 +msgid "corrupt patch for submodule %s"

2170 +msgstr "trasig patch för undermodulen %s"

2171

2101 -#: builtin/apply.c:3854

2172 +#: builtin/apply.c:3855

2173 #, c-format

2174 msgid "unable to stat newly created file '%s'"

2175 msgstr "kan inte ta status på nyligen skapade filen \"%s\""

2176

2106 -#: builtin/apply.c:3859

2177 +#: builtin/apply.c:3860

2178 #, c-format

2179 msgid "unable to create backing store for newly created file %s"

2180 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"

2181

2111 -#: builtin/apply.c:3862 builtin/apply.c:3970

2182 +#: builtin/apply.c:3863 builtin/apply.c:3971

2183 #, c-format

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

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

2186

2116 -#: builtin/apply.c:3895

2187 +#: builtin/apply.c:3896

2188 #, c-format

2189 msgid "closing file '%s'"

2190 msgstr "stänger filen \"%s\""

2191

2121 -#: builtin/apply.c:3944

2192 +#: builtin/apply.c:3945

2193 #, c-format

2194 msgid "unable to write file '%s' mode %o"

2195 msgstr "kan inte skriva filen \"%s\" läge %o"

2196

2126 -#: builtin/apply.c:4031

2197 +#: builtin/apply.c:4032

2198 #, c-format

2199 msgid "Applied patch %s cleanly."

2200 msgstr "Tillämpade patchen %s rent."

2201

2131 -#: builtin/apply.c:4039

2202 +#: builtin/apply.c:4040

2203 msgid "internal error"

2204 msgstr "internt fel"

2205

2206 #. Say this even without --verbose

2136 -#: builtin/apply.c:4042

2207 +#: builtin/apply.c:4043

2208 #, c-format

2209 msgid "Applying patch %%s with %d reject..."

2210 msgid_plural "Applying patch %%s with %d rejects..."

2211 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."

2212 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

2213

2143 -#: builtin/apply.c:4052

2214 +#: builtin/apply.c:4053

2215 #, c-format

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

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

2218

2148 -#: builtin/apply.c:4073

2219 +#: builtin/apply.c:4074

2220 #, c-format

2221 msgid "Hunk #%d applied cleanly."

2222 msgstr "Stycke %d tillämpades rent."

2223

2153 -#: builtin/apply.c:4076

2224 +#: builtin/apply.c:4077

2225 #, c-format

2226 msgid "Rejected hunk #%d."

2227 msgstr "Refuserar stycke %d."

2228

2158 -#: builtin/apply.c:4226

2229 +#: builtin/apply.c:4227

2230 msgid "unrecognized input"

2231 msgstr "indata känns inte igen"

2232

2162 -#: builtin/apply.c:4237

2233 +#: builtin/apply.c:4238

2234 msgid "unable to read index file"

2235 msgstr "kan inte läsa indexfilen"

2236

2166 -#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

2237 +#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:91

2238 #: builtin/fetch.c:63

2239 msgid "path"

2240 msgstr "sökväg"

2241

2171 -#: builtin/apply.c:4357

2242 +#: builtin/apply.c:4358

2243 msgid "don't apply changes matching the given path"

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

2245

2175 -#: builtin/apply.c:4360

2246 +#: builtin/apply.c:4361

2247 msgid "apply changes matching the given path"

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

2249

2179 -#: builtin/apply.c:4362

2250 +#: builtin/apply.c:4363

2251 msgid "num"

2252 msgstr "antal"

2253

2183 -#: builtin/apply.c:4363

2254 +#: builtin/apply.c:4364

2255 msgid "remove <num> leading slashes from traditional diff paths"

2256 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"

2257

2187 -#: builtin/apply.c:4366

2258 +#: builtin/apply.c:4367

2259 msgid "ignore additions made by the patch"

2260 msgstr "ignorera tillägg gjorda av patchen"

2261

2191 -#: builtin/apply.c:4368

2262 +#: builtin/apply.c:4369

2263 msgid "instead of applying the patch, output diffstat for the input"

2264 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"

2265

2195 -#: builtin/apply.c:4372

2266 +#: builtin/apply.c:4373

2267 msgid "show number of added and deleted lines in decimal notation"

2268 msgstr "visa antal tillagda och borttagna rader decimalt"

2269

2199 -#: builtin/apply.c:4374

2270 +#: builtin/apply.c:4375

2271 msgid "instead of applying the patch, output a summary for the input"

2272 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"

2273

2203 -#: builtin/apply.c:4376

2274 +#: builtin/apply.c:4377

2275 msgid "instead of applying the patch, see if the patch is applicable"

2276 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"

2277

2207 -#: builtin/apply.c:4378

2278 +#: builtin/apply.c:4379

2279 msgid "make sure the patch is applicable to the current index"

2280 msgstr "se till att patchen kan tillämpas på aktuellt index"

2281

2211 -#: builtin/apply.c:4380

2282 +#: builtin/apply.c:4381

2283 msgid "apply a patch without touching the working tree"

2284 msgstr "tillämpa en patch utan att röra arbetskatalogen"

2285

2215 -#: builtin/apply.c:4382

2286 +#: builtin/apply.c:4383

2287 msgid "also apply the patch (use with --stat/--summary/--check)"

2288 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"

2289

2219 -#: builtin/apply.c:4384

2290 +#: builtin/apply.c:4385

2291 msgid "attempt three-way merge if a patch does not apply"

2292 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

2293

2223 -#: builtin/apply.c:4386

2294 +#: builtin/apply.c:4387

2295 msgid "build a temporary index based on embedded index information"

2296 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"

2297

2227 -#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456

2298 +#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:462

2299 msgid "paths are separated with NUL character"

2300 msgstr "sökvägar avdelas med NUL-tecken"

2301

2231 -#: builtin/apply.c:4391

2302 +#: builtin/apply.c:4392

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

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

2305

2235 -#: builtin/apply.c:4392

2306 +#: builtin/apply.c:4393

2307 msgid "action"

2308 msgstr "åtgärd"

2309

2239 -#: builtin/apply.c:4393

2310 +#: builtin/apply.c:4394

2311 msgid "detect new or modified lines that have whitespace errors"

2312 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"

2313

2243 -#: builtin/apply.c:4396 builtin/apply.c:4399

2314 +#: builtin/apply.c:4397 builtin/apply.c:4400

2315 msgid "ignore changes in whitespace when finding context"

2316 msgstr "ignorera ändringar i blanktecken för sammanhang"

2317

2247 -#: builtin/apply.c:4402

2318 +#: builtin/apply.c:4403

2319 msgid "apply the patch in reverse"

2320 msgstr "tillämpa patchen baklänges"

2321

2251 -#: builtin/apply.c:4404

2322 +#: builtin/apply.c:4405

2323 msgid "don't expect at least one line of context"

2324 msgstr "förvänta inte minst en rad sammanhang"

2325

2255 -#: builtin/apply.c:4406

2326 +#: builtin/apply.c:4407

2327 msgid "leave the rejected hunks in corresponding *.rej files"

2328 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"

2329

2259 -#: builtin/apply.c:4408

2330 +#: builtin/apply.c:4409

2331 msgid "allow overlapping hunks"

2332 msgstr "tillåt överlappande stycken"

2333

2263 -#: builtin/apply.c:4411

2334 +#: builtin/apply.c:4412

2335 msgid "tolerate incorrectly detected missing new-line at the end of file"

2336 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2337

2267 -#: builtin/apply.c:4414

2338 +#: builtin/apply.c:4415

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

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

2341

2271 -#: builtin/apply.c:4416

2342 +#: builtin/apply.c:4417

2343 msgid "root"

2344 msgstr "rot"

2345

2275 -#: builtin/apply.c:4417

2346 +#: builtin/apply.c:4418

2347 msgid "prepend <root> to all filenames"

2348 msgstr "lägg till <rot> i alla filnamn"

2349

2279 -#: builtin/apply.c:4439

2350 +#: builtin/apply.c:4440

2351 msgid "--3way outside a repository"

2352 msgstr "--3way utanför arkiv"

2353

2283 -#: builtin/apply.c:4447

2354 +#: builtin/apply.c:4448

2355 msgid "--index outside a repository"

2356 msgstr "--index utanför arkiv"

2357

2287 -#: builtin/apply.c:4450

2358 +#: builtin/apply.c:4451

2359 msgid "--cached outside a repository"

2360 msgstr "--cached utanför arkiv"

2361

2291 -#: builtin/apply.c:4466

2362 +#: builtin/apply.c:4467

2363 #, c-format

2364 msgid "can't open patch '%s'"

2365 msgstr "kan inte öppna patchen \"%s\""

2366

2296 -#: builtin/apply.c:4480

2367 +#: builtin/apply.c:4481

2368 #, c-format

2369 msgid "squelched %d whitespace error"

2370 msgid_plural "squelched %d whitespace errors"

2371 msgstr[0] "undertryckte %d fel i blanksteg"

2372 msgstr[1] "undertryckte %d fel i blanksteg"

2373

2303 -#: builtin/apply.c:4486 builtin/apply.c:4496

2374 +#: builtin/apply.c:4487 builtin/apply.c:4497

2375 #, c-format

2376 msgid "%d line adds whitespace errors."

2377 msgid_plural "%d lines add whitespace errors."

@@ -2354,103 +2425,103 @@ msgstr "utför 'git bisect next'"

2425 msgid "update BISECT_HEAD instead of checking out the current commit"

2426 msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"

2427

2357 -#: builtin/blame.c:25

2428 +#: builtin/blame.c:26

2429 msgid "git blame [options] [rev-opts] [rev] [--] file"

2430 msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2431

2361 -#: builtin/blame.c:30

2432 +#: builtin/blame.c:31

2433 msgid "[rev-opts] are documented in git-rev-list(1)"

2434 msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)"

2435

2365 -#: builtin/blame.c:2355

2436 +#: builtin/blame.c:2276

2437 msgid "Show blame entries as we find them, incrementally"

2438 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

2439

2369 -#: builtin/blame.c:2356

2440 +#: builtin/blame.c:2277

2441 msgid "Show blank SHA-1 for boundary commits (Default: off)"

2442 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

2443

2373 -#: builtin/blame.c:2357

2444 +#: builtin/blame.c:2278

2445 msgid "Do not treat root commits as boundaries (Default: off)"

2446 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

2447

2377 -#: builtin/blame.c:2358

2448 +#: builtin/blame.c:2279

2449 msgid "Show work cost statistics"

2450 msgstr "Visa statistik över arbetskostnad"

2451

2381 -#: builtin/blame.c:2359

2452 +#: builtin/blame.c:2280

2453 msgid "Show output score for blame entries"

2454 msgstr "Visa utdatapoäng för klandringsposter"

2455

2385 -#: builtin/blame.c:2360

2456 +#: builtin/blame.c:2281

2457 msgid "Show original filename (Default: auto)"

2458 msgstr "Visa originalfilnamn (Standard: auto)"

2459

2389 -#: builtin/blame.c:2361

2460 +#: builtin/blame.c:2282

2461 msgid "Show original linenumber (Default: off)"

2462 msgstr "Visa ursprungligt radnummer (Standard: av)"

2463

2393 -#: builtin/blame.c:2362

2464 +#: builtin/blame.c:2283

2465 msgid "Show in a format designed for machine consumption"

2466 msgstr "Visa i ett format avsett för maskinkonsumtion"

2467

2397 -#: builtin/blame.c:2363

2468 +#: builtin/blame.c:2284

2469 msgid "Show porcelain format with per-line commit information"

2470 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

2471

2401 -#: builtin/blame.c:2364

2472 +#: builtin/blame.c:2285

2473 msgid "Use the same output mode as git-annotate (Default: off)"

2474 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

2475

2405 -#: builtin/blame.c:2365

2476 +#: builtin/blame.c:2286

2477 msgid "Show raw timestamp (Default: off)"

2478 msgstr "Visa rå tidsstämpel (Standard: av)"

2479

2409 -#: builtin/blame.c:2366

2480 +#: builtin/blame.c:2287

2481 msgid "Show long commit SHA1 (Default: off)"

2482 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

2483

2413 -#: builtin/blame.c:2367

2484 +#: builtin/blame.c:2288

2485 msgid "Suppress author name and timestamp (Default: off)"

2486 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

2487

2417 -#: builtin/blame.c:2368

2488 +#: builtin/blame.c:2289

2489 msgid "Show author email instead of name (Default: off)"

2490 msgstr "Visa författarens e-post istället för namn (Standard: av)"

2491

2421 -#: builtin/blame.c:2369

2492 +#: builtin/blame.c:2290

2493 msgid "Ignore whitespace differences"

2494 msgstr "Ignorera ändringar i blanksteg"

2495

2425 -#: builtin/blame.c:2370

2496 +#: builtin/blame.c:2291

2497 msgid "Spend extra cycles to find better match"

2498 msgstr "Slösa extra cykler med att hitta bättre träff"

2499

2429 -#: builtin/blame.c:2371

2500 +#: builtin/blame.c:2292

2501 msgid "Use revisions from <file> instead of calling git-rev-list"

2502 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

2503

2433 -#: builtin/blame.c:2372

2504 +#: builtin/blame.c:2293

2505 msgid "Use <file>'s contents as the final image"

2506 msgstr "Använd <fil>s innehåll som slutgiltig bild"

2507

2437 -#: builtin/blame.c:2373 builtin/blame.c:2374

2508 +#: builtin/blame.c:2294 builtin/blame.c:2295

2509 msgid "score"

2510 msgstr "poäng"

2511

2441 -#: builtin/blame.c:2373

2512 +#: builtin/blame.c:2294

2513 msgid "Find line copies within and across files"

2514 msgstr "Hitta kopierade rader inuti och mellan filer"

2515

2445 -#: builtin/blame.c:2374

2516 +#: builtin/blame.c:2295

2517 msgid "Find line movements within and across files"

2518 msgstr "Hitta flyttade rader inuti och mellan filer"

2519

2449 -#: builtin/blame.c:2375

2520 +#: builtin/blame.c:2296

2521 msgid "n,m"

2522 msgstr "n,m"

2523

2453 -#: builtin/blame.c:2375

2524 +#: builtin/blame.c:2296

2525 msgid "Process only line range n,m, counting from 1"

2526 msgstr "Behandla endast radintervallet n,m, med början på 1"

2527

@@ -2683,8 +2754,8 @@ msgid "act on remote-tracking branches"

2754 msgstr "arbeta på fjärrspårande grenar"

2755

2756 #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832

2686 -#: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369

2687 -#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2757 +#: builtin/branch.c:838 builtin/commit.c:1433 builtin/commit.c:1434

2758 +#: builtin/commit.c:1435 builtin/commit.c:1436 builtin/tag.c:468

2759 msgid "commit"

2760 msgstr "incheckning"

2761

@@ -2748,7 +2819,7 @@ msgstr "visa grenar i spalter"

2819 msgid "Failed to resolve HEAD as a valid ref."

2820 msgstr "Misslyckades slå upp HEAD som giltig referens"

2821

2751 -#: builtin/branch.c:860 builtin/clone.c:619

2822 +#: builtin/branch.c:860 builtin/clone.c:630

2823 msgid "HEAD not found below refs/heads!"

2824 msgstr "HEAD hittades inte under refs/heads!"

2825

@@ -2870,43 +2941,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

2941 msgid "Need a repository to unbundle."

2942 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

2943

2873 -#: builtin/cat-file.c:176

2944 +#: builtin/cat-file.c:285

2945 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"

2946 msgstr "git cat-file (-t|-s|-e|-p|<typ>|--textconv) <objekt>"

2947

2877 -#: builtin/cat-file.c:177

2948 +#: builtin/cat-file.c:286

2949 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>"

2950 msgstr "git cat-file (--batch|--batch-check) < <objektlista>"

2951

2881 -#: builtin/cat-file.c:195

2952 +#: builtin/cat-file.c:323

2953 msgid "<type> can be one of: blob, tree, commit, tag"

2954 msgstr "<typ> kan vara en av: blob, tree, commit, tag"

2955

2885 -#: builtin/cat-file.c:196

2956 +#: builtin/cat-file.c:324

2957 msgid "show object type"

2958 msgstr "visa objekttyp"

2959

2889 -#: builtin/cat-file.c:197

2960 +#: builtin/cat-file.c:325

2961 msgid "show object size"

2962 msgstr "visa objektstorlek"

2963

2893 -#: builtin/cat-file.c:199

2964 +#: builtin/cat-file.c:327

2965 msgid "exit with zero when there's no error"

2966 msgstr "avsluta med noll när det inte uppstått något fel"

2967

2897 -#: builtin/cat-file.c:200

2968 +#: builtin/cat-file.c:328

2969 msgid "pretty-print object's content"

2970 msgstr "visa objektets innehåll snyggt"

2971

2901 -#: builtin/cat-file.c:202

2972 +#: builtin/cat-file.c:330

2973 msgid "for blob objects, run textconv on object's content"

2974 msgstr "för blob-objekt, kör textconv på objektets innehåll"

2975

2905 -#: builtin/cat-file.c:204

2976 +#: builtin/cat-file.c:332

2977 msgid "show info and content of objects fed from the standard input"

2978 msgstr "visa information och innehåll för objekt som listas på standard in"

2979

2909 -#: builtin/cat-file.c:207

2980 +#: builtin/cat-file.c:335

2981 msgid "show info about objects fed from the standard input"

2982 msgstr "visa information för objekt som listas på standard in"

2983

@@ -2934,30 +3005,55 @@ msgstr "läs filnamn från standard in"

3005 msgid "input paths are terminated by a null character"

3006 msgstr "sökvägar avdelas med null-tecken"

3007

2937 -#: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177

3008 +#: builtin/check-ignore.c:18 builtin/checkout.c:1054 builtin/gc.c:177

3009 msgid "suppress progress reporting"

3010 msgstr "undertryck förloppsrapportering"

3011

2941 -#: builtin/check-ignore.c:146

3012 +#: builtin/check-ignore.c:26

3013 +msgid "show non-matching input paths"

3014 +msgstr "visa indatasökvägar som inte träffas"

3015 +

3016 +#: builtin/check-ignore.c:143

3017 msgid "cannot specify pathnames with --stdin"

3018 msgstr "kan inte ange sökvägsnamn med --stdin"

3019

2945 -#: builtin/check-ignore.c:149

3020 +#: builtin/check-ignore.c:146

3021 msgid "-z only makes sense with --stdin"

3022 msgstr "-z kan endast användas tillsammans med --stdin"

3023

2949 -#: builtin/check-ignore.c:151

3024 +#: builtin/check-ignore.c:148

3025 msgid "no path specified"

3026 msgstr "ingen sökväg angavs"

3027

2953 -#: builtin/check-ignore.c:155

3028 +#: builtin/check-ignore.c:152

3029 msgid "--quiet is only valid with a single pathname"

3030 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"

3031

2957 -#: builtin/check-ignore.c:157

3032 +#: builtin/check-ignore.c:154

3033 msgid "cannot have both --quiet and --verbose"

3034 msgstr "kan inte använda både --quiet och --verbose"

3035

3036 +#: builtin/check-ignore.c:157

3037 +msgid "--non-matching is only valid with --verbose"

3038 +msgstr "--non-matching är endast giltig med --verbose"

3039 +

3040 +#: builtin/check-mailmap.c:8

3041 +msgid "git check-mailmap [options] <contact>..."

3042 +msgstr "git check-mailmap [flaggor] <kontakt>..."

3043 +

3044 +#: builtin/check-mailmap.c:13

3045 +msgid "also read contacts from stdin"

3046 +msgstr "läs även kontakter från standard in"

3047 +

3048 +#: builtin/check-mailmap.c:24

3049 +#, c-format

3050 +msgid "unable to parse contact: %s"

3051 +msgstr "kunde inte tolka kontakt: %s"

3052 +

3053 +#: builtin/check-mailmap.c:47

3054 +msgid "no contacts specified"

3055 +msgstr "inga kontakter angavs"

3056 +

3057 #: builtin/checkout-index.c:126

3058 msgid "git checkout-index [options] [--] [<file>...]"

3059 msgstr "git checkout-index [flaggor] [--] [<fil>...]"

@@ -3074,42 +3170,42 @@ msgstr "du måste lösa ditt befintliga index först"

3170 msgid "Can not do reflog for '%s'\n"

3171 msgstr "Kan inte skapa referenslog för \"%s\"\n"

3172

3077 -#: builtin/checkout.c:634

3173 +#: builtin/checkout.c:639

3174 msgid "HEAD is now at"

3175 msgstr "HEAD är nu på"

3176

3081 -#: builtin/checkout.c:641

3177 +#: builtin/checkout.c:646

3178 #, c-format

3179 msgid "Reset branch '%s'\n"

3180 msgstr "Återställ gren \"%s\"\n"

3181

3086 -#: builtin/checkout.c:644

3182 +#: builtin/checkout.c:649

3183 #, c-format

3184 msgid "Already on '%s'\n"

3185 msgstr "Redan på \"%s\"\n"

3186

3091 -#: builtin/checkout.c:648

3187 +#: builtin/checkout.c:653

3188 #, c-format

3189 msgid "Switched to and reset branch '%s'\n"

3190 msgstr "Växlade till och nollställde grenen \"%s\"\n"

3191

3096 -#: builtin/checkout.c:650 builtin/checkout.c:987

3192 +#: builtin/checkout.c:655 builtin/checkout.c:997

3193 #, c-format

3194 msgid "Switched to a new branch '%s'\n"

3195 msgstr "Växlade till en ny gren \"%s\"\n"

3196

3101 -#: builtin/checkout.c:652

3197 +#: builtin/checkout.c:657

3198 #, c-format

3199 msgid "Switched to branch '%s'\n"

3200 msgstr "Växlade till grenen \"%s\"\n"

3201

3106 -#: builtin/checkout.c:708

3202 +#: builtin/checkout.c:713

3203 #, c-format

3204 msgid " ... and %d more.\n"

3205 msgstr " ... och %d till.\n"

3206

3207 #. The singular version

3112 -#: builtin/checkout.c:714

3208 +#: builtin/checkout.c:719

3209 #, c-format

3210 msgid ""

3211 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -3132,7 +3228,7 @@ msgstr[1] ""

3228 "\n"

3229 "%s\n"

3230

3135 -#: builtin/checkout.c:732

3231 +#: builtin/checkout.c:737

3232 #, c-format

3233 msgid ""

3234 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -3147,136 +3243,136 @@ msgstr ""

3243 " git branch nytt_grennamn %s\n"

3244 "\n"

3245

3150 -#: builtin/checkout.c:762

3246 +#: builtin/checkout.c:767

3247 msgid "internal error in revision walk"

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

3249

3154 -#: builtin/checkout.c:766

3250 +#: builtin/checkout.c:771

3251 msgid "Previous HEAD position was"

3252 msgstr "Tidigare position för HEAD var"

3253

3158 -#: builtin/checkout.c:793 builtin/checkout.c:982

3254 +#: builtin/checkout.c:798 builtin/checkout.c:992

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

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

3257

3258 #. case (1)

3163 -#: builtin/checkout.c:918

3259 +#: builtin/checkout.c:928

3260 #, c-format

3261 msgid "invalid reference: %s"

3262 msgstr "felaktig referens: %s"

3263

3264 #. case (1): want a tree

3169 -#: builtin/checkout.c:957

3265 +#: builtin/checkout.c:967

3266 #, c-format

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

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

3269

3174 -#: builtin/checkout.c:996

3270 +#: builtin/checkout.c:1006

3271 msgid "paths cannot be used with switching branches"

3272 msgstr "sökvägar kan inte användas vid byte av gren"

3273

3178 -#: builtin/checkout.c:999 builtin/checkout.c:1003

3274 +#: builtin/checkout.c:1009 builtin/checkout.c:1013

3275 #, c-format

3276 msgid "'%s' cannot be used with switching branches"

3277 msgstr "\"%s\" kan inte användas vid byte av gren"

3278

3183 -#: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015

3184 -#: builtin/checkout.c:1018

3279 +#: builtin/checkout.c:1017 builtin/checkout.c:1020 builtin/checkout.c:1025

3280 +#: builtin/checkout.c:1028

3281 #, c-format

3282 msgid "'%s' cannot be used with '%s'"

3283 msgstr "\"%s\" kan inte användas med \"%s\""

3284

3189 -#: builtin/checkout.c:1023

3285 +#: builtin/checkout.c:1033

3286 #, c-format

3287 msgid "Cannot switch branch to a non-commit '%s'"

3288 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

3289

3194 -#: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90

3290 +#: builtin/checkout.c:1055 builtin/checkout.c:1057 builtin/clone.c:89

3291 #: builtin/remote.c:169 builtin/remote.c:171

3292 msgid "branch"

3293 msgstr "gren"

3294

3199 -#: builtin/checkout.c:1046

3295 +#: builtin/checkout.c:1056

3296 msgid "create and checkout a new branch"

3297 msgstr "skapa och checka ut en ny gren"

3298

3203 -#: builtin/checkout.c:1048

3299 +#: builtin/checkout.c:1058

3300 msgid "create/reset and checkout a branch"

3301 msgstr "skapa/nollställ och checka ut en gren"

3302

3207 -#: builtin/checkout.c:1049

3303 +#: builtin/checkout.c:1059

3304 msgid "create reflog for new branch"

3305 msgstr "skapa reflogg för ny gren"

3306

3211 -#: builtin/checkout.c:1050

3307 +#: builtin/checkout.c:1060

3308 msgid "detach the HEAD at named commit"

3309 msgstr "koppla från HEAD vid namngiven incheckning"

3310

3215 -#: builtin/checkout.c:1051

3311 +#: builtin/checkout.c:1061

3312 msgid "set upstream info for new branch"

3313 msgstr "sätt uppströmsinformation för ny gren"

3314

3219 -#: builtin/checkout.c:1053

3315 +#: builtin/checkout.c:1063

3316 msgid "new branch"

3317 msgstr "ny gren"

3318

3223 -#: builtin/checkout.c:1053

3319 +#: builtin/checkout.c:1063

3320 msgid "new unparented branch"

3321 msgstr "ny gren utan förälder"

3322

3227 -#: builtin/checkout.c:1054

3323 +#: builtin/checkout.c:1064

3324 msgid "checkout our version for unmerged files"

3325 msgstr "checka ut vår version för ej sammanslagna filer"

3326

3231 -#: builtin/checkout.c:1056

3327 +#: builtin/checkout.c:1066

3328 msgid "checkout their version for unmerged files"

3329 msgstr "checka ut deras version för ej sammanslagna filer"

3330

3235 -#: builtin/checkout.c:1058

3331 +#: builtin/checkout.c:1068

3332 msgid "force checkout (throw away local modifications)"

3333 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

3334

3239 -#: builtin/checkout.c:1059

3335 +#: builtin/checkout.c:1069

3336 msgid "perform a 3-way merge with the new branch"

3337 msgstr "utför en 3-vägssammanslagning för den nya grenen"

3338

3243 -#: builtin/checkout.c:1060 builtin/merge.c:217

3339 +#: builtin/checkout.c:1070 builtin/merge.c:232

3340 msgid "update ignored files (default)"

3341 msgstr "uppdatera ignorerade filer (standard)"

3342

3247 -#: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245

3343 +#: builtin/checkout.c:1071 builtin/log.c:1208 parse-options.h:249

3344 msgid "style"

3345 msgstr "stil"

3346

3251 -#: builtin/checkout.c:1062

3347 +#: builtin/checkout.c:1072

3348 msgid "conflict style (merge or diff3)"

3349 msgstr "konfliktstil (merge eller diff3)"

3350

3255 -#: builtin/checkout.c:1065

3351 +#: builtin/checkout.c:1075

3352 msgid "do not limit pathspecs to sparse entries only"

3353 msgstr "begränsa inte sökvägar till endast glesa poster"

3354

3259 -#: builtin/checkout.c:1067

3355 +#: builtin/checkout.c:1077

3356 msgid "second guess 'git checkout no-such-branch'"

3357 msgstr "förutspå \"git checkout gren-saknas\""

3358

3263 -#: builtin/checkout.c:1091

3359 +#: builtin/checkout.c:1101

3360 msgid "-b, -B and --orphan are mutually exclusive"

3361 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

3362

3267 -#: builtin/checkout.c:1108

3363 +#: builtin/checkout.c:1118

3364 msgid "--track needs a branch name"

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

3366

3271 -#: builtin/checkout.c:1115

3367 +#: builtin/checkout.c:1125

3368 msgid "Missing branch name; try -b"

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

3370

3275 -#: builtin/checkout.c:1150

3371 +#: builtin/checkout.c:1160

3372 msgid "invalid path specification"

3373 msgstr "felaktig sökvägsangivelse"

3374

3279 -#: builtin/checkout.c:1157

3375 +#: builtin/checkout.c:1167

3376 #, c-format

3377 msgid ""

3378 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -3285,12 +3381,12 @@ msgstr ""

3381 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

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

3383

3288 -#: builtin/checkout.c:1162

3384 +#: builtin/checkout.c:1172

3385 #, c-format

3386 msgid "git checkout: --detach does not take a path argument '%s'"

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

3388

3293 -#: builtin/checkout.c:1166

3389 +#: builtin/checkout.c:1176

3390 msgid ""

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

3392 "checking out of the index."

@@ -3298,218 +3394,321 @@ msgstr ""

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

3395 "du checkar ut från indexet."

3396

3301 -#: builtin/clean.c:20

3302 -msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3397 +#: builtin/clean.c:25

3398 +msgid ""

3399 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."

3400 msgstr ""

3304 -"git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..."

3401 +"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "

3402 +"<sökvägar>..."

3403

3306 -#: builtin/clean.c:24

3404 +#: builtin/clean.c:29

3405 #, c-format

3406 msgid "Removing %s\n"

3407 msgstr "Tar bort %s\n"

3408

3311 -#: builtin/clean.c:25

3409 +#: builtin/clean.c:30

3410 #, c-format

3411 msgid "Would remove %s\n"

3412 msgstr "Skulle ta bort %s\n"

3413

3316 -#: builtin/clean.c:26

3414 +#: builtin/clean.c:31

3415 #, c-format

3416 msgid "Skipping repository %s\n"

3417 msgstr "Hoppar över arkivet %s\n"

3418

3321 -#: builtin/clean.c:27

3419 +#: builtin/clean.c:32

3420 #, c-format

3421 msgid "Would skip repository %s\n"

3422 msgstr "Skulle hoppa över arkivet %s\n"

3423

3326 -#: builtin/clean.c:28

3424 +#: builtin/clean.c:33

3425 #, c-format

3426 msgid "failed to remove %s"

3427 msgstr "misslyckades ta bort %s"

3428

3331 -#: builtin/clean.c:160

3429 +#: builtin/clean.c:293

3430 +msgid ""

3431 +"Prompt help:\n"

3432 +"1 - select a numbered item\n"

3433 +"foo - select item based on unique prefix\n"

3434 +" - (empty) select nothing"

3435 +msgstr ""

3436 +"Kommandohjälp:\n"

3437 +"1 - markera en numrerad post\n"

3438 +"foo - markera post baserad på unikt prefix\n"

3439 +" - (tomt) markera ingenting"

3440 +

3441 +#: builtin/clean.c:297

3442 +msgid ""

3443 +"Prompt help:\n"

3444 +"1 - select a single item\n"

3445 +"3-5 - select a range of items\n"

3446 +"2-3,6-9 - select multiple ranges\n"

3447 +"foo - select item based on unique prefix\n"

3448 +"-... - unselect specified items\n"

3449 +"* - choose all items\n"

3450 +" - (empty) finish selecting"

3451 +msgstr ""

3452 +"Kommandohjälp:\n"

3453 +"1 - markera en ensam post\n"

3454 +"3-5 - markera ett intervall med poster\n"

3455 +"2-3,6-9 - markera flera intervall\n"

3456 +"foo - markera post baserad på unikt prefix\n"

3457 +"-... - avmarkera specifika poster\n"

3458 +"* - välj alla poster\n"

3459 +" - (tomt) avsluta markering"

3460 +

3461 +#: builtin/clean.c:515

3462 +#, c-format

3463 +msgid "Huh (%s)?"

3464 +msgstr "Vadå (%s)?"

3465 +

3466 +#: builtin/clean.c:658

3467 +#, c-format

3468 +msgid "Input ignore patterns>> "

3469 +msgstr "Ange ignoreringsmönster>>"

3470 +

3471 +#: builtin/clean.c:695

3472 +#, c-format

3473 +msgid "WARNING: Cannot find items matched by: %s"

3474 +msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3475 +

3476 +#: builtin/clean.c:716

3477 +msgid "Select items to delete"

3478 +msgstr "Välj poster att ta bort"

3479 +

3480 +#: builtin/clean.c:756

3481 +#, c-format

3482 +msgid "remove %s? "

3483 +msgstr "ta bort %s?"

3484 +

3485 +#: builtin/clean.c:781

3486 +msgid "Bye."

3487 +msgstr "Hej då."

3488 +

3489 +#: builtin/clean.c:789

3490 +msgid ""

3491 +"clean - start cleaning\n"

3492 +"filter by pattern - exclude items from deletion\n"

3493 +"select by numbers - select items to be deleted by numbers\n"

3494 +"ask each - confirm each deletion (like \"rm -i\")\n"

3495 +"quit - stop cleaning\n"

3496 +"help - this screen\n"

3497 +"? - help for prompt selection"

3498 +msgstr ""

3499 +"clean - börja städa\n"

3500 +"filter by pattern - uteslut poster från borttagning\n"

3501 +"select by numbers - markera poster som ska tas bort med siffror\n"

3502 +"ask each - bekräfta varje borttagning (som \"rm -i\")\n"

3503 +"quit - sluta städa\n"

3504 +"help - denna skärm\n"

3505 +"? - hjälp för kommandoval"

3506 +

3507 +#: builtin/clean.c:816

3508 +msgid "*** Commands ***"

3509 +msgstr "*** Kommandon ***"

3510 +

3511 +#: builtin/clean.c:817

3512 +msgid "What now"

3513 +msgstr "Vad nu"

3514 +

3515 +#: builtin/clean.c:825

3516 +msgid "Would remove the following item:"

3517 +msgid_plural "Would remove the following items:"

3518 +msgstr[0] "Skulle ta bort följande post:"

3519 +msgstr[1] "Skulle ta bort följande poster:"

3520 +

3521 +#: builtin/clean.c:842

3522 +msgid "No more files to clean, exiting."

3523 +msgstr "Inga fler filer att städa, avslutar."

3524 +

3525 +#: builtin/clean.c:874

3526 msgid "do not print names of files removed"

3527 msgstr "skriv inte ut namn på borttagna filer"

3528

3335 -#: builtin/clean.c:162

3529 +#: builtin/clean.c:876

3530 msgid "force"

3531 msgstr "tvinga"

3532

3339 -#: builtin/clean.c:164

3533 +#: builtin/clean.c:877

3534 +msgid "interactive cleaning"

3535 +msgstr "städa interaktivt"

3536 +

3537 +#: builtin/clean.c:879

3538 msgid "remove whole directories"

3539 msgstr "ta bort hela kataloger"

3540

3343 -#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3344 -#: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182

3541 +#: builtin/clean.c:880 builtin/describe.c:420 builtin/grep.c:716

3542 +#: builtin/ls-files.c:493 builtin/name-rev.c:315 builtin/show-ref.c:186

3543 msgid "pattern"

3544 msgstr "mönster"

3545

3348 -#: builtin/clean.c:166

3546 +#: builtin/clean.c:881

3547 msgid "add <pattern> to ignore rules"

3548 msgstr "lägg till <mönster> till ignoreringsregler"

3549

3352 -#: builtin/clean.c:167

3550 +#: builtin/clean.c:882

3551 msgid "remove ignored files, too"

3552 msgstr "ta även bort ignorerade filer"

3553

3356 -#: builtin/clean.c:169

3554 +#: builtin/clean.c:884

3555 msgid "remove only ignored files"

3556 msgstr "ta endast bort ignorerade filer"

3557

3360 -#: builtin/clean.c:187

3558 +#: builtin/clean.c:902

3559 msgid "-x and -X cannot be used together"

3560 msgstr "-x och -X kan inte användas samtidigt"

3561

3364 -#: builtin/clean.c:191

3562 +#: builtin/clean.c:906

3563 msgid ""

3366 -"clean.requireForce set to true and neither -n nor -f given; refusing to clean"

3564 +"clean.requireForce set to true and neither -i, -n nor -f given; refusing to "

3565 +"clean"

3566 msgstr ""

3368 -"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar "

3567 +"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

3568 "städa"

3569

3371 -#: builtin/clean.c:194

3570 +#: builtin/clean.c:909

3571 msgid ""

3373 -"clean.requireForce defaults to true and neither -n nor -f given; refusing to "

3374 -"clean"

3572 +"clean.requireForce defaults to true and neither -i, -n nor -f given; "

3573 +"refusing to clean"

3574 msgstr ""

3376 -"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; "

3377 -"vägrar städa"

3575 +"clean.requireForce har standardvärdet true och varken -i, -n eller -f "

3576 +"angavs; vägrar städa"

3577

3379 -#: builtin/clone.c:37

3578 +#: builtin/clone.c:36

3579 msgid "git clone [options] [--] <repo> [<dir>]"

3580 msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

3581

3383 -#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3384 -#: builtin/push.c:436

3582 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:229

3583 +#: builtin/push.c:462

3584 msgid "force progress reporting"

3585 msgstr "tvinga förloppsrapportering"

3586

3388 -#: builtin/clone.c:67

3587 +#: builtin/clone.c:66

3588 msgid "don't create a checkout"

3589 msgstr "skapa inte någon utcheckning"

3590

3392 -#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3591 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

3592 msgid "create a bare repository"

3593 msgstr "skapa ett naket (\"bare\") arkiv"

3594

3396 -#: builtin/clone.c:73

3595 +#: builtin/clone.c:72

3596 msgid "create a mirror repository (implies bare)"

3597 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

3598

3400 -#: builtin/clone.c:75

3599 +#: builtin/clone.c:74

3600 msgid "to clone from a local repository"

3601 msgstr "för att klona från ett lokalt arkiv"

3602

3404 -#: builtin/clone.c:77

3603 +#: builtin/clone.c:76

3604 msgid "don't use local hardlinks, always copy"

3605 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

3606

3408 -#: builtin/clone.c:79

3607 +#: builtin/clone.c:78

3608 msgid "setup as shared repository"

3609 msgstr "skapa som ett delat arkiv"

3610

3412 -#: builtin/clone.c:81 builtin/clone.c:83

3611 +#: builtin/clone.c:80 builtin/clone.c:82

3612 msgid "initialize submodules in the clone"

3613 msgstr "initiera undermoduler i klonen"

3614

3416 -#: builtin/clone.c:84 builtin/init-db.c:485

3615 +#: builtin/clone.c:83 builtin/init-db.c:485

3616 msgid "template-directory"

3617 msgstr "mallkatalog"

3618

3420 -#: builtin/clone.c:85 builtin/init-db.c:486

3619 +#: builtin/clone.c:84 builtin/init-db.c:486

3620 msgid "directory from which templates will be used"

3621 msgstr "katalog att använda mallar från"

3622

3424 -#: builtin/clone.c:87

3623 +#: builtin/clone.c:86

3624 msgid "reference repository"

3625 msgstr "referensarkiv"

3626

3428 -#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3627 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3628 msgid "name"

3629 msgstr "namn"

3630

3432 -#: builtin/clone.c:89

3631 +#: builtin/clone.c:88

3632 msgid "use <name> instead of 'origin' to track upstream"

3633 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

3634

3436 -#: builtin/clone.c:91

3635 +#: builtin/clone.c:90

3636 msgid "checkout <branch> instead of the remote's HEAD"

3637 msgstr "checka ut <gren> istället för fjärrens HEAD"

3638

3440 -#: builtin/clone.c:93

3639 +#: builtin/clone.c:92

3640 msgid "path to git-upload-pack on the remote"

3641 msgstr "sökväg till git-upload-pack på fjärren"

3642

3444 -#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3643 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:661

3644 msgid "depth"

3645 msgstr "djup"

3646

3448 -#: builtin/clone.c:95

3647 +#: builtin/clone.c:94

3648 msgid "create a shallow clone of that depth"

3649 msgstr "skapa en grund klon på detta djup"

3650

3452 -#: builtin/clone.c:97

3651 +#: builtin/clone.c:96

3652 msgid "clone only one branch, HEAD or --branch"

3653 msgstr "klona endast en gren, HEAD eller --branch"

3654

3456 -#: builtin/clone.c:98 builtin/init-db.c:494

3655 +#: builtin/clone.c:97 builtin/init-db.c:494

3656 msgid "gitdir"

3657 msgstr "gitkat"

3658

3460 -#: builtin/clone.c:99 builtin/init-db.c:495

3659 +#: builtin/clone.c:98 builtin/init-db.c:495

3660 msgid "separate git dir from working tree"

3661 msgstr "separera gitkatalogen från arbetskatalogen"

3662

3464 -#: builtin/clone.c:100

3663 +#: builtin/clone.c:99

3664 msgid "key=value"

3665 msgstr "nyckel=värde"

3666

3468 -#: builtin/clone.c:101

3667 +#: builtin/clone.c:100

3668 msgid "set config inside the new repository"

3669 msgstr "ställ in konfiguration i det nya arkivet"

3670

3472 -#: builtin/clone.c:254

3671 +#: builtin/clone.c:253

3672 #, c-format

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

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

3675

3477 -#: builtin/clone.c:317

3676 +#: builtin/clone.c:316

3677 #, c-format

3678 msgid "failed to create directory '%s'"

3679 msgstr "misslyckades skapa katalogen \"%s\""

3680

3482 -#: builtin/clone.c:319 builtin/diff.c:77

3681 +#: builtin/clone.c:318 builtin/diff.c:77

3682 #, c-format

3683 msgid "failed to stat '%s'"

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

3685

3487 -#: builtin/clone.c:321

3686 +#: builtin/clone.c:320

3687 #, c-format

3688 msgid "%s exists and is not a directory"

3689 msgstr "%s finns och är ingen katalog"

3690

3492 -#: builtin/clone.c:335

3691 +#: builtin/clone.c:334

3692 #, c-format

3693 msgid "failed to stat %s\n"

3694 msgstr "misslyckades ta status på %s\n"

3695

3497 -#: builtin/clone.c:357

3696 +#: builtin/clone.c:356

3697 #, c-format

3698 msgid "failed to create link '%s'"

3699 msgstr "misslyckades skapa länken \"%s\""

3700

3502 -#: builtin/clone.c:361

3701 +#: builtin/clone.c:360

3702 #, c-format

3703 msgid "failed to copy file to '%s'"

3704 msgstr "misslyckades kopiera filen till \"%s\""

3705

3507 -#: builtin/clone.c:384

3706 +#: builtin/clone.c:383

3707 #, c-format

3708 msgid "done.\n"

3709 msgstr "klart.\n"

3710

3512 -#: builtin/clone.c:397

3711 +#: builtin/clone.c:396

3712 msgid ""

3713 "Clone succeeded, but checkout failed.\n"

3714 "You can inspect what was checked out with 'git status'\n"

@@ -3519,91 +3718,105 @@ msgstr ""

3718 "Du kan inspektera det som checkades ut med \"git status\"\n"

3719 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

3720

3522 -#: builtin/clone.c:476

3721 +#: builtin/clone.c:475

3722 #, c-format

3723 msgid "Could not find remote branch %s to clone."

3724 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

3725

3527 -#: builtin/clone.c:550

3726 +#: builtin/clone.c:555

3727 +#, c-format

3728 +msgid "Checking connectivity... "

3729 +msgstr "Kontrollerar anslutning..."

3730 +

3731 +#: builtin/clone.c:558

3732 msgid "remote did not send all necessary objects"

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

3734

3531 -#: builtin/clone.c:610

3735 +#: builtin/clone.c:560

3736 +#, c-format

3737 +msgid "done\n"

3738 +msgstr "klart\n"

3739 +

3740 +#: builtin/clone.c:621

3741 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3742 msgstr ""

3743 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

3744

3536 -#: builtin/clone.c:641

3745 +#: builtin/clone.c:652

3746 msgid "unable to checkout working tree"

3747 msgstr "kunde inte checka ut arbetskatalogen"

3748

3540 -#: builtin/clone.c:749

3749 +#: builtin/clone.c:760

3750 msgid "Too many arguments."

3751 msgstr "För många argument."

3752

3544 -#: builtin/clone.c:753

3753 +#: builtin/clone.c:764

3754 msgid "You must specify a repository to clone."

3755 msgstr "Du måste ange ett arkiv att klona."

3756

3548 -#: builtin/clone.c:764

3757 +#: builtin/clone.c:775

3758 #, c-format

3759 msgid "--bare and --origin %s options are incompatible."

3760 msgstr "flaggorna --bare och --origin %s är inkompatibla."

3761

3553 -#: builtin/clone.c:767

3762 +#: builtin/clone.c:778

3763 msgid "--bare and --separate-git-dir are incompatible."

3764 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

3765

3557 -#: builtin/clone.c:780

3766 +#: builtin/clone.c:791

3767 #, c-format

3768 msgid "repository '%s' does not exist"

3769 msgstr "arkivet \"%s\" finns inte"

3770

3562 -#: builtin/clone.c:785

3771 +#: builtin/clone.c:796

3772 msgid "--depth is ignored in local clones; use file:// instead."

3773 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

3774

3566 -#: builtin/clone.c:795

3775 +#: builtin/clone.c:798

3776 +msgid "--local is ignored"

3777 +msgstr "--local ignoreras"

3778 +

3779 +#: builtin/clone.c:808

3780 #, c-format

3781 msgid "destination path '%s' already exists and is not an empty directory."

3782 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

3783

3571 -#: builtin/clone.c:805

3784 +#: builtin/clone.c:818

3785 #, c-format

3786 msgid "working tree '%s' already exists."

3787 msgstr "arbetsträdet \"%s\" finns redan."

3788

3576 -#: builtin/clone.c:818 builtin/clone.c:830

3789 +#: builtin/clone.c:831 builtin/clone.c:843

3790 #, c-format

3791 msgid "could not create leading directories of '%s'"

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

3793

3581 -#: builtin/clone.c:821

3794 +#: builtin/clone.c:834

3795 #, c-format

3796 msgid "could not create work tree dir '%s'."

3797 msgstr "kunde inte skapa arbetskatalogen \"%s\""

3798

3586 -#: builtin/clone.c:840

3799 +#: builtin/clone.c:853

3800 #, c-format

3801 msgid "Cloning into bare repository '%s'...\n"

3802 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

3803

3591 -#: builtin/clone.c:842

3804 +#: builtin/clone.c:855

3805 #, c-format

3806 msgid "Cloning into '%s'...\n"

3807 msgstr "Klonar till \"%s\"...\n"

3808

3596 -#: builtin/clone.c:877

3809 +#: builtin/clone.c:890

3810 #, c-format

3811 msgid "Don't know how to clone %s"

3812 msgstr "Vet inte hur man klonar %s"

3813

3601 -#: builtin/clone.c:926

3814 +#: builtin/clone.c:942

3815 #, c-format

3816 msgid "Remote branch %s not found in upstream %s"

3817 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

3818

3606 -#: builtin/clone.c:933

3819 +#: builtin/clone.c:949

3820 msgid "You appear to have cloned an empty repository."

3821 msgstr "Du verkar ha klonat ett tomt arkiv."

3822

@@ -3639,15 +3852,15 @@ msgstr "Spaltfyllnad mellan spalter"

3852 msgid "--command must be the first argument"

3853 msgstr "--command måste vara första argument"

3854

3642 -#: builtin/commit.c:34

3855 +#: builtin/commit.c:35

3856 msgid "git commit [options] [--] <pathspec>..."

3857 msgstr "git commit [flaggor] [--] <sökväg>..."

3858

3646 -#: builtin/commit.c:39

3859 +#: builtin/commit.c:40

3860 msgid "git status [options] [--] <pathspec>..."

3861 msgstr "git status [flaggor] [--] <sökväg>..."

3862

3650 -#: builtin/commit.c:44

3863 +#: builtin/commit.c:45

3864 msgid ""

3865 "Your name and email address were configured automatically based\n"

3866 "on your username and hostname. Please check that they are accurate.\n"

@@ -3672,7 +3885,7 @@ msgstr ""

3885 "\n"

3886 " git commit --amend --reset-author\n"

3887

3675 -#: builtin/commit.c:56

3888 +#: builtin/commit.c:57

3889 msgid ""

3890 "You asked to amend the most recent commit, but doing so would make\n"

3891 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -3682,109 +3895,127 @@ msgstr ""

3895 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"

3896 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"

3897

3685 -#: builtin/commit.c:61

3898 +#: builtin/commit.c:62

3899 msgid ""

3900 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3901 "If you wish to commit it anyway, use:\n"

3902 "\n"

3903 " git commit --allow-empty\n"

3904 "\n"

3692 -"Otherwise, please use 'git reset'\n"

3905 msgstr ""

3906 "Den tidigare \"cherry-pick\":en är nu tom, kanske på grund av en löst\n"

3907 "konflikt. Om du vill checka in den ändå använder du:\n"

3908 "\n"

3909 " git commit --allow-empty\n"

3910 "\n"

3699 -"Annars använder du \"git reset\"\n"

3911

3701 -#: builtin/commit.c:260

3912 +#: builtin/commit.c:69

3913 +msgid "Otherwise, please use 'git reset'\n"

3914 +msgstr "Använd annars \"git reset\"\n"

3915 +

3916 +#: builtin/commit.c:72

3917 +msgid ""

3918 +"If you wish to skip this commit, use:\n"

3919 +"\n"

3920 +" git reset\n"

3921 +"\n"

3922 +"Then \"git cherry-pick --continue\" will resume cherry-picking\n"

3923 +"the remaining commits.\n"

3924 +msgstr ""

3925 +"Om du vill hoppa över incheckningen, använd:\n"

3926 +"\n"

3927 +" git reset\n"

3928 +"\n"

3929 +"\"git cherry-pick --continue\" kommer därefter att återuppta\n"

3930 +"cherry-pick för återstående incheckningar.\n"

3931 +

3932 +#: builtin/commit.c:279

3933 msgid "failed to unpack HEAD tree object"

3934 msgstr "misslyckades packa upp HEAD:s trädobjekt"

3935

3705 -#: builtin/commit.c:302

3936 +#: builtin/commit.c:321

3937 msgid "unable to create temporary index"

3938 msgstr "kunde inte skapa temporär indexfil"

3939

3709 -#: builtin/commit.c:308

3940 +#: builtin/commit.c:327

3941 msgid "interactive add failed"

3942 msgstr "interaktiv tilläggning misslyckades"

3943

3713 -#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3944 +#: builtin/commit.c:360 builtin/commit.c:381 builtin/commit.c:431

3945 msgid "unable to write new_index file"

3946 msgstr "kunde inte skriva filen new_index"

3947

3717 -#: builtin/commit.c:393

3948 +#: builtin/commit.c:412

3949 msgid "cannot do a partial commit during a merge."

3950 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

3951

3721 -#: builtin/commit.c:395

3952 +#: builtin/commit.c:414

3953 msgid "cannot do a partial commit during a cherry-pick."

3954 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

3955

3725 -#: builtin/commit.c:405

3956 +#: builtin/commit.c:424

3957 msgid "cannot read the index"

3958 msgstr "kan inte läsa indexet"

3959

3729 -#: builtin/commit.c:425

3960 +#: builtin/commit.c:444

3961 msgid "unable to write temporary index file"

3962 msgstr "kunde inte skriva temporär indexfil"

3963

3733 -#: builtin/commit.c:513 builtin/commit.c:519

3964 +#: builtin/commit.c:535 builtin/commit.c:541

3965 #, c-format

3966 msgid "invalid commit: %s"

3967 msgstr "felaktig incheckning: %s"

3968

3738 -#: builtin/commit.c:542

3969 +#: builtin/commit.c:563

3970 msgid "malformed --author parameter"

3971 msgstr "felformad \"--author\"-flagga"

3972

3742 -#: builtin/commit.c:562

3973 +#: builtin/commit.c:583

3974 #, c-format

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

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

3977

3747 -#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3978 +#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:982

3979 #, c-format

3980 msgid "could not lookup commit %s"

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

3982

3752 -#: builtin/commit.c:612 builtin/shortlog.c:270

3983 +#: builtin/commit.c:633 builtin/shortlog.c:271

3984 #, c-format

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

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

3987

3757 -#: builtin/commit.c:614

3988 +#: builtin/commit.c:635

3989 msgid "could not read log from standard input"

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

3991

3761 -#: builtin/commit.c:618

3992 +#: builtin/commit.c:639

3993 #, c-format

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

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

3996

3766 -#: builtin/commit.c:624

3997 +#: builtin/commit.c:645

3998 msgid "commit has empty message"

3999 msgstr "incheckningen har ett tomt meddelande"

4000

3770 -#: builtin/commit.c:640

4001 +#: builtin/commit.c:661

4002 msgid "could not read MERGE_MSG"

4003 msgstr "kunde inte läsa MERGE_MSG"

4004

3774 -#: builtin/commit.c:644

4005 +#: builtin/commit.c:665

4006 msgid "could not read SQUASH_MSG"

4007 msgstr "kunde inte läsa SQUASH_MSG"

4008

3778 -#: builtin/commit.c:648

4009 +#: builtin/commit.c:669

4010 #, c-format

4011 msgid "could not read '%s'"

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

4013

3783 -#: builtin/commit.c:709

4014 +#: builtin/commit.c:730

4015 msgid "could not write commit template"

4016 msgstr "kunde inte skriva incheckningsmall"

4017

3787 -#: builtin/commit.c:720

4018 +#: builtin/commit.c:741

4019 #, c-format

4020 msgid ""

4021 "\n"

@@ -3799,7 +4030,7 @@ msgstr ""

4030 "\t%s\n"

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

4032

3802 -#: builtin/commit.c:725

4033 +#: builtin/commit.c:746

4034 #, c-format

4035 msgid ""

4036 "\n"

@@ -3814,7 +4045,7 @@ msgstr ""

4045 "\t%s\n"

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

4047

3817 -#: builtin/commit.c:737

4048 +#: builtin/commit.c:758

4049 #, c-format

4050 msgid ""

4051 "Please enter the commit message for your changes. Lines starting\n"

@@ -3824,7 +4055,7 @@ msgstr ""

4055 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4056 "incheckningen.\n"

4057

3827 -#: builtin/commit.c:742

4058 +#: builtin/commit.c:763

4059 #, c-format

4060 msgid ""

4061 "Please enter the commit message for your changes. Lines starting\n"

@@ -3835,139 +4066,139 @@ msgstr ""

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

4067 "Ett tomt meddelande avbryter incheckningen.\n"

4068

3838 -#: builtin/commit.c:755

4069 +#: builtin/commit.c:776

4070 #, c-format

4071 msgid "%sAuthor: %s"

4072 msgstr "%sFörfattare: %s"

4073

3843 -#: builtin/commit.c:762

4074 +#: builtin/commit.c:783

4075 #, c-format

4076 msgid "%sCommitter: %s"

4077 msgstr "%sIncheckare: %s"

4078

3848 -#: builtin/commit.c:782

4079 +#: builtin/commit.c:803

4080 msgid "Cannot read index"

4081 msgstr "Kan inte läsa indexet"

4082

3852 -#: builtin/commit.c:819

4083 +#: builtin/commit.c:845

4084 msgid "Error building trees"

4085 msgstr "Fel vid byggande av träd"

4086

3856 -#: builtin/commit.c:834 builtin/tag.c:359

4087 +#: builtin/commit.c:860 builtin/tag.c:359

4088 #, c-format

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

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

4091

3861 -#: builtin/commit.c:931

4092 +#: builtin/commit.c:957

4093 #, c-format

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

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

4096

3866 -#: builtin/commit.c:946 builtin/commit.c:1140

4097 +#: builtin/commit.c:972 builtin/commit.c:1208

4098 #, c-format

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

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

4101

3871 -#: builtin/commit.c:976

4102 +#: builtin/commit.c:1009

4103 +msgid "--long and -z are incompatible"

4104 +msgstr "--long och -z är inkompatibla"

4105 +

4106 +#: builtin/commit.c:1039

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

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

4109

3875 -#: builtin/commit.c:987

4110 +#: builtin/commit.c:1050

4111 msgid "You have nothing to amend."

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

4113

3879 -#: builtin/commit.c:990

4114 +#: builtin/commit.c:1053

4115 msgid "You are in the middle of a merge -- cannot amend."

4116 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

4117

3883 -#: builtin/commit.c:992

4118 +#: builtin/commit.c:1055

4119 msgid "You are in the middle of a cherry-pick -- cannot amend."

4120 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

4121

3887 -#: builtin/commit.c:995

4122 +#: builtin/commit.c:1058

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

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

4125

3891 -#: builtin/commit.c:1005

4126 +#: builtin/commit.c:1068

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

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

4129

3895 -#: builtin/commit.c:1007

4130 +#: builtin/commit.c:1070

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

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

4133

3899 -#: builtin/commit.c:1015

4134 +#: builtin/commit.c:1078

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

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

4137

3903 -#: builtin/commit.c:1032

4138 +#: builtin/commit.c:1095

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

4140 msgstr ""

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

4142

3908 -#: builtin/commit.c:1034

4143 +#: builtin/commit.c:1097

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

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

4146

3912 -#: builtin/commit.c:1036

4147 +#: builtin/commit.c:1099

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

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

4150

3916 -#: builtin/commit.c:1038

4151 +#: builtin/commit.c:1101

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

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

4154

3920 -#: builtin/commit.c:1048 builtin/tag.c:575

4155 +#: builtin/commit.c:1111 builtin/tag.c:575

4156 #, c-format

4157 msgid "Invalid cleanup mode %s"

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

4159

3925 -#: builtin/commit.c:1053

4160 +#: builtin/commit.c:1116

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

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

4163

3929 -#: builtin/commit.c:1059 builtin/commit.c:1194

3930 -msgid "--long and -z are incompatible"

3931 -msgstr "--long och -z är inkompatibla"

3932 -

3933 -#: builtin/commit.c:1154 builtin/commit.c:1390

4164 +#: builtin/commit.c:1222 builtin/commit.c:1455

4165 msgid "show status concisely"

3935 -msgstr "vis koncis status"

4166 +msgstr "visa koncis status"

4167

3937 -#: builtin/commit.c:1156 builtin/commit.c:1392

4168 +#: builtin/commit.c:1224 builtin/commit.c:1457

4169 msgid "show branch information"

4170 msgstr "visa information om gren"

4171

3941 -#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

4172 +#: builtin/commit.c:1226 builtin/commit.c:1459 builtin/push.c:452

4173 msgid "machine-readable output"

4174 msgstr "maskinläsbar utdata"

4175

3945 -#: builtin/commit.c:1161 builtin/commit.c:1396

4176 +#: builtin/commit.c:1229 builtin/commit.c:1461

4177 msgid "show status in long format (default)"

4178 msgstr "visa status i långt format (standard)"

4179

3949 -#: builtin/commit.c:1164 builtin/commit.c:1399

4180 +#: builtin/commit.c:1232 builtin/commit.c:1464

4181 msgid "terminate entries with NUL"

4182 msgstr "terminera poster med NUL"

4183

3953 -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659

3954 -#: builtin/fast-export.c:662 builtin/tag.c:459

4184 +#: builtin/commit.c:1234 builtin/commit.c:1467 builtin/fast-export.c:667

4185 +#: builtin/fast-export.c:670 builtin/tag.c:459

4186 msgid "mode"

4187 msgstr "läge"

4188

3958 -#: builtin/commit.c:1167 builtin/commit.c:1402

4189 +#: builtin/commit.c:1235 builtin/commit.c:1467

4190 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4191 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4192

3962 -#: builtin/commit.c:1170

4193 +#: builtin/commit.c:1238

4194 msgid "show ignored files"

4195 msgstr "visa ignorerade filer"

4196

3966 -#: builtin/commit.c:1171 parse-options.h:151

4197 +#: builtin/commit.c:1239 parse-options.h:154

4198 msgid "when"

4199 msgstr "när"

4200

3970 -#: builtin/commit.c:1172

4201 +#: builtin/commit.c:1240

4202 msgid ""

4203 "ignore changes to submodules, optional when: all, dirty, untracked. "

4204 "(Default: all)"

@@ -3975,217 +4206,217 @@ msgstr ""

4206 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4207 "(Default: all)"

4208

3978 -#: builtin/commit.c:1174

4209 +#: builtin/commit.c:1242

4210 msgid "list untracked files in columns"

4211 msgstr "visa ospårade filer i spalter"

4212

3982 -#: builtin/commit.c:1248

4213 +#: builtin/commit.c:1313

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

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

4216

3986 -#: builtin/commit.c:1250

4217 +#: builtin/commit.c:1315

4218 msgid "could not parse newly created commit"

4219 msgstr "kunde inte tolka en precis skapad incheckning"

4220

3990 -#: builtin/commit.c:1291

4221 +#: builtin/commit.c:1356

4222 msgid "detached HEAD"

4223 msgstr "frånkopplad HEAD"

4224

3994 -#: builtin/commit.c:1293

4225 +#: builtin/commit.c:1358

4226 msgid " (root-commit)"

4227 msgstr " (rotincheckning)"

4228

3998 -#: builtin/commit.c:1360

4229 +#: builtin/commit.c:1425

4230 msgid "suppress summary after successful commit"

4231 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4232

4002 -#: builtin/commit.c:1361

4233 +#: builtin/commit.c:1426

4234 msgid "show diff in commit message template"

4235 msgstr "visa diff i mallen för incheckningsmeddelandet"

4236

4006 -#: builtin/commit.c:1363

4237 +#: builtin/commit.c:1428

4238 msgid "Commit message options"

4239 msgstr "Alternativ för incheckningsmeddelande"

4240

4010 -#: builtin/commit.c:1364 builtin/tag.c:457

4241 +#: builtin/commit.c:1429 builtin/tag.c:457

4242 msgid "read message from file"

4243 msgstr "läs meddelande från fil"

4244

4014 -#: builtin/commit.c:1365

4245 +#: builtin/commit.c:1430

4246 msgid "author"

4247 msgstr "författare"

4248

4018 -#: builtin/commit.c:1365

4249 +#: builtin/commit.c:1430

4250 msgid "override author for commit"

4251 msgstr "överstyr författare för incheckningen"

4252

4022 -#: builtin/commit.c:1366 builtin/gc.c:178

4253 +#: builtin/commit.c:1431 builtin/gc.c:178

4254 msgid "date"

4255 msgstr "datum"

4256

4026 -#: builtin/commit.c:1366

4257 +#: builtin/commit.c:1431

4258 msgid "override date for commit"

4259 msgstr "överstyr datum för inchecknignen"

4260

4030 -#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

4031 -#: builtin/notes.c:690 builtin/tag.c:455

4261 +#: builtin/commit.c:1432 builtin/merge.c:223 builtin/notes.c:405

4262 +#: builtin/notes.c:562 builtin/tag.c:455

4263 msgid "message"

4264 msgstr "meddelande"

4265

4035 -#: builtin/commit.c:1367

4266 +#: builtin/commit.c:1432

4267 msgid "commit message"

4268 msgstr "incheckningsmeddelande"

4269

4039 -#: builtin/commit.c:1368

4270 +#: builtin/commit.c:1433

4271 msgid "reuse and edit message from specified commit"

4272 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4273

4043 -#: builtin/commit.c:1369

4274 +#: builtin/commit.c:1434

4275 msgid "reuse message from specified commit"

4276 msgstr "återanvänd meddelande från angiven incheckning"

4277

4047 -#: builtin/commit.c:1370

4278 +#: builtin/commit.c:1435

4279 msgid "use autosquash formatted message to fixup specified commit"

4280 msgstr ""

4281 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4282

4052 -#: builtin/commit.c:1371

4283 +#: builtin/commit.c:1436

4284 msgid "use autosquash formatted message to squash specified commit"

4285 msgstr ""

4286 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4287 "incheckning"

4288

4058 -#: builtin/commit.c:1372

4289 +#: builtin/commit.c:1437

4290 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4291 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4292

4062 -#: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109

4293 +#: builtin/commit.c:1438 builtin/log.c:1160 builtin/revert.c:111

4294 msgid "add Signed-off-by:"

4295 msgstr "lägg till Signed-off-by:"

4296

4066 -#: builtin/commit.c:1374

4297 +#: builtin/commit.c:1439

4298 msgid "use specified template file"

4299 msgstr "använd angiven mallfil"

4300

4070 -#: builtin/commit.c:1375

4301 +#: builtin/commit.c:1440

4302 msgid "force edit of commit"

4303 msgstr "tvinga redigering av incheckning"

4304

4074 -#: builtin/commit.c:1376

4305 +#: builtin/commit.c:1441

4306 msgid "default"

4307 msgstr "standard"

4308

4078 -#: builtin/commit.c:1376 builtin/tag.c:460

4309 +#: builtin/commit.c:1441 builtin/tag.c:460

4310 msgid "how to strip spaces and #comments from message"

4311 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4312

4082 -#: builtin/commit.c:1377

4313 +#: builtin/commit.c:1442

4314 msgid "include status in commit message template"

4315 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4316

4086 -#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

4317 +#: builtin/commit.c:1443 builtin/merge.c:230 builtin/tag.c:461

4318 msgid "key id"

4319 msgstr "nyckel-id"

4320

4090 -#: builtin/commit.c:1379 builtin/merge.c:216

4321 +#: builtin/commit.c:1444 builtin/merge.c:231

4322 msgid "GPG sign commit"

4323 msgstr "GPG-signera incheckning"

4324

4325 #. end commit message options

4095 -#: builtin/commit.c:1382

4326 +#: builtin/commit.c:1447

4327 msgid "Commit contents options"

4328 msgstr "Alternativ för incheckningens innehåll"

4329

4099 -#: builtin/commit.c:1383

4330 +#: builtin/commit.c:1448

4331 msgid "commit all changed files"

4332 msgstr "checka in alla ändrade filer"

4333

4103 -#: builtin/commit.c:1384

4334 +#: builtin/commit.c:1449

4335 msgid "add specified files to index for commit"

4336 msgstr "lägg till angivna filer till indexet för incheckning"

4337

4107 -#: builtin/commit.c:1385

4338 +#: builtin/commit.c:1450

4339 msgid "interactively add files"

4340 msgstr "lägg till filer interaktivt"

4341

4111 -#: builtin/commit.c:1386

4342 +#: builtin/commit.c:1451

4343 msgid "interactively add changes"

4344 msgstr "lägg till ändringar interaktivt"

4345

4115 -#: builtin/commit.c:1387

4346 +#: builtin/commit.c:1452

4347 msgid "commit only specified files"

4348 msgstr "checka endast in angivna filer"

4349

4119 -#: builtin/commit.c:1388

4350 +#: builtin/commit.c:1453

4351 msgid "bypass pre-commit hook"

4352 msgstr "förbigå pre-commit-krok"

4353

4123 -#: builtin/commit.c:1389

4354 +#: builtin/commit.c:1454

4355 msgid "show what would be committed"

4356 msgstr "visa vad som skulle checkas in"

4357

4127 -#: builtin/commit.c:1400

4358 +#: builtin/commit.c:1465

4359 msgid "amend previous commit"

4360 msgstr "lägg till föregående incheckning"

4361

4131 -#: builtin/commit.c:1401

4362 +#: builtin/commit.c:1466

4363 msgid "bypass post-rewrite hook"

4364 msgstr "förbigå post-rewrite-krok"

4365

4135 -#: builtin/commit.c:1406

4366 +#: builtin/commit.c:1471

4367 msgid "ok to record an empty change"

4368 msgstr "ok att registrera en tom ändring"

4369

4139 -#: builtin/commit.c:1409

4370 +#: builtin/commit.c:1474

4371 msgid "ok to record a change with an empty message"

4372 msgstr "ok att registrera en ändring med tomt meddelande"

4373

4143 -#: builtin/commit.c:1441

4374 +#: builtin/commit.c:1507

4375 msgid "could not parse HEAD commit"

4376 msgstr "kunde inte tolka HEAD:s incheckning"

4377

4147 -#: builtin/commit.c:1479 builtin/merge.c:510

4378 +#: builtin/commit.c:1545 builtin/merge.c:525

4379 #, c-format

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

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

4382

4152 -#: builtin/commit.c:1486

4383 +#: builtin/commit.c:1552

4384 #, c-format

4385 msgid "Corrupt MERGE_HEAD file (%s)"

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

4387

4157 -#: builtin/commit.c:1493

4388 +#: builtin/commit.c:1559

4389 msgid "could not read MERGE_MODE"

4390 msgstr "kunde inte läsa MERGE_MODE"

4391

4161 -#: builtin/commit.c:1512

4392 +#: builtin/commit.c:1578

4393 #, c-format

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

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

4396

4166 -#: builtin/commit.c:1526

4397 +#: builtin/commit.c:1592

4398 #, c-format

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

4400 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4401

4171 -#: builtin/commit.c:1531

4402 +#: builtin/commit.c:1597

4403 #, c-format

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

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

4406

4176 -#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

4407 +#: builtin/commit.c:1612 builtin/merge.c:861 builtin/merge.c:886

4408 msgid "failed to write commit object"

4409 msgstr "kunde inte skriva incheckningsobjekt"

4410

4180 -#: builtin/commit.c:1567

4411 +#: builtin/commit.c:1633

4412 msgid "cannot lock HEAD ref"

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

4414

4184 -#: builtin/commit.c:1571

4415 +#: builtin/commit.c:1637

4416 msgid "cannot update HEAD ref"

4417 msgstr "kunde inte uppdatera HEAD-referens"

4418

4188 -#: builtin/commit.c:1582

4419 +#: builtin/commit.c:1648

4420 msgid ""

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

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

@@ -4200,115 +4431,123 @@ msgstr ""

4431 msgid "git config [options]"

4432 msgstr "git config [flaggor]"

4433

4203 -#: builtin/config.c:51

4434 +#: builtin/config.c:52

4435 msgid "Config file location"

4436 msgstr "Konfigurationsfilens plats"

4437

4207 -#: builtin/config.c:52

4438 +#: builtin/config.c:53

4439 msgid "use global config file"

4440 msgstr "använd global konfigurationsfil"

4441

4211 -#: builtin/config.c:53

4442 +#: builtin/config.c:54

4443 msgid "use system config file"

4444 msgstr "använd systemets konfigurationsfil"

4445

4215 -#: builtin/config.c:54

4446 +#: builtin/config.c:55

4447 msgid "use repository config file"

4448 msgstr "använd arkivets konfigurationsfil"

4449

4219 -#: builtin/config.c:55

4450 +#: builtin/config.c:56

4451 msgid "use given config file"

4452 msgstr "använd angiven konfigurationsil"

4453

4223 -#: builtin/config.c:56

4454 +#: builtin/config.c:57

4455 +msgid "blob-id"

4456 +msgstr "blob-id"

4457 +

4458 +#: builtin/config.c:57

4459 +msgid "read config from given blob object"

4460 +msgstr "läs konfiguration från givet blob-objekt"

4461 +

4462 +#: builtin/config.c:58

4463 msgid "Action"

4464 msgstr "Åtgärd"

4465

4227 -#: builtin/config.c:57

4466 +#: builtin/config.c:59

4467 msgid "get value: name [value-regex]"

4468 msgstr "hämta värde: namn [värde-reguttr]"

4469

4231 -#: builtin/config.c:58

4470 +#: builtin/config.c:60

4471 msgid "get all values: key [value-regex]"

4472 msgstr "hämta alla värden: nyckel [värde-reguttr]"

4473

4235 -#: builtin/config.c:59

4474 +#: builtin/config.c:61

4475 msgid "get values for regexp: name-regex [value-regex]"

4476 msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

4477

4239 -#: builtin/config.c:60

4478 +#: builtin/config.c:62

4479 msgid "replace all matching variables: name value [value_regex]"

4480 msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

4481

4243 -#: builtin/config.c:61

4482 +#: builtin/config.c:63

4483 msgid "add a new variable: name value"

4484 msgstr "lägg till en ny variabel: namn värde"

4485

4247 -#: builtin/config.c:62

4486 +#: builtin/config.c:64

4487 msgid "remove a variable: name [value-regex]"

4488 msgstr "ta bort en variabel: namn [värde-reguttr]"

4489

4251 -#: builtin/config.c:63

4490 +#: builtin/config.c:65

4491 msgid "remove all matches: name [value-regex]"

4492 msgstr "ta bort alla träffar: namn [värde-reguttr]"

4493

4255 -#: builtin/config.c:64

4494 +#: builtin/config.c:66

4495 msgid "rename section: old-name new-name"

4496 msgstr "byt namn på sektion: gammalt-namn nytt-namn"

4497

4259 -#: builtin/config.c:65

4498 +#: builtin/config.c:67

4499 msgid "remove a section: name"

4500 msgstr "ta bort en sektion: namn"

4501

4263 -#: builtin/config.c:66

4502 +#: builtin/config.c:68

4503 msgid "list all"

4504 msgstr "visa alla"

4505

4267 -#: builtin/config.c:67

4506 +#: builtin/config.c:69

4507 msgid "open an editor"

4508 msgstr "öppna textredigeringsprogram"

4509

4271 -#: builtin/config.c:68 builtin/config.c:69

4510 +#: builtin/config.c:70 builtin/config.c:71

4511 msgid "slot"

4512 msgstr "plats"

4513

4275 -#: builtin/config.c:68

4514 +#: builtin/config.c:70

4515 msgid "find the color configured: [default]"

4516 msgstr "hitta den inställda färgen: [default]"

4517

4279 -#: builtin/config.c:69

4518 +#: builtin/config.c:71

4519 msgid "find the color setting: [stdout-is-tty]"

4520 msgstr "hitta färginställningen: [stdout-is-tty]"

4521

4283 -#: builtin/config.c:70

4522 +#: builtin/config.c:72

4523 msgid "Type"

4524 msgstr "Typ"

4525

4287 -#: builtin/config.c:71

4526 +#: builtin/config.c:73

4527 msgid "value is \"true\" or \"false\""

4528 msgstr "värdet är \"true\" eller \"false\""

4529

4291 -#: builtin/config.c:72

4530 +#: builtin/config.c:74

4531 msgid "value is decimal number"

4532 msgstr "värdet är ett decimalt tal"

4533

4295 -#: builtin/config.c:73

4534 +#: builtin/config.c:75

4535 msgid "value is --bool or --int"

4536 msgstr "värdet är --bool eller --int"

4537

4299 -#: builtin/config.c:74

4538 +#: builtin/config.c:76

4539 msgid "value is a path (file or directory name)"

4540 msgstr "värdet är en sökväg (fil- eller katalognamn)"

4541

4303 -#: builtin/config.c:75

4542 +#: builtin/config.c:77

4543 msgid "Other"

4544 msgstr "Andra"

4545

4307 -#: builtin/config.c:76

4546 +#: builtin/config.c:78

4547 msgid "terminate values with NUL byte"

4548 msgstr "terminera värden med NUL-byte"

4549

4311 -#: builtin/config.c:77

4550 +#: builtin/config.c:79

4551 msgid "respect include directives on lookup"

4552 msgstr "respektera inkluderingsdirektiv vid uppslag"

4553

@@ -4320,55 +4559,55 @@ msgstr "git count-objects [-v] [-H | --human-readable]"

4559 msgid "print sizes in human readable format"

4560 msgstr "skriv storlekar i människoläsbart format"

4561

4323 -#: builtin/describe.c:15

4562 +#: builtin/describe.c:16

4563 msgid "git describe [options] <committish>*"

4564 msgstr "git describe [flaggor] <incheckning-igt>*"

4565

4327 -#: builtin/describe.c:16

4566 +#: builtin/describe.c:17

4567 msgid "git describe [options] --dirty"

4568 msgstr "git describe [flaggor] --dirty"

4569

4331 -#: builtin/describe.c:233

4570 +#: builtin/describe.c:237

4571 #, c-format

4572 msgid "annotated tag %s not available"

4573 msgstr "den annoterade taggen %s inte tillgänglig"

4574

4336 -#: builtin/describe.c:237

4575 +#: builtin/describe.c:241

4576 #, c-format

4577 msgid "annotated tag %s has no embedded name"

4578 msgstr "den annoterade taggen %s har inget inbäddat namn"

4579

4341 -#: builtin/describe.c:239

4580 +#: builtin/describe.c:243

4581 #, c-format

4582 msgid "tag '%s' is really '%s' here"

4583 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

4584

4346 -#: builtin/describe.c:266

4585 +#: builtin/describe.c:270

4586 #, c-format

4587 msgid "Not a valid object name %s"

4588 msgstr "Objektnamnet är inte giltigt: %s"

4589

4351 -#: builtin/describe.c:269

4590 +#: builtin/describe.c:273

4591 #, c-format

4592 msgid "%s is not a valid '%s' object"

4593 msgstr "%s är inte ett giltigt \"%s\"-objekt"

4594

4356 -#: builtin/describe.c:286

4595 +#: builtin/describe.c:290

4596 #, c-format

4597 msgid "no tag exactly matches '%s'"

4598 msgstr "ingen tagg motsvarar \"%s\" exakt"

4599

4361 -#: builtin/describe.c:288

4600 +#: builtin/describe.c:292

4601 #, c-format

4602 msgid "searching to describe %s\n"

4603 msgstr "söker för att beskriva %s\n"

4604

4366 -#: builtin/describe.c:328

4605 +#: builtin/describe.c:332

4606 #, c-format

4607 msgid "finished search at %s\n"

4608 msgstr "avslutade sökning på %s\n"

4609

4371 -#: builtin/describe.c:352

4610 +#: builtin/describe.c:359

4611 #, c-format

4612 msgid ""

4613 "No annotated tags can describe '%s'.\n"

@@ -4377,7 +4616,7 @@ msgstr ""

4616 "Inga annoterade taggar kan beskriva \"%s\".\n"

4617 "Det finns dock oannoterade taggar: testa --tags."

4618

4380 -#: builtin/describe.c:356

4619 +#: builtin/describe.c:363

4620 #, c-format

4621 msgid ""

4622 "No tags can describe '%s'.\n"

@@ -4386,12 +4625,12 @@ msgstr ""

4625 "Inga taggar kan beskriva \"%s\".\n"

4626 "Testa --always, eller skapa några taggar."

4627

4389 -#: builtin/describe.c:377

4628 +#: builtin/describe.c:384

4629 #, c-format

4630 msgid "traversed %lu commits\n"

4631 msgstr "traverserade %lu incheckningar\n"

4632

4394 -#: builtin/describe.c:380

4633 +#: builtin/describe.c:387

4634 #, c-format

4635 msgid ""

4636 "more than %i tags found; listed %i most recent\n"

@@ -4400,59 +4639,63 @@ msgstr ""

4639 "mer än %i taggar hittades; listar de %i senaste\n"

4640 "gav upp sökningen vid %s\n"

4641

4403 -#: builtin/describe.c:402

4642 +#: builtin/describe.c:409

4643 msgid "find the tag that comes after the commit"

4644 msgstr "hitta taggen som kommer efter incheckningen"

4645

4407 -#: builtin/describe.c:403

4646 +#: builtin/describe.c:410

4647 msgid "debug search strategy on stderr"

4648 msgstr "felsök sökstrategin på standard fel"

4649

4411 -#: builtin/describe.c:404

4650 +#: builtin/describe.c:411

4651 msgid "use any ref"

4652 msgstr "använd alla referenser"

4653

4415 -#: builtin/describe.c:405

4654 +#: builtin/describe.c:412

4655 msgid "use any tag, even unannotated"

4656 msgstr "använd alla taggar, även oannoterade"

4657

4419 -#: builtin/describe.c:406

4658 +#: builtin/describe.c:413

4659 msgid "always use long format"

4660 msgstr "använd alltid långt format"

4661

4423 -#: builtin/describe.c:409

4662 +#: builtin/describe.c:414

4663 +msgid "only follow first parent"

4664 +msgstr "följ endast första föräldern"

4665 +

4666 +#: builtin/describe.c:417

4667 msgid "only output exact matches"

4668 msgstr "skriv endast ut exakta träffar"

4669

4427 -#: builtin/describe.c:411

4670 +#: builtin/describe.c:419

4671 msgid "consider <n> most recent tags (default: 10)"

4672 msgstr "överväg de <n> nyaste taggarna (standard: 10)"

4673

4431 -#: builtin/describe.c:413

4674 +#: builtin/describe.c:421

4675 msgid "only consider tags matching <pattern>"

4676 msgstr "överväg endast taggar som motsvarar <mönster>"

4677

4435 -#: builtin/describe.c:415 builtin/name-rev.c:238

4678 +#: builtin/describe.c:423 builtin/name-rev.c:322

4679 msgid "show abbreviated commit object as fallback"

4680 msgstr "visa förkortade incheckningsobjekt som standard"

4681

4439 -#: builtin/describe.c:416

4682 +#: builtin/describe.c:424

4683 msgid "mark"

4684 msgstr "märke"

4685

4443 -#: builtin/describe.c:417

4686 +#: builtin/describe.c:425

4687 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4688 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

4689

4447 -#: builtin/describe.c:435

4690 +#: builtin/describe.c:443

4691 msgid "--long is incompatible with --abbrev=0"

4692 msgstr "--long är inkompatibel med --abbrev=0"

4693

4451 -#: builtin/describe.c:461

4694 +#: builtin/describe.c:469

4695 msgid "No names found, cannot describe anything."

4696 msgstr "Inga namn hittades, kan inte beskriva något."

4697

4455 -#: builtin/describe.c:481

4698 +#: builtin/describe.c:489

4699 msgid "--dirty is incompatible with committishes"

4700 msgstr "--dirty är inkompatibelt med \"committish\"-värden"

4701

@@ -4461,31 +4704,26 @@ msgstr "--dirty är inkompatibelt med \"committish\"-värden"

4704 msgid "'%s': not a regular file or symlink"

4705 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

4706

4464 -#: builtin/diff.c:228

4707 +#: builtin/diff.c:230

4708 #, c-format

4709 msgid "invalid option: %s"

4710 msgstr "ogiltig flagga: %s"

4711

4469 -#: builtin/diff.c:305

4712 +#: builtin/diff.c:307

4713 msgid "Not a git repository"

4714 msgstr "Inte ett git-arkiv"

4715

4473 -#: builtin/diff.c:348

4716 +#: builtin/diff.c:350

4717 #, c-format

4718 msgid "invalid object '%s' given."

4719 msgstr "objektet \"%s\" som angavs är felaktigt."

4720

4478 -#: builtin/diff.c:353

4479 -#, c-format

4480 -msgid "more than %d trees given: '%s'"

4481 -msgstr "mer än %d träd angavs: \"%s\""

4482 -

4483 -#: builtin/diff.c:363

4721 +#: builtin/diff.c:359

4722 #, c-format

4723 msgid "more than two blobs given: '%s'"

4724 msgstr "mer än två blobbar angavs: \"%s\""

4725

4488 -#: builtin/diff.c:371

4726 +#: builtin/diff.c:366

4727 #, c-format

4728 msgid "unhandled object '%s' given."

4729 msgstr "ej hanterat objekt \"%s\" angavs."

@@ -4494,39 +4732,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."

4732 msgid "git fast-export [rev-list-opts]"

4733 msgstr "git fast-export [rev-list-flaggor]"

4734

4497 -#: builtin/fast-export.c:658

4735 +#: builtin/fast-export.c:666

4736 msgid "show progress after <n> objects"

4737 msgstr "visa förlopp efter <n> objekt"

4738

4501 -#: builtin/fast-export.c:660

4739 +#: builtin/fast-export.c:668

4740 msgid "select handling of signed tags"

4741 msgstr "välj hantering av signerade taggar"

4742

4505 -#: builtin/fast-export.c:663

4743 +#: builtin/fast-export.c:671

4744 msgid "select handling of tags that tag filtered objects"

4745 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4746

4509 -#: builtin/fast-export.c:666

4747 +#: builtin/fast-export.c:674

4748 msgid "Dump marks to this file"

4749 msgstr "Dump märken till filen"

4750

4513 -#: builtin/fast-export.c:668

4751 +#: builtin/fast-export.c:676

4752 msgid "Import marks from this file"

4753 msgstr "Importera märken från filen"

4754

4517 -#: builtin/fast-export.c:670

4755 +#: builtin/fast-export.c:678

4756 msgid "Fake a tagger when tags lack one"

4757 msgstr "Fejka taggare när taggen saknar en"

4758

4521 -#: builtin/fast-export.c:672

4759 +#: builtin/fast-export.c:680

4760 msgid "Output full tree for each commit"

4761 msgstr "Skriv ut hela trädet för varje incheckning"

4762

4525 -#: builtin/fast-export.c:674

4763 +#: builtin/fast-export.c:682

4764 msgid "Use the done feature to terminate the stream"

4765 msgstr "Använd done-funktionen för att avsluta strömmen"

4766

4529 -#: builtin/fast-export.c:675

4767 +#: builtin/fast-export.c:683

4768 msgid "Skip output of blob data"

4769 msgstr "Hoppa över skrivning av blob-data"

4770

@@ -4602,7 +4840,7 @@ msgstr "fördjupa historik för grund klon"

4840 msgid "convert to a complete repository"

4841 msgstr "konvertera till komplett arkiv"

4842

4605 -#: builtin/fetch.c:88 builtin/log.c:1130

4843 +#: builtin/fetch.c:88 builtin/log.c:1177

4844 msgid "dir"

4845 msgstr "kat"

4846

@@ -4614,76 +4852,76 @@ msgstr "lägg till i början av undermodulens sökvägsutdata"

4852 msgid "default mode for recursion"

4853 msgstr "standardläge för rekursion"

4854

4617 -#: builtin/fetch.c:204

4855 +#: builtin/fetch.c:220

4856 msgid "Couldn't find remote ref HEAD"

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

4858

4621 -#: builtin/fetch.c:257

4859 +#: builtin/fetch.c:273

4860 #, c-format

4861 msgid "object %s not found"

4862 msgstr "objektet %s hittades inte"

4863

4626 -#: builtin/fetch.c:262

4864 +#: builtin/fetch.c:278

4865 msgid "[up to date]"

4866 msgstr "[àjour]"

4867

4630 -#: builtin/fetch.c:276

4868 +#: builtin/fetch.c:292

4869 #, c-format

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

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

4872

4635 -#: builtin/fetch.c:277 builtin/fetch.c:363

4873 +#: builtin/fetch.c:293 builtin/fetch.c:379

4874 msgid "[rejected]"

4875 msgstr "[refuserad]"

4876

4639 -#: builtin/fetch.c:288

4877 +#: builtin/fetch.c:304

4878 msgid "[tag update]"

4879 msgstr "[uppdaterad tagg]"

4880

4643 -#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343

4881 +#: builtin/fetch.c:306 builtin/fetch.c:341 builtin/fetch.c:359

4882 msgid " (unable to update local ref)"

4883 msgstr " (kunde inte uppdatera lokal ref)"

4884

4647 -#: builtin/fetch.c:308

4885 +#: builtin/fetch.c:324

4886 msgid "[new tag]"

4887 msgstr "[ny tagg]"

4888

4651 -#: builtin/fetch.c:311

4889 +#: builtin/fetch.c:327

4890 msgid "[new branch]"

4891 msgstr "[ny gren]"

4892

4655 -#: builtin/fetch.c:314

4893 +#: builtin/fetch.c:330

4894 msgid "[new ref]"

4895 msgstr "[ny ref]"

4896

4659 -#: builtin/fetch.c:359

4897 +#: builtin/fetch.c:375

4898 msgid "unable to update local ref"

4899 msgstr "kunde inte uppdatera lokal ref"

4900

4663 -#: builtin/fetch.c:359

4901 +#: builtin/fetch.c:375

4902 msgid "forced update"

4903 msgstr "tvingad uppdatering"

4904

4667 -#: builtin/fetch.c:365

4905 +#: builtin/fetch.c:381

4906 msgid "(non-fast-forward)"

4907 msgstr "(ej snabbspolad)"

4908

4671 -#: builtin/fetch.c:396 builtin/fetch.c:688

4909 +#: builtin/fetch.c:412 builtin/fetch.c:718

4910 #, c-format

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

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

4913

4676 -#: builtin/fetch.c:405

4914 +#: builtin/fetch.c:421

4915 #, c-format

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

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

4918

4681 -#: builtin/fetch.c:491

4919 +#: builtin/fetch.c:520

4920 #, c-format

4921 msgid "From %.*s\n"

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

4923

4686 -#: builtin/fetch.c:502

4924 +#: builtin/fetch.c:531

4925 #, c-format

4926 msgid ""

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

@@ -4692,55 +4930,55 @@ msgstr ""

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

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

4932

4695 -#: builtin/fetch.c:552

4933 +#: builtin/fetch.c:581

4934 #, c-format

4935 msgid " (%s will become dangling)"

4936 msgstr " (%s kommer bli dinglande)"

4937

4700 -#: builtin/fetch.c:553

4938 +#: builtin/fetch.c:582

4939 #, c-format

4940 msgid " (%s has become dangling)"

4941 msgstr " (%s har blivit dinglande)"

4942

4705 -#: builtin/fetch.c:560

4943 +#: builtin/fetch.c:589

4944 msgid "[deleted]"

4945 msgstr "[borttagen]"

4946

4709 -#: builtin/fetch.c:561 builtin/remote.c:1055

4947 +#: builtin/fetch.c:590 builtin/remote.c:1055

4948 msgid "(none)"

4949 msgstr "(ingen)"

4950

4713 -#: builtin/fetch.c:678

4951 +#: builtin/fetch.c:708

4952 #, c-format

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

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

4955

4718 -#: builtin/fetch.c:712

4956 +#: builtin/fetch.c:742

4957 #, c-format

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

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

4960

4723 -#: builtin/fetch.c:789

4961 +#: builtin/fetch.c:823

4962 #, c-format

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

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

4965

4728 -#: builtin/fetch.c:792

4966 +#: builtin/fetch.c:826

4967 #, c-format

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

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

4970

4733 -#: builtin/fetch.c:894

4971 +#: builtin/fetch.c:928

4972 #, c-format

4973 msgid "Fetching %s\n"

4974 msgstr "Hämtar %s\n"

4975

4738 -#: builtin/fetch.c:896 builtin/remote.c:100

4976 +#: builtin/fetch.c:930 builtin/remote.c:100

4977 #, c-format

4978 msgid "Could not fetch %s"

4979 msgstr "Kunde inte hämta %s"

4980

4743 -#: builtin/fetch.c:915

4981 +#: builtin/fetch.c:949

4982 msgid ""

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

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

@@ -4748,32 +4986,32 @@ msgstr ""

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

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

4988

4751 -#: builtin/fetch.c:935

4989 +#: builtin/fetch.c:969

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

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

4992

4755 -#: builtin/fetch.c:981

4993 +#: builtin/fetch.c:1015

4994 msgid "--depth and --unshallow cannot be used together"

4995 msgstr "--depth och --unshallow kan inte användas samtidigt"

4996

4759 -#: builtin/fetch.c:983

4997 +#: builtin/fetch.c:1017

4998 msgid "--unshallow on a complete repository does not make sense"

4999 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5000

4763 -#: builtin/fetch.c:1002

5001 +#: builtin/fetch.c:1036

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

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

5004

4767 -#: builtin/fetch.c:1004

5005 +#: builtin/fetch.c:1038

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

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

5008

4771 -#: builtin/fetch.c:1015

5009 +#: builtin/fetch.c:1049

5010 #, c-format

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

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

5013

4776 -#: builtin/fetch.c:1023

5014 +#: builtin/fetch.c:1057

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

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

5017

@@ -4782,9 +5020,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5020 msgstr ""

5021 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5022

4785 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701

4786 -#: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175

4787 -#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239

5023 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5024 +#: builtin/merge.c:203 builtin/show-branch.c:655 builtin/show-ref.c:179

5025 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:243

5026 msgid "n"

5027 msgstr "n"

5028

@@ -4943,220 +5181,220 @@ msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

5181 msgid "grep: failed to create thread: %s"

5182 msgstr "grep: misslyckades skapa tråd. %s"

5183

4946 -#: builtin/grep.c:365

5184 +#: builtin/grep.c:364

5185 #, c-format

5186 msgid "Failed to chdir: %s"

5187 msgstr "Kunde inte byta katalog (chdir): %s"

5188

4951 -#: builtin/grep.c:443 builtin/grep.c:478

5189 +#: builtin/grep.c:442 builtin/grep.c:477

5190 #, c-format

5191 msgid "unable to read tree (%s)"

5192 msgstr "kunde inte läsa träd (%s)"

5193

4956 -#: builtin/grep.c:493

5194 +#: builtin/grep.c:492

5195 #, c-format

5196 msgid "unable to grep from object of type %s"

5197 msgstr "Kunde inte \"grep\" från objekt av typen %s"

5198

4961 -#: builtin/grep.c:551

5199 +#: builtin/grep.c:550

5200 #, c-format

5201 msgid "switch `%c' expects a numerical value"

5202 msgstr "flaggan \"%c\" antar ett numeriskt värde"

5203

4966 -#: builtin/grep.c:568

5204 +#: builtin/grep.c:567

5205 #, c-format

5206 msgid "cannot open '%s'"

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

5208

4971 -#: builtin/grep.c:643

5209 +#: builtin/grep.c:642

5210 msgid "search in index instead of in the work tree"

5211 msgstr "sök i indexet istället för i arbetskatalogen"

5212

4975 -#: builtin/grep.c:645

5213 +#: builtin/grep.c:644

5214 msgid "find in contents not managed by git"

5215 msgstr "sök i innehål som inte hanteras av git"

5216

4979 -#: builtin/grep.c:647

5217 +#: builtin/grep.c:646

5218 msgid "search in both tracked and untracked files"

5219 msgstr "sök i både spårade och ospårade filer"

5220

4983 -#: builtin/grep.c:649

5221 +#: builtin/grep.c:648

5222 msgid "search also in ignored files"

5223 msgstr "sök även i ignorerade filer"

5224

4987 -#: builtin/grep.c:652

5225 +#: builtin/grep.c:651

5226 msgid "show non-matching lines"

4989 -msgstr "vis rader som inte träffas"

5227 +msgstr "visa rader som inte träffas"

5228

4991 -#: builtin/grep.c:654

5229 +#: builtin/grep.c:653

5230 msgid "case insensitive matching"

5231 msgstr "skiftlägesokänslig sökning"

5232

4995 -#: builtin/grep.c:656

5233 +#: builtin/grep.c:655

5234 msgid "match patterns only at word boundaries"

5235 msgstr "matcha endast mönster vid ordgränser"

5236

4999 -#: builtin/grep.c:658

5237 +#: builtin/grep.c:657

5238 msgid "process binary files as text"

5239 msgstr "hantera binärfiler som text"

5240

5003 -#: builtin/grep.c:660

5241 +#: builtin/grep.c:659

5242 msgid "don't match patterns in binary files"

5243 msgstr "träffa inte mönster i binärfiler"

5244

5007 -#: builtin/grep.c:663

5245 +#: builtin/grep.c:662

5246 msgid "descend at most <depth> levels"

5247 msgstr "gå som mest ned <djup> nivåer"

5248

5011 -#: builtin/grep.c:667

5249 +#: builtin/grep.c:666

5250 msgid "use extended POSIX regular expressions"

5251 msgstr "använd utökade POSIX-reguljära uttryck"

5252

5015 -#: builtin/grep.c:670

5253 +#: builtin/grep.c:669

5254 msgid "use basic POSIX regular expressions (default)"

5255 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

5256

5019 -#: builtin/grep.c:673

5257 +#: builtin/grep.c:672

5258 msgid "interpret patterns as fixed strings"

5259 msgstr "tolka mönster som fixerade strängar"

5260

5023 -#: builtin/grep.c:676

5261 +#: builtin/grep.c:675

5262 msgid "use Perl-compatible regular expressions"

5263 msgstr "använd Perlkompatibla reguljära uttryck"

5264

5027 -#: builtin/grep.c:679

5265 +#: builtin/grep.c:678

5266 msgid "show line numbers"

5267 msgstr "visa radnummer"

5268

5031 -#: builtin/grep.c:680

5269 +#: builtin/grep.c:679

5270 msgid "don't show filenames"

5271 msgstr "visa inte filnamn"

5272

5035 -#: builtin/grep.c:681

5273 +#: builtin/grep.c:680

5274 msgid "show filenames"

5275 msgstr "visa filnamn"

5276

5039 -#: builtin/grep.c:683

5277 +#: builtin/grep.c:682

5278 msgid "show filenames relative to top directory"

5279 msgstr "visa filnamn relativa till toppkatalogen"

5280

5043 -#: builtin/grep.c:685

5281 +#: builtin/grep.c:684

5282 msgid "show only filenames instead of matching lines"

5283 msgstr "visa endast filnamn istället för träffade rader"

5284

5047 -#: builtin/grep.c:687

5285 +#: builtin/grep.c:686

5286 msgid "synonym for --files-with-matches"

5287 msgstr "synonym för --files-with-matches"

5288

5051 -#: builtin/grep.c:690

5289 +#: builtin/grep.c:689

5290 msgid "show only the names of files without match"

5291 msgstr "visa endast namn på filer utan träffar"

5292

5055 -#: builtin/grep.c:692

5293 +#: builtin/grep.c:691

5294 msgid "print NUL after filenames"

5295 msgstr "skriv NUL efter filnamn"

5296

5059 -#: builtin/grep.c:694

5297 +#: builtin/grep.c:693

5298 msgid "show the number of matches instead of matching lines"

5299 msgstr "visa antal träffar istället för träffade rader"

5300

5063 -#: builtin/grep.c:695

5301 +#: builtin/grep.c:694

5302 msgid "highlight matches"

5303 msgstr "ljusmarkera träffar"

5304

5067 -#: builtin/grep.c:697

5305 +#: builtin/grep.c:696

5306 msgid "print empty line between matches from different files"

5307 msgstr "skriv tomma rader mellan träffar från olika filer"

5308

5071 -#: builtin/grep.c:699

5309 +#: builtin/grep.c:698

5310 msgid "show filename only once above matches from same file"

5311 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

5312

5075 -#: builtin/grep.c:702

5313 +#: builtin/grep.c:701

5314 msgid "show <n> context lines before and after matches"

5315 msgstr "visa <n> rader sammanhang före och efter träffar"

5316

5079 -#: builtin/grep.c:705

5317 +#: builtin/grep.c:704

5318 msgid "show <n> context lines before matches"

5319 msgstr "visa <n> rader sammanhang före träffar"

5320

5083 -#: builtin/grep.c:707

5321 +#: builtin/grep.c:706

5322 msgid "show <n> context lines after matches"

5323 msgstr "visa <n> rader sammanhang efter träffar"

5324

5087 -#: builtin/grep.c:708

5325 +#: builtin/grep.c:707

5326 msgid "shortcut for -C NUM"

5327 msgstr "genväg för -C NUM"

5328

5091 -#: builtin/grep.c:711

5329 +#: builtin/grep.c:710

5330 msgid "show a line with the function name before matches"

5331 msgstr "visa en rad med funktionsnamnet före träffen"

5332

5095 -#: builtin/grep.c:713

5333 +#: builtin/grep.c:712

5334 msgid "show the surrounding function"

5335 msgstr "visa den omkringliggande funktionen"

5336

5099 -#: builtin/grep.c:716

5337 +#: builtin/grep.c:715

5338 msgid "read patterns from file"

5339 msgstr "läs mönster från fil"

5340

5103 -#: builtin/grep.c:718

5341 +#: builtin/grep.c:717

5342 msgid "match <pattern>"

5343 msgstr "träffa <mönster>"

5344

5107 -#: builtin/grep.c:720

5345 +#: builtin/grep.c:719

5346 msgid "combine patterns specified with -e"

5347 msgstr "kombinera mönster som anges med -e"

5348

5111 -#: builtin/grep.c:732

5349 +#: builtin/grep.c:731

5350 msgid "indicate hit with exit status without output"

5351 msgstr "ange träff med slutstatuskod utan utdata"

5352

5115 -#: builtin/grep.c:734

5353 +#: builtin/grep.c:733

5354 msgid "show only matches from files that match all patterns"

5355 msgstr "visa endast träffar från filer som träffar alla mönster"

5356

5119 -#: builtin/grep.c:736

5357 +#: builtin/grep.c:735

5358 msgid "show parse tree for grep expression"

5359 msgstr "visa analysträd för grep-uttryck"

5360

5123 -#: builtin/grep.c:740

5361 +#: builtin/grep.c:739

5362 msgid "pager"

5363 msgstr "bläddrare"

5364

5127 -#: builtin/grep.c:740

5365 +#: builtin/grep.c:739

5366 msgid "show matching files in the pager"

5367 msgstr "visa träffade filer i filbläddraren"

5368

5131 -#: builtin/grep.c:743

5369 +#: builtin/grep.c:742

5370 msgid "allow calling of grep(1) (ignored by this build)"

5371 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

5372

5135 -#: builtin/grep.c:744 builtin/show-ref.c:184

5373 +#: builtin/grep.c:743 builtin/show-ref.c:188

5374 msgid "show usage"

5375 msgstr "visa användning"

5376

5139 -#: builtin/grep.c:811

5377 +#: builtin/grep.c:810

5378 msgid "no pattern given."

5379 msgstr "inget mönster angavs."

5380

5143 -#: builtin/grep.c:866

5381 +#: builtin/grep.c:865

5382 msgid "--open-files-in-pager only works on the worktree"

5383 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

5384

5147 -#: builtin/grep.c:889

5385 +#: builtin/grep.c:888

5386 msgid "--cached or --untracked cannot be used with --no-index."

5387 msgstr "--cached och --untracked kan inte användas med --no-index."

5388

5151 -#: builtin/grep.c:894

5389 +#: builtin/grep.c:893

5390 msgid "--no-index or --untracked cannot be used with revs."

5391 msgstr "--no-index och --untracked kan inte användas med revisioner."

5392

5155 -#: builtin/grep.c:897

5393 +#: builtin/grep.c:896

5394 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5395 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5396

5159 -#: builtin/grep.c:905

5397 +#: builtin/grep.c:904

5398 msgid "both --cached and trees are given."

5399 msgstr "både --cached och träd angavs."

5400

@@ -5196,54 +5434,54 @@ msgstr "spara filen som den är utan filer"

5434 msgid "process file as it were from this path"

5435 msgstr "hantera filen som om den kom från sökvägen"

5436

5199 -#: builtin/help.c:43

5437 +#: builtin/help.c:41

5438 msgid "print all available commands"

5439 msgstr "visa alla tillgängliga kommandon"

5440

5203 -#: builtin/help.c:44

5441 +#: builtin/help.c:42

5442 msgid "print list of useful guides"

5443 msgstr "lista användbara vägledningar"

5444

5207 -#: builtin/help.c:45

5445 +#: builtin/help.c:43

5446 msgid "show man page"

5447 msgstr "visa manualsida"

5448

5211 -#: builtin/help.c:46

5449 +#: builtin/help.c:44

5450 msgid "show manual in web browser"

5451 msgstr "visa manual i webbläsare"

5452

5215 -#: builtin/help.c:48

5453 +#: builtin/help.c:46

5454 msgid "show info page"

5455 msgstr "visa info-sida"

5456

5219 -#: builtin/help.c:54

5457 +#: builtin/help.c:52

5458 msgid "git help [--all] [--guides] [--man|--web|--info] [command]"

5459 msgstr "git help [--all] [--guides] [--man|--web|--info] [kommando]"

5460

5223 -#: builtin/help.c:66

5461 +#: builtin/help.c:64

5462 #, c-format

5463 msgid "unrecognized help format '%s'"

5464 msgstr "okänt hjälpformat: %s"

5465

5228 -#: builtin/help.c:94

5466 +#: builtin/help.c:92

5467 msgid "Failed to start emacsclient."

5468 msgstr "Misslyckades starta emacsclient."

5469

5232 -#: builtin/help.c:107

5470 +#: builtin/help.c:105

5471 msgid "Failed to parse emacsclient version."

5472 msgstr "Kunde inte tolka emacsclient-version."

5473

5236 -#: builtin/help.c:115

5474 +#: builtin/help.c:113

5475 #, c-format

5476 msgid "emacsclient version '%d' too old (< 22)."

5477 msgstr "emacsclient version \"%d\" för gammal (< 22)."

5478

5241 -#: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178

5479 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176

5480 #, c-format

5481 msgid "failed to exec '%s': %s"

5482 msgstr "exec misslyckades för \"%s\": %s"

5483

5246 -#: builtin/help.c:218

5484 +#: builtin/help.c:216

5485 #, c-format

5486 msgid ""

5487 "'%s': path for unsupported man viewer.\n"

@@ -5252,7 +5490,7 @@ msgstr ""

5490 "\"%s\": sökväg för man-visare som ej stöds.\n"

5491 "Använd \"man.<verktyg>.cmd\" istället."

5492

5255 -#: builtin/help.c:230

5493 +#: builtin/help.c:228

5494 #, c-format

5495 msgid ""

5496 "'%s': cmd for supported man viewer.\n"

@@ -5261,335 +5499,335 @@ msgstr ""

5499 "\"%s\": kommando för man-visare som stöds.\n"

5500 "Använd \"man.<verktyg>.path\" istället."

5501

5264 -#: builtin/help.c:351

5502 +#: builtin/help.c:349

5503 #, c-format

5504 msgid "'%s': unknown man viewer."

5505 msgstr "\"%s\": okänd man-visare."

5506

5269 -#: builtin/help.c:368

5507 +#: builtin/help.c:366

5508 msgid "no man viewer handled the request"

5509 msgstr "ingen man-visare hanterade förfrågan"

5510

5273 -#: builtin/help.c:376

5511 +#: builtin/help.c:374

5512 msgid "no info viewer handled the request"

5513 msgstr "ingen info-visare hanterade förfrågan"

5514

5277 -#: builtin/help.c:422

5515 +#: builtin/help.c:420

5516 msgid "Defining attributes per path"

5517 msgstr "Definierar attribut per sökväg"

5518

5281 -#: builtin/help.c:423

5519 +#: builtin/help.c:421

5520 msgid "A Git glossary"

5521 msgstr "En Git-ordlista"

5522

5285 -#: builtin/help.c:424

5523 +#: builtin/help.c:422

5524 msgid "Specifies intentionally untracked files to ignore"

5525 msgstr "Ange avsiktligen ospårade filer att ignorera"

5526

5289 -#: builtin/help.c:425

5527 +#: builtin/help.c:423

5528 msgid "Defining submodule properties"

5529 msgstr "Ange egenskaper för undermoduler"

5530

5293 -#: builtin/help.c:426

5531 +#: builtin/help.c:424

5532 msgid "Specifying revisions and ranges for Git"

5533 msgstr "Ange versioner och intervall i Git"

5534

5297 -#: builtin/help.c:427

5535 +#: builtin/help.c:425

5536 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"

5537 msgstr "Introduktion till Git (för version 1.5.1 och senare)"

5538

5301 -#: builtin/help.c:428

5539 +#: builtin/help.c:426

5540 msgid "An overview of recommended workflows with Git"

5541 msgstr "Översikt över rekommenderade arbetsflöden med Git"

5542

5305 -#: builtin/help.c:440

5543 +#: builtin/help.c:438

5544 msgid "The common Git guides are:\n"

5545 msgstr "De vanliga Git-vägledningarna är:\n"

5546

5309 -#: builtin/help.c:462 builtin/help.c:478

5547 +#: builtin/help.c:460 builtin/help.c:476

5548 #, c-format

5549 msgid "usage: %s%s"

5550 msgstr "användning: %s%s"

5551

5314 -#: builtin/help.c:494

5552 +#: builtin/help.c:492

5553 #, c-format

5554 msgid "`git %s' is aliased to `%s'"

5555 msgstr "\"git %s\" är ett alias för \"%s\""

5556

5319 -#: builtin/index-pack.c:182

5557 +#: builtin/index-pack.c:184

5558 #, c-format

5559 msgid "object type mismatch at %s"

5560 msgstr "objekttyp stämmer inte överens vid %s"

5561

5324 -#: builtin/index-pack.c:202

5562 +#: builtin/index-pack.c:204

5563 msgid "object of unexpected type"

5564 msgstr "objekt av oväntad typ"

5565

5328 -#: builtin/index-pack.c:239

5566 +#: builtin/index-pack.c:244

5567 #, c-format

5568 msgid "cannot fill %d byte"

5569 msgid_plural "cannot fill %d bytes"

5570 msgstr[0] "kan inte fylla %d byte"

5571 msgstr[1] "kan inte fylla %d byte"

5572

5335 -#: builtin/index-pack.c:249

5573 +#: builtin/index-pack.c:254

5574 msgid "early EOF"

5575 msgstr "tidigt filslut"

5576

5339 -#: builtin/index-pack.c:250

5577 +#: builtin/index-pack.c:255

5578 msgid "read error on input"

5579 msgstr "indataläsfel"

5580

5343 -#: builtin/index-pack.c:262

5581 +#: builtin/index-pack.c:267

5582 msgid "used more bytes than were available"

5583 msgstr "använde fler byte än tillgängligt"

5584

5347 -#: builtin/index-pack.c:269

5585 +#: builtin/index-pack.c:274

5586 msgid "pack too large for current definition of off_t"

5587 msgstr "paket för stort för nuvarande definition av off_t"

5588

5351 -#: builtin/index-pack.c:285

5589 +#: builtin/index-pack.c:290

5590 #, c-format

5591 msgid "unable to create '%s'"

5592 msgstr "kunde inte skapa \"%s\""

5593

5356 -#: builtin/index-pack.c:290

5594 +#: builtin/index-pack.c:295

5595 #, c-format

5596 msgid "cannot open packfile '%s'"

5597 msgstr "kan inte öppna paketfilen \"%s\""

5598

5361 -#: builtin/index-pack.c:304

5599 +#: builtin/index-pack.c:309

5600 msgid "pack signature mismatch"

5601 msgstr "paketsignatur stämmer inte överens"

5602

5365 -#: builtin/index-pack.c:306

5603 +#: builtin/index-pack.c:311

5604 #, c-format

5605 msgid "pack version %<PRIu32> unsupported"

5606 msgstr "paketversion %<PRIu32> stöds ej"

5607

5370 -#: builtin/index-pack.c:324

5608 +#: builtin/index-pack.c:329

5609 #, c-format

5610 msgid "pack has bad object at offset %lu: %s"

5611 msgstr "paketet har felaktigt objekt vid index %lu: %s"

5612

5375 -#: builtin/index-pack.c:446

5613 +#: builtin/index-pack.c:451

5614 #, c-format

5615 msgid "inflate returned %d"

5616 msgstr "inflate returnerade %d"

5617

5380 -#: builtin/index-pack.c:495

5618 +#: builtin/index-pack.c:500

5619 msgid "offset value overflow for delta base object"

5620 msgstr "indexvärdespill för deltabasobjekt"

5621

5384 -#: builtin/index-pack.c:503

5622 +#: builtin/index-pack.c:508

5623 msgid "delta base offset is out of bound"

5624 msgstr "deltabasindex utanför gränsen"

5625

5388 -#: builtin/index-pack.c:511

5626 +#: builtin/index-pack.c:516

5627 #, c-format

5628 msgid "unknown object type %d"

5629 msgstr "okänd objekttyp %d"

5630

5393 -#: builtin/index-pack.c:542

5631 +#: builtin/index-pack.c:547

5632 msgid "cannot pread pack file"

5633 msgstr "kan inte utföra \"pread\" på paketfil"

5634

5397 -#: builtin/index-pack.c:544

5635 +#: builtin/index-pack.c:549

5636 #, c-format

5637 msgid "premature end of pack file, %lu byte missing"

5638 msgid_plural "premature end of pack file, %lu bytes missing"

5639 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

5640 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

5641

5404 -#: builtin/index-pack.c:570

5642 +#: builtin/index-pack.c:575

5643 msgid "serious inflate inconsistency"

5644 msgstr "allvarlig inflate-inkonsekvens"

5645

5408 -#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5409 -#: builtin/index-pack.c:724 builtin/index-pack.c:733

5646 +#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5647 +#: builtin/index-pack.c:729 builtin/index-pack.c:738

5648 #, c-format

5649 msgid "SHA1 COLLISION FOUND WITH %s !"

5650 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

5651

5414 -#: builtin/index-pack.c:664 builtin/pack-objects.c:170

5652 +#: builtin/index-pack.c:669 builtin/pack-objects.c:170

5653 #: builtin/pack-objects.c:262

5654 #, c-format

5655 msgid "unable to read %s"

5656 msgstr "kunde inte läsa %s"

5657

5420 -#: builtin/index-pack.c:730

5658 +#: builtin/index-pack.c:735

5659 #, c-format

5660 msgid "cannot read existing object %s"

5661 msgstr "kan inte läsa befintligt objekt %s"

5662

5425 -#: builtin/index-pack.c:744

5663 +#: builtin/index-pack.c:749

5664 #, c-format

5665 msgid "invalid blob object %s"

5666 msgstr "ogiltigt blob-objekt %s"

5667

5430 -#: builtin/index-pack.c:759

5668 +#: builtin/index-pack.c:763

5669 #, c-format

5670 msgid "invalid %s"

5671 msgstr "ogiltigt %s"

5672

5435 -#: builtin/index-pack.c:761

5673 +#: builtin/index-pack.c:766

5674 msgid "Error in object"

5675 msgstr "Fel i objekt"

5676

5439 -#: builtin/index-pack.c:763

5677 +#: builtin/index-pack.c:768

5678 #, c-format

5679 msgid "Not all child objects of %s are reachable"

5680 msgstr "Inte alla barnobjekt för %s kan nås"

5681

5444 -#: builtin/index-pack.c:833 builtin/index-pack.c:863

5682 +#: builtin/index-pack.c:838 builtin/index-pack.c:868

5683 msgid "failed to apply delta"

5684 msgstr "misslyckades tillämpa delta"

5685

5448 -#: builtin/index-pack.c:1004

5686 +#: builtin/index-pack.c:1009

5687 msgid "Receiving objects"

5688 msgstr "Tar emot objekt"

5689

5452 -#: builtin/index-pack.c:1004

5690 +#: builtin/index-pack.c:1009

5691 msgid "Indexing objects"

5692 msgstr "Skapar index för objekt"

5693

5456 -#: builtin/index-pack.c:1030

5694 +#: builtin/index-pack.c:1035

5695 msgid "pack is corrupted (SHA1 mismatch)"

5696 msgstr "paketet är trasigt (SHA1 stämmer inte)"

5697

5460 -#: builtin/index-pack.c:1035

5698 +#: builtin/index-pack.c:1040

5699 msgid "cannot fstat packfile"

5700 msgstr "kan inte utföra \"fstat\" på paketfil"

5701

5464 -#: builtin/index-pack.c:1038

5702 +#: builtin/index-pack.c:1043

5703 msgid "pack has junk at the end"

5704 msgstr "paket har skräp i slutet"

5705

5468 -#: builtin/index-pack.c:1049

5706 +#: builtin/index-pack.c:1054

5707 msgid "confusion beyond insanity in parse_pack_objects()"

5708 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

5709

5472 -#: builtin/index-pack.c:1072

5710 +#: builtin/index-pack.c:1077

5711 msgid "Resolving deltas"

5712 msgstr "Analyserar delta"

5713

5476 -#: builtin/index-pack.c:1082

5714 +#: builtin/index-pack.c:1087

5715 #, c-format

5716 msgid "unable to create thread: %s"

5717 msgstr "kunde inte skapa tråd: %s"

5718

5481 -#: builtin/index-pack.c:1124

5719 +#: builtin/index-pack.c:1129

5720 msgid "confusion beyond insanity"

5721 msgstr "förvirrad bortom vanvett"

5722

5485 -#: builtin/index-pack.c:1132

5723 +#: builtin/index-pack.c:1137

5724 #, c-format

5725 msgid "completed with %d local objects"

5726 msgstr "slutfördes med %d lokala objekt"

5727

5490 -#: builtin/index-pack.c:1142

5728 +#: builtin/index-pack.c:1147

5729 #, c-format

5730 msgid "Unexpected tail checksum for %s (disk corruption?)"

5731 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

5732

5495 -#: builtin/index-pack.c:1146

5733 +#: builtin/index-pack.c:1151

5734 #, c-format

5735 msgid "pack has %d unresolved delta"

5736 msgid_plural "pack has %d unresolved deltas"

5737 msgstr[0] "paketet har %d oanalyserat delta"

5738 msgstr[1] "paketet har %d oanalyserade delta"

5739

5502 -#: builtin/index-pack.c:1171

5740 +#: builtin/index-pack.c:1176

5741 #, c-format

5742 msgid "unable to deflate appended object (%d)"

5743 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

5744

5507 -#: builtin/index-pack.c:1250

5745 +#: builtin/index-pack.c:1255

5746 #, c-format

5747 msgid "local object %s is corrupt"

5748 msgstr "lokalt objekt %s är trasigt"

5749

5512 -#: builtin/index-pack.c:1274

5750 +#: builtin/index-pack.c:1279

5751 msgid "error while closing pack file"

5752 msgstr "fel vid stängning av paketfil"

5753

5516 -#: builtin/index-pack.c:1287

5754 +#: builtin/index-pack.c:1292

5755 #, c-format

5756 msgid "cannot write keep file '%s'"

5757 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

5758

5521 -#: builtin/index-pack.c:1295

5759 +#: builtin/index-pack.c:1300

5760 #, c-format

5761 msgid "cannot close written keep file '%s'"

5762 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

5763

5526 -#: builtin/index-pack.c:1308

5764 +#: builtin/index-pack.c:1313

5765 msgid "cannot store pack file"

5766 msgstr "kan inte spara paketfil"

5767

5530 -#: builtin/index-pack.c:1319

5768 +#: builtin/index-pack.c:1324

5769 msgid "cannot store index file"

5770 msgstr "kan inte spara indexfil"

5771

5534 -#: builtin/index-pack.c:1352

5772 +#: builtin/index-pack.c:1357

5773 #, c-format

5774 msgid "bad pack.indexversion=%<PRIu32>"

5775 msgstr "felaktig pack.indexversion=%<PRIu32>"

5776

5539 -#: builtin/index-pack.c:1358

5777 +#: builtin/index-pack.c:1363

5778 #, c-format

5779 msgid "invalid number of threads specified (%d)"

5780 msgstr "felaktigt antal trådar angivet (%d)"

5781

5544 -#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5782 +#: builtin/index-pack.c:1367 builtin/index-pack.c:1545

5783 #, c-format

5784 msgid "no threads support, ignoring %s"

5785 msgstr "trådstöd saknas, ignorerar %s"

5786

5549 -#: builtin/index-pack.c:1420

5787 +#: builtin/index-pack.c:1425

5788 #, c-format

5789 msgid "Cannot open existing pack file '%s'"

5790 msgstr "Kan inte öppna befintlig paketfil \"%s\""

5791

5554 -#: builtin/index-pack.c:1422

5792 +#: builtin/index-pack.c:1427

5793 #, c-format

5794 msgid "Cannot open existing pack idx file for '%s'"

5795 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""

5796

5559 -#: builtin/index-pack.c:1469

5797 +#: builtin/index-pack.c:1474

5798 #, c-format

5799 msgid "non delta: %d object"

5800 msgid_plural "non delta: %d objects"

5801 msgstr[0] "icke-delta: %d objekt"

5802 msgstr[1] "icke-delta: %d objekt"

5803

5566 -#: builtin/index-pack.c:1476

5804 +#: builtin/index-pack.c:1481

5805 #, c-format

5806 msgid "chain length = %d: %lu object"

5807 msgid_plural "chain length = %d: %lu objects"

5808 msgstr[0] "kedjelängd = %d: %lu objekt"

5809 msgstr[1] "kedjelängd = %d: %lu objekt"

5810

5573 -#: builtin/index-pack.c:1503

5811 +#: builtin/index-pack.c:1509

5812 msgid "Cannot come back to cwd"

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

5814

5577 -#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5578 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5815 +#: builtin/index-pack.c:1557 builtin/index-pack.c:1560

5816 +#: builtin/index-pack.c:1572 builtin/index-pack.c:1576

5817 #, c-format

5818 msgid "bad %s"

5819 msgstr "felaktig %s"

5820

5583 -#: builtin/index-pack.c:1580

5821 +#: builtin/index-pack.c:1590

5822 msgid "--fix-thin cannot be used without --stdin"

5823 msgstr "--fix-thin kan inte användas med --stdin"

5824

5587 -#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5825 +#: builtin/index-pack.c:1594 builtin/index-pack.c:1604

5826 #, c-format

5827 msgid "packfile name '%s' does not end with '.pack'"

5828 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

5829

5592 -#: builtin/index-pack.c:1603

5830 +#: builtin/index-pack.c:1613

5831 msgid "--verify with no packfile name given"

5832 msgstr "--verify angavs utan paketfilnamn"

5833

@@ -5725,7 +5963,7 @@ msgstr "behörigheter"

5963 msgid "specify that the git repository is to be shared amongst several users"

5964 msgstr "ange att git-arkivet skall delas bland flera användare"

5965

l10n: Update Swedish translation (2135t0f0u)