8f69cccbe4 · 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-15 10:21+0800\n"

11 -"PO-Revision-Date: 2012-10-02 08:15+0100\n"

10 +"POT-Creation-Date: 2012-10-16 08:38+0800\n"

11 +"PO-Revision-Date: 2012-10-16 08:36+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"

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

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

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

75

76 -# %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

76 +#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2389

77 +#: builtin/blame.c:2390 builtin/config.c:56 builtin/fast-export.c:642

78 +#: builtin/fast-export.c:644 builtin/grep.c:801 builtin/hash-object.c:77

79 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540

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

81 msgid "file"

82 msgstr "fil"

83

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

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

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

119

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

120 +#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619

121 msgid "command"

122 msgstr "kommando"

123

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

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

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

137

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

138 +#: bundle.c:89 builtin/commit.c:672

139 #, c-format

140 msgid "could not open '%s'"

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

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

144 msgid "Repository lacks these prerequisite commits:"

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

146

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

147 +#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290

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

149 #: builtin/shortlog.c:181

150 msgid "revision walk setup failed"

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

203 msgid "index-pack died"

204 msgstr "index-pack dog"

205

207 -#: commit.c:48

206 +#: commit.c:50

207 #, c-format

208 msgid "could not parse %s"

209 msgstr "kunde inte tolka %s"

210

212 -#: commit.c:50

211 +#: commit.c:52

212 #, c-format

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

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

@@ -318,32 +317,7 @@ msgstr ""

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

318 "%s"

319

321 -#: diff.c:1401

322 -msgid " 0 files changed"

323 -msgstr " 0 filer ändrade"

324 -

325 -#: diff.c:1405

326 -#, c-format

327 -msgid " %d file changed"

328 -msgid_plural " %d files changed"

329 -msgstr[0] " %d fil ändrad"

330 -msgstr[1] " %d filer ändrade"

331 -

332 -#: diff.c:1422

333 -#, c-format

334 -msgid ", %d insertion(+)"

335 -msgid_plural ", %d insertions(+)"

336 -msgstr[0] ", %d tillägg(+)"

337 -msgstr[1] ", %d tillägg(+)"

338 -

339 -#: diff.c:1433

340 -#, c-format

341 -msgid ", %d deletion(-)"

342 -msgid_plural ", %d deletions(-)"

343 -msgstr[0] ", %d borttagning(-)"

344 -msgstr[1] ", %d borttagningar(-)"

345 -

346 -#: diff.c:3460

320 +#: diff.c:3458

321 #, c-format

322 msgid ""

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

@@ -364,17 +338,17 @@ msgstr "gpg godtog inte data"

338 msgid "gpg failed to sign the data"

339 msgstr "gpg misslyckades signera data"

340

367 -#: grep.c:1320

341 +#: grep.c:1441

342 #, c-format

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

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

345

372 -#: grep.c:1337

346 +#: grep.c:1458

347 #, c-format

348 msgid "'%s': %s"

349 msgstr "\"%s\": %s"

350

377 -#: grep.c:1348

351 +#: grep.c:1469

352 #, c-format

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

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

@@ -741,19 +715,19 @@ msgstr[1] ""

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

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

717

744 -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977

718 +#: sequencer.c:123 builtin/merge.c:864 builtin/merge.c:977

719 #: builtin/merge.c:1087 builtin/merge.c:1097

720 #, c-format

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

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

723

750 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867

724 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:867

725 #: builtin/merge.c:1089 builtin/merge.c:1102

726 #, c-format

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

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

729

756 -#: sequencer.c:144

730 +#: sequencer.c:146

731 msgid ""

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

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

@@ -761,7 +735,7 @@ msgstr ""

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

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

737

764 -#: sequencer.c:147

738 +#: sequencer.c:149

739 msgid ""

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

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

@@ -771,214 +745,214 @@ msgstr ""

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

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

747

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

748 +#: sequencer.c:162 sequencer.c:770 sequencer.c:853

749 #, c-format

750 msgid "Could not write to %s"

751 msgstr "Kunde inte skriva till %s"

752

779 -#: sequencer.c:163

753 +#: sequencer.c:165

754 #, c-format

755 msgid "Error wrapping up %s"

756 msgstr "Fel vid ombrytning av %s"

757

784 -#: sequencer.c:178

758 +#: sequencer.c:180

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

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

761

788 -#: sequencer.c:180

762 +#: sequencer.c:182

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

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

765

792 -#: sequencer.c:183

766 +#: sequencer.c:185

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

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

769

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

797 -#: sequencer.c:233

771 +#: sequencer.c:235

772 #, c-format

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

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

775

802 -#: sequencer.c:261

776 +#: sequencer.c:266

777 msgid "Could not resolve HEAD commit\n"

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

779

806 -#: sequencer.c:282

780 +#: sequencer.c:287

781 msgid "Unable to update cache tree\n"

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

783

810 -#: sequencer.c:327

784 +#: sequencer.c:332

785 #, c-format

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

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

788

815 -#: sequencer.c:332

789 +#: sequencer.c:337

790 #, c-format

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

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

793

820 -#: sequencer.c:398

794 +#: sequencer.c:403

795 msgid "Your index file is unmerged."

796 msgstr "Din indexfil har inte slagits ihop."

797

824 -#: sequencer.c:401

798 +#: sequencer.c:406

799 msgid "You do not have a valid HEAD"

800 msgstr "Du har ingen giltig HEAD"

801

828 -#: sequencer.c:416

802 +#: sequencer.c:421

803 #, c-format

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

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

806

833 -#: sequencer.c:424

807 +#: sequencer.c:429

808 #, c-format

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

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

811

838 -#: sequencer.c:428

812 +#: sequencer.c:433

813 #, c-format

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

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

816

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

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

845 -#: sequencer.c:439

819 +#: sequencer.c:444

820 #, c-format

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

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

823

850 -#: sequencer.c:443

824 +#: sequencer.c:448

825 #, c-format

826 msgid "Cannot get commit message for %s"

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

828

855 -#: sequencer.c:527

829 +#: sequencer.c:532

830 #, c-format

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

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

833

860 -#: sequencer.c:528

834 +#: sequencer.c:533

835 #, c-format

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

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

838

865 -#: sequencer.c:560

839 +#: sequencer.c:565

840 msgid "empty commit set passed"

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

842

869 -#: sequencer.c:568

843 +#: sequencer.c:573

844 #, c-format

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

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

847

874 -#: sequencer.c:573

848 +#: sequencer.c:578

849 #, c-format

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

851 msgstr "git %s: misslyckades uppdatera indexet"

852

879 -#: sequencer.c:631

853 +#: sequencer.c:636

854 #, c-format

855 msgid "Cannot %s during a %s"

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

857

884 -#: sequencer.c:653

858 +#: sequencer.c:658

859 #, c-format

860 msgid "Could not parse line %d."

861 msgstr "Kan inte tolka rad %d."

862

889 -#: sequencer.c:658

863 +#: sequencer.c:663

864 msgid "No commits parsed."

865 msgstr "Inga incheckningar lästes."

866

893 -#: sequencer.c:671

867 +#: sequencer.c:676

868 #, c-format

869 msgid "Could not open %s"

870 msgstr "Kunde inte öppna %s"

871

898 -#: sequencer.c:675

872 +#: sequencer.c:680

873 #, c-format

874 msgid "Could not read %s."

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

876

903 -#: sequencer.c:682

877 +#: sequencer.c:687

878 #, c-format

879 msgid "Unusable instruction sheet: %s"

880 msgstr "Oanvändbart manus: %s"

881

908 -#: sequencer.c:710

882 +#: sequencer.c:715

883 #, c-format

884 msgid "Invalid key: %s"

885 msgstr "Felaktig nyckel: %s"

886

913 -#: sequencer.c:713

887 +#: sequencer.c:718

888 #, c-format

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

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

891

918 -#: sequencer.c:725

892 +#: sequencer.c:730

893 #, c-format

894 msgid "Malformed options sheet: %s"

895 msgstr "Trasigt manus: %s"

896

923 -#: sequencer.c:746

897 +#: sequencer.c:751

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

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

900

927 -#: sequencer.c:747

901 +#: sequencer.c:752

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

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

904

931 -#: sequencer.c:751

905 +#: sequencer.c:756

906 #, c-format

907 msgid "Could not create sequencer directory %s"

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

909

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

910 +#: sequencer.c:772 sequencer.c:857

911 #, c-format

912 msgid "Error wrapping up %s."

913 msgstr "Fel vid ombrytning av %s."

914

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

915 +#: sequencer.c:791 sequencer.c:925

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

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

918

945 -#: sequencer.c:788

919 +#: sequencer.c:793

920 msgid "cannot resolve HEAD"

921 msgstr "kan inte bestämma HEAD"

922

949 -#: sequencer.c:790

923 +#: sequencer.c:795

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

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

926

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

927 +#: sequencer.c:817 builtin/apply.c:4005

928 #, c-format

929 msgid "cannot open %s: %s"

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

931

958 -#: sequencer.c:815

932 +#: sequencer.c:820

933 #, c-format

934 msgid "cannot read %s: %s"

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

936

963 -#: sequencer.c:816

937 +#: sequencer.c:821

938 msgid "unexpected end of file"

939 msgstr "oväntat filslut"

940

967 -#: sequencer.c:822

941 +#: sequencer.c:827

942 #, c-format

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

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

945

972 -#: sequencer.c:845

946 +#: sequencer.c:850

947 #, c-format

948 msgid "Could not format %s."

949 msgstr "Kunde inte formatera %s."

950

977 -#: sequencer.c:1007

951 +#: sequencer.c:1012

952 msgid "Can't revert as initial commit"

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

954

981 -#: sequencer.c:1008

955 +#: sequencer.c:1013

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

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

958

@@ -1374,7 +1348,7 @@ msgstr "git add [flaggor] [--] <filmönster>..."

1348 msgid "unexpected diff status %c"

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

1350

1377 -#: builtin/add.c:67 builtin/commit.c:229

1351 +#: builtin/add.c:67 builtin/commit.c:230

1352 msgid "updating files failed"

1353 msgstr "misslyckades uppdatera filer"

1354

@@ -1439,7 +1413,7 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

1413 msgid "dry run"

1414 msgstr "testkörning"

1415

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

1416 +#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1154

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

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

1419 msgid "be verbose"

@@ -1516,7 +1490,7 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

1492

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

