dc4a1ba99c · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2014-04-19 12:50+0800\n"

11 -"PO-Revision-Date: 2014-06-24 19:51+0100\n"

10 +"POT-Creation-Date: 2014-08-04 14:48+0800\n"

11 +"PO-Revision-Date: 2014-08-05 13:44+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"

@@ -22,17 +22,15 @@ msgstr ""

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

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

24

25 -#: advice.c:85

25 +#: advice.c:88

26 msgid ""

27 -"Fix them up in the work tree,\n"

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

29 -"appropriate to mark resolution and make a commit,\n"

30 -"or use 'git commit -a'."

27 +"Fix them up in the work tree, and then use 'git add/rm <file>'\n"

28 +"as appropriate to mark resolution and make a commit, or use\n"

29 +"'git commit -a'."

30 msgstr ""

32 -"Rätta dem i din arbetskatalog,\n"

33 -"och använd sedan \"git add/rm <fil>\" som\n"

34 -"lämpligt för att ange lösning och checka in,\n"

35 -"eller använd \"git commit -a\"."

31 +"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"

32 +"som lämpligt för att ange lösning och checka in, eller använd\n"

33 +"\"git commit -a\"."

34

35 #: archive.c:10

36 msgid "git archive [options] <tree-ish> [<path>...]"

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

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

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

53

56 -#: archive.c:243 builtin/add.c:136 builtin/add.c:428 builtin/rm.c:328

54 +#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

55 #, c-format

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

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

@@ -66,7 +64,7 @@ msgstr "fmt"

64 msgid "archive format"

65 msgstr "arkivformat"

66

69 -#: archive.c:329 builtin/log.c:1193

67 +#: archive.c:329 builtin/log.c:1201

68 msgid "prefix"

69 msgstr "prefix"

70

@@ -74,9 +72,9 @@ msgstr "prefix"

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

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

74

77 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2258

78 -#: builtin/blame.c:2259 builtin/config.c:57 builtin/fast-export.c:680

79 -#: builtin/fast-export.c:682 builtin/grep.c:714 builtin/hash-object.c:77

75 +#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

76 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

77 +#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

78 #: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

79 #: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

80 msgid "file"

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

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

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

263

266 -#: bundle.c:86 builtin/commit.c:706

264 +#: bundle.c:86 builtin/commit.c:755

265 #, c-format

266 msgid "could not open '%s'"

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

@@ -272,8 +270,8 @@ msgstr "kunde inte öppna \"%s\""

270 msgid "Repository lacks these prerequisite commits:"

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

272

275 -#: bundle.c:162 sequencer.c:669 sequencer.c:1123 builtin/log.c:332

276 -#: builtin/log.c:821 builtin/log.c:1418 builtin/log.c:1644 builtin/merge.c:357

273 +#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

274 +#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

275 #: builtin/shortlog.c:158

276 msgid "revision walk setup failed"

277 msgstr "misslyckades skapa revisionstraversering"

@@ -296,47 +294,47 @@ msgid_plural "The bundle requires these %d refs:"

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

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

296

299 -#: bundle.c:293

297 +#: bundle.c:289

298 msgid "rev-list died"

299 msgstr "rev-list dog"

300

303 -#: bundle.c:299 builtin/log.c:1329 builtin/shortlog.c:261

301 +#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

302 #, c-format

303 msgid "unrecognized argument: %s"

304 msgstr "okänt argument: %s"

305

308 -#: bundle.c:334

306 +#: bundle.c:330

307 #, c-format

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

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

310

313 -#: bundle.c:379

311 +#: bundle.c:375

312 msgid "Refusing to create empty bundle."

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

314

317 -#: bundle.c:395

315 +#: bundle.c:390

316 msgid "Could not spawn pack-objects"

317 msgstr "Kunde inte starta pack-objects"

318

321 -#: bundle.c:413

319 +#: bundle.c:408

320 msgid "pack-objects died"

321 msgstr "pack-objects misslyckades"

322

325 -#: bundle.c:416

323 +#: bundle.c:411

324 #, c-format

325 msgid "cannot create '%s'"

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

327

330 -#: bundle.c:438

328 +#: bundle.c:433

329 msgid "index-pack died"

330 msgstr "index-pack dog"

331

334 -#: commit.c:54

332 +#: commit.c:40

333 #, c-format

334 msgid "could not parse %s"

335 msgstr "kunde inte tolka %s"

336

339 -#: commit.c:56

337 +#: commit.c:42

338 #, c-format

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

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

@@ -432,26 +430,26 @@ msgstr[1] "%lu år sedan"

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

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

432

435 -#: diffcore-rename.c:517

433 +#: diffcore-rename.c:514

434 msgid "Performing inexact rename detection"

435 msgstr "Utför onöjaktig namnbytesdetektering"

436

439 -#: diff.c:113

437 +#: diff.c:114

438 #, c-format

439 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

440 msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

441

444 -#: diff.c:118

442 +#: diff.c:119

443 #, c-format

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

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

446

449 -#: diff.c:213

447 +#: diff.c:214

448 #, c-format

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

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

451

454 -#: diff.c:263

452 +#: diff.c:267

453 #, c-format

454 msgid ""

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

@@ -460,7 +458,16 @@ msgstr ""

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

459 "%s"

460

463 -#: diff.c:3495

461 +#: diff.c:2934

462 +#, c-format

463 +msgid "external diff died, stopping at %s"

464 +msgstr "extern diff dog, stannar vid %s"

465 +

466 +#: diff.c:3329

467 +msgid "--follow requires exactly one pathspec"

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

469 +

470 +#: diff.c:3492

471 #, c-format

472 msgid ""

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

@@ -469,58 +476,58 @@ msgstr ""

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

477 "%s"

478

472 -#: diff.c:3509

479 +#: diff.c:3506

480 #, c-format

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

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

483

477 -#: gpg-interface.c:59 gpg-interface.c:131

484 +#: gpg-interface.c:73 gpg-interface.c:145

485 msgid "could not run gpg."

486 msgstr "kunde inte köra gpg."

487

481 -#: gpg-interface.c:71

488 +#: gpg-interface.c:85

489 msgid "gpg did not accept the data"

490 msgstr "gpg godtog inte data"

491

485 -#: gpg-interface.c:82

492 +#: gpg-interface.c:96

493 msgid "gpg failed to sign the data"

494 msgstr "gpg misslyckades signera data"

495

489 -#: gpg-interface.c:115

496 +#: gpg-interface.c:129

497 #, c-format

498 msgid "could not create temporary file '%s': %s"

499 msgstr "kunde inte skapa temporära filen \"%s\": %s"

500

494 -#: gpg-interface.c:118

501 +#: gpg-interface.c:132

502 #, c-format

503 msgid "failed writing detached signature to '%s': %s"

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

505

499 -#: grep.c:1698

506 +#: grep.c:1703

507 #, c-format

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

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

510

504 -#: grep.c:1715

511 +#: grep.c:1720

512 #, c-format

513 msgid "'%s': %s"

514 msgstr "\"%s\": %s"

515

509 -#: grep.c:1726

516 +#: grep.c:1731

517 #, c-format

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

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

520

514 -#: help.c:209

521 +#: help.c:207

522 #, c-format

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

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

525

519 -#: help.c:216

526 +#: help.c:214

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

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

529

523 -#: help.c:232

530 +#: help.c:230

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

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

533

@@ -556,7 +563,7 @@ msgstr "automatiskt om %0.1f sekunder..."

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

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

565

559 -#: help.c:384 help.c:443

566 +#: help.c:384 help.c:444

567 msgid ""

568 "\n"

569 "Did you mean this?"

@@ -570,16 +577,16 @@ msgstr[1] ""

577 "\n"

578 "Menade du ett av dessa?"

579

573 -#: help.c:439

580 +#: help.c:440

581 #, c-format

582 msgid "%s: %s - %s"

583 msgstr "%s: %s - %s"

584

578 -#: merge.c:56

585 +#: merge.c:40

586 msgid "failed to read the cache"

587 msgstr "misslyckades läsa cachen"

588

582 -#: merge.c:110 builtin/checkout.c:357 builtin/checkout.c:558

589 +#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

590 #: builtin/clone.c:661

591 msgid "unable to write new index file"

592 msgstr "kunde inte skriva ny indexfil"

@@ -589,7 +596,7 @@ msgstr "kunde inte skriva ny indexfil"

596 msgid "(bad commit)\n"

597 msgstr "(felaktig incheckning)\n"

598

592 -#: merge-recursive.c:208

599 +#: merge-recursive.c:210

600 #, c-format

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

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

@@ -598,64 +605,64 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

605 msgid "error building trees"

606 msgstr "fel vid byggande av träd"

607

601 -#: merge-recursive.c:675

608 +#: merge-recursive.c:692

609 #, c-format

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

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

612

606 -#: merge-recursive.c:686

613 +#: merge-recursive.c:703

614 #, c-format

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

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

617

611 -#: merge-recursive.c:700 merge-recursive.c:721

618 +#: merge-recursive.c:717 merge-recursive.c:738

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

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

621

615 -#: merge-recursive.c:711

622 +#: merge-recursive.c:728

623 #, c-format

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

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

626

620 -#: merge-recursive.c:751

627 +#: merge-recursive.c:768

628 #, c-format

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

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

631

625 -#: merge-recursive.c:753

632 +#: merge-recursive.c:770

633 #, c-format

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

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

636

630 -#: merge-recursive.c:776 builtin/clone.c:317

637 +#: merge-recursive.c:793 builtin/clone.c:317

638 #, c-format

639 msgid "failed to open '%s'"

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

641

635 -#: merge-recursive.c:784

642 +#: merge-recursive.c:801

643 #, c-format

644 msgid "failed to symlink '%s'"

645 msgstr "misslyckades skapa symboliska länken \"%s\""

646

640 -#: merge-recursive.c:787

647 +#: merge-recursive.c:804

648 #, c-format

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

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

651

645 -#: merge-recursive.c:925

652 +#: merge-recursive.c:942

653 msgid "Failed to execute internal merge"

654 msgstr "Misslyckades exekvera intern sammanslagning"

655

649 -#: merge-recursive.c:929

656 +#: merge-recursive.c:946

657 #, c-format

658 msgid "Unable to add %s to database"

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

660

654 -#: merge-recursive.c:945

661 +#: merge-recursive.c:962

662 msgid "unsupported object type in the tree"

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

664

658 -#: merge-recursive.c:1024 merge-recursive.c:1038

665 +#: merge-recursive.c:1037 merge-recursive.c:1051

666 #, c-format

667 msgid ""

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

@@ -664,7 +671,7 @@ msgstr ""

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

672 "i trädet."

673

667 -#: merge-recursive.c:1030 merge-recursive.c:1043

674 +#: merge-recursive.c:1043 merge-recursive.c:1056

675 #, c-format

676 msgid ""

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

@@ -673,20 +680,20 @@ msgstr ""

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

681 "i trädet vid %s."

682

676 -#: merge-recursive.c:1084

683 +#: merge-recursive.c:1097

684 msgid "rename"

685 msgstr "namnbyte"

686

680 -#: merge-recursive.c:1084

687 +#: merge-recursive.c:1097

688 msgid "renamed"

689 msgstr "namnbytt"

690

684 -#: merge-recursive.c:1140

691 +#: merge-recursive.c:1153

692 #, c-format

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

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

695

689 -#: merge-recursive.c:1162

696 +#: merge-recursive.c:1175

697 #, c-format

698 msgid ""

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

@@ -695,195 +702,195 @@ msgstr ""

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

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

704

698 -#: merge-recursive.c:1167

705 +#: merge-recursive.c:1180

706 msgid " (left unresolved)"

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

708

702 -#: merge-recursive.c:1221

709 +#: merge-recursive.c:1234

710 #, c-format

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

712 msgstr ""

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

714

708 -#: merge-recursive.c:1251

715 +#: merge-recursive.c:1264

716 #, c-format

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

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

719

713 -#: merge-recursive.c:1450

720 +#: merge-recursive.c:1463

721 #, c-format

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

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

724

718 -#: merge-recursive.c:1460

725 +#: merge-recursive.c:1473

726 #, c-format

727 msgid "Adding merged %s"

728 msgstr "Lägger till sammanslagen %s"

729

723 -#: merge-recursive.c:1465 merge-recursive.c:1663

730 +#: merge-recursive.c:1478 merge-recursive.c:1676

731 #, c-format

732 msgid "Adding as %s instead"

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

734

728 -#: merge-recursive.c:1516

735 +#: merge-recursive.c:1529

736 #, c-format

737 msgid "cannot read object %s"

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

739

733 -#: merge-recursive.c:1519

740 +#: merge-recursive.c:1532

741 #, c-format

742 msgid "object %s is not a blob"

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

744

738 -#: merge-recursive.c:1567

745 +#: merge-recursive.c:1580

746 msgid "modify"

747 msgstr "ändra"

748

742 -#: merge-recursive.c:1567

749 +#: merge-recursive.c:1580

750 msgid "modified"

751 msgstr "ändrad"

752

746 -#: merge-recursive.c:1577

753 +#: merge-recursive.c:1590

754 msgid "content"

755 msgstr "innehåll"

756

750 -#: merge-recursive.c:1584

757 +#: merge-recursive.c:1597

758 msgid "add/add"

759 msgstr "tillägg/tillägg"

760

754 -#: merge-recursive.c:1618

761 +#: merge-recursive.c:1631

762 #, c-format

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

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

765

759 -#: merge-recursive.c:1632

766 +#: merge-recursive.c:1645

767 #, c-format

768 msgid "Auto-merging %s"

769 msgstr "Slår ihop %s automatiskt"

770

764 -#: merge-recursive.c:1636 git-submodule.sh:1149

771 +#: merge-recursive.c:1649 git-submodule.sh:1150

772 msgid "submodule"

773 msgstr "undermodul"

774

768 -#: merge-recursive.c:1637

775 +#: merge-recursive.c:1650

776 #, c-format

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

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

779

773 -#: merge-recursive.c:1727

780 +#: merge-recursive.c:1740

781 #, c-format

782 msgid "Removing %s"

783 msgstr "Tar bort %s"

784

778 -#: merge-recursive.c:1752

785 +#: merge-recursive.c:1765

786 msgid "file/directory"

787 msgstr "fil/katalog"

788

782 -#: merge-recursive.c:1758

789 +#: merge-recursive.c:1771

790 msgid "directory/file"

791 msgstr "katalog/fil"

792

786 -#: merge-recursive.c:1763

793 +#: merge-recursive.c:1776

794 #, c-format

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

796 msgstr ""

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

798

792 -#: merge-recursive.c:1773

799 +#: merge-recursive.c:1786

800 #, c-format

801 msgid "Adding %s"

802 msgstr "Lägger till %s"

803

797 -#: merge-recursive.c:1790

804 +#: merge-recursive.c:1803

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

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

807

801 -#: merge-recursive.c:1809

808 +#: merge-recursive.c:1822

809 msgid "Already up-to-date!"

810 msgstr "Redan à jour!"

811

805 -#: merge-recursive.c:1818

812 +#: merge-recursive.c:1831

813 #, c-format

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

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

816

810 -#: merge-recursive.c:1848

817 +#: merge-recursive.c:1861

818 #, c-format

819 msgid "Unprocessed path??? %s"

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

821

815 -#: merge-recursive.c:1893

822 +#: merge-recursive.c:1906

823 msgid "Merging:"

824 msgstr "Slår ihop:"

825

819 -#: merge-recursive.c:1906

826 +#: merge-recursive.c:1919

827 #, c-format

828 msgid "found %u common ancestor:"

829 msgid_plural "found %u common ancestors:"

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

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

832

826 -#: merge-recursive.c:1943

833 +#: merge-recursive.c:1956

834 msgid "merge returned no commit"

835 msgstr "sammanslagningen returnerade ingen incheckning"

836

830 -#: merge-recursive.c:2000

837 +#: merge-recursive.c:2013

838 #, c-format

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

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

841

835 -#: merge-recursive.c:2012 builtin/merge.c:668

842 +#: merge-recursive.c:2024 builtin/merge.c:666

843 msgid "Unable to write index."

844 msgstr "Kunde inte skriva indexet."

845

839 -#: notes-utils.c:40

846 +#: notes-utils.c:41

847 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

849

843 -#: notes-utils.c:81

850 +#: notes-utils.c:83

851 #, c-format

852 msgid "Bad notes.rewriteMode value: '%s'"

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

854

848 -#: notes-utils.c:91

855 +#: notes-utils.c:93

856 #, c-format

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

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

859

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

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

855 -#: notes-utils.c:118

862 +#: notes-utils.c:120

863 #, c-format

864 msgid "Bad %s value: '%s'"

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

866

860 -#: object.c:229

867 +#: object.c:234

868 #, c-format

869 msgid "unable to parse object: %s"

870 msgstr "kunde inte tolka objektet: %s"

871

865 -#: parse-options.c:532

872 +#: parse-options.c:534

873 msgid "..."

874 msgstr "..."

875

869 -#: parse-options.c:550

876 +#: parse-options.c:552

877 #, c-format

878 msgid "usage: %s"

879 msgstr "användning: %s"

880

881 #. TRANSLATORS: the colon here should align with the

882 #. one in "usage: %s" translation

876 -#: parse-options.c:554

883 +#: parse-options.c:556

884 #, c-format

885 msgid " or: %s"

886 msgstr " eller: %s"

887

881 -#: parse-options.c:557

888 +#: parse-options.c:559

889 #, c-format

890 msgid " %s"

891 msgstr " %s"

892

886 -#: parse-options.c:591

893 +#: parse-options.c:593

894 msgid "-NUM"

895 msgstr "-TAL"

896

@@ -939,12 +946,12 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

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

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

948

942 -#: pathspec.c:433

949 +#: pathspec.c:432

950 #, c-format

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

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

953

947 -#: pathspec.c:442

954 +#: pathspec.c:441

955 msgid ""

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

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

@@ -952,11 +959,11 @@ msgstr ""

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

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

961

955 -#: progress.c:224

962 +#: progress.c:225

963 msgid "done"

964 msgstr "klart"

965

959 -#: read-cache.c:1238

966 +#: read-cache.c:1260

967 #, c-format

968 msgid ""

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

@@ -965,7 +972,7 @@ msgstr ""

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

973 "Använder version %i"

974

968 -#: read-cache.c:1248

975 +#: read-cache.c:1270

976 #, c-format

977 msgid ""

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

@@ -974,51 +981,51 @@ msgstr ""

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

982 "Använder version %i"

983

977 -#: remote.c:758

984 +#: remote.c:753

985 #, c-format

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

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

988

982 -#: remote.c:762

989 +#: remote.c:757

990 #, c-format

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

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

993

987 -#: remote.c:766

994 +#: remote.c:761

995 #, c-format

996 msgid "%s tracks both %s and %s"

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

998

992 -#: remote.c:774

999 +#: remote.c:769

1000 msgid "Internal error"

1001 msgstr "Internt fel"

1002

996 -#: remote.c:1948

1003 +#: remote.c:1943

1004 #, c-format

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

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

1007

1001 -#: remote.c:1952

1008 +#: remote.c:1947

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

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

1011

1005 -#: remote.c:1955

1012 +#: remote.c:1950

1013 #, c-format

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

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

1016

1010 -#: remote.c:1959

1017 +#: remote.c:1954

1018 #, c-format

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

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

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

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

1023

1017 -#: remote.c:1965

1024 +#: remote.c:1960

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

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

1027

1021 -#: remote.c:1968

1028 +#: remote.c:1963

1029 #, c-format

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

1031 msgid_plural ""

@@ -1028,11 +1035,11 @@ msgstr[0] ""

1035 msgstr[1] ""

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

1037

1031 -#: remote.c:1976

1038 +#: remote.c:1971

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

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

1041

1035 -#: remote.c:1979

1042 +#: remote.c:1974

1043 #, c-format

1044 msgid ""

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

@@ -1047,7 +1054,7 @@ msgstr[1] ""

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

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

1056

1050 -#: remote.c:1989

1057 +#: remote.c:1984

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

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

1060

@@ -1060,19 +1067,19 @@ msgstr "misslyckades öppna /dev/null"

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

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

1069

1063 -#: sequencer.c:206 builtin/merge.c:786 builtin/merge.c:899

1064 -#: builtin/merge.c:1009 builtin/merge.c:1019

1070 +#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1071 +#: builtin/merge.c:1003 builtin/merge.c:1013

1072 #, c-format

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

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

1075

