14147865dd · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2012-09-05 06:20+0800\n"

11 -"PO-Revision-Date: 2012-09-07 10:09+0100\n"

10 +"POT-Creation-Date: 2012-09-15 10:21+0800\n"

11 +"PO-Revision-Date: 2012-09-21 15:52+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"

@@ -38,6 +38,94 @@ msgstr ""

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

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

40

41 +#: archive.c:10

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

43 +msgstr "git archive [flaggor] <träd-igt> [<sökväg>...]"

44 +

45 +#: archive.c:11

46 +msgid "git archive --list"

47 +msgstr "git archive --list"

48 +

49 +#: archive.c:12

50 +msgid ""

51 +"git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]"

52 +msgstr ""

53 +"git archive --remote <arkiv> [--exec <kmd>] [flaggor] <träd-igt> "

54 +"[<sökväg>...]"

55 +

56 +#: archive.c:13

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

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

59 +

60 +#: archive.c:322

61 +msgid "fmt"

62 +msgstr "fmt"

63 +

64 +#: archive.c:322

65 +msgid "archive format"

66 +msgstr "arkivformat"

67 +

68 +#: archive.c:323 builtin/log.c:1079

69 +msgid "prefix"

70 +msgstr "prefix"

71 +

72 +#: archive.c:324

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

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

75 +

76 +# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.

77 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332

78 +#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642

79 +#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77

80 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537

81 +#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149

82 +msgid "file"

83 +msgstr "fil"

84 +

85 +#: archive.c:326 builtin/archive.c:92

86 +msgid "write the archive to this file"

87 +msgstr "skriv arkivet till filen"

88 +

89 +#: archive.c:328

90 +msgid "read .gitattributes in working directory"

91 +msgstr "läs .gitattributes i arbetskatalogen"

92 +

93 +#: archive.c:329

94 +msgid "report archived files on stderr"

95 +msgstr "rapportera arkiverade filer på standard fel"

96 +

97 +#: archive.c:330

98 +msgid "store only"

99 +msgstr "endast spara"

100 +

101 +#: archive.c:331

102 +msgid "compress faster"

103 +msgstr "komprimera snabbare"

104 +

105 +#: archive.c:339

106 +msgid "compress better"

107 +msgstr "komprimera bättre"

108 +

109 +#: archive.c:342

110 +msgid "list supported archive formats"

111 +msgstr "visa understödda arkivformat"

112 +

113 +#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85

114 +msgid "repo"

115 +msgstr "arkiv"

116 +

117 +#: archive.c:345 builtin/archive.c:94

118 +msgid "retrieve the archive from remote repository <repo>"

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

120 +

121 +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616

122 +msgid "command"

123 +msgstr "kommando"

124 +

125 +#: archive.c:347 builtin/archive.c:96

126 +msgid "path to the remote git-upload-archive command"

127 +msgstr "sökväg till kommandot git-upload-archive på fjärren"

128 +

129 #: bundle.c:36

130 #, c-format

131 msgid "'%s' does not look like a v2 bundle file"

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

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

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

138

51 -#: bundle.c:89 builtin/commit.c:699

139 +#: bundle.c:89 builtin/commit.c:714

140 #, c-format

141 msgid "could not open '%s'"

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

@@ -57,7 +145,7 @@ msgstr "kunde inte öppna \"%s\""

145 msgid "Repository lacks these prerequisite commits:"

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

147

60 -#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290

148 +#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290

149 #: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347

150 #: builtin/shortlog.c:181

151 msgid "revision walk setup failed"

@@ -406,20 +494,20 @@ msgstr "misslyckades ta skapa symboliska länken \"%s\""

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

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

496

409 -#: merge-recursive.c:921

497 +#: merge-recursive.c:922

498 msgid "Failed to execute internal merge"

499 msgstr "Misslyckades exekvera intern sammanslagning"

500

413 -#: merge-recursive.c:925

501 +#: merge-recursive.c:926

502 #, c-format

503 msgid "Unable to add %s to database"

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

505

418 -#: merge-recursive.c:941

506 +#: merge-recursive.c:942

507 msgid "unsupported object type in the tree"

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

509

422 -#: merge-recursive.c:1020 merge-recursive.c:1034

510 +#: merge-recursive.c:1021 merge-recursive.c:1035

511 #, c-format

512 msgid ""

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

@@ -428,7 +516,7 @@ msgstr ""

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

517 "i trädet."

518

431 -#: merge-recursive.c:1026 merge-recursive.c:1039

519 +#: merge-recursive.c:1027 merge-recursive.c:1040

520 #, c-format

521 msgid ""

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

@@ -437,20 +525,20 @@ msgstr ""

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

526 "i trädet vid %s."

527

440 -#: merge-recursive.c:1080

528 +#: merge-recursive.c:1081

529 msgid "rename"

530 msgstr "namnbyte"

531

444 -#: merge-recursive.c:1080

532 +#: merge-recursive.c:1081

533 msgid "renamed"

534 msgstr "namnbytt"

535

448 -#: merge-recursive.c:1136

536 +#: merge-recursive.c:1137

537 #, c-format

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

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

540

453 -#: merge-recursive.c:1158

541 +#: merge-recursive.c:1159

542 #, c-format

543 msgid ""

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

@@ -459,144 +547,144 @@ msgstr ""

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

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

549

462 -#: merge-recursive.c:1163

550 +#: merge-recursive.c:1164

551 msgid " (left unresolved)"

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

553

466 -#: merge-recursive.c:1217

554 +#: merge-recursive.c:1218

555 #, c-format

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

557 msgstr ""

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

559

472 -#: merge-recursive.c:1247

560 +#: merge-recursive.c:1248

561 #, c-format

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

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

564

477 -#: merge-recursive.c:1446

565 +#: merge-recursive.c:1447

566 #, c-format

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

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

569

482 -#: merge-recursive.c:1456

570 +#: merge-recursive.c:1457

571 #, c-format

572 msgid "Adding merged %s"

573 msgstr "Lägger till sammanslagen %s"

574

487 -#: merge-recursive.c:1461 merge-recursive.c:1659

575 +#: merge-recursive.c:1462 merge-recursive.c:1660

576 #, c-format

577 msgid "Adding as %s instead"

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

579

492 -#: merge-recursive.c:1512

580 +#: merge-recursive.c:1513

581 #, c-format

582 msgid "cannot read object %s"

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

584

497 -#: merge-recursive.c:1515

585 +#: merge-recursive.c:1516

586 #, c-format

587 msgid "object %s is not a blob"

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

589

502 -#: merge-recursive.c:1563

590 +#: merge-recursive.c:1564

591 msgid "modify"

592 msgstr "ändra"

593

506 -#: merge-recursive.c:1563

594 +#: merge-recursive.c:1564

595 msgid "modified"

596 msgstr "ändrad"

597

510 -#: merge-recursive.c:1573

598 +#: merge-recursive.c:1574

599 msgid "content"

600 msgstr "innehåll"

601

514 -#: merge-recursive.c:1580

602 +#: merge-recursive.c:1581

603 msgid "add/add"

604 msgstr "tillägg/tillägg"

605

518 -#: merge-recursive.c:1614

606 +#: merge-recursive.c:1615

607 #, c-format

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

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

610

523 -#: merge-recursive.c:1628

611 +#: merge-recursive.c:1629

612 #, c-format

613 msgid "Auto-merging %s"

614 msgstr "Slår ihop %s automatiskt"

615

528 -#: merge-recursive.c:1632 git-submodule.sh:869

616 +#: merge-recursive.c:1633 git-submodule.sh:869

617 msgid "submodule"

618 msgstr "undermodul"

619

532 -#: merge-recursive.c:1633

620 +#: merge-recursive.c:1634

621 #, c-format

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

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

624

537 -#: merge-recursive.c:1723

625 +#: merge-recursive.c:1724

626 #, c-format

627 msgid "Removing %s"

628 msgstr "Tar bort %s"

629

542 -#: merge-recursive.c:1748

630 +#: merge-recursive.c:1749

631 msgid "file/directory"

632 msgstr "fil/katalog"

633

546 -#: merge-recursive.c:1754

634 +#: merge-recursive.c:1755

635 msgid "directory/file"

636 msgstr "katalog/fil"

637

550 -#: merge-recursive.c:1759

638 +#: merge-recursive.c:1760

639 #, c-format

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

641 msgstr ""

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

643

556 -#: merge-recursive.c:1769

644 +#: merge-recursive.c:1770

645 #, c-format

646 msgid "Adding %s"

647 msgstr "Lägger till %s"

648

561 -#: merge-recursive.c:1786

649 +#: merge-recursive.c:1787

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

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

652

565 -#: merge-recursive.c:1805

653 +#: merge-recursive.c:1806

654 msgid "Already up-to-date!"

655 msgstr "Redan à jour!"

656

569 -#: merge-recursive.c:1814

657 +#: merge-recursive.c:1815

658 #, c-format

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

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

661

574 -#: merge-recursive.c:1844

662 +#: merge-recursive.c:1845

663 #, c-format

664 msgid "Unprocessed path??? %s"

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

666

579 -#: merge-recursive.c:1889

667 +#: merge-recursive.c:1890

668 msgid "Merging:"

669 msgstr "Slår ihop:"

670

583 -#: merge-recursive.c:1902

671 +#: merge-recursive.c:1903

672 #, c-format

673 msgid "found %u common ancestor:"

674 msgid_plural "found %u common ancestors:"

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

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

677

590 -#: merge-recursive.c:1939

678 +#: merge-recursive.c:1940

679 msgid "merge returned no commit"

680 msgstr "sammanslagningen returnerade ingen incheckning"

681

594 -#: merge-recursive.c:1996

682 +#: merge-recursive.c:1997

683 #, c-format

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

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

686

599 -#: merge-recursive.c:2008 builtin/merge.c:696

687 +#: merge-recursive.c:2009 builtin/merge.c:696

688 msgid "Unable to write index."

689 msgstr "Kunde inte skriva indexet."

690

@@ -683,7 +771,7 @@ msgstr ""

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

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

773

686 -#: sequencer.c:160 sequencer.c:758 sequencer.c:841

774 +#: sequencer.c:160 sequencer.c:765 sequencer.c:848

775 #, c-format

776 msgid "Could not write to %s"

777 msgstr "Kunde inte skriva till %s"

@@ -719,178 +807,178 @@ msgstr "Kunde inte bestämma HEAD:s incheckning\n"

807 msgid "Unable to update cache tree\n"

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

809

722 -#: sequencer.c:324

810 +#: sequencer.c:327

811 #, c-format

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

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

814

727 -#: sequencer.c:329

815 +#: sequencer.c:332

816 #, c-format

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

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

819

732 -#: sequencer.c:395

820 +#: sequencer.c:398

821 msgid "Your index file is unmerged."

822 msgstr "Din indexfil har inte slagits ihop."

823

736 -#: sequencer.c:398

824 +#: sequencer.c:401

825 msgid "You do not have a valid HEAD"

826 msgstr "Du har ingen giltig HEAD"

827

740 -#: sequencer.c:413

828 +#: sequencer.c:416

829 #, c-format

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

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

832

745 -#: sequencer.c:421

833 +#: sequencer.c:424

834 #, c-format

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

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

837

750 -#: sequencer.c:425

838 +#: sequencer.c:428

839 #, c-format

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

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

842

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

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

757 -#: sequencer.c:436

845 +#: sequencer.c:439

846 #, c-format

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

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

849

762 -#: sequencer.c:440

850 +#: sequencer.c:443

851 #, c-format

852 msgid "Cannot get commit message for %s"

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

854

767 -#: sequencer.c:524

855 +#: sequencer.c:527

856 #, c-format

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

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

859

772 -#: sequencer.c:525

860 +#: sequencer.c:528

861 #, c-format

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

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

864

777 -#: sequencer.c:553

865 +#: sequencer.c:560

866 msgid "empty commit set passed"

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

868

781 -#: sequencer.c:561

869 +#: sequencer.c:568

870 #, c-format

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

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

873

786 -#: sequencer.c:566

874 +#: sequencer.c:573

875 #, c-format

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

877 msgstr "git %s: misslyckades uppdatera indexet"

878

791 -#: sequencer.c:624

879 +#: sequencer.c:631

880 #, c-format

881 msgid "Cannot %s during a %s"

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

883

796 -#: sequencer.c:646

884 +#: sequencer.c:653

885 #, c-format

886 msgid "Could not parse line %d."

887 msgstr "Kan inte tolka rad %d."

888

801 -#: sequencer.c:651

889 +#: sequencer.c:658

890 msgid "No commits parsed."

891 msgstr "Inga incheckningar lästes."

892

805 -#: sequencer.c:664

893 +#: sequencer.c:671

894 #, c-format

895 msgid "Could not open %s"

896 msgstr "Kunde inte öppna %s"

897

810 -#: sequencer.c:668

898 +#: sequencer.c:675

899 #, c-format

900 msgid "Could not read %s."

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

902

815 -#: sequencer.c:675

903 +#: sequencer.c:682

904 #, c-format

905 msgid "Unusable instruction sheet: %s"

906 msgstr "Oanvändbart manus: %s"

907

820 -#: sequencer.c:703

908 +#: sequencer.c:710

909 #, c-format

910 msgid "Invalid key: %s"

911 msgstr "Felaktig nyckel: %s"

912

825 -#: sequencer.c:706

913 +#: sequencer.c:713

914 #, c-format

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

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

917

830 -#: sequencer.c:718

918 +#: sequencer.c:725

919 #, c-format

920 msgid "Malformed options sheet: %s"

921 msgstr "Trasigt manus: %s"

922

835 -#: sequencer.c:739

923 +#: sequencer.c:746

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

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

926

839 -#: sequencer.c:740

927 +#: sequencer.c:747

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

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

930

843 -#: sequencer.c:744

931 +#: sequencer.c:751

932 #, c-format

933 msgid "Could not create sequencer directory %s"

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

935

848 -#: sequencer.c:760 sequencer.c:845

936 +#: sequencer.c:767 sequencer.c:852

937 #, c-format

938 msgid "Error wrapping up %s."

939 msgstr "Fel vid ombrytning av %s."

940

853 -#: sequencer.c:779 sequencer.c:913

941 +#: sequencer.c:786 sequencer.c:920

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

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

944

857 -#: sequencer.c:781

945 +#: sequencer.c:788

946 msgid "cannot resolve HEAD"

947 msgstr "kan inte bestämma HEAD"

948

861 -#: sequencer.c:783

949 +#: sequencer.c:790

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

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

952

865 -#: sequencer.c:805 builtin/apply.c:3987

953 +#: sequencer.c:812 builtin/apply.c:4005

954 #, c-format

955 msgid "cannot open %s: %s"

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

957

870 -#: sequencer.c:808

958 +#: sequencer.c:815

959 #, c-format

960 msgid "cannot read %s: %s"

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

962

875 -#: sequencer.c:809

963 +#: sequencer.c:816

964 msgid "unexpected end of file"

965 msgstr "oväntat filslut"

966

879 -#: sequencer.c:815

967 +#: sequencer.c:822

968 #, c-format

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

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

971

884 -#: sequencer.c:838

972 +#: sequencer.c:845

973 #, c-format

974 msgid "Could not format %s."

975 msgstr "Kunde inte formatera %s."

976

889 -#: sequencer.c:1000

977 +#: sequencer.c:1007

978 msgid "Can't revert as initial commit"

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

980

893 -#: sequencer.c:1001

981 +#: sequencer.c:1008

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

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

984

@@ -913,12 +1001,17 @@ msgstr "Ingen standarduppström angiven för grenen \"%s\""

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

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

1003

916 -#: wrapper.c:413

1004 +#: wrapper.c:408

1005 +#, c-format

1006 +msgid "unable to access '%s': %s"

1007 +msgstr "kan inte komma åt \"%s\": %s"

1008 +

1009 +#: wrapper.c:426

1010 #, c-format

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

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

1013

921 -#: wrapper.c:414

1014 +#: wrapper.c:427

1015 msgid "no such user"

1016 msgstr "okänd användare"

1017

@@ -977,12 +1070,6 @@ msgid " (commit or discard the untracked or modified content in submodules)"

1070 msgstr ""

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

1072

980 -# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.

981 -#: wt-status.c:224

982 -#, c-format

983 -msgid "%s files:"

984 -msgstr "%se filer:"

985 -

1073 #: wt-status.c:227

1074 #, c-format

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

@@ -1186,12 +1273,12 @@ msgid "Initial commit"

1273 msgstr "Första incheckning"

1274

1275 #: wt-status.c:1011

1189 -msgid "Untracked"

1190 -msgstr "Ospårad"

1276 +msgid "Untracked files"

1277 +msgstr "Ospårade filer"

1278

1279 #: wt-status.c:1013

1193 -msgid "Ignored"

1194 -msgstr "Ignorerad"

1280 +msgid "Ignored files"

1281 +msgstr "Ignorerade filer"

1282

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

1284 #: wt-status.c:1015

@@ -1207,58 +1294,69 @@ msgstr " (använd flaggan -u för att visa ospårade filer)"

1294 msgid "No changes"

1295 msgstr "Inga ändringar"

1296

1210 -#: wt-status.c:1027

1297 +#: wt-status.c:1028

1298 #, c-format

1212 -msgid "no changes added to commit%s\n"

1213 -msgstr "inga ändringar att checka in%s\n"

1214 -

1215 -#: wt-status.c:1029

1216 -msgid " (use \"git add\" and/or \"git commit -a\")"

1217 -msgstr " (använd \"git add\" och/eller \"git commit -a\")"

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

1300 +msgstr ""

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

1302 +"\")\n"

1303

1304 #: wt-status.c:1031

1305 #, c-format

1221 -msgid "nothing added to commit but untracked files present%s\n"

1222 -msgstr "inget köat för incheckning, men ospårade filer finns%s\n"

1306 +msgid "no changes added to commit\n"

1307 +msgstr "inga ändringar att checka in\n"

1308 +

1309 +#: wt-status.c:1034

1310 +#, c-format

1311 +msgid ""

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

1313 +"track)\n"

1314 +msgstr ""

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

1316 +"\")\n"

1317

1224 -#: wt-status.c:1033

1225 -msgid " (use \"git add\" to track)"

1226 -msgstr " (spåra med \"git add\")"

1318 +#: wt-status.c:1037

1319 +#, c-format

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

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

1322

1228 -#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041

1323 +#: wt-status.c:1040

1324 #, c-format

1230 -msgid "nothing to commit%s\n"

1231 -msgstr "inget att checka in%s\n"

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

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

1327

1233 -#: wt-status.c:1036

1234 -msgid " (create/copy files and use \"git add\" to track)"

1235 -msgstr " (skapa/kopiera filer och spåra med \"git add\")"

1328 +#: wt-status.c:1043 wt-status.c:1048

1329 +#, c-format

1330 +msgid "nothing to commit\n"

1331 +msgstr "inget att checka in\n"

1332

1237 -#: wt-status.c:1039

1238 -msgid " (use -u to show untracked files)"

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

1333 +#: wt-status.c:1046

1334 +#, c-format

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

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

1337

1241 -#: wt-status.c:1042

1242 -msgid " (working directory clean)"

1243 -msgstr " (arbetskatalogen ren)"

1338 +#: wt-status.c:1050

1339 +#, c-format

1340 +msgid "nothing to commit, working directory clean\n"

1341 +msgstr "inget att checka in, arbetskatalogen ren\n"

1342

1245 -#: wt-status.c:1150

1343 +#: wt-status.c:1158

1344 msgid "HEAD (no branch)"

1345 msgstr "HEAD (ingen gren)"

1346

1249 -#: wt-status.c:1156

1347 +#: wt-status.c:1164

1348 msgid "Initial commit on "

1349 msgstr "Första incheckning på "

1350

1253 -#: wt-status.c:1171

1351 +#: wt-status.c:1179

1352 msgid "behind "

1353 msgstr "efter "

1354

1257 -#: wt-status.c:1174 wt-status.c:1177

1355 +#: wt-status.c:1182 wt-status.c:1185

1356 msgid "ahead "

1357 msgstr "före "

1358

1261 -#: wt-status.c:1179

1359 +#: wt-status.c:1187

1360 msgid ", behind "

1361 msgstr ", efter "

1362

@@ -1267,6 +1365,10 @@ msgstr ", efter "

1365 msgid "failed to unlink '%s'"

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

1367

1368 +#: builtin/add.c:19

1369 +msgid "git add [options] [--] <filepattern>..."

1370 +msgstr "git add [flaggor] [--] <filmönster>..."

1371 +

1372 #: builtin/add.c:62

1373 #, c-format

1374 msgid "unexpected diff status %c"

@@ -1290,7 +1392,7 @@ msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""

1392 msgid "Unstaged changes after refreshing the index:"

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

1394

1293 -#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186

1395 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186

1396 #, c-format

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

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

@@ -1327,47 +1429,99 @@ msgstr "Tom patch. Avbryter."

1429 msgid "Could not apply '%s'"

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

1431

1330 -#: builtin/add.c:312

1432 +#: builtin/add.c:313

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

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

1435

1334 -#: builtin/add.c:352

1436 +#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63

1437 +#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253

1438 +#: builtin/rm.c:133

1439 +msgid "dry run"

1440 +msgstr "testkörning"

1441 +

1442 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187

1443 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477

1444 +#: builtin/mv.c:62 builtin/read-tree.c:112