1493 +#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:290 builtin/mv.c:82

1494 #: builtin/rm.c:162

1495 msgid "index file corrupt"

1496 msgstr "indexfilen trasig"

@@ -2057,95 +2031,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil"

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

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

2033

2060 -#: builtin/blame.c:2316

2034 +#: builtin/blame.c:2373

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

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

2037

2064 -#: builtin/blame.c:2317

2038 +#: builtin/blame.c:2374

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

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

2041

2068 -#: builtin/blame.c:2318

2042 +#: builtin/blame.c:2375

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

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

2045

2072 -#: builtin/blame.c:2319

2046 +#: builtin/blame.c:2376

2047 msgid "Show work cost statistics"

2048 msgstr "Visa statistik över arbetskostnad"

2049

2076 -#: builtin/blame.c:2320

2050 +#: builtin/blame.c:2377

2051 msgid "Show output score for blame entries"

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

2053

2080 -#: builtin/blame.c:2321

2054 +#: builtin/blame.c:2378

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

2056 msgstr "Visa originalfilnamn (Standard: auto)"

2057

2084 -#: builtin/blame.c:2322

2058 +#: builtin/blame.c:2379

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

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

2061

2088 -#: builtin/blame.c:2323

2062 +#: builtin/blame.c:2380

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

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

2065

2092 -#: builtin/blame.c:2324

2066 +#: builtin/blame.c:2381

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

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

2069

2096 -#: builtin/blame.c:2325

2070 +#: builtin/blame.c:2382

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

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

2073

2100 -#: builtin/blame.c:2326

2074 +#: builtin/blame.c:2383

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

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

2077

2104 -#: builtin/blame.c:2327

2078 +#: builtin/blame.c:2384

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

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

2081

2108 -#: builtin/blame.c:2328

2082 +#: builtin/blame.c:2385

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

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

2085

2112 -#: builtin/blame.c:2329

2086 +#: builtin/blame.c:2386

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

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

2089

2116 -#: builtin/blame.c:2330

2090 +#: builtin/blame.c:2387

2091 msgid "Ignore whitespace differences"

2092 msgstr "Ignorera ändringar i blanksteg"

2093

2120 -#: builtin/blame.c:2331

2094 +#: builtin/blame.c:2388

2095 msgid "Spend extra cycles to find better match"

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

2097

2124 -#: builtin/blame.c:2332

2098 +#: builtin/blame.c:2389

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

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

2101

2128 -#: builtin/blame.c:2333

2102 +#: builtin/blame.c:2390

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

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

2105

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

2106 +#: builtin/blame.c:2391 builtin/blame.c:2392

2107 msgid "score"

2108 msgstr "poäng"

2109

2136 -#: builtin/blame.c:2334

2110 +#: builtin/blame.c:2391

2111 msgid "Find line copies within and across files"

2112 msgstr "Hitta kopierade rader inuti och mellan filer"

2113

2140 -#: builtin/blame.c:2335

2114 +#: builtin/blame.c:2392

2115 msgid "Find line movements within and across files"

2116 msgstr "Hitta flyttade rader inuti och mellan filer"

2117

2144 -#: builtin/blame.c:2336

2118 +#: builtin/blame.c:2393

2119 msgid "n,m"

2120 msgstr "n,m"

2121

2148 -#: builtin/blame.c:2336

2122 +#: builtin/blame.c:2393

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

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

2125

@@ -2354,8 +2328,8 @@ msgid "act on remote-tracking branches"

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

2329

2330 #: 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

2331 +#: builtin/branch.c:771 builtin/commit.c:1362 builtin/commit.c:1363

2332 +#: builtin/commit.c:1364 builtin/commit.c:1365 builtin/tag.c:470

2333 msgid "commit"

2334 msgstr "incheckning"

2335

@@ -2531,8 +2505,8 @@ msgid "git check-attr [-a | --all | attr...] [--] pathname..."

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

2506

2507 #: 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>"

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

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

2510

2511 #: builtin/check-attr.c:19

2512 msgid "report all attributes set on file"

@@ -2912,7 +2886,7 @@ msgstr "tvinga"

2886 msgid "remove whole directories"

2887 msgstr "ta bort hela kataloger"

2888

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

2889 +#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:803

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

2891 msgid "pattern"

2892 msgstr "mönster"

@@ -3038,7 +3012,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD"

3012 msgid "path to git-upload-pack on the remote"

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

3014

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

3015 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:748

3016 msgid "depth"

3017 msgstr "djup"

3018

@@ -3116,69 +3090,69 @@ msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3090 msgstr ""

3091 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

3092

3119 -#: builtin/clone.c:642

3093 +#: builtin/clone.c:690

3094 msgid "Too many arguments."

3095 msgstr "För många argument."

3096

3123 -#: builtin/clone.c:646

3097 +#: builtin/clone.c:694

3098 msgid "You must specify a repository to clone."

3099 msgstr "Du måste ange ett arkiv att klona."

3100

3127 -#: builtin/clone.c:657

3101 +#: builtin/clone.c:705

3102 #, c-format

3103 msgid "--bare and --origin %s options are incompatible."

3104 msgstr "flaggorna --bare och --origin %s är inkompatibla."

3105

3132 -#: builtin/clone.c:671

3106 +#: builtin/clone.c:719

3107 #, c-format

3108 msgid "repository '%s' does not exist"

3109 msgstr "arkivet \"%s\" finns inte"

3110

3137 -#: builtin/clone.c:676

3111 +#: builtin/clone.c:724

3112 msgid "--depth is ignored in local clones; use file:// instead."

3113 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

3114

3141 -#: builtin/clone.c:686

3115 +#: builtin/clone.c:734

3116 #, c-format

3117 msgid "destination path '%s' already exists and is not an empty directory."

3118 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

3119

3146 -#: builtin/clone.c:696

3120 +#: builtin/clone.c:744

3121 #, c-format

3122 msgid "working tree '%s' already exists."

3123 msgstr "arbetsträdet \"%s\" finns redan."

3124

3151 -#: builtin/clone.c:709 builtin/clone.c:723

3125 +#: builtin/clone.c:757 builtin/clone.c:771

3126 #, c-format

3127 msgid "could not create leading directories of '%s'"

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

3129

3156 -#: builtin/clone.c:712

3130 +#: builtin/clone.c:760

3131 #, c-format

3132 msgid "could not create work tree dir '%s'."

3133 msgstr "kunde inte skapa arbetskatalogen \"%s\""

3134

3161 -#: builtin/clone.c:731

3135 +#: builtin/clone.c:779

3136 #, c-format

3137 msgid "Cloning into bare repository '%s'...\n"

3138 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

3139

3166 -#: builtin/clone.c:733

3140 +#: builtin/clone.c:781

3141 #, c-format

3142 msgid "Cloning into '%s'...\n"

3143 msgstr "Klonar till \"%s\"...\n"

3144

3171 -#: builtin/clone.c:789

3145 +#: builtin/clone.c:823

3146 #, c-format

3147 msgid "Don't know how to clone %s"

3148 msgstr "Vet inte hur man klonar %s"

3149

3176 -#: builtin/clone.c:838

3150 +#: builtin/clone.c:872

3151 #, c-format

3152 msgid "Remote branch %s not found in upstream %s"

3153 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

3154

3181 -#: builtin/clone.c:845

3155 +#: builtin/clone.c:879

3156 msgid "You appear to have cloned an empty repository."

3157 msgstr "Du verkar ha klonat ett tomt arkiv."

3158

@@ -3214,15 +3188,15 @@ msgstr "Spaltfyllnad mellan spalter"

3188 msgid "--command must be the first argument"

3189 msgstr "--command måste vara första argument"

3190

3217 -#: builtin/commit.c:33

3191 +#: builtin/commit.c:34

3192 msgid "git commit [options] [--] <filepattern>..."

3193 msgstr "git commit [flaggor] [--] <filmöster>..."

3194

3221 -#: builtin/commit.c:38

3195 +#: builtin/commit.c:39

3196 msgid "git status [options] [--] <filepattern>..."

3197 msgstr "git status [flaggor] [--] <filmönster>..."

3198

3225 -#: builtin/commit.c:43

3199 +#: builtin/commit.c:44

3200 msgid ""

3201 "Your name and email address were configured automatically based\n"

3202 "on your username and hostname. Please check that they are accurate.\n"

@@ -3247,7 +3221,7 @@ msgstr ""

3221 "\n"

3222 " git commit --amend --reset-author\n"

3223

3250 -#: builtin/commit.c:55

3224 +#: builtin/commit.c:56

3225 msgid ""

3226 "You asked to amend the most recent commit, but doing so would make\n"

3227 "it empty. You can repeat your command with --allow-empty, or you can\n"

@@ -3257,7 +3231,7 @@ msgstr ""

3231 "blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"

3232 "så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"

3233

3260 -#: builtin/commit.c:60

3234 +#: builtin/commit.c:61

3235 msgid ""

3236 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"

3237 "If you wish to commit it anyway, use:\n"

@@ -3273,93 +3247,93 @@ msgstr ""

3247 "\n"

3248 "Annars använder du \"git reset\"\n"

3249

3276 -#: builtin/commit.c:256

3250 +#: builtin/commit.c:257

3251 msgid "failed to unpack HEAD tree object"

3252 msgstr "misslyckades packa upp HEAD:s trädobjekt"

3253

3280 -#: builtin/commit.c:298

3254 +#: builtin/commit.c:299

3255 msgid "unable to create temporary index"

3256 msgstr "kunde inte skapa temporär indexfil"

3257

3284 -#: builtin/commit.c:304

3258 +#: builtin/commit.c:305

3259 msgid "interactive add failed"

3260 msgstr "interaktiv tilläggning misslyckades"

3261

3288 -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408

3262 +#: builtin/commit.c:338 builtin/commit.c:359 builtin/commit.c:409

3263 msgid "unable to write new_index file"

3264 msgstr "kunde inte skriva filen new_index"

3265

3292 -#: builtin/commit.c:389

3266 +#: builtin/commit.c:390

3267 msgid "cannot do a partial commit during a merge."

3268 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

3269

3296 -#: builtin/commit.c:391

3270 +#: builtin/commit.c:392

3271 msgid "cannot do a partial commit during a cherry-pick."

3272 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

3273

3300 -#: builtin/commit.c:401

3274 +#: builtin/commit.c:402

3275 msgid "cannot read the index"