1069 -#: sequencer.c:208 builtin/merge.c:343 builtin/merge.c:789

1070 -#: builtin/merge.c:1011 builtin/merge.c:1024

1076 +#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1077 +#: builtin/merge.c:1005 builtin/merge.c:1018

1078 #, c-format

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

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

1081

1075 -#: sequencer.c:229

1082 +#: sequencer.c:194

1083 msgid ""

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

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

@@ -1080,7 +1087,7 @@ msgstr ""

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

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

1089

1083 -#: sequencer.c:232

1090 +#: sequencer.c:197

1091 msgid ""

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

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

@@ -1090,220 +1097,224 @@ msgstr ""

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

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

1099

1093 -#: sequencer.c:245 sequencer.c:879 sequencer.c:962

1100 +#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1101 #, c-format

1102 msgid "Could not write to %s"

1103 msgstr "Kunde inte skriva till %s"

1104

1098 -#: sequencer.c:248

1105 +#: sequencer.c:213

1106 #, c-format

1107 msgid "Error wrapping up %s"

1108 msgstr "Fel vid ombrytning av %s"

1109

1103 -#: sequencer.c:263

1110 +#: sequencer.c:228

1111 msgid "Your local changes would be overwritten by cherry-pick."

1112 msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."

1113

1107 -#: sequencer.c:265

1114 +#: sequencer.c:230

1115 msgid "Your local changes would be overwritten by revert."

1116 msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."

1117

1111 -#: sequencer.c:268

1118 +#: sequencer.c:233

1119 msgid "Commit your changes or stash them to proceed."

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

1121

1122 +#: sequencer.c:250

1123 +msgid "Failed to lock HEAD during fast_forward_to"

1124 +msgstr "Misslyckades låsa HEAD under \"fast_forward_to\""

1125 +

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

1116 -#: sequencer.c:325

1127 +#: sequencer.c:293

1128 #, c-format

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

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

1131

1121 -#: sequencer.c:356

1132 +#: sequencer.c:324

1133 msgid "Could not resolve HEAD commit\n"

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

1135

1125 -#: sequencer.c:378

1136 +#: sequencer.c:344

1137 msgid "Unable to update cache tree\n"

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

1139

1129 -#: sequencer.c:430

1140 +#: sequencer.c:391

1141 #, c-format

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

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

1144

1134 -#: sequencer.c:435

1145 +#: sequencer.c:396

1146 #, c-format

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

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

1149

1139 -#: sequencer.c:501

1150 +#: sequencer.c:462

1151 msgid "Your index file is unmerged."

1152 msgstr "Din indexfil har inte slagits ihop."

1153

1143 -#: sequencer.c:520

1154 +#: sequencer.c:481

1155 #, c-format

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

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

1158

1148 -#: sequencer.c:528

1159 +#: sequencer.c:489

1160 #, c-format

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

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

1163

1153 -#: sequencer.c:532

1164 +#: sequencer.c:493

1165 #, c-format

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

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

1168

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

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

1160 -#: sequencer.c:545

1171 +#: sequencer.c:506

1172 #, c-format

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

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

1175

1165 -#: sequencer.c:549

1176 +#: sequencer.c:510

1177 #, c-format

1178 msgid "Cannot get commit message for %s"

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

1180

1170 -#: sequencer.c:635

1181 +#: sequencer.c:596

1182 #, c-format

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

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

1185

1175 -#: sequencer.c:636

1186 +#: sequencer.c:597

1187 #, c-format

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

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

1190

1180 -#: sequencer.c:672

1191 +#: sequencer.c:633

1192 msgid "empty commit set passed"

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

1194

1184 -#: sequencer.c:680

1195 +#: sequencer.c:641

1196 #, c-format

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

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

1199

1189 -#: sequencer.c:685

1200 +#: sequencer.c:645

1201 #, c-format

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

1203 msgstr "git %s: misslyckades uppdatera indexet"

1204

1194 -#: sequencer.c:743

1205 +#: sequencer.c:705

1206 #, c-format

1207 msgid "Cannot %s during a %s"

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

1209

1199 -#: sequencer.c:765

1210 +#: sequencer.c:727

1211 #, c-format

1212 msgid "Could not parse line %d."

1213 msgstr "Kan inte tolka rad %d."

1214

1204 -#: sequencer.c:770

1215 +#: sequencer.c:732

1216 msgid "No commits parsed."

1217 msgstr "Inga incheckningar lästes."

1218

1208 -#: sequencer.c:783

1219 +#: sequencer.c:745

1220 #, c-format

1221 msgid "Could not open %s"

1222 msgstr "Kunde inte öppna %s"

1223

1213 -#: sequencer.c:787

1224 +#: sequencer.c:749

1225 #, c-format

1226 msgid "Could not read %s."

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

1228

1218 -#: sequencer.c:794

1229 +#: sequencer.c:756

1230 #, c-format

1231 msgid "Unusable instruction sheet: %s"

1232 msgstr "Oanvändbart manus: %s"

1233

1223 -#: sequencer.c:824

1234 +#: sequencer.c:786

1235 #, c-format

1236 msgid "Invalid key: %s"

1237 msgstr "Felaktig nyckel: %s"

1238

1228 -#: sequencer.c:827

1239 +#: sequencer.c:789

1240 #, c-format

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

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

1243

1233 -#: sequencer.c:839

1244 +#: sequencer.c:801

1245 #, c-format

1246 msgid "Malformed options sheet: %s"

1247 msgstr "Trasigt manus: %s"

1248

1238 -#: sequencer.c:860

1249 +#: sequencer.c:822

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

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

1252

1242 -#: sequencer.c:861

1253 +#: sequencer.c:823

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

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

1256

1246 -#: sequencer.c:865

1257 +#: sequencer.c:827

1258 #, c-format

1259 msgid "Could not create sequencer directory %s"

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

1261

1251 -#: sequencer.c:881 sequencer.c:966

1262 +#: sequencer.c:843 sequencer.c:928

1263 #, c-format

1264 msgid "Error wrapping up %s."

1265 msgstr "Fel vid ombrytning av %s."

1266

1256 -#: sequencer.c:900 sequencer.c:1036

1267 +#: sequencer.c:862 sequencer.c:998

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

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

1270

1260 -#: sequencer.c:902

1271 +#: sequencer.c:864

1272 msgid "cannot resolve HEAD"

1273 msgstr "kan inte bestämma HEAD"

1274

1264 -#: sequencer.c:904

1275 +#: sequencer.c:866

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

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

1278

1268 -#: sequencer.c:926 builtin/apply.c:4061

1279 +#: sequencer.c:888 builtin/apply.c:4062

1280 #, c-format

1281 msgid "cannot open %s: %s"

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

1283

1273 -#: sequencer.c:929

1284 +#: sequencer.c:891

1285 #, c-format

1286 msgid "cannot read %s: %s"

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

1288

1278 -#: sequencer.c:930

1289 +#: sequencer.c:892

1290 msgid "unexpected end of file"

1291 msgstr "oväntat filslut"

1292

1282 -#: sequencer.c:936

1293 +#: sequencer.c:898

1294 #, c-format

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

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

1297

1287 -#: sequencer.c:959

1298 +#: sequencer.c:921

1299 #, c-format

1300 msgid "Could not format %s."

1301 msgstr "Kunde inte formatera %s."

1302

1292 -#: sequencer.c:1104

1303 +#: sequencer.c:1066

1304 #, c-format

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

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

1307

1297 -#: sequencer.c:1107

1308 +#: sequencer.c:1069

1309 #, c-format

1310 msgid "%s: bad revision"

1311 msgstr "%s: felaktig revision"

1312

1302 -#: sequencer.c:1141

1313 +#: sequencer.c:1103

1314 msgid "Can't revert as initial commit"

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

1316

1306 -#: sequencer.c:1142

1317 +#: sequencer.c:1104

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

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

1320

@@ -1329,21 +1340,21 @@ msgstr ""

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

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

1342

1332 -#: sha1_name.c:1072

1343 +#: sha1_name.c:1060

1344 msgid "HEAD does not point to a branch"

1345 msgstr "HEAD pekar inte på en gren"

1346

1336 -#: sha1_name.c:1075

1347 +#: sha1_name.c:1063

1348 #, c-format

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

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

1351

1341 -#: sha1_name.c:1077

1352 +#: sha1_name.c:1065

1353 #, c-format

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

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

1356

1346 -#: sha1_name.c:1081

1357 +#: sha1_name.c:1069

1358 #, c-format

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

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

@@ -1373,17 +1384,17 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1384 msgid "staging updated .gitmodules failed"

1385 msgstr "misslyckades köa uppdaterad .gitmodules"

1386

1376 -#: submodule.c:1121 builtin/init-db.c:363

1387 +#: submodule.c:1118 builtin/init-db.c:363

1388 #, c-format

1389 msgid "Could not create git link %s"

1390 msgstr "Kunde inte skapa gitlänk %s"

1391

1381 -#: submodule.c:1132

1392 +#: submodule.c:1129

1393 #, c-format

1394 msgid "Could not set core.worktree in %s"

1395 msgstr "Kunde inte sätta core.worktree i %s"

1396

1386 -#: unpack-trees.c:206

1397 +#: unpack-trees.c:202

1398 msgid "Checking out files"

1399 msgstr "Checkar ut filer"

1400

@@ -1416,22 +1427,22 @@ msgstr "felaktigt portnummer"

1427 msgid "invalid '..' path segment"

1428 msgstr "felaktigt \"..\"-sökvägssegment"

1429

1419 -#: wrapper.c:422

1430 +#: wrapper.c:460

1431 #, c-format

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

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

1434

1424 -#: wrapper.c:443

1435 +#: wrapper.c:481

1436 #, c-format

1437 msgid "unable to access '%s'"

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

1439

1429 -#: wrapper.c:454

1440 +#: wrapper.c:492

1441 #, c-format

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

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

1444

1434 -#: wrapper.c:455

1445 +#: wrapper.c:493

1446 msgid "no such user"

1447 msgstr "okänd användare"

1448

@@ -1578,15 +1589,15 @@ msgstr "ospårat innehåll, "

1589 msgid "bug: unhandled diff status %c"

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

1591

1581 -#: wt-status.c:765

1592 +#: wt-status.c:764

1593 msgid "Submodules changed but not updated:"

1594 msgstr "Undermoduler ändrade men inte uppdaterade:"

1595

1585 -#: wt-status.c:767

1596 +#: wt-status.c:766

1597 msgid "Submodule changes to be committed:"

1598 msgstr "Undermodulers ändringar att checka in:"

1599

1589 -#: wt-status.c:846

1600 +#: wt-status.c:845

1601 msgid ""

1602 "Do not touch the line above.\n"

1603 "Everything below will be removed."

@@ -1594,68 +1605,68 @@ msgstr ""

1605 "Rör inte raden ovan.\n"

1606 "Allt nedan kommer tas bort."

1607

1597 -#: wt-status.c:937

1608 +#: wt-status.c:936

1609 msgid "You have unmerged paths."

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

1611

1601 -#: wt-status.c:940

1612 +#: wt-status.c:939

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

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

1615

1605 -#: wt-status.c:943

1616 +#: wt-status.c:942

1617 msgid "All conflicts fixed but you are still merging."

1618 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

1619

1609 -#: wt-status.c:946

1620 +#: wt-status.c:945

1621 msgid " (use \"git commit\" to conclude merge)"

1622 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

1623

1613 -#: wt-status.c:956

1624 +#: wt-status.c:955

1625 msgid "You are in the middle of an am session."

1626 msgstr "Du är i mitten av en körning av \"git am\"."

1627

1617 -#: wt-status.c:959

1628 +#: wt-status.c:958

1629 msgid "The current patch is empty."

1630 msgstr "Aktuell patch är tom."

1631

1621 -#: wt-status.c:963

1632 +#: wt-status.c:962

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

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

1635

1625 -#: wt-status.c:965

1636 +#: wt-status.c:964

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

1638 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

1639

1629 -#: wt-status.c:967

1640 +#: wt-status.c:966

1641 msgid " (use \"git am --abort\" to restore the original branch)"

1642 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

1643

1633 -#: wt-status.c:1027 wt-status.c:1044

1644 +#: wt-status.c:1026 wt-status.c:1043

1645 #, c-format

1646 msgid "You are currently rebasing branch '%s' on '%s'."

1647 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

1648

1638 -#: wt-status.c:1032 wt-status.c:1049

1649 +#: wt-status.c:1031 wt-status.c:1048

1650 msgid "You are currently rebasing."

1651 msgstr "Du håller på med en ombasering."

1652

1642 -#: wt-status.c:1035

1653 +#: wt-status.c:1034

1654 msgid " (fix conflicts and then run \"git rebase --continue\")"

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

1656

1646 -#: wt-status.c:1037

1657 +#: wt-status.c:1036

1658 msgid " (use \"git rebase --skip\" to skip this patch)"

1659 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

1660

1650 -#: wt-status.c:1039

1661 +#: wt-status.c:1038

1662 msgid " (use \"git rebase --abort\" to check out the original branch)"

1663 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

1664

1654 -#: wt-status.c:1052

1665 +#: wt-status.c:1051

1666 msgid " (all conflicts fixed: run \"git rebase --continue\")"

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

1668

1658 -#: wt-status.c:1056

1669 +#: wt-status.c:1055

1670 #, c-format

1671 msgid ""

1672 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -1663,118 +1674,118 @@ msgstr ""

1674 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

1675 "ovanpå \"%s\"."

1676

1666 -#: wt-status.c:1061

1677 +#: wt-status.c:1060

1678 msgid "You are currently splitting a commit during a rebase."

1679 msgstr "Du håller på att dela upp en incheckning i en ombasering."

1680

1670 -#: wt-status.c:1064

1681 +#: wt-status.c:1063

1682 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1683 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

1684

1674 -#: wt-status.c:1068

1685 +#: wt-status.c:1067

1686 #, c-format

1687 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

1688 msgstr ""

1689 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

1690 "ovanpå \"%s\"."

1691

1681 -#: wt-status.c:1073

1692 +#: wt-status.c:1072

1693 msgid "You are currently editing a commit during a rebase."

1694 msgstr "Du håller på att redigera en incheckning under en ombasering."

1695

1685 -#: wt-status.c:1076

1696 +#: wt-status.c:1075

1697 msgid " (use \"git commit --amend\" to amend the current commit)"

1698 msgstr ""

1699 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

1700

1690 -#: wt-status.c:1078

1701 +#: wt-status.c:1077

1702 msgid ""

1703 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1704 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

1705

1695 -#: wt-status.c:1088

1706 +#: wt-status.c:1087

1707 #, c-format

1708 msgid "You are currently cherry-picking commit %s."

1709 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

1710

1700 -#: wt-status.c:1093

1711 +#: wt-status.c:1092

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

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

1714

1704 -#: wt-status.c:1096

1715 +#: wt-status.c:1095

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

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

1718

1708 -#: wt-status.c:1098

1719 +#: wt-status.c:1097

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

1721 msgstr ""

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

1723 "operationen)"

1724

1714 -#: wt-status.c:1107

1725 +#: wt-status.c:1106

1726 #, c-format

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

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

1729

1719 -#: wt-status.c:1112

1730 +#: wt-status.c:1111

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

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

1733

1723 -#: wt-status.c:1115

1734 +#: wt-status.c:1114

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

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

1737

1727 -#: wt-status.c:1117

1738 +#: wt-status.c:1116

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

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

1741

1731 -#: wt-status.c:1128

1742 +#: wt-status.c:1127

1743 #, c-format

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

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

1746

1736 -#: wt-status.c:1132

1747 +#: wt-status.c:1131

1748 msgid "You are currently bisecting."

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

1750

1740 -#: wt-status.c:1135

1751 +#: wt-status.c:1134

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

1753 msgstr ""

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

1755

1745 -#: wt-status.c:1310

1756 +#: wt-status.c:1309

1757 msgid "On branch "

1758 msgstr "På grenen "

1759

1749 -#: wt-status.c:1317

1760 +#: wt-status.c:1316

1761 msgid "rebase in progress; onto "

1762 msgstr "ombasering pågår; ovanpå"

1763

1753 -#: wt-status.c:1324

1764 +#: wt-status.c:1323

1765 msgid "HEAD detached at "

1766 msgstr "HEAD frånkopplad vid "

1767

1757 -#: wt-status.c:1326

1768 +#: wt-status.c:1325

1769 msgid "HEAD detached from "

1770 msgstr "HEAD frånkopplad från "

1771

1761 -#: wt-status.c:1329

1772 +#: wt-status.c:1328

1773 msgid "Not currently on any branch."

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

1775

1765 -#: wt-status.c:1346

1776 +#: wt-status.c:1345

1777 msgid "Initial commit"

1778 msgstr "Första incheckning"

1779

1769 -#: wt-status.c:1360

1780 +#: wt-status.c:1359

1781 msgid "Untracked files"

1782 msgstr "Ospårade filer"

1783

1773 -#: wt-status.c:1362

1784 +#: wt-status.c:1361

1785 msgid "Ignored files"

1786 msgstr "Ignorerade filer"

1787

1777 -#: wt-status.c:1366

1788 +#: wt-status.c:1365

1789 #, c-format

1790 msgid ""

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

@@ -1786,32 +1797,32 @@ msgstr ""

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

1798

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

1789 -#: wt-status.c:1372

1800 +#: wt-status.c:1371

1801 #, c-format

1802 msgid "Untracked files not listed%s"

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

1804

1794 -#: wt-status.c:1374

1805 +#: wt-status.c:1373

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

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

1808

1798 -#: wt-status.c:1380

1809 +#: wt-status.c:1379

1810 msgid "No changes"

1811 msgstr "Inga ändringar"

1812

1802 -#: wt-status.c:1385

1813 +#: wt-status.c:1384

1814 #, c-format

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

1816 msgstr ""

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

1818 "\")\n"

1819

1809 -#: wt-status.c:1388

1820 +#: wt-status.c:1387

1821 #, c-format

1822 msgid "no changes added to commit\n"

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

1824

1814 -#: wt-status.c:1391

1825 +#: wt-status.c:1390

1826 #, c-format

1827 msgid ""

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

@@ -1820,44 +1831,44 @@ msgstr ""

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

1832 "\")\n"

1833

1823 -#: wt-status.c:1394

1834 +#: wt-status.c:1393

1835 #, c-format

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

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

1838

1828 -#: wt-status.c:1397

1839 +#: wt-status.c:1396

1840 #, c-format

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

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

1843

1833 -#: wt-status.c:1400 wt-status.c:1405

1844 +#: wt-status.c:1399 wt-status.c:1404

1845 #, c-format

1846 msgid "nothing to commit\n"

1847 msgstr "inget att checka in\n"

1848

1838 -#: wt-status.c:1403

1849 +#: wt-status.c:1402

1850 #, c-format

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

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

1853

1843 -#: wt-status.c:1407

1854 +#: wt-status.c:1406

1855 #, c-format

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

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

1858

1848 -#: wt-status.c:1516

1859 +#: wt-status.c:1515

1860 msgid "HEAD (no branch)"

1861 msgstr "HEAD (ingen gren)"

1862

1852 -#: wt-status.c:1522

1863 +#: wt-status.c:1521

1864 msgid "Initial commit on "

1865 msgstr "Första incheckning på "

1866

1856 -#: wt-status.c:1554

1867 +#: wt-status.c:1553

1868 msgid "gone"

1869 msgstr "försvunnen"

1870

1860 -#: wt-status.c:1556 wt-status.c:1564

1871 +#: wt-status.c:1555 wt-status.c:1563

1872 msgid "behind "

1873 msgstr "efter "

1874

@@ -1888,7 +1899,7 @@ msgstr "ta bort \"%s\"\n"

1899 msgid "Unstaged changes after refreshing the index:"

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

1901

1891 -#: builtin/add.c:193

1902 +#: builtin/add.c:193 builtin/rev-parse.c:781

1903 msgid "Could not read the index"

1904 msgstr "Kunde inte läsa indexet"

1905

@@ -1919,15 +1930,15 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

1932

1922 -#: builtin/add.c:248 builtin/clean.c:876 builtin/fetch.c:93 builtin/mv.c:70

1923 -#: builtin/prune-packed.c:77 builtin/push.c:489 builtin/remote.c:1344

1933 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1934 +#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

1935 #: builtin/rm.c:269

1936 msgid "dry run"

1937 msgstr "testkörning"

1938

1928 -#: builtin/add.c:249 builtin/apply.c:4410 builtin/check-ignore.c:19