1445 +msgid "be verbose"

1446 +msgstr "var pratsam"

1447 +

1448 +#: builtin/add.c:322

1449 +msgid "interactive picking"

1450 +msgstr "plocka interaktivt"

1451 +

1452 +#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248

1453 +msgid "select hunks interactively"

1454 +msgstr "välj stycken interaktivt"

1455 +

1456 +#: builtin/add.c:324

1457 +msgid "edit current diff and apply"

1458 +msgstr "redigera aktuell diff och applicera"

1459 +

1460 +#: builtin/add.c:325

1461 +msgid "allow adding otherwise ignored files"

1462 +msgstr "tillåt lägga till annars ignorerade filer"

1463 +

1464 +#: builtin/add.c:326

1465 +msgid "update tracked files"

1466 +msgstr "uppdatera spårade filer"

1467 +

1468 +#: builtin/add.c:327

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

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

1471 +

1472 +#: builtin/add.c:328

1473 +msgid "add changes from all tracked and untracked files"

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

1475 +

1476 +#: builtin/add.c:329

1477 +msgid "don't add, only refresh the index"

1478 +msgstr "lägg inte till, uppdatera endast indexet"

1479 +

1480 +#: builtin/add.c:330

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

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

1483 +

1484 +#: builtin/add.c:331

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

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

1487 +

1488 +#: builtin/add.c:353

1489 #, c-format

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

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

1492

1339 -#: builtin/add.c:353

1493 +#: builtin/add.c:354

1494 msgid "no files added"

1495 msgstr "inga filer har lagts till"

1496

1343 -#: builtin/add.c:359

1497 +#: builtin/add.c:360

1498 msgid "adding files failed"

1499 msgstr "misslyckades lägga till filer"

1500

1347 -#: builtin/add.c:391

1501 +#: builtin/add.c:392

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

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

1504

1351 -#: builtin/add.c:393

1505 +#: builtin/add.c:394

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

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

1508

1355 -#: builtin/add.c:413

1509 +#: builtin/add.c:414

1510 #, c-format

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

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

1513

1360 -#: builtin/add.c:414

1514 +#: builtin/add.c:415

1515 #, c-format

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

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

1518

1365 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1519 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1520 #: builtin/rm.c:162

1521 msgid "index file corrupt"

1522 msgstr "indexfilen trasig"

1523

1370 -#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260

1524 +#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260

1525 msgid "Unable to write new index file"

1526 msgstr "Kunde inte skriva ny indexfil"

1527

@@ -1420,17 +1574,17 @@ msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"

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

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

1576

1423 -#: builtin/apply.c:1402

1577 +#: builtin/apply.c:1420

1578 #, c-format

1579 msgid "recount: unexpected line: %.*s"

1580 msgstr "recount: förväntade rad: %.*s"

1581

1428 -#: builtin/apply.c:1459

1582 +#: builtin/apply.c:1477

1583 #, c-format

1584 msgid "patch fragment without header at line %d: %.*s"

1585 msgstr "patch-fragment utan huvud på rad %d: %.*s"

1586

1433 -#: builtin/apply.c:1476

1587 +#: builtin/apply.c:1494

1588 #, c-format

1589 msgid ""

1590 "git diff header lacks filename information when removing %d leading pathname "

@@ -1446,82 +1600,82 @@ msgstr[1] ""

1600 "sökvägskomponenter\n"

1601 "tas bort (rad %d)"

1602

1449 -#: builtin/apply.c:1636

1603 +#: builtin/apply.c:1654

1604 msgid "new file depends on old contents"

1605 msgstr "ny fil beror på gammalt innehåll"

1606

1453 -#: builtin/apply.c:1638

1607 +#: builtin/apply.c:1656

1608 msgid "deleted file still has contents"

1609 msgstr "borttagen fil har fortfarande innehåll"

1610

1457 -#: builtin/apply.c:1664

1611 +#: builtin/apply.c:1682

1612 #, c-format

1613 msgid "corrupt patch at line %d"

1614 msgstr "trasig patch på rad %d"

1615

1462 -#: builtin/apply.c:1700

1616 +#: builtin/apply.c:1718

1617 #, c-format

1618 msgid "new file %s depends on old contents"

1619 msgstr "nya filen %s beror på gammalt innehåll"

1620

1467 -#: builtin/apply.c:1702

1621 +#: builtin/apply.c:1720

1622 #, c-format

1623 msgid "deleted file %s still has contents"

1624 msgstr "borttagna filen %s har fortfarande innehåll"

1625

1472 -#: builtin/apply.c:1705

1626 +#: builtin/apply.c:1723

1627 #, c-format

1628 msgid "** warning: file %s becomes empty but is not deleted"

1629 msgstr "** varning: filen %s blir tom men har inte tagits bort"

1630

1477 -#: builtin/apply.c:1851

1631 +#: builtin/apply.c:1869

1632 #, c-format

1633 msgid "corrupt binary patch at line %d: %.*s"

1634 msgstr "trasig binärpatch på rad %d: %.*s"

1635

1636 #. there has to be one hunk (forward hunk)

1483 -#: builtin/apply.c:1880

1637 +#: builtin/apply.c:1898

1638 #, c-format

1639 msgid "unrecognized binary patch at line %d"

1640 msgstr "binärpatchen på rad %d känns inte igen"

1641

1488 -#: builtin/apply.c:1966

1642 +#: builtin/apply.c:1984

1643 #, c-format

1644 msgid "patch with only garbage at line %d"

1645 msgstr "patch med bara skräp på rad %d"

1646

1493 -#: builtin/apply.c:2056

1647 +#: builtin/apply.c:2074

1648 #, c-format

1649 msgid "unable to read symlink %s"

1650 msgstr "kunde inte läsa symboliska länken %s"

1651

1498 -#: builtin/apply.c:2060

1652 +#: builtin/apply.c:2078

1653 #, c-format

1654 msgid "unable to open or read %s"

1655 msgstr "kunde inte öppna eller läsa %s"

1656

1503 -#: builtin/apply.c:2131

1657 +#: builtin/apply.c:2149

1658 msgid "oops"

1659 msgstr "hoppsan"

1660

1507 -#: builtin/apply.c:2653

1661 +#: builtin/apply.c:2671

1662 #, c-format

1663 msgid "invalid start of line: '%c'"

1664 msgstr "felaktig inledning på rad: \"%c\""

1665

1512 -#: builtin/apply.c:2771

1666 +#: builtin/apply.c:2789

1667 #, c-format

1668 msgid "Hunk #%d succeeded at %d (offset %d line)."

1669 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."

1670 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."

1671 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."

1672

1519 -#: builtin/apply.c:2783

1673 +#: builtin/apply.c:2801

1674 #, c-format

1675 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"

1676 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"

1677

1524 -#: builtin/apply.c:2789

1678 +#: builtin/apply.c:2807

1679 #, c-format

1680 msgid ""

1681 "while searching for:\n"

@@ -1530,321 +1684,318 @@ msgstr ""

1684 "vid sökning efter:\n"

1685 "%.*s"

1686

1533 -#: builtin/apply.c:2808

1687 +#: builtin/apply.c:2826

1688 #, c-format

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

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

1691

1538 -#: builtin/apply.c:2911

1692 +#: builtin/apply.c:2929

1693 #, c-format

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

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

1696

1543 -#: builtin/apply.c:2917

1697 +#: builtin/apply.c:2935

1698 #, c-format

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

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

1701

1548 -#: builtin/apply.c:2938

1702 +#: builtin/apply.c:2956

1703 #, c-format

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

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

1706

1553 -#: builtin/apply.c:3060

1707 +#: builtin/apply.c:3078

1708 #, c-format

1709 msgid "cannot checkout %s"

1710 msgstr "kan inte checka ut %s"

1711

1558 -#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158

1712 +#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176

1713 #, c-format

1714 msgid "read of %s failed"

1715 msgstr "misslyckades läsa %s"

1716

1563 -#: builtin/apply.c:3138 builtin/apply.c:3360

1717 +#: builtin/apply.c:3156 builtin/apply.c:3378

1718 #, c-format

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

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

1721

1568 -#: builtin/apply.c:3219 builtin/apply.c:3374

1722 +#: builtin/apply.c:3237 builtin/apply.c:3392

1723 #, c-format

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

1725 msgstr "%s: finns inte i indexet"

1726

1573 -#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388

1727 +#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406

1728 #, c-format

1729 msgid "%s: %s"

1730 msgstr "%s: %s"

1731

1578 -#: builtin/apply.c:3228 builtin/apply.c:3382

1732 +#: builtin/apply.c:3246 builtin/apply.c:3400

1733 #, c-format

1734 msgid "%s: does not match index"

1735 msgstr "%s: motsvarar inte indexet"

1736

1583 -#: builtin/apply.c:3330

1737 +#: builtin/apply.c:3348

1738 msgid "removal patch leaves file contents"

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

1740

1587 -#: builtin/apply.c:3399

1741 +#: builtin/apply.c:3417

1742 #, c-format

1743 msgid "%s: wrong type"

1744 msgstr "%s: fel typ"

1745

1592 -#: builtin/apply.c:3401

1746 +#: builtin/apply.c:3419

1747 #, c-format

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

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

1750

1597 -#: builtin/apply.c:3502

1751 +#: builtin/apply.c:3520

1752 #, c-format

1753 msgid "%s: already exists in index"

1754 msgstr "%s: finns redan i indexet"

1755

1602 -#: builtin/apply.c:3505

1756 +#: builtin/apply.c:3523

1757 #, c-format

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

1759 msgstr "%s: finns redan i arbetskatalogen"

1760

1607 -#: builtin/apply.c:3525

1761 +#: builtin/apply.c:3543

1762 #, c-format

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

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

1765

1612 -#: builtin/apply.c:3530

1766 +#: builtin/apply.c:3548

1767 #, c-format

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

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

1770

1617 -#: builtin/apply.c:3538

1771 +#: builtin/apply.c:3556

1772 #, c-format

1773 msgid "%s: patch does not apply"

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

1775

1622 -#: builtin/apply.c:3551

1776 +#: builtin/apply.c:3569

1777 #, c-format

1778 msgid "Checking patch %s..."

1779 msgstr "Kontrollerar patchen %s..."

1780

1627 -#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158

1781 +#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158

1782 #, c-format

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

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

1785

1632 -#: builtin/apply.c:3749

1786 +#: builtin/apply.c:3767

1787 #, c-format

1788 msgid "unable to remove %s from index"

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

1790

1637 -#: builtin/apply.c:3777

1791 +#: builtin/apply.c:3795

1792 #, c-format

1793 msgid "corrupt patch for subproject %s"

1794 msgstr "trasig patch för underprojektet %s"

1795

1642 -#: builtin/apply.c:3781

1796 +#: builtin/apply.c:3799

1797 #, c-format

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

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

1800

1647 -#: builtin/apply.c:3786

1801 +#: builtin/apply.c:3804

1802 #, c-format

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

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

1805

1652 -#: builtin/apply.c:3789 builtin/apply.c:3897

1806 +#: builtin/apply.c:3807 builtin/apply.c:3915

1807 #, c-format

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

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

1810

1657 -#: builtin/apply.c:3822

1811 +#: builtin/apply.c:3840

1812 #, c-format

1813 msgid "closing file '%s'"

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

1815

1662 -#: builtin/apply.c:3871

1816 +#: builtin/apply.c:3889

1817 #, c-format

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

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

1820

1667 -#: builtin/apply.c:3958

1821 +#: builtin/apply.c:3976

1822 #, c-format

1823 msgid "Applied patch %s cleanly."

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

1825

1672 -#: builtin/apply.c:3966

1826 +#: builtin/apply.c:3984

1827 msgid "internal error"

1828 msgstr "internt fel"

1829

1830 #. Say this even without --verbose

1677 -#: builtin/apply.c:3969

1831 +#: builtin/apply.c:3987

1832 #, c-format

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

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

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

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

1837

1684 -#: builtin/apply.c:3979

1838 +#: builtin/apply.c:3997

1839 #, c-format

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

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

1842

1689 -#: builtin/apply.c:4000

1843 +#: builtin/apply.c:4018

1844 #, c-format

1845 msgid "Hunk #%d applied cleanly."

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

1847

1694 -#: builtin/apply.c:4003

1848 +#: builtin/apply.c:4021

1849 #, c-format

1850 msgid "Rejected hunk #%d."

1851 msgstr "Refuserar stycke %d."

1852

1699 -#: builtin/apply.c:4153

1853 +#: builtin/apply.c:4171

1854 msgid "unrecognized input"

1855 msgstr "indata känns inte igen"

1856

1703 -#: builtin/apply.c:4164

1857 +#: builtin/apply.c:4182

1858 msgid "unable to read index file"

1859 msgstr "kan inte läsa indexfilen"

1860

1707 -#: builtin/apply.c:4283 builtin/apply.c:4286

1861 +#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91

1862 +#: builtin/fetch.c:63

1863 msgid "path"

1864 msgstr "sökväg"

1865

1711 -#: builtin/apply.c:4284

1866 +#: builtin/apply.c:4302

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

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

1869

1715 -#: builtin/apply.c:4287

1870 +#: builtin/apply.c:4305

1871 msgid "apply changes matching the given path"

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

1873

1719 -#: builtin/apply.c:4289

1874 +#: builtin/apply.c:4307

1875 msgid "num"

1876 msgstr "antal"

1877

1723 -#: builtin/apply.c:4290

1878 +#: builtin/apply.c:4308

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

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

1881

1727 -#: builtin/apply.c:4293

1882 +#: builtin/apply.c:4311

1883 msgid "ignore additions made by the patch"

1884 msgstr "ignorera tillägg gjorda av patchen"

1885

1731 -#: builtin/apply.c:4295

1886 +#: builtin/apply.c:4313

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

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

1889

1735 -#: builtin/apply.c:4299

1736 -msgid "shows number of added and deleted lines in decimal notation"

1737 -msgstr "visar antal tillagda och borttagna rader decimalt"

1890 +#: builtin/apply.c:4317

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

1892 +msgstr "visa antal tillagda och borttagna rader decimalt"

1893

1739 -#: builtin/apply.c:4301

1894 +#: builtin/apply.c:4319

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

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

1897

1743 -#: builtin/apply.c:4303

1898 +#: builtin/apply.c:4321

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

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

1901

1747 -#: builtin/apply.c:4305

1902 +#: builtin/apply.c:4323

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

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

1905

1751 -#: builtin/apply.c:4307

1906 +#: builtin/apply.c:4325

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

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

1909

1755 -#: builtin/apply.c:4309

1910 +#: builtin/apply.c:4327

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

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

1913

1759 -#: builtin/apply.c:4311

1914 +#: builtin/apply.c:4329

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

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

1917

1763 -#: builtin/apply.c:4313

1918 +#: builtin/apply.c:4331

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

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

1921

1767 -#: builtin/apply.c:4315

1922 +#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460

1923 msgid "paths are separated with NUL character"

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

1925

1771 -#: builtin/apply.c:4318

1926 +#: builtin/apply.c:4336

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

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

1929

1775 -#: builtin/apply.c:4319

1930 +#: builtin/apply.c:4337

1931 msgid "action"

1932 msgstr "åtgärd"

1933

1779 -#: builtin/apply.c:4320

1934 +#: builtin/apply.c:4338

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

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

1937

1783 -#: builtin/apply.c:4323 builtin/apply.c:4326

1938 +#: builtin/apply.c:4341 builtin/apply.c:4344

1939 msgid "ignore changes in whitespace when finding context"

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

1941

1787 -#: builtin/apply.c:4329

1942 +#: builtin/apply.c:4347

1943 msgid "apply the patch in reverse"

1944 msgstr "tillämpa patchen baklänges"

1945

1791 -#: builtin/apply.c:4331

1946 +#: builtin/apply.c:4349

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

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

1949

1795 -#: builtin/apply.c:4333

1950 +#: builtin/apply.c:4351

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

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

1953

1799 -#: builtin/apply.c:4335

1954 +#: builtin/apply.c:4353

1955 msgid "allow overlapping hunks"

1956 msgstr "tillåt överlappande stycken"

1957

1803 -#: builtin/apply.c:4336

1804 -msgid "be verbose"

1805 -msgstr "var pratsam"

1806 -

1807 -#: builtin/apply.c:4338

1958 +#: builtin/apply.c:4356

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

1960 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1961

1811 -#: builtin/apply.c:4341

1962 +#: builtin/apply.c:4359

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

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

1965

1815 -#: builtin/apply.c:4343

1966 +#: builtin/apply.c:4361

1967 msgid "root"

1968 msgstr "rot"

1969

1819 -#: builtin/apply.c:4344

1970 +#: builtin/apply.c:4362

1971 msgid "prepend <root> to all filenames"

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

1973

1823 -#: builtin/apply.c:4366

1974 +#: builtin/apply.c:4384

1975 msgid "--3way outside a repository"

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

1977

1827 -#: builtin/apply.c:4374

1978 +#: builtin/apply.c:4392

1979 msgid "--index outside a repository"

1980 msgstr "--index utanför arkiv"

1981

1831 -#: builtin/apply.c:4377

1982 +#: builtin/apply.c:4395

1983 msgid "--cached outside a repository"

1984 msgstr "--cached utanför arkiv"

1985

1835 -#: builtin/apply.c:4393

1986 +#: builtin/apply.c:4411

1987 #, c-format

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

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

1990

1840 -#: builtin/apply.c:4407

1991 +#: builtin/apply.c:4425

1992 #, c-format

1993 msgid "squelched %d whitespace error"

1994 msgid_plural "squelched %d whitespace errors"

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

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

1997

1847 -#: builtin/apply.c:4413 builtin/apply.c:4423

1998 +#: builtin/apply.c:4431 builtin/apply.c:4441

1999 #, c-format

2000 msgid "%d line adds whitespace errors."

2001 msgid_plural "%d lines add whitespace errors."

@@ -1886,7 +2037,135 @@ msgstr "git archive: protokollfel"

2037 msgid "git archive: expected a flush"

2038 msgstr "git archive: förväntade en tömning (flush)"

2039

1889 -#: builtin/branch.c:144

2040 +#: builtin/bisect--helper.c:7

2041 +msgid "git bisect--helper --next-all [--no-checkout]"

2042 +msgstr "git bisect--helper --next-all [--no-checkout]"

2043 +

2044 +#: builtin/bisect--helper.c:17

2045 +msgid "perform 'git bisect next'"

2046 +msgstr "utför 'git bisect next'"

2047 +

2048 +#: builtin/bisect--helper.c:19

2049 +msgid "update BISECT_HEAD instead of checking out the current commit"

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

2051 +

2052 +#: builtin/blame.c:25

2053 +msgid "git blame [options] [rev-opts] [rev] [--] file"

2054 +msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

2055 +

2056 +#: builtin/blame.c:30 builtin/shortlog.c:15

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

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

2059 +

2060 +#: builtin/blame.c:2316

2061 +msgid "Show blame entries as we find them, incrementally"

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

2063 +

2064 +#: builtin/blame.c:2317

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

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

2067 +

2068 +#: builtin/blame.c:2318

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

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

2071 +

2072 +#: builtin/blame.c:2319

2073 +msgid "Show work cost statistics"

2074 +msgstr "Visa statistik över arbetskostnad"

2075 +

2076 +#: builtin/blame.c:2320

2077 +msgid "Show output score for blame entries"

2078 +msgstr "Visa utdatapoäng för klandringsposter"

2079 +

2080 +#: builtin/blame.c:2321

2081 +msgid "Show original filename (Default: auto)"

2082 +msgstr "Visa originalfilnamn (Standard: auto)"

2083 +

2084 +#: builtin/blame.c:2322

2085 +msgid "Show original linenumber (Default: off)"

2086 +msgstr "Visa ursprungligt radnummer (Standard: av)"

2087 +

2088 +#: builtin/blame.c:2323

2089 +msgid "Show in a format designed for machine consumption"

2090 +msgstr "Visa i ett format avsett för maskinkonsumtion"

2091 +

2092 +#: builtin/blame.c:2324

2093 +msgid "Show porcelain format with per-line commit information"

2094 +msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

2095 +

2096 +#: builtin/blame.c:2325

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

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

2099 +

2100 +#: builtin/blame.c:2326

2101 +msgid "Show raw timestamp (Default: off)"

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

2103 +

2104 +#: builtin/blame.c:2327

2105 +msgid "Show long commit SHA1 (Default: off)"

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

2107 +

2108 +#: builtin/blame.c:2328

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

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

2111 +

2112 +#: builtin/blame.c:2329

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

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

2115 +

2116 +#: builtin/blame.c:2330

2117 +msgid "Ignore whitespace differences"

2118 +msgstr "Ignorera ändringar i blanksteg"

2119 +

2120 +#: builtin/blame.c:2331

2121 +msgid "Spend extra cycles to find better match"

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

2123 +

2124 +#: builtin/blame.c:2332

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

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

2127 +

2128 +#: builtin/blame.c:2333

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

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

2131 +

2132 +#: builtin/blame.c:2334 builtin/blame.c:2335

2133 +msgid "score"

2134 +msgstr "poäng"

2135 +

2136 +#: builtin/blame.c:2334

2137 +msgid "Find line copies within and across files"

2138 +msgstr "Hitta kopierade rader inuti och mellan filer"

2139 +

2140 +#: builtin/blame.c:2335

2141 +msgid "Find line movements within and across files"