3276 msgstr "kan inte läsa indexet"

3277

3304 -#: builtin/commit.c:421

3278 +#: builtin/commit.c:422

3279 msgid "unable to write temporary index file"

3280 msgstr "kunde inte skriva temporär indexfil"

3281

3308 -#: builtin/commit.c:510 builtin/commit.c:516

3282 +#: builtin/commit.c:509 builtin/commit.c:515

3283 #, c-format

3284 msgid "invalid commit: %s"

3285 msgstr "felaktig incheckning: %s"

3286

3313 -#: builtin/commit.c:539

3287 +#: builtin/commit.c:538

3288 msgid "malformed --author parameter"

3289 msgstr "felformad \"--author\"-flagga"

3290

3317 -#: builtin/commit.c:600

3291 +#: builtin/commit.c:558

3292 #, c-format

3293 msgid "Malformed ident string: '%s'"

3294 msgstr "Felaktig indragningssträng: \"%s\""

3295

3322 -#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985

3296 +#: builtin/commit.c:596 builtin/commit.c:629 builtin/commit.c:952

3297 #, c-format

3298 msgid "could not lookup commit %s"

3299 msgstr "kunde inte slå upp incheckningen %s"

3300

3327 -#: builtin/commit.c:650 builtin/shortlog.c:296

3301 +#: builtin/commit.c:608 builtin/shortlog.c:296

3302 #, c-format

3303 msgid "(reading log message from standard input)\n"

3304 msgstr "(läser loggmeddelande från standard in)\n"

3305

3332 -#: builtin/commit.c:652

3306 +#: builtin/commit.c:610

3307 msgid "could not read log from standard input"

3308 msgstr "kunde inte läsa logg från standard in"

3309

3336 -#: builtin/commit.c:656

3310 +#: builtin/commit.c:614

3311 #, c-format

3312 msgid "could not read log file '%s'"

3313 msgstr "kunde inte läsa loggfilen \"%s\""

3314

3341 -#: builtin/commit.c:662

3315 +#: builtin/commit.c:620

3316 msgid "commit has empty message"

3317 msgstr "incheckningen har ett tomt meddelande"

3318

3345 -#: builtin/commit.c:678

3319 +#: builtin/commit.c:636

3320 msgid "could not read MERGE_MSG"

3321 msgstr "kunde inte läsa MERGE_MSG"

3322

3349 -#: builtin/commit.c:682

3323 +#: builtin/commit.c:640

3324 msgid "could not read SQUASH_MSG"

3325 msgstr "kunde inte läsa SQUASH_MSG"

3326

3353 -#: builtin/commit.c:686

3327 +#: builtin/commit.c:644

3328 #, c-format

3329 msgid "could not read '%s'"

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

3331

3358 -#: builtin/commit.c:738

3332 +#: builtin/commit.c:705

3333 msgid "could not write commit template"

3334 msgstr "kunde inte skriva incheckningsmall"

3335

3362 -#: builtin/commit.c:749

3336 +#: builtin/commit.c:716

3337 #, c-format

3338 msgid ""

3339 "\n"

@@ -3374,7 +3348,7 @@ msgstr ""

3348 "\t%s\n"

3349 "och försöker igen.\n"

3350

3377 -#: builtin/commit.c:754

3351 +#: builtin/commit.c:721

3352 #, c-format

3353 msgid ""

3354 "\n"

@@ -3389,7 +3363,7 @@ msgstr ""

3363 "\t%s\n"

3364 "och försöker igen.\n"

3365

3392 -#: builtin/commit.c:766

3366 +#: builtin/commit.c:733

3367 msgid ""

3368 "Please enter the commit message for your changes. Lines starting\n"

3369 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -3397,7 +3371,7 @@ msgstr ""

3371 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

3372 "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

3373

3400 -#: builtin/commit.c:771

3374 +#: builtin/commit.c:738

3375 msgid ""

3376 "Please enter the commit message for your changes. Lines starting\n"

3377 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -3407,131 +3381,131 @@ msgstr ""

3381 "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

3382 "Ett tomt meddelande avbryter incheckningen.\n"

3383

3410 -#: builtin/commit.c:784

3384 +#: builtin/commit.c:751

3385 #, c-format

3386 msgid "%sAuthor: %s"

3387 msgstr "%sFörfattare: %s"

3388

3415 -#: builtin/commit.c:791

3389 +#: builtin/commit.c:758

3390 #, c-format

3391 msgid "%sCommitter: %s"

3392 msgstr "%sIncheckare: %s"

3393

3420 -#: builtin/commit.c:811

3394 +#: builtin/commit.c:778

3395 msgid "Cannot read index"

3396 msgstr "Kan inte läsa indexet"

3397

3424 -#: builtin/commit.c:848

3398 +#: builtin/commit.c:815

3399 msgid "Error building trees"

3400 msgstr "Fel vid byggande av träd"

3401

3428 -#: builtin/commit.c:863 builtin/tag.c:361

3402 +#: builtin/commit.c:830 builtin/tag.c:361

3403 #, c-format

3404 msgid "Please supply the message using either -m or -F option.\n"

3405 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

3406

3433 -#: builtin/commit.c:960

3407 +#: builtin/commit.c:927

3408 #, c-format

3409 msgid "No existing author found with '%s'"

3410 msgstr "Hittade ingen befintlig författare med \"%s\""

3411

3438 -#: builtin/commit.c:975 builtin/commit.c:1175

3412 +#: builtin/commit.c:942 builtin/commit.c:1142

3413 #, c-format

3414 msgid "Invalid untracked files mode '%s'"

3415 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

3416

3443 -#: builtin/commit.c:1015

3417 +#: builtin/commit.c:982

3418 msgid "Using both --reset-author and --author does not make sense"

3419 msgstr "Kan inte använda både --reset-author och --author"

3420

3447 -#: builtin/commit.c:1026

3421 +#: builtin/commit.c:993

3422 msgid "You have nothing to amend."

3423 msgstr "Du har inget att utöka."

3424

3451 -#: builtin/commit.c:1029

3425 +#: builtin/commit.c:996

3426 msgid "You are in the middle of a merge -- cannot amend."

3427 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

3428

3455 -#: builtin/commit.c:1031

3429 +#: builtin/commit.c:998

3430 msgid "You are in the middle of a cherry-pick -- cannot amend."

3431 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

3432

3459 -#: builtin/commit.c:1034

3433 +#: builtin/commit.c:1001

3434 msgid "Options --squash and --fixup cannot be used together"

3435 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

3436

3463 -#: builtin/commit.c:1044

3437 +#: builtin/commit.c:1011

3438 msgid "Only one of -c/-C/-F/--fixup can be used."

3439 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

3440

3467 -#: builtin/commit.c:1046

3441 +#: builtin/commit.c:1013

3442 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

3443 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

3444

3471 -#: builtin/commit.c:1054

3445 +#: builtin/commit.c:1021

3446 msgid "--reset-author can be used only with -C, -c or --amend."

3447 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

3448

3475 -#: builtin/commit.c:1071

3449 +#: builtin/commit.c:1038

3450 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

3451 msgstr ""

3452 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

3453

3480 -#: builtin/commit.c:1073

3454 +#: builtin/commit.c:1040

3455 msgid "No paths with --include/--only does not make sense."

3456 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

3457

3484 -#: builtin/commit.c:1075

3458 +#: builtin/commit.c:1042

3459 msgid "Clever... amending the last one with dirty index."

3460 msgstr "Smart... utöka den senaste med smutsigt index."

3461

3488 -#: builtin/commit.c:1077

3462 +#: builtin/commit.c:1044

3463 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

3464 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

3465

3492 -#: builtin/commit.c:1087 builtin/tag.c:577

3466 +#: builtin/commit.c:1054 builtin/tag.c:577

3467 #, c-format

3468 msgid "Invalid cleanup mode %s"

3469 msgstr "Felaktigt städningsläge %s"

3470

3497 -#: builtin/commit.c:1092

3471 +#: builtin/commit.c:1059

3472 msgid "Paths with -a does not make sense."

3473 msgstr "Kan inte ange sökvägar med -a."

3474

3501 -#: builtin/commit.c:1189 builtin/commit.c:1417

3475 +#: builtin/commit.c:1156 builtin/commit.c:1384

3476 msgid "show status concisely"

3477 msgstr "vis koncis status"

3478

3505 -#: builtin/commit.c:1191 builtin/commit.c:1419

3479 +#: builtin/commit.c:1158 builtin/commit.c:1386

3480 msgid "show branch information"

3481 msgstr "visa information om gren"

3482

3509 -#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389

3483 +#: builtin/commit.c:1160 builtin/commit.c:1388 builtin/push.c:389

3484 msgid "machine-readable output"

3485 msgstr "maskinläsbar utdata"

3486

3513 -#: builtin/commit.c:1196 builtin/commit.c:1423

3487 +#: builtin/commit.c:1163 builtin/commit.c:1390

3488 msgid "terminate entries with NUL"

3489 msgstr "terminera poster med NUL"

3490

3517 -#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636

3491 +#: builtin/commit.c:1165 builtin/commit.c:1393 builtin/fast-export.c:636

3492 #: builtin/fast-export.c:639 builtin/tag.c:461

3493 msgid "mode"

3494 msgstr "läge"

3495

3522 -#: builtin/commit.c:1199 builtin/commit.c:1426

3496 +#: builtin/commit.c:1166 builtin/commit.c:1393

3497 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

3498 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

3499

3526 -#: builtin/commit.c:1202

3500 +#: builtin/commit.c:1169

3501 msgid "show ignored files"

3502 msgstr "visa ignorerade filer"

3503

3530 -#: builtin/commit.c:1203 parse-options.h:151

3504 +#: builtin/commit.c:1170 parse-options.h:151

3505 msgid "when"

3506 msgstr "när"

3507

3534 -#: builtin/commit.c:1204

3508 +#: builtin/commit.c:1171

3509 msgid ""

3510 "ignore changes to submodules, optional when: all, dirty, untracked. "

3511 "(Default: all)"

@@ -3539,217 +3513,217 @@ msgstr ""

3513 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

3514 "(Default: all)"

3515

3542 -#: builtin/commit.c:1206

3516 +#: builtin/commit.c:1173

3517 msgid "list untracked files in columns"

3518 msgstr "visa ospårade filer i spalter"

3519

3546 -#: builtin/commit.c:1275