1929 -#: builtin/commit.c:1256 builtin/count-objects.c:95 builtin/fsck.c:612

1930 -#: builtin/log.c:1592 builtin/mv.c:69 builtin/read-tree.c:113

1939 +#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1940 +#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1941 +#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

1942 msgid "be verbose"

1943 msgstr "var pratsam"

1944

@@ -1935,7 +1946,7 @@ msgstr "var pratsam"

1946 msgid "interactive picking"

1947 msgstr "plocka interaktivt"

1948

1938 -#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:283

1949 +#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

1950 msgid "select hunks interactively"

1951 msgstr "välj stycken interaktivt"

1952

@@ -1988,30 +1999,30 @@ msgstr "inga filer har lagts till"

1999 msgid "adding files failed"

2000 msgstr "misslyckades lägga till filer"

2001

1991 -#: builtin/add.c:330

2002 +#: builtin/add.c:329

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

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

2005

1995 -#: builtin/add.c:337

2006 +#: builtin/add.c:336

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

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

2009

1999 -#: builtin/add.c:358

2010 +#: builtin/add.c:357

2011 #, c-format

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

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

2014

2004 -#: builtin/add.c:359

2015 +#: builtin/add.c:358

2016 #, c-format

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

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

2019

2009 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:920

2010 -#: builtin/commit.c:320 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2020 +#: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2021 +#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2022 msgid "index file corrupt"

2023 msgstr "indexfilen trasig"

2024

2014 -#: builtin/add.c:448 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:432

2025 +#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2026 msgid "Unable to write new index file"

2027 msgstr "Kunde inte skriva ny indexfil"

2028

@@ -2029,37 +2040,37 @@ msgstr "okänt alternativ för whitespace: \"%s\""

2040 msgid "unrecognized whitespace ignore option '%s'"

2041 msgstr "okänt alternativ för ignore-whitespace: \"%s\""

2042

2032 -#: builtin/apply.c:823

2043 +#: builtin/apply.c:825

2044 #, c-format

2045 msgid "Cannot prepare timestamp regexp %s"

2046 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"

2047

2037 -#: builtin/apply.c:832

2048 +#: builtin/apply.c:834

2049 #, c-format

2050 msgid "regexec returned %d for input: %s"

2051 msgstr "regexec returnerade %d för indata: %s"

2052

2042 -#: builtin/apply.c:913

2053 +#: builtin/apply.c:915

2054 #, c-format

2055 msgid "unable to find filename in patch at line %d"

2056 msgstr "kan inte hitta filnamn i patchen på rad %d"

2057

2047 -#: builtin/apply.c:945

2058 +#: builtin/apply.c:947

2059 #, c-format

2060 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

2061 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"

2062

2052 -#: builtin/apply.c:949

2063 +#: builtin/apply.c:951

2064 #, c-format

2065 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

2066 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"

2067

2057 -#: builtin/apply.c:950

2068 +#: builtin/apply.c:952

2069 #, c-format

2070 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

2071 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"

2072

2062 -#: builtin/apply.c:957

2073 +#: builtin/apply.c:959

2074 #, c-format

2075 msgid "git apply: bad git-diff - expected /dev/null on line %d"

2076 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"

@@ -2174,17 +2185,17 @@ msgstr ""

2185 msgid "missing binary patch data for '%s'"

2186 msgstr "saknar binära patchdata för \"%s\""

2187

2177 -#: builtin/apply.c:2946

2188 +#: builtin/apply.c:2944

2189 #, c-format

2190 msgid "binary patch does not apply to '%s'"

2191 msgstr "binärpatchen kan inte tillämpas på \"%s\""

2192

2182 -#: builtin/apply.c:2952

2193 +#: builtin/apply.c:2950

2194 #, c-format

2195 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"

2196 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"

2197

2187 -#: builtin/apply.c:2973

2198 +#: builtin/apply.c:2971

2199 #, c-format

2200 msgid "patch failed: %s:%ld"

2201 msgstr "patch misslyckades: %s:%ld"

@@ -2273,213 +2284,213 @@ msgstr "make_cache_entry misslyckades för sökvägen \"%s\""

2284 msgid "unable to remove %s from index"

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

2286

2276 -#: builtin/apply.c:3851

2287 +#: builtin/apply.c:3852

2288 #, c-format

2289 msgid "corrupt patch for submodule %s"

2290 msgstr "trasig patch för undermodulen %s"

2291

2281 -#: builtin/apply.c:3855

2292 +#: builtin/apply.c:3856

2293 #, c-format

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

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

2296

2286 -#: builtin/apply.c:3860

2297 +#: builtin/apply.c:3861

2298 #, c-format

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

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

2301

2291 -#: builtin/apply.c:3863 builtin/apply.c:3971

2302 +#: builtin/apply.c:3864 builtin/apply.c:3972

2303 #, c-format

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

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

2306

2296 -#: builtin/apply.c:3896

2307 +#: builtin/apply.c:3897

2308 #, c-format

2309 msgid "closing file '%s'"

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

2311

2301 -#: builtin/apply.c:3945

2312 +#: builtin/apply.c:3946

2313 #, c-format

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

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

2316

2306 -#: builtin/apply.c:4032

2317 +#: builtin/apply.c:4033

2318 #, c-format

2319 msgid "Applied patch %s cleanly."

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

2321

2311 -#: builtin/apply.c:4040

2322 +#: builtin/apply.c:4041

2323 msgid "internal error"

2324 msgstr "internt fel"

2325

2315 -#: builtin/apply.c:4043

2326 +#: builtin/apply.c:4044

2327 #, c-format

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

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

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

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

2332

2322 -#: builtin/apply.c:4053

2333 +#: builtin/apply.c:4054

2334 #, c-format

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

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

2337

2327 -#: builtin/apply.c:4074

2338 +#: builtin/apply.c:4075

2339 #, c-format

2340 msgid "Hunk #%d applied cleanly."

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

2342

2332 -#: builtin/apply.c:4077

2343 +#: builtin/apply.c:4078

2344 #, c-format

2345 msgid "Rejected hunk #%d."

2346 msgstr "Refuserar stycke %d."

2347

2337 -#: builtin/apply.c:4227

2348 +#: builtin/apply.c:4228

2349 msgid "unrecognized input"

2350 msgstr "indata känns inte igen"

2351

2341 -#: builtin/apply.c:4238

2352 +#: builtin/apply.c:4239

2353 msgid "unable to read index file"

2354 msgstr "kan inte läsa indexfilen"

2355

2345 -#: builtin/apply.c:4357 builtin/apply.c:4360 builtin/clone.c:90

2346 -#: builtin/fetch.c:78

2356 +#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2357 +#: builtin/fetch.c:93

2358 msgid "path"

2359 msgstr "sökväg"

2360

2350 -#: builtin/apply.c:4358

2361 +#: builtin/apply.c:4359

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

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

2364

2354 -#: builtin/apply.c:4361

2365 +#: builtin/apply.c:4362

2366 msgid "apply changes matching the given path"

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

2368

2358 -#: builtin/apply.c:4363

2369 +#: builtin/apply.c:4364

2370 msgid "num"

2371 msgstr "antal"

2372

2362 -#: builtin/apply.c:4364

2373 +#: builtin/apply.c:4365

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

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

2376

2366 -#: builtin/apply.c:4367

2377 +#: builtin/apply.c:4368

2378 msgid "ignore additions made by the patch"

2379 msgstr "ignorera tillägg gjorda av patchen"

2380

2370 -#: builtin/apply.c:4369

2381 +#: builtin/apply.c:4370

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

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

2384

2374 -#: builtin/apply.c:4373

2385 +#: builtin/apply.c:4374

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

2387 msgstr "visa antal tillagda och borttagna rader decimalt"

2388

2378 -#: builtin/apply.c:4375

2389 +#: builtin/apply.c:4376

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

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

2392

2382 -#: builtin/apply.c:4377

2393 +#: builtin/apply.c:4378

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

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

2396

2386 -#: builtin/apply.c:4379

2397 +#: builtin/apply.c:4380

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

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

2400

2390 -#: builtin/apply.c:4381

2401 +#: builtin/apply.c:4382

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

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

2404

2394 -#: builtin/apply.c:4383

2405 +#: builtin/apply.c:4384

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

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

2408

2398 -#: builtin/apply.c:4385

2409 +#: builtin/apply.c:4386

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

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

2412

2402 -#: builtin/apply.c:4387

2413 +#: builtin/apply.c:4388

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

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

2416

2406 -#: builtin/apply.c:4389 builtin/checkout-index.c:197 builtin/ls-files.c:455

2417 +#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2418 msgid "paths are separated with NUL character"

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

2420

2410 -#: builtin/apply.c:4392

2421 +#: builtin/apply.c:4393

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

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

2424

2414 -#: builtin/apply.c:4393

2425 +#: builtin/apply.c:4394

2426 msgid "action"

2427 msgstr "åtgärd"

2428

2418 -#: builtin/apply.c:4394

2429 +#: builtin/apply.c:4395

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

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

2432

2422 -#: builtin/apply.c:4397 builtin/apply.c:4400

2433 +#: builtin/apply.c:4398 builtin/apply.c:4401

2434 msgid "ignore changes in whitespace when finding context"

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

2436

2426 -#: builtin/apply.c:4403

2437 +#: builtin/apply.c:4404

2438 msgid "apply the patch in reverse"

2439 msgstr "tillämpa patchen baklänges"

2440

2430 -#: builtin/apply.c:4405

2441 +#: builtin/apply.c:4406

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

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

2444

2434 -#: builtin/apply.c:4407

2445 +#: builtin/apply.c:4408

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

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

2448

2438 -#: builtin/apply.c:4409

2449 +#: builtin/apply.c:4410

2450 msgid "allow overlapping hunks"

2451 msgstr "tillåt överlappande stycken"

2452

2442 -#: builtin/apply.c:4412

2453 +#: builtin/apply.c:4413

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

2455 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2456

2446 -#: builtin/apply.c:4415

2457 +#: builtin/apply.c:4416

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

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

2460

2450 -#: builtin/apply.c:4417

2461 +#: builtin/apply.c:4418

2462 msgid "root"

2463 msgstr "rot"

2464

2454 -#: builtin/apply.c:4418

2465 +#: builtin/apply.c:4419

2466 msgid "prepend <root> to all filenames"

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

2468

2458 -#: builtin/apply.c:4440

2469 +#: builtin/apply.c:4441

2470 msgid "--3way outside a repository"

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

2472

2462 -#: builtin/apply.c:4448

2473 +#: builtin/apply.c:4449

2474 msgid "--index outside a repository"

2475 msgstr "--index utanför arkiv"

2476

2466 -#: builtin/apply.c:4451

2477 +#: builtin/apply.c:4452

2478 msgid "--cached outside a repository"

2479 msgstr "--cached utanför arkiv"

2480

2470 -#: builtin/apply.c:4467

2481 +#: builtin/apply.c:4468

2482 #, c-format

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

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

2485

2475 -#: builtin/apply.c:4481

2486 +#: builtin/apply.c:4482

2487 #, c-format

2488 msgid "squelched %d whitespace error"

2489 msgid_plural "squelched %d whitespace errors"

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

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

2492

2482 -#: builtin/apply.c:4487 builtin/apply.c:4497

2493 +#: builtin/apply.c:4488 builtin/apply.c:4498

2494 #, c-format

2495 msgid "%d line adds whitespace errors."

2496 msgid_plural "%d lines add whitespace errors."

@@ -2533,106 +2544,116 @@ msgstr "utför 'git bisect next'"

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

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

2546

2536 -#: builtin/blame.c:27

2547 +#: builtin/blame.c:30

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

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

2550

2540 -#: builtin/blame.c:32

2551 +#: builtin/blame.c:35

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

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

2554

2544 -#: builtin/blame.c:2242

2555 +#: builtin/blame.c:2501

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

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

2558

2548 -#: builtin/blame.c:2243

2559 +#: builtin/blame.c:2502

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

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

2562

2552 -#: builtin/blame.c:2244

2563 +#: builtin/blame.c:2503

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

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

2566

2556 -#: builtin/blame.c:2245

2567 +#: builtin/blame.c:2504

2568 msgid "Show work cost statistics"

2569 msgstr "Visa statistik över arbetskostnad"

2570

2560 -#: builtin/blame.c:2246

2571 +#: builtin/blame.c:2505

2572 msgid "Show output score for blame entries"

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

2574

2564 -#: builtin/blame.c:2247

2575 +#: builtin/blame.c:2506

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

2577 msgstr "Visa originalfilnamn (Standard: auto)"

2578

2568 -#: builtin/blame.c:2248

2579 +#: builtin/blame.c:2507

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

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

2582

2572 -#: builtin/blame.c:2249

2583 +#: builtin/blame.c:2508

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

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

2586

2576 -#: builtin/blame.c:2250

2587 +#: builtin/blame.c:2509

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

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

2590

2580 -#: builtin/blame.c:2251

2591 +#: builtin/blame.c:2510

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

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

2594

2584 -#: builtin/blame.c:2252

2595 +#: builtin/blame.c:2511

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

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

2598

2588 -#: builtin/blame.c:2253

2599 +#: builtin/blame.c:2512

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

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

2602

2592 -#: builtin/blame.c:2254

2603 +#: builtin/blame.c:2513

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

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

2606

2596 -#: builtin/blame.c:2255

2607 +#: builtin/blame.c:2514

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

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

2610

2600 -#: builtin/blame.c:2256

2611 +#: builtin/blame.c:2515

2612 msgid "Ignore whitespace differences"

2613 msgstr "Ignorera ändringar i blanksteg"

2614

2604 -#: builtin/blame.c:2257

2615 +#: builtin/blame.c:2516

2616 msgid "Spend extra cycles to find better match"

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

2618

2608 -#: builtin/blame.c:2258

2619 +#: builtin/blame.c:2517

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

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

2622

2612 -#: builtin/blame.c:2259

2623 +#: builtin/blame.c:2518

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

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

2626

2616 -#: builtin/blame.c:2260 builtin/blame.c:2261

2627 +#: builtin/blame.c:2519 builtin/blame.c:2520

2628 msgid "score"

2629 msgstr "poäng"

2630

2620 -#: builtin/blame.c:2260

2631 +#: builtin/blame.c:2519

2632 msgid "Find line copies within and across files"

2633 msgstr "Hitta kopierade rader inuti och mellan filer"

2634

2624 -#: builtin/blame.c:2261

2635 +#: builtin/blame.c:2520

2636 msgid "Find line movements within and across files"

2637 msgstr "Hitta flyttade rader inuti och mellan filer"

2638

2628 -#: builtin/blame.c:2262

2639 +#: builtin/blame.c:2521

2640 msgid "n,m"

2641 msgstr "n,m"

2642

2632 -#: builtin/blame.c:2262

2643 +#: builtin/blame.c:2521

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

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

2646

2647 +#. TRANSLATORS: This string is used to tell us the maximum

2648 +#. display width for a relative timestamp in "git blame"

2649 +#. output. For C locale, "4 years, 11 months ago", which

2650 +#. takes 22 places, is the longest among various forms of

2651 +#. relative timestamps, but your language may need more or

2652 +#. fewer display columns.

2653 +#: builtin/blame.c:2599

2654 +msgid "4 years, 11 months ago"

2655 +msgstr "4 år, 11 månader sedan"

2656 +

2657 #: builtin/branch.c:24

2658 msgid "git branch [options] [-r | -a] [--merged | --no-merged]"

2659 msgstr "git branch [flaggor] [-r | -a] [--merged | --no-merged]"

@@ -2872,9 +2893,9 @@ msgid "act on remote-tracking branches"

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

2894

2895 #: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2875 -#: builtin/branch.c:850 builtin/commit.c:1494 builtin/commit.c:1495

2876 -#: builtin/commit.c:1496 builtin/commit.c:1497 builtin/tag.c:527

2877 -#: builtin/tag.c:533

2896 +#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2897 +#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2898 +#: builtin/tag.c:621

2899 msgid "commit"

2900 msgstr "incheckning"

2901

@@ -2938,7 +2959,7 @@ msgstr "visa grenar i spalter"

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

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

2961

2941 -#: builtin/branch.c:872 builtin/clone.c:635

2962 +#: builtin/branch.c:872 builtin/clone.c:636

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

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

2965

@@ -3124,7 +3145,7 @@ msgstr "läs filnamn från standard in"

3145 msgid "terminate input and output records by a NUL character"

3146 msgstr "avsluta in- och utdataposter med NUL-tecken"

3147

3127 -#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:271

3148 +#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3149 msgid "suppress progress reporting"

3150 msgstr "undertryck förloppsrapportering"

3151

@@ -3181,43 +3202,43 @@ msgstr "inga kontakter angavs"

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

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

3204

3184 -#: builtin/checkout-index.c:187

3205 +#: builtin/checkout-index.c:188

3206 msgid "check out all files in the index"

3207 msgstr "checka ut alla filer i indexet"

3208

3188 -#: builtin/checkout-index.c:188

3209 +#: builtin/checkout-index.c:189

3210 msgid "force overwrite of existing files"

3211 msgstr "tvinga överskrivning av befintliga filer"

3212

3192 -#: builtin/checkout-index.c:190

3213 +#: builtin/checkout-index.c:191

3214 msgid "no warning for existing files and files not in index"

3215 msgstr "ingen varning för existerande filer och filer ej i indexet"

3216

3196 -#: builtin/checkout-index.c:192

3217 +#: builtin/checkout-index.c:193

3218 msgid "don't checkout new files"

3219 msgstr "checka inte ut nya filer"

3220

3200 -#: builtin/checkout-index.c:194

3221 +#: builtin/checkout-index.c:195

3222 msgid "update stat information in the index file"

3223 msgstr "uppdatera stat-information i indexfilen"

3224

3204 -#: builtin/checkout-index.c:200

3225 +#: builtin/checkout-index.c:201

3226 msgid "read list of paths from the standard input"

3227 msgstr "läs listan över sökvägar från standard in"

3228

3208 -#: builtin/checkout-index.c:202

3229 +#: builtin/checkout-index.c:203

3230 msgid "write the content to temporary files"

3231 msgstr "skriv innehåll till temporära filer"

3232

3212 -#: builtin/checkout-index.c:203 builtin/column.c:30

3233 +#: builtin/checkout-index.c:204 builtin/column.c:30

3234 msgid "string"

3235 msgstr "sträng"

3236

3216 -#: builtin/checkout-index.c:204

3237 +#: builtin/checkout-index.c:205

3238 msgid "when creating files, prepend <string>"

3239 msgstr "när filer skapas, lägg till <sträng> först"

3240

3220 -#: builtin/checkout-index.c:207

3241 +#: builtin/checkout-index.c:208

3242 msgid "copy out the files from named stage"

3243 msgstr "kopiera ut filer från namngiven etapp"

3244

@@ -3259,75 +3280,75 @@ msgstr "sökväg \"%s\": kan inte slå ihop"

3280 msgid "Unable to add merge result for '%s'"

3281 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

3282

3262 -#: builtin/checkout.c:232 builtin/checkout.c:235 builtin/checkout.c:238

3263 -#: builtin/checkout.c:241

3283 +#: builtin/checkout.c:231 builtin/checkout.c:234 builtin/checkout.c:237

3284 +#: builtin/checkout.c:240

3285 #, c-format

3286 msgid "'%s' cannot be used with updating paths"

3287 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

3288

3268 -#: builtin/checkout.c:244 builtin/checkout.c:247

3289 +#: builtin/checkout.c:243 builtin/checkout.c:246

3290 #, c-format

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

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

3293

3273 -#: builtin/checkout.c:250

3294 +#: builtin/checkout.c:249

3295 #, c-format

3296 msgid "Cannot update paths and switch to branch '%s' at the same time."

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

3298

3278 -#: builtin/checkout.c:261 builtin/checkout.c:450

3299 +#: builtin/checkout.c:260 builtin/checkout.c:449

3300 msgid "corrupt index file"

3301 msgstr "indexfilen är trasig"

3302

3282 -#: builtin/checkout.c:321 builtin/checkout.c:328

3303 +#: builtin/checkout.c:320 builtin/checkout.c:327

3304 #, c-format

3305 msgid "path '%s' is unmerged"

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

3307

3287 -#: builtin/checkout.c:472

3308 +#: builtin/checkout.c:471

3309 msgid "you need to resolve your current index first"

3310 msgstr "du måste lösa ditt befintliga index först"

3311