2142 +msgstr "Hitta flyttade rader inuti och mellan filer"

2143 +

2144 +#: builtin/blame.c:2336

2145 +msgid "n,m"

2146 +msgstr "n,m"

2147 +

2148 +#: builtin/blame.c:2336

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

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

2151 +

2152 +#: builtin/branch.c:23

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

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

2155 +

2156 +#: builtin/branch.c:24

2157 +msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]"

2158 +msgstr "git branch [flaggor] [-l] [-f] <grennamn> [<startpunkt>]"

2159 +

2160 +#: builtin/branch.c:25

2161 +msgid "git branch [options] [-r] (-d | -D) <branchname>..."

2162 +msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..."

2163 +

2164 +#: builtin/branch.c:26

2165 +msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>"

2166 +msgstr "git branch [flaggor] (-m | -M) [<gammal_gren>] <ny_gren>"

2167 +

2168 +#: builtin/branch.c:145

2169 #, c-format

2170 msgid ""

2171 "deleting branch '%s' that has been merged to\n"

@@ -1895,7 +2174,7 @@ msgstr ""

2174 "tar bort grenen \"%s\" som har slagits ihop med\n"

2175 " \"%s\", men ännu inte slagits ihop med HEAD."

2176

1898 -#: builtin/branch.c:148

2177 +#: builtin/branch.c:149

2178 #, c-format

2179 msgid ""

2180 "not deleting branch '%s' that is not yet merged to\n"

@@ -1904,35 +2183,35 @@ msgstr ""

2183 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

2184 " \"%s\", trots att den har slagits ihop med HEAD."

2185

1907 -#: builtin/branch.c:180

2186 +#: builtin/branch.c:181

2187 msgid "cannot use -a with -d"

2188 msgstr "kan inte ange -a med -d"

2189

1911 -#: builtin/branch.c:186

2190 +#: builtin/branch.c:187

2191 msgid "Couldn't look up commit object for HEAD"

2192 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

2193

1915 -#: builtin/branch.c:191

2194 +#: builtin/branch.c:192

2195 #, c-format

2196 msgid "Cannot delete the branch '%s' which you are currently on."

2197 msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."

2198

1920 -#: builtin/branch.c:202

2199 +#: builtin/branch.c:203

2200 #, c-format

2201 msgid "remote branch '%s' not found."

2202 msgstr "fjärrgrenen \"%s\" hittades inte."

2203

1925 -#: builtin/branch.c:203

2204 +#: builtin/branch.c:204

2205 #, c-format

2206 msgid "branch '%s' not found."

2207 msgstr "grenen \"%s\" hittades inte."

2208

1930 -#: builtin/branch.c:210

2209 +#: builtin/branch.c:211

2210 #, c-format

2211 msgid "Couldn't look up commit object for '%s'"

2212 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

2213

1935 -#: builtin/branch.c:216

2214 +#: builtin/branch.c:217

2215 #, c-format

2216 msgid ""

2217 "The branch '%s' is not fully merged.\n"

@@ -1941,129 +2220,259 @@ msgstr ""

2220 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

2221 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

2222

1944 -#: builtin/branch.c:225

2223 +#: builtin/branch.c:226

2224 #, c-format

2225 msgid "Error deleting remote branch '%s'"

2226 msgstr "Fel vid borttagning av fjärrgrenen \"%s\""

2227

1949 -#: builtin/branch.c:226

2228 +#: builtin/branch.c:227

2229 #, c-format

2230 msgid "Error deleting branch '%s'"

2231 msgstr "Fel vid borttagning av grenen \"%s\""

2232

1954 -#: builtin/branch.c:233

2233 +#: builtin/branch.c:234

2234 #, c-format

2235 msgid "Deleted remote branch %s (was %s).\n"

2236 msgstr "Tog bort fjärrgrenen %s (var %s).\n"

2237

1959 -#: builtin/branch.c:234

2238 +#: builtin/branch.c:235

2239 #, c-format

2240 msgid "Deleted branch %s (was %s).\n"

2241 msgstr "Tog bort grenen %s (var %s).\n"

2242

1964 -#: builtin/branch.c:239

2243 +#: builtin/branch.c:240

2244 msgid "Update of config-file failed"

2245 msgstr "Misslyckades uppdatera konfigurationsfil"

2246

1968 -#: builtin/branch.c:337

2247 +#: builtin/branch.c:338

2248 #, c-format

2249 msgid "branch '%s' does not point at a commit"

2250 msgstr "grenen \"%s\" pekar inte på en incheckning"

2251

1973 -#: builtin/branch.c:409

2252 +#: builtin/branch.c:410

2253 #, c-format

2254 msgid "[%s: behind %d]"

2255 msgstr "[%s: bakom %d] "

2256

1978 -#: builtin/branch.c:411

2257 +#: builtin/branch.c:412

2258 #, c-format

2259 msgid "[behind %d]"

2260 msgstr "[bakom %d] "

2261

1983 -#: builtin/branch.c:415

2262 +#: builtin/branch.c:416

2263 #, c-format

2264 msgid "[%s: ahead %d]"

2265 msgstr "[%s: före %d] "

2266

1988 -#: builtin/branch.c:417

2267 +#: builtin/branch.c:418

2268 #, c-format

2269 msgid "[ahead %d]"

2270 msgstr "[före %d] "

2271

1993 -#: builtin/branch.c:420

2272 +#: builtin/branch.c:421

2273 #, c-format

2274 msgid "[%s: ahead %d, behind %d]"

2275 msgstr "[%s: före %d, bakom %d] "

2276

1998 -#: builtin/branch.c:423

2277 +#: builtin/branch.c:424

2278 #, c-format

2279 msgid "[ahead %d, behind %d]"

2280 msgstr "[före %d, bakom %d] "

2281

2003 -#: builtin/branch.c:535

2282 +#: builtin/branch.c:537

2283 msgid "(no branch)"

2284 msgstr "(ingen gren)"

2285

2007 -#: builtin/branch.c:600

2286 +#: builtin/branch.c:602

2287 msgid "some refs could not be read"

2288 msgstr "vissa referenser kunde inte läsas"

2289

2011 -#: builtin/branch.c:613

2290 +#: builtin/branch.c:615

2291 msgid "cannot rename the current branch while not on any."

2292 msgstr ""

2293 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

2294

2016 -#: builtin/branch.c:623

2295 +#: builtin/branch.c:625

2296 #, c-format

2297 msgid "Invalid branch name: '%s'"

2298 msgstr "Felaktigt namn på gren: \"%s\""

2299

2021 -#: builtin/branch.c:638

2300 +#: builtin/branch.c:640

2301 msgid "Branch rename failed"

2302 msgstr "Misslyckades byta namn på gren"

2303

2025 -#: builtin/branch.c:642

2304 +#: builtin/branch.c:644

2305 #, c-format

2306 msgid "Renamed a misnamed branch '%s' away"

2307 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

2308

2030 -#: builtin/branch.c:646

2309 +#: builtin/branch.c:648

2310 #, c-format

2311 msgid "Branch renamed to %s, but HEAD is not updated!"

2312 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

2313

2035 -#: builtin/branch.c:653

2314 +#: builtin/branch.c:655

2315 msgid "Branch is renamed, but update of config-file failed"

2316 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2317

2039 -#: builtin/branch.c:668

2318 +#: builtin/branch.c:670

2319 #, c-format

2320 msgid "malformed object name %s"

2321 msgstr "felformat objektnamn %s"

2322

2044 -#: builtin/branch.c:692

2323 +#: builtin/branch.c:694

2324 #, c-format

2325 msgid "could not write branch description template: %s"

2326 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2327

2049 -#: builtin/branch.c:783

2328 +#: builtin/branch.c:724

2329 +msgid "Generic options"

2330 +msgstr "Allmänna flaggor"

2331 +

2332 +#: builtin/branch.c:726

2333 +msgid "show hash and subject, give twice for upstream branch"

2334 +msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

2335 +

2336 +#: builtin/branch.c:727

2337 +msgid "suppress informational messages"

2338 +msgstr "undertryck informationsmeddelanden"

2339 +

2340 +#: builtin/branch.c:728

2341 +msgid "set up tracking mode (see git-pull(1))"

2342 +msgstr "ställ in spårningsläge (se git-pull(1))"

2343 +

2344 +#: builtin/branch.c:730

2345 +msgid "change upstream info"

2346 +msgstr "ändra uppströmsinformation"

2347 +

2348 +#: builtin/branch.c:734

2349 +msgid "use colored output"

2350 +msgstr "använd färgad utdata"

2351 +

2352 +#: builtin/branch.c:735

2353 +msgid "act on remote-tracking branches"

2354 +msgstr "arbeta på fjärrspårande grenar"

2355 +

2356 +#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765

2357 +#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396

2358 +#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470

2359 +msgid "commit"

2360 +msgstr "incheckning"

2361 +

2362 +#: builtin/branch.c:739 builtin/branch.c:745

2363 +msgid "print only branches that contain the commit"

2364 +msgstr "visa endast grenar som innehåller incheckningen"

2365 +

2366 +#: builtin/branch.c:751

2367 +msgid "Specific git-branch actions:"

2368 +msgstr "Specifika git-branch-åtgärder:"

2369 +

2370 +#: builtin/branch.c:752

2371 +msgid "list both remote-tracking and local branches"

2372 +msgstr "visa både fjärrspårande och lokala grenar"

2373 +

2374 +#: builtin/branch.c:754

2375 +msgid "delete fully merged branch"

2376 +msgstr "ta bort helt sammanslagen gren"

2377 +

2378 +#: builtin/branch.c:755

2379 +msgid "delete branch (even if not merged)"

2380 +msgstr "ta bort gren (även om inte helt sammanslagen)"

2381 +

2382 +#: builtin/branch.c:756

2383 +msgid "move/rename a branch and its reflog"

2384 +msgstr "flytta/ta bort en gren och dess reflogg"

2385 +

2386 +#: builtin/branch.c:757

2387 +msgid "move/rename a branch, even if target exists"

2388 +msgstr "flytta/ta bort en gren, även om målet finns"

2389 +

2390 +#: builtin/branch.c:758

2391 +msgid "list branch names"

2392 +msgstr "lista namn på grenar"

2393 +

2394 +#: builtin/branch.c:759

2395 +msgid "create the branch's reflog"

2396 +msgstr "skapa grenens reflogg"

2397 +

2398 +#: builtin/branch.c:761

2399 +msgid "edit the description for the branch"

2400 +msgstr "redigera beskrivning för grenen"

2401 +

2402 +#: builtin/branch.c:762

2403 +msgid "force creation (when already exists)"

2404 +msgstr "tvinga skapande (när den redan finns)"

2405 +

2406 +#: builtin/branch.c:765

2407 +msgid "print only not merged branches"

2408 +msgstr "visa endast ej sammanslagna grenar"

2409 +

2410 +#: builtin/branch.c:771

2411 +msgid "print only merged branches"

2412 +msgstr "visa endast sammanslagna grenar"

2413 +

2414 +#: builtin/branch.c:775

2415 +msgid "list branches in columns"

2416 +msgstr "visa grenar i spalter"

2417 +

2418 +#: builtin/branch.c:788

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

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

2421

2053 -#: builtin/branch.c:788 builtin/clone.c:561

2422 +#: builtin/branch.c:793 builtin/clone.c:561

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

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

2425

2057 -#: builtin/branch.c:808

2426 +#: builtin/branch.c:813

2427 msgid "--column and --verbose are incompatible"

2428 msgstr "--column och --verbose är inkompatibla"

2429

2061 -#: builtin/branch.c:857

2430 +#: builtin/branch.c:864

2431 +#, c-format

2432 +msgid "branch '%s' does not exist"

2433 +msgstr "grenen \"%s\" finns inte"

2434 +

2435 +#: builtin/branch.c:876

2436 +#, c-format

2437 +msgid "Branch '%s' has no upstream information"

2438 +msgstr "Grenen \"%s\" har ingen uppströmsinformation"

2439 +

2440 +#: builtin/branch.c:891

2441 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

2442 msgstr ""

2443 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

2444 "grennamn"

2445

2446 +#: builtin/branch.c:894

2447 +#, c-format

2448 +msgid ""

2449 +"The --set-upstream flag is deprecated and will be removed. Consider using --"

2450 +"track or --set-upstream-to\n"

2451 +msgstr ""

2452 +"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

2453 +"eller --set-upstream-to\n"

2454 +

2455 +#: builtin/branch.c:911

2456 +#, c-format

2457 +msgid ""

2458 +"\n"

2459 +"If you wanted to make '%s' track '%s', do this:\n"

2460 +"\n"

2461 +msgstr ""

2462 +"\n"

2463 +"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

2464 +"\n"

2465 +

2466 +#: builtin/branch.c:912

2467 +#, c-format

2468 +msgid " git branch -d %s\n"

2469 +msgstr " git branch -d %s\n"

2470 +

2471 +#: builtin/branch.c:913

2472 +#, c-format

2473 +msgid " git branch --set-upstream-to %s\n"

2474 +msgstr " git branch --set-upstream-to %s\n"

2475 +

2476 #: builtin/bundle.c:47

2477 #, c-format

2478 msgid "%s is okay\n"

@@ -2077,95 +2486,227 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

2486 msgid "Need a repository to unbundle."

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

2488

2080 -#: builtin/checkout.c:114 builtin/checkout.c:147

2489 +#: builtin/cat-file.c:247

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

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

2492 +

2493 +#: builtin/cat-file.c:248

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

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

2496 +

2497 +#: builtin/cat-file.c:266

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

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

2500 +

2501 +#: builtin/cat-file.c:267

2502 +msgid "show object type"

2503 +msgstr "visa objekttyp"

2504 +

2505 +#: builtin/cat-file.c:268

2506 +msgid "show object size"

2507 +msgstr "visa objektstorlek"

2508 +

2509 +#: builtin/cat-file.c:270

2510 +msgid "exit with zero when there's no error"

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

2512 +

2513 +#: builtin/cat-file.c:271

2514 +msgid "pretty-print object's content"

2515 +msgstr "visa objektets innehåll snyggt"

2516 +

2517 +#: builtin/cat-file.c:273

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

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

2520 +

2521 +#: builtin/cat-file.c:275

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

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

2524 +

2525 +#: builtin/cat-file.c:278

2526 +msgid "show info about objects fed from the standard input"

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

2528 +

2529 +#: builtin/check-attr.c:11

2530 +msgid "git check-attr [-a | --all | attr...] [--] pathname..."

2531 +msgstr "git check-attr [-a | --all | attr...] [--] sökväg..."

2532 +

2533 +#: builtin/check-attr.c:12

2534 +msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"

2535 +msgstr "git check-attr --stdin [-a | --all | attr...] < <sökvägslista>"

2536 +

2537 +#: builtin/check-attr.c:19

2538 +msgid "report all attributes set on file"

2539 +msgstr "visa alla attribut som satts på filen"

2540 +

2541 +#: builtin/check-attr.c:20

2542 +msgid "use .gitattributes only from the index"

2543 +msgstr "använd .gitattributes endast från indexet"

2544 +

2545 +#: builtin/check-attr.c:21 builtin/hash-object.c:75

2546 +msgid "read file names from stdin"

2547 +msgstr "läs filnamn från standard in"

2548 +

2549 +#: builtin/check-attr.c:23

2550 +msgid "input paths are terminated by a null character"

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

2552 +

2553 +#: builtin/checkout-index.c:126

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

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

2556 +

2557 +#: builtin/checkout-index.c:187

2558 +msgid "check out all files in the index"

2559 +msgstr "checka ut alla filer i indexet"

2560 +

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

2562 +msgid "force overwrite of existing files"

2563 +msgstr "tvinga överskrivning av befintliga filer"

2564 +

2565 +#: builtin/checkout-index.c:190

2566 +msgid "no warning for existing files and files not in index"

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

2568 +

2569 +#: builtin/checkout-index.c:192

2570 +msgid "don't checkout new files"

2571 +msgstr "checka inte ut nya filer"

2572 +

2573 +#: builtin/checkout-index.c:194

2574 +msgid "update stat information in the index file"

2575 +msgstr "uppdatera stat-information i indexfilen"

2576 +

2577 +#: builtin/checkout-index.c:200

2578 +msgid "read list of paths from the standard input"

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

2580 +

2581 +#: builtin/checkout-index.c:202

2582 +msgid "write the content to temporary files"

2583 +msgstr "skriv innehåll till temporära filer"

2584 +

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

2586 +msgid "string"

2587 +msgstr "sträng"

2588 +

2589 +#: builtin/checkout-index.c:204

2590 +msgid "when creating files, prepend <string>"

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

2592 +

2593 +#: builtin/checkout-index.c:207

2594 +msgid "copy out the files from named stage"

2595 +msgstr "kopiera ut filer från namngiven etapp"

2596 +

2597 +#: builtin/checkout.c:25

2598 +msgid "git checkout [options] <branch>"

2599 +msgstr "git checkout [flaggor] <gren>"

2600 +

2601 +#: builtin/checkout.c:26

2602 +msgid "git checkout [options] [<branch>] -- <file>..."

2603 +msgstr "git checkout [flaggor] [<gren>] -- <fil>..."

2604 +

2605 +#: builtin/checkout.c:116 builtin/checkout.c:149

2606 #, c-format

2607 msgid "path '%s' does not have our version"

2608 msgstr "sökvägen \"%s\" har inte vår version"

2609

2085 -#: builtin/checkout.c:116 builtin/checkout.c:149

2610 +#: builtin/checkout.c:118 builtin/checkout.c:151

2611 #, c-format

2612 msgid "path '%s' does not have their version"

2613 msgstr "sökvägen \"%s\" har inte deras version"

2614

2090 -#: builtin/checkout.c:132

2615 +#: builtin/checkout.c:134

2616 #, c-format

2617 msgid "path '%s' does not have all necessary versions"

2618 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

2619

2095 -#: builtin/checkout.c:176

2620 +#: builtin/checkout.c:178

2621 #, c-format

2622 msgid "path '%s' does not have necessary versions"

2623 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

2624

2100 -#: builtin/checkout.c:193

2625 +#: builtin/checkout.c:195

2626 #, c-format

2627 msgid "path '%s': cannot merge"

2628 msgstr "sökväg \"%s\": kan inte slå ihop"

2629

2105 -#: builtin/checkout.c:210

2630 +#: builtin/checkout.c:212

2631 #, c-format

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

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

2634

2110 -#: builtin/checkout.c:235 builtin/checkout.c:392

2635 +#: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242

2636 +#: builtin/checkout.c:245

2637 +#, c-format

2638 +msgid "'%s' cannot be used with updating paths"

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

2640 +

2641 +#: builtin/checkout.c:248 builtin/checkout.c:251

2642 +#, c-format

2643 +msgid "'%s' cannot be used with %s"

2644 +msgstr "\"%s\" kan inte användas med %s"

2645 +

2646 +#: builtin/checkout.c:254

2647 +#, c-format

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

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

2650 +

2651 +#: builtin/checkout.c:265 builtin/checkout.c:426

2652 msgid "corrupt index file"

2653 msgstr "indexfilen är trasig"

2654

2114 -#: builtin/checkout.c:265 builtin/checkout.c:272

2655 +#: builtin/checkout.c:295 builtin/checkout.c:302

2656 #, c-format

2657 msgid "path '%s' is unmerged"

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

2659

2119 -#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586

2660 +#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586

2661 #: builtin/merge.c:811

2662 msgid "unable to write new index file"

2663 msgstr "kunde inte skriva ny indexfil"

2664

2124 -#: builtin/checkout.c:414

2665 +#: builtin/checkout.c:448

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

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

2668

2128 -#: builtin/checkout.c:533

2669 +#: builtin/checkout.c:569

2670 #, c-format

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

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

2673

2133 -#: builtin/checkout.c:566

2674 +#: builtin/checkout.c:602

2675 msgid "HEAD is now at"

2676 msgstr "HEAD är nu på"

2677

2137 -#: builtin/checkout.c:573

2678 +#: builtin/checkout.c:609

2679 #, c-format

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

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

2682

2142 -#: builtin/checkout.c:576

2683 +#: builtin/checkout.c:612

2684 #, c-format

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

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

2687

2147 -#: builtin/checkout.c:580

2688 +#: builtin/checkout.c:616

2689 #, c-format

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

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

2692

2152 -#: builtin/checkout.c:582

2693 +#: builtin/checkout.c:618

2694 #, c-format

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

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

2697

2157 -#: builtin/checkout.c:584

2698 +#: builtin/checkout.c:620

2699 #, c-format

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

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

2702

2162 -#: builtin/checkout.c:640

2703 +#: builtin/checkout.c:676

2704 #, c-format

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

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

2707

2708 #. The singular version

2168 -#: builtin/checkout.c:646

2709 +#: builtin/checkout.c:682

2710 #, c-format

2711 msgid ""

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

@@ -2188,7 +2729,7 @@ msgstr[1] ""

2729 "\n"

2730 "%s\n"

2731

2191 -#: builtin/checkout.c:664

2732 +#: builtin/checkout.c:700

2733 #, c-format

2734 msgid ""

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

@@ -2203,88 +2744,150 @@ msgstr ""

2744 " git branch nytt_grennamn %s\n"

2745 "\n"

2746

2206 -#: builtin/checkout.c:694

2747 +#: builtin/checkout.c:730

2748 msgid "internal error in revision walk"

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

2750