3520 +#: builtin/commit.c:1242

3521 msgid "couldn't look up newly created commit"

3522 msgstr "kunde inte slå upp en precis skapad incheckning"

3523

3550 -#: builtin/commit.c:1277

3524 +#: builtin/commit.c:1244

3525 msgid "could not parse newly created commit"

3526 msgstr "kunde inte tolka en precis skapad incheckning"

3527

3554 -#: builtin/commit.c:1318

3528 +#: builtin/commit.c:1285

3529 msgid "detached HEAD"

3530 msgstr "frånkopplad HEAD"

3531

3558 -#: builtin/commit.c:1320

3532 +#: builtin/commit.c:1287

3533 msgid " (root-commit)"

3534 msgstr " (rotincheckning)"

3535

3562 -#: builtin/commit.c:1387

3536 +#: builtin/commit.c:1354

3537 msgid "suppress summary after successful commit"

3538 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

3539

3566 -#: builtin/commit.c:1388

3540 +#: builtin/commit.c:1355

3541 msgid "show diff in commit message template"

3542 msgstr "visa diff i mallen för incheckningsmeddelandet"

3543

3570 -#: builtin/commit.c:1390

3544 +#: builtin/commit.c:1357

3545 msgid "Commit message options"

3546 msgstr "Alternativ för incheckningsmeddelande"

3547

3574 -#: builtin/commit.c:1391 builtin/tag.c:459

3548 +#: builtin/commit.c:1358 builtin/tag.c:459

3549 msgid "read message from file"

3550 msgstr "läs meddelande från fil"

3551

3578 -#: builtin/commit.c:1392

3552 +#: builtin/commit.c:1359

3553 msgid "author"

3554 msgstr "författare"

3555

3582 -#: builtin/commit.c:1392

3556 +#: builtin/commit.c:1359

3557 msgid "override author for commit"

3558 msgstr "överstyr författare för incheckningen"

3559

3586 -#: builtin/commit.c:1393 builtin/gc.c:178

3560 +#: builtin/commit.c:1360 builtin/gc.c:178

3561 msgid "date"

3562 msgstr "datum"

3563

3590 -#: builtin/commit.c:1393

3564 +#: builtin/commit.c:1360

3565 msgid "override date for commit"

3566 msgstr "överstyr datum för inchecknignen"

3567

3594 -#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534

3595 -#: builtin/notes.c:691 builtin/tag.c:457

3568 +#: builtin/commit.c:1361 builtin/merge.c:206 builtin/notes.c:537

3569 +#: builtin/notes.c:694 builtin/tag.c:457

3570 msgid "message"

3571 msgstr "meddelande"

3572

3599 -#: builtin/commit.c:1394

3573 +#: builtin/commit.c:1361

3574 msgid "commit message"

3575 msgstr "incheckningsmeddelande"

3576

3603 -#: builtin/commit.c:1395

3577 +#: builtin/commit.c:1362

3578 msgid "reuse and edit message from specified commit"

3579 msgstr "återanvänd och redigera meddelande från angiven incheckning"

3580

3607 -#: builtin/commit.c:1396

3581 +#: builtin/commit.c:1363

3582 msgid "reuse message from specified commit"

3583 msgstr "återanvänd meddelande från angiven incheckning"

3584

3611 -#: builtin/commit.c:1397

3585 +#: builtin/commit.c:1364

3586 msgid "use autosquash formatted message to fixup specified commit"

3587 msgstr ""

3588 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

3589

3616 -#: builtin/commit.c:1398

3590 +#: builtin/commit.c:1365

3591 msgid "use autosquash formatted message to squash specified commit"

3592 msgstr ""

3593 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

3594 "incheckning"

3595

3622 -#: builtin/commit.c:1399

3596 +#: builtin/commit.c:1366

3597 msgid "the commit is authored by me now (used with -C/-c/--amend)"

3598 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

3599

3626 -#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109

3600 +#: builtin/commit.c:1367 builtin/log.c:1068 builtin/revert.c:109

3601 msgid "add Signed-off-by:"

3602 msgstr "lägg till Signed-off-by:"

3603

3630 -#: builtin/commit.c:1401

3604 +#: builtin/commit.c:1368

3605 msgid "use specified template file"

3606 msgstr "använd angiven mallfil"

3607

3634 -#: builtin/commit.c:1402

3608 +#: builtin/commit.c:1369

3609 msgid "force edit of commit"

3610 msgstr "tvinga redigering av incheckning"

3611

3638 -#: builtin/commit.c:1403

3612 +#: builtin/commit.c:1370

3613 msgid "default"

3614 msgstr "standard"

3615

3642 -#: builtin/commit.c:1403 builtin/tag.c:462

3616 +#: builtin/commit.c:1370 builtin/tag.c:462

3617 msgid "how to strip spaces and #comments from message"

3618 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

3619

3646 -#: builtin/commit.c:1404

3620 +#: builtin/commit.c:1371

3621 msgid "include status in commit message template"

3622 msgstr "inkludera status i mallen för incheckningsmeddelandet"

3623

3650 -#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463

3624 +#: builtin/commit.c:1372 builtin/merge.c:213 builtin/tag.c:463

3625 msgid "key id"

3626 msgstr "nyckel-id"

3627

3654 -#: builtin/commit.c:1406 builtin/merge.c:214

3628 +#: builtin/commit.c:1373 builtin/merge.c:214

3629 msgid "GPG sign commit"

3630 msgstr "GPG-signera incheckning"

3631

3632 #. end commit message options

3659 -#: builtin/commit.c:1409

3633 +#: builtin/commit.c:1376

3634 msgid "Commit contents options"

3635 msgstr "Alternativ för incheckningens innehåll"

3636

3663 -#: builtin/commit.c:1410

3637 +#: builtin/commit.c:1377

3638 msgid "commit all changed files"

3639 msgstr "checka in alla ändrade filer"

3640

3667 -#: builtin/commit.c:1411

3641 +#: builtin/commit.c:1378

3642 msgid "add specified files to index for commit"

3643 msgstr "lägg till angivna filer till indexet för incheckning"

3644

3671 -#: builtin/commit.c:1412

3645 +#: builtin/commit.c:1379

3646 msgid "interactively add files"

3647 msgstr "lägg till filer interaktivt"

3648

3675 -#: builtin/commit.c:1413

3649 +#: builtin/commit.c:1380

3650 msgid "interactively add changes"

3651 msgstr "lägg till ändringar interaktivt"

3652

3679 -#: builtin/commit.c:1414

3653 +#: builtin/commit.c:1381

3654 msgid "commit only specified files"

3655 msgstr "checka endast in angivna filer"

3656

3683 -#: builtin/commit.c:1415

3657 +#: builtin/commit.c:1382

3658 msgid "bypass pre-commit hook"

3659 msgstr "förbigå pre-commit-krok"

3660

3687 -#: builtin/commit.c:1416

3661 +#: builtin/commit.c:1383

3662 msgid "show what would be committed"

3663 msgstr "visa vad som skulle checkas in"

3664

3691 -#: builtin/commit.c:1424

3665 +#: builtin/commit.c:1391

3666 msgid "amend previous commit"

3667 msgstr "lägg till föregående incheckning"

3668

3695 -#: builtin/commit.c:1425

3669 +#: builtin/commit.c:1392

3670 msgid "bypass post-rewrite hook"

3671 msgstr "förbigå post-rewrite-krok"

3672

3699 -#: builtin/commit.c:1430

3673 +#: builtin/commit.c:1397

3674 msgid "ok to record an empty change"

3675 msgstr "ok att registrera en tom ändring"

3676

3703 -#: builtin/commit.c:1433

3677 +#: builtin/commit.c:1400

3678 msgid "ok to record a change with an empty message"

3679 msgstr "ok att registrera en ändring med tomt meddelande"

3680

3707 -#: builtin/commit.c:1464

3681 +#: builtin/commit.c:1432

3682 msgid "could not parse HEAD commit"

3683 msgstr "kunde inte tolka HEAD:s incheckning"

3684

3711 -#: builtin/commit.c:1502 builtin/merge.c:508

3685 +#: builtin/commit.c:1470 builtin/merge.c:508

3686 #, c-format

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

3688 msgstr "kunde inte öppna \"%s\" för läsning"

3689

3716 -#: builtin/commit.c:1509

3690 +#: builtin/commit.c:1477

3691 #, c-format

3692 msgid "Corrupt MERGE_HEAD file (%s)"

3693 msgstr "Trasig MERGE_HEAD-fil (%s)"

3694

3721 -#: builtin/commit.c:1516

3695 +#: builtin/commit.c:1484

3696 msgid "could not read MERGE_MODE"

3697 msgstr "kunde inte läsa MERGE_MODE"

3698

3725 -#: builtin/commit.c:1535

3699 +#: builtin/commit.c:1503

3700 #, c-format

3701 msgid "could not read commit message: %s"

3702 msgstr "kunde inte läsa incheckningsmeddelande: %s"

3703

3730 -#: builtin/commit.c:1549

3704 +#: builtin/commit.c:1517

3705 #, c-format

3706 msgid "Aborting commit; you did not edit the message.\n"

3707 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

3708

3735 -#: builtin/commit.c:1554

3709 +#: builtin/commit.c:1522

3710 #, c-format

3711 msgid "Aborting commit due to empty commit message.\n"

3712 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

3713

3740 -#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960

3714 +#: builtin/commit.c:1537 builtin/merge.c:935 builtin/merge.c:960

3715 msgid "failed to write commit object"

3716 msgstr "kunde inte skriva incheckningsobjekt"

3717

3744 -#: builtin/commit.c:1590

3718 +#: builtin/commit.c:1558

3719 msgid "cannot lock HEAD ref"

3720 msgstr "kunde inte låsa HEAD-referens"

3721

3748 -#: builtin/commit.c:1594

3722 +#: builtin/commit.c:1562

3723 msgid "cannot update HEAD ref"

3724 msgstr "kunde inte uppdatera HEAD-referens"

3725

3752 -#: builtin/commit.c:1605

3726 +#: builtin/commit.c:1573

3727 msgid ""

3728 "Repository has been updated, but unable to write\n"

3729 "new_index file. Check that disk is not full or quota is\n"

@@ -4179,67 +4153,67 @@ msgstr "Kunde inte hitta fjärr-referensen HEAD"

4153 msgid "object %s not found"

4154 msgstr "objektet %s hittades inte"