3291 -#: builtin/checkout.c:593

3312 +#: builtin/checkout.c:591

3313 #, c-format

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

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

3316

3296 -#: builtin/checkout.c:631

3317 +#: builtin/checkout.c:629

3318 msgid "HEAD is now at"

3319 msgstr "HEAD är nu på"

3320

3300 -#: builtin/checkout.c:638

3321 +#: builtin/checkout.c:636

3322 #, c-format

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

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

3325

3305 -#: builtin/checkout.c:641

3326 +#: builtin/checkout.c:639

3327 #, c-format

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

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

3330

3310 -#: builtin/checkout.c:645

3331 +#: builtin/checkout.c:643

3332 #, c-format

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

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

3335

3315 -#: builtin/checkout.c:647 builtin/checkout.c:1032

3336 +#: builtin/checkout.c:645 builtin/checkout.c:1026

3337 #, c-format

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

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

3340

3320 -#: builtin/checkout.c:649

3341 +#: builtin/checkout.c:647

3342 #, c-format

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

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

3345

3325 -#: builtin/checkout.c:705

3346 +#: builtin/checkout.c:699

3347 #, c-format

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

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

3350

3330 -#: builtin/checkout.c:711

3351 +#: builtin/checkout.c:705

3352 #, c-format

3353 msgid ""

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

@@ -3350,7 +3371,7 @@ msgstr[1] ""

3371 "\n"

3372 "%s\n"

3373

3353 -#: builtin/checkout.c:729

3374 +#: builtin/checkout.c:723

3375 #, c-format

3376 msgid ""

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

@@ -3365,139 +3386,139 @@ msgstr ""

3386 " git branch nytt_grennamn %s\n"

3387 "\n"

3388

3368 -#: builtin/checkout.c:759

3389 +#: builtin/checkout.c:753

3390 msgid "internal error in revision walk"

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

3392

3372 -#: builtin/checkout.c:763

3393 +#: builtin/checkout.c:757

3394 msgid "Previous HEAD position was"

3395 msgstr "Tidigare position för HEAD var"

3396

3376 -#: builtin/checkout.c:790 builtin/checkout.c:1027

3397 +#: builtin/checkout.c:784 builtin/checkout.c:1021

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

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

3400

3380 -#: builtin/checkout.c:934

3401 +#: builtin/checkout.c:928

3402 #, c-format

3403 msgid "only one reference expected, %d given."

3404 msgstr "endast en referens förväntades, %d gavs."

3405

3385 -#: builtin/checkout.c:973

3406 +#: builtin/checkout.c:967

3407 #, c-format

3408 msgid "invalid reference: %s"

3409 msgstr "felaktig referens: %s"

3410

3390 -#: builtin/checkout.c:1002

3411 +#: builtin/checkout.c:996

3412 #, c-format

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

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

3415

3395 -#: builtin/checkout.c:1041

3416 +#: builtin/checkout.c:1035

3417 msgid "paths cannot be used with switching branches"

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

3419

3399 -#: builtin/checkout.c:1044 builtin/checkout.c:1048

3420 +#: builtin/checkout.c:1038 builtin/checkout.c:1042

3421 #, c-format

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

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

3424

3404 -#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3405 -#: builtin/checkout.c:1063

3425 +#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3426 +#: builtin/checkout.c:1057

3427 #, c-format

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

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

3430

3410 -#: builtin/checkout.c:1068

3431 +#: builtin/checkout.c:1062

3432 #, c-format

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

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

3435

3415 -#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:88

3436 +#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3437 #: builtin/remote.c:159 builtin/remote.c:161

3438 msgid "branch"

3439 msgstr "gren"

3440

3420 -#: builtin/checkout.c:1091

3441 +#: builtin/checkout.c:1085

3442 msgid "create and checkout a new branch"

3443 msgstr "skapa och checka ut en ny gren"

3444

3424 -#: builtin/checkout.c:1093

3445 +#: builtin/checkout.c:1087

3446 msgid "create/reset and checkout a branch"

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

3448

3428 -#: builtin/checkout.c:1094

3449 +#: builtin/checkout.c:1088

3450 msgid "create reflog for new branch"

3451 msgstr "skapa reflogg för ny gren"

3452

3432 -#: builtin/checkout.c:1095

3453 +#: builtin/checkout.c:1089

3454 msgid "detach the HEAD at named commit"

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

3456

3436 -#: builtin/checkout.c:1096

3457 +#: builtin/checkout.c:1090

3458 msgid "set upstream info for new branch"

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

3460

3440 -#: builtin/checkout.c:1098

3461 +#: builtin/checkout.c:1092

3462 msgid "new-branch"

3463 msgstr "ny-gren"

3464

3444 -#: builtin/checkout.c:1098

3465 +#: builtin/checkout.c:1092

3466 msgid "new unparented branch"

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

3468

3448 -#: builtin/checkout.c:1099

3469 +#: builtin/checkout.c:1093

3470 msgid "checkout our version for unmerged files"

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

3472

3452 -#: builtin/checkout.c:1101

3473 +#: builtin/checkout.c:1095

3474 msgid "checkout their version for unmerged files"

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

3476

3456 -#: builtin/checkout.c:1103

3477 +#: builtin/checkout.c:1097

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

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

3480

3460 -#: builtin/checkout.c:1104

3481 +#: builtin/checkout.c:1098

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

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

3484

3464 -#: builtin/checkout.c:1105 builtin/merge.c:225

3485 +#: builtin/checkout.c:1099 builtin/merge.c:225

3486 msgid "update ignored files (default)"

3487 msgstr "uppdatera ignorerade filer (standard)"

3488

3468 -#: builtin/checkout.c:1106 builtin/log.c:1228 parse-options.h:245

3489 +#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3490 msgid "style"

3491 msgstr "stil"

3492

3472 -#: builtin/checkout.c:1107

3493 +#: builtin/checkout.c:1101

3494 msgid "conflict style (merge or diff3)"

3495 msgstr "konfliktstil (merge eller diff3)"

3496

3476 -#: builtin/checkout.c:1110

3497 +#: builtin/checkout.c:1104

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

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

3500

3480 -#: builtin/checkout.c:1112

3501 +#: builtin/checkout.c:1106

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

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

3504

3484 -#: builtin/checkout.c:1135

3505 +#: builtin/checkout.c:1129

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

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

3508

3488 -#: builtin/checkout.c:1152

3509 +#: builtin/checkout.c:1146

3510 msgid "--track needs a branch name"

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

3512

3492 -#: builtin/checkout.c:1159

3513 +#: builtin/checkout.c:1153

3514 msgid "Missing branch name; try -b"

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

3516

3496 -#: builtin/checkout.c:1196

3517 +#: builtin/checkout.c:1190

3518 msgid "invalid path specification"

3519 msgstr "felaktig sökvägsangivelse"

3520

3500 -#: builtin/checkout.c:1203

3521 +#: builtin/checkout.c:1197

3522 #, c-format

3523 msgid ""

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

@@ -3506,12 +3527,12 @@ msgstr ""

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

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

3529

3509 -#: builtin/checkout.c:1208

3530 +#: builtin/checkout.c:1202

3531 #, c-format

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

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

3534

3514 -#: builtin/checkout.c:1212

3535 +#: builtin/checkout.c:1206

3536 msgid ""

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

3538 "checking out of the index."

@@ -3588,30 +3609,30 @@ msgstr ""

3609 msgid "Huh (%s)?"

3610 msgstr "Vadå (%s)?"

3611

3591 -#: builtin/clean.c:660

3612 +#: builtin/clean.c:659

3613 #, c-format

3614 msgid "Input ignore patterns>> "

3615 msgstr "Ange ignoreringsmönster>>"

3616

3596 -#: builtin/clean.c:697

3617 +#: builtin/clean.c:696

3618 #, c-format

3619 msgid "WARNING: Cannot find items matched by: %s"

3620 msgstr "VARNING: Hittar inte poster som motsvarar: %s"

3621

3601 -#: builtin/clean.c:718

3622 +#: builtin/clean.c:717

3623 msgid "Select items to delete"

3624 msgstr "Välj poster att ta bort"

3625

3605 -#: builtin/clean.c:758

3626 +#: builtin/clean.c:757

3627 #, c-format

3628 msgid "remove %s? "

3629 msgstr "ta bort %s?"

3630

3610 -#: builtin/clean.c:783

3631 +#: builtin/clean.c:782

3632 msgid "Bye."

3633 msgstr "Hej då."

3634

3614 -#: builtin/clean.c:791

3635 +#: builtin/clean.c:790

3636 msgid ""

3637 "clean - start cleaning\n"

3638 "filter by pattern - exclude items from deletion\n"

@@ -3629,62 +3650,62 @@ msgstr ""

3650 "help - denna skärm\n"

3651 "? - hjälp för kommandoval"

3652

3632 -#: builtin/clean.c:818

3653 +#: builtin/clean.c:817

3654 msgid "*** Commands ***"

3655 msgstr "*** Kommandon ***"

3656

3636 -#: builtin/clean.c:819

3657 +#: builtin/clean.c:818

3658 msgid "What now"

3659 msgstr "Vad nu"

3660

3640 -#: builtin/clean.c:827

3661 +#: builtin/clean.c:826

3662 msgid "Would remove the following item:"

3663 msgid_plural "Would remove the following items:"

3664 msgstr[0] "Skulle ta bort följande post:"

3665 msgstr[1] "Skulle ta bort följande poster:"

3666

3646 -#: builtin/clean.c:844

3667 +#: builtin/clean.c:843

3668 msgid "No more files to clean, exiting."

3669 msgstr "Inga fler filer att städa, avslutar."

3670

3650 -#: builtin/clean.c:875

3671 +#: builtin/clean.c:874

3672 msgid "do not print names of files removed"

3673 msgstr "skriv inte ut namn på borttagna filer"

3674

3654 -#: builtin/clean.c:877

3675 +#: builtin/clean.c:876

3676 msgid "force"

3677 msgstr "tvinga"

3678

3658 -#: builtin/clean.c:878

3679 +#: builtin/clean.c:877

3680 msgid "interactive cleaning"

3681 msgstr "städa interaktivt"

3682

3662 -#: builtin/clean.c:880

3683 +#: builtin/clean.c:879

3684 msgid "remove whole directories"

3685 msgstr "ta bort hela kataloger"

3686

3666 -#: builtin/clean.c:881 builtin/describe.c:415 builtin/grep.c:716

3667 -#: builtin/ls-files.c:486 builtin/name-rev.c:314 builtin/show-ref.c:185

3687 +#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3688 +#: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3689 msgid "pattern"

3690 msgstr "mönster"

3691

3671 -#: builtin/clean.c:882

3692 +#: builtin/clean.c:881

3693 msgid "add <pattern> to ignore rules"

3694 msgstr "lägg till <mönster> till ignoreringsregler"

3695

3675 -#: builtin/clean.c:883

3696 +#: builtin/clean.c:882

3697 msgid "remove ignored files, too"

3698 msgstr "ta även bort ignorerade filer"

3699

3679 -#: builtin/clean.c:885

3700 +#: builtin/clean.c:884

3701 msgid "remove only ignored files"

3702 msgstr "ta endast bort ignorerade filer"

3703

3683 -#: builtin/clean.c:903

3704 +#: builtin/clean.c:902

3705 msgid "-x and -X cannot be used together"

3706 msgstr "-x och -X kan inte användas samtidigt"

3707

3687 -#: builtin/clean.c:907

3708 +#: builtin/clean.c:906

3709 msgid ""

3710 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "

3711 "clean"

@@ -3692,7 +3713,7 @@ msgstr ""

3713 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "

3714 "städa"

3715

3695 -#: builtin/clean.c:910

3716 +#: builtin/clean.c:909

3717 msgid ""

3718 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "

3719 "refusing to clean"

@@ -3704,8 +3725,8 @@ msgstr ""

3725 msgid "git clone [options] [--] <repo> [<dir>]"

3726 msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

3727

3707 -#: builtin/clone.c:64 builtin/fetch.c:97 builtin/merge.c:222

3708 -#: builtin/push.c:504

3728 +#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3729 +#: builtin/push.c:503

3730 msgid "force progress reporting"

3731 msgstr "tvinga förloppsrapportering"

3732

@@ -3765,7 +3786,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

3786 msgid "path to git-upload-pack on the remote"

3787 msgstr "sökväg till git-upload-pack på fjärren"

3788

3768 -#: builtin/clone.c:92 builtin/fetch.c:98 builtin/grep.c:661

3789 +#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3790 msgid "depth"

3791 msgstr "djup"

3792

@@ -3867,95 +3888,95 @@ msgstr "Kontrollerar anslutning..."

3888 msgid "remote did not send all necessary objects"

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

3890

3870 -#: builtin/clone.c:626

3891 +#: builtin/clone.c:627

3892 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3893 msgstr ""

3894 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

3895

3875 -#: builtin/clone.c:657

3896 +#: builtin/clone.c:658

3897 msgid "unable to checkout working tree"

3898 msgstr "kunde inte checka ut arbetskatalogen"

3899

3879 -#: builtin/clone.c:765

3900 +#: builtin/clone.c:768

3901 msgid "Too many arguments."

3902 msgstr "För många argument."

3903

3883 -#: builtin/clone.c:769

3904 +#: builtin/clone.c:772

3905 msgid "You must specify a repository to clone."

3906 msgstr "Du måste ange ett arkiv att klona."

3907

3887 -#: builtin/clone.c:780

3908 +#: builtin/clone.c:783

3909 #, c-format

3910 msgid "--bare and --origin %s options are incompatible."

3911 msgstr "flaggorna --bare och --origin %s är inkompatibla."

3912

3892 -#: builtin/clone.c:783

3913 +#: builtin/clone.c:786

3914 msgid "--bare and --separate-git-dir are incompatible."

3915 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

3916

3896 -#: builtin/clone.c:796

3917 +#: builtin/clone.c:799

3918 #, c-format

3919 msgid "repository '%s' does not exist"

3920 msgstr "arkivet \"%s\" finns inte"

3921

3901 -#: builtin/clone.c:802

3902 -msgid "--depth is ignored in local clones; use file:// instead."

3903 -msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

3904 -

3905 -#: builtin/clone.c:805

3906 -msgid "source repository is shallow, ignoring --local"

3907 -msgstr "källarkivet är grunt, ignorerar --local"

3908 -

3909 -#: builtin/clone.c:810

3910 -msgid "--local is ignored"

3911 -msgstr "--local ignoreras"

3912 -

3913 -#: builtin/clone.c:814 builtin/fetch.c:1119

3922 +#: builtin/clone.c:805 builtin/fetch.c:1143

3923 #, c-format

3924 msgid "depth %s is not a positive number"

3925 msgstr "djupet %s är inte ett positivt tal"

3926

3918 -#: builtin/clone.c:824

3927 +#: builtin/clone.c:815

3928 #, c-format

3929 msgid "destination path '%s' already exists and is not an empty directory."

3930 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

3931

3923 -#: builtin/clone.c:834

3932 +#: builtin/clone.c:825

3933 #, c-format

3934 msgid "working tree '%s' already exists."

3935 msgstr "arbetsträdet \"%s\" finns redan."

3936

3928 -#: builtin/clone.c:847 builtin/clone.c:859

3937 +#: builtin/clone.c:838 builtin/clone.c:850

3938 #, c-format

3939 msgid "could not create leading directories of '%s'"

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

3941

3933 -#: builtin/clone.c:850

3942 +#: builtin/clone.c:841

3943 #, c-format

3944 msgid "could not create work tree dir '%s'."

3945 msgstr "kunde inte skapa arbetskatalogen \"%s\""

3946

3938 -#: builtin/clone.c:869

3947 +#: builtin/clone.c:860

3948 #, c-format

3949 msgid "Cloning into bare repository '%s'...\n"

3950 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

3951

3943 -#: builtin/clone.c:871

3952 +#: builtin/clone.c:862

3953 #, c-format

3954 msgid "Cloning into '%s'...\n"

3955 msgstr "Klonar till \"%s\"...\n"

3956

3957 +#: builtin/clone.c:898

3958 +msgid "--depth is ignored in local clones; use file:// instead."

3959 +msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

3960 +

3961 +#: builtin/clone.c:901

3962 +msgid "source repository is shallow, ignoring --local"

3963 +msgstr "källarkivet är grunt, ignorerar --local"

3964 +

3965 #: builtin/clone.c:906

3966 +msgid "--local is ignored"

3967 +msgstr "--local ignoreras"

3968 +

3969 +#: builtin/clone.c:910

3970 #, c-format

3971 msgid "Don't know how to clone %s"

3972 msgstr "Vet inte hur man klonar %s"

3973

3953 -#: builtin/clone.c:957 builtin/clone.c:965

3974 +#: builtin/clone.c:961 builtin/clone.c:969

3975 #, c-format

3976 msgid "Remote branch %s not found in upstream %s"

3977 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

3978

3958 -#: builtin/clone.c:968

3979 +#: builtin/clone.c:972

3980 msgid "You appear to have cloned an empty repository."

3981 msgstr "Du verkar ha klonat ett tomt arkiv."

3982

@@ -4072,89 +4093,98 @@ msgstr ""

4093 msgid "failed to unpack HEAD tree object"

4094 msgstr "misslyckades packa upp HEAD:s trädobjekt"

4095

4075 -#: builtin/commit.c:330

4096 +#: builtin/commit.c:328

4097 msgid "unable to create temporary index"

4098 msgstr "kunde inte skapa temporär indexfil"

4099

4079 -#: builtin/commit.c:336

4100 +#: builtin/commit.c:334

4101 msgid "interactive add failed"

4102 msgstr "interaktiv tilläggning misslyckades"

4103

4083 -#: builtin/commit.c:369 builtin/commit.c:390 builtin/commit.c:440

4104 +#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4105 msgid "unable to write new_index file"

4106 msgstr "kunde inte skriva filen new_index"

4107

4087 -#: builtin/commit.c:421

4108 +#: builtin/commit.c:418

4109 msgid "cannot do a partial commit during a merge."

4110 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

4111

4091 -#: builtin/commit.c:423

4112 +#: builtin/commit.c:420

4113 msgid "cannot do a partial commit during a cherry-pick."

4114 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

4115

4095 -#: builtin/commit.c:433

4116 +#: builtin/commit.c:429

4117 msgid "cannot read the index"

4118 msgstr "kan inte läsa indexet"

4119

4099 -#: builtin/commit.c:453

4120 +#: builtin/commit.c:447

4121 msgid "unable to write temporary index file"

4122 msgstr "kunde inte skriva temporär indexfil"

4123

4103 -#: builtin/commit.c:544 builtin/commit.c:550

4124 +#: builtin/commit.c:557 builtin/commit.c:563

4125 #, c-format

4126 msgid "invalid commit: %s"

4127 msgstr "felaktig incheckning: %s"

4128

4108 -#: builtin/commit.c:572

4129 +#: builtin/commit.c:585

4130 msgid "malformed --author parameter"

4131 msgstr "felformad \"--author\"-flagga"

4132

4133 #: builtin/commit.c:592

4134 #, c-format

4135 +msgid "invalid date format: %s"

4136 +msgstr "felaktigt datumformat: %s"

4137 +

4138 +#: builtin/commit.c:609

4139 +#, c-format

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

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

4142

4117 -#: builtin/commit.c:629 builtin/commit.c:663 builtin/commit.c:1014

4143 +#: builtin/commit.c:642

4144 +msgid ""

4145 +"unable to select a comment character that is not used\n"

4146 +"in the current commit message"

4147 +msgstr ""

4148 +"kunde inte välja ett kommentarstecken som inte använts\n"

4149 +"i det befintliga incheckningsmeddelandet"

4150 +

4151 +#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4152 #, c-format

4153 msgid "could not lookup commit %s"

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

4155

4122 -#: builtin/commit.c:641 builtin/shortlog.c:273

4156 +#: builtin/commit.c:691 builtin/shortlog.c:273

4157 #, c-format

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

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

4160

4127 -#: builtin/commit.c:643

4161 +#: builtin/commit.c:693

4162 msgid "could not read log from standard input"

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

4164

4131 -#: builtin/commit.c:647

4165 +#: builtin/commit.c:697

4166 #, c-format

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

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

4169

4136 -#: builtin/commit.c:654

4137 -msgid "commit has empty message"

4138 -msgstr "incheckningen har ett tomt meddelande"

4139 -

4140 -#: builtin/commit.c:670

4170 +#: builtin/commit.c:719