2210 -#: builtin/checkout.c:698

2751 +#: builtin/checkout.c:734

2752 msgid "Previous HEAD position was"

2753 msgstr "Tidigare position för HEAD var"

2754

2214 -#: builtin/checkout.c:724 builtin/checkout.c:919

2755 +#: builtin/checkout.c:761 builtin/checkout.c:950

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

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

2758

2759 #. case (1)

2219 -#: builtin/checkout.c:855

2760 +#: builtin/checkout.c:886

2761 #, c-format

2762 msgid "invalid reference: %s"

2763 msgstr "felaktig referens: %s"

2764

2765 #. case (1): want a tree

2225 -#: builtin/checkout.c:894

2766 +#: builtin/checkout.c:925

2767 #, c-format

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

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

2770

2230 -#: builtin/checkout.c:976

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

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

2771 +#: builtin/checkout.c:961

2772 +msgid "paths cannot be used with switching branches"

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

2774 +

2775 +#: builtin/checkout.c:964 builtin/checkout.c:968

2776 +#, c-format

2777 +msgid "'%s' cannot be used with switching branches"

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

2779

2234 -#: builtin/checkout.c:985

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

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

2780 +#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980

2781 +#: builtin/checkout.c:983

2782 +#, c-format

2783 +msgid "'%s' cannot be used with '%s'"

2784 +msgstr "\"%s\" kan inte användas med \"%s\""

2785

2786 #: builtin/checkout.c:988

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

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

2787 +#, c-format

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

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

2790

2242 -#: builtin/checkout.c:990

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

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

2791 +#: builtin/checkout.c:1009 builtin/gc.c:177

2792 +msgid "suppress progress reporting"

2793 +msgstr "undertryck förloppsrapportering"

2794

2246 -#: builtin/checkout.c:996

2247 -msgid "--track needs a branch name"

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

2795 +#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89

2796 +#: builtin/remote.c:169 builtin/remote.c:171

2797 +msgid "branch"

2798 +msgstr "gren"

2799

2250 -#: builtin/checkout.c:1003

2251 -msgid "Missing branch name; try -b"

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

2800 +#: builtin/checkout.c:1011

2801 +msgid "create and checkout a new branch"

2802 +msgstr "skapa och checka ut en ny gren"

2803

2254 -#: builtin/checkout.c:1009

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

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

2804 +#: builtin/checkout.c:1013

2805 +msgid "create/reset and checkout a branch"

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

2807

2258 -#: builtin/checkout.c:1011

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

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

2808 +#: builtin/checkout.c:1014

2809 +msgid "create reflog for new branch"

2810 +msgstr "skapa reflogg för ny gren"

2811 +

2812 +#: builtin/checkout.c:1015

2813 +msgid "detach the HEAD at named commit"

2814 +msgstr "koppla från HEAD vid namngiven incheckning"

2815 +

2816 +#: builtin/checkout.c:1016

2817 +msgid "set upstream info for new branch"

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

2819 +

2820 +#: builtin/checkout.c:1018

2821 +msgid "new branch"

2822 +msgstr "ny gren"

2823 +

2824 +#: builtin/checkout.c:1018

2825 +msgid "new unparented branch"

2826 +msgstr "ny gren utan förälder"

2827 +

2828 +#: builtin/checkout.c:1019

2829 +msgid "checkout our version for unmerged files"

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

2831

2832 #: builtin/checkout.c:1021

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

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

2833 +msgid "checkout their version for unmerged files"

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

2835 +

2836 +#: builtin/checkout.c:1023

2837 +msgid "force checkout (throw away local modifications)"

2838 +msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

2839 +

2840 +#: builtin/checkout.c:1024

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

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

2843

2266 -#: builtin/checkout.c:1055

2844 +#: builtin/checkout.c:1025 builtin/merge.c:215

2845 +msgid "update ignored files (default)"

2846 +msgstr "uppdatera ignorerade filer (standard)"

2847 +

2848 +#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241

2849 +msgid "style"

2850 +msgstr "stil"

2851 +

2852 +#: builtin/checkout.c:1027

2853 +msgid "conflict style (merge or diff3)"

2854 +msgstr "konfliktstil (merge eller diff3)"

2855 +

2856 +#: builtin/checkout.c:1030

2857 +msgid "second guess 'git checkout no-such-branch'"

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

2859 +

2860 +#: builtin/checkout.c:1054

2861 +msgid "-b, -B and --orphan are mutually exclusive"

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

2863 +

2864 +#: builtin/checkout.c:1071

2865 +msgid "--track needs a branch name"

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

2867 +

2868 +#: builtin/checkout.c:1078

2869 +msgid "Missing branch name; try -b"

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

2871 +

2872 +#: builtin/checkout.c:1113

2873 msgid "invalid path specification"

2874 msgstr "felaktig sökvägsangivelse"

2875

2270 -#: builtin/checkout.c:1063

2876 +#: builtin/checkout.c:1120

2877 #, c-format

2878 msgid ""

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

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

2880 "Did you intend to checkout '%s' which can not be resolved as commit?"

2881 msgstr ""

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

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

2278 -

2279 -#: builtin/checkout.c:1065

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

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

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

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

2884

2283 -#: builtin/checkout.c:1070

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

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

2885 +#: builtin/checkout.c:1125

2886 +#, c-format

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

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

2889

2287 -#: builtin/checkout.c:1073

2890 +#: builtin/checkout.c:1129

2891 msgid ""

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

2893 "checking out of the index."

@@ -2292,13 +2895,39 @@ msgstr ""

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

2896 "du checkar ut från indexet."

2897

2295 -#: builtin/checkout.c:1092

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

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

2898 +#: builtin/clean.c:19

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

2900 +msgstr ""

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

2902 +

2903 +#: builtin/clean.c:51

2904 +msgid "do not print names of files removed"

2905 +msgstr "skriv inte ut namn på borttagna filer"

2906 +

2907 +#: builtin/clean.c:53

2908 +msgid "force"

2909 +msgstr "tvinga"

2910

2299 -#: builtin/checkout.c:1095

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

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

2911 +#: builtin/clean.c:55

2912 +msgid "remove whole directories"

2913 +msgstr "ta bort hela kataloger"

2914 +

2915 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802

2916 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199

2917 +msgid "pattern"

2918 +msgstr "mönster"

2919 +

2920 +#: builtin/clean.c:57

2921 +msgid "add <pattern> to ignore rules"

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

2923 +

2924 +#: builtin/clean.c:58

2925 +msgid "remove ignored files, too"

2926 +msgstr "ta även bort ignorerade filer"

2927 +

2928 +#: builtin/clean.c:60

2929 +msgid "remove only ignored files"

2930 +msgstr "ta endast bort ignorerade filer"

2931

2932 #: builtin/clean.c:78

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

@@ -2344,20 +2973,113 @@ msgstr "Skulle inte ta bort %s\n"

2973 msgid "Not removing %s\n"

2974 msgstr "Tar inte bort %s\n"

2975

2347 -#: builtin/clone.c:243

2348 -#, c-format

2349 -msgid "reference repository '%s' is not a local directory."

2350 -msgstr "referensarkivet \"%s\" är inte en lokal katalog."

2976 +#: builtin/clone.c:36

2977 +msgid "git clone [options] [--] <repo> [<dir>]"

2978 +msgstr "git clone [flaggor] [--] <arkiv> [<kat>]"

2979

2352 -#: builtin/clone.c:306

2353 -#, c-format

2354 -msgid "failed to create directory '%s'"

2355 -msgstr "misslyckades skapa katalogen \"%s\""

2980 +#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

2981 +#: builtin/push.c:399

2982 +msgid "force progress reporting"

2983 +msgstr "tvinga förloppsrapportering"

2984

2357 -#: builtin/clone.c:308 builtin/diff.c:77

2358 -#, c-format

2359 -msgid "failed to stat '%s'"

2360 -msgstr "misslyckades ta status på \"%s\""

2985 +#: builtin/clone.c:66

2986 +msgid "don't create a checkout"

2987 +msgstr "skapa inte någon utcheckning"

2988 +

2989 +#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488

2990 +msgid "create a bare repository"

2991 +msgstr "skapa ett naket (\"bare\") arkiv"

2992 +

2993 +#: builtin/clone.c:72

2994 +msgid "create a mirror repository (implies bare)"

2995 +msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

2996 +

2997 +#: builtin/clone.c:74

2998 +msgid "to clone from a local repository"

2999 +msgstr "för att klona från ett lokalt arkiv"

3000 +

3001 +#: builtin/clone.c:76

3002 +msgid "don't use local hardlinks, always copy"

3003 +msgstr "skapa inte lokala hårda länkar, kopiera alltid"

3004 +

3005 +#: builtin/clone.c:78

3006 +msgid "setup as shared repository"

3007 +msgstr "skapa som ett delat arkiv"

3008 +

3009 +#: builtin/clone.c:80 builtin/clone.c:82

3010 +msgid "initialize submodules in the clone"

3011 +msgstr "initiera undermoduler i klonen"

3012 +

3013 +#: builtin/clone.c:83 builtin/init-db.c:485

3014 +msgid "template-directory"

3015 +msgstr "mallkatalog"

3016 +

3017 +#: builtin/clone.c:84 builtin/init-db.c:486

3018 +msgid "directory from which templates will be used"

3019 +msgstr "katalog att använda mallar från"

3020 +

3021 +#: builtin/clone.c:86

3022 +msgid "reference repository"

3023 +msgstr "referensarkiv"

3024 +

3025 +#: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44

3026 +msgid "name"

3027 +msgstr "namn"

3028 +

3029 +#: builtin/clone.c:88

3030 +msgid "use <name> instead of 'origin' to track upstream"

3031 +msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

3032 +

3033 +#: builtin/clone.c:90

3034 +msgid "checkout <branch> instead of the remote's HEAD"

3035 +msgstr "checka ut <gren> istället för fjärrens HEAD"

3036 +

3037 +#: builtin/clone.c:92

3038 +msgid "path to git-upload-pack on the remote"

3039 +msgstr "sökväg till git-upload-pack på fjärren"

3040 +

3041 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747

3042 +msgid "depth"

3043 +msgstr "djup"

3044 +

3045 +#: builtin/clone.c:94

3046 +msgid "create a shallow clone of that depth"

3047 +msgstr "skapa en grund klon på detta djup"

3048 +

3049 +#: builtin/clone.c:96

3050 +msgid "clone only one branch, HEAD or --branch"

3051 +msgstr "klona endast en gren, HEAD eller --branch"

3052 +

3053 +#: builtin/clone.c:97 builtin/init-db.c:494

3054 +msgid "gitdir"

3055 +msgstr "gitkat"

3056 +

3057 +#: builtin/clone.c:98 builtin/init-db.c:495

3058 +msgid "separate git dir from working tree"

3059 +msgstr "separera gitkatalogen från arbetskatalogen"

3060 +

3061 +#: builtin/clone.c:99

3062 +msgid "key=value"

3063 +msgstr "nyckel=värde"

3064 +

3065 +#: builtin/clone.c:100

3066 +msgid "set config inside the new repository"

3067 +msgstr "ställ in konfiguration i det nya arkivet"

3068 +

3069 +#: builtin/clone.c:243

3070 +#, c-format

3071 +msgid "reference repository '%s' is not a local directory."

3072 +msgstr "referensarkivet \"%s\" är inte en lokal katalog."

3073 +

3074 +#: builtin/clone.c:306

3075 +#, c-format

3076 +msgid "failed to create directory '%s'"

3077 +msgstr "misslyckades skapa katalogen \"%s\""

3078 +

3079 +#: builtin/clone.c:308 builtin/diff.c:77

3080 +#, c-format

3081 +msgid "failed to stat '%s'"

3082 +msgstr "misslyckades ta status på \"%s\""

3083

3084 #: builtin/clone.c:310

3085 #, c-format

@@ -2460,10 +3182,46 @@ msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

3182 msgid "You appear to have cloned an empty repository."

3183 msgstr "Du verkar ha klonat ett tomt arkiv."

3184

3185 +#: builtin/column.c:9

3186 +msgid "git column [options]"

3187 +msgstr "git column [flaggor]"

3188 +

3189 +#: builtin/column.c:26

3190 +msgid "lookup config vars"

3191 +msgstr "slå upp konfigurationsvariabler"

3192 +

3193 +#: builtin/column.c:27 builtin/column.c:28

3194 +msgid "layout to use"

3195 +msgstr "utseende att använda"

3196 +

3197 +#: builtin/column.c:29

3198 +msgid "Maximum width"

3199 +msgstr "Maximal bredd"

3200 +

3201 +#: builtin/column.c:30

3202 +msgid "Padding space on left border"

3203 +msgstr "Spaltfyllnad i vänsterkanten"

3204 +

3205 +#: builtin/column.c:31

3206 +msgid "Padding space on right border"

3207 +msgstr "Spaltfyllnad i högerkanten"

3208 +

3209 +#: builtin/column.c:32

3210 +msgid "Padding space between columns"

3211 +msgstr "Spaltfyllnad mellan spalter"

3212 +

3213 #: builtin/column.c:51

3214 msgid "--command must be the first argument"

3215 msgstr "--command måste vara första argument"

3216

3217 +#: builtin/commit.c:33

3218 +msgid "git commit [options] [--] <filepattern>..."

3219 +msgstr "git commit [flaggor] [--] <filmöster>..."

3220 +

3221 +#: builtin/commit.c:38

3222 +msgid "git status [options] [--] <filepattern>..."

3223 +msgstr "git status [flaggor] [--] <filmönster>..."

3224 +

3225 #: builtin/commit.c:43

3226 msgid ""

3227 "Your name and email address were configured automatically based\n"

@@ -2547,61 +3305,61 @@ msgstr "kan inte läsa indexet"

3305 msgid "unable to write temporary index file"

3306 msgstr "kunde inte skriva temporär indexfil"

3307

2550 -#: builtin/commit.c:496 builtin/commit.c:502

3308 +#: builtin/commit.c:510 builtin/commit.c:516

3309 #, c-format

3310 msgid "invalid commit: %s"

3311 msgstr "felaktig incheckning: %s"

3312

2555 -#: builtin/commit.c:525

3313 +#: builtin/commit.c:539

3314 msgid "malformed --author parameter"

3315 msgstr "felformad \"--author\"-flagga"

3316

2559 -#: builtin/commit.c:585

3317 +#: builtin/commit.c:600

3318 #, c-format

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

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

3321

2564 -#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970

3322 +#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985

3323 #, c-format

3324 msgid "could not lookup commit %s"

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

3326

2569 -#: builtin/commit.c:635 builtin/shortlog.c:296

3327 +#: builtin/commit.c:650 builtin/shortlog.c:296

3328 #, c-format

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

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

3331

2574 -#: builtin/commit.c:637

3332 +#: builtin/commit.c:652

3333 msgid "could not read log from standard input"

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

3335

2578 -#: builtin/commit.c:641

3336 +#: builtin/commit.c:656

3337 #, c-format

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

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

3340

2583 -#: builtin/commit.c:647

3341 +#: builtin/commit.c:662

3342 msgid "commit has empty message"

3343 msgstr "incheckningen har ett tomt meddelande"

3344

2587 -#: builtin/commit.c:663

3345 +#: builtin/commit.c:678

3346 msgid "could not read MERGE_MSG"

3347 msgstr "kunde inte läsa MERGE_MSG"

3348

2591 -#: builtin/commit.c:667

3349 +#: builtin/commit.c:682

3350 msgid "could not read SQUASH_MSG"

3351 msgstr "kunde inte läsa SQUASH_MSG"

3352

2595 -#: builtin/commit.c:671

3353 +#: builtin/commit.c:686

3354 #, c-format

3355 msgid "could not read '%s'"

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

3357

2600 -#: builtin/commit.c:723

3358 +#: builtin/commit.c:738

3359 msgid "could not write commit template"

3360 msgstr "kunde inte skriva incheckningsmall"

3361

2604 -#: builtin/commit.c:734

3362 +#: builtin/commit.c:749

3363 #, c-format

3364 msgid ""

3365 "\n"

@@ -2616,7 +3374,7 @@ msgstr ""

3374 "\t%s\n"

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

3376

2619 -#: builtin/commit.c:739

3377 +#: builtin/commit.c:754

3378 #, c-format

3379 msgid ""

3380 "\n"

@@ -2631,7 +3389,7 @@ msgstr ""

3389 "\t%s\n"

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

3391

2634 -#: builtin/commit.c:751

3392 +#: builtin/commit.c:766

3393 msgid ""

3394 "Please enter the commit message for your changes. Lines starting\n"

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

@@ -2639,7 +3397,7 @@ msgstr ""

3397 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

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

3399

2642 -#: builtin/commit.c:756

3400 +#: builtin/commit.c:771

3401 msgid ""

3402 "Please enter the commit message for your changes. Lines starting\n"

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

@@ -2649,159 +3407,349 @@ msgstr ""

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

3408 "Ett tomt meddelande avbryter incheckningen.\n"

3409

2652 -#: builtin/commit.c:769

3410 +#: builtin/commit.c:784

3411 #, c-format

3412 msgid "%sAuthor: %s"

3413 msgstr "%sFörfattare: %s"

3414

2657 -#: builtin/commit.c:776

3415 +#: builtin/commit.c:791

3416 #, c-format

3417 msgid "%sCommitter: %s"

3418 msgstr "%sIncheckare: %s"

3419

2662 -#: builtin/commit.c:796

3420 +#: builtin/commit.c:811

3421 msgid "Cannot read index"

3422 msgstr "Kan inte läsa indexet"

3423

2666 -#: builtin/commit.c:833

3424 +#: builtin/commit.c:848

3425 msgid "Error building trees"

3426 msgstr "Fel vid byggande av träd"

3427

2670 -#: builtin/commit.c:848 builtin/tag.c:361

3428 +#: builtin/commit.c:863 builtin/tag.c:361

3429 #, c-format

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

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

3432

2675 -#: builtin/commit.c:945

3433 +#: builtin/commit.c:960

3434 #, c-format

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

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

3437

2680 -#: builtin/commit.c:960 builtin/commit.c:1160

3438 +#: builtin/commit.c:975 builtin/commit.c:1175

3439 #, c-format

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

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

3442

2685 -#: builtin/commit.c:1000

3443 +#: builtin/commit.c:1015

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

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

3446

2689 -#: builtin/commit.c:1011

3447 +#: builtin/commit.c:1026

3448 msgid "You have nothing to amend."

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

3450

2693 -#: builtin/commit.c:1014

3451 +#: builtin/commit.c:1029

3452 msgid "You are in the middle of a merge -- cannot amend."

3453 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

3454

2697 -#: builtin/commit.c:1016

3455 +#: builtin/commit.c:1031

3456 msgid "You are in the middle of a cherry-pick -- cannot amend."

3457 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

3458

2701 -#: builtin/commit.c:1019

3459 +#: builtin/commit.c:1034

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

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

3462

2705 -#: builtin/commit.c:1029

3463 +#: builtin/commit.c:1044

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

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

3466

2709 -#: builtin/commit.c:1031

3467 +#: builtin/commit.c:1046

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

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

3470

2713 -#: builtin/commit.c:1039

3471 +#: builtin/commit.c:1054

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

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

3474

2717 -#: builtin/commit.c:1056

3475 +#: builtin/commit.c:1071

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

3477 msgstr ""

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

3479

2722 -#: builtin/commit.c:1058

3480 +#: builtin/commit.c:1073

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

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

3483

2726 -#: builtin/commit.c:1060

3484 +#: builtin/commit.c:1075

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

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

3487

2730 -#: builtin/commit.c:1062

3488 +#: builtin/commit.c:1077

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

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

3491

2734 -#: builtin/commit.c:1072 builtin/tag.c:577

3492 +#: builtin/commit.c:1087 builtin/tag.c:577

3493 #, c-format

3494 msgid "Invalid cleanup mode %s"

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

3496

2739 -#: builtin/commit.c:1077

3497 +#: builtin/commit.c:1092

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

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

3500

2743 -#: builtin/commit.c:1260

3501 +#: builtin/commit.c:1189 builtin/commit.c:1417

3502 +msgid "show status concisely"

3503 +msgstr "vis koncis status"

3504 +

3505 +#: builtin/commit.c:1191 builtin/commit.c:1419

3506 +msgid "show branch information"

3507 +msgstr "visa information om gren"

3508 +

3509 +#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389

3510 +msgid "machine-readable output"

3511 +msgstr "maskinläsbar utdata"

3512 +

3513 +#: builtin/commit.c:1196 builtin/commit.c:1423

3514 +msgid "terminate entries with NUL"

3515 +msgstr "terminera poster med NUL"

3516 +

3517 +#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636

3518 +#: builtin/fast-export.c:639 builtin/tag.c:461

3519 +msgid "mode"

3520 +msgstr "läge"

3521 +

3522 +#: builtin/commit.c:1199 builtin/commit.c:1426

3523 +msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3524 +msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

3525 +

3526 +#: builtin/commit.c:1202

3527 +msgid "show ignored files"

3528 +msgstr "visa ignorerade filer"

3529 +

3530 +#: builtin/commit.c:1203 parse-options.h:151

3531 +msgid "when"

3532 +msgstr "när"

3533 +

3534 +#: builtin/commit.c:1204

3535 +msgid ""

3536 +"ignore changes to submodules, optional when: all, dirty, untracked. "

3537 +"(Default: all)"