4155

4182 -#: builtin/fetch.c:260

4156 +#: builtin/fetch.c:259

4157 msgid "[up to date]"

4158 msgstr "[àjour]"

4159

4186 -#: builtin/fetch.c:274

4160 +#: builtin/fetch.c:273

4161 #, c-format

4162 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

4163 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

4164

4191 -#: builtin/fetch.c:275 builtin/fetch.c:361

4165 +#: builtin/fetch.c:274 builtin/fetch.c:360

4166 msgid "[rejected]"

4167 msgstr "[refuserad]"

4168

4195 -#: builtin/fetch.c:286

4169 +#: builtin/fetch.c:285

4170 msgid "[tag update]"

4171 msgstr "[uppdaterad tagg]"

4172

4199 -#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341

4173 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340

4174 msgid " (unable to update local ref)"

4175 msgstr " (kunde inte uppdatera lokal ref)"

4176

4203 -#: builtin/fetch.c:306

4177 +#: builtin/fetch.c:305

4178 msgid "[new tag]"

4179 msgstr "[ny tagg]"

4180

4207 -#: builtin/fetch.c:309

4181 +#: builtin/fetch.c:308

4182 msgid "[new branch]"

4183 msgstr "[ny gren]"

4184

4211 -#: builtin/fetch.c:312

4185 +#: builtin/fetch.c:311

4186 msgid "[new ref]"

4187 msgstr "[ny ref]"

4188

4215 -#: builtin/fetch.c:357

4189 +#: builtin/fetch.c:356

4190 msgid "unable to update local ref"

4191 msgstr "kunde inte uppdatera lokal ref"

4192

4219 -#: builtin/fetch.c:357

4193 +#: builtin/fetch.c:356

4194 msgid "forced update"

4195 msgstr "tvingad uppdatering"

4196

4223 -#: builtin/fetch.c:363

4197 +#: builtin/fetch.c:362

4198 msgid "(non-fast-forward)"

4199 msgstr "(ej snabbspolad)"

4200

4227 -#: builtin/fetch.c:394 builtin/fetch.c:686

4201 +#: builtin/fetch.c:393 builtin/fetch.c:685

4202 #, c-format

4203 msgid "cannot open %s: %s\n"

4204 msgstr "kan inte öppna %s: %s\n"

4205

4232 -#: builtin/fetch.c:403

4206 +#: builtin/fetch.c:402

4207 #, c-format

4208 msgid "%s did not send all necessary objects\n"

4209 msgstr "%s sände inte alla nödvändiga objekt\n"

4210

4237 -#: builtin/fetch.c:489

4211 +#: builtin/fetch.c:488

4212 #, c-format

4213 msgid "From %.*s\n"

4214 msgstr "Från %.*s\n"

4215

4242 -#: builtin/fetch.c:500

4216 +#: builtin/fetch.c:499

4217 #, c-format

4218 msgid ""

4219 "some local refs could not be updated; try running\n"

@@ -4248,55 +4222,55 @@ msgstr ""

4222 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

4223 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

4224

4251 -#: builtin/fetch.c:550

4225 +#: builtin/fetch.c:549

4226 #, c-format

4227 msgid " (%s will become dangling)"

4228 msgstr " (%s kommer bli dinglande)"

4229

4256 -#: builtin/fetch.c:551

4230 +#: builtin/fetch.c:550

4231 #, c-format

4232 msgid " (%s has become dangling)"

4233 msgstr " (%s har blivit dinglande)"

4234

4261 -#: builtin/fetch.c:558

4235 +#: builtin/fetch.c:557

4236 msgid "[deleted]"

4237 msgstr "[borttagen]"

4238

4265 -#: builtin/fetch.c:559 builtin/remote.c:1055

4239 +#: builtin/fetch.c:558 builtin/remote.c:1055

4240 msgid "(none)"

4241 msgstr "(ingen)"

4242

4269 -#: builtin/fetch.c:676

4243 +#: builtin/fetch.c:675

4244 #, c-format

4245 msgid "Refusing to fetch into current branch %s of non-bare repository"

4246 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

4247

4274 -#: builtin/fetch.c:710

4248 +#: builtin/fetch.c:709

4249 #, c-format

4250 msgid "Don't know how to fetch from %s"

4251 msgstr "Vet inte hur man hämtar från %s"

4252

4279 -#: builtin/fetch.c:787

4253 +#: builtin/fetch.c:786

4254 #, c-format

4255 msgid "Option \"%s\" value \"%s\" is not valid for %s"

4256 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

4257

4284 -#: builtin/fetch.c:790

4258 +#: builtin/fetch.c:789

4259 #, c-format

4260 msgid "Option \"%s\" is ignored for %s\n"

4261 msgstr "Flaggan \"%s\" ignoreras för %s\n"

4262

4289 -#: builtin/fetch.c:892

4263 +#: builtin/fetch.c:891

4264 #, c-format

4265 msgid "Fetching %s\n"

4266 msgstr "Hämtar %s\n"

4267

4294 -#: builtin/fetch.c:894 builtin/remote.c:100

4268 +#: builtin/fetch.c:893 builtin/remote.c:100

4269 #, c-format

4270 msgid "Could not fetch %s"

4271 msgstr "Kunde inte hämta %s"

4272

4299 -#: builtin/fetch.c:913

4273 +#: builtin/fetch.c:912

4274 msgid ""

4275 "No remote repository specified. Please, specify either a URL or a\n"

4276 "remote name from which new revisions should be fetched."

@@ -4304,24 +4278,24 @@ msgstr ""

4278 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

4279 "fjärrarkiv som nya incheckningar skall hämtas från."

4280

4307 -#: builtin/fetch.c:933

4281 +#: builtin/fetch.c:932

4282 msgid "You need to specify a tag name."

4283 msgstr "Du måste ange namnet på en tagg."

4284

4311 -#: builtin/fetch.c:985

4285 +#: builtin/fetch.c:984

4286 msgid "fetch --all does not take a repository argument"

4287 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

4288

4315 -#: builtin/fetch.c:987

4289 +#: builtin/fetch.c:986

4290 msgid "fetch --all does not make sense with refspecs"

4291 msgstr "fetch --all kan inte anges med referensspecifikationer"

4292

4319 -#: builtin/fetch.c:998

4293 +#: builtin/fetch.c:997

4294 #, c-format

4295 msgid "No such remote or remote group: %s"

4296 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

4297

4324 -#: builtin/fetch.c:1006

4298 +#: builtin/fetch.c:1005

4299 msgid "Fetching a group and specifying refspecs does not make sense"

4300 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

4301

@@ -4330,7 +4304,7 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]"

4304 msgstr ""

4305 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

4306

4333 -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786

4307 +#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:787

4308 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192

4309 #: builtin/tag.c:448 parse-options.h:133 parse-options.h:235

4310 msgid "n"

@@ -4466,12 +4440,7 @@ msgstr "var mer grundlig (ökar körtiden)"

4440 msgid "enable auto-gc mode"

4441 msgstr "aktivera auto-gc-läge"

4442

4469 -#: builtin/gc.c:221

4470 -#, c-format

4471 -msgid "Auto packing the repository for optimum performance.\n"

4472 -msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

4473 -

4474 -#: builtin/gc.c:224

4443 +#: builtin/gc.c:222

4444 #, c-format

4445 msgid ""

4446 "Auto packing the repository for optimum performance. You may also\n"

@@ -4480,7 +4449,7 @@ msgstr ""

4449 "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"

4450 "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"

4451

4483 -#: builtin/gc.c:251

4452 +#: builtin/gc.c:249

4453 msgid ""

4454 "There are too many unreachable loose objects; run 'git prune' to remove them."

4455 msgstr ""

@@ -4491,227 +4460,230 @@ msgstr ""

4460 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"

4461 msgstr "git grep [flaggor] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"

4462

4494 -#: builtin/grep.c:216

4463 +#: builtin/grep.c:217

4464 #, c-format

4465 msgid "grep: failed to create thread: %s"

4466 msgstr "grep: misslyckades skapa tråd. %s"

4467

4499 -#: builtin/grep.c:454

4468 +#: builtin/grep.c:455

4469 #, c-format

4470 msgid "Failed to chdir: %s"

4471 msgstr "Kunde inte byta katalog (chdir): %s"

4472

4504 -#: builtin/grep.c:530 builtin/grep.c:564

4473 +#: builtin/grep.c:531 builtin/grep.c:565

4474 #, c-format

4475 msgid "unable to read tree (%s)"

4476 msgstr "kunde inte läsa träd (%s)"

4477

4509 -#: builtin/grep.c:578

4478 +#: builtin/grep.c:579

4479 #, c-format

4480 msgid "unable to grep from object of type %s"

4481 msgstr "Kunde inte \"grep\" från objekt av typen %s"

4482

4514 -#: builtin/grep.c:636

4483 +#: builtin/grep.c:637

4484 #, c-format

4485 msgid "switch `%c' expects a numerical value"

4486 msgstr "flaggan \"%c\" antar ett numeriskt värde"

4487

4519 -#: builtin/grep.c:653

4488 +#: builtin/grep.c:654

4489 #, c-format

4490 msgid "cannot open '%s'"

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

4492

4524 -#: builtin/grep.c:728

4493 +#: builtin/grep.c:729

4494 msgid "search in index instead of in the work tree"

4495 msgstr "sök i indexet istället för i arbetskatalogen"

4496

4528 -#: builtin/grep.c:730

4497 +#: builtin/grep.c:731

4498 msgid "find in contents not managed by git"

4499 msgstr "sök i innehål som inte hanteras av git"

4500

4532 -#: builtin/grep.c:732

4501 +#: builtin/grep.c:733

4502 msgid "search in both tracked and untracked files"

4503 msgstr "sök i både spårade och ospårade filer"

4504

4536 -#: builtin/grep.c:734

4505 +#: builtin/grep.c:735

4506 msgid "search also in ignored files"

4507 msgstr "sök även i ignorerade filer"

4508

4540 -#: builtin/grep.c:737

4509 +#: builtin/grep.c:738

4510 msgid "show non-matching lines"

4511 msgstr "vis rader som inte träffas"

4512

4544 -#: builtin/grep.c:739

4513 +#: builtin/grep.c:740

4514 msgid "case insensitive matching"

4515 msgstr "skiftlägesokänslig sökning"

4516

4548 -#: builtin/grep.c:741