4171 msgid "could not read MERGE_MSG"

4172 msgstr "kunde inte läsa MERGE_MSG"

4173

4144 -#: builtin/commit.c:674

4174 +#: builtin/commit.c:723

4175 msgid "could not read SQUASH_MSG"

4176 msgstr "kunde inte läsa SQUASH_MSG"

4177

4148 -#: builtin/commit.c:678

4178 +#: builtin/commit.c:727

4179 #, c-format

4180 msgid "could not read '%s'"

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

4182

4153 -#: builtin/commit.c:749

4183 +#: builtin/commit.c:798

4184 msgid "could not write commit template"

4185 msgstr "kunde inte skriva incheckningsmall"

4186

4157 -#: builtin/commit.c:764

4187 +#: builtin/commit.c:816

4188 #, c-format

4189 msgid ""

4190 "\n"

@@ -4169,7 +4199,7 @@ msgstr ""

4199 "\t%s\n"

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

4201

4172 -#: builtin/commit.c:769

4202 +#: builtin/commit.c:821

4203 #, c-format

4204 msgid ""

4205 "\n"

@@ -4184,7 +4214,7 @@ msgstr ""

4214 "\t%s\n"

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

4216

4187 -#: builtin/commit.c:782

4217 +#: builtin/commit.c:834

4218 #, c-format

4219 msgid ""

4220 "Please enter the commit message for your changes. Lines starting\n"

@@ -4194,7 +4224,7 @@ msgstr ""

4224 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4225 "incheckningen.\n"

4226

4197 -#: builtin/commit.c:789

4227 +#: builtin/commit.c:841

4228 #, c-format

4229 msgid ""

4230 "Please enter the commit message for your changes. Lines starting\n"

@@ -4205,139 +4235,144 @@ msgstr ""

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

4236 "Ett tomt meddelande avbryter incheckningen.\n"

4237

4208 -#: builtin/commit.c:802

4238 +#: builtin/commit.c:855

4239 +#, c-format

4240 +msgid "%sAuthor: %.*s <%.*s>"

4241 +msgstr "%sFörfattare: %.*s <%.*s>"

4242 +

4243 +#: builtin/commit.c:863

4244 #, c-format

4210 -msgid "%sAuthor: %s"

4211 -msgstr "%sFörfattare: %s"

4245 +msgid "%sDate: %s"

4246 +msgstr "%sDatum: %s"

4247

4213 -#: builtin/commit.c:809

4248 +#: builtin/commit.c:870

4249 #, c-format

4215 -msgid "%sCommitter: %s"

4216 -msgstr "%sIncheckare: %s"

4250 +msgid "%sCommitter: %.*s <%.*s>"

4251 +msgstr "%sIncheckare: %.*s <%.*s>"

4252

4218 -#: builtin/commit.c:829

4253 +#: builtin/commit.c:888

4254 msgid "Cannot read index"

4255 msgstr "Kan inte läsa indexet"

4256

4222 -#: builtin/commit.c:872

4257 +#: builtin/commit.c:945

4258 msgid "Error building trees"

4259 msgstr "Fel vid byggande av träd"

4260

4226 -#: builtin/commit.c:887 builtin/tag.c:391

4261 +#: builtin/commit.c:960 builtin/tag.c:495

4262 #, c-format

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

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

4265

4231 -#: builtin/commit.c:989

4266 +#: builtin/commit.c:1061

4267 #, c-format

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

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

4270

4236 -#: builtin/commit.c:1004 builtin/commit.c:1244

4271 +#: builtin/commit.c:1076 builtin/commit.c:1316

4272 #, c-format

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

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

4275

4241 -#: builtin/commit.c:1041

4276 +#: builtin/commit.c:1113

4277 msgid "--long and -z are incompatible"

4278 msgstr "--long och -z är inkompatibla"

4279

4245 -#: builtin/commit.c:1071

4280 +#: builtin/commit.c:1143

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

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

4283

4249 -#: builtin/commit.c:1080

4284 +#: builtin/commit.c:1152

4285 msgid "You have nothing to amend."

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

4287

4253 -#: builtin/commit.c:1083

4288 +#: builtin/commit.c:1155

4289 msgid "You are in the middle of a merge -- cannot amend."

4290 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

4291

4257 -#: builtin/commit.c:1085

4292 +#: builtin/commit.c:1157

4293 msgid "You are in the middle of a cherry-pick -- cannot amend."

4294 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

4295

4261 -#: builtin/commit.c:1088

4296 +#: builtin/commit.c:1160

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

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

4299

4265 -#: builtin/commit.c:1098

4300 +#: builtin/commit.c:1170

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

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

4303

4269 -#: builtin/commit.c:1100

4304 +#: builtin/commit.c:1172

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

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

4307

4273 -#: builtin/commit.c:1108

4308 +#: builtin/commit.c:1180

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

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

4311

4277 -#: builtin/commit.c:1125

4312 +#: builtin/commit.c:1197

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

4314 msgstr ""

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

4316

4282 -#: builtin/commit.c:1127

4317 +#: builtin/commit.c:1199

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

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

4320

4286 -#: builtin/commit.c:1129

4321 +#: builtin/commit.c:1201

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

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

4324

4290 -#: builtin/commit.c:1131

4325 +#: builtin/commit.c:1203

4326 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

4328

4294 -#: builtin/commit.c:1143 builtin/tag.c:639

4329 +#: builtin/commit.c:1215 builtin/tag.c:727

4330 #, c-format

4331 msgid "Invalid cleanup mode %s"

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

4333

4299 -#: builtin/commit.c:1148

4334 +#: builtin/commit.c:1220

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

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

4337

4303 -#: builtin/commit.c:1258 builtin/commit.c:1516

4338 +#: builtin/commit.c:1330 builtin/commit.c:1595

4339 msgid "show status concisely"

4340 msgstr "visa koncis status"

4341

4307 -#: builtin/commit.c:1260 builtin/commit.c:1518

4342 +#: builtin/commit.c:1332 builtin/commit.c:1597

4343 msgid "show branch information"

4344 msgstr "visa information om gren"

4345

4311 -#: builtin/commit.c:1262 builtin/commit.c:1520 builtin/push.c:490

4346 +#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4347 msgid "machine-readable output"

4348 msgstr "maskinläsbar utdata"

4349

4315 -#: builtin/commit.c:1265 builtin/commit.c:1522

4350 +#: builtin/commit.c:1337 builtin/commit.c:1601

4351 msgid "show status in long format (default)"

4352 msgstr "visa status i långt format (standard)"

4353

4319 -#: builtin/commit.c:1268 builtin/commit.c:1525

4354 +#: builtin/commit.c:1340 builtin/commit.c:1604

4355 msgid "terminate entries with NUL"

4356 msgstr "terminera poster med NUL"

4357

4323 -#: builtin/commit.c:1270 builtin/commit.c:1528 builtin/fast-export.c:674

4324 -#: builtin/fast-export.c:677 builtin/tag.c:514

4358 +#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4359 +#: builtin/fast-export.c:706 builtin/tag.c:602

4360 msgid "mode"

4361 msgstr "läge"

4362

4328 -#: builtin/commit.c:1271 builtin/commit.c:1528

4363 +#: builtin/commit.c:1343 builtin/commit.c:1607

4364 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

4365 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

4366

4332 -#: builtin/commit.c:1274

4367 +#: builtin/commit.c:1346

4368 msgid "show ignored files"

4369 msgstr "visa ignorerade filer"

4370

4336 -#: builtin/commit.c:1275 parse-options.h:153

4371 +#: builtin/commit.c:1347 parse-options.h:153

4372 msgid "when"

4373 msgstr "när"

4374

4340 -#: builtin/commit.c:1276

4375 +#: builtin/commit.c:1348

4376 msgid ""

4377 "ignore changes to submodules, optional when: all, dirty, untracked. "

4378 "(Default: all)"

@@ -4345,217 +4380,217 @@ msgstr ""

4380 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4381 "(Default: all)"

4382

4348 -#: builtin/commit.c:1278

4383 +#: builtin/commit.c:1350

4384 msgid "list untracked files in columns"

4385 msgstr "visa ospårade filer i spalter"

4386

4352 -#: builtin/commit.c:1347

4387 +#: builtin/commit.c:1419

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

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

4390

4356 -#: builtin/commit.c:1349

4391 +#: builtin/commit.c:1421

4392 msgid "could not parse newly created commit"

4393 msgstr "kunde inte tolka en precis skapad incheckning"

4394

4360 -#: builtin/commit.c:1390

4395 +#: builtin/commit.c:1469

4396 msgid "detached HEAD"

4397 msgstr "frånkopplad HEAD"

4398

4364 -#: builtin/commit.c:1392

4399 +#: builtin/commit.c:1471

4400 msgid " (root-commit)"

4401 msgstr " (rotincheckning)"

4402

4368 -#: builtin/commit.c:1486

4403 +#: builtin/commit.c:1565

4404 msgid "suppress summary after successful commit"

4405 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4406

4372 -#: builtin/commit.c:1487

4407 +#: builtin/commit.c:1566

4408 msgid "show diff in commit message template"

4409 msgstr "visa diff i mallen för incheckningsmeddelandet"

4410

4376 -#: builtin/commit.c:1489

4411 +#: builtin/commit.c:1568

4412 msgid "Commit message options"

4413 msgstr "Alternativ för incheckningsmeddelande"

4414

4380 -#: builtin/commit.c:1490 builtin/tag.c:512

4415 +#: builtin/commit.c:1569 builtin/tag.c:600

4416 msgid "read message from file"

4417 msgstr "läs meddelande från fil"

4418

4384 -#: builtin/commit.c:1491

4419 +#: builtin/commit.c:1570

4420 msgid "author"

4421 msgstr "författare"

4422

4388 -#: builtin/commit.c:1491

4423 +#: builtin/commit.c:1570

4424 msgid "override author for commit"

4425 msgstr "överstyr författare för incheckningen"

4426

4392 -#: builtin/commit.c:1492 builtin/gc.c:272

4427 +#: builtin/commit.c:1571 builtin/gc.c:286

4428 msgid "date"

4429 msgstr "datum"

4430

4396 -#: builtin/commit.c:1492

4431 +#: builtin/commit.c:1571

4432 msgid "override date for commit"

4433 msgstr "överstyr datum för incheckningen"

4434

4400 -#: builtin/commit.c:1493 builtin/merge.c:216 builtin/notes.c:409

4401 -#: builtin/notes.c:566 builtin/tag.c:510

4435 +#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4436 +#: builtin/notes.c:566 builtin/tag.c:598

4437 msgid "message"

4438 msgstr "meddelande"

4439

4405 -#: builtin/commit.c:1493

4440 +#: builtin/commit.c:1572

4441 msgid "commit message"

4442 msgstr "incheckningsmeddelande"

4443

4409 -#: builtin/commit.c:1494

4444 +#: builtin/commit.c:1573

4445 msgid "reuse and edit message from specified commit"

4446 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4447

4413 -#: builtin/commit.c:1495

4448 +#: builtin/commit.c:1574

4449 msgid "reuse message from specified commit"

4450 msgstr "återanvänd meddelande från angiven incheckning"

4451

4417 -#: builtin/commit.c:1496

4452 +#: builtin/commit.c:1575

4453 msgid "use autosquash formatted message to fixup specified commit"

4454 msgstr ""

4455 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4456

4422 -#: builtin/commit.c:1497

4457 +#: builtin/commit.c:1576

4458 msgid "use autosquash formatted message to squash specified commit"

4459 msgstr ""

4460 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4461 "incheckning"

4462

4428 -#: builtin/commit.c:1498

4463 +#: builtin/commit.c:1577

4464 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4465 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4466

4432 -#: builtin/commit.c:1499 builtin/log.c:1180 builtin/revert.c:86

4467 +#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4468 msgid "add Signed-off-by:"

4469 msgstr "lägg till Signed-off-by:"

4470

4436 -#: builtin/commit.c:1500

4471 +#: builtin/commit.c:1579

4472 msgid "use specified template file"

4473 msgstr "använd angiven mallfil"

4474

4440 -#: builtin/commit.c:1501

4475 +#: builtin/commit.c:1580

4476 msgid "force edit of commit"

4477 msgstr "tvinga redigering av incheckning"

4478

4444 -#: builtin/commit.c:1502

4479 +#: builtin/commit.c:1581

4480 msgid "default"

4481 msgstr "standard"

4482

4448 -#: builtin/commit.c:1502 builtin/tag.c:515

4483 +#: builtin/commit.c:1581 builtin/tag.c:603

4484 msgid "how to strip spaces and #comments from message"

4485 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4486

4452 -#: builtin/commit.c:1503

4487 +#: builtin/commit.c:1582

4488 msgid "include status in commit message template"

4489 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4490

4456 -#: builtin/commit.c:1504 builtin/merge.c:223 builtin/revert.c:92

4457 -#: builtin/tag.c:516

4491 +#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4492 +#: builtin/tag.c:604

4493 msgid "key-id"

4494 msgstr "nyckel-id"

4495

4461 -#: builtin/commit.c:1505 builtin/merge.c:224 builtin/revert.c:93

4496 +#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4497 msgid "GPG sign commit"

4498 msgstr "GPG-signera incheckning"

4499

4465 -#: builtin/commit.c:1508

4500 +#: builtin/commit.c:1587

4501 msgid "Commit contents options"

4502 msgstr "Alternativ för incheckningens innehåll"

4503

4469 -#: builtin/commit.c:1509

4504 +#: builtin/commit.c:1588

4505 msgid "commit all changed files"

4506 msgstr "checka in alla ändrade filer"

4507

4473 -#: builtin/commit.c:1510

4508 +#: builtin/commit.c:1589

4509 msgid "add specified files to index for commit"

4510 msgstr "lägg till angivna filer till indexet för incheckning"

4511

4477 -#: builtin/commit.c:1511

4512 +#: builtin/commit.c:1590

4513 msgid "interactively add files"

4514 msgstr "lägg till filer interaktivt"

4515

4481 -#: builtin/commit.c:1512

4516 +#: builtin/commit.c:1591

4517 msgid "interactively add changes"

4518 msgstr "lägg till ändringar interaktivt"

4519

4485 -#: builtin/commit.c:1513

4520 +#: builtin/commit.c:1592

4521 msgid "commit only specified files"

4522 msgstr "checka endast in angivna filer"

4523

4489 -#: builtin/commit.c:1514

4524 +#: builtin/commit.c:1593

4525 msgid "bypass pre-commit hook"

4526 msgstr "förbigå pre-commit-krok"

4527

4493 -#: builtin/commit.c:1515

4528 +#: builtin/commit.c:1594

4529 msgid "show what would be committed"

4530 msgstr "visa vad som skulle checkas in"

4531

4497 -#: builtin/commit.c:1526

4532 +#: builtin/commit.c:1605

4533 msgid "amend previous commit"

4534 msgstr "lägg till föregående incheckning"

4535

4501 -#: builtin/commit.c:1527

4536 +#: builtin/commit.c:1606

4537 msgid "bypass post-rewrite hook"

4538 msgstr "förbigå post-rewrite-krok"

4539

4505 -#: builtin/commit.c:1532

4540 +#: builtin/commit.c:1611

4541 msgid "ok to record an empty change"

4542 msgstr "ok att registrera en tom ändring"

4543

4509 -#: builtin/commit.c:1534

4544 +#: builtin/commit.c:1613

4545 msgid "ok to record a change with an empty message"

4546 msgstr "ok att registrera en ändring med tomt meddelande"

4547

4513 -#: builtin/commit.c:1562

4548 +#: builtin/commit.c:1641

4549 msgid "could not parse HEAD commit"

4550 msgstr "kunde inte tolka HEAD:s incheckning"

4551

4517 -#: builtin/commit.c:1601 builtin/merge.c:518

4552 +#: builtin/commit.c:1680 builtin/merge.c:518

4553 #, c-format

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

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

4556

4522 -#: builtin/commit.c:1608

4557 +#: builtin/commit.c:1687

4558 #, c-format

4559 msgid "Corrupt MERGE_HEAD file (%s)"

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

4561

4527 -#: builtin/commit.c:1615

4562 +#: builtin/commit.c:1694

4563 msgid "could not read MERGE_MODE"

4564 msgstr "kunde inte läsa MERGE_MODE"

4565

4531 -#: builtin/commit.c:1634

4566 +#: builtin/commit.c:1713

4567 #, c-format

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

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

4570

4536 -#: builtin/commit.c:1645

4571 +#: builtin/commit.c:1724

4572 #, c-format

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

4574 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4575

4541 -#: builtin/commit.c:1650

4576 +#: builtin/commit.c:1729

4577 #, c-format

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

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

4580

4546 -#: builtin/commit.c:1665 builtin/merge.c:857 builtin/merge.c:882

4581 +#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4582 msgid "failed to write commit object"

4583 msgstr "kunde inte skriva incheckningsobjekt"

4584

4550 -#: builtin/commit.c:1686

4585 +#: builtin/commit.c:1756

4586 msgid "cannot lock HEAD ref"

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

4588

4554 -#: builtin/commit.c:1690

4589 +#: builtin/commit.c:1769

4590 msgid "cannot update HEAD ref"

4591 msgstr "kunde inte uppdatera HEAD-referens"

4592

4558 -#: builtin/commit.c:1701

4593 +#: builtin/commit.c:1780

4594 msgid ""

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

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

@@ -4710,47 +4745,47 @@ msgstr "git describe [flaggor] <incheckning-igt>*"

4745 msgid "git describe [options] --dirty"

4746 msgstr "git describe [flaggor] --dirty"

4747

4713 -#: builtin/describe.c:225

4748 +#: builtin/describe.c:216

4749 #, c-format

4750 msgid "annotated tag %s not available"

4751 msgstr "den annoterade taggen %s inte tillgänglig"

4752

4718 -#: builtin/describe.c:229

4753 +#: builtin/describe.c:220

4754 #, c-format

4755 msgid "annotated tag %s has no embedded name"

4756 msgstr "den annoterade taggen %s har inget inbäddat namn"

4757

4723 -#: builtin/describe.c:231

4758 +#: builtin/describe.c:222

4759 #, c-format

4760 msgid "tag '%s' is really '%s' here"

4761 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

4762

4728 -#: builtin/describe.c:258

4763 +#: builtin/describe.c:249

4764 #, c-format

4765 msgid "Not a valid object name %s"

4766 msgstr "Objektnamnet är inte giltigt: %s"

4767

4733 -#: builtin/describe.c:261

4768 +#: builtin/describe.c:252

4769 #, c-format

4770 msgid "%s is not a valid '%s' object"

4771 msgstr "%s är inte ett giltigt \"%s\"-objekt"

4772

4738 -#: builtin/describe.c:278

4773 +#: builtin/describe.c:269

4774 #, c-format

4775 msgid "no tag exactly matches '%s'"

4776 msgstr "ingen tagg motsvarar \"%s\" exakt"

4777

4743 -#: builtin/describe.c:280

4778 +#: builtin/describe.c:271

4779 #, c-format

4780 msgid "searching to describe %s\n"

4781 msgstr "söker för att beskriva %s\n"

4782

4748 -#: builtin/describe.c:327

4783 +#: builtin/describe.c:318

4784 #, c-format

4785 msgid "finished search at %s\n"

4786 msgstr "avslutade sökning på %s\n"

4787

4753 -#: builtin/describe.c:354

4788 +#: builtin/describe.c:345

4789 #, c-format

4790 msgid ""

4791 "No annotated tags can describe '%s'.\n"

@@ -4759,7 +4794,7 @@ msgstr ""

4794 "Inga annoterade taggar kan beskriva \"%s\".\n"

4795 "Det finns dock oannoterade taggar: testa --tags."

4796

4762 -#: builtin/describe.c:358

4797 +#: builtin/describe.c:349

4798 #, c-format

4799 msgid ""

4800 "No tags can describe '%s'.\n"

@@ -4768,12 +4803,12 @@ msgstr ""

4803 "Inga taggar kan beskriva \"%s\".\n"

4804 "Testa --always, eller skapa några taggar."

4805

4771 -#: builtin/describe.c:379

4806 +#: builtin/describe.c:370

4807 #, c-format

4808 msgid "traversed %lu commits\n"

4809 msgstr "traverserade %lu incheckningar\n"

4810

4776 -#: builtin/describe.c:382

4811 +#: builtin/describe.c:373

4812 #, c-format

4813 msgid ""

4814 "more than %i tags found; listed %i most recent\n"