3538 +msgstr ""

3539 +"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

3540 +"(Default: all)"

3541 +

3542 +#: builtin/commit.c:1206

3543 +msgid "list untracked files in columns"

3544 +msgstr "visa ospårade filer i spalter"

3545 +

3546 +#: builtin/commit.c:1275

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

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

3549

2747 -#: builtin/commit.c:1262

3550 +#: builtin/commit.c:1277

3551 msgid "could not parse newly created commit"

3552 msgstr "kunde inte tolka en precis skapad incheckning"

3553

2751 -#: builtin/commit.c:1303

3554 +#: builtin/commit.c:1318

3555 msgid "detached HEAD"

3556 msgstr "frånkopplad HEAD"

3557

2755 -#: builtin/commit.c:1305

3558 +#: builtin/commit.c:1320

3559 msgid " (root-commit)"

3560 msgstr " (rotincheckning)"

3561

2759 -#: builtin/commit.c:1449

3562 +#: builtin/commit.c:1387

3563 +msgid "suppress summary after successful commit"

3564 +msgstr "undertryck sammanfattning efter framgångsrik incheckning"

3565 +

3566 +#: builtin/commit.c:1388

3567 +msgid "show diff in commit message template"

3568 +msgstr "visa diff i mallen för incheckningsmeddelandet"

3569 +

3570 +#: builtin/commit.c:1390

3571 +msgid "Commit message options"

3572 +msgstr "Alternativ för incheckningsmeddelande"

3573 +

3574 +#: builtin/commit.c:1391 builtin/tag.c:459

3575 +msgid "read message from file"

3576 +msgstr "läs meddelande från fil"

3577 +

3578 +#: builtin/commit.c:1392

3579 +msgid "author"

3580 +msgstr "författare"

3581 +

3582 +#: builtin/commit.c:1392

3583 +msgid "override author for commit"

3584 +msgstr "överstyr författare för incheckningen"

3585 +

3586 +#: builtin/commit.c:1393 builtin/gc.c:178

3587 +msgid "date"

3588 +msgstr "datum"

3589 +

3590 +#: builtin/commit.c:1393

3591 +msgid "override date for commit"

3592 +msgstr "överstyr datum för inchecknignen"

3593 +

3594 +#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534

3595 +#: builtin/notes.c:691 builtin/tag.c:457

3596 +msgid "message"

3597 +msgstr "meddelande"

3598 +

3599 +#: builtin/commit.c:1394

3600 +msgid "commit message"

3601 +msgstr "incheckningsmeddelande"

3602 +

3603 +#: builtin/commit.c:1395

3604 +msgid "reuse and edit message from specified commit"

3605 +msgstr "återanvänd och redigera meddelande från angiven incheckning"

3606 +

3607 +#: builtin/commit.c:1396

3608 +msgid "reuse message from specified commit"

3609 +msgstr "återanvänd meddelande från angiven incheckning"

3610 +

3611 +#: builtin/commit.c:1397

3612 +msgid "use autosquash formatted message to fixup specified commit"

3613 +msgstr ""

3614 +"använd autosquash-formaterat meddelande för att fixa angiven incheckning"

3615 +

3616 +#: builtin/commit.c:1398

3617 +msgid "use autosquash formatted message to squash specified commit"

3618 +msgstr ""

3619 +"använd autosquash-formaterat meddelande för att slå ihop med angiven "

3620 +"incheckning"

3621 +

3622 +#: builtin/commit.c:1399

3623 +msgid "the commit is authored by me now (used with -C/-c/--amend)"

3624 +msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

3625 +

3626 +#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109

3627 +msgid "add Signed-off-by:"

3628 +msgstr "lägg till Signed-off-by:"

3629 +

3630 +#: builtin/commit.c:1401

3631 +msgid "use specified template file"

3632 +msgstr "använd angiven mallfil"

3633 +

3634 +#: builtin/commit.c:1402

3635 +msgid "force edit of commit"

3636 +msgstr "tvinga redigering av incheckning"

3637 +

3638 +#: builtin/commit.c:1403

3639 +msgid "default"

3640 +msgstr "standard"

3641 +

3642 +#: builtin/commit.c:1403 builtin/tag.c:462

3643 +msgid "how to strip spaces and #comments from message"

3644 +msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

3645 +

3646 +#: builtin/commit.c:1404

3647 +msgid "include status in commit message template"

3648 +msgstr "inkludera status i mallen för incheckningsmeddelandet"

3649 +

3650 +#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463

3651 +msgid "key id"

3652 +msgstr "nyckel-id"

3653 +

3654 +#: builtin/commit.c:1406 builtin/merge.c:214

3655 +msgid "GPG sign commit"

3656 +msgstr "GPG-signera incheckning"

3657 +

3658 +#. end commit message options

3659 +#: builtin/commit.c:1409

3660 +msgid "Commit contents options"

3661 +msgstr "Alternativ för incheckningens innehåll"

3662 +

3663 +#: builtin/commit.c:1410

3664 +msgid "commit all changed files"

3665 +msgstr "checka in alla ändrade filer"

3666 +

3667 +#: builtin/commit.c:1411

3668 +msgid "add specified files to index for commit"

3669 +msgstr "lägg till angivna filer till indexet för incheckning"

3670 +

3671 +#: builtin/commit.c:1412

3672 +msgid "interactively add files"

3673 +msgstr "lägg till filer interaktivt"

3674 +

3675 +#: builtin/commit.c:1413

3676 +msgid "interactively add changes"

3677 +msgstr "lägg till ändringar interaktivt"

3678 +

3679 +#: builtin/commit.c:1414

3680 +msgid "commit only specified files"

3681 +msgstr "checka endast in angivna filer"

3682 +

3683 +#: builtin/commit.c:1415

3684 +msgid "bypass pre-commit hook"

3685 +msgstr "förbigå pre-commit-krok"

3686 +

3687 +#: builtin/commit.c:1416

3688 +msgid "show what would be committed"

3689 +msgstr "visa vad som skulle checkas in"

3690 +

3691 +#: builtin/commit.c:1424

3692 +msgid "amend previous commit"

3693 +msgstr "lägg till föregående incheckning"

3694 +

3695 +#: builtin/commit.c:1425

3696 +msgid "bypass post-rewrite hook"

3697 +msgstr "förbigå post-rewrite-krok"

3698 +

3699 +#: builtin/commit.c:1430

3700 +msgid "ok to record an empty change"

3701 +msgstr "ok att registrera en tom ändring"

3702 +

3703 +#: builtin/commit.c:1433

3704 +msgid "ok to record a change with an empty message"

3705 +msgstr "ok att registrera en ändring med tomt meddelande"

3706 +

3707 +#: builtin/commit.c:1464

3708 msgid "could not parse HEAD commit"

3709 msgstr "kunde inte tolka HEAD:s incheckning"

3710

2763 -#: builtin/commit.c:1487 builtin/merge.c:508

3711 +#: builtin/commit.c:1502 builtin/merge.c:508

3712 #, c-format

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

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

3715

2768 -#: builtin/commit.c:1494

3716 +#: builtin/commit.c:1509

3717 #, c-format

3718 msgid "Corrupt MERGE_HEAD file (%s)"

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

3720

2773 -#: builtin/commit.c:1501

3721 +#: builtin/commit.c:1516

3722 msgid "could not read MERGE_MODE"

3723 msgstr "kunde inte läsa MERGE_MODE"

3724

2777 -#: builtin/commit.c:1520

3725 +#: builtin/commit.c:1535

3726 #, c-format

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

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

3729

2782 -#: builtin/commit.c:1534

3730 +#: builtin/commit.c:1549

3731 #, c-format

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

3733 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

3734

2787 -#: builtin/commit.c:1539

3735 +#: builtin/commit.c:1554

3736 #, c-format

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

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

3739

2792 -#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960

3740 +#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960

3741 msgid "failed to write commit object"

3742 msgstr "kunde inte skriva incheckningsobjekt"

3743

2796 -#: builtin/commit.c:1575

3744 +#: builtin/commit.c:1590

3745 msgid "cannot lock HEAD ref"

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

3747

2800 -#: builtin/commit.c:1579

3748 +#: builtin/commit.c:1594

3749 msgid "cannot update HEAD ref"

3750 msgstr "kunde inte uppdatera HEAD-referens"

3751

2804 -#: builtin/commit.c:1590

3752 +#: builtin/commit.c:1605

3753 msgid ""

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

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

@@ -2812,6 +3760,134 @@ msgstr ""

3760 "att kvoten inte har överskridits, och kör sedan\n"

3761 "\"git reset HEAD\" för att återställa."

3762

3763 +#: builtin/config.c:7

3764 +msgid "git config [options]"

3765 +msgstr "git config [flaggor]"

3766 +

3767 +#: builtin/config.c:52

3768 +msgid "Config file location"

3769 +msgstr "Konfigurationsfilens plats"

3770 +

3771 +#: builtin/config.c:53

3772 +msgid "use global config file"

3773 +msgstr "använd global konfigurationsfil"

3774 +

3775 +#: builtin/config.c:54

3776 +msgid "use system config file"

3777 +msgstr "använd systemets konfigurationsfil"

3778 +

3779 +#: builtin/config.c:55

3780 +msgid "use repository config file"

3781 +msgstr "använd arkivets konfigurationsfil"

3782 +

3783 +#: builtin/config.c:56

3784 +msgid "use given config file"

3785 +msgstr "använd angiven konfigurationsil"

3786 +

3787 +#: builtin/config.c:57

3788 +msgid "Action"

3789 +msgstr "Åtgärd"

3790 +

3791 +#: builtin/config.c:58

3792 +msgid "get value: name [value-regex]"

3793 +msgstr "hämta värde: namn [värde-reguttr]"

3794 +

3795 +#: builtin/config.c:59

3796 +msgid "get all values: key [value-regex]"

3797 +msgstr "hämta alla värden: nyckel [värde-reguttr]"

3798 +

3799 +#: builtin/config.c:60

3800 +msgid "get values for regexp: name-regex [value-regex]"

3801 +msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"

3802 +

3803 +#: builtin/config.c:61

3804 +msgid "replace all matching variables: name value [value_regex]"

3805 +msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"

3806 +

3807 +#: builtin/config.c:62

3808 +msgid "add a new variable: name value"

3809 +msgstr "lägg till en ny variabel: namn värde"

3810 +

3811 +#: builtin/config.c:63

3812 +msgid "remove a variable: name [value-regex]"

3813 +msgstr "ta bort en variabel: namn [värde-reguttr]"

3814 +

3815 +#: builtin/config.c:64

3816 +msgid "remove all matches: name [value-regex]"

3817 +msgstr "ta bort alla träffar: namn [värde-reguttr]"

3818 +

3819 +#: builtin/config.c:65

3820 +msgid "rename section: old-name new-name"

3821 +msgstr "byt namn på sektion: gammalt-namn nytt-namn"

3822 +

3823 +#: builtin/config.c:66

3824 +msgid "remove a section: name"

3825 +msgstr "ta bort en sektion: namn"

3826 +

3827 +#: builtin/config.c:67

3828 +msgid "list all"

3829 +msgstr "visa alla"

3830 +

3831 +#: builtin/config.c:68

3832 +msgid "open an editor"

3833 +msgstr "öppna textredigeringsprogram"

3834 +

3835 +#: builtin/config.c:69 builtin/config.c:70

3836 +msgid "slot"

3837 +msgstr "plats"

3838 +

3839 +#: builtin/config.c:69

3840 +msgid "find the color configured: [default]"

3841 +msgstr "hitta den inställda färgen: [default]"

3842 +

3843 +#: builtin/config.c:70

3844 +msgid "find the color setting: [stdout-is-tty]"

3845 +msgstr "hitta färginställningen: [stdout-is-tty]"

3846 +

3847 +#: builtin/config.c:71

3848 +msgid "Type"

3849 +msgstr "Typ"

3850 +

3851 +#: builtin/config.c:72

3852 +msgid "value is \"true\" or \"false\""

3853 +msgstr "värdet är \"true\" eller \"false\""

3854 +

3855 +#: builtin/config.c:73

3856 +msgid "value is decimal number"

3857 +msgstr "värdet är ett decimalt tal"

3858 +

3859 +#: builtin/config.c:74

3860 +msgid "value is --bool or --int"

3861 +msgstr "värdet är --bool eller --int"

3862 +

3863 +#: builtin/config.c:75

3864 +msgid "value is a path (file or directory name)"

3865 +msgstr "värdet är en sökväg (fil- eller katalognamn)"

3866 +

3867 +#: builtin/config.c:76

3868 +msgid "Other"

3869 +msgstr "Andra"

3870 +

3871 +#: builtin/config.c:77

3872 +msgid "terminate values with NUL byte"

3873 +msgstr "terminera värden med NUL-byte"

3874 +

3875 +#: builtin/config.c:78

3876 +msgid "respect include directives on lookup"

3877 +msgstr "respektera inkluderingsdirektiv vid uppslag"

3878 +

3879 +#: builtin/count-objects.c:69

3880 +msgid "git count-objects [-v]"

3881 +msgstr "git count-objects [-v]"

3882 +

3883 +#: builtin/describe.c:15

3884 +msgid "git describe [options] <committish>*"

3885 +msgstr "git describe [flaggor] <incheckning-igt>*"

3886 +

3887 +#: builtin/describe.c:16

3888 +msgid "git describe [options] --dirty"

3889 +msgstr "git describe [flaggor] --dirty"

3890 +

3891 #: builtin/describe.c:234

3892 #, c-format

3893 msgid "annotated tag %s not available"

@@ -2884,6 +3960,50 @@ msgstr ""

3960 "mer än %i taggar hittades; listar de %i senaste\n"

3961 "gav upp sökningen vid %s\n"

3962

3963 +#: builtin/describe.c:403

3964 +msgid "find the tag that comes after the commit"

3965 +msgstr "hitta taggen som kommer efter incheckningen"

3966 +

3967 +#: builtin/describe.c:404

3968 +msgid "debug search strategy on stderr"

3969 +msgstr "felsök sökstrategin på standard fel"

3970 +

3971 +#: builtin/describe.c:405

3972 +msgid "use any ref in .git/refs"

3973 +msgstr "använd alla referenser i .git/refs"

3974 +

3975 +#: builtin/describe.c:406

3976 +msgid "use any tag in .git/refs/tags"

3977 +msgstr "använd alla taggar i .git/refs/tags"

3978 +

3979 +#: builtin/describe.c:407

3980 +msgid "always use long format"

3981 +msgstr "använd alltid långt format"

3982 +

3983 +#: builtin/describe.c:410

3984 +msgid "only output exact matches"

3985 +msgstr "skriv endast ut exakta träffar"

3986 +

3987 +#: builtin/describe.c:412

3988 +msgid "consider <n> most recent tags (default: 10)"

3989 +msgstr "överväg de <n> nyaste taggarna (standard: 10)"

3990 +

3991 +#: builtin/describe.c:414

3992 +msgid "only consider tags matching <pattern>"

3993 +msgstr "överväg endast taggar som motsvarar <mönster>"

3994 +

3995 +#: builtin/describe.c:416 builtin/name-rev.c:238

3996 +msgid "show abbreviated commit object as fallback"

3997 +msgstr "visa förkortade incheckningsobjekt som standard"

3998 +

3999 +#: builtin/describe.c:417

4000 +msgid "mark"

4001 +msgstr "märke"

4002 +

4003 +#: builtin/describe.c:418

4004 +msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4005 +msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

4006 +

4007 #: builtin/describe.c:436

4008 msgid "--long is incompatible with --abbrev=0"

4009 msgstr "--long är inkompatibel med --abbrev=0"

@@ -2930,76 +4050,196 @@ msgstr "mer än två blobbar angavs: \"%s\""

4050 msgid "unhandled object '%s' given."

4051 msgstr "ej hanterat objekt \"%s\" angavs."

4052

2933 -#: builtin/fetch.c:200

4053 +#: builtin/fast-export.c:22

4054 +msgid "git fast-export [rev-list-opts]"

4055 +msgstr "git fast-export [rev-list-flaggor]"

4056 +

4057 +#: builtin/fast-export.c:635

4058 +msgid "show progress after <n> objects"

4059 +msgstr "visa förlopp efter <n> objekt"

4060 +

4061 +#: builtin/fast-export.c:637

4062 +msgid "select handling of signed tags"

4063 +msgstr "välj hantering av signerade taggar"

4064 +

4065 +#: builtin/fast-export.c:640

4066 +msgid "select handling of tags that tag filtered objects"

4067 +msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4068 +

4069 +#: builtin/fast-export.c:643

4070 +msgid "Dump marks to this file"

4071 +msgstr "Dump märken till filen"

4072 +

4073 +#: builtin/fast-export.c:645

4074 +msgid "Import marks from this file"

4075 +msgstr "Importera märken från filen"

4076 +

4077 +#: builtin/fast-export.c:647

4078 +msgid "Fake a tagger when tags lack one"

4079 +msgstr "Fejka taggare när taggen saknar en"

4080 +

4081 +#: builtin/fast-export.c:649

4082 +msgid "Output full tree for each commit"

4083 +msgstr "Skriv ut hela trädet för varje incheckning"

4084 +

4085 +#: builtin/fast-export.c:651

4086 +msgid "Use the done feature to terminate the stream"

4087 +msgstr "Använd done-funktionen för att avsluta strömmen"

4088 +

4089 +#: builtin/fast-export.c:652

4090 +msgid "Skip output of blob data"

4091 +msgstr "Hoppa över skrivning av blob-data"

4092 +

4093 +#: builtin/fetch.c:20

4094 +msgid "git fetch [<options>] [<repository> [<refspec>...]]"

4095 +msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

4096 +

4097 +#: builtin/fetch.c:21

4098 +msgid "git fetch [<options>] <group>"

4099 +msgstr "git fetch [<flaggor>] <grupp>"

4100 +

4101 +#: builtin/fetch.c:22

4102 +msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"

4103 +msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

4104 +

4105 +#: builtin/fetch.c:23

4106 +msgid "git fetch --all [<options>]"

4107 +msgstr "git fetch --all [<flaggor>]"

4108 +

4109 +#: builtin/fetch.c:60

4110 +msgid "fetch from all remotes"

4111 +msgstr "hämta från alla fjärrar"

4112 +

4113 +#: builtin/fetch.c:62

4114 +msgid "append to .git/FETCH_HEAD instead of overwriting"

4115 +msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

4116 +

4117 +#: builtin/fetch.c:64

4118 +msgid "path to upload pack on remote end"

4119 +msgstr "sökväg till upload pack på fjärren"

4120 +

4121 +#: builtin/fetch.c:65

4122 +msgid "force overwrite of local branch"

4123 +msgstr "tvinga överskrivning av lokal gren"

4124 +

4125 +#: builtin/fetch.c:67

4126 +msgid "fetch from multiple remotes"

4127 +msgstr "hämta från flera fjärrar"

4128 +

4129 +#: builtin/fetch.c:69

4130 +msgid "fetch all tags and associated objects"

4131 +msgstr "hämta alla taggar och associerade objekt"

4132 +

4133 +#: builtin/fetch.c:71

4134 +msgid "do not fetch all tags (--no-tags)"

4135 +msgstr "hämta inte alla taggar (--no-tags)"

4136 +

4137 +#: builtin/fetch.c:73

4138 +msgid "prune remote-tracking branches no longer on remote"

4139 +msgstr "rensa fjärrspårande grenar ej längre på fjärren"

4140 +

4141 +#: builtin/fetch.c:74

4142 +msgid "on-demand"

4143 +msgstr "on-demand"

4144 +

4145 +#: builtin/fetch.c:75

4146 +msgid "control recursive fetching of submodules"

4147 +msgstr "styr rekursiv hämtning av undermoduler"

4148 +

4149 +#: builtin/fetch.c:79

4150 +msgid "keep downloaded pack"

4151 +msgstr "behåll hämtade paket"

4152 +

4153 +#: builtin/fetch.c:81

4154 +msgid "allow updating of HEAD ref"

4155 +msgstr "tillåt uppdatering av HEAD-referens"

4156 +

4157 +#: builtin/fetch.c:84

4158 +msgid "deepen history of shallow clone"

4159 +msgstr "fördjupa historik för grund klon"

4160 +

4161 +#: builtin/fetch.c:85 builtin/log.c:1083

4162 +msgid "dir"

4163 +msgstr "kat"

4164 +

4165 +#: builtin/fetch.c:86

4166 +msgid "prepend this to submodule path output"

4167 +msgstr "lägg till i början av undermodulens sökvägsutdata"

4168 +

4169 +#: builtin/fetch.c:89

4170 +msgid "default mode for recursion"

4171 +msgstr "standardläge för rekursion"

4172 +

4173 +#: builtin/fetch.c:201

4174 msgid "Couldn't find remote ref HEAD"

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

4176

2937 -#: builtin/fetch.c:253

4177 +#: builtin/fetch.c:254

4178 #, c-format

4179 msgid "object %s not found"

4180 msgstr "objektet %s hittades inte"

4181

2942 -#: builtin/fetch.c:259

4182 +#: builtin/fetch.c:260

4183 msgid "[up to date]"

4184 msgstr "[àjour]"

4185

2946 -#: builtin/fetch.c:273

4186 +#: builtin/fetch.c:274

4187 #, c-format

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

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

4190

2951 -#: builtin/fetch.c:274 builtin/fetch.c:360