4517 +#: builtin/grep.c:742

4518 msgid "match patterns only at word boundaries"

4519 msgstr "matcha endast mönster vid ordgränser"

4520

4552 -#: builtin/grep.c:743

4521 +#: builtin/grep.c:744

4522 msgid "process binary files as text"

4523 msgstr "hantera binärfiler som text"

4524

4556 -#: builtin/grep.c:745

4525 +#: builtin/grep.c:746

4526 msgid "don't match patterns in binary files"

4527 msgstr "träffa inte mönster i binärfiler"

4528

4560 -#: builtin/grep.c:748

4529 +#: builtin/grep.c:749

4530 msgid "descend at most <depth> levels"

4531 msgstr "gå som mest ned <djup> nivåer"

4532

4564 -#: builtin/grep.c:752

4533 +#: builtin/grep.c:753

4534 msgid "use extended POSIX regular expressions"

4535 msgstr "använd utökade POSIX-reguljära uttryck"

4536

4568 -#: builtin/grep.c:755

4537 +#: builtin/grep.c:756

4538 msgid "use basic POSIX regular expressions (default)"

4539 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

4540

4572 -#: builtin/grep.c:758

4541 +#: builtin/grep.c:759

4542 msgid "interpret patterns as fixed strings"

4543 msgstr "tolka mönster som fixerade strängar"

4544

4576 -#: builtin/grep.c:761

4545 +#: builtin/grep.c:762

4546 msgid "use Perl-compatible regular expressions"

4547 msgstr "använd Perlkompatibla reguljära uttryck"

4548

4580 -#: builtin/grep.c:764

4549 +#: builtin/grep.c:765

4550 msgid "show line numbers"

4551 msgstr "visa radnummer"

4552

4584 -#: builtin/grep.c:765

4553 +#: builtin/grep.c:766

4554 msgid "don't show filenames"

4555 msgstr "visa inte filnamn"

4556

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

4589 -#: builtin/grep.c:766

4557 +#: builtin/grep.c:767

4558 msgid "show filenames"

4559 msgstr "visa filnamn"

4560

4593 -#: builtin/grep.c:768

4561 +#: builtin/grep.c:769

4562 msgid "show filenames relative to top directory"

4563 msgstr "visa filnamn relativa till toppkatalogen"

4564

4597 -#: builtin/grep.c:770

4565 +#: builtin/grep.c:771

4566 msgid "show only filenames instead of matching lines"

4567 msgstr "visa endast filnamn istället för träffade rader"

4568

4601 -#: builtin/grep.c:772

4569 +#: builtin/grep.c:773

4570 msgid "synonym for --files-with-matches"

4571 msgstr "synonym för --files-with-matches"

4572

4605 -#: builtin/grep.c:775

4573 +#: builtin/grep.c:776

4574 msgid "show only the names of files without match"

4575 msgstr "visa endast namn på filer utan träffar"

4576

4609 -#: builtin/grep.c:777

4577 +#: builtin/grep.c:778

4578 msgid "print NUL after filenames"

4579 msgstr "skriv NUL efter filnamn"

4580

4613 -#: builtin/grep.c:779

4581 +#: builtin/grep.c:780

4582 msgid "show the number of matches instead of matching lines"

4583 msgstr "visa antal träffar istället för träffade rader"

4584

4617 -#: builtin/grep.c:780

4585 +#: builtin/grep.c:781

4586 msgid "highlight matches"

4587 msgstr "ljusmarkera träffar"

4588

4621 -#: builtin/grep.c:782

4589 +#: builtin/grep.c:783

4590 msgid "print empty line between matches from different files"

4591 msgstr "skriv tomma rader mellan träffar från olika filer"

4592

4625 -#: builtin/grep.c:784

4593 +#: builtin/grep.c:785

4594 msgid "show filename only once above matches from same file"

4595 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

4596

4629 -#: builtin/grep.c:787

4597 +#: builtin/grep.c:788

4598 msgid "show <n> context lines before and after matches"

4599 msgstr "visa <n> rader sammanhang före och efter träffar"

4600

4633 -#: builtin/grep.c:790

4601 +#: builtin/grep.c:791

4602 msgid "show <n> context lines before matches"

4603 msgstr "visa <n> rader sammanhang före träffar"

4604

4637 -#: builtin/grep.c:792

4605 +#: builtin/grep.c:793

4606 msgid "show <n> context lines after matches"

4607 msgstr "visa <n> rader sammanhang efter träffar"

4608

4641 -#: builtin/grep.c:793

4609 +#: builtin/grep.c:794

4610 msgid "shortcut for -C NUM"

4611 msgstr "genväg för -C NUM"

4612

4645 -#: builtin/grep.c:796

4613 +#: builtin/grep.c:797

4614 msgid "show a line with the function name before matches"

4615 msgstr "visa en rad med funktionsnamnet före träffen"

4616

4649 -#: builtin/grep.c:798

4617 +#: builtin/grep.c:799

4618 msgid "show the surrounding function"

4619 msgstr "visa den omkringliggande funktionen"

4620

4653 -#: builtin/grep.c:801

4621 +#: builtin/grep.c:802

4622 msgid "read patterns from file"

4623 msgstr "läs mönster från fil"

4624

4657 -#: builtin/grep.c:803

4625 +#: builtin/grep.c:804

4626 msgid "match <pattern>"

4627 msgstr "träffa <mönster>"

4628

4661 -#: builtin/grep.c:805

4629 +#: builtin/grep.c:806

4630 msgid "combine patterns specified with -e"

4631 msgstr "kombinera mönster som anges med -e"

4632

4665 -#: builtin/grep.c:817

4633 +#: builtin/grep.c:818

4634 msgid "indicate hit with exit status without output"

4635 msgstr "ange träff med slutstatuskod utan utdata"

4636

4669 -#: builtin/grep.c:819

4637 +#: builtin/grep.c:820

4638 msgid "show only matches from files that match all patterns"

4639 msgstr "visa endast träffar från filer som träffar alla mönster"

4640

4641 #: builtin/grep.c:822

4642 +msgid "show parse tree for grep expression"

4643 +msgstr "visa analysträd för grep-uttryck"

4644 +

4645 +#: builtin/grep.c:826

4646 msgid "pager"

4647 msgstr "bläddrare"

4648

4677 -#: builtin/grep.c:822

4649 +#: builtin/grep.c:826

4650 msgid "show matching files in the pager"

4651 msgstr "visa träffade filer i filbläddraren"

4652

4681 -#: builtin/grep.c:825

4653 +#: builtin/grep.c:829

4654 msgid "allow calling of grep(1) (ignored by this build)"

4655 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

4656

4685 -#: builtin/grep.c:826 builtin/show-ref.c:201

4657 +#: builtin/grep.c:830 builtin/show-ref.c:201

4658 msgid "show usage"

4659 msgstr "visa användning"

4660

4689 -#: builtin/grep.c:917

4661 +#: builtin/grep.c:921

4662 msgid "no pattern given."

4663 msgstr "inget mönster angavs."

4664

4693 -#: builtin/grep.c:931

4665 +#: builtin/grep.c:935

4666 #, c-format

4667 msgid "bad object %s"

4668 msgstr "felaktigt objekt %s"

4669

4698 -#: builtin/grep.c:972

4670 +#: builtin/grep.c:976

4671 msgid "--open-files-in-pager only works on the worktree"

4672 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

4673

4702 -#: builtin/grep.c:995

4674 +#: builtin/grep.c:999

4675 msgid "--cached or --untracked cannot be used with --no-index."

4676 msgstr "--cached och --untracked kan inte användas med --no-index."

4677

4706 -#: builtin/grep.c:1000

4678 +#: builtin/grep.c:1004

4679 msgid "--no-index or --untracked cannot be used with revs."

4680 msgstr "--no-index och --untracked kan inte användas med revisioner."

4681

4710 -#: builtin/grep.c:1003

4682 +#: builtin/grep.c:1007

4683 msgid "--[no-]exclude-standard cannot be used for tracked contents."

4684 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

4685

4714 -#: builtin/grep.c:1011

4686 +#: builtin/grep.c:1015

4687 msgid "both --cached and trees are given."

4688 msgstr "både --cached och träd angavs."

4689

@@ -5718,7 +5690,7 @@ msgstr "tillåt snabbspolning (standard)"

5690 msgid "abort if fast-forward is not possible"

5691 msgstr "avbryt om snabbspolning inte är möjlig"

5692

5721 -#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112

5693 +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112

5694 msgid "strategy"

5695 msgstr "strategi"

5696

@@ -6181,11 +6153,11 @@ msgstr "läs från standard in"

6153 msgid "allow to print `undefined` names"

6154 msgstr "tillåt att skriva \"odefinierade\" namn"

6155

6184 -#: builtin/notes.c:23

6156 +#: builtin/notes.c:26

6157 msgid "git notes [--ref <notes_ref>] [list [<object>]]"

6158 msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"

6159

6188 -#: builtin/notes.c:24

6160 +#: builtin/notes.c:27

6161 msgid ""

6162 "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "

6163 "<object>] [<object>]"

@@ -6193,12 +6165,12 @@ msgstr ""

6165 "git notes [--ref <anteckningsref>] add [-f] [-m <medd> | -F <fil> | (-c | -"

6166 "C) <objekt>] [<objekt>]"

6167

6196 -#: builtin/notes.c:25

6168 +#: builtin/notes.c:28

6169 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"

6170 msgstr ""

6171 "git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"

6172

6201 -#: builtin/notes.c:26

6173 +#: builtin/notes.c:29

6174 msgid ""

6175 "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "

6176 "<object>] [<object>]"

@@ -6206,226 +6178,226 @@ msgstr ""

6178 "git notes [--ref <anteckningsref>] append [-m <medd> | -F <fil> | (-c | -C) "

6179 "<objekt>] [<objekt>]"

6180

6209 -#: builtin/notes.c:27

6181 +#: builtin/notes.c:30

6182 msgid "git notes [--ref <notes_ref>] edit [<object>]"

6183 msgstr "git notes [--ref <anteckningsref>] edit [<objekt>]"

6184

6213 -#: builtin/notes.c:28

6185 +#: builtin/notes.c:31

6186 msgid "git notes [--ref <notes_ref>] show [<object>]"

6187 msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"

6188

6217 -#: builtin/notes.c:29

6189 +#: builtin/notes.c:32

6190 msgid ""