@@ -4782,63 +4817,63 @@ msgstr ""

4817 "mer än %i taggar hittades; listar de %i senaste\n"

4818 "gav upp sökningen vid %s\n"

4819

4785 -#: builtin/describe.c:404

4820 +#: builtin/describe.c:395

4821 msgid "find the tag that comes after the commit"

4822 msgstr "hitta taggen som kommer efter incheckningen"

4823

4789 -#: builtin/describe.c:405

4824 +#: builtin/describe.c:396

4825 msgid "debug search strategy on stderr"

4826 msgstr "felsök sökstrategin på standard fel"

4827

4793 -#: builtin/describe.c:406

4828 +#: builtin/describe.c:397

4829 msgid "use any ref"

4830 msgstr "använd alla referenser"

4831

4797 -#: builtin/describe.c:407

4832 +#: builtin/describe.c:398

4833 msgid "use any tag, even unannotated"

4834 msgstr "använd alla taggar, även oannoterade"

4835

4801 -#: builtin/describe.c:408

4836 +#: builtin/describe.c:399

4837 msgid "always use long format"

4838 msgstr "använd alltid långt format"

4839

4805 -#: builtin/describe.c:409

4840 +#: builtin/describe.c:400

4841 msgid "only follow first parent"

4842 msgstr "följ endast första föräldern"

4843

4809 -#: builtin/describe.c:412

4844 +#: builtin/describe.c:403

4845 msgid "only output exact matches"

4846 msgstr "skriv endast ut exakta träffar"

4847

4813 -#: builtin/describe.c:414

4848 +#: builtin/describe.c:405

4849 msgid "consider <n> most recent tags (default: 10)"

4850 msgstr "överväg de <n> nyaste taggarna (standard: 10)"

4851

4817 -#: builtin/describe.c:416

4852 +#: builtin/describe.c:407

4853 msgid "only consider tags matching <pattern>"

4854 msgstr "överväg endast taggar som motsvarar <mönster>"

4855

4821 -#: builtin/describe.c:418 builtin/name-rev.c:321

4856 +#: builtin/describe.c:409 builtin/name-rev.c:318

4857 msgid "show abbreviated commit object as fallback"

4858 msgstr "visa förkortade incheckningsobjekt som standard"

4859

4825 -#: builtin/describe.c:419

4860 +#: builtin/describe.c:410

4861 msgid "mark"

4862 msgstr "märke"

4863

4829 -#: builtin/describe.c:420

4864 +#: builtin/describe.c:411

4865 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4866 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

4867

4833 -#: builtin/describe.c:438

4868 +#: builtin/describe.c:429

4869 msgid "--long is incompatible with --abbrev=0"

4870 msgstr "--long är inkompatibel med --abbrev=0"

4871

4837 -#: builtin/describe.c:464

4872 +#: builtin/describe.c:455

4873 msgid "No names found, cannot describe anything."

4874 msgstr "Inga namn hittades, kan inte beskriva något."

4875

4841 -#: builtin/describe.c:484

4876 +#: builtin/describe.c:475

4877 msgid "--dirty is incompatible with commit-ishes"

4878 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

4879

@@ -4871,46 +4906,54 @@ msgstr "mer än två blobbar angavs: \"%s\""

4906 msgid "unhandled object '%s' given."

4907 msgstr "ej hanterat objekt \"%s\" angavs."

4908

4874 -#: builtin/fast-export.c:22

4909 +#: builtin/fast-export.c:23

4910 msgid "git fast-export [rev-list-opts]"

4911 msgstr "git fast-export [rev-list-flaggor]"

4912

4878 -#: builtin/fast-export.c:673

4913 +#: builtin/fast-export.c:702

4914 msgid "show progress after <n> objects"

4915 msgstr "visa förlopp efter <n> objekt"

4916

4882 -#: builtin/fast-export.c:675

4917 +#: builtin/fast-export.c:704

4918 msgid "select handling of signed tags"

4919 msgstr "välj hantering av signerade taggar"

4920

4886 -#: builtin/fast-export.c:678

4921 +#: builtin/fast-export.c:707

4922 msgid "select handling of tags that tag filtered objects"

4923 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4924

4890 -#: builtin/fast-export.c:681

4925 +#: builtin/fast-export.c:710

4926 msgid "Dump marks to this file"

4927 msgstr "Dump märken till filen"

4928

4894 -#: builtin/fast-export.c:683

4929 +#: builtin/fast-export.c:712

4930 msgid "Import marks from this file"

4931 msgstr "Importera märken från filen"

4932

4898 -#: builtin/fast-export.c:685

4933 +#: builtin/fast-export.c:714

4934 msgid "Fake a tagger when tags lack one"

4935 msgstr "Fejka taggare när taggen saknar en"

4936

4902 -#: builtin/fast-export.c:687

4937 +#: builtin/fast-export.c:716

4938 msgid "Output full tree for each commit"

4939 msgstr "Skriv ut hela trädet för varje incheckning"

4940

4906 -#: builtin/fast-export.c:689

4941 +#: builtin/fast-export.c:718

4942 msgid "Use the done feature to terminate the stream"

4943 msgstr "Använd done-funktionen för att avsluta strömmen"

4944

4910 -#: builtin/fast-export.c:690

4945 +#: builtin/fast-export.c:719

4946 msgid "Skip output of blob data"

4947 msgstr "Hoppa över skrivning av blob-data"

4948

4949 +#: builtin/fast-export.c:720

4950 +msgid "refspec"

4951 +msgstr "referensspecifikation"

4952 +

4953 +#: builtin/fast-export.c:721

4954 +msgid "Apply refspec to exported refs"

4955 +msgstr "Applicera referensspecifikation på exporterade referenser"

4956 +

4957 #: builtin/fetch.c:20

4958 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4959 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

@@ -4927,153 +4970,161 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

4970 msgid "git fetch --all [<options>]"

4971 msgstr "git fetch --all [<flaggor>]"

4972

4930 -#: builtin/fetch.c:75

4973 +#: builtin/fetch.c:90

4974 msgid "fetch from all remotes"

4975 msgstr "hämta från alla fjärrar"

4976

4934 -#: builtin/fetch.c:77

4977 +#: builtin/fetch.c:92

4978 msgid "append to .git/FETCH_HEAD instead of overwriting"

4979 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

4980

4938 -#: builtin/fetch.c:79

4981 +#: builtin/fetch.c:94

4982 msgid "path to upload pack on remote end"

4983 msgstr "sökväg till upload pack på fjärren"

4984

4942 -#: builtin/fetch.c:80

4985 +#: builtin/fetch.c:95

4986 msgid "force overwrite of local branch"

4987 msgstr "tvinga överskrivning av lokal gren"

4988

4946 -#: builtin/fetch.c:82

4989 +#: builtin/fetch.c:97

4990 msgid "fetch from multiple remotes"

4991 msgstr "hämta från flera fjärrar"

4992

4950 -#: builtin/fetch.c:84

4993 +#: builtin/fetch.c:99

4994 msgid "fetch all tags and associated objects"

4995 msgstr "hämta alla taggar och associerade objekt"

4996

4954 -#: builtin/fetch.c:86

4997 +#: builtin/fetch.c:101

4998 msgid "do not fetch all tags (--no-tags)"

4999 msgstr "hämta inte alla taggar (--no-tags)"

5000

4958 -#: builtin/fetch.c:88

5001 +#: builtin/fetch.c:103

5002 msgid "prune remote-tracking branches no longer on remote"

5003 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

5004

4962 -#: builtin/fetch.c:89

5005 +#: builtin/fetch.c:104

5006 msgid "on-demand"

5007 msgstr "on-demand"

5008

4966 -#: builtin/fetch.c:90

5009 +#: builtin/fetch.c:105

5010 msgid "control recursive fetching of submodules"

5011 msgstr "styr rekursiv hämtning av undermoduler"

5012

4970 -#: builtin/fetch.c:94

5013 +#: builtin/fetch.c:109

5014 msgid "keep downloaded pack"

5015 msgstr "behåll hämtade paket"

5016

4974 -#: builtin/fetch.c:96

5017 +#: builtin/fetch.c:111

5018 msgid "allow updating of HEAD ref"

5019 msgstr "tillåt uppdatering av HEAD-referens"

5020

4978 -#: builtin/fetch.c:99

5021 +#: builtin/fetch.c:114

5022 msgid "deepen history of shallow clone"

5023 msgstr "fördjupa historik för grund klon"

5024

4982 -#: builtin/fetch.c:101

5025 +#: builtin/fetch.c:116

5026 msgid "convert to a complete repository"

5027 msgstr "konvertera till komplett arkiv"

5028

4986 -#: builtin/fetch.c:103 builtin/log.c:1197

5029 +#: builtin/fetch.c:118 builtin/log.c:1205

5030 msgid "dir"

5031 msgstr "kat"

5032

4990 -#: builtin/fetch.c:104

5033 +#: builtin/fetch.c:119

5034 msgid "prepend this to submodule path output"

5035 msgstr "lägg till i början av undermodulens sökvägsutdata"

5036

4994 -#: builtin/fetch.c:107

5037 +#: builtin/fetch.c:122

5038 msgid "default mode for recursion"

5039 msgstr "standardläge för rekursion"

5040

4998 -#: builtin/fetch.c:109

5041 +#: builtin/fetch.c:124

5042 msgid "accept refs that update .git/shallow"

5043 msgstr "tar emot referenser som uppdaterar .git/shallow"

5044

5002 -#: builtin/fetch.c:347

5045 +#: builtin/fetch.c:125

5046 +msgid "refmap"

5047 +msgstr "referenskarta"

5048 +

5049 +#: builtin/fetch.c:126

5050 +msgid "specify fetch refmap"

5051 +msgstr "ange referenskarta för \"fetch\""

5052 +

5053 +#: builtin/fetch.c:376

5054 msgid "Couldn't find remote ref HEAD"

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

5056

5006 -#: builtin/fetch.c:411

5057 +#: builtin/fetch.c:440

5058 #, c-format

5059 msgid "object %s not found"

5060 msgstr "objektet %s hittades inte"

5061

5011 -#: builtin/fetch.c:416

5062 +#: builtin/fetch.c:445

5063 msgid "[up to date]"

5064 msgstr "[àjour]"

5065

5015 -#: builtin/fetch.c:430

5066 +#: builtin/fetch.c:459

5067 #, c-format

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

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

5070

5020 -#: builtin/fetch.c:431 builtin/fetch.c:517

5071 +#: builtin/fetch.c:460 builtin/fetch.c:546

5072 msgid "[rejected]"

5073 msgstr "[refuserad]"

5074

5024 -#: builtin/fetch.c:442

5075 +#: builtin/fetch.c:471

5076 msgid "[tag update]"

5077 msgstr "[uppdaterad tagg]"

5078

5028 -#: builtin/fetch.c:444 builtin/fetch.c:479 builtin/fetch.c:497

5079 +#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5080 msgid " (unable to update local ref)"

5081 msgstr " (kunde inte uppdatera lokal ref)"

5082

5032 -#: builtin/fetch.c:462

5083 +#: builtin/fetch.c:491

5084 msgid "[new tag]"

5085 msgstr "[ny tagg]"

5086

5036 -#: builtin/fetch.c:465

5087 +#: builtin/fetch.c:494

5088 msgid "[new branch]"

5089 msgstr "[ny gren]"

5090

5040 -#: builtin/fetch.c:468

5091 +#: builtin/fetch.c:497

5092 msgid "[new ref]"

5093 msgstr "[ny ref]"

5094

5044 -#: builtin/fetch.c:513

5095 +#: builtin/fetch.c:542

5096 msgid "unable to update local ref"

5097 msgstr "kunde inte uppdatera lokal ref"

5098

5048 -#: builtin/fetch.c:513

5099 +#: builtin/fetch.c:542

5100 msgid "forced update"

5101 msgstr "tvingad uppdatering"

5102

5052 -#: builtin/fetch.c:519

5103 +#: builtin/fetch.c:548

5104 msgid "(non-fast-forward)"

5105 msgstr "(ej snabbspolad)"

5106

5056 -#: builtin/fetch.c:552 builtin/fetch.c:785

5107 +#: builtin/fetch.c:581 builtin/fetch.c:814

5108 #, c-format

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

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

5111

5061 -#: builtin/fetch.c:561

5112 +#: builtin/fetch.c:590

5113 #, c-format

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

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

5116

5066 -#: builtin/fetch.c:579

5117 +#: builtin/fetch.c:608

5118 #, c-format

5119 msgid "reject %s because shallow roots are not allowed to be updated"

5120 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5121

5071 -#: builtin/fetch.c:667 builtin/fetch.c:750

5122 +#: builtin/fetch.c:696 builtin/fetch.c:779

5123 #, c-format

5124 msgid "From %.*s\n"

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

5126

5076 -#: builtin/fetch.c:678

5127 +#: builtin/fetch.c:707

5128 #, c-format

5129 msgid ""

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

@@ -5082,55 +5133,55 @@ msgstr ""

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

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

5135

5085 -#: builtin/fetch.c:730

5136 +#: builtin/fetch.c:759

5137 #, c-format

5138 msgid " (%s will become dangling)"

5139 msgstr " (%s kommer bli dinglande)"

5140

5090 -#: builtin/fetch.c:731

5141 +#: builtin/fetch.c:760

5142 #, c-format

5143 msgid " (%s has become dangling)"

5144 msgstr " (%s har blivit dinglande)"

5145

5095 -#: builtin/fetch.c:755

5146 +#: builtin/fetch.c:784

5147 msgid "[deleted]"

5148 msgstr "[borttagen]"

5149

5099 -#: builtin/fetch.c:756 builtin/remote.c:1050

5150 +#: builtin/fetch.c:785 builtin/remote.c:1059

5151 msgid "(none)"

5152 msgstr "(ingen)"

5153

5103 -#: builtin/fetch.c:775

5154 +#: builtin/fetch.c:804

5155 #, c-format

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

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

5158

5108 -#: builtin/fetch.c:794

5159 +#: builtin/fetch.c:823

5160 #, c-format

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

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

5163

5113 -#: builtin/fetch.c:797

5164 +#: builtin/fetch.c:826

5165 #, c-format

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

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

5168

5118 -#: builtin/fetch.c:853

5169 +#: builtin/fetch.c:882

5170 #, c-format

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

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

5173

5123 -#: builtin/fetch.c:1015

5174 +#: builtin/fetch.c:1044

5175 #, c-format

5176 msgid "Fetching %s\n"

5177 msgstr "Hämtar %s\n"

5178

5128 -#: builtin/fetch.c:1017 builtin/remote.c:90

5179 +#: builtin/fetch.c:1046 builtin/remote.c:90

5180 #, c-format

5181 msgid "Could not fetch %s"

5182 msgstr "Kunde inte hämta %s"

5183

5133 -#: builtin/fetch.c:1035

5184 +#: builtin/fetch.c:1064

5185 msgid ""

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

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

@@ -5138,32 +5189,32 @@ msgstr ""

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

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

5191

5141 -#: builtin/fetch.c:1059

5192 +#: builtin/fetch.c:1087

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

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

5195

5145 -#: builtin/fetch.c:1107

5196 +#: builtin/fetch.c:1131

5197 msgid "--depth and --unshallow cannot be used together"

5198 msgstr "--depth och --unshallow kan inte användas samtidigt"

5199

5149 -#: builtin/fetch.c:1109

5200 +#: builtin/fetch.c:1133

5201 msgid "--unshallow on a complete repository does not make sense"

5202 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5203

5153 -#: builtin/fetch.c:1132

5204 +#: builtin/fetch.c:1156

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

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

5207

5157 -#: builtin/fetch.c:1134

5208 +#: builtin/fetch.c:1158

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

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

5211

5161 -#: builtin/fetch.c:1145

5212 +#: builtin/fetch.c:1169

5213 #, c-format

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

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

5216

5166 -#: builtin/fetch.c:1153

5217 +#: builtin/fetch.c:1177

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

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

5220

@@ -5172,9 +5223,9 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

5223 msgstr ""

5224 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5225

5175 -#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:700

5176 -#: builtin/merge.c:196 builtin/repack.c:175 builtin/repack.c:179

5177 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:501

5226 +#: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5227 +#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5228 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5229 #: parse-options.h:132 parse-options.h:239

5230 msgid "n"

5231 msgstr "n"

@@ -5199,43 +5250,43 @@ msgstr "inled meddelande med <text>"

5250 msgid "file to read from"

5251 msgstr "fil att läsa från"

5252

5202 -#: builtin/for-each-ref.c:1063

5253 +#: builtin/for-each-ref.c:1051

5254 msgid "git for-each-ref [options] [<pattern>]"

5255 msgstr "git for-each-ref [flaggor] [<mönster>]"

5256

5206 -#: builtin/for-each-ref.c:1078

5257 +#: builtin/for-each-ref.c:1066

5258 msgid "quote placeholders suitably for shells"

5259 msgstr "citera platshållare passande för skal"

5260

5210 -#: builtin/for-each-ref.c:1080

5261 +#: builtin/for-each-ref.c:1068

5262 msgid "quote placeholders suitably for perl"

5263 msgstr "citera platshållare passande för perl"

5264

5214 -#: builtin/for-each-ref.c:1082

5265 +#: builtin/for-each-ref.c:1070

5266 msgid "quote placeholders suitably for python"

5267 msgstr "citera platshållare passande för python"

5268

5218 -#: builtin/for-each-ref.c:1084

5269 +#: builtin/for-each-ref.c:1072

5270 msgid "quote placeholders suitably for tcl"

5271 msgstr "citera platshållare passande för tcl"

5272

5222 -#: builtin/for-each-ref.c:1087

5273 +#: builtin/for-each-ref.c:1075

5274 msgid "show only <n> matched refs"

5275 msgstr "visa endast <n> träffade refs"

5276

5226 -#: builtin/for-each-ref.c:1088 builtin/replace.c:177

5277 +#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5278 msgid "format"

5279 msgstr "format"

5280

5230 -#: builtin/for-each-ref.c:1088

5281 +#: builtin/for-each-ref.c:1076

5282 msgid "format to use for the output"

5283 msgstr "format att använda för utdata"

5284

5234 -#: builtin/for-each-ref.c:1089

5285 +#: builtin/for-each-ref.c:1077

5286 msgid "key"

5287 msgstr "nyckel"

5288

5238 -#: builtin/for-each-ref.c:1090

5289 +#: builtin/for-each-ref.c:1078

5290 msgid "field name to sort on"

5291 msgstr "fältnamn att sortera på"

5292

@@ -5243,55 +5294,55 @@ msgstr "fältnamn att sortera på"

5294 msgid "Checking connectivity"

5295 msgstr "Kontrollerar konnektivitet"

5296

5246 -#: builtin/fsck.c:544

5297 +#: builtin/fsck.c:538

5298 msgid "Checking object directories"

5299 msgstr "Kontrollerar objektkataloger"

5300

5250 -#: builtin/fsck.c:607

5301 +#: builtin/fsck.c:601

5302 msgid "git fsck [options] [<object>...]"

5303 msgstr "git fsck [flaggor] [<objekt>...]"

5304

5254 -#: builtin/fsck.c:613

5305 +#: builtin/fsck.c:607

5306 msgid "show unreachable objects"

5307 msgstr "visa onåbara objekt"

5308

5258 -#: builtin/fsck.c:614

5309 +#: builtin/fsck.c:608

5310 msgid "show dangling objects"

5311 msgstr "visa dinglande objekt"

5312

5262 -#: builtin/fsck.c:615

5313 +#: builtin/fsck.c:609

5314 msgid "report tags"

5315 msgstr "rapportera taggar"

5316

5266 -#: builtin/fsck.c:616

5317 +#: builtin/fsck.c:610

5318 msgid "report root nodes"

5319 msgstr "rapportera rotnoder"

5320

5270 -#: builtin/fsck.c:617

5321 +#: builtin/fsck.c:611

5322 msgid "make index objects head nodes"

5323 msgstr "gör indexojekt till huvudnoder"

5324

5274 -#: builtin/fsck.c:618

5325 +#: builtin/fsck.c:612

5326 msgid "make reflogs head nodes (default)"

5327 msgstr "gör refloggar till huvudnoder (standard)"

5328

5278 -#: builtin/fsck.c:619

5329 +#: builtin/fsck.c:613

5330 msgid "also consider packs and alternate objects"

5331 msgstr "ta även hänsyn till paket och alternativa objekt"

5332

5282 -#: builtin/fsck.c:620