4191 +#: builtin/fetch.c:275 builtin/fetch.c:361

4192 msgid "[rejected]"

4193 msgstr "[refuserad]"

4194

2955 -#: builtin/fetch.c:285

4195 +#: builtin/fetch.c:286

4196 msgid "[tag update]"

4197 msgstr "[uppdaterad tagg]"

4198

2959 -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4199 +#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341

4200 msgid " (unable to update local ref)"

4201 msgstr " (kunde inte uppdatera lokal ref)"

4202

2963 -#: builtin/fetch.c:305

4203 +#: builtin/fetch.c:306

4204 msgid "[new tag]"

4205 msgstr "[ny tagg]"

4206

2967 -#: builtin/fetch.c:308

4207 +#: builtin/fetch.c:309

4208 msgid "[new branch]"

4209 msgstr "[ny gren]"

4210

2971 -#: builtin/fetch.c:311

4211 +#: builtin/fetch.c:312

4212 msgid "[new ref]"

4213 msgstr "[ny ref]"

4214

2975 -#: builtin/fetch.c:356

4215 +#: builtin/fetch.c:357

4216 msgid "unable to update local ref"

4217 msgstr "kunde inte uppdatera lokal ref"

4218

2979 -#: builtin/fetch.c:356

4219 +#: builtin/fetch.c:357

4220 msgid "forced update"

4221 msgstr "tvingad uppdatering"

4222

2983 -#: builtin/fetch.c:362

4223 +#: builtin/fetch.c:363

4224 msgid "(non-fast-forward)"

4225 msgstr "(ej snabbspolad)"

4226

2987 -#: builtin/fetch.c:393 builtin/fetch.c:685

4227 +#: builtin/fetch.c:394 builtin/fetch.c:686

4228 #, c-format

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

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

4231

2992 -#: builtin/fetch.c:402

4232 +#: builtin/fetch.c:403

4233 #, c-format

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

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

4236

2997 -#: builtin/fetch.c:488

4237 +#: builtin/fetch.c:489

4238 #, c-format

4239 msgid "From %.*s\n"

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

4241

3002 -#: builtin/fetch.c:499

4242 +#: builtin/fetch.c:500

4243 #, c-format

4244 msgid ""

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

@@ -3008,55 +4248,55 @@ msgstr ""

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

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

4250

3011 -#: builtin/fetch.c:549

4251 +#: builtin/fetch.c:550

4252 #, c-format

4253 msgid " (%s will become dangling)"

4254 msgstr " (%s kommer bli dinglande)"

4255

3016 -#: builtin/fetch.c:550

4256 +#: builtin/fetch.c:551

4257 #, c-format

4258 msgid " (%s has become dangling)"

4259 msgstr " (%s har blivit dinglande)"

4260

3021 -#: builtin/fetch.c:557

4261 +#: builtin/fetch.c:558

4262 msgid "[deleted]"

4263 msgstr "[borttagen]"

4264

3025 -#: builtin/fetch.c:558 builtin/remote.c:1055

4265 +#: builtin/fetch.c:559 builtin/remote.c:1055

4266 msgid "(none)"

4267 msgstr "(ingen)"

4268

3029 -#: builtin/fetch.c:675

4269 +#: builtin/fetch.c:676

4270 #, c-format

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

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

4273

3034 -#: builtin/fetch.c:709

4274 +#: builtin/fetch.c:710

4275 #, c-format

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

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

4278

3039 -#: builtin/fetch.c:786

4279 +#: builtin/fetch.c:787

4280 #, c-format

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

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

4283

3044 -#: builtin/fetch.c:789

4284 +#: builtin/fetch.c:790

4285 #, c-format

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

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

4288

3049 -#: builtin/fetch.c:888

4289 +#: builtin/fetch.c:892

4290 #, c-format

4291 msgid "Fetching %s\n"

4292 msgstr "Hämtar %s\n"

4293

3054 -#: builtin/fetch.c:890 builtin/remote.c:100

4294 +#: builtin/fetch.c:894 builtin/remote.c:100

4295 #, c-format

4296 msgid "Could not fetch %s"

4297 msgstr "Kunde inte hämta %s"

4298

3059 -#: builtin/fetch.c:907

4299 +#: builtin/fetch.c:913

4300 msgid ""

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

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

@@ -3064,27 +4304,146 @@ msgstr ""

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

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

4306

3067 -#: builtin/fetch.c:927

4307 +#: builtin/fetch.c:933

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

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

4310

3071 -#: builtin/fetch.c:979

4311 +#: builtin/fetch.c:985

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

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

4314

3075 -#: builtin/fetch.c:981

4315 +#: builtin/fetch.c:987

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

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

4318

3079 -#: builtin/fetch.c:992

4319 +#: builtin/fetch.c:998

4320 #, c-format

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

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

4323

3084 -#: builtin/fetch.c:1000

4324 +#: builtin/fetch.c:1006

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

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

4327

4328 +#: builtin/fmt-merge-msg.c:13

4329 +msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4330 +msgstr ""

4331 +"git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

4332 +

4333 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786

4334 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4335 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4336 +msgid "n"

4337 +msgstr "n"

4338 +

4339 +#: builtin/fmt-merge-msg.c:654

4340 +msgid "populate log with at most <n> entries from shortlog"

4341 +msgstr "fyll i loggen med som mest <n> poster från shortlog"

4342 +

4343 +#: builtin/fmt-merge-msg.c:657

4344 +msgid "alias for --log (deprecated)"

4345 +msgstr "alias för --log (avråds)"

4346 +

4347 +#: builtin/fmt-merge-msg.c:660

4348 +msgid "text"

4349 +msgstr "text"

4350 +

4351 +#: builtin/fmt-merge-msg.c:661

4352 +msgid "use <text> as start of message"

4353 +msgstr "inled meddelande med <text>"

4354 +

4355 +#: builtin/fmt-merge-msg.c:662

4356 +msgid "file to read from"

4357 +msgstr "fil att läsa från"

4358 +

4359 +#: builtin/for-each-ref.c:979

4360 +msgid "git for-each-ref [options] [<pattern>]"

4361 +msgstr "git for-each-ref [flaggor] [<mönster>]"

4362 +

4363 +#: builtin/for-each-ref.c:994

4364 +msgid "quote placeholders suitably for shells"

4365 +msgstr "citera platshållare passande för skal"

4366 +

4367 +#: builtin/for-each-ref.c:996

4368 +msgid "quote placeholders suitably for perl"

4369 +msgstr "citera platshållare passande för perl"

4370 +

4371 +#: builtin/for-each-ref.c:998

4372 +msgid "quote placeholders suitably for python"

4373 +msgstr "citera platshållare passande för python"

4374 +

4375 +#: builtin/for-each-ref.c:1000

4376 +msgid "quote placeholders suitably for tcl"

4377 +msgstr "citera platshållare passande för tcl"

4378 +

4379 +#: builtin/for-each-ref.c:1003

4380 +msgid "show only <n> matched refs"

4381 +msgstr "visa endast <n> träffade refs"

4382 +

4383 +#: builtin/for-each-ref.c:1004

4384 +msgid "format"

4385 +msgstr "format"

4386 +

4387 +#: builtin/for-each-ref.c:1004

4388 +msgid "format to use for the output"

4389 +msgstr "format att använda för utdata"

4390 +

4391 +#: builtin/for-each-ref.c:1005

4392 +msgid "key"

4393 +msgstr "nyckel"

4394 +

4395 +#: builtin/for-each-ref.c:1006

4396 +msgid "field name to sort on"

4397 +msgstr "fältnamn att sortera på"

4398 +

4399 +#: builtin/fsck.c:608

4400 +msgid "git fsck [options] [<object>...]"

4401 +msgstr "git fsck [flaggor] [<objekt>...]"

4402 +

4403 +#: builtin/fsck.c:614

4404 +msgid "show unreachable objects"

4405 +msgstr "visa onåbara objekt"

4406 +

4407 +#: builtin/fsck.c:615

4408 +msgid "show dangling objects"

4409 +msgstr "visa dinglande objekt"

4410 +

4411 +#: builtin/fsck.c:616

4412 +msgid "report tags"

4413 +msgstr "rapportera taggar"

4414 +

4415 +#: builtin/fsck.c:617

4416 +msgid "report root nodes"

4417 +msgstr "rapportera rotnoder"

4418 +

4419 +#: builtin/fsck.c:618

4420 +msgid "make index objects head nodes"

4421 +msgstr "gör indexojekt till huvudnoder"

4422 +

4423 +#: builtin/fsck.c:619

4424 +msgid "make reflogs head nodes (default)"

4425 +msgstr "gör refloggar till huvudnoder (standard)"

4426 +

4427 +#: builtin/fsck.c:620

4428 +msgid "also consider packs and alternate objects"

4429 +msgstr "ta även hänsyn till paket och alternativa objekt"

4430 +

4431 +#: builtin/fsck.c:621

4432 +msgid "enable more strict checking"

4433 +msgstr "aktivera striktare kontroll"

4434 +

4435 +#: builtin/fsck.c:623

4436 +msgid "write dangling objects in .git/lost-found"

4437 +msgstr "skriv dinglande objekt i .git/lost-found"

4438 +

4439 +#: builtin/fsck.c:624 builtin/prune.c:134

4440 +msgid "show progress"

4441 +msgstr "visa förlopp"

4442 +

4443 +#: builtin/gc.c:22

4444 +msgid "git gc [options]"

4445 +msgstr "git gc [flaggor]"

4446 +

4447 #: builtin/gc.c:63

4448 #, c-format

4449 msgid "Invalid %s: '%s'"

@@ -3095,6 +4454,18 @@ msgstr "Felaktigt %s: \"%s\""

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

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

4456

4457 +#: builtin/gc.c:179

4458 +msgid "prune unreferenced objects"

4459 +msgstr "rensa ej refererade objekt"

4460 +

4461 +#: builtin/gc.c:181

4462 +msgid "be more thorough (increased runtime)"

4463 +msgstr "var mer grundlig (ökar körtiden)"

4464 +

4465 +#: builtin/gc.c:182

4466 +msgid "enable auto-gc mode"

4467 +msgstr "aktivera auto-gc-läge"

4468 +

4469 #: builtin/gc.c:221

4470 #, c-format

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

@@ -3116,6 +4487,10 @@ msgstr ""

4487 "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "

4488 "dem."

4489

4490 +#: builtin/grep.c:22

4491 +msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

4492 +msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

4493 +

4494 #: builtin/grep.c:216

4495 #, c-format

4496 msgid "grep: failed to create thread: %s"

@@ -3146,6 +4521,171 @@ msgstr "flaggan \"%c\" antar ett numeriskt värde"

4521 msgid "cannot open '%s'"

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

4523

4524 +#: builtin/grep.c:728

4525 +msgid "search in index instead of in the work tree"

4526 +msgstr "sök i indexet istället för i arbetskatalogen"

4527 +

4528 +#: builtin/grep.c:730

4529 +msgid "find in contents not managed by git"

4530 +msgstr "sök i innehål som inte hanteras av git"

4531 +

4532 +#: builtin/grep.c:732

4533 +msgid "search in both tracked and untracked files"

4534 +msgstr "sök i både spårade och ospårade filer"

4535 +

4536 +#: builtin/grep.c:734

4537 +msgid "search also in ignored files"

4538 +msgstr "sök även i ignorerade filer"

4539 +

4540 +#: builtin/grep.c:737

4541 +msgid "show non-matching lines"

4542 +msgstr "vis rader som inte träffas"

4543 +

4544 +#: builtin/grep.c:739

4545 +msgid "case insensitive matching"

4546 +msgstr "skiftlägesokänslig sökning"

4547 +

4548 +#: builtin/grep.c:741

4549 +msgid "match patterns only at word boundaries"

4550 +msgstr "matcha endast mönster vid ordgränser"

4551 +

4552 +#: builtin/grep.c:743

4553 +msgid "process binary files as text"

4554 +msgstr "hantera binärfiler som text"

4555 +

4556 +#: builtin/grep.c:745

4557 +msgid "don't match patterns in binary files"

4558 +msgstr "träffa inte mönster i binärfiler"

4559 +

4560 +#: builtin/grep.c:748

4561 +msgid "descend at most <depth> levels"

4562 +msgstr "gå som mest ned <djup> nivåer"

4563 +

4564 +#: builtin/grep.c:752

4565 +msgid "use extended POSIX regular expressions"

4566 +msgstr "använd utökade POSIX-reguljära uttryck"

4567 +

4568 +#: builtin/grep.c:755

4569 +msgid "use basic POSIX regular expressions (default)"

4570 +msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

4571 +

4572 +#: builtin/grep.c:758

4573 +msgid "interpret patterns as fixed strings"

4574 +msgstr "tolka mönster som fixerade strängar"

4575 +

4576 +#: builtin/grep.c:761

4577 +msgid "use Perl-compatible regular expressions"

4578 +msgstr "använd Perlkompatibla reguljära uttryck"

4579 +

4580 +#: builtin/grep.c:764

4581 +msgid "show line numbers"

4582 +msgstr "visa radnummer"

4583 +

4584 +#: builtin/grep.c:765

4585 +msgid "don't show filenames"

4586 +msgstr "visa inte filnamn"

4587 +

4588 +# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.

4589 +#: builtin/grep.c:766

4590 +msgid "show filenames"

4591 +msgstr "visa filnamn"

4592 +

4593 +#: builtin/grep.c:768

4594 +msgid "show filenames relative to top directory"

4595 +msgstr "visa filnamn relativa till toppkatalogen"

4596 +

4597 +#: builtin/grep.c:770

4598 +msgid "show only filenames instead of matching lines"

4599 +msgstr "visa endast filnamn istället för träffade rader"

4600 +

4601 +#: builtin/grep.c:772

4602 +msgid "synonym for --files-with-matches"

4603 +msgstr "synonym för --files-with-matches"

4604 +

4605 +#: builtin/grep.c:775

4606 +msgid "show only the names of files without match"

4607 +msgstr "visa endast namn på filer utan träffar"

4608 +

4609 +#: builtin/grep.c:777

4610 +msgid "print NUL after filenames"

4611 +msgstr "skriv NUL efter filnamn"

4612 +

4613 +#: builtin/grep.c:779

4614 +msgid "show the number of matches instead of matching lines"

4615 +msgstr "visa antal träffar istället för träffade rader"

4616 +

4617 +#: builtin/grep.c:780

4618 +msgid "highlight matches"

4619 +msgstr "ljusmarkera träffar"

4620 +

4621 +#: builtin/grep.c:782

4622 +msgid "print empty line between matches from different files"

4623 +msgstr "skriv tomma rader mellan träffar från olika filer"

4624 +

4625 +#: builtin/grep.c:784

4626 +msgid "show filename only once above matches from same file"

4627 +msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

4628 +

4629 +#: builtin/grep.c:787

4630 +msgid "show <n> context lines before and after matches"

4631 +msgstr "visa <n> rader sammanhang före och efter träffar"

4632 +

4633 +#: builtin/grep.c:790

4634 +msgid "show <n> context lines before matches"

4635 +msgstr "visa <n> rader sammanhang före träffar"

4636 +

4637 +#: builtin/grep.c:792

4638 +msgid "show <n> context lines after matches"

4639 +msgstr "visa <n> rader sammanhang efter träffar"

4640 +

4641 +#: builtin/grep.c:793

4642 +msgid "shortcut for -C NUM"

4643 +msgstr "genväg för -C NUM"

4644 +

4645 +#: builtin/grep.c:796

4646 +msgid "show a line with the function name before matches"

4647 +msgstr "visa en rad med funktionsnamnet före träffen"

4648 +

4649 +#: builtin/grep.c:798

4650 +msgid "show the surrounding function"

4651 +msgstr "visa den omkringliggande funktionen"

4652 +

4653 +#: builtin/grep.c:801

4654 +msgid "read patterns from file"

4655 +msgstr "läs mönster från fil"

4656 +

4657 +#: builtin/grep.c:803

4658 +msgid "match <pattern>"

4659 +msgstr "träffa <mönster>"

4660 +

4661 +#: builtin/grep.c:805

4662 +msgid "combine patterns specified with -e"

4663 +msgstr "kombinera mönster som anges med -e"

4664 +

4665 +#: builtin/grep.c:817

4666 +msgid "indicate hit with exit status without output"

4667 +msgstr "ange träff med slutstatuskod utan utdata"

4668 +

4669 +#: builtin/grep.c:819

4670 +msgid "show only matches from files that match all patterns"

4671 +msgstr "visa endast träffar från filer som träffar alla mönster"

4672 +

4673 +#: builtin/grep.c:822

4674 +msgid "pager"

4675 +msgstr "bläddrare"

4676 +

4677 +#: builtin/grep.c:822

4678 +msgid "show matching files in the pager"

4679 +msgstr "visa träffade filer i filbläddraren"

4680 +

4681 +#: builtin/grep.c:825

4682 +msgid "allow calling of grep(1) (ignored by this build)"

4683 +msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

4684 +

4685 +#: builtin/grep.c:826 builtin/show-ref.c:201

4686 +msgid "show usage"

4687 +msgstr "visa användning"

4688 +

4689 #: builtin/grep.c:917

4690 msgid "no pattern given."

4691 msgstr "inget mönster angavs."

@@ -3175,6 +4715,62 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

4715 msgid "both --cached and trees are given."

4716 msgstr "både --cached och träd angavs."

4717

4718 +#: builtin/hash-object.c:60

4719 +msgid ""

4720 +"git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

4721 +"<file>..."

4722 +msgstr ""

4723 +"git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] "

4724 +"<fil>..."

4725 +

4726 +#: builtin/hash-object.c:61

4727 +msgid "git hash-object --stdin-paths < <list-of-paths>"

4728 +msgstr "git hash-object --stdin-paths < <sökvägslista>"

4729 +

4730 +#: builtin/hash-object.c:72

4731 +msgid "type"

4732 +msgstr "typ"

4733 +

4734 +#: builtin/hash-object.c:72

4735 +msgid "object type"

4736 +msgstr "objekttyp"

4737 +

4738 +#: builtin/hash-object.c:73

4739 +msgid "write the object into the object database"

4740 +msgstr "skriv objektet till objektdatabasen"

4741 +

4742 +#: builtin/hash-object.c:74

4743 +msgid "read the object from stdin"

4744 +msgstr "läs objektet från standard in"

4745 +

4746 +#: builtin/hash-object.c:76

4747 +msgid "store file as is without filters"

4748 +msgstr "spara filen som den är utan filer"

4749 +

4750 +#: builtin/hash-object.c:77

4751 +msgid "process file as it were from this path"

4752 +msgstr "hantera filen som om den kom från sökvägen"

4753 +

4754 +#: builtin/help.c:43

4755 +msgid "print all available commands"

4756 +msgstr "visa alla tillgängliga kommandon"

4757 +

4758 +#: builtin/help.c:44

4759 +msgid "show man page"

4760 +msgstr "visa manualsida"

4761 +

4762 +#: builtin/help.c:45

4763 +msgid "show manual in web browser"

4764 +msgstr "visa manual i webbläsare"

4765 +

4766 +#: builtin/help.c:47

4767 +msgid "show info page"

4768 +msgstr "visa info-sida"

4769 +

4770 +#: builtin/help.c:53

4771 +msgid "git help [--all] [--man|--web|--info] [command]"

4772 +msgstr "git help [--all] [--man|--web|--info] [kommando]"

4773 +

4774 #: builtin/help.c:65

4775 #, c-format

4776 msgid "unrecognized help format '%s'"

@@ -3289,6 +4885,11 @@ msgstr "kan inte öppna paketfilen \"%s\""

4885 msgid "pack signature mismatch"

4886 msgstr "paketsignatur stämmer inte överens"

4887

4888 +#: builtin/index-pack.c:294

4889 +#, c-format

4890 +msgid "pack version %<PRIu32> unsupported"

4891 +msgstr "paketversion %<PRIu32> stöds ej"

4892 +

4893 #: builtin/index-pack.c:312

4894 #, c-format

4895 msgid "pack has bad object at offset %lu: %s"

@@ -3395,93 +4996,123 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()"

4996 msgid "Resolving deltas"

4997 msgstr "Analyserar delta"

4998

3398 -#: builtin/index-pack.c:1105

4999 +#: builtin/index-pack.c:1064

5000 +#, c-format

5001 +msgid "unable to create thread: %s"

5002 +msgstr "kunde inte skapa tråd: %s"

5003 +

5004 +#: builtin/index-pack.c:1106

5005 msgid "confusion beyond insanity"

5006 msgstr "förvirrad bortom vanvett"

5007

3402 -#: builtin/index-pack.c:1124

5008 +#: builtin/index-pack.c:1112

5009 +#, c-format

5010 +msgid "completed with %d local objects"

5011 +msgstr "slutfördes med %d lokala objekt"

5012 +

5013 +#: builtin/index-pack.c:1121

5014 +#, c-format

5015 +msgid "Unexpected tail checksum for %s (disk corruption?)"

5016 +msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

5017 +

5018 +#: builtin/index-pack.c:1125

5019 #, c-format

5020 msgid "pack has %d unresolved delta"

5021 msgid_plural "pack has %d unresolved deltas"

5022 msgstr[0] "paketet har %d oanalyserat delta"

5023 msgstr[1] "paketet har %d oanalyserade delta"

5024

3409 -#: builtin/index-pack.c:1149