6191 "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>"

6192 msgstr ""

6193 "git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi> ] "

6194 "<anteckningsref>"

6195

6224 -#: builtin/notes.c:30

6196 +#: builtin/notes.c:33

6197 msgid "git notes merge --commit [-v | -q]"

6198 msgstr "git notes merge --commit [-v | -q]"

6199

6228 -#: builtin/notes.c:31

6200 +#: builtin/notes.c:34

6201 msgid "git notes merge --abort [-v | -q]"

6202 msgstr "git notes merge --abort [-v | -q]"

6203

6232 -#: builtin/notes.c:32

6204 +#: builtin/notes.c:35

6205 msgid "git notes [--ref <notes_ref>] remove [<object>...]"

6206 msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"

6207

6236 -#: builtin/notes.c:33

6208 +#: builtin/notes.c:36

6209 msgid "git notes [--ref <notes_ref>] prune [-n | -v]"

6210 msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"

6211

6240 -#: builtin/notes.c:34

6212 +#: builtin/notes.c:37

6213 msgid "git notes [--ref <notes_ref>] get-ref"

6214 msgstr "git notes [--ref <anteckningsref>] get-ref"

6215

6244 -#: builtin/notes.c:39

6216 +#: builtin/notes.c:42

6217 msgid "git notes [list [<object>]]"

6218 msgstr "git notes [list [<objekt>]]"

6219

6248 -#: builtin/notes.c:44

6220 +#: builtin/notes.c:47

6221 msgid "git notes add [<options>] [<object>]"

6222 msgstr "git notes add [<flaggor>] [<objekt>]"

6223

6252 -#: builtin/notes.c:49

6224 +#: builtin/notes.c:52

6225 msgid "git notes copy [<options>] <from-object> <to-object>"

6226 msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"

6227

6256 -#: builtin/notes.c:50

6228 +#: builtin/notes.c:53

6229 msgid "git notes copy --stdin [<from-object> <to-object>]..."

6230 msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."

6231

6260 -#: builtin/notes.c:55

6232 +#: builtin/notes.c:58

6233 msgid "git notes append [<options>] [<object>]"

6234 msgstr "git notes append [<flaggor>] [<objekt>]"

6235

6264 -#: builtin/notes.c:60

6236 +#: builtin/notes.c:63

6237 msgid "git notes edit [<object>]"

6238 msgstr "git notes edit [<objekt>]"

6239

6268 -#: builtin/notes.c:65

6240 +#: builtin/notes.c:68

6241 msgid "git notes show [<object>]"

6242 msgstr "git notes show [<objekt>]"

6243

6272 -#: builtin/notes.c:70

6244 +#: builtin/notes.c:73

6245 msgid "git notes merge [<options>] <notes_ref>"

6246 msgstr "git notes merge [<flaggor>] <anteckningsref>"

6247

6276 -#: builtin/notes.c:71

6248 +#: builtin/notes.c:74

6249 msgid "git notes merge --commit [<options>]"

6250 msgstr "git notes merge --commit [<flaggor>]"

6251

6280 -#: builtin/notes.c:72

6252 +#: builtin/notes.c:75

6253 msgid "git notes merge --abort [<options>]"

6254 msgstr "git notes merge --abort [<flaggor>]"

6255

6284 -#: builtin/notes.c:77

6256 +#: builtin/notes.c:80

6257 msgid "git notes remove [<object>]"

6258 msgstr "git notes remove [<objekt>]"

6259

6288 -#: builtin/notes.c:82

6260 +#: builtin/notes.c:85

6261 msgid "git notes prune [<options>]"

6262 msgstr "git notes prune [<flaggor>]"

6263

6292 -#: builtin/notes.c:87

6264 +#: builtin/notes.c:90

6265 msgid "git notes get-ref"

6266 msgstr "git notes get-ref"

6267

6296 -#: builtin/notes.c:139

6268 +#: builtin/notes.c:142

6269 #, c-format

6270 msgid "unable to start 'show' for object '%s'"

6271 msgstr "kunde inte starta \"show\" för objektet \"%s\""

6272

6301 -#: builtin/notes.c:145

6273 +#: builtin/notes.c:148

6274 msgid "can't fdopen 'show' output fd"

6275 msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"

6276

6305 -#: builtin/notes.c:155

6277 +#: builtin/notes.c:158

6278 #, c-format

6279 msgid "failed to close pipe to 'show' for object '%s'"

6280 msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""

6281

6310 -#: builtin/notes.c:158

6282 +#: builtin/notes.c:161

6283 #, c-format

6284 msgid "failed to finish 'show' for object '%s'"

6285 msgstr "kunde inte avsluta \"show\" för objektet \"%s\""

6286

6315 -#: builtin/notes.c:175 builtin/tag.c:347

6287 +#: builtin/notes.c:178 builtin/tag.c:347

6288 #, c-format

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

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

6291

6320 -#: builtin/notes.c:189

6292 +#: builtin/notes.c:192

6293 msgid "Please supply the note contents using either -m or -F option"

6294 msgstr "Ange innehåll för anteckningen med antingen -m eller -F"

6295

6324 -#: builtin/notes.c:210 builtin/notes.c:973

6296 +#: builtin/notes.c:213 builtin/notes.c:976

6297 #, c-format

6298 msgid "Removing note for object %s\n"

6299 msgstr "Tar bort anteckning för objektet %s\n"

6300

6329 -#: builtin/notes.c:215

6301 +#: builtin/notes.c:218

6302 msgid "unable to write note object"

6303 msgstr "kunde inte skriva anteckningsobjekt"

6304

6333 -#: builtin/notes.c:217

6305 +#: builtin/notes.c:220

6306 #, c-format

6307 msgid "The note contents has been left in %s"

6308 msgstr "Anteckningens innehåll har lämnats kvar i %s"

6309

6338 -#: builtin/notes.c:251 builtin/tag.c:542

6310 +#: builtin/notes.c:254 builtin/tag.c:542

6311 #, c-format

6312 msgid "cannot read '%s'"

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

6314

6343 -#: builtin/notes.c:253 builtin/tag.c:545

6315 +#: builtin/notes.c:256 builtin/tag.c:545

6316 #, c-format

6317 msgid "could not open or read '%s'"

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

6319

6348 -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447

6349 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644

6350 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766

6351 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558

6320 +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450

6321 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647

6322 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769

6323 +#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558

6324 #, c-format

6325 msgid "Failed to resolve '%s' as a valid ref."

6326 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."

6327

6356 -#: builtin/notes.c:275

6328 +#: builtin/notes.c:278

6329 #, c-format

6330 msgid "Failed to read object '%s'."

6331 msgstr "Kunde inte läsa objektet \"%s\"."

6332

6361 -#: builtin/notes.c:299

6333 +#: builtin/notes.c:302

6334 msgid "Cannot commit uninitialized/unreferenced notes tree"

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

6336

6365 -#: builtin/notes.c:340

6337 +#: builtin/notes.c:343

6338 #, c-format

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

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

6341

6370 -#: builtin/notes.c:350

6342 +#: builtin/notes.c:353

6343 #, c-format

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

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

6346

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

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

6377 -#: builtin/notes.c:377

6349 +#: builtin/notes.c:380

6350 #, c-format

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

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

6353

6382 -#: builtin/notes.c:441

6354 +#: builtin/notes.c:444

6355 #, c-format

6356 msgid "Malformed input line: '%s'."

6357 msgstr "Felaktig indatarad: \"%s\"."

6358

6387 -#: builtin/notes.c:456

6359 +#: builtin/notes.c:459

6360 #, c-format

6361 msgid "Failed to copy notes from '%s' to '%s'"

6362 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

6363

6392 -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627

6393 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759

6394 -#: builtin/notes.c:1033

6364 +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630

6365 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762

6366 +#: builtin/notes.c:1036

6367 msgid "too many parameters"

6368 msgstr "för många parametrar"

6369

6398 -#: builtin/notes.c:513 builtin/notes.c:772

6370 +#: builtin/notes.c:516 builtin/notes.c:775

6371 #, c-format

6372 msgid "No note found for object %s."

6373 msgstr "Inga anteckningar hittades för objektet %s."

6374

6403 -#: builtin/notes.c:535 builtin/notes.c:692

6375 +#: builtin/notes.c:538 builtin/notes.c:695

6376 msgid "note contents as a string"

6377 msgstr "anteckningsinnehåll som sträng"

6378

6407 -#: builtin/notes.c:538 builtin/notes.c:695

6379 +#: builtin/notes.c:541 builtin/notes.c:698

6380 msgid "note contents in a file"

6381 msgstr "anteckningsinnehåll i en fil"

6382

6411 -#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697

6412 -#: builtin/notes.c:700 builtin/tag.c:476

6383 +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700

6384 +#: builtin/notes.c:703 builtin/tag.c:476

6385 msgid "object"

6386 msgstr "objekt"

6387

6416 -#: builtin/notes.c:541 builtin/notes.c:698

6388 +#: builtin/notes.c:544 builtin/notes.c:701

6389 msgid "reuse and edit specified note object"

6390 msgstr "återanvänd och redigera angivet anteckningsobjekt"

6391

6420 -#: builtin/notes.c:544 builtin/notes.c:701

6392 +#: builtin/notes.c:547 builtin/notes.c:704

6393 msgid "reuse specified note object"

6394 msgstr "återanvänd angivet anteckningsobjekt"

6395

6424 -#: builtin/notes.c:546 builtin/notes.c:614

6396 +#: builtin/notes.c:549 builtin/notes.c:617

6397 msgid "replace existing notes"

6398 msgstr "ersätt befintliga anteckningar"

6399

6428 -#: builtin/notes.c:580

6400 +#: builtin/notes.c:583

6401 #, c-format

6402 msgid ""

6403 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -6434,24 +6406,24 @@ msgstr ""

6406 "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "

6407 "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"

6408

6437 -#: builtin/notes.c:585 builtin/notes.c:662

6409 +#: builtin/notes.c:588 builtin/notes.c:665

6410 #, c-format

6411 msgid "Overwriting existing notes for object %s\n"

6412 msgstr "Skriver över befintliga anteckningar för objektet %s\n"

6413

6442 -#: builtin/notes.c:615

6414 +#: builtin/notes.c:618

6415 msgid "read objects from stdin"

6416 msgstr "läs objekt från standard in"

6417

6446 -#: builtin/notes.c:617