5333 +#: builtin/fsck.c:614

5334 msgid "enable more strict checking"

5335 msgstr "aktivera striktare kontroll"

5336

5286 -#: builtin/fsck.c:622

5337 +#: builtin/fsck.c:616

5338 msgid "write dangling objects in .git/lost-found"

5339 msgstr "skriv dinglande objekt i .git/lost-found"

5340

5290 -#: builtin/fsck.c:623 builtin/prune.c:144

5341 +#: builtin/fsck.c:617 builtin/prune.c:144

5342 msgid "show progress"

5343 msgstr "visa förlopp"

5344

5294 -#: builtin/fsck.c:673

5345 +#: builtin/fsck.c:667

5346 msgid "Checking objects"

5347 msgstr "Kontrollerar objekt"

5348

@@ -5299,48 +5350,48 @@ msgstr "Kontrollerar objekt"

5350 msgid "git gc [options]"

5351 msgstr "git gc [flaggor]"

5352

5302 -#: builtin/gc.c:90

5353 +#: builtin/gc.c:91

5354 #, c-format

5355 msgid "Invalid %s: '%s'"

5356 msgstr "Felaktigt %s: \"%s\""

5357

5307 -#: builtin/gc.c:117

5358 +#: builtin/gc.c:118

5359 #, c-format

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

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

5362

5312 -#: builtin/gc.c:273

5363 +#: builtin/gc.c:287

5364 msgid "prune unreferenced objects"

5365 msgstr "rensa ej refererade objekt"

5366

5316 -#: builtin/gc.c:275

5367 +#: builtin/gc.c:289

5368 msgid "be more thorough (increased runtime)"

5369 msgstr "var mer grundlig (ökar körtiden)"

5370

5320 -#: builtin/gc.c:276

5371 +#: builtin/gc.c:290

5372 msgid "enable auto-gc mode"

5373 msgstr "aktivera auto-gc-läge"

5374

5324 -#: builtin/gc.c:277

5375 +#: builtin/gc.c:291

5376 msgid "force running gc even if there may be another gc running"

5377 msgstr "tvinga gc-körning även om en annan gc kanske körs"

5378

5328 -#: builtin/gc.c:318

5379 +#: builtin/gc.c:332

5380 #, c-format

5381 msgid "Auto packing the repository in background for optimum performance.\n"

5382 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

5383

5333 -#: builtin/gc.c:320

5384 +#: builtin/gc.c:334

5385 #, c-format

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

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

5388

5338 -#: builtin/gc.c:321

5389 +#: builtin/gc.c:335

5390 #, c-format

5391 msgid "See \"git help gc\" for manual housekeeping.\n"

5392 msgstr "Se \"git help gc\" för manuell hushållning.\n"

5393

5343 -#: builtin/gc.c:336

5394 +#: builtin/gc.c:353

5395 #, c-format

5396 msgid ""

5397 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5348,7 +5399,7 @@ msgstr ""

5399 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5400 "är fallet)"

5401

5351 -#: builtin/gc.c:361

5402 +#: builtin/gc.c:375

5403 msgid ""

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

5405 msgstr ""

@@ -5364,224 +5415,219 @@ msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

5415 msgid "grep: failed to create thread: %s"

5416 msgstr "grep: misslyckades skapa tråd. %s"

5417

5367 -#: builtin/grep.c:365

5368 -#, c-format

5369 -msgid "Failed to chdir: %s"

5370 -msgstr "Kunde inte byta katalog (chdir): %s"

5371 -

5372 -#: builtin/grep.c:443 builtin/grep.c:478

5418 +#: builtin/grep.c:441 builtin/grep.c:476

5419 #, c-format

5420 msgid "unable to read tree (%s)"

5421 msgstr "kunde inte läsa träd (%s)"

5422

5377 -#: builtin/grep.c:493

5423 +#: builtin/grep.c:491

5424 #, c-format

5425 msgid "unable to grep from object of type %s"

5426 msgstr "Kunde inte \"grep\" från objekt av typen %s"

5427

5382 -#: builtin/grep.c:549

5428 +#: builtin/grep.c:547

5429 #, c-format

5430 msgid "switch `%c' expects a numerical value"

5431 msgstr "flaggan \"%c\" antar ett numeriskt värde"

5432

5387 -#: builtin/grep.c:566

5433 +#: builtin/grep.c:564

5434 #, c-format

5435 msgid "cannot open '%s'"

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

5437

5392 -#: builtin/grep.c:640

5438 +#: builtin/grep.c:638

5439 msgid "search in index instead of in the work tree"

5440 msgstr "sök i indexet istället för i arbetskatalogen"

5441

5396 -#: builtin/grep.c:642

5442 +#: builtin/grep.c:640

5443 msgid "find in contents not managed by git"

5444 msgstr "sök i innehåll som inte hanteras av git"

5445

5400 -#: builtin/grep.c:644

5446 +#: builtin/grep.c:642

5447 msgid "search in both tracked and untracked files"

5448 msgstr "sök i både spårade och ospårade filer"

5449

5404 -#: builtin/grep.c:646

5450 +#: builtin/grep.c:644

5451 msgid "search also in ignored files"

5452 msgstr "sök även i ignorerade filer"

5453

5408 -#: builtin/grep.c:649

5454 +#: builtin/grep.c:647

5455 msgid "show non-matching lines"

5456 msgstr "visa rader som inte träffas"

5457

5412 -#: builtin/grep.c:651

5458 +#: builtin/grep.c:649

5459 msgid "case insensitive matching"

5460 msgstr "skiftlägesokänslig sökning"

5461

5416 -#: builtin/grep.c:653

5462 +#: builtin/grep.c:651

5463 msgid "match patterns only at word boundaries"

5464 msgstr "matcha endast mönster vid ordgränser"

5465

5420 -#: builtin/grep.c:655

5466 +#: builtin/grep.c:653

5467 msgid "process binary files as text"

5468 msgstr "hantera binärfiler som text"

5469

5424 -#: builtin/grep.c:657

5470 +#: builtin/grep.c:655

5471 msgid "don't match patterns in binary files"

5472 msgstr "träffa inte mönster i binärfiler"

5473

5428 -#: builtin/grep.c:660

5474 +#: builtin/grep.c:658

5475 msgid "process binary files with textconv filters"

5476 msgstr "hantera binärfiler med textconv-filter"

5477

5432 -#: builtin/grep.c:662

5478 +#: builtin/grep.c:660

5479 msgid "descend at most <depth> levels"

5480 msgstr "gå som mest ned <djup> nivåer"

5481

5436 -#: builtin/grep.c:666

5482 +#: builtin/grep.c:664

5483 msgid "use extended POSIX regular expressions"

5484 msgstr "använd utökade POSIX-reguljära uttryck"

5485

5440 -#: builtin/grep.c:669

5486 +#: builtin/grep.c:667

5487 msgid "use basic POSIX regular expressions (default)"

5488 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

5489

5444 -#: builtin/grep.c:672

5490 +#: builtin/grep.c:670

5491 msgid "interpret patterns as fixed strings"

5492 msgstr "tolka mönster som fixerade strängar"

5493

5448 -#: builtin/grep.c:675

5494 +#: builtin/grep.c:673

5495 msgid "use Perl-compatible regular expressions"

5496 msgstr "använd Perlkompatibla reguljära uttryck"

5497

5452 -#: builtin/grep.c:678

5498 +#: builtin/grep.c:676

5499 msgid "show line numbers"

5500 msgstr "visa radnummer"

5501

5456 -#: builtin/grep.c:679

5502 +#: builtin/grep.c:677

5503 msgid "don't show filenames"

5504 msgstr "visa inte filnamn"

5505

5460 -#: builtin/grep.c:680

5506 +#: builtin/grep.c:678

5507 msgid "show filenames"

5508 msgstr "visa filnamn"

5509

5464 -#: builtin/grep.c:682

5510 +#: builtin/grep.c:680

5511 msgid "show filenames relative to top directory"

5512 msgstr "visa filnamn relativa till toppkatalogen"

5513

5468 -#: builtin/grep.c:684

5514 +#: builtin/grep.c:682

5515 msgid "show only filenames instead of matching lines"

5516 msgstr "visa endast filnamn istället för träffade rader"

5517

5472 -#: builtin/grep.c:686

5518 +#: builtin/grep.c:684

5519 msgid "synonym for --files-with-matches"

5520 msgstr "synonym för --files-with-matches"

5521

5476 -#: builtin/grep.c:689

5522 +#: builtin/grep.c:687

5523 msgid "show only the names of files without match"

5524 msgstr "visa endast namn på filer utan träffar"

5525

5480 -#: builtin/grep.c:691

5526 +#: builtin/grep.c:689

5527 msgid "print NUL after filenames"

5528 msgstr "skriv NUL efter filnamn"

5529

5484 -#: builtin/grep.c:693

5530 +#: builtin/grep.c:691

5531 msgid "show the number of matches instead of matching lines"

5532 msgstr "visa antal träffar istället för träffade rader"

5533

5488 -#: builtin/grep.c:694

5534 +#: builtin/grep.c:692

5535 msgid "highlight matches"

5536 msgstr "ljusmarkera träffar"

5537

5492 -#: builtin/grep.c:696

5538 +#: builtin/grep.c:694

5539 msgid "print empty line between matches from different files"

5540 msgstr "skriv tomma rader mellan träffar från olika filer"

5541

5496 -#: builtin/grep.c:698

5542 +#: builtin/grep.c:696

5543 msgid "show filename only once above matches from same file"

5544 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

5545

5500 -#: builtin/grep.c:701

5546 +#: builtin/grep.c:699

5547 msgid "show <n> context lines before and after matches"

5548 msgstr "visa <n> rader sammanhang före och efter träffar"

5549

5504 -#: builtin/grep.c:704

5550 +#: builtin/grep.c:702

5551 msgid "show <n> context lines before matches"

5552 msgstr "visa <n> rader sammanhang före träffar"

5553

5508 -#: builtin/grep.c:706

5554 +#: builtin/grep.c:704

5555 msgid "show <n> context lines after matches"

5556 msgstr "visa <n> rader sammanhang efter träffar"

5557

5512 -#: builtin/grep.c:707

5558 +#: builtin/grep.c:705

5559 msgid "shortcut for -C NUM"

5560 msgstr "genväg för -C NUM"

5561

5516 -#: builtin/grep.c:710

5562 +#: builtin/grep.c:708

5563 msgid "show a line with the function name before matches"

5564 msgstr "visa en rad med funktionsnamnet före träffen"

5565

5520 -#: builtin/grep.c:712

5566 +#: builtin/grep.c:710

5567 msgid "show the surrounding function"

5568 msgstr "visa den omkringliggande funktionen"

5569

5524 -#: builtin/grep.c:715

5570 +#: builtin/grep.c:713

5571 msgid "read patterns from file"

5572 msgstr "läs mönster från fil"

5573

5528 -#: builtin/grep.c:717

5574 +#: builtin/grep.c:715

5575 msgid "match <pattern>"

5576 msgstr "träffa <mönster>"

5577

5532 -#: builtin/grep.c:719

5578 +#: builtin/grep.c:717

5579 msgid "combine patterns specified with -e"

5580 msgstr "kombinera mönster som anges med -e"

5581

5536 -#: builtin/grep.c:731

5582 +#: builtin/grep.c:729

5583 msgid "indicate hit with exit status without output"

5584 msgstr "ange träff med slutstatuskod utan utdata"

5585

5540 -#: builtin/grep.c:733

5586 +#: builtin/grep.c:731

5587 msgid "show only matches from files that match all patterns"

5588 msgstr "visa endast träffar från filer som träffar alla mönster"

5589

5544 -#: builtin/grep.c:735

5590 +#: builtin/grep.c:733

5591 msgid "show parse tree for grep expression"

5592 msgstr "visa analysträd för grep-uttryck"

5593

5548 -#: builtin/grep.c:739

5594 +#: builtin/grep.c:737

5595 msgid "pager"

5596 msgstr "bläddrare"

5597

5552 -#: builtin/grep.c:739

5598 +#: builtin/grep.c:737

5599 msgid "show matching files in the pager"

5600 msgstr "visa träffade filer i filbläddraren"

5601

5556 -#: builtin/grep.c:742

5602 +#: builtin/grep.c:740

5603 msgid "allow calling of grep(1) (ignored by this build)"

5604 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

5605

5560 -#: builtin/grep.c:743 builtin/show-ref.c:187

5606 +#: builtin/grep.c:741 builtin/show-ref.c:187

5607 msgid "show usage"

5608 msgstr "visa användning"

5609

5564 -#: builtin/grep.c:810

5610 +#: builtin/grep.c:808

5611 msgid "no pattern given."

5612 msgstr "inget mönster angavs."

5613

5568 -#: builtin/grep.c:868

5614 +#: builtin/grep.c:866

5615 msgid "--open-files-in-pager only works on the worktree"

5616 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

5617

5572 -#: builtin/grep.c:891

5618 +#: builtin/grep.c:892

5619 msgid "--cached or --untracked cannot be used with --no-index."

5620 msgstr "--cached och --untracked kan inte användas med --no-index."

5621

5576 -#: builtin/grep.c:896

5622 +#: builtin/grep.c:897

5623 msgid "--no-index or --untracked cannot be used with revs."

5624 msgstr "--no-index och --untracked kan inte användas med revisioner."

5625

5580 -#: builtin/grep.c:899

5626 +#: builtin/grep.c:900

5627 msgid "--[no-]exclude-standard cannot be used for tracked contents."

5628 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5629

5584 -#: builtin/grep.c:907

5630 +#: builtin/grep.c:908

5631 msgid "both --cached and trees are given."

5632 msgstr "både --cached och träd angavs."

5633

@@ -5597,7 +5643,7 @@ msgstr ""

5643 msgid "git hash-object --stdin-paths < <list-of-paths>"

5644 msgstr "git hash-object --stdin-paths < <sökvägslista>"

5645

5600 -#: builtin/hash-object.c:72 builtin/tag.c:521

5646 +#: builtin/hash-object.c:72 builtin/tag.c:609

5647 msgid "type"

5648 msgstr "typ"

5649

@@ -5741,280 +5787,291 @@ msgstr "användning: %s%s"

5787 msgid "`git %s' is aliased to `%s'"

5788 msgstr "\"git %s\" är ett alias för \"%s\""

5789

5744 -#: builtin/index-pack.c:184

5790 +#: builtin/index-pack.c:145

5791 +#, c-format

5792 +msgid "unable to open %s"

5793 +msgstr "kunde inte öppna %s"

5794 +

5795 +#: builtin/index-pack.c:191

5796 #, c-format

5797 msgid "object type mismatch at %s"

5798 msgstr "objekttyp stämmer inte överens vid %s"

5799

5749 -#: builtin/index-pack.c:204

5750 -msgid "object of unexpected type"

5751 -msgstr "objekt av oväntad typ"

5800 +#: builtin/index-pack.c:211

5801 +#, c-format

5802 +msgid "did not receive expected object %s"

5803 +msgstr "emottog inte det förväntade objektet %s"

5804

5753 -#: builtin/index-pack.c:244

5805 +#: builtin/index-pack.c:214

5806 +#, c-format

5807 +msgid "object %s: expected type %s, found %s"

5808 +msgstr "objektet %s: förväntad typ %s, såg %s"

5809 +

5810 +#: builtin/index-pack.c:256

5811 #, c-format

5812 msgid "cannot fill %d byte"

5813 msgid_plural "cannot fill %d bytes"

5814 msgstr[0] "kan inte fylla %d byte"

5815 msgstr[1] "kan inte fylla %d byte"

5816

5760 -#: builtin/index-pack.c:254

5817 +#: builtin/index-pack.c:266

5818 msgid "early EOF"

5819 msgstr "tidigt filslut"

5820

5764 -#: builtin/index-pack.c:255

5821 +#: builtin/index-pack.c:267

5822 msgid "read error on input"

5823 msgstr "indataläsfel"

5824

5768 -#: builtin/index-pack.c:267

5825 +#: builtin/index-pack.c:279

5826 msgid "used more bytes than were available"

5827 msgstr "använde fler byte än tillgängligt"

5828

5772 -#: builtin/index-pack.c:274

5829 +#: builtin/index-pack.c:286

5830 msgid "pack too large for current definition of off_t"

5831 msgstr "paket för stort för nuvarande definition av off_t"

5832

5776 -#: builtin/index-pack.c:290

5833 +#: builtin/index-pack.c:302

5834 #, c-format

5835 msgid "unable to create '%s'"

5836 msgstr "kunde inte skapa \"%s\""

5837

5781 -#: builtin/index-pack.c:295

5838 +#: builtin/index-pack.c:307

5839 #, c-format

5840 msgid "cannot open packfile '%s'"

5841 msgstr "kan inte öppna paketfilen \"%s\""

5842

5786 -#: builtin/index-pack.c:309

5843 +#: builtin/index-pack.c:321

5844 msgid "pack signature mismatch"

5845 msgstr "paketsignatur stämmer inte överens"

5846

5790 -#: builtin/index-pack.c:311

5847 +#: builtin/index-pack.c:323

5848 #, c-format

5849 msgid "pack version %<PRIu32> unsupported"

5850 msgstr "paketversion %<PRIu32> stöds ej"

5851

5795 -#: builtin/index-pack.c:329

5852 +#: builtin/index-pack.c:341

5853 #, c-format

5854 msgid "pack has bad object at offset %lu: %s"

5855 msgstr "paketet har felaktigt objekt vid index %lu: %s"

5856

5800 -#: builtin/index-pack.c:451

5857 +#: builtin/index-pack.c:462

5858 #, c-format

5859 msgid "inflate returned %d"

5860 msgstr "inflate returnerade %d"

5861

5805 -#: builtin/index-pack.c:500

5862 +#: builtin/index-pack.c:511

5863 msgid "offset value overflow for delta base object"

5864 msgstr "indexvärdespill för deltabasobjekt"

5865

5809 -#: builtin/index-pack.c:508

5866 +#: builtin/index-pack.c:519

5867 msgid "delta base offset is out of bound"

5868 msgstr "deltabasindex utanför gränsen"

5869

5813 -#: builtin/index-pack.c:516

5870 +#: builtin/index-pack.c:527

5871 #, c-format

5872 msgid "unknown object type %d"

5873 msgstr "okänd objekttyp %d"

5874

5818 -#: builtin/index-pack.c:547

5875 +#: builtin/index-pack.c:558

5876 msgid "cannot pread pack file"

5877 msgstr "kan inte utföra \"pread\" på paketfil"

5878

5822 -#: builtin/index-pack.c:549

5879 +#: builtin/index-pack.c:560

5880 #, c-format

5881 msgid "premature end of pack file, %lu byte missing"

5882 msgid_plural "premature end of pack file, %lu bytes missing"

5883 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

5884 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

5885

5829 -#: builtin/index-pack.c:575

5886 +#: builtin/index-pack.c:586

5887 msgid "serious inflate inconsistency"

5888 msgstr "allvarlig inflate-inkonsekvens"

5889

5833 -#: builtin/index-pack.c:666 builtin/index-pack.c:672 builtin/index-pack.c:695

5834 -#: builtin/index-pack.c:729 builtin/index-pack.c:738

5890 +#: builtin/index-pack.c:677 builtin/index-pack.c:683 builtin/index-pack.c:706

5891 +#: builtin/index-pack.c:740 builtin/index-pack.c:749

5892 #, c-format

5893 msgid "SHA1 COLLISION FOUND WITH %s !"

5894 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

5895

5839 -#: builtin/index-pack.c:669 builtin/pack-objects.c:162

5896 +#: builtin/index-pack.c:680 builtin/pack-objects.c:162

5897 #: builtin/pack-objects.c:254

5898 #, c-format

5899 msgid "unable to read %s"

5900 msgstr "kunde inte läsa %s"

5901

5845 -#: builtin/index-pack.c:735

5902 +#: builtin/index-pack.c:746

5903 #, c-format

5904 msgid "cannot read existing object %s"

5905 msgstr "kan inte läsa befintligt objekt %s"

5906

5850 -#: builtin/index-pack.c:749

5907 +#: builtin/index-pack.c:760

5908 #, c-format

5909 msgid "invalid blob object %s"

5910 msgstr "ogiltigt blob-objekt %s"

5911

5855 -#: builtin/index-pack.c:763

5912 +#: builtin/index-pack.c:774

5913 #, c-format

5914 msgid "invalid %s"

5915 msgstr "ogiltigt %s"

5916