5025 +#: builtin/index-pack.c:1150

5026 #, c-format

5027 msgid "unable to deflate appended object (%d)"

5028 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

5029

3414 -#: builtin/index-pack.c:1228

5030 +#: builtin/index-pack.c:1229

5031 #, c-format

5032 msgid "local object %s is corrupt"

5033 msgstr "lokalt objekt %s är trasigt"

5034

3419 -#: builtin/index-pack.c:1252

5035 +#: builtin/index-pack.c:1253

5036 msgid "error while closing pack file"

5037 msgstr "fel vid stängning av paketfil"

5038

3423 -#: builtin/index-pack.c:1265

5039 +#: builtin/index-pack.c:1266

5040 #, c-format

5041 msgid "cannot write keep file '%s'"

5042 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

5043

3428 -#: builtin/index-pack.c:1273

5044 +#: builtin/index-pack.c:1274

5045 #, c-format

5046 msgid "cannot close written keep file '%s'"

5047 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

5048

3433 -#: builtin/index-pack.c:1286

5049 +#: builtin/index-pack.c:1287

5050 msgid "cannot store pack file"

5051 msgstr "kan inte spara paketfil"

5052

3437 -#: builtin/index-pack.c:1297

5053 +#: builtin/index-pack.c:1298

5054 msgid "cannot store index file"

5055 msgstr "kan inte spara indexfil"

5056

3441 -#: builtin/index-pack.c:1398

5057 +#: builtin/index-pack.c:1331

5058 +#, c-format

5059 +msgid "bad pack.indexversion=%<PRIu32>"

5060 +msgstr "felaktig pack.indexversion=%<PRIu32>"

5061 +

5062 +#: builtin/index-pack.c:1337

5063 +#, c-format

5064 +msgid "invalid number of threads specified (%d)"

5065 +msgstr "felaktigt antal trådar angivet (%d)"

5066 +

5067 +#: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5068 +#, c-format

5069 +msgid "no threads support, ignoring %s"

5070 +msgstr "trådstöd saknas, ignorerar %s"

5071 +

5072 +#: builtin/index-pack.c:1399

5073 #, c-format

5074 msgid "Cannot open existing pack file '%s'"

5075 msgstr "Kan inte öppna befintlig paketfil \"%s\""

5076

3446 -#: builtin/index-pack.c:1400

5077 +#: builtin/index-pack.c:1401

5078 #, c-format

5079 msgid "Cannot open existing pack idx file for '%s'"

5080 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""

5081

3451 -#: builtin/index-pack.c:1447

5082 +#: builtin/index-pack.c:1448

5083 #, c-format

5084 msgid "non delta: %d object"

5085 msgid_plural "non delta: %d objects"

5086 msgstr[0] "icke-delta: %d objekt"

5087 msgstr[1] "icke-delta: %d objekt"

5088

3458 -#: builtin/index-pack.c:1454

5089 +#: builtin/index-pack.c:1455

5090 #, c-format

5091 msgid "chain length = %d: %lu object"

5092 msgid_plural "chain length = %d: %lu objects"

5093 msgstr[0] "kedjelängd = %d: %lu objekt"

5094 msgstr[1] "kedjelängd = %d: %lu objekt"

5095

3465 -#: builtin/index-pack.c:1481

5096 +#: builtin/index-pack.c:1482

5097 msgid "Cannot come back to cwd"

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

5099

3469 -#: builtin/index-pack.c:1525 builtin/index-pack.c:1528

3470 -#: builtin/index-pack.c:1540 builtin/index-pack.c:1544

5100 +#: builtin/index-pack.c:1526 builtin/index-pack.c:1529

5101 +#: builtin/index-pack.c:1541 builtin/index-pack.c:1545

5102 #, c-format

5103 msgid "bad %s"

5104 msgstr "felaktig %s"

5105

3475 -#: builtin/index-pack.c:1558

5106 +#: builtin/index-pack.c:1559

5107 msgid "--fix-thin cannot be used without --stdin"

5108 msgstr "--fix-thin kan inte användas med --stdin"

5109

3479 -#: builtin/index-pack.c:1562 builtin/index-pack.c:1572

5110 +#: builtin/index-pack.c:1563 builtin/index-pack.c:1573

5111 #, c-format

5112 msgid "packfile name '%s' does not end with '.pack'"

5113 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

5114

3484 -#: builtin/index-pack.c:1581

5115 +#: builtin/index-pack.c:1582

5116 msgid "--verify with no packfile name given"

5117 msgstr "--verify angavs utan paketfilnamn"

5118

@@ -3601,6 +5232,26 @@ msgstr " delat"

5232 msgid "cannot tell cwd"

5233 msgstr "kan inte läsa aktuell katalog (cwd)"

5234

5235 +#: builtin/init-db.c:467

5236 +msgid ""

5237 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"

5238 +"[=<permissions>]] [directory]"

5239 +msgstr ""

5240 +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"

5241 +"[=<behörigheter>]] [katalog]"

5242 +

5243 +#: builtin/init-db.c:490

5244 +msgid "permissions"

5245 +msgstr "behörigheter"

5246 +

5247 +#: builtin/init-db.c:491

5248 +msgid "specify that the git repository is to be shared amongst several users"

5249 +msgstr "ange att git-arkivet skall delas bland flera användare"

5250 +

5251 +#: builtin/init-db.c:493 builtin/prune-packed.c:77

5252 +msgid "be quiet"

5253 +msgstr "var tyst"

5254 +

5255 #: builtin/init-db.c:522 builtin/init-db.c:529

5256 #, c-format

5257 msgid "cannot mkdir %s"

@@ -3629,6 +5280,26 @@ msgstr "Kan inte komma åt aktuell arbetskatalog"

5280 msgid "Cannot access work tree '%s'"

5281 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

5282

5283 +#: builtin/log.c:37

5284 +msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5285 +msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n"

5286 +

5287 +#: builtin/log.c:38

5288 +msgid " or: git show [options] <object>..."

5289 +msgstr " eller: git show [flaggor] <objekt>..."

5290 +

5291 +#: builtin/log.c:100

5292 +msgid "suppress diff output"

5293 +msgstr "undertryck diff-utdata"

5294 +

5295 +#: builtin/log.c:101

5296 +msgid "show source"

5297 +msgstr "visa källkod"

5298 +

5299 +#: builtin/log.c:102

5300 +msgid "decorate options"

5301 +msgstr "dekoreringsflaggor"

5302 +

5303 #: builtin/log.c:189

5304 #, c-format

5305 msgid "Final output: %d %s\n"

@@ -3674,10 +5345,130 @@ msgstr "Omslagsbrevet behöver e-postformat"

5345 msgid "insane in-reply-to: %s"

5346 msgstr "tokigt in-reply-to: %s"

5347

5348 +#: builtin/log.c:890

5349 +msgid "git format-patch [options] [<since> | <revision range>]"

5350 +msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

5351 +

5352 #: builtin/log.c:935

5353 msgid "Two output directories?"

5354 msgstr "Två utdatakataloger?"

5355

5356 +#: builtin/log.c:1063

5357 +msgid "use [PATCH n/m] even with a single patch"

5358 +msgstr "använd [PATCH n/m] även för en ensam patch"

5359 +

5360 +#: builtin/log.c:1066

5361 +msgid "use [PATCH] even with multiple patches"

5362 +msgstr "använd [PATCH] även för flera patchar"

5363 +

5364 +#: builtin/log.c:1070

5365 +msgid "print patches to standard out"

5366 +msgstr "skriv patcharna på stnadard ut"

5367 +

5368 +#: builtin/log.c:1072

5369 +msgid "generate a cover letter"

5370 +msgstr "generera ett följebrev"

5371 +

5372 +#: builtin/log.c:1074

5373 +msgid "use simple number sequence for output file names"

5374 +msgstr "använd enkel nummersekvens för utdatafilnamn"

5375 +

5376 +#: builtin/log.c:1075

5377 +msgid "sfx"

5378 +msgstr "sfx"

5379 +

5380 +#: builtin/log.c:1076

5381 +msgid "use <sfx> instead of '.patch'"

5382 +msgstr "använd <sfx> istället för \".patch\""

5383 +

5384 +#: builtin/log.c:1078

5385 +msgid "start numbering patches at <n> instead of 1"

5386 +msgstr "börja numrera patchar på <n> istället för 1"

5387 +

5388 +#: builtin/log.c:1080

5389 +msgid "Use [<prefix>] instead of [PATCH]"

5390 +msgstr "Använd [<prefix>] istället för [PATCH]"

5391 +

5392 +#: builtin/log.c:1083

5393 +msgid "store resulting files in <dir>"

5394 +msgstr "spara filerna i <katalog>"

5395 +

5396 +#: builtin/log.c:1086

5397 +msgid "don't strip/add [PATCH]"

5398 +msgstr "ta inte bort eller lägg till [PATCH]"

5399 +

5400 +#: builtin/log.c:1089

5401 +msgid "don't output binary diffs"

5402 +msgstr "skriv inte binära diffar"

5403 +

5404 +#: builtin/log.c:1091

5405 +msgid "don't include a patch matching a commit upstream"

5406 +msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

5407 +

5408 +#: builtin/log.c:1093

5409 +msgid "show patch format instead of default (patch + stat)"

5410 +msgstr "visa patchformat istället för standard (patch + stat)"

5411 +

5412 +#: builtin/log.c:1095

5413 +msgid "Messaging"

5414 +msgstr "E-post"

5415 +

5416 +#: builtin/log.c:1096

5417 +msgid "header"

5418 +msgstr "huvud"

5419 +

5420 +#: builtin/log.c:1097

5421 +msgid "add email header"

5422 +msgstr "lägg till e-posthuvud"

5423 +

5424 +#: builtin/log.c:1098 builtin/log.c:1100

5425 +msgid "email"

5426 +msgstr "epost"

5427 +

5428 +#: builtin/log.c:1098

5429 +msgid "add To: header"

5430 +msgstr "Lägg till mottagarhuvud (\"To:\")"

5431 +

5432 +#: builtin/log.c:1100

5433 +msgid "add Cc: header"

5434 +msgstr "Lägg till kopiehuvud (\"Cc:\")"

5435 +

5436 +#: builtin/log.c:1102

5437 +msgid "message-id"

5438 +msgstr "meddelande-id"

5439 +

5440 +#: builtin/log.c:1103

5441 +msgid "make first mail a reply to <message-id>"

5442 +msgstr "Gör det första brevet ett svar till <meddelande-id>"

5443 +

5444 +#: builtin/log.c:1104 builtin/log.c:1107

5445 +msgid "boundary"

5446 +msgstr "gräns"

5447 +

5448 +#: builtin/log.c:1105

5449 +msgid "attach the patch"

5450 +msgstr "bifoga patchen"

5451 +

5452 +#: builtin/log.c:1108

5453 +msgid "inline the patch"

5454 +msgstr "gör patchen ett inline-objekt"

5455 +

5456 +#: builtin/log.c:1112

5457 +msgid "enable message threading, styles: shallow, deep"

5458 +msgstr "aktivera brevtrådning, typer: shallow, deep"

5459 +

5460 +#: builtin/log.c:1114

5461 +msgid "signature"

5462 +msgstr "signatur"

5463 +

5464 +#: builtin/log.c:1115

5465 +msgid "add a signature"

5466 +msgstr "lägg till signatur"

5467 +

5468 +#: builtin/log.c:1117

5469 +msgid "don't print the patch filenames"

5470 +msgstr "visa inte filnamn för patchar"

5471 +

5472 #: builtin/log.c:1157

5473 #, c-format

5474 msgid "bogus committer info %s"

@@ -3716,6 +5507,10 @@ msgstr "Kunde inte skapa katalogen \"%s\""

5507 msgid "Failed to create output files"

5508 msgstr "Misslyckades skapa utdatafiler"

5509

5510 +#: builtin/log.c:1443

5511 +msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5512 +msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

5513 +

5514 #: builtin/log.c:1498

5515 #, c-format

5516 msgid ""

@@ -3727,6 +5522,146 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

5522 msgid "Unknown commit %s"

5523 msgstr "Okänd incheckning %s"

5524

5525 +#: builtin/ls-files.c:408

5526 +msgid "git ls-files [options] [<file>...]"

5527 +msgstr "git ls-files [flaggor] [<fil>...]"

5528 +

5529 +#: builtin/ls-files.c:463

5530 +msgid "identify the file status with tags"

5531 +msgstr "identifiera filstatus med taggar"

5532 +

5533 +#: builtin/ls-files.c:465

5534 +msgid "use lowercase letters for 'assume unchanged' files"

5535 +msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

5536 +

5537 +#: builtin/ls-files.c:467

5538 +msgid "show cached files in the output (default)"

5539 +msgstr "visa cachade filer i utdata (standard)"

5540 +

5541 +#: builtin/ls-files.c:469

5542 +msgid "show deleted files in the output"

5543 +msgstr "visa borttagna filer i utdata"

5544 +

5545 +#: builtin/ls-files.c:471

5546 +msgid "show modified files in the output"

5547 +msgstr "visa modifierade filer i utdata"

5548 +

5549 +#: builtin/ls-files.c:473

5550 +msgid "show other files in the output"

5551 +msgstr "visa andra filer i utdata"

5552 +

5553 +#: builtin/ls-files.c:475

5554 +msgid "show ignored files in the output"

5555 +msgstr "visa ignorerade filer i utdata"

5556 +

5557 +#: builtin/ls-files.c:478

5558 +msgid "show staged contents' object name in the output"

5559 +msgstr "visa köat innehålls objektnamn i utdata"

5560 +

5561 +#: builtin/ls-files.c:480

5562 +msgid "show files on the filesystem that need to be removed"

5563 +msgstr "visa filer i filsystemet som behöver tas bort"

5564 +

5565 +#: builtin/ls-files.c:482

5566 +msgid "show 'other' directories' name only"

5567 +msgstr "visa endast namn för \"andra\" kataloger"

5568 +

5569 +#: builtin/ls-files.c:485

5570 +msgid "don't show empty directories"

5571 +msgstr "visa inte tomma kataloger"

5572 +

5573 +#: builtin/ls-files.c:488

5574 +msgid "show unmerged files in the output"

5575 +msgstr "visa ej sammanslagna filer i utdata"

5576 +

5577 +#: builtin/ls-files.c:490

5578 +msgid "show resolve-undo information"

5579 +msgstr "visa \"resolve-undo\"-information"

5580 +

5581 +#: builtin/ls-files.c:492

5582 +msgid "skip files matching pattern"

5583 +msgstr "hoppa över filer som motsvarar mönster"

5584 +

5585 +#: builtin/ls-files.c:495

5586 +msgid "exclude patterns are read from <file>"

5587 +msgstr "exkludera mönster som läses från <fil>"

5588 +

5589 +#: builtin/ls-files.c:498

5590 +msgid "read additional per-directory exclude patterns in <file>"

5591 +msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

5592 +

5593 +#: builtin/ls-files.c:500

5594 +msgid "add the standard git exclusions"

5595 +msgstr "lägg till git:s standardexkluderingar"

5596 +

5597 +#: builtin/ls-files.c:503

5598 +msgid "make the output relative to the project top directory"

5599 +msgstr "gör utdata relativ till projektets toppkatalog"

5600 +

5601 +#: builtin/ls-files.c:506

5602 +msgid "if any <file> is not in the index, treat this as an error"

5603 +msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

5604 +

5605 +#: builtin/ls-files.c:507

5606 +msgid "tree-ish"

5607 +msgstr "träd-igt"

5608 +

5609 +#: builtin/ls-files.c:508

5610 +msgid "pretend that paths removed since <tree-ish> are still present"

5611 +msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

5612 +

5613 +#: builtin/ls-files.c:510

5614 +msgid "show debugging data"

5615 +msgstr "visa felsökningsutdata"

5616 +

5617 +#: builtin/ls-tree.c:27

5618 +msgid "git ls-tree [<options>] <tree-ish> [<path>...]"

5619 +msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"

5620 +

5621 +#: builtin/ls-tree.c:125

5622 +msgid "only show trees"

5623 +msgstr "visa endast träd"

5624 +

5625 +#: builtin/ls-tree.c:127

5626 +msgid "recurse into subtrees"

5627 +msgstr "rekursera ner i underträd"

5628 +

5629 +#: builtin/ls-tree.c:129

5630 +msgid "show trees when recursing"

5631 +msgstr "visa träd medan rekursering"

5632 +

5633 +#: builtin/ls-tree.c:132

5634 +msgid "terminate entries with NUL byte"

5635 +msgstr "terminera poster med NUL-byte"

5636 +

5637 +#: builtin/ls-tree.c:133

5638 +msgid "include object size"

5639 +msgstr "inkludera objektstorlek"

5640 +

5641 +#: builtin/ls-tree.c:135 builtin/ls-tree.c:137

5642 +msgid "list only filenames"

5643 +msgstr "visa endast filnamn"

5644 +

5645 +#: builtin/ls-tree.c:140

5646 +msgid "use full path names"

5647 +msgstr "använd fullständiga sökvägsnamn"

5648 +

5649 +#: builtin/ls-tree.c:142

5650 +msgid "list entire tree; not just current directory (implies --full-name)"

5651 +msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"

5652 +

5653 +#: builtin/merge.c:43

5654 +msgid "git merge [options] [<commit>...]"

5655 +msgstr "git merge [flaggor] [<incheckning>...]"

5656 +

5657 +#: builtin/merge.c:44

5658 +msgid "git merge [options] <msg> HEAD <commit>"

5659 +msgstr "git merge [flaggor] <meddelande> HEAD <incheckning>"

5660 +

5661 +#: builtin/merge.c:45

5662 +msgid "git merge --abort"

5663 +msgstr "git merge --abort"

5664 +

5665 #: builtin/merge.c:90

5666 msgid "switch `m' requires a value"

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

@@ -3746,6 +5681,67 @@ msgstr "Tillgängliga strategier är:"

5681 msgid "Available custom strategies are:"

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

5683

5684 +#: builtin/merge.c:183

5685 +msgid "do not show a diffstat at the end of the merge"

5686 +msgstr "visa inte en diffstat när sammanslagningen är färdig"

5687 +

5688 +#: builtin/merge.c:186

5689 +msgid "show a diffstat at the end of the merge"

5690 +msgstr "visa en diffstat när sammanslagningen är färdig"

5691 +

5692 +#: builtin/merge.c:187

5693 +msgid "(synonym to --stat)"

5694 +msgstr "(synonym till --stat)"

5695 +

5696 +#: builtin/merge.c:189

5697 +msgid "add (at most <n>) entries from shortlog to merge commit message"

5698 +msgstr ""

5699 +"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"

5700 +

5701 +#: builtin/merge.c:192

5702 +msgid "create a single commit instead of doing a merge"

5703 +msgstr "skapa en ensam incheckning istället för en sammanslagning"

5704 +

5705 +#: builtin/merge.c:194

5706 +msgid "perform a commit if the merge succeeds (default)"

5707 +msgstr "utför en incheckning om sammanslagningen lyckades (standard)"

5708 +

5709 +#: builtin/merge.c:196

5710 +msgid "edit message before committing"

5711 +msgstr "redigera meddelande innan incheckning"

5712 +

5713 +#: builtin/merge.c:198

5714 +msgid "allow fast-forward (default)"

5715 +msgstr "tillåt snabbspolning (standard)"

5716 +

5717 +#: builtin/merge.c:200

5718 +msgid "abort if fast-forward is not possible"

5719 +msgstr "avbryt om snabbspolning inte är möjlig"

5720 +

5721 +#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112

5722 +msgid "strategy"

5723 +msgstr "strategi"

5724 +

5725 +#: builtin/merge.c:203

5726 +msgid "merge strategy to use"

5727 +msgstr "sammanslagninsstrategi att använda"

5728 +

5729 +#: builtin/merge.c:204

5730 +msgid "option=value"

5731 +msgstr "alternativ=värde"

5732 +

5733 +#: builtin/merge.c:205

5734 +msgid "option for selected merge strategy"

5735 +msgstr "alternativ för vald sammanslagningsstrategi"

5736 +

5737 +#: builtin/merge.c:207

5738 +msgid "merge commit message (for a non-fast-forward merge)"

5739 +msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"

5740 +

5741 +#: builtin/merge.c:211

5742 +msgid "abort the current in-progress merge"

5743 +msgstr "avbryt den pågående sammanslagningen"

5744 +

5745 #: builtin/merge.c:240

5746 msgid "could not run stash."

5747 msgstr "kunde köra stash."

@@ -3975,7 +5971,7 @@ msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

5971 #: builtin/merge.c:1584

5972 #, c-format

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

3978 -msgstr "Sammanslaning med strategin %s misslyckades.\n"

5974 +msgstr "Sammanslagning med strategin %s misslyckades.\n"

5975

5976 #: builtin/merge.c:1593

5977 #, c-format

@@ -3988,6 +5984,105 @@ msgid "Automatic merge went well; stopped before committing as requested\n"

5984 msgstr ""

5985 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"

5986

5987 +#: builtin/merge-base.c:26

5988 +msgid "git merge-base [-a|--all] <commit> <commit>..."

5989 +msgstr "git merge-base [-a|--all] <incheckning> <incheckning>..."

5990 +

5991 +#: builtin/merge-base.c:27

5992 +msgid "git merge-base [-a|--all] --octopus <commit>..."