6418 +#: builtin/notes.c:620

6419 msgid "load rewriting config for <command> (implies --stdin)"

6420 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"

6421

6450 -#: builtin/notes.c:635

6422 +#: builtin/notes.c:638

6423 msgid "too few parameters"

6424 msgstr "för få parametrar"

6425

6454 -#: builtin/notes.c:656

6426 +#: builtin/notes.c:659

6427 #, c-format

6428 msgid ""

6429 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "

@@ -6460,12 +6432,12 @@ msgstr ""

6432 "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "

6433 "%s. Använd \"-f\" för att skriva över befintliga anteckningar"

6434

6463 -#: builtin/notes.c:668

6435 +#: builtin/notes.c:671

6436 #, c-format

6437 msgid "Missing notes on source object %s. Cannot copy."

6438 msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."

6439

6468 -#: builtin/notes.c:717

6440 +#: builtin/notes.c:720

6441 #, c-format

6442 msgid ""

6443 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"

@@ -6474,15 +6446,15 @@ msgstr ""

6446 "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"

6447 "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"

6448

6477 -#: builtin/notes.c:864

6449 +#: builtin/notes.c:867

6450 msgid "General options"

6451 msgstr "Allmänna flaggor"

6452

6481 -#: builtin/notes.c:866

6453 +#: builtin/notes.c:869

6454 msgid "Merge options"

6455 msgstr "Flaggor för sammanslagning"

6456

6485 -#: builtin/notes.c:868

6457 +#: builtin/notes.c:871

6458 msgid ""

6459 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"

6460 "cat_sort_uniq)"

@@ -6490,46 +6462,46 @@ msgstr ""

6462 "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"

6463 "cat_sort_uniq)"

6464

6493 -#: builtin/notes.c:870

6465 +#: builtin/notes.c:873

6466 msgid "Committing unmerged notes"

6467 msgstr "Checkar in ej sammanslagna anteckningar"

6468

6497 -#: builtin/notes.c:872

6469 +#: builtin/notes.c:875

6470 msgid "finalize notes merge by committing unmerged notes"

6471 msgstr ""

6472 "färdigställ sammanslagning av anteckningar genom att checka in ej "

6473 "sammanslagna anteckningar"

6474

6503 -#: builtin/notes.c:874

6475 +#: builtin/notes.c:877

6476 msgid "Aborting notes merge resolution"

6477 msgstr "Avbryt lösning av sammanslagning av anteckningar"

6478

6507 -#: builtin/notes.c:876

6479 +#: builtin/notes.c:879

6480 msgid "abort notes merge"

6481 msgstr "avbryt sammanslagning av anteckningar"

6482

6511 -#: builtin/notes.c:971

6483 +#: builtin/notes.c:974

6484 #, c-format

6485 msgid "Object %s has no note\n"

6486 msgstr "Objektet %s har ingen anteckning\n"

6487

6516 -#: builtin/notes.c:983

6488 +#: builtin/notes.c:986

6489 msgid "attempt to remove non-existent note is not an error"

6490 msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"

6491

6520 -#: builtin/notes.c:986

6492 +#: builtin/notes.c:989

6493 msgid "read object names from the standard input"

6494 msgstr "läs objektnamn från standard in"

6495

6524 -#: builtin/notes.c:1067

6496 +#: builtin/notes.c:1070

6497 msgid "notes_ref"

6498 msgstr "anteckningar-ref"

6499

6528 -#: builtin/notes.c:1068

6500 +#: builtin/notes.c:1071

6501 msgid "use notes from <notes_ref>"

6502 msgstr "använd anteckningar från <anteckningsref>"

6503

6532 -#: builtin/notes.c:1103 builtin/remote.c:1598

6504 +#: builtin/notes.c:1106 builtin/remote.c:1598

6505 #, c-format

6506 msgid "Unknown subcommand: %s"

6507 msgstr "Okänt underkommando: %s"

@@ -8935,7 +8907,7 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

8907 msgid "Cannot rebase onto multiple branches"

8908 msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"

8909

8938 -#: git-rebase.sh:52

8910 +#: git-rebase.sh:53

8911 msgid ""

8912 "When you have resolved this problem, run \"git rebase --continue\".\n"

8913 "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

@@ -8946,27 +8918,31 @@ msgstr ""

8918 "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"

8919 "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."

8920

8949 -#: git-rebase.sh:159

8921 +#: git-rebase.sh:160

8922 msgid "The pre-rebase hook refused to rebase."

8923 msgstr "Kroken pre-rebase vägrade ombaseringen."

8924

8953 -#: git-rebase.sh:164

8925 +#: git-rebase.sh:165

8926 msgid "It looks like git-am is in progress. Cannot rebase."

8927 msgstr "Det verkar som en git-am körs. Kan inte ombasera."

8928

8957 -#: git-rebase.sh:295

8929 +#: git-rebase.sh:296

8930 msgid "The --exec option must be used with the --interactive option"

8931 msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"

8932

8961 -#: git-rebase.sh:300

8933 +#: git-rebase.sh:301

8934 msgid "No rebase in progress?"

8935 msgstr "Ingen ombasering pågår?"

8936

8965 -#: git-rebase.sh:313

8937 +#: git-rebase.sh:312

8938 +msgid "The --edit-todo action can only be used during interactive rebase."

8939 +msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."

8940 +

8941 +#: git-rebase.sh:319

8942 msgid "Cannot read HEAD"

8943 msgstr "Kan inte läsa HEAD"

8944

8969 -#: git-rebase.sh:316

8945 +#: git-rebase.sh:322

8946 msgid ""

8947 "You must edit all merge conflicts and then\n"

8948 "mark them as resolved using git add"

@@ -8974,12 +8950,12 @@ msgstr ""

8950 "Du måste redigera alla sammanslagningskonflikter och\n"

8951 "därefter markera dem som lösta med git add"

8952

8977 -#: git-rebase.sh:334

8953 +#: git-rebase.sh:340

8954 #, sh-format

8955 msgid "Could not move back to $head_name"

8956 msgstr "Kunde inte flytta tillbaka till $head_name"

8957

8982 -#: git-rebase.sh:350

8958 +#: git-rebase.sh:359

8959 #, sh-format

8960 msgid ""

8961 "It seems that there is already a $state_dir_base directory, and\n"

@@ -9000,57 +8976,57 @@ msgstr ""

8976 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"

8977 "något av värde där."

8978

9003 -#: git-rebase.sh:395

8979 +#: git-rebase.sh:404

8980 #, sh-format

8981 msgid "invalid upstream $upstream_name"

8982 msgstr "ogiltig uppström $upstream_name"

8983

9008 -#: git-rebase.sh:419

8984 +#: git-rebase.sh:428

8985 #, sh-format

8986 msgid "$onto_name: there are more than one merge bases"

8987 msgstr "$onto_name: mer än en sammanslagningsbas finns"

8988

9013 -#: git-rebase.sh:422 git-rebase.sh:426

8989 +#: git-rebase.sh:431 git-rebase.sh:435

8990 #, sh-format

8991 msgid "$onto_name: there is no merge base"

8992 msgstr "$onto_name: ingen sammanslagningsbas finns"

8993

9018 -#: git-rebase.sh:431

8994 +#: git-rebase.sh:440

8995 #, sh-format

8996 msgid "Does not point to a valid commit: $onto_name"

8997 msgstr "Peka på en giltig incheckning: $onto_name"

8998

9023 -#: git-rebase.sh:454

8999 +#: git-rebase.sh:463

9000 #, sh-format

9001 msgid "fatal: no such branch: $branch_name"

9002 msgstr "ödesdigert: ingen sådan gren: $branch_name"

9003

9028 -#: git-rebase.sh:474

9004 +#: git-rebase.sh:483

9005 msgid "Please commit or stash them."

9006 msgstr "Checka in eller använd \"stash\" på dem."

9007

9032 -#: git-rebase.sh:492

9008 +#: git-rebase.sh:501

9009 #, sh-format

9010 msgid "Current branch $branch_name is up to date."

9011 msgstr "Aktuell gren $branch_name är à jour."

9012

9037 -#: git-rebase.sh:495

9013 +#: git-rebase.sh:504

9014 #, sh-format

9015 msgid "Current branch $branch_name is up to date, rebase forced."

9016 msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."

9017

9042 -#: git-rebase.sh:506

9018 +#: git-rebase.sh:515

9019 #, sh-format

9020 msgid "Changes from $mb to $onto:"

9021 msgstr "Ändringar från $mb till $onto:"

9022

9023 #. Detach HEAD and reset the tree

9048 -#: git-rebase.sh:515

9024 +#: git-rebase.sh:524

9025 msgid "First, rewinding head to replay your work on top of it..."

9026 msgstr ""

9027 "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."

9028

9053 -#: git-rebase.sh:523

9029 +#: git-rebase.sh:532

9030 #, sh-format

9031 msgid "Fast-forwarded $branch_name to $onto_name."

9032 msgstr "Snabbspolade $branch_name till $onto_name."

@@ -9379,6 +9355,27 @@ msgstr "# Undermodulers ändringar att checka in:"

9355 msgid "Synchronizing submodule url for '$name'"

9356 msgstr "Synkroniserar undermodul-url för \"$name\""

9357

9358 +#~ msgid " 0 files changed"

9359 +#~ msgstr " 0 filer ändrade"

9360 +

9361 +#~ msgid " %d file changed"

9362 +#~ msgid_plural " %d files changed"

9363 +#~ msgstr[0] " %d fil ändrad"

9364 +#~ msgstr[1] " %d filer ändrade"

9365 +

9366 +#~ msgid ", %d insertion(+)"

9367 +#~ msgid_plural ", %d insertions(+)"

9368 +#~ msgstr[0] ", %d tillägg(+)"

9369 +#~ msgstr[1] ", %d tillägg(+)"

9370 +

9371 +#~ msgid ", %d deletion(-)"

9372 +#~ msgid_plural ", %d deletions(-)"

9373 +#~ msgstr[0] ", %d borttagning(-)"

9374 +#~ msgstr[1] ", %d borttagningar(-)"

9375 +

9376 +#~ msgid "Auto packing the repository for optimum performance.\n"

9377 +#~ msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

9378 +

9379 #~ msgid " (use \"git add\" to track)"

9380 #~ msgstr " (spåra med \"git add\")"

9381

l10n: Update Swedish translation (1964t0f0u)