5860 -#: builtin/index-pack.c:766

5917 +#: builtin/index-pack.c:777

5918 msgid "Error in object"

5919 msgstr "Fel i objekt"

5920

5864 -#: builtin/index-pack.c:768

5921 +#: builtin/index-pack.c:779

5922 #, c-format

5923 msgid "Not all child objects of %s are reachable"

5924 msgstr "Inte alla barnobjekt för %s kan nås"

5925

5869 -#: builtin/index-pack.c:839 builtin/index-pack.c:869

5926 +#: builtin/index-pack.c:851 builtin/index-pack.c:881

5927 msgid "failed to apply delta"

5928 msgstr "misslyckades tillämpa delta"

5929

5873 -#: builtin/index-pack.c:1010

5930 +#: builtin/index-pack.c:1022

5931 msgid "Receiving objects"

5932 msgstr "Tar emot objekt"

5933

5877 -#: builtin/index-pack.c:1010

5934 +#: builtin/index-pack.c:1022

5935 msgid "Indexing objects"

5936 msgstr "Skapar index för objekt"

5937

5881 -#: builtin/index-pack.c:1036

5938 +#: builtin/index-pack.c:1048

5939 msgid "pack is corrupted (SHA1 mismatch)"

5940 msgstr "paketet är trasigt (SHA1 stämmer inte)"

5941

5885 -#: builtin/index-pack.c:1041

5942 +#: builtin/index-pack.c:1053

5943 msgid "cannot fstat packfile"

5944 msgstr "kan inte utföra \"fstat\" på paketfil"

5945

5889 -#: builtin/index-pack.c:1044

5946 +#: builtin/index-pack.c:1056

5947 msgid "pack has junk at the end"

5948 msgstr "paket har skräp i slutet"

5949

5893 -#: builtin/index-pack.c:1055

5950 +#: builtin/index-pack.c:1067

5951 msgid "confusion beyond insanity in parse_pack_objects()"

5952 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

5953

5897 -#: builtin/index-pack.c:1078

5954 +#: builtin/index-pack.c:1090

5955 msgid "Resolving deltas"

5956 msgstr "Analyserar delta"

5957

5901 -#: builtin/index-pack.c:1088

5958 +#: builtin/index-pack.c:1100

5959 #, c-format

5960 msgid "unable to create thread: %s"

5961 msgstr "kunde inte skapa tråd: %s"

5962

5906 -#: builtin/index-pack.c:1130

5963 +#: builtin/index-pack.c:1142

5964 msgid "confusion beyond insanity"

5965 msgstr "förvirrad bortom vanvett"

5966

5910 -#: builtin/index-pack.c:1138

5967 +#: builtin/index-pack.c:1150

5968 #, c-format

5969 msgid "completed with %d local objects"

5970 msgstr "slutfördes med %d lokala objekt"

5971

5915 -#: builtin/index-pack.c:1148

5972 +#: builtin/index-pack.c:1160

5973 #, c-format

5974 msgid "Unexpected tail checksum for %s (disk corruption?)"

5975 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

5976

5920 -#: builtin/index-pack.c:1152

5977 +#: builtin/index-pack.c:1164

5978 #, c-format

5979 msgid "pack has %d unresolved delta"

5980 msgid_plural "pack has %d unresolved deltas"

5981 msgstr[0] "paketet har %d oanalyserat delta"

5982 msgstr[1] "paketet har %d oanalyserade delta"

5983

5927 -#: builtin/index-pack.c:1177

5984 +#: builtin/index-pack.c:1189

5985 #, c-format

5986 msgid "unable to deflate appended object (%d)"

5987 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

5988

5932 -#: builtin/index-pack.c:1256

5989 +#: builtin/index-pack.c:1268

5990 #, c-format

5991 msgid "local object %s is corrupt"

5992 msgstr "lokalt objekt %s är trasigt"

5993

5937 -#: builtin/index-pack.c:1280

5994 +#: builtin/index-pack.c:1292

5995 msgid "error while closing pack file"

5996 msgstr "fel vid stängning av paketfil"

5997

5941 -#: builtin/index-pack.c:1293

5998 +#: builtin/index-pack.c:1305

5999 #, c-format

6000 msgid "cannot write keep file '%s'"

6001 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

6002

5946 -#: builtin/index-pack.c:1301

6003 +#: builtin/index-pack.c:1313

6004 #, c-format

6005 msgid "cannot close written keep file '%s'"

6006 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

6007

5951 -#: builtin/index-pack.c:1314

6008 +#: builtin/index-pack.c:1326

6009 msgid "cannot store pack file"

6010 msgstr "kan inte spara paketfil"

6011

5955 -#: builtin/index-pack.c:1325

6012 +#: builtin/index-pack.c:1337

6013 msgid "cannot store index file"

6014 msgstr "kan inte spara indexfil"

6015

5959 -#: builtin/index-pack.c:1358

6016 +#: builtin/index-pack.c:1370

6017 #, c-format

6018 msgid "bad pack.indexversion=%<PRIu32>"

6019 msgstr "felaktig pack.indexversion=%<PRIu32>"

6020

5964 -#: builtin/index-pack.c:1364

6021 +#: builtin/index-pack.c:1376

6022 #, c-format

6023 msgid "invalid number of threads specified (%d)"

6024 msgstr "felaktigt antal trådar angivet (%d)"

6025

5969 -#: builtin/index-pack.c:1368 builtin/index-pack.c:1546

6026 +#: builtin/index-pack.c:1380 builtin/index-pack.c:1559

6027 #, c-format

6028 msgid "no threads support, ignoring %s"

6029 msgstr "trådstöd saknas, ignorerar %s"

6030

5974 -#: builtin/index-pack.c:1426

6031 +#: builtin/index-pack.c:1438

6032 #, c-format

6033 msgid "Cannot open existing pack file '%s'"

6034 msgstr "Kan inte öppna befintlig paketfil \"%s\""

6035

5979 -#: builtin/index-pack.c:1428

6036 +#: builtin/index-pack.c:1440

6037 #, c-format

6038 msgid "Cannot open existing pack idx file for '%s'"

6039 msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""

6040

5984 -#: builtin/index-pack.c:1475

6041 +#: builtin/index-pack.c:1487

6042 #, c-format

6043 msgid "non delta: %d object"

6044 msgid_plural "non delta: %d objects"

6045 msgstr[0] "icke-delta: %d objekt"

6046 msgstr[1] "icke-delta: %d objekt"

6047

5991 -#: builtin/index-pack.c:1482

6048 +#: builtin/index-pack.c:1494

6049 #, c-format

6050 msgid "chain length = %d: %lu object"

6051 msgid_plural "chain length = %d: %lu objects"

6052 msgstr[0] "kedjelängd = %d: %lu objekt"

6053 msgstr[1] "kedjelängd = %d: %lu objekt"

6054

5998 -#: builtin/index-pack.c:1510

6055 +#: builtin/index-pack.c:1523

6056 msgid "Cannot come back to cwd"

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

6058

6002 -#: builtin/index-pack.c:1558 builtin/index-pack.c:1561

6003 -#: builtin/index-pack.c:1573 builtin/index-pack.c:1577

6059 +#: builtin/index-pack.c:1571 builtin/index-pack.c:1574

6060 +#: builtin/index-pack.c:1586 builtin/index-pack.c:1590

6061 #, c-format

6062 msgid "bad %s"

6063 msgstr "felaktig %s"

6064

6008 -#: builtin/index-pack.c:1591

6065 +#: builtin/index-pack.c:1604

6066 msgid "--fix-thin cannot be used without --stdin"

6067 msgstr "--fix-thin kan inte användas med --stdin"

6068

6012 -#: builtin/index-pack.c:1595 builtin/index-pack.c:1605

6069 +#: builtin/index-pack.c:1608 builtin/index-pack.c:1617

6070 #, c-format

6071 msgid "packfile name '%s' does not end with '.pack'"

6072 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

6073

6017 -#: builtin/index-pack.c:1614

6074 +#: builtin/index-pack.c:1625

6075 msgid "--verify with no packfile name given"

6076 msgstr "--verify angavs utan paketfilnamn"

6077

@@ -6143,7 +6200,7 @@ msgstr "behörigheter"

6200 msgid "specify that the git repository is to be shared amongst several users"

6201 msgstr "ange att git-arkivet skall delas bland flera användare"

6202

6146 -#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:168

6203 +#: builtin/init-db.c:491 builtin/prune-packed.c:79 builtin/repack.c:172

6204 msgid "be quiet"

6205 msgstr "var tyst"

6206

@@ -6183,38 +6240,38 @@ msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]\n"

6240 msgid " or: git show [options] <object>..."

6241 msgstr " eller: git show [flaggor] <objekt>..."

6242

6186 -#: builtin/log.c:125

6243 +#: builtin/log.c:127

6244 msgid "suppress diff output"

6245 msgstr "undertryck diff-utdata"

6246

6190 -#: builtin/log.c:126

6247 +#: builtin/log.c:128

6248 msgid "show source"

6249 msgstr "visa källkod"

6250

6194 -#: builtin/log.c:127

6251 +#: builtin/log.c:129

6252 msgid "Use mail map file"

6253 msgstr "Använd e-postmappningsfil"

6254

6198 -#: builtin/log.c:128

6255 +#: builtin/log.c:130

6256 msgid "decorate options"

6257 msgstr "dekoreringsflaggor"

6258

6202 -#: builtin/log.c:231

6259 +#: builtin/log.c:229

6260 #, c-format

6261 msgid "Final output: %d %s\n"

6262 msgstr "Slututdata: %d %s\n"

6263

6207 -#: builtin/log.c:473 builtin/log.c:565

6264 +#: builtin/log.c:470 builtin/log.c:562

6265 #, c-format

6266 msgid "Could not read object %s"

6267 msgstr "Kunde inte läsa objektet %s"

6268

6212 -#: builtin/log.c:589

6269 +#: builtin/log.c:586

6270 #, c-format

6271 msgid "Unknown type: %d"

6272 msgstr "Okänd typ: %d"

6273

6217 -#: builtin/log.c:689

6274 +#: builtin/log.c:687

6275 msgid "format.headers without value"

6276 msgstr "format.headers utan värde"

6277

@@ -6235,200 +6292,209 @@ msgstr "Behöver precis ett intervall."

6292 msgid "Not a range."

6293 msgstr "Inte ett intervall."

6294

6238 -#: builtin/log.c:911

6295 +#: builtin/log.c:916

6296 msgid "Cover letter needs email format"

6297 msgstr "Omslagsbrevet behöver e-postformat"

6298

6242 -#: builtin/log.c:987

6299 +#: builtin/log.c:995

6300 #, c-format

6301 msgid "insane in-reply-to: %s"

6302 msgstr "tokigt in-reply-to: %s"

6303

6247 -#: builtin/log.c:1015

6304 +#: builtin/log.c:1023

6305 msgid "git format-patch [options] [<since> | <revision range>]"

6306 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

6307

6251 -#: builtin/log.c:1060

6308 +#: builtin/log.c:1068

6309 msgid "Two output directories?"

6310 msgstr "Två utdatakataloger?"

6311

6255 -#: builtin/log.c:1175

6312 +#: builtin/log.c:1183

6313 msgid "use [PATCH n/m] even with a single patch"

6314 msgstr "använd [PATCH n/m] även för en ensam patch"

6315

6259 -#: builtin/log.c:1178

6316 +#: builtin/log.c:1186

6317 msgid "use [PATCH] even with multiple patches"

6318 msgstr "använd [PATCH] även för flera patchar"

6319

6263 -#: builtin/log.c:1182

6320 +#: builtin/log.c:1190

6321 msgid "print patches to standard out"

6322 msgstr "skriv patcharna på standard ut"

6323

6267 -#: builtin/log.c:1184

6324 +#: builtin/log.c:1192

6325 msgid "generate a cover letter"

6326 msgstr "generera ett följebrev"

6327

6271 -#: builtin/log.c:1186

6328 +#: builtin/log.c:1194

6329 msgid "use simple number sequence for output file names"

6330 msgstr "använd enkel nummersekvens för utdatafilnamn"

6331

6275 -#: builtin/log.c:1187

6332 +#: builtin/log.c:1195

6333 msgid "sfx"

6334 msgstr "sfx"

6335

6279 -#: builtin/log.c:1188

6336 +#: builtin/log.c:1196

6337 msgid "use <sfx> instead of '.patch'"

6338 msgstr "använd <sfx> istället för \".patch\""

6339

6283 -#: builtin/log.c:1190

6340 +#: builtin/log.c:1198

6341 msgid "start numbering patches at <n> instead of 1"

6342 msgstr "börja numrera patchar på <n> istället för 1"

6343

6287 -#: builtin/log.c:1192

6344 +#: builtin/log.c:1200

6345 msgid "mark the series as Nth re-roll"

6346 msgstr "markera serien som N:te försök"

6347

6291 -#: builtin/log.c:1194

6348 +#: builtin/log.c:1202

6349 msgid "Use [<prefix>] instead of [PATCH]"

6350 msgstr "Använd [<prefix>] istället för [PATCH]"

6351

6295 -#: builtin/log.c:1197

6352 +#: builtin/log.c:1205

6353 msgid "store resulting files in <dir>"

6354 msgstr "spara filerna i <katalog>"

6355

6299 -#: builtin/log.c:1200

6356 +#: builtin/log.c:1208

6357 msgid "don't strip/add [PATCH]"

6358 msgstr "ta inte bort eller lägg till [PATCH]"

6359

6303 -#: builtin/log.c:1203

6360 +#: builtin/log.c:1211

6361 msgid "don't output binary diffs"

6362 msgstr "skriv inte binära diffar"

6363

6307 -#: builtin/log.c:1205

6364 +#: builtin/log.c:1213

6365 msgid "don't include a patch matching a commit upstream"

6366 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

6367

6311 -#: builtin/log.c:1207

6368 +#: builtin/log.c:1215

6369 msgid "show patch format instead of default (patch + stat)"

6370 msgstr "visa patchformat istället för standard (patch + stat)"

6371

6315 -#: builtin/log.c:1209

6372 +#: builtin/log.c:1217

6373 msgid "Messaging"

6374 msgstr "E-post"

6375

6319 -#: builtin/log.c:1210

6376 +#: builtin/log.c:1218

6377 msgid "header"

6378 msgstr "huvud"

6379

6323 -#: builtin/log.c:1211

6380 +#: builtin/log.c:1219

6381 msgid "add email header"

6382 msgstr "lägg till e-posthuvud"

6383

6327 -#: builtin/log.c:1212 builtin/log.c:1214

6384 +#: builtin/log.c:1220 builtin/log.c:1222

6385 msgid "email"

6386 msgstr "epost"

6387

6331 -#: builtin/log.c:1212

6388 +#: builtin/log.c:1220

6389 msgid "add To: header"

6390 msgstr "Lägg till mottagarhuvud (\"To:\")"

6391

6335 -#: builtin/log.c:1214

6392 +#: builtin/log.c:1222

6393 msgid "add Cc: header"

6394 msgstr "Lägg till kopiehuvud (\"Cc:\")"

6395

6339 -#: builtin/log.c:1216

6396 +#: builtin/log.c:1224

6397 msgid "ident"

6398 msgstr "ident"

6399

6343 -#: builtin/log.c:1217

6400 +#: builtin/log.c:1225

6401 msgid "set From address to <ident> (or committer ident if absent)"

6402 msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"

6403

6347 -#: builtin/log.c:1219

6404 +#: builtin/log.c:1227

6405 msgid "message-id"

6406 msgstr "meddelande-id"

6407

6351 -#: builtin/log.c:1220

6408 +#: builtin/log.c:1228

6409 msgid "make first mail a reply to <message-id>"

6410 msgstr "Gör det första brevet ett svar till <meddelande-id>"

6411

6355 -#: builtin/log.c:1221 builtin/log.c:1224

6412 +#: builtin/log.c:1229 builtin/log.c:1232

6413 msgid "boundary"

6414 msgstr "gräns"

6415

6359 -#: builtin/log.c:1222

6416 +#: builtin/log.c:1230

6417 msgid "attach the patch"

6418 msgstr "bifoga patchen"

6419

6363 -#: builtin/log.c:1225

6420 +#: builtin/log.c:1233

6421 msgid "inline the patch"

6422 msgstr "gör patchen ett inline-objekt"

6423

6367 -#: builtin/log.c:1229

6424 +#: builtin/log.c:1237

6425 msgid "enable message threading, styles: shallow, deep"

6426 msgstr "aktivera brevtrådning, typer: shallow, deep"

6427

6371 -#: builtin/log.c:1231

6428 +#: builtin/log.c:1239

6429 msgid "signature"

6430 msgstr "signatur"

6431

6375 -#: builtin/log.c:1232

6432 +#: builtin/log.c:1240

6433 msgid "add a signature"

6434 msgstr "lägg till signatur"

6435

6379 -#: builtin/log.c:1233

6436 +#: builtin/log.c:1242

6437 +msgid "add a signature from a file"

6438 +msgstr "lägg till signatur från fil"

6439 +

6440 +#: builtin/log.c:1243

6441 msgid "don't print the patch filenames"

6442 msgstr "visa inte filnamn för patchar"

6443

6383 -#: builtin/log.c:1307

6444 +#: builtin/log.c:1317

6445 #, c-format

6446 msgid "invalid ident line: %s"

6447 msgstr "ogiltig ident-rad: %s"

6448

6388 -#: builtin/log.c:1322

6449 +#: builtin/log.c:1332

6450 msgid "-n and -k are mutually exclusive."

6451 msgstr "-n och -k kan inte användas samtidigt."

6452

6392 -#: builtin/log.c:1324

6453 +#: builtin/log.c:1334

6454 msgid "--subject-prefix and -k are mutually exclusive."

6455 msgstr "--subject-prefix och -k kan inte användas samtidigt."

6456

6396 -#: builtin/log.c:1332

6457 +#: builtin/log.c:1342

6458 msgid "--name-only does not make sense"

6459 msgstr "kan inte använda --name-only"

6460

6400 -#: builtin/log.c:1334

6461 +#: builtin/log.c:1344

6462 msgid "--name-status does not make sense"

6463 msgstr "kan inte använda --name-status"

6464

6404 -#: builtin/log.c:1336

6465 +#: builtin/log.c:1346

6466 msgid "--check does not make sense"

6467 msgstr "kan inte använda --check"

6468

6408 -#: builtin/log.c:1359

6469 +#: builtin/log.c:1369

6470 msgid "standard output, or directory, which one?"

6471 msgstr "standard ut, eller katalog, vilken skall det vara?"

6472

6412 -#: builtin/log.c:1361

6473 +#: builtin/log.c:1371

6474 #, c-format

6475 msgid "Could not create directory '%s'"

6476 msgstr "Kunde inte skapa katalogen \"%s\""

6477

6417 -#: builtin/log.c:1509

6478 +#: builtin/log.c:1468

6479 +#, c-format

6480 +msgid "unable to read signature file '%s'"

6481 +msgstr "kunde inte läsa signaturfil \"%s\""

6482 +

6483 +#: builtin/log.c:1531

6484 msgid "Failed to create output files"

6485 msgstr "Misslyckades skapa utdatafiler"

6486

6421 -#: builtin/log.c:1558

6487 +#: builtin/log.c:1579

6488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

6489 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

6490

6425 -#: builtin/log.c:1613

6491 +#: builtin/log.c:1634

6492 #, c-format

6493 msgid ""

6494 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

6495 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

6496

6431 -#: builtin/log.c:1626 builtin/log.c:1628 builtin/log.c:1640

6497 +#: builtin/log.c:1647 builtin/log.c:1649 builtin/log.c:1661

6498 #, c-format

6499 msgid "Unknown commit %s"

6500 msgstr "Okänd incheckning %s"

@@ -6710,33 +6776,33 @@ msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

6776 msgid "git write-tree failed to write a tree"

6777 msgstr "git write-tree misslyckades skriva ett träd"

6778

6713 -#: builtin/merge.c:681

6779 +#: builtin/merge.c:678

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

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

6782

6717 -#: builtin/merge.c:695

6783 +#: builtin/merge.c:692

6784 #, c-format

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

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

6787

6722 -#: builtin/merge.c:709

6788 +#: builtin/merge.c:705

6789 #, c-format

6790 msgid "unable to write %s"

6791 msgstr "kunde inte skriva %s"

6792

6727 -#: builtin/merge.c:798

6793 +#: builtin/merge.c:794

6794 #, c-format

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