5993 +msgstr "git merge-base [-a|--all] --octopus <incheckning>..."

5994 +

5995 +#: builtin/merge-base.c:28

5996 +msgid "git merge-base --independent <commit>..."

5997 +msgstr "git merge-base --independent <incheckning>..."

5998 +

5999 +#: builtin/merge-base.c:29

6000 +msgid "git merge-base --is-ancestor <commit> <commit>"

6001 +msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"

6002 +

6003 +#: builtin/merge-base.c:98

6004 +msgid "output all common ancestors"

6005 +msgstr "skriv ut alla gemensamma anfäder"

6006 +

6007 +#: builtin/merge-base.c:99

6008 +msgid "find ancestors for a single n-way merge"

6009 +msgstr "hitta anfader för enkel n-vägssammanslagning"

6010 +

6011 +#: builtin/merge-base.c:100

6012 +msgid "list revs not reachable from others"

6013 +msgstr "visa revisioner som inte kan nås från andra"

6014 +

6015 +#: builtin/merge-base.c:102

6016 +msgid "is the first one ancestor of the other?"

6017 +msgstr "är den första anfader till den andra?"

6018 +

6019 +#: builtin/merge-file.c:8

6020 +msgid ""

6021 +"git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file "

6022 +"file2"

6023 +msgstr ""

6024 +"git merge-file [alternativ] [-L namn1 [-L orig [-L namn2]]] fil1 origfil fil2"

6025 +

6026 +#: builtin/merge-file.c:33

6027 +msgid "send results to standard output"

6028 +msgstr "sänd resultat till standard ut"

6029 +

6030 +#: builtin/merge-file.c:34

6031 +msgid "use a diff3 based merge"

6032 +msgstr "använd diff3-baserad sammanslagning"

6033 +

6034 +#: builtin/merge-file.c:35

6035 +msgid "for conflicts, use our version"

6036 +msgstr "för konflikter, använd vår version"

6037 +

6038 +#: builtin/merge-file.c:37

6039 +msgid "for conflicts, use their version"

6040 +msgstr "för konflikter, använd deras version"

6041 +

6042 +#: builtin/merge-file.c:39

6043 +msgid "for conflicts, use a union version"

6044 +msgstr "för konflikter, använd en förenad version"

6045 +

6046 +#: builtin/merge-file.c:42

6047 +msgid "for conflicts, use this marker size"

6048 +msgstr "för konflikter, använd denna markörstorlek"

6049 +

6050 +#: builtin/merge-file.c:43

6051 +msgid "do not warn about conflicts"

6052 +msgstr "varna inte om konflikter"

6053 +

6054 +#: builtin/merge-file.c:45

6055 +msgid "set labels for file1/orig_file/file2"

6056 +msgstr "sätt etiketter för fil1/origfil/fil2"

6057 +

6058 +#: builtin/mktree.c:67

6059 +msgid "git mktree [-z] [--missing] [--batch]"

6060 +msgstr "git mktree [-z] [--missing] [--batch]"

6061 +

6062 +#: builtin/mktree.c:153

6063 +msgid "input is NUL terminated"

6064 +msgstr "indata är NUL-terminerad"

6065 +

6066 +#: builtin/mktree.c:154 builtin/write-tree.c:24

6067 +msgid "allow missing objects"

6068 +msgstr "tillåt saknade objekt"

6069 +

6070 +#: builtin/mktree.c:155

6071 +msgid "allow creation of more than one tree"

6072 +msgstr "tillåt skapa mer än ett träd"

6073 +

6074 +#: builtin/mv.c:14

6075 +msgid "git mv [options] <source>... <destination>"

6076 +msgstr "git mv [flaggor] <källa>... <mål>"

6077 +

6078 +#: builtin/mv.c:64

6079 +msgid "force move/rename even if target exists"

6080 +msgstr "tvinga flytta/ändra namn även om målet finns"

6081 +

6082 +#: builtin/mv.c:65

6083 +msgid "skip move/rename errors"

6084 +msgstr "hoppa över fel vid flytt/namnändring"

6085 +

6086 #: builtin/mv.c:108

6087 #, c-format

6088 msgid "Checking rename of '%s' to '%s'\n"

@@ -4050,6 +6145,154 @@ msgstr "Byter namn på %s till %s\n"

6145 msgid "renaming '%s' failed"

6146 msgstr "misslyckades byta namn på \"%s\""

6147

6148 +#: builtin/name-rev.c:175

6149 +msgid "git name-rev [options] <commit>..."

6150 +msgstr "git name-rev [flaggor] <incheckning>..."

6151 +

6152 +#: builtin/name-rev.c:176

6153 +msgid "git name-rev [options] --all"

6154 +msgstr "git name-rev [flaggor] --all"

6155 +

6156 +#: builtin/name-rev.c:177

6157 +msgid "git name-rev [options] --stdin"

6158 +msgstr "git name-rev [flaggor] --stdin"

6159 +

6160 +#: builtin/name-rev.c:229

6161 +msgid "print only names (no SHA-1)"

6162 +msgstr "skriv endast namn (ingen SHA-1)"

6163 +

6164 +#: builtin/name-rev.c:230

6165 +msgid "only use tags to name the commits"

6166 +msgstr "använd endast taggar för att namnge incheckningar"

6167 +

6168 +#: builtin/name-rev.c:232

6169 +msgid "only use refs matching <pattern>"

6170 +msgstr "använd endast referenser som motsvarar <mönster>"

6171 +

6172 +#: builtin/name-rev.c:234

6173 +msgid "list all commits reachable from all refs"

6174 +msgstr "lista alla incheckningar som kan nås alla referenser"

6175 +

6176 +#: builtin/name-rev.c:235

6177 +msgid "read from stdin"

6178 +msgstr "läs från standard in"

6179 +

6180 +#: builtin/name-rev.c:236

6181 +msgid "allow to print `undefined` names"

6182 +msgstr "tillåt att skriva \"odefinierade\" namn"

6183 +

6184 +#: builtin/notes.c:23

6185 +msgid "git notes [--ref <notes_ref>] [list [<object>]]"

6186 +msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"

6187 +

6188 +#: builtin/notes.c:24

6189 +msgid ""

6190 +"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

6191 +"<object>] [<object>]"

6192 +msgstr ""

6193 +"git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -"

6194 +"C) <objekt>] [<objekt>]"

6195 +

6196 +#: builtin/notes.c:25

6197 +msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

6198 +msgstr ""

6199 +"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"

6200 +

6201 +#: builtin/notes.c:26

6202 +msgid ""

6203 +"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

6204 +"<object>] [<object>]"

6205 +msgstr ""

6206 +"git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) "

6207 +"<objekt>] [<objekt>]"

6208 +

6209 +#: builtin/notes.c:27

6210 +msgid "git notes [--ref <notes_ref>] edit [<object>]"

6211 +msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]"

6212 +

6213 +#: builtin/notes.c:28

6214 +msgid "git notes [--ref <notes_ref>] show [<object>]"

6215 +msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"

6216 +

6217 +#: builtin/notes.c:29

6218 +msgid ""

6219 +"git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

6220 +msgstr ""

6221 +"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] "

6222 +"<anteckningsref>"

6223 +

6224 +#: builtin/notes.c:30

6225 +msgid "git notes merge --commit [-v | -q]"

6226 +msgstr "git notes merge --commit [-v | -q]"

6227 +

6228 +#: builtin/notes.c:31

6229 +msgid "git notes merge --abort [-v | -q]"

6230 +msgstr "git notes merge --abort [-v | -q]"

6231 +

6232 +#: builtin/notes.c:32

6233 +msgid "git notes [--ref <notes_ref>] remove [<object>...]"

6234 +msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"

6235 +

6236 +#: builtin/notes.c:33

6237 +msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

6238 +msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"

6239 +

6240 +#: builtin/notes.c:34

6241 +msgid "git notes [--ref <notes_ref>] get-ref"

6242 +msgstr "git notes [--ref <anteckningsref>] get-ref"

6243 +

6244 +#: builtin/notes.c:39

6245 +msgid "git notes [list [<object>]]"

6246 +msgstr "git notes [list [<objekt>]]"

6247 +

6248 +#: builtin/notes.c:44

6249 +msgid "git notes add [<options>] [<object>]"

6250 +msgstr "git notes add [<flaggor>] [<objekt>]"

6251 +

6252 +#: builtin/notes.c:49

6253 +msgid "git notes copy [<options>] <from-object> <to-object>"

6254 +msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"

6255 +

6256 +#: builtin/notes.c:50

6257 +msgid "git notes copy --stdin [<from-object> <to-object>]..."

6258 +msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."

6259 +

6260 +#: builtin/notes.c:55

6261 +msgid "git notes append [<options>] [<object>]"

6262 +msgstr "git notes append [<flaggor>] [<objekt>]"

6263 +

6264 +#: builtin/notes.c:60

6265 +msgid "git notes edit [<object>]"

6266 +msgstr "git notes edit [<objekt>]"

6267 +

6268 +#: builtin/notes.c:65

6269 +msgid "git notes show [<object>]"

6270 +msgstr "git notes show [<objekt>]"

6271 +

6272 +#: builtin/notes.c:70

6273 +msgid "git notes merge [<options>] <notes_ref>"

6274 +msgstr "git notes merge [<flaggor>] <anteckningsref>"

6275 +

6276 +#: builtin/notes.c:71

6277 +msgid "git notes merge --commit [<options>]"

6278 +msgstr "git notes merge --commit [<flaggor>]"

6279 +

6280 +#: builtin/notes.c:72

6281 +msgid "git notes merge --abort [<options>]"

6282 +msgstr "git notes merge --abort [<flaggor>]"

6283 +

6284 +#: builtin/notes.c:77

6285 +msgid "git notes remove [<object>]"

6286 +msgstr "git notes remove [<objekt>]"

6287 +

6288 +#: builtin/notes.c:82

6289 +msgid "git notes prune [<options>]"

6290 +msgstr "git notes prune [<flaggor>]"

6291 +

6292 +#: builtin/notes.c:87

6293 +msgid "git notes get-ref"

6294 +msgstr "git notes get-ref"

6295 +

6296 #: builtin/notes.c:139

6297 #, c-format

6298 msgid "unable to start 'show' for object '%s'"

@@ -4157,6 +6400,31 @@ msgstr "för många parametrar"

6400 msgid "No note found for object %s."

6401 msgstr "Inga anteckningar hittades för objektet %s."

6402

6403 +#: builtin/notes.c:535 builtin/notes.c:692

6404 +msgid "note contents as a string"

6405 +msgstr "anteckningsinnehåll som sträng"

6406 +

6407 +#: builtin/notes.c:538 builtin/notes.c:695

6408 +msgid "note contents in a file"

6409 +msgstr "anteckningsinnehåll i en fil"

6410 +

6411 +#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697

6412 +#: builtin/notes.c:700 builtin/tag.c:476

6413 +msgid "object"

6414 +msgstr "objekt"

6415 +

6416 +#: builtin/notes.c:541 builtin/notes.c:698

6417 +msgid "reuse and edit specified note object"

6418 +msgstr "återanvänd och redigera angivet anteckningsobjekt"

6419 +

6420 +#: builtin/notes.c:544 builtin/notes.c:701

6421 +msgid "reuse specified note object"

6422 +msgstr "återanvänd angivet anteckningsobjekt"

6423 +

6424 +#: builtin/notes.c:546 builtin/notes.c:614

6425 +msgid "replace existing notes"

6426 +msgstr "ersätt befintliga anteckningar"

6427 +

6428 #: builtin/notes.c:580

6429 #, c-format

6430 msgid ""

@@ -4171,6 +6439,14 @@ msgstr ""

6439 msgid "Overwriting existing notes for object %s\n"

6440 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

6441

6442 +#: builtin/notes.c:615

6443 +msgid "read objects from stdin"

6444 +msgstr "läs objekt från standard in"

6445 +

6446 +#: builtin/notes.c:617

6447 +msgid "load rewriting config for <command> (implies --stdin)"

6448 +msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"

6449 +

6450 #: builtin/notes.c:635

6451 msgid "too few parameters"

6452 msgstr "för få parametrar"

@@ -4198,16 +6474,74 @@ msgstr ""

6474 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

6475 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

6476

6477 +#: builtin/notes.c:864

6478 +msgid "General options"

6479 +msgstr "Allmänna flaggor"

6480 +

6481 +#: builtin/notes.c:866

6482 +msgid "Merge options"

6483 +msgstr "Flaggor för sammanslagning"

6484 +

6485 +#: builtin/notes.c:868

6486 +msgid ""

6487 +"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6488 +"cat_sort_uniq)"

6489 +msgstr ""

6490 +"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"

6491 +"cat_sort_uniq)"

6492 +

6493 +#: builtin/notes.c:870

6494 +msgid "Committing unmerged notes"

6495 +msgstr "Checkar in ej sammanslagna anteckningar"

6496 +

6497 +#: builtin/notes.c:872

6498 +msgid "finalize notes merge by committing unmerged notes"

6499 +msgstr ""

6500 +"färdigställ sammanslagning av anteckningar genom att checka in ej "

6501 +"sammanslagna anteckningar"

6502 +

6503 +#: builtin/notes.c:874

6504 +msgid "Aborting notes merge resolution"

6505 +msgstr "Avbryt lösning av sammanslagning av anteckningar"

6506 +

6507 +#: builtin/notes.c:876

6508 +msgid "abort notes merge"

6509 +msgstr "avbryt sammanslagning av anteckningar"

6510 +

6511 #: builtin/notes.c:971

6512 #, c-format

6513 msgid "Object %s has no note\n"

6514 msgstr "Objektet %s har ingen anteckning\n"

6515

6516 +#: builtin/notes.c:983

6517 +msgid "attempt to remove non-existent note is not an error"

6518 +msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"

6519 +

6520 +#: builtin/notes.c:986

6521 +msgid "read object names from the standard input"

6522 +msgstr "läs objektnamn från standard in"

6523 +

6524 +#: builtin/notes.c:1067

6525 +msgid "notes_ref"

6526 +msgstr "anteckningar-ref"

6527 +

6528 +#: builtin/notes.c:1068

6529 +msgid "use notes from <notes_ref>"

6530 +msgstr "använd anteckningar från <anteckningsref>"

6531 +

6532 #: builtin/notes.c:1103 builtin/remote.c:1598

6533 #, c-format

6534 msgid "Unknown subcommand: %s"

6535 msgstr "Okänt underkommando: %s"

6536

6537 +#: builtin/pack-objects.c:23

6538 +msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]"

6539 +msgstr "git pack-objects --stdout [flaggor...] [< reflista | < objektlista]"

6540 +

6541 +#: builtin/pack-objects.c:24

6542 +msgid "git pack-objects [options...] base-name [< ref-list | < object-list]"

6543 +msgstr "git pack-objects [flaggor...] basnamn [< reflista | < objektlista]"

6544 +

6545 #: builtin/pack-objects.c:183 builtin/pack-objects.c:186

6546 #, c-format

6547 msgid "deflate error (%d)"

@@ -4233,6 +6567,162 @@ msgstr "flaggan %s godtar inte negativ form"

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

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

6569

6570 +#: builtin/pack-objects.c:2448

6571 +msgid "do not show progress meter"

6572 +msgstr "visa inte förloppsindikator"

6573 +

6574 +#: builtin/pack-objects.c:2450

6575 +msgid "show progress meter"

6576 +msgstr "visa förloppsindikator"

6577 +

6578 +#: builtin/pack-objects.c:2452

6579 +msgid "show progress meter during object writing phase"

6580 +msgstr "visa förloppsindikator under objektskrivningsfasen"

6581 +

6582 +#: builtin/pack-objects.c:2455

6583 +msgid "similar to --all-progress when progress meter is shown"

6584 +msgstr "som --all-progress när förloppsmätaren visas"

6585 +

6586 +#: builtin/pack-objects.c:2456

6587 +msgid "version[,offset]"

6588 +msgstr "version[,offset]"

6589 +

6590 +#: builtin/pack-objects.c:2457

6591 +msgid "write the pack index file in the specified idx format version"

6592 +msgstr "skriv paketindexfilen i angiven indexformatversion"

6593 +

6594 +#: builtin/pack-objects.c:2460

6595 +msgid "maximum size of each output pack file"

6596 +msgstr "maximal storlek på varje utdatapaketfil"

6597 +

6598 +#: builtin/pack-objects.c:2462

6599 +msgid "ignore borrowed objects from alternate object store"

6600 +msgstr "ignorera lånade objekt från alternativa objektlager"

6601 +

6602 +#: builtin/pack-objects.c:2464

6603 +msgid "ignore packed objects"

6604 +msgstr "ignorera packade objekt"

6605 +

6606 +#: builtin/pack-objects.c:2466

6607 +msgid "limit pack window by objects"

6608 +msgstr "begränsa paketfönster efter objekt"

6609 +

6610 +#: builtin/pack-objects.c:2468

6611 +msgid "limit pack window by memory in addition to object limit"

6612 +msgstr "begränsa paketfönster efter minne förutom objektgräns"

6613 +

6614 +#: builtin/pack-objects.c:2470

6615 +msgid "maximum length of delta chain allowed in the resulting pack"

6616 +msgstr "maximal längd på deltakedja tillåten i slutligt paket"

6617 +

6618 +#: builtin/pack-objects.c:2472

6619 +msgid "reuse existing deltas"

6620 +msgstr "återanvänd befintliga delta"

6621 +

6622 +#: builtin/pack-objects.c:2474

6623 +msgid "reuse existing objects"

6624 +msgstr "återanvänd befintliga objekt"

6625 +

6626 +#: builtin/pack-objects.c:2476

6627 +msgid "use OFS_DELTA objects"

6628 +msgstr "använd OFS_DELTA-objekt"

6629 +

6630 +#: builtin/pack-objects.c:2478

6631 +msgid "use threads when searching for best delta matches"

6632 +msgstr "använd trådar vid sökning efter bästa deltaträffar"

6633 +

6634 +#: builtin/pack-objects.c:2480

6635 +msgid "do not create an empty pack output"

6636 +msgstr "försök inte skapa tom paketutdata"

6637 +

6638 +#: builtin/pack-objects.c:2482

6639 +msgid "read revision arguments from standard input"

6640 +msgstr "läs revisionsargument från standard in"

6641 +

6642 +#: builtin/pack-objects.c:2484

6643 +msgid "limit the objects to those that are not yet packed"

6644 +msgstr "begränsa objekt till de som ännu inte packats"

6645 +

6646 +#: builtin/pack-objects.c:2487

6647 +msgid "include objects reachable from any reference"

6648 +msgstr "inkludera objekt som kan nås från någon referens"

6649 +

6650 +#: builtin/pack-objects.c:2490

6651 +msgid "include objects referred by reflog entries"

6652 +msgstr "inkludera objekt som refereras från referensloggposter"

6653 +

6654 +#: builtin/pack-objects.c:2493

6655 +msgid "output pack to stdout"

6656 +msgstr "skriv paket på standard ut"

6657 +

6658 +#: builtin/pack-objects.c:2495

6659 +msgid "include tag objects that refer to objects to be packed"

6660 +msgstr "inkludera taggobjekt som refererar objekt som skall packas"

6661 +

6662 +#: builtin/pack-objects.c:2497

6663 +msgid "keep unreachable objects"

6664 +msgstr "behåll onåbara objekt"

6665 +

6666 +#: builtin/pack-objects.c:2498 parse-options.h:141

6667 +msgid "time"

6668 +msgstr "tid"

6669 +

6670 +#: builtin/pack-objects.c:2499

6671 +msgid "unpack unreachable objects newer than <time>"

6672 +msgstr "packa upp onåbara objekt nyare än <tid>"

6673 +

6674 +#: builtin/pack-objects.c:2502

6675 +msgid "create thin packs"

6676 +msgstr "skapa tunna paket"

6677 +

6678 +#: builtin/pack-objects.c:2504

6679 +msgid "ignore packs that have companion .keep file"

6680 +msgstr "ignorera paket som har tillhörande .keep-fil"

6681 +

6682 +#: builtin/pack-objects.c:2506

6683 +msgid "pack compression level"

6684 +msgstr "komprimeringsgrad för paket"

6685 +

6686 +#: builtin/pack-objects.c:2508

6687 +msgid "do not hide commits by grafts"

6688 +msgstr "göm inte incheckningar med ympningar (\"grafts\")"

6689 +

6690 +#: builtin/pack-refs.c:6

6691 +msgid "git pack-refs [options]"

6692 +msgstr "git pack-refs [flaggor]"

6693 +

6694 +#: builtin/pack-refs.c:14

6695 +msgid "pack everything"

6696 +msgstr "packa allt"

6697 +

6698 +#: builtin/pack-refs.c:15

6699 +msgid "prune loose refs (default)"

6700 +msgstr "ta bort lösa referenser (standard)"

6701 +

6702 +#: builtin/prune-packed.c:7

6703 +msgid "git prune-packed [-n|--dry-run] [-q|--quiet]"

6704 +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]"

6705 +

6706 +#: builtin/prune.c:12

6707 +msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

6708 +msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"

6709 +

6710 +#: builtin/prune.c:132

6711 +msgid "do not remove, show only"

6712 +msgstr "ta inte bort, bara visa"

6713 +

6714 +#: builtin/prune.c:133

6715 +msgid "report pruned objects"

Update Swedish translation (1967t0f0u)