25d1d7e1c3 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2013-03-05 12:36+0800\n"

11 -"PO-Revision-Date: 2013-03-05 09:17+0100\n"

10 +"POT-Creation-Date: 2013-04-10 15:16+0800\n"

11 +"PO-Revision-Date: 2013-04-11 11:56+0100\n"

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

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

14 "Language: sv\n"

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

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

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

19

20 -#: advice.c:49

20 +#: advice.c:53

21 #, c-format

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

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

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

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

27 #. * other commands doing a merge do.

28 #.

29 -#: advice.c:79

29 +#: advice.c:83

30 msgid ""

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

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

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

65 msgid "archive format"

66 msgstr "arkivformat"

67

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

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

69 msgid "prefix"

70 msgstr "prefix"

71

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

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

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

75

76 -#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366

77 -#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653

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

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

77 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:659

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

79 #: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536

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

81 msgid "file"

82 msgstr "fil"

83

84 -#: archive.c:327 builtin/archive.c:92

84 +#: archive.c:327 builtin/archive.c:89

85 msgid "write the archive to this file"

86 msgstr "skriv arkivet till filen"

87

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

109 msgid "list supported archive formats"

110 msgstr "visa understödda arkivformat"

111

112 -#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85

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

113 msgid "repo"

114 msgstr "arkiv"

115

116 -#: archive.c:346 builtin/archive.c:94

116 +#: archive.c:346 builtin/archive.c:91

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

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

119

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

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

121 msgid "command"

122 msgstr "kommando"

123

124 -#: archive.c:348 builtin/archive.c:96

124 +#: archive.c:348 builtin/archive.c:93

125 msgid "path to the remote git-upload-archive command"

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

127

@@ -133,6 +133,36 @@ msgstr ""

133 "Negativa mönster ignoreras i git-attribut\n"

134 "Använd '\\!' för att inleda med ett utropstecken."

135

136 +#: branch.c:201

137 +#, c-format

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

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

140 +

141 +#: branch.c:203

142 +#, c-format

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

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

145 +

146 +#: branch.c:205

147 +msgid ""

148 +"\n"

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

150 +"branch that already exists at the remote, you may need to\n"

151 +"run \"git fetch\" to retrieve it.\n"

152 +"\n"

153 +"If you are planning to push out a new local branch that\n"

154 +"will track its remote counterpart, you may want to use\n"

155 +"\"git push -u\" to set the upstream config as you push."

156 +msgstr ""

157 +"\n"

158 +"Om du har tänkt basera ditt arbete på en uppströmsgren\n"

159 +"som redan finns på fjärren kan du behöva köra \"git fetch\"\n"

160 +"för att hämta den.\n"

161 +"\n"

162 +"Om du har tänkt sända in en ny lokal gren som skall\n"

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

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

165 +

166 #: bundle.c:36

167 #, c-format

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

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

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

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

175

146 -#: bundle.c:89 builtin/commit.c:674

176 +#: bundle.c:89 builtin/commit.c:676

177 #, c-format

178 msgid "could not open '%s'"

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

@@ -152,35 +182,35 @@ msgstr "kunde inte öppna \"%s\""

182 msgid "Repository lacks these prerequisite commits:"

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

184

155 -#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299

156 -#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347

185 +#: bundle.c:164 sequencer.c:651 sequencer.c:1083 builtin/log.c:300

186 +#: builtin/log.c:754 builtin/log.c:1350 builtin/log.c:1566 builtin/merge.c:349

187 #: builtin/shortlog.c:157

188 msgid "revision walk setup failed"

189 msgstr "misslyckades skapa revisionstraversering"

190

191 #: bundle.c:186

192 #, c-format

163 -msgid "The bundle contains %d ref"

164 -msgid_plural "The bundle contains %d refs"

165 -msgstr[0] "Paketet (bundlen) innehåller %d referens"

166 -msgstr[1] "Paketet (bundlen) innehåller %d referenser"

193 +msgid "The bundle contains this ref:"

194 +msgid_plural "The bundle contains these %d refs:"

195 +msgstr[0] "Paketet (bundlen) denna referens:"

196 +msgstr[1] "Paketet (bundlen) dessa %d referenser:"

197

168 -#: bundle.c:192

198 +#: bundle.c:193

199 msgid "The bundle records a complete history."

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

201

202 #: bundle.c:195

203 #, c-format

174 -msgid "The bundle requires this ref"

175 -msgid_plural "The bundle requires these %d refs"

176 -msgstr[0] "Paketet (bundlen) kräver denna referens"

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

204 +msgid "The bundle requires this ref:"

205 +msgid_plural "The bundle requires these %d refs:"

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

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

208

209 #: bundle.c:294

210 msgid "rev-list died"

211 msgstr "rev-list dog"

212

183 -#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260

213 +#: bundle.c:300 builtin/log.c:1246 builtin/shortlog.c:260

214 #, c-format

215 msgid "unrecognized argument: %s"

216 msgstr "okänt argument: %s"

@@ -330,7 +360,7 @@ msgstr ""

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

361 "%s"

362

333 -#: diff.c:3468

363 +#: diff.c:3480

364 #, c-format

365 msgid ""

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

@@ -339,12 +369,12 @@ msgstr ""

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

370 "%s"

371

342 -#: diff.c:3482

372 +#: diff.c:3494

373 #, c-format

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

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

376

347 -#: gpg-interface.c:59 gpg-interface.c:127

377 +#: gpg-interface.c:59 gpg-interface.c:131

378 msgid "could not run gpg."

379 msgstr "kunde inte köra gpg."

380

@@ -356,27 +386,27 @@ msgstr "gpg godtog inte data"

386 msgid "gpg failed to sign the data"

387 msgstr "gpg misslyckades signera data"

388

359 -#: gpg-interface.c:112

389 +#: gpg-interface.c:115

390 #, c-format

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

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

393

364 -#: gpg-interface.c:115

394 +#: gpg-interface.c:118

395 #, c-format

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

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

398

369 -#: grep.c:1622

399 +#: grep.c:1623

400 #, c-format

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

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

403

374 -#: grep.c:1639

404 +#: grep.c:1640

405 #, c-format

406 msgid "'%s': %s"

407 msgstr "\"%s\": %s"

408

379 -#: grep.c:1650

409 +#: grep.c:1651

410 #, c-format

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

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

@@ -444,8 +474,8 @@ msgstr[1] ""

474 msgid "failed to read the cache"

475 msgstr "misslyckads läsa cachen"

476

447 -#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534

448 -#: builtin/clone.c:586

477 +#: merge.c:110 builtin/checkout.c:362 builtin/checkout.c:563

478 +#: builtin/clone.c:635

479 msgid "unable to write new index file"

480 msgstr "kunde inte skriva ny indexfil"

481

@@ -494,7 +524,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

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

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

526

497 -#: merge-recursive.c:773 builtin/clone.c:302

527 +#: merge-recursive.c:773 builtin/clone.c:303

528 #, c-format

529 msgid "failed to open '%s'"

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

@@ -628,7 +658,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

658 msgid "Auto-merging %s"

659 msgstr "Slår ihop %s automatiskt"

660

631 -#: merge-recursive.c:1633 git-submodule.sh:942

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

662 msgid "submodule"

663 msgstr "undermodul"

664

@@ -699,10 +729,15 @@ msgstr "sammanslagningen returnerade ingen incheckning"

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

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

731

702 -#: merge-recursive.c:2009 builtin/merge.c:643

732 +#: merge-recursive.c:2009 builtin/merge.c:658

733 msgid "Unable to write index."

734 msgstr "Kunde inte skriva indexet."

735

736 +#: object.c:195

737 +#, c-format

738 +msgid "unable to parse object: %s"

739 +msgstr "kunde inte tolka objektet: %s"

740 +

741 #: parse-options.c:489

742 msgid "..."

743 msgstr "..."

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

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

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

775

741 -#: remote.c:1653

776 +#: remote.c:1781

777 #, c-format

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

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

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

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

782

748 -#: remote.c:1659

783 +#: remote.c:1787

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

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

786

752 -#: remote.c:1662

787 +#: remote.c:1790

788 #, c-format

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

790 msgid_plural ""

@@ -759,11 +794,11 @@ msgstr[0] ""

794 msgstr[1] ""

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

796

762 -#: remote.c:1670

797 +#: remote.c:1798

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

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

800

766 -#: remote.c:1673

801 +#: remote.c:1801

802 #, c-format

803 msgid ""

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

@@ -778,23 +813,23 @@ msgstr[1] ""

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

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

815

781 -#: remote.c:1683

816 +#: remote.c:1811

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

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

819

785 -#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984

786 -#: builtin/merge.c:994

820 +#: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999

821 +#: builtin/merge.c:1009

822 #, c-format

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

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

825

791 -#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986

792 -#: builtin/merge.c:999

826 +#: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779

827 +#: builtin/merge.c:1001 builtin/merge.c:1014

828 #, c-format

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

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

831

797 -#: sequencer.c:146

832 +#: sequencer.c:229

833 msgid ""

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

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

@@ -802,7 +837,7 @@ msgstr ""

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

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

839

805 -#: sequencer.c:149

840 +#: sequencer.c:232

841 msgid ""

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

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

@@ -812,228 +847,228 @@ msgstr ""

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

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

849

815 -#: sequencer.c:162 sequencer.c:774 sequencer.c:857

850 +#: sequencer.c:245 sequencer.c:859 sequencer.c:942

851 #, c-format

852 msgid "Could not write to %s"

853 msgstr "Kunde inte skriva till %s"

854

820 -#: sequencer.c:165

855 +#: sequencer.c:248

856 #, c-format

857 msgid "Error wrapping up %s"

858 msgstr "Fel vid ombrytning av %s"

859

825 -#: sequencer.c:180

860 +#: sequencer.c:263

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

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

863

829 -#: sequencer.c:182

864 +#: sequencer.c:265

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

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

867

833 -#: sequencer.c:185

868 +#: sequencer.c:268

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

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

871

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

838 -#: sequencer.c:236

873 +#: sequencer.c:319

874 #, c-format

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

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

877

843 -#: sequencer.c:267

878 +#: sequencer.c:350

879 msgid "Could not resolve HEAD commit\n"

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

881

847 -#: sequencer.c:288

882 +#: sequencer.c:371

883 msgid "Unable to update cache tree\n"

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

885

851 -#: sequencer.c:333

886 +#: sequencer.c:416

887 #, c-format

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

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

890

856 -#: sequencer.c:338

891 +#: sequencer.c:421

892 #, c-format

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

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

895

861 -#: sequencer.c:404

896 +#: sequencer.c:487

897 msgid "Your index file is unmerged."

898 msgstr "Din indexfil har inte slagits ihop."

899

865 -#: sequencer.c:423

900 +#: sequencer.c:506

901 #, c-format

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

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

904

870 -#: sequencer.c:431

905 +#: sequencer.c:514

906 #, c-format

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

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

909

875 -#: sequencer.c:435

910 +#: sequencer.c:518

911 #, c-format

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

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

914

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

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

882 -#: sequencer.c:448

917 +#: sequencer.c:531

918 #, c-format

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

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

921

887 -#: sequencer.c:452

922 +#: sequencer.c:535

923 #, c-format

924 msgid "Cannot get commit message for %s"

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

926

892 -#: sequencer.c:536

927 +#: sequencer.c:621

928 #, c-format

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

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

931

897 -#: sequencer.c:537

932 +#: sequencer.c:622

933 #, c-format

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

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

936

902 -#: sequencer.c:569

937 +#: sequencer.c:654

938 msgid "empty commit set passed"

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

940

906 -#: sequencer.c:577

941 +#: sequencer.c:662

942 #, c-format

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

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

945

911 -#: sequencer.c:582

946 +#: sequencer.c:667

947 #, c-format

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

949 msgstr "git %s: misslyckades uppdatera indexet"

950

916 -#: sequencer.c:640

951 +#: sequencer.c:725

952 #, c-format

953 msgid "Cannot %s during a %s"

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

955

921 -#: sequencer.c:662

956 +#: sequencer.c:747

957 #, c-format

958 msgid "Could not parse line %d."

959 msgstr "Kan inte tolka rad %d."

960

926 -#: sequencer.c:667

961 +#: sequencer.c:752

962 msgid "No commits parsed."

963 msgstr "Inga incheckningar lästes."

964

930 -#: sequencer.c:680

965 +#: sequencer.c:765

966 #, c-format

967 msgid "Could not open %s"

968 msgstr "Kunde inte öppna %s"

969

935 -#: sequencer.c:684

970 +#: sequencer.c:769

971 #, c-format

972 msgid "Could not read %s."

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

974

940 -#: sequencer.c:691

975 +#: sequencer.c:776

976 #, c-format

977 msgid "Unusable instruction sheet: %s"

978 msgstr "Oanvändbart manus: %s"

979

945 -#: sequencer.c:719

980 +#: sequencer.c:804

981 #, c-format

982 msgid "Invalid key: %s"

983 msgstr "Felaktig nyckel: %s"

984

950 -#: sequencer.c:722

985 +#: sequencer.c:807

986 #, c-format

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

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

989

955 -#: sequencer.c:734

990 +#: sequencer.c:819

991 #, c-format

992 msgid "Malformed options sheet: %s"

993 msgstr "Trasigt manus: %s"

994

960 -#: sequencer.c:755

995 +#: sequencer.c:840

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

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

998

964 -#: sequencer.c:756

999 +#: sequencer.c:841

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

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

1002

968 -#: sequencer.c:760

1003 +#: sequencer.c:845

1004 #, c-format

1005 msgid "Could not create sequencer directory %s"

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

1007

973 -#: sequencer.c:776 sequencer.c:861

1008 +#: sequencer.c:861 sequencer.c:946

1009 #, c-format

1010 msgid "Error wrapping up %s."

1011 msgstr "Fel vid ombrytning av %s."

1012

978 -#: sequencer.c:795 sequencer.c:929

1013 +#: sequencer.c:880 sequencer.c:1014

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

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

1016

982 -#: sequencer.c:797

1017 +#: sequencer.c:882

1018 msgid "cannot resolve HEAD"

1019 msgstr "kan inte bestämma HEAD"

1020

986 -#: sequencer.c:799

1021 +#: sequencer.c:884

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

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

1024

990 -#: sequencer.c:821 builtin/apply.c:4056

1025 +#: sequencer.c:906 builtin/apply.c:4060

1026 #, c-format

1027 msgid "cannot open %s: %s"

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

1029

995 -#: sequencer.c:824

1030 +#: sequencer.c:909

1031 #, c-format

1032 msgid "cannot read %s: %s"

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

1034

1000 -#: sequencer.c:825

1035 +#: sequencer.c:910

1036 msgid "unexpected end of file"

1037 msgstr "oväntat filslut"

1038

1004 -#: sequencer.c:831

1039 +#: sequencer.c:916

1040 #, c-format

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

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

1043

1009 -#: sequencer.c:854

1044 +#: sequencer.c:939

1045 #, c-format

1046 msgid "Could not format %s."

1047 msgstr "Kunde inte formatera %s."

1048

1014 -#: sequencer.c:1016

1049 +#: sequencer.c:1101

1050 msgid "Can't revert as initial commit"

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

1052

1018 -#: sequencer.c:1017

1053 +#: sequencer.c:1102

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

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

1056

1022 -#: sha1_name.c:1044

1057 +#: sha1_name.c:1036

1058 msgid "HEAD does not point to a branch"

1059 msgstr "HEAD pekar inte på en gren"

1060

1026 -#: sha1_name.c:1047

1061 +#: sha1_name.c:1039

1062 #, c-format

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

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

1065

1031 -#: sha1_name.c:1049

1066 +#: sha1_name.c:1041

1067 #, c-format

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

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

1070

1036 -#: sha1_name.c:1052

1071 +#: sha1_name.c:1044

1072 #, c-format

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

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

@@ -1162,113 +1197,113 @@ msgstr "ändrat innehåll, "

1197 msgid "untracked content, "

1198 msgstr "ospårat innehåll, "

1199

1165 -#: wt-status.c:303

1200 +#: wt-status.c:306

1201 #, c-format

1202 msgid "new file: %s"

1203 msgstr "ny fil: %s"

1204

1170 -#: wt-status.c:306

1205 +#: wt-status.c:309

1206 #, c-format

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

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

1209

1175 -#: wt-status.c:309

1210 +#: wt-status.c:312

1211 #, c-format

1212 msgid "deleted: %s"

1213 msgstr "borttagen: %s"

1214

1180 -#: wt-status.c:312

1215 +#: wt-status.c:315

1216 #, c-format

1217 msgid "modified: %s"

1218 msgstr "ändrad: %s"

1219

1185 -#: wt-status.c:315

1220 +#: wt-status.c:318

1221 #, c-format

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

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

1224

1190 -#: wt-status.c:318

1225 +#: wt-status.c:321

1226 #, c-format

1227 msgid "typechange: %s"

1228 msgstr "typbyte: %s"

1229

1195 -#: wt-status.c:321

1230 +#: wt-status.c:324

1231 #, c-format

1232 msgid "unknown: %s"

1233 msgstr "okänd: %s"

1234

1200 -#: wt-status.c:324

1235 +#: wt-status.c:327

1236 #, c-format

1237 msgid "unmerged: %s"

1238 msgstr "osammansl.: %s"

1239

1205 -#: wt-status.c:327

1240 +#: wt-status.c:330

1241 #, c-format

1242 msgid "bug: unhandled diff status %c"

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

1244

1210 -#: wt-status.c:789

1245 +#: wt-status.c:805

1246 msgid "You have unmerged paths."

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

1248

1214 -#: wt-status.c:792 wt-status.c:944

1249 +#: wt-status.c:808 wt-status.c:960

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

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

1252

1218 -#: wt-status.c:795

1253 +#: wt-status.c:811

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

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

1256

1222 -#: wt-status.c:798

1257 +#: wt-status.c:814

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

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

1260

1226 -#: wt-status.c:808

1261 +#: wt-status.c:824

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

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

1264

1230 -#: wt-status.c:811

1265 +#: wt-status.c:827

1266 msgid "The current patch is empty."

1267 msgstr "Aktuell patch är tom."

1268

1234 -#: wt-status.c:815

1269 +#: wt-status.c:831

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

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

1272

1238 -#: wt-status.c:817

1273 +#: wt-status.c:833

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

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

1276

1242 -#: wt-status.c:819

1277 +#: wt-status.c:835

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

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

1280

1246 -#: wt-status.c:879 wt-status.c:896

1281 +#: wt-status.c:895 wt-status.c:912

1282 #, c-format

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

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

1285

1251 -#: wt-status.c:884 wt-status.c:901

1286 +#: wt-status.c:900 wt-status.c:917

1287 msgid "You are currently rebasing."

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

1289

1255 -#: wt-status.c:887

1290 +#: wt-status.c:903

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

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

1293

1259 -#: wt-status.c:889

1294 +#: wt-status.c:905

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

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

1297

1263 -#: wt-status.c:891

1298 +#: wt-status.c:907

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

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

1301

1267 -#: wt-status.c:904

1302 +#: wt-status.c:920

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

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

1305

1271 -#: wt-status.c:908

1306 +#: wt-status.c:924

1307 #, c-format

1308 msgid ""

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

@@ -1276,104 +1311,142 @@ msgstr ""

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

1312 "ovanpå \"%s\"."

1313

1279 -#: wt-status.c:913

1314 +#: wt-status.c:929

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

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

1317

1283 -#: wt-status.c:916

1318 +#: wt-status.c:932

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

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

1321

1287 -#: wt-status.c:920

1322 +#: wt-status.c:936

1323 #, c-format

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

1325 msgstr ""

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

1327 "ovanpå \"%s\"."

1328

1294 -#: wt-status.c:925

1329 +#: wt-status.c:941

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

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

1332

1298 -#: wt-status.c:928

1333 +#: wt-status.c:944

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

1335 msgstr ""

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

1337

1303 -#: wt-status.c:930

1338 +#: wt-status.c:946

1339 msgid ""

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

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

1342

1308 -#: wt-status.c:940

1343 +#: wt-status.c:956

1344 msgid "You are currently cherry-picking."

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

1346

1312 -#: wt-status.c:947

1347 +#: wt-status.c:963

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

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

1350

1316 -#: wt-status.c:958

1351 +#: wt-status.c:972

1352 +#, c-format

1353 +msgid "You are currently reverting commit %s."

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

1355 +

1356 +#: wt-status.c:977

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

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

1359 +

1360 +#: wt-status.c:980

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

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

1363 +

1364 +#: wt-status.c:982

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

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

1367 +

1368 +#: wt-status.c:993

1369 #, c-format

1318 -msgid "You are currently bisecting branch '%s'."

1319 -msgstr "Du håller på med en \"bisect\" på grenen \"%s\"."

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

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

1372

1321 -#: wt-status.c:962

1373 +#: wt-status.c:997

1374 msgid "You are currently bisecting."

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

1376

1325 -#: wt-status.c:965

1377 +#: wt-status.c:1000

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

1379 msgstr ""

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

1381

1330 -#: wt-status.c:1064

1382 +#: wt-status.c:1175

1383 msgid "On branch "

1384 msgstr "På grenen "

1385

1334 -#: wt-status.c:1071

1386 +#: wt-status.c:1186

1387 +msgid "HEAD detached at "

1388 +msgstr "HEAD frånkopplad vid "

1389 +

1390 +#: wt-status.c:1188

1391 +msgid "HEAD detached from "

1392 +msgstr "HEAD frånkopplad från "

1393 +

1394 +#: wt-status.c:1191

1395 msgid "Not currently on any branch."

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

1397

1338 -#: wt-status.c:1083

1398 +#: wt-status.c:1208

1399 msgid "Initial commit"

1400 msgstr "Första incheckning"

1401

1342 -#: wt-status.c:1097

1402 +#: wt-status.c:1222

1403 msgid "Untracked files"

1404 msgstr "Ospårade filer"

1405

1346 -#: wt-status.c:1099

1406 +#: wt-status.c:1224

1407 msgid "Ignored files"

1408 msgstr "Ignorerade filer"

1409

1410 +#: wt-status.c:1228

1411 +#, c-format

1412 +msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"

1413 +msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\""

1414 +

1415 +#: wt-status.c:1232

1416 +msgid "may speed it up, but you have to be careful not to forget to add"

1417 +msgstr "kanske gör det snabbare, men du måste vara försiktig så att du"

1418 +

1419 +#: wt-status.c:1235

1420 +msgid "new files yourself (see 'git help status')."

1421 +msgstr "inte glömmer lägga till filer själv (se \"git help status\")"

1422 +

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

1351 -#: wt-status.c:1101

1424 +#: wt-status.c:1238

1425 #, c-format

1426 msgid "Untracked files not listed%s"

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

1428

1356 -#: wt-status.c:1103

1429 +#: wt-status.c:1240

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

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

1432

1360 -#: wt-status.c:1109

1433 +#: wt-status.c:1246

1434 msgid "No changes"

1435 msgstr "Inga ändringar"

1436

1364 -#: wt-status.c:1114

1437 +#: wt-status.c:1251

1438 #, c-format

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

1440 msgstr ""

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

1442 "\")\n"

1443

1371 -#: wt-status.c:1117

1444 +#: wt-status.c:1254

1445 #, c-format

1446 msgid "no changes added to commit\n"

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

1448

1376 -#: wt-status.c:1120

1449 +#: wt-status.c:1257

1450 #, c-format

1451 msgid ""

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

@@ -1382,52 +1455,52 @@ msgstr ""

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

1456 "\")\n"

1457

1385 -#: wt-status.c:1123

1458 +#: wt-status.c:1260

1459 #, c-format

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

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

1462

1390 -#: wt-status.c:1126

1463 +#: wt-status.c:1263

1464 #, c-format

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

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

1467

1395 -#: wt-status.c:1129 wt-status.c:1134

1468 +#: wt-status.c:1266 wt-status.c:1271

1469 #, c-format

1470 msgid "nothing to commit\n"

1471 msgstr "inget att checka in\n"

1472

1400 -#: wt-status.c:1132

1473 +#: wt-status.c:1269

1474 #, c-format

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

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

1477

1405 -#: wt-status.c:1136

1478 +#: wt-status.c:1273

1479 #, c-format

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

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

1482

1410 -#: wt-status.c:1244

1483 +#: wt-status.c:1381

1484 msgid "HEAD (no branch)"

1485 msgstr "HEAD (ingen gren)"

1486

1414 -#: wt-status.c:1250

1487 +#: wt-status.c:1387

1488 msgid "Initial commit on "

1489 msgstr "Första incheckning på "

1490

1418 -#: wt-status.c:1265

1491 +#: wt-status.c:1402

1492 msgid "behind "

1493 msgstr "efter "

1494

1422 -#: wt-status.c:1268 wt-status.c:1271

1495 +#: wt-status.c:1405 wt-status.c:1408

1496 msgid "ahead "

1497 msgstr "före "

1498

1426 -#: wt-status.c:1273

1499 +#: wt-status.c:1410

1500 msgid ", behind "

1501 msgstr ", efter "

1502

1430 -#: compat/precompose_utf8.c:58 builtin/clone.c:341

1503 +#: compat/precompose_utf8.c:58 builtin/clone.c:342

1504 #, c-format

1505 msgid "failed to unlink '%s'"

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

@@ -1441,7 +1514,7 @@ msgstr "git add [flaggor] [--] <sökväg>..."

1514 msgid "unexpected diff status %c"

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

1516

1444 -#: builtin/add.c:68 builtin/commit.c:231

1517 +#: builtin/add.c:68 builtin/commit.c:233

1518 msgid "updating files failed"

1519 msgstr "misslyckades uppdatera filer"

1520

@@ -1496,9 +1569,9 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

1569 msgid "dry run"

1570 msgstr "testkörning"

1571

1499 -#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19

1500 -#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613

1501 -#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112

1572 +#: builtin/add.c:278 builtin/apply.c:4409 builtin/check-ignore.c:19

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

1574 +#: builtin/log.c:1514 builtin/mv.c:62 builtin/read-tree.c:112

1575 msgid "be verbose"

1576 msgstr "var pratsam"

1577

@@ -1506,7 +1579,7 @@ msgstr "var pratsam"

1579 msgid "interactive picking"

1580 msgstr "plocka interaktivt"

1581

1509 -#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258

1582 +#: builtin/add.c:281 builtin/checkout.c:1060 builtin/reset.c:258

1583 msgid "select hunks interactively"

1584 msgstr "välj stycken interaktivt"

1585

@@ -1561,9 +1634,9 @@ msgstr "misslyckades lägga till filer"

1634 #. * this is not the original behavior and can't be

1635 #. * changed until users trained themselves not to type

1636 #. * "git add -u" or "git add -A". For now, we warn and

1564 -#. * keep the old behavior. Later, this warning can be

1565 -#. * turned into a die(...), and eventually we may

1566 -#. * reallow the command with a new behavior.

1637 +#. * keep the old behavior. Later, the behavior can be changed

1638 +#. * to tree-wide, keeping the warning for a while, and

1639 +#. * eventually we can drop the warning.

1640 #.

1641 #: builtin/add.c:335

1642 #, c-format

@@ -1618,11 +1691,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

1692

1693 #: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204

1621 -#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235

1694 +#: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235

1695 msgid "index file corrupt"

1696 msgstr "indexfilen trasig"

1697

1625 -#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370

1698 +#: builtin/add.c:481 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370

1699 msgid "Unable to write new index file"

1700 msgstr "Kunde inte skriva ny indexfil"

1701

@@ -1755,24 +1828,24 @@ msgstr "kunde inte läsa symboliska länken %s"

1828 msgid "unable to open or read %s"

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

1830

1758 -#: builtin/apply.c:2684

1831 +#: builtin/apply.c:2688

1832 #, c-format

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

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

1835

1763 -#: builtin/apply.c:2802

1836 +#: builtin/apply.c:2806

1837 #, c-format

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

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

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

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

1842

1770 -#: builtin/apply.c:2814

1843 +#: builtin/apply.c:2818

1844 #, c-format

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

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

1847

1775 -#: builtin/apply.c:2820

1848 +#: builtin/apply.c:2824

1849 #, c-format

1850 msgid ""

1851 "while searching for:\n"

@@ -1781,318 +1854,318 @@ msgstr ""

1854 "vid sökning efter:\n"

1855 "%.*s"

1856

1784 -#: builtin/apply.c:2839

1857 +#: builtin/apply.c:2843

1858 #, c-format

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

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

1861

1789 -#: builtin/apply.c:2942

1862 +#: builtin/apply.c:2946

1863 #, c-format

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

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

1866

1794 -#: builtin/apply.c:2948

1867 +#: builtin/apply.c:2952

1868 #, c-format

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

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

1871

1799 -#: builtin/apply.c:2969

1872 +#: builtin/apply.c:2973

1873 #, c-format

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

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

1876

1804 -#: builtin/apply.c:3091

1877 +#: builtin/apply.c:3095

1878 #, c-format

1879 msgid "cannot checkout %s"

1880 msgstr "kan inte checka ut %s"

1881

1809 -#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189

1882 +#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193

1883 #, c-format

1884 msgid "read of %s failed"

1885 msgstr "misslyckades läsa %s"

1886

1814 -#: builtin/apply.c:3169 builtin/apply.c:3391

1887 +#: builtin/apply.c:3173 builtin/apply.c:3395

1888 #, c-format

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

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

1891

1819 -#: builtin/apply.c:3250 builtin/apply.c:3405

1892 +#: builtin/apply.c:3254 builtin/apply.c:3409

1893 #, c-format

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

1895 msgstr "%s: finns inte i indexet"

1896

1824 -#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419

1897 +#: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423

1898 #, c-format

1899 msgid "%s: %s"

1900 msgstr "%s: %s"

1901

1829 -#: builtin/apply.c:3259 builtin/apply.c:3413

1902 +#: builtin/apply.c:3263 builtin/apply.c:3417

1903 #, c-format

1904 msgid "%s: does not match index"

1905 msgstr "%s: motsvarar inte indexet"

1906

1834 -#: builtin/apply.c:3361

1907 +#: builtin/apply.c:3365

1908 msgid "removal patch leaves file contents"

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

1910

1838 -#: builtin/apply.c:3430

1911 +#: builtin/apply.c:3434

1912 #, c-format

1913 msgid "%s: wrong type"

1914 msgstr "%s: fel typ"

1915

1843 -#: builtin/apply.c:3432

1916 +#: builtin/apply.c:3436

1917 #, c-format

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

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

1920

1848 -#: builtin/apply.c:3533

1921 +#: builtin/apply.c:3537

1922 #, c-format

1923 msgid "%s: already exists in index"

1924 msgstr "%s: finns redan i indexet"

1925

1853 -#: builtin/apply.c:3536

1926 +#: builtin/apply.c:3540

1927 #, c-format

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

1929 msgstr "%s: finns redan i arbetskatalogen"

1930

1858 -#: builtin/apply.c:3556

1931 +#: builtin/apply.c:3560

1932 #, c-format

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

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

1935

1863 -#: builtin/apply.c:3561

1936 +#: builtin/apply.c:3565

1937 #, c-format

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

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

1940

1868 -#: builtin/apply.c:3569

1941 +#: builtin/apply.c:3573

1942 #, c-format

1943 msgid "%s: patch does not apply"

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

1945

1873 -#: builtin/apply.c:3582

1946 +#: builtin/apply.c:3586

1947 #, c-format

1948 msgid "Checking patch %s..."

1949 msgstr "Kontrollerar patchen %s..."

1950

1878 -#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124

1951 +#: builtin/apply.c:3679 builtin/checkout.c:215 builtin/reset.c:124

1952 #, c-format

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

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

1955

1883 -#: builtin/apply.c:3818

1956 +#: builtin/apply.c:3822

1957 #, c-format

1958 msgid "unable to remove %s from index"

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

1960

1888 -#: builtin/apply.c:3846

1961 +#: builtin/apply.c:3850

1962 #, c-format

1963 msgid "corrupt patch for subproject %s"

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

1965

1893 -#: builtin/apply.c:3850

1966 +#: builtin/apply.c:3854

1967 #, c-format

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

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

1970

1898 -#: builtin/apply.c:3855

1971 +#: builtin/apply.c:3859

1972 #, c-format

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

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

1975

1903 -#: builtin/apply.c:3858 builtin/apply.c:3966

1976 +#: builtin/apply.c:3862 builtin/apply.c:3970

1977 #, c-format

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

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

1980

1908 -#: builtin/apply.c:3891

1981 +#: builtin/apply.c:3895

1982 #, c-format

1983 msgid "closing file '%s'"

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

1985

1913 -#: builtin/apply.c:3940

1986 +#: builtin/apply.c:3944

1987 #, c-format

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

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

1990

1918 -#: builtin/apply.c:4027

1991 +#: builtin/apply.c:4031

1992 #, c-format

1993 msgid "Applied patch %s cleanly."

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

1995

1923 -#: builtin/apply.c:4035

1996 +#: builtin/apply.c:4039

1997 msgid "internal error"

1998 msgstr "internt fel"

1999

2000 #. Say this even without --verbose

1928 -#: builtin/apply.c:4038

2001 +#: builtin/apply.c:4042

2002 #, c-format

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

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

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

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

2007

1935 -#: builtin/apply.c:4048

2008 +#: builtin/apply.c:4052

2009 #, c-format

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

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

2012

1940 -#: builtin/apply.c:4069

2013 +#: builtin/apply.c:4073

2014 #, c-format

2015 msgid "Hunk #%d applied cleanly."

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

2017

1945 -#: builtin/apply.c:4072

2018 +#: builtin/apply.c:4076

2019 #, c-format

2020 msgid "Rejected hunk #%d."

2021 msgstr "Refuserar stycke %d."

2022

1950 -#: builtin/apply.c:4222

2023 +#: builtin/apply.c:4226

2024 msgid "unrecognized input"

2025 msgstr "indata känns inte igen"

2026

1954 -#: builtin/apply.c:4233

2027 +#: builtin/apply.c:4237

2028 msgid "unable to read index file"

2029 msgstr "kan inte läsa indexfilen"

2030

1958 -#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91

2031 +#: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92

2032 #: builtin/fetch.c:63

2033 msgid "path"

2034 msgstr "sökväg"

2035

1963 -#: builtin/apply.c:4353

2036 +#: builtin/apply.c:4357

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

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

2039

1967 -#: builtin/apply.c:4356

2040 +#: builtin/apply.c:4360

2041 msgid "apply changes matching the given path"

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

2043

1971 -#: builtin/apply.c:4358

2044 +#: builtin/apply.c:4362

2045 msgid "num"

2046 msgstr "antal"

2047

1975 -#: builtin/apply.c:4359

2048 +#: builtin/apply.c:4363

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

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

2051

1979 -#: builtin/apply.c:4362

2052 +#: builtin/apply.c:4366

2053 msgid "ignore additions made by the patch"

2054 msgstr "ignorera tillägg gjorda av patchen"

2055

1983 -#: builtin/apply.c:4364

2056 +#: builtin/apply.c:4368

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

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

2059

1987 -#: builtin/apply.c:4368

2060 +#: builtin/apply.c:4372

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

2062 msgstr "visa antal tillagda och borttagna rader decimalt"

2063

1991 -#: builtin/apply.c:4370

2064 +#: builtin/apply.c:4374

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

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

2067

1995 -#: builtin/apply.c:4372

2068 +#: builtin/apply.c:4376

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

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

2071

1999 -#: builtin/apply.c:4374

2072 +#: builtin/apply.c:4378

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

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

2075

2003 -#: builtin/apply.c:4376

2076 +#: builtin/apply.c:4380

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

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

2079

2007 -#: builtin/apply.c:4378

2080 +#: builtin/apply.c:4382

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

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

2083

2011 -#: builtin/apply.c:4380

2084 +#: builtin/apply.c:4384

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

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

2087

2015 -#: builtin/apply.c:4382

2088 +#: builtin/apply.c:4386

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

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

2091

2019 -#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463

2092 +#: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:463

2093 msgid "paths are separated with NUL character"

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

2095

2023 -#: builtin/apply.c:4387

2096 +#: builtin/apply.c:4391

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

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

2099

2027 -#: builtin/apply.c:4388

2100 +#: builtin/apply.c:4392

2101 msgid "action"

2102 msgstr "åtgärd"

2103

2031 -#: builtin/apply.c:4389

2104 +#: builtin/apply.c:4393

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

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

2107

2035 -#: builtin/apply.c:4392 builtin/apply.c:4395

2108 +#: builtin/apply.c:4396 builtin/apply.c:4399

2109 msgid "ignore changes in whitespace when finding context"

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

2111

2039 -#: builtin/apply.c:4398

2112 +#: builtin/apply.c:4402

2113 msgid "apply the patch in reverse"

2114 msgstr "tillämpa patchen baklänges"

2115

2043 -#: builtin/apply.c:4400

2116 +#: builtin/apply.c:4404

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

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

2119

2047 -#: builtin/apply.c:4402

2120 +#: builtin/apply.c:4406

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

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

2123

2051 -#: builtin/apply.c:4404

2124 +#: builtin/apply.c:4408

2125 msgid "allow overlapping hunks"

2126 msgstr "tillåt överlappande stycken"

2127

2055 -#: builtin/apply.c:4407

2128 +#: builtin/apply.c:4411

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

2130 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2131

2059 -#: builtin/apply.c:4410

2132 +#: builtin/apply.c:4414

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

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

2135

2063 -#: builtin/apply.c:4412

2136 +#: builtin/apply.c:4416

2137 msgid "root"

2138 msgstr "rot"

2139

2067 -#: builtin/apply.c:4413

2140 +#: builtin/apply.c:4417

2141 msgid "prepend <root> to all filenames"

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

2143

2071 -#: builtin/apply.c:4435

2144 +#: builtin/apply.c:4439

2145 msgid "--3way outside a repository"

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

2147

2075 -#: builtin/apply.c:4443

2148 +#: builtin/apply.c:4447

2149 msgid "--index outside a repository"

2150 msgstr "--index utanför arkiv"

2151

2079 -#: builtin/apply.c:4446

2152 +#: builtin/apply.c:4450

2153 msgid "--cached outside a repository"

2154 msgstr "--cached utanför arkiv"

2155

2083 -#: builtin/apply.c:4462

2156 +#: builtin/apply.c:4466

2157 #, c-format

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

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

2160

2088 -#: builtin/apply.c:4476

2161 +#: builtin/apply.c:4480

2162 #, c-format

2163 msgid "squelched %d whitespace error"

2164 msgid_plural "squelched %d whitespace errors"

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

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

2167

2095 -#: builtin/apply.c:4482 builtin/apply.c:4492

2168 +#: builtin/apply.c:4486 builtin/apply.c:4496

2169 #, c-format

2170 msgid "%d line adds whitespace errors."

2171 msgid_plural "%d lines add whitespace errors."

@@ -2116,21 +2189,21 @@ msgstr "git archive: Fjärr utan URL"

2189 msgid "git archive: expected ACK/NAK, got EOF"

2190 msgstr "git archive: förväntade ACK/NAK, fick EOF"

2191

2119 -#: builtin/archive.c:63

2192 +#: builtin/archive.c:61

2193 #, c-format

2194 msgid "git archive: NACK %s"

2195 msgstr "git archive: NACK %s"

2196

2124 -#: builtin/archive.c:65

2197 +#: builtin/archive.c:63

2198 #, c-format

2199 msgid "remote error: %s"

2200 msgstr "fjärrfel: %s"

2201

2129 -#: builtin/archive.c:66

2202 +#: builtin/archive.c:64

2203 msgid "git archive: protocol error"

2204 msgstr "git archive: protokollfel"

2205

2133 -#: builtin/archive.c:71

2206 +#: builtin/archive.c:68

2207 msgid "git archive: expected a flush"

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

2209

@@ -2246,23 +2319,23 @@ msgstr "n,m"

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

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

2321

2249 -#: builtin/branch.c:23

2322 +#: builtin/branch.c:24

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

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

2325

2253 -#: builtin/branch.c:24

2326 +#: builtin/branch.c:25

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

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

2329

2257 -#: builtin/branch.c:25

2330 +#: builtin/branch.c:26

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

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

2333

2261 -#: builtin/branch.c:26

2334 +#: builtin/branch.c:27

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

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

2337

2265 -#: builtin/branch.c:145

2338 +#: builtin/branch.c:146

2339 #, c-format

2340 msgid ""

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

@@ -2271,7 +2344,7 @@ msgstr ""

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

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

2346

2274 -#: builtin/branch.c:149

2347 +#: builtin/branch.c:150

2348 #, c-format

2349 msgid ""

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

@@ -2280,12 +2353,12 @@ msgstr ""

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

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

2355

2283 -#: builtin/branch.c:163

2356 +#: builtin/branch.c:164

2357 #, c-format

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

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

2360

2288 -#: builtin/branch.c:167

2361 +#: builtin/branch.c:168

2362 #, c-format

2363 msgid ""

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

@@ -2294,288 +2367,332 @@ msgstr ""

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

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

2369

2297 -#: builtin/branch.c:180

2370 +#: builtin/branch.c:181

2371 msgid "Update of config-file failed"

2372 msgstr "Misslyckades uppdatera konfigurationsfil"

2373

2301 -#: builtin/branch.c:208

2374 +#: builtin/branch.c:209

2375 msgid "cannot use -a with -d"

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

2377

2305 -#: builtin/branch.c:214

2378 +#: builtin/branch.c:215

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

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

2381

2309 -#: builtin/branch.c:222

2382 +#: builtin/branch.c:223

2383 #, c-format

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

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

2386

2314 -#: builtin/branch.c:235

2387 +#: builtin/branch.c:236

2388 #, c-format

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

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

2391

2319 -#: builtin/branch.c:236

2392 +#: builtin/branch.c:237

2393 #, c-format

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

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

2396

2324 -#: builtin/branch.c:250

2397 +#: builtin/branch.c:251

2398 #, c-format

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

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

2401

2329 -#: builtin/branch.c:251

2402 +#: builtin/branch.c:252

2403 #, c-format

2404 msgid "Error deleting branch '%s'"

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

2406

2334 -#: builtin/branch.c:258

2407 +#: builtin/branch.c:259

2408 #, c-format

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

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

2411

2339 -#: builtin/branch.c:259

2412 +#: builtin/branch.c:260

2413 #, c-format

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

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

2416

2344 -#: builtin/branch.c:361

2417 +#: builtin/branch.c:362

2418 #, c-format

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

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

2421

2349 -#: builtin/branch.c:433

2422 +#: builtin/branch.c:434

2423 #, c-format

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

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

2426

2354 -#: builtin/branch.c:435

2427 +#: builtin/branch.c:436

2428 #, c-format

2429 msgid "[behind %d]"

2430 msgstr "[bakom %d] "

2431

2359 -#: builtin/branch.c:439

2432 +#: builtin/branch.c:440

2433 #, c-format

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

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

2436

2364 -#: builtin/branch.c:441

2437 +#: builtin/branch.c:442

2438 #, c-format

2439 msgid "[ahead %d]"

2440 msgstr "[före %d] "

2441

2369 -#: builtin/branch.c:444

2442 +#: builtin/branch.c:445

2443 #, c-format

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

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

2446

2374 -#: builtin/branch.c:447

2447 +#: builtin/branch.c:448

2448 #, c-format

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

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

2451

2379 -#: builtin/branch.c:469

2452 +#: builtin/branch.c:470

2453 msgid " **** invalid ref ****"

2454 msgstr " **** ogiltig ref ****"

2455

2383 -#: builtin/branch.c:560

2456 +#: builtin/branch.c:562

2457 +#, c-format

2458 +msgid "(no branch, rebasing %s)"

2459 +msgstr "(ingen gren, ombaserar %s)"

2460 +

2461 +#: builtin/branch.c:565

2462 +#, c-format

2463 +msgid "(no branch, bisect started on %s)"

2464 +msgstr "(ingen gren, \"bisect\" startad på %s)"

2465 +

2466 +#: builtin/branch.c:568

2467 +#, c-format

2468 +msgid "(detached from %s)"

2469 +msgstr "(frånkopplad från %s)"

2470 +

2471 +#: builtin/branch.c:571

2472 msgid "(no branch)"

2473 msgstr "(ingen gren)"

2474

2387 -#: builtin/branch.c:593

2475 +#: builtin/branch.c:617

2476 #, c-format

2477 msgid "object '%s' does not point to a commit"

2478 msgstr "objektet \"%s\" pekar på en incheckning"

2479

2392 -#: builtin/branch.c:625

2480 +#: builtin/branch.c:649

2481 msgid "some refs could not be read"

2482 msgstr "vissa referenser kunde inte läsas"

2483

2396 -#: builtin/branch.c:638

2484 +#: builtin/branch.c:662

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

2486 msgstr ""

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

2488

2401 -#: builtin/branch.c:648

2489 +#: builtin/branch.c:672

2490 #, c-format

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

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

2493

2406 -#: builtin/branch.c:663

2494 +#: builtin/branch.c:687

2495 msgid "Branch rename failed"

2496 msgstr "Misslyckades byta namn på gren"

2497

2410 -#: builtin/branch.c:667

2498 +#: builtin/branch.c:691

2499 #, c-format

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

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

2502

2415 -#: builtin/branch.c:671

2503 +#: builtin/branch.c:695

2504 #, c-format

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

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

2507

2420 -#: builtin/branch.c:678

2508 +#: builtin/branch.c:702

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

2510 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2511

2424 -#: builtin/branch.c:693

2512 +#: builtin/branch.c:717

2513 #, c-format

2514 msgid "malformed object name %s"

2515 msgstr "felformat objektnamn %s"

2516

2429 -#: builtin/branch.c:717

2517 +#: builtin/branch.c:741

2518 #, c-format

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

2520 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2521

2434 -#: builtin/branch.c:747

2522 +#: builtin/branch.c:771

2523 msgid "Generic options"

2524 msgstr "Allmänna flaggor"

2525

2438 -#: builtin/branch.c:749

2526 +#: builtin/branch.c:773

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

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

2529

2442 -#: builtin/branch.c:750

2530 +#: builtin/branch.c:774

2531 msgid "suppress informational messages"

2532 msgstr "undertryck informationsmeddelanden"

2533

2446 -#: builtin/branch.c:751

2534 +#: builtin/branch.c:775

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

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

2537

2450 -#: builtin/branch.c:753

2538 +#: builtin/branch.c:777

2539 msgid "change upstream info"

2540 msgstr "ändra uppströmsinformation"

2541

2454 -#: builtin/branch.c:757

2542 +#: builtin/branch.c:781

2543 msgid "use colored output"

2544 msgstr "använd färgad utdata"

2545

2458 -#: builtin/branch.c:758

2546 +#: builtin/branch.c:782

2547 msgid "act on remote-tracking branches"

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

2549

2462 -#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788

2463 -#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367

2464 -#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468

2550 +#: builtin/branch.c:785 builtin/branch.c:791 builtin/branch.c:812

2551 +#: builtin/branch.c:818 builtin/commit.c:1368 builtin/commit.c:1369

2552 +#: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468

2553 msgid "commit"

2554 msgstr "incheckning"

2555

2468 -#: builtin/branch.c:762 builtin/branch.c:768

2556 +#: builtin/branch.c:786 builtin/branch.c:792

2557 msgid "print only branches that contain the commit"

2558 msgstr "visa endast grenar som innehåller incheckningen"

2559

2472 -#: builtin/branch.c:774

2560 +#: builtin/branch.c:798

2561 msgid "Specific git-branch actions:"

2562 msgstr "Specifika git-branch-åtgärder:"

2563

2476 -#: builtin/branch.c:775

2564 +#: builtin/branch.c:799

2565 msgid "list both remote-tracking and local branches"

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

2567

2480 -#: builtin/branch.c:777

2568 +#: builtin/branch.c:801

2569 msgid "delete fully merged branch"

2570 msgstr "ta bort helt sammanslagen gren"

2571

2484 -#: builtin/branch.c:778

2572 +#: builtin/branch.c:802

2573 msgid "delete branch (even if not merged)"

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

2575

2488 -#: builtin/branch.c:779

2576 +#: builtin/branch.c:803

2577 msgid "move/rename a branch and its reflog"

2578 msgstr "flytta/ta bort en gren och dess reflogg"

2579

2492 -#: builtin/branch.c:780

2580 +#: builtin/branch.c:804

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

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

2583

2496 -#: builtin/branch.c:781

2584 +#: builtin/branch.c:805

2585 msgid "list branch names"

2586 msgstr "lista namn på grenar"

2587

2500 -#: builtin/branch.c:782

2588 +#: builtin/branch.c:806

2589 msgid "create the branch's reflog"

2590 msgstr "skapa grenens reflogg"

2591

2504 -#: builtin/branch.c:784

2592 +#: builtin/branch.c:808

2593 msgid "edit the description for the branch"

2594 msgstr "redigera beskrivning för grenen"

2595

2508 -#: builtin/branch.c:785

2596 +#: builtin/branch.c:809

2597 msgid "force creation (when already exists)"

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

2599

2512 -#: builtin/branch.c:788

2600 +#: builtin/branch.c:812

2601 msgid "print only not merged branches"

2602 msgstr "visa endast ej sammanslagna grenar"

2603

2516 -#: builtin/branch.c:794

2604 +#: builtin/branch.c:818

2605 msgid "print only merged branches"

2606 msgstr "visa endast sammanslagna grenar"

2607

2520 -#: builtin/branch.c:798

2608 +#: builtin/branch.c:822

2609 msgid "list branches in columns"

2610 msgstr "visa grenar i spalter"

2611

2524 -#: builtin/branch.c:811

2612 +#: builtin/branch.c:835

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

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

2615

2528 -#: builtin/branch.c:816 builtin/clone.c:561

2616 +#: builtin/branch.c:840 builtin/clone.c:609

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

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

2619

2532 -#: builtin/branch.c:839

2620 +#: builtin/branch.c:863

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

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

2623

2536 -#: builtin/branch.c:845

2624 +#: builtin/branch.c:869 builtin/branch.c:908

2625 msgid "branch name required"

2626 msgstr "grennamn krävs"

2627

2540 -#: builtin/branch.c:860

2628 +#: builtin/branch.c:884

2629 msgid "Cannot give description to detached HEAD"

2630 msgstr "Kan inte beskriva frånkopplad HEAD"

2631

2544 -#: builtin/branch.c:865

2632 +#: builtin/branch.c:889

2633 msgid "cannot edit description of more than one branch"

2634 msgstr "kan inte redigera beskrivning för mer än en gren"

2635

2548 -#: builtin/branch.c:872

2636 +#: builtin/branch.c:896

2637 #, c-format

2638 msgid "No commit on branch '%s' yet."

2639 msgstr "Inga incheckningar på grenen \"%s\" ännu"

2640

2553 -#: builtin/branch.c:875

2641 +#: builtin/branch.c:899

2642 #, c-format

2643 msgid "No branch named '%s'."

2644 msgstr "Ingen gren vid namnet \"%s\"."

2645

2558 -#: builtin/branch.c:888

2646 +#: builtin/branch.c:914

2647 msgid "too many branches for a rename operation"

2648 msgstr "för många grenar för namnbyte"

2649

2562 -#: builtin/branch.c:893

2650 +#: builtin/branch.c:919

2651 +msgid "too many branches to set new upstream"

2652 +msgstr "för många grenar för att byta uppström"

2653 +

2654 +#: builtin/branch.c:923

2655 +#, c-format

2656 +msgid ""

2657 +"could not set upstream of HEAD to %s when it does not point to any branch."

2658 +msgstr ""

2659 +"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

2660 +

2661 +#: builtin/branch.c:926 builtin/branch.c:948 builtin/branch.c:970

2662 +#, c-format

2663 +msgid "no such branch '%s'"

2664 +msgstr "okänd gren \"%s\""

2665 +

2666 +#: builtin/branch.c:930

2667 #, c-format

2668 msgid "branch '%s' does not exist"

2669 msgstr "grenen \"%s\" finns inte"

2670

2567 -#: builtin/branch.c:905

2671 +#: builtin/branch.c:942

2672 +msgid "too many branches to unset upstream"

2673 +msgstr "för många grenar för att ta bort uppström"

2674 +

2675 +#: builtin/branch.c:946

2676 +msgid "could not unset upstream of HEAD when it does not point to any branch."

2677 +msgstr ""

2678 +"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

2679 +

2680 +#: builtin/branch.c:952

2681 #, c-format

2682 msgid "Branch '%s' has no upstream information"

2683 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

2684

2572 -#: builtin/branch.c:920

2685 +#: builtin/branch.c:967

2686 +msgid "it does not make sense to create 'HEAD' manually"

2687 +msgstr "kan inte skapa \"HEAD\" manuellt"

2688 +

2689 +#: builtin/branch.c:973

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

2691 msgstr ""

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

2693 "grennamn"

2694

2578 -#: builtin/branch.c:923

2695 +#: builtin/branch.c:976

2696 #, c-format

2697 msgid ""

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

@@ -2584,7 +2701,7 @@ msgstr ""

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

2702 "eller --set-upstream-to\n"

2703

2587 -#: builtin/branch.c:940

2704 +#: builtin/branch.c:993

2705 #, c-format

2706 msgid ""

2707 "\n"

@@ -2595,12 +2712,12 @@ msgstr ""

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

2713 "\n"

2714

2598 -#: builtin/branch.c:941

2715 +#: builtin/branch.c:994

2716 #, c-format

2717 msgid " git branch -d %s\n"

2718 msgstr " git branch -d %s\n"

2719

2603 -#: builtin/branch.c:942

2720 +#: builtin/branch.c:995

2721 #, c-format

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

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

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

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

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

2801

2685 -#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177

2802 +#: builtin/check-ignore.c:18 builtin/checkout.c:1041 builtin/gc.c:177

2803 msgid "suppress progress reporting"

2804 msgstr "undertryck förloppsrapportering"

2805

@@ -2804,60 +2921,60 @@ msgstr "\"%s\" kan inte användas med %s"

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

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

2923

2807 -#: builtin/checkout.c:265 builtin/checkout.c:426

2924 +#: builtin/checkout.c:265 builtin/checkout.c:455

2925 msgid "corrupt index file"

2926 msgstr "indexfilen är trasig"

2927

2811 -#: builtin/checkout.c:295 builtin/checkout.c:302

2928 +#: builtin/checkout.c:326 builtin/checkout.c:333

2929 #, c-format

2930 msgid "path '%s' is unmerged"

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

2932

2816 -#: builtin/checkout.c:448

2933 +#: builtin/checkout.c:477

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

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

2936

2820 -#: builtin/checkout.c:569

2937 +#: builtin/checkout.c:598

2938 #, c-format

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

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

2941

2825 -#: builtin/checkout.c:602

2942 +#: builtin/checkout.c:631

2943 msgid "HEAD is now at"

2944 msgstr "HEAD är nu på"

2945

2829 -#: builtin/checkout.c:609

2946 +#: builtin/checkout.c:638

2947 #, c-format

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

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

2950

2834 -#: builtin/checkout.c:612

2951 +#: builtin/checkout.c:641

2952 #, c-format

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

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

2955

2839 -#: builtin/checkout.c:616

2956 +#: builtin/checkout.c:645

2957 #, c-format

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

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

2960

2844 -#: builtin/checkout.c:618 builtin/checkout.c:955

2961 +#: builtin/checkout.c:647 builtin/checkout.c:984

2962 #, c-format

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

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

2965

2849 -#: builtin/checkout.c:620

2966 +#: builtin/checkout.c:649

2967 #, c-format

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

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

2970

2854 -#: builtin/checkout.c:676

2971 +#: builtin/checkout.c:705

2972 #, c-format

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

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

2975

2976 #. The singular version

2860 -#: builtin/checkout.c:682

2977 +#: builtin/checkout.c:711

2978 #, c-format

2979 msgid ""

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

@@ -2880,7 +2997,7 @@ msgstr[1] ""

2997 "\n"

2998 "%s\n"

2999

2883 -#: builtin/checkout.c:700

3000 +#: builtin/checkout.c:729

3001 #, c-format

3002 msgid ""

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

@@ -2895,132 +3012,132 @@ msgstr ""

3012 " git branch nytt_grennamn %s\n"

3013 "\n"

3014

2898 -#: builtin/checkout.c:730

3015 +#: builtin/checkout.c:759

3016 msgid "internal error in revision walk"

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

3018

2902 -#: builtin/checkout.c:734

3019 +#: builtin/checkout.c:763

3020 msgid "Previous HEAD position was"

3021 msgstr "Tidigare position för HEAD var"

3022

2906 -#: builtin/checkout.c:761 builtin/checkout.c:950

3023 +#: builtin/checkout.c:790 builtin/checkout.c:979

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

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

3026

3027 #. case (1)

2911 -#: builtin/checkout.c:886

3028 +#: builtin/checkout.c:915

3029 #, c-format

3030 msgid "invalid reference: %s"

3031 msgstr "felaktig referens: %s"

3032

3033 #. case (1): want a tree

2917 -#: builtin/checkout.c:925

3034 +#: builtin/checkout.c:954

3035 #, c-format

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

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

3038

2922 -#: builtin/checkout.c:964

3039 +#: builtin/checkout.c:993

3040 msgid "paths cannot be used with switching branches"

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

3042

2926 -#: builtin/checkout.c:967 builtin/checkout.c:971

3043 +#: builtin/checkout.c:996 builtin/checkout.c:1000

3044 #, c-format

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

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

3047

2931 -#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983

2932 -#: builtin/checkout.c:986

3048 +#: builtin/checkout.c:1004 builtin/checkout.c:1007 builtin/checkout.c:1012

3049 +#: builtin/checkout.c:1015

3050 #, c-format

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

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

3053

2937 -#: builtin/checkout.c:991

3054 +#: builtin/checkout.c:1020

3055 #, c-format

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

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

3058

2942 -#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89

3059 +#: builtin/checkout.c:1042 builtin/checkout.c:1044 builtin/clone.c:90

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

3061 msgid "branch"

3062 msgstr "gren"

3063

2947 -#: builtin/checkout.c:1014

3064 +#: builtin/checkout.c:1043

3065 msgid "create and checkout a new branch"

3066 msgstr "skapa och checka ut en ny gren"

3067

2951 -#: builtin/checkout.c:1016

3068 +#: builtin/checkout.c:1045

3069 msgid "create/reset and checkout a branch"

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

3071

2955 -#: builtin/checkout.c:1017

3072 +#: builtin/checkout.c:1046

3073 msgid "create reflog for new branch"

3074 msgstr "skapa reflogg för ny gren"

3075

2959 -#: builtin/checkout.c:1018

3076 +#: builtin/checkout.c:1047

3077 msgid "detach the HEAD at named commit"

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

3079

2963 -#: builtin/checkout.c:1019

3080 +#: builtin/checkout.c:1048

3081 msgid "set upstream info for new branch"

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

3083

2967 -#: builtin/checkout.c:1021

3084 +#: builtin/checkout.c:1050

3085 msgid "new branch"

3086 msgstr "ny gren"

3087

2971 -#: builtin/checkout.c:1021

3088 +#: builtin/checkout.c:1050

3089 msgid "new unparented branch"

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

3091

2975 -#: builtin/checkout.c:1022

3092 +#: builtin/checkout.c:1051

3093 msgid "checkout our version for unmerged files"

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

3095

2979 -#: builtin/checkout.c:1024

3096 +#: builtin/checkout.c:1053

3097 msgid "checkout their version for unmerged files"

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

3099

2983 -#: builtin/checkout.c:1026

3100 +#: builtin/checkout.c:1055

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

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

3103

2987 -#: builtin/checkout.c:1027

3104 +#: builtin/checkout.c:1056

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

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

3107

2991 -#: builtin/checkout.c:1028 builtin/merge.c:215

3108 +#: builtin/checkout.c:1057 builtin/merge.c:217

3109 msgid "update ignored files (default)"

3110 msgstr "uppdatera ignorerade filer (standard)"

3111

2995 -#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245

3112 +#: builtin/checkout.c:1058 builtin/log.c:1149 parse-options.h:245

3113 msgid "style"

3114 msgstr "stil"

3115

2999 -#: builtin/checkout.c:1030

3116 +#: builtin/checkout.c:1059

3117 msgid "conflict style (merge or diff3)"

3118 msgstr "konfliktstil (merge eller diff3)"

3119

3003 -#: builtin/checkout.c:1033

3120 +#: builtin/checkout.c:1062

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

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

3123

3007 -#: builtin/checkout.c:1057

3124 +#: builtin/checkout.c:1086

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

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

3127

3011 -#: builtin/checkout.c:1074

3128 +#: builtin/checkout.c:1103

3129 msgid "--track needs a branch name"

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

3131

3015 -#: builtin/checkout.c:1081

3132 +#: builtin/checkout.c:1110

3133 msgid "Missing branch name; try -b"

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

3135

3019 -#: builtin/checkout.c:1116

3136 +#: builtin/checkout.c:1145

3137 msgid "invalid path specification"

3138 msgstr "felaktig sökvägsangivelse"

3139

3023 -#: builtin/checkout.c:1123

3140 +#: builtin/checkout.c:1152

3141 #, c-format

3142 msgid ""

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

@@ -3029,12 +3146,12 @@ msgstr ""

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

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

3148

3032 -#: builtin/checkout.c:1128

3149 +#: builtin/checkout.c:1157

3150 #, c-format

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

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

3153

3037 -#: builtin/checkout.c:1132

3154 +#: builtin/checkout.c:1161

3155 msgid ""

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

3157 "checking out of the index."

@@ -3084,7 +3201,7 @@ msgstr "tvinga"

3201 msgid "remove whole directories"

3202 msgstr "ta bort hela kataloger"

3203

3087 -#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717

3204 +#: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717

3205 #: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182

3206 msgid "pattern"

3207 msgstr "mönster"

@@ -3120,216 +3237,234 @@ msgstr ""

3237 "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; "

3238 "vägrar städa"

3239

3123 -#: builtin/clone.c:36

3240 +#: builtin/clone.c:37

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

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

3243

3127 -#: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212

3244 +#: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214

3245 #: builtin/push.c:436

3246 msgid "force progress reporting"

3247 msgstr "tvinga förloppsrapportering"

3248

3132 -#: builtin/clone.c:66

3249 +#: builtin/clone.c:67

3250 msgid "don't create a checkout"

3251 msgstr "skapa inte någon utcheckning"

3252

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

3253 +#: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488

3254 msgid "create a bare repository"

3255 msgstr "skapa ett naket (\"bare\") arkiv"

3256

3140 -#: builtin/clone.c:72

3257 +#: builtin/clone.c:73

3258 msgid "create a mirror repository (implies bare)"

3259 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

3260

3144 -#: builtin/clone.c:74

3261 +#: builtin/clone.c:75

3262 msgid "to clone from a local repository"

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

3264

3148 -#: builtin/clone.c:76

3265 +#: builtin/clone.c:77

3266 msgid "don't use local hardlinks, always copy"

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

3268

3152 -#: builtin/clone.c:78

3269 +#: builtin/clone.c:79

3270 msgid "setup as shared repository"

3271 msgstr "skapa som ett delat arkiv"

3272

3156 -#: builtin/clone.c:80 builtin/clone.c:82

3273 +#: builtin/clone.c:81 builtin/clone.c:83

3274 msgid "initialize submodules in the clone"

3275 msgstr "initiera undermoduler i klonen"

3276

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

3277 +#: builtin/clone.c:84 builtin/init-db.c:485

3278 msgid "template-directory"

3279 msgstr "mallkatalog"

3280

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

3281 +#: builtin/clone.c:85 builtin/init-db.c:486

3282 msgid "directory from which templates will be used"

3283 msgstr "katalog att använda mallar från"

3284

3168 -#: builtin/clone.c:86

3285 +#: builtin/clone.c:87

3286 msgid "reference repository"

3287 msgstr "referensarkiv"

3288

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

3289 +#: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44

3290 msgid "name"

3291 msgstr "namn"

3292

3176 -#: builtin/clone.c:88

3293 +#: builtin/clone.c:89

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

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

3296

3180 -#: builtin/clone.c:90

3297 +#: builtin/clone.c:91

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

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

3300

3184 -#: builtin/clone.c:92

3301 +#: builtin/clone.c:93

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

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

3304

3188 -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662

3305 +#: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662

3306 msgid "depth"

3307 msgstr "djup"

3308

3192 -#: builtin/clone.c:94

3309 +#: builtin/clone.c:95

3310 msgid "create a shallow clone of that depth"

3311 msgstr "skapa en grund klon på detta djup"

3312

3196 -#: builtin/clone.c:96

3313 +#: builtin/clone.c:97

3314 msgid "clone only one branch, HEAD or --branch"

3315 msgstr "klona endast en gren, HEAD eller --branch"

3316

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

3317 +#: builtin/clone.c:98 builtin/init-db.c:494

3318 msgid "gitdir"

3319 msgstr "gitkat"

3320

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

3321 +#: builtin/clone.c:99 builtin/init-db.c:495

3322 msgid "separate git dir from working tree"

3323 msgstr "separera gitkatalogen från arbetskatalogen"

3324

3208 -#: builtin/clone.c:99

3325 +#: builtin/clone.c:100

3326 msgid "key=value"

3327 msgstr "nyckel=värde"

3328

3212 -#: builtin/clone.c:100

3329 +#: builtin/clone.c:101

3330 msgid "set config inside the new repository"

3331 msgstr "ställ in konfiguration i det nya arkivet"

3332

3216 -#: builtin/clone.c:243

3333 +#: builtin/clone.c:244

3334 #, c-format

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

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

3337

3221 -#: builtin/clone.c:306

3338 +#: builtin/clone.c:307

3339 #, c-format

3340 msgid "failed to create directory '%s'"

3341 msgstr "misslyckades skapa katalogen \"%s\""

3342

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

3343 +#: builtin/clone.c:309 builtin/diff.c:77

3344 #, c-format

3345 msgid "failed to stat '%s'"

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

3347

3231 -#: builtin/clone.c:310

3348 +#: builtin/clone.c:311

3349 #, c-format

3350 msgid "%s exists and is not a directory"

3351 msgstr "%s finns och är ingen katalog"

3352

3236 -#: builtin/clone.c:324

3353 +#: builtin/clone.c:325

3354 #, c-format

3355 msgid "failed to stat %s\n"

3356 msgstr "misslyckades ta status på %s\n"

3357

3241 -#: builtin/clone.c:346

3358 +#: builtin/clone.c:347

3359 #, c-format

3360 msgid "failed to create link '%s'"

3361 msgstr "misslyckades skapa länken \"%s\""

3362

3246 -#: builtin/clone.c:350

3363 +#: builtin/clone.c:351

3364 #, c-format

3365 msgid "failed to copy file to '%s'"

3366 msgstr "misslyckades kopiera filen till \"%s\""

3367

3251 -#: builtin/clone.c:373

3368 +#: builtin/clone.c:374

3369 #, c-format

3370 msgid "done.\n"

3371 msgstr "klart.\n"

3372

3256 -#: builtin/clone.c:443

3373 +#: builtin/clone.c:387

3374 +msgid ""

3375 +"Clone succeeded, but checkout failed.\n"

3376 +"You can inspect what was checked out with 'git status'\n"

3377 +"and retry the checkout with 'git checkout -f HEAD'\n"

3378 +msgstr ""

3379 +"Klonen lyckades, men utcheckningen misslyckades.\n"

3380 +"Du kan inspektera det som checkades ut med \"git status\"\n"

3381 +"och försöka checka ut igen med \"git checkout -f HEAD\"\n"

3382 +

3383 +#: builtin/clone.c:466

3384 #, c-format

3385 msgid "Could not find remote branch %s to clone."

3386 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

3387

3261 -#: builtin/clone.c:552

3388 +#: builtin/clone.c:540

3389 +msgid "remote did not send all necessary objects"

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

3391 +

3392 +#: builtin/clone.c:600

3393 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

3394 msgstr ""

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

3396

3266 -#: builtin/clone.c:690

3397 +#: builtin/clone.c:631

3398 +msgid "unable to checkout working tree"

3399 +msgstr "kunde inte checka ut arbetskatalogen"

3400 +

3401 +#: builtin/clone.c:739

3402 msgid "Too many arguments."

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

3404

3270 -#: builtin/clone.c:694

3405 +#: builtin/clone.c:743

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

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

3408

3274 -#: builtin/clone.c:705

3409 +#: builtin/clone.c:754

3410 #, c-format

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

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

3413

3279 -#: builtin/clone.c:708

3414 +#: builtin/clone.c:757

3415 msgid "--bare and --separate-git-dir are incompatible."

3416 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

3417

3283 -#: builtin/clone.c:721

3418 +#: builtin/clone.c:770

3419 #, c-format

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

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

3422

3288 -#: builtin/clone.c:726

3423 +#: builtin/clone.c:775

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

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

3426

3292 -#: builtin/clone.c:736

3427 +#: builtin/clone.c:785

3428 #, c-format

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

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

3431

3297 -#: builtin/clone.c:746

3432 +#: builtin/clone.c:795

3433 #, c-format

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

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

3436

3302 -#: builtin/clone.c:759 builtin/clone.c:771

3437 +#: builtin/clone.c:808 builtin/clone.c:820

3438 #, c-format

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

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

3441

3307 -#: builtin/clone.c:762

3442 +#: builtin/clone.c:811

3443 #, c-format

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

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

3446

3312 -#: builtin/clone.c:781

3447 +#: builtin/clone.c:830

3448 #, c-format

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

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

3451

3317 -#: builtin/clone.c:783

3452 +#: builtin/clone.c:832

3453 #, c-format

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

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

3456

3322 -#: builtin/clone.c:818

3457 +#: builtin/clone.c:867

3458 #, c-format

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

3460 msgstr "Vet inte hur man klonar %s"

3461

3327 -#: builtin/clone.c:867

3462 +#: builtin/clone.c:916

3463 #, c-format

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

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

3466

3332 -#: builtin/clone.c:874

3467 +#: builtin/clone.c:923

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

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

3470

@@ -3424,93 +3559,93 @@ msgstr ""

3559 "\n"

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

3561

3427 -#: builtin/commit.c:258

3562 +#: builtin/commit.c:260

3563 msgid "failed to unpack HEAD tree object"

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

3565

3431 -#: builtin/commit.c:300

3566 +#: builtin/commit.c:302

3567 msgid "unable to create temporary index"

3568 msgstr "kunde inte skapa temporär indexfil"

3569

3435 -#: builtin/commit.c:306

3570 +#: builtin/commit.c:308

3571 msgid "interactive add failed"

3572 msgstr "interaktiv tilläggning misslyckades"

3573

3439 -#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410

3574 +#: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412

3575 msgid "unable to write new_index file"

3576 msgstr "kunde inte skriva filen new_index"

3577

3443 -#: builtin/commit.c:391

3578 +#: builtin/commit.c:393

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

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

3581

3447 -#: builtin/commit.c:393

3582 +#: builtin/commit.c:395

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

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

3585

3451 -#: builtin/commit.c:403

3586 +#: builtin/commit.c:405

3587 msgid "cannot read the index"

3588 msgstr "kan inte läsa indexet"

3589

3455 -#: builtin/commit.c:423

3590 +#: builtin/commit.c:425

3591 msgid "unable to write temporary index file"

3592 msgstr "kunde inte skriva temporär indexfil"

3593

3459 -#: builtin/commit.c:511 builtin/commit.c:517

3594 +#: builtin/commit.c:513 builtin/commit.c:519

3595 #, c-format

3596 msgid "invalid commit: %s"

3597 msgstr "felaktig incheckning: %s"

3598

3464 -#: builtin/commit.c:540

3599 +#: builtin/commit.c:542

3600 msgid "malformed --author parameter"

3601 msgstr "felformad \"--author\"-flagga"

3602

3468 -#: builtin/commit.c:560

3603 +#: builtin/commit.c:562

3604 #, c-format

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

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

3607

3473 -#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954

3608 +#: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956

3609 #, c-format

3610 msgid "could not lookup commit %s"

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

3612

3478 -#: builtin/commit.c:610 builtin/shortlog.c:272

3613 +#: builtin/commit.c:612 builtin/shortlog.c:272

3614 #, c-format

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

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

3617

3483 -#: builtin/commit.c:612

3618 +#: builtin/commit.c:614

3619 msgid "could not read log from standard input"

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

3621

3487 -#: builtin/commit.c:616

3622 +#: builtin/commit.c:618

3623 #, c-format

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

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

3626

3492 -#: builtin/commit.c:622

3627 +#: builtin/commit.c:624

3628 msgid "commit has empty message"

3629 msgstr "incheckningen har ett tomt meddelande"

3630

3496 -#: builtin/commit.c:638

3631 +#: builtin/commit.c:640

3632 msgid "could not read MERGE_MSG"

3633 msgstr "kunde inte läsa MERGE_MSG"

3634

3500 -#: builtin/commit.c:642

3635 +#: builtin/commit.c:644

3636 msgid "could not read SQUASH_MSG"

3637 msgstr "kunde inte läsa SQUASH_MSG"

3638

3504 -#: builtin/commit.c:646

3639 +#: builtin/commit.c:648

3640 #, c-format

3641 msgid "could not read '%s'"

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

3643

3509 -#: builtin/commit.c:707

3644 +#: builtin/commit.c:709

3645 msgid "could not write commit template"

3646 msgstr "kunde inte skriva incheckningsmall"

3647

3513 -#: builtin/commit.c:718

3648 +#: builtin/commit.c:720

3649 #, c-format

3650 msgid ""

3651 "\n"

@@ -3525,7 +3660,7 @@ msgstr ""

3660 "\t%s\n"

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

3662

3528 -#: builtin/commit.c:723

3663 +#: builtin/commit.c:725

3664 #, c-format

3665 msgid ""

3666 "\n"

@@ -3540,7 +3675,7 @@ msgstr ""

3675 "\t%s\n"

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

3677

3543 -#: builtin/commit.c:735

3678 +#: builtin/commit.c:737

3679 #, c-format

3680 msgid ""

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

@@ -3550,7 +3685,7 @@ msgstr ""

3685 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

3686 "incheckningen.\n"

3687

3553 -#: builtin/commit.c:740

3688 +#: builtin/commit.c:742

3689 #, c-format

3690 msgid ""

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

@@ -3561,139 +3696,139 @@ msgstr ""

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

3697 "Ett tomt meddelande avbryter incheckningen.\n"

3698

3564 -#: builtin/commit.c:753

3699 +#: builtin/commit.c:755

3700 #, c-format

3701 msgid "%sAuthor: %s"

3702 msgstr "%sFörfattare: %s"

3703

3569 -#: builtin/commit.c:760

3704 +#: builtin/commit.c:762

3705 #, c-format

3706 msgid "%sCommitter: %s"

3707 msgstr "%sIncheckare: %s"

3708

3574 -#: builtin/commit.c:780

3709 +#: builtin/commit.c:782

3710 msgid "Cannot read index"

3711 msgstr "Kan inte läsa indexet"

3712

3578 -#: builtin/commit.c:817

3713 +#: builtin/commit.c:819

3714 msgid "Error building trees"

3715 msgstr "Fel vid byggande av träd"

3716

3582 -#: builtin/commit.c:832 builtin/tag.c:359

3717 +#: builtin/commit.c:834 builtin/tag.c:359

3718 #, c-format

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

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

3721

3587 -#: builtin/commit.c:929

3722 +#: builtin/commit.c:931

3723 #, c-format

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

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

3726

3592 -#: builtin/commit.c:944 builtin/commit.c:1138

3727 +#: builtin/commit.c:946 builtin/commit.c:1140

3728 #, c-format

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

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

3731

3597 -#: builtin/commit.c:974

3732 +#: builtin/commit.c:976

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

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

3735

3601 -#: builtin/commit.c:985

3736 +#: builtin/commit.c:987

3737 msgid "You have nothing to amend."

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

3739

3605 -#: builtin/commit.c:988

3740 +#: builtin/commit.c:990

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

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

3743

3609 -#: builtin/commit.c:990

3744 +#: builtin/commit.c:992

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

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

3747

3613 -#: builtin/commit.c:993

3748 +#: builtin/commit.c:995

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

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

3751

3617 -#: builtin/commit.c:1003

3752 +#: builtin/commit.c:1005

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

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

3755

3621 -#: builtin/commit.c:1005

3756 +#: builtin/commit.c:1007

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

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

3759

3625 -#: builtin/commit.c:1013

3760 +#: builtin/commit.c:1015

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

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

3763

3629 -#: builtin/commit.c:1030

3764 +#: builtin/commit.c:1032

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

3766 msgstr ""

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

3768

3634 -#: builtin/commit.c:1032

3769 +#: builtin/commit.c:1034

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

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

3772

3638 -#: builtin/commit.c:1034

3773 +#: builtin/commit.c:1036

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

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

3776

3642 -#: builtin/commit.c:1036

3777 +#: builtin/commit.c:1038

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

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

3780

3646 -#: builtin/commit.c:1046 builtin/tag.c:575

3781 +#: builtin/commit.c:1048 builtin/tag.c:575

3782 #, c-format

3783 msgid "Invalid cleanup mode %s"

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

3785

3651 -#: builtin/commit.c:1051

3786 +#: builtin/commit.c:1053

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

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

3789

3655 -#: builtin/commit.c:1057 builtin/commit.c:1192

3790 +#: builtin/commit.c:1059 builtin/commit.c:1194

3791 msgid "--long and -z are incompatible"

3792 msgstr "--long och -z är inkompatibla"

3793

3659 -#: builtin/commit.c:1152 builtin/commit.c:1388

3794 +#: builtin/commit.c:1154 builtin/commit.c:1390

3795 msgid "show status concisely"

3796 msgstr "vis koncis status"

3797

3663 -#: builtin/commit.c:1154 builtin/commit.c:1390

3798 +#: builtin/commit.c:1156 builtin/commit.c:1392

3799 msgid "show branch information"

3800 msgstr "visa information om gren"

3801

3667 -#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426

3802 +#: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426

3803 msgid "machine-readable output"

3804 msgstr "maskinläsbar utdata"

3805

3671 -#: builtin/commit.c:1159 builtin/commit.c:1394

3806 +#: builtin/commit.c:1161 builtin/commit.c:1396

3807 msgid "show status in long format (default)"

3808 msgstr "visa status i långt format (standard)"

3809

3675 -#: builtin/commit.c:1162 builtin/commit.c:1397

3810 +#: builtin/commit.c:1164 builtin/commit.c:1399

3811 msgid "terminate entries with NUL"

3812 msgstr "terminera poster med NUL"

3813

3679 -#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647

3680 -#: builtin/fast-export.c:650 builtin/tag.c:459

3814 +#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:653

3815 +#: builtin/fast-export.c:656 builtin/tag.c:459

3816 msgid "mode"

3817 msgstr "läge"

3818

3684 -#: builtin/commit.c:1165 builtin/commit.c:1400

3819 +#: builtin/commit.c:1167 builtin/commit.c:1402

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

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

3822

3688 -#: builtin/commit.c:1168

3823 +#: builtin/commit.c:1170

3824 msgid "show ignored files"

3825 msgstr "visa ignorerade filer"

3826

3692 -#: builtin/commit.c:1169 parse-options.h:151

3827 +#: builtin/commit.c:1171 parse-options.h:151

3828 msgid "when"

3829 msgstr "när"

3830

3696 -#: builtin/commit.c:1170

3831 +#: builtin/commit.c:1172

3832 msgid ""

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

3834 "(Default: all)"

@@ -3701,217 +3836,217 @@ msgstr ""

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

3837 "(Default: all)"

3838

3704 -#: builtin/commit.c:1172

3839 +#: builtin/commit.c:1174

3840 msgid "list untracked files in columns"

3841 msgstr "visa ospårade filer i spalter"

3842

3708 -#: builtin/commit.c:1246

3843 +#: builtin/commit.c:1248

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

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

3846

3712 -#: builtin/commit.c:1248

3847 +#: builtin/commit.c:1250

3848 msgid "could not parse newly created commit"

3849 msgstr "kunde inte tolka en precis skapad incheckning"

3850

3716 -#: builtin/commit.c:1289

3851 +#: builtin/commit.c:1291

3852 msgid "detached HEAD"

3853 msgstr "frånkopplad HEAD"

3854

3720 -#: builtin/commit.c:1291

3855 +#: builtin/commit.c:1293

3856 msgid " (root-commit)"

3857 msgstr " (rotincheckning)"

3858

3724 -#: builtin/commit.c:1358

3859 +#: builtin/commit.c:1360

3860 msgid "suppress summary after successful commit"

3861 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

3862

3728 -#: builtin/commit.c:1359

3863 +#: builtin/commit.c:1361

3864 msgid "show diff in commit message template"

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

3866

3732 -#: builtin/commit.c:1361

3867 +#: builtin/commit.c:1363

3868 msgid "Commit message options"

3869 msgstr "Alternativ för incheckningsmeddelande"

3870

3736 -#: builtin/commit.c:1362 builtin/tag.c:457

3871 +#: builtin/commit.c:1364 builtin/tag.c:457

3872 msgid "read message from file"

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

3874

3740 -#: builtin/commit.c:1363

3875 +#: builtin/commit.c:1365

3876 msgid "author"

3877 msgstr "författare"

3878

3744 -#: builtin/commit.c:1363

3879 +#: builtin/commit.c:1365

3880 msgid "override author for commit"

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

3882

3748 -#: builtin/commit.c:1364 builtin/gc.c:178

3883 +#: builtin/commit.c:1366 builtin/gc.c:178

3884 msgid "date"

3885 msgstr "datum"

3886

3752 -#: builtin/commit.c:1364

3887 +#: builtin/commit.c:1366

3888 msgid "override date for commit"

3889 msgstr "överstyr datum för inchecknignen"

3890

3756 -#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533

3891 +#: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533

3892 #: builtin/notes.c:690 builtin/tag.c:455

3893 msgid "message"

3894 msgstr "meddelande"

3895

3761 -#: builtin/commit.c:1365

3896 +#: builtin/commit.c:1367

3897 msgid "commit message"

3898 msgstr "incheckningsmeddelande"

3899

3765 -#: builtin/commit.c:1366

3900 +#: builtin/commit.c:1368

3901 msgid "reuse and edit message from specified commit"

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

3903

3769 -#: builtin/commit.c:1367

3904 +#: builtin/commit.c:1369

3905 msgid "reuse message from specified commit"

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

3907

3773 -#: builtin/commit.c:1368

3908 +#: builtin/commit.c:1370

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

3910 msgstr ""

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

3912

3778 -#: builtin/commit.c:1369

3913 +#: builtin/commit.c:1371

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

3915 msgstr ""

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

3917 "incheckning"

3918

3784 -#: builtin/commit.c:1370

3919 +#: builtin/commit.c:1372

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

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

3922

3788 -#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109

3923 +#: builtin/commit.c:1373 builtin/log.c:1104 builtin/revert.c:109

3924 msgid "add Signed-off-by:"

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

3926

3792 -#: builtin/commit.c:1372

3927 +#: builtin/commit.c:1374

3928 msgid "use specified template file"

3929 msgstr "använd angiven mallfil"

3930

3796 -#: builtin/commit.c:1373

3931 +#: builtin/commit.c:1375

3932 msgid "force edit of commit"

3933 msgstr "tvinga redigering av incheckning"

3934

3800 -#: builtin/commit.c:1374

3935 +#: builtin/commit.c:1376

3936 msgid "default"

3937 msgstr "standard"

3938

3804 -#: builtin/commit.c:1374 builtin/tag.c:460

3939 +#: builtin/commit.c:1376 builtin/tag.c:460

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

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

3942

3808 -#: builtin/commit.c:1375

3943 +#: builtin/commit.c:1377

3944 msgid "include status in commit message template"

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

3946

3812 -#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461

3947 +#: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461

3948 msgid "key id"

3949 msgstr "nyckel-id"

3950

3816 -#: builtin/commit.c:1377 builtin/merge.c:214

3951 +#: builtin/commit.c:1379 builtin/merge.c:216

3952 msgid "GPG sign commit"

3953 msgstr "GPG-signera incheckning"

3954

3955 #. end commit message options

3821 -#: builtin/commit.c:1380

3956 +#: builtin/commit.c:1382

3957 msgid "Commit contents options"

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

3959

3825 -#: builtin/commit.c:1381

3960 +#: builtin/commit.c:1383

3961 msgid "commit all changed files"

3962 msgstr "checka in alla ändrade filer"

3963

3829 -#: builtin/commit.c:1382

3964 +#: builtin/commit.c:1384

3965 msgid "add specified files to index for commit"

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

3967

3833 -#: builtin/commit.c:1383

3968 +#: builtin/commit.c:1385

3969 msgid "interactively add files"

3970 msgstr "lägg till filer interaktivt"

3971

3837 -#: builtin/commit.c:1384

3972 +#: builtin/commit.c:1386

3973 msgid "interactively add changes"

3974 msgstr "lägg till ändringar interaktivt"

3975

3841 -#: builtin/commit.c:1385

3976 +#: builtin/commit.c:1387

3977 msgid "commit only specified files"

3978 msgstr "checka endast in angivna filer"

3979

3845 -#: builtin/commit.c:1386

3980 +#: builtin/commit.c:1388

3981 msgid "bypass pre-commit hook"

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

3983

3849 -#: builtin/commit.c:1387

3984 +#: builtin/commit.c:1389

3985 msgid "show what would be committed"

3986 msgstr "visa vad som skulle checkas in"

3987

3853 -#: builtin/commit.c:1398

3988 +#: builtin/commit.c:1400

3989 msgid "amend previous commit"

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

3991

3857 -#: builtin/commit.c:1399

3992 +#: builtin/commit.c:1401

3993 msgid "bypass post-rewrite hook"

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

3995

3861 -#: builtin/commit.c:1404

3996 +#: builtin/commit.c:1406

3997 msgid "ok to record an empty change"

3998 msgstr "ok att registrera en tom ändring"

3999

3865 -#: builtin/commit.c:1407

4000 +#: builtin/commit.c:1409

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

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

4003

3869 -#: builtin/commit.c:1439

4004 +#: builtin/commit.c:1441

4005 msgid "could not parse HEAD commit"

4006 msgstr "kunde inte tolka HEAD:s incheckning"

4007

3873 -#: builtin/commit.c:1477 builtin/merge.c:508

4008 +#: builtin/commit.c:1479 builtin/merge.c:510

4009 #, c-format

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

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

4012

3878 -#: builtin/commit.c:1484

4013 +#: builtin/commit.c:1486

4014 #, c-format

4015 msgid "Corrupt MERGE_HEAD file (%s)"

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

4017

3883 -#: builtin/commit.c:1491

4018 +#: builtin/commit.c:1493

4019 msgid "could not read MERGE_MODE"

4020 msgstr "kunde inte läsa MERGE_MODE"

4021

3887 -#: builtin/commit.c:1510

4022 +#: builtin/commit.c:1512

4023 #, c-format

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

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

4026

3892 -#: builtin/commit.c:1524

4027 +#: builtin/commit.c:1526

4028 #, c-format

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

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

4031

3897 -#: builtin/commit.c:1529

4032 +#: builtin/commit.c:1531

4033 #, c-format

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

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

4036

3902 -#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857

4037 +#: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872

4038 msgid "failed to write commit object"

4039 msgstr "kunde inte skriva incheckningsobjekt"

4040

3906 -#: builtin/commit.c:1565

4041 +#: builtin/commit.c:1567

4042 msgid "cannot lock HEAD ref"

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

4044

3910 -#: builtin/commit.c:1569

4045 +#: builtin/commit.c:1571

4046 msgid "cannot update HEAD ref"

4047 msgstr "kunde inte uppdatera HEAD-referens"

4048

3914 -#: builtin/commit.c:1580

4049 +#: builtin/commit.c:1582

4050 msgid ""

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

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

@@ -4038,7 +4173,7 @@ msgstr "terminera värden med NUL-byte"

4173 msgid "respect include directives on lookup"

4174 msgstr "respektera inkluderingsdirektiv vid uppslag"

4175

4041 -#: builtin/count-objects.c:69

4176 +#: builtin/count-objects.c:82

4177 msgid "git count-objects [-v]"

4178 msgstr "git count-objects [-v]"

4179

@@ -4050,47 +4185,47 @@ msgstr "git describe [flaggor] <incheckning-igt>*"

4185 msgid "git describe [options] --dirty"

4186 msgstr "git describe [flaggor] --dirty"

4187

4053 -#: builtin/describe.c:234

4188 +#: builtin/describe.c:233

4189 #, c-format

4190 msgid "annotated tag %s not available"

4191 msgstr "den annoterade taggen %s inte tillgänglig"

4192

4058 -#: builtin/describe.c:238

4193 +#: builtin/describe.c:237

4194 #, c-format

4195 msgid "annotated tag %s has no embedded name"

4196 msgstr "den annoterade taggen %s har inget inbäddat namn"

4197

4063 -#: builtin/describe.c:240

4198 +#: builtin/describe.c:239

4199 #, c-format

4200 msgid "tag '%s' is really '%s' here"

4201 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

4202

4068 -#: builtin/describe.c:267

4203 +#: builtin/describe.c:266

4204 #, c-format

4205 msgid "Not a valid object name %s"

4206 msgstr "Objektnamnet är inte giltigt: %s"

4207

4073 -#: builtin/describe.c:270

4208 +#: builtin/describe.c:269

4209 #, c-format

4210 msgid "%s is not a valid '%s' object"

4211 msgstr "%s är inte ett giltigt \"%s\"-objekt"

4212

4078 -#: builtin/describe.c:287

4213 +#: builtin/describe.c:286

4214 #, c-format

4215 msgid "no tag exactly matches '%s'"

4216 msgstr "ingen tagg motsvarar \"%s\" exakt"

4217

4083 -#: builtin/describe.c:289

4218 +#: builtin/describe.c:288

4219 #, c-format

4220 msgid "searching to describe %s\n"

4221 msgstr "söker för att beskriva %s\n"

4222

4088 -#: builtin/describe.c:329

4223 +#: builtin/describe.c:328

4224 #, c-format

4225 msgid "finished search at %s\n"

4226 msgstr "avslutade sökning på %s\n"

4227

4093 -#: builtin/describe.c:353

4228 +#: builtin/describe.c:352

4229 #, c-format

4230 msgid ""

4231 "No annotated tags can describe '%s'.\n"

@@ -4099,7 +4234,7 @@ msgstr ""

4234 "Inga annoterade taggar kan beskriva \"%s\".\n"

4235 "Det finns dock oannoterade taggar: testa --tags."

4236

4102 -#: builtin/describe.c:357

4237 +#: builtin/describe.c:356

4238 #, c-format

4239 msgid ""

4240 "No tags can describe '%s'.\n"

@@ -4108,12 +4243,12 @@ msgstr ""

4243 "Inga taggar kan beskriva \"%s\".\n"

4244 "Testa --always, eller skapa några taggar."

4245

4111 -#: builtin/describe.c:378

4246 +#: builtin/describe.c:377

4247 #, c-format

4248 msgid "traversed %lu commits\n"

4249 msgstr "traverserade %lu incheckningar\n"

4250

4116 -#: builtin/describe.c:381

4251 +#: builtin/describe.c:380

4252 #, c-format

4253 msgid ""

4254 "more than %i tags found; listed %i most recent\n"

@@ -4122,59 +4257,59 @@ msgstr ""

4257 "mer än %i taggar hittades; listar de %i senaste\n"

4258 "gav upp sökningen vid %s\n"

4259

4125 -#: builtin/describe.c:403

4260 +#: builtin/describe.c:402

4261 msgid "find the tag that comes after the commit"

4262 msgstr "hitta taggen som kommer efter incheckningen"

4263

4129 -#: builtin/describe.c:404

4264 +#: builtin/describe.c:403

4265 msgid "debug search strategy on stderr"

4266 msgstr "felsök sökstrategin på standard fel"

4267

4268 +#: builtin/describe.c:404

4269 +msgid "use any ref"

4270 +msgstr "använd alla referenser"

4271 +

4272 #: builtin/describe.c:405

4134 -msgid "use any ref in .git/refs"

4135 -msgstr "använd alla referenser i .git/refs"

4273 +msgid "use any tag, even unannotated"

4274 +msgstr "använd alla taggar, även oannoterade"

4275

4276 #: builtin/describe.c:406

4138 -msgid "use any tag in .git/refs/tags"

4139 -msgstr "använd alla taggar i .git/refs/tags"

4140 -

4141 -#: builtin/describe.c:407

4277 msgid "always use long format"

4278 msgstr "använd alltid långt format"

4279

4145 -#: builtin/describe.c:410

4280 +#: builtin/describe.c:409

4281 msgid "only output exact matches"

4282 msgstr "skriv endast ut exakta träffar"

4283

4149 -#: builtin/describe.c:412

4284 +#: builtin/describe.c:411

4285 msgid "consider <n> most recent tags (default: 10)"

4286 msgstr "överväg de <n> nyaste taggarna (standard: 10)"

4287

4153 -#: builtin/describe.c:414

4288 +#: builtin/describe.c:413

4289 msgid "only consider tags matching <pattern>"

4290 msgstr "överväg endast taggar som motsvarar <mönster>"

4291

4157 -#: builtin/describe.c:416 builtin/name-rev.c:238

4292 +#: builtin/describe.c:415 builtin/name-rev.c:238

4293 msgid "show abbreviated commit object as fallback"

4294 msgstr "visa förkortade incheckningsobjekt som standard"

4295

4161 -#: builtin/describe.c:417

4296 +#: builtin/describe.c:416

4297 msgid "mark"

4298 msgstr "märke"

4299

4165 -#: builtin/describe.c:418

4300 +#: builtin/describe.c:417

4301 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

4302 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

4303

4169 -#: builtin/describe.c:436

4304 +#: builtin/describe.c:435

4305 msgid "--long is incompatible with --abbrev=0"

4306 msgstr "--long är inkompatibel med --abbrev=0"

4307

4173 -#: builtin/describe.c:462

4308 +#: builtin/describe.c:461

4309 msgid "No names found, cannot describe anything."

4310 msgstr "Inga namn hittades, kan inte beskriva något."

4311

4177 -#: builtin/describe.c:482

4312 +#: builtin/describe.c:481

4313 msgid "--dirty is incompatible with committishes"

4314 msgstr "--dirty är inkompatibelt med \"committish\"-värden"

4315

@@ -4216,39 +4351,39 @@ msgstr "ej hanterat objekt \"%s\" angavs."

4351 msgid "git fast-export [rev-list-opts]"

4352 msgstr "git fast-export [rev-list-flaggor]"

4353

4219 -#: builtin/fast-export.c:646

4354 +#: builtin/fast-export.c:652

4355 msgid "show progress after <n> objects"

4356 msgstr "visa förlopp efter <n> objekt"

4357

4223 -#: builtin/fast-export.c:648

4358 +#: builtin/fast-export.c:654

4359 msgid "select handling of signed tags"

4360 msgstr "välj hantering av signerade taggar"

4361

4227 -#: builtin/fast-export.c:651

4362 +#: builtin/fast-export.c:657

4363 msgid "select handling of tags that tag filtered objects"

4364 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

4365

4231 -#: builtin/fast-export.c:654

4366 +#: builtin/fast-export.c:660

4367 msgid "Dump marks to this file"

4368 msgstr "Dump märken till filen"

4369

4235 -#: builtin/fast-export.c:656

4370 +#: builtin/fast-export.c:662

4371 msgid "Import marks from this file"

4372 msgstr "Importera märken från filen"

4373

4239 -#: builtin/fast-export.c:658

4374 +#: builtin/fast-export.c:664

4375 msgid "Fake a tagger when tags lack one"

4376 msgstr "Fejka taggare när taggen saknar en"

4377

4243 -#: builtin/fast-export.c:660

4378 +#: builtin/fast-export.c:666

4379 msgid "Output full tree for each commit"

4380 msgstr "Skriv ut hela trädet för varje incheckning"

4381

4247 -#: builtin/fast-export.c:662

4382 +#: builtin/fast-export.c:668

4383 msgid "Use the done feature to terminate the stream"

4384 msgstr "Använd done-funktionen för att avsluta strömmen"

4385

4251 -#: builtin/fast-export.c:663

4386 +#: builtin/fast-export.c:669

4387 msgid "Skip output of blob data"

4388 msgstr "Hoppa över skrivning av blob-data"

4389

@@ -4324,7 +4459,7 @@ msgstr "fördjupa historik för grund klon"

4459 msgid "convert to a complete repository"

4460 msgstr "konvertera till komplett arkiv"

4461

4327 -#: builtin/fetch.c:88 builtin/log.c:1119

4462 +#: builtin/fetch.c:88 builtin/log.c:1121

4463 msgid "dir"

4464 msgstr "kat"

4465

@@ -4862,28 +4997,23 @@ msgstr "visa användning"

4997 msgid "no pattern given."

4998 msgstr "inget mönster angavs."

4999

4865 -#: builtin/grep.c:825

4866 -#, c-format

4867 -msgid "bad object %s"

4868 -msgstr "felaktigt objekt %s"

4869 -

4870 -#: builtin/grep.c:868

5000 +#: builtin/grep.c:866

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

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

5003

4874 -#: builtin/grep.c:891

5004 +#: builtin/grep.c:889

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

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

5007

4878 -#: builtin/grep.c:896

5008 +#: builtin/grep.c:894

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

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

5011

4882 -#: builtin/grep.c:899

5012 +#: builtin/grep.c:897

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

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

5015

4886 -#: builtin/grep.c:907

5016 +#: builtin/grep.c:905

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

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

5019

@@ -5007,280 +5137,280 @@ msgstr "användning: %s%s"

5137 msgid "`git %s' is aliased to `%s'"

5138 msgstr "\"git %s\" är ett alias för \"%s\""

5139

5010 -#: builtin/index-pack.c:170

5140 +#: builtin/index-pack.c:182

5141 #, c-format

5142 msgid "object type mismatch at %s"

5143 msgstr "objekttyp stämmer inte överens vid %s"

5144

5015 -#: builtin/index-pack.c:190

5145 +#: builtin/index-pack.c:202

5146 msgid "object of unexpected type"

5147 msgstr "objekt av oväntad typ"

5148

5019 -#: builtin/index-pack.c:227

5149 +#: builtin/index-pack.c:239

5150 #, c-format

5151 msgid "cannot fill %d byte"

5152 msgid_plural "cannot fill %d bytes"

5153 msgstr[0] "kan inte fylla %d byte"

5154 msgstr[1] "kan inte fylla %d byte"

5155

5026 -#: builtin/index-pack.c:237

5156 +#: builtin/index-pack.c:249

5157 msgid "early EOF"

5158 msgstr "tidigt filslut"

5159

5030 -#: builtin/index-pack.c:238

5160 +#: builtin/index-pack.c:250

5161 msgid "read error on input"

5162 msgstr "indataläsfel"

5163

5034 -#: builtin/index-pack.c:250

5164 +#: builtin/index-pack.c:262

5165 msgid "used more bytes than were available"

5166 msgstr "använde fler byte än tillgängligt"

5167

5038 -#: builtin/index-pack.c:257

5168 +#: builtin/index-pack.c:269

5169 msgid "pack too large for current definition of off_t"

5170 msgstr "paket för stort för nuvarande definition av off_t"

5171

5042 -#: builtin/index-pack.c:273

5172 +#: builtin/index-pack.c:285

5173 #, c-format

5174 msgid "unable to create '%s'"

5175 msgstr "kunde inte skapa \"%s\""

5176

5047 -#: builtin/index-pack.c:278

5177 +#: builtin/index-pack.c:290

5178 #, c-format

5179 msgid "cannot open packfile '%s'"

5180 msgstr "kan inte öppna paketfilen \"%s\""

5181

5052 -#: builtin/index-pack.c:292

5182 +#: builtin/index-pack.c:304

5183 msgid "pack signature mismatch"

5184 msgstr "paketsignatur stämmer inte överens"

5185

5056 -#: builtin/index-pack.c:294

5186 +#: builtin/index-pack.c:306

5187 #, c-format

5188 msgid "pack version %<PRIu32> unsupported"

5189 msgstr "paketversion %<PRIu32> stöds ej"

5190

5061 -#: builtin/index-pack.c:312

5191 +#: builtin/index-pack.c:324

5192 #, c-format

5193 msgid "pack has bad object at offset %lu: %s"

5194 msgstr "paketet har felaktigt objekt vid index %lu: %s"

5195

5066 -#: builtin/index-pack.c:434

5196 +#: builtin/index-pack.c:446

5197 #, c-format

5198 msgid "inflate returned %d"

5199 msgstr "inflate returnerade %d"

5200

5071 -#: builtin/index-pack.c:483

5201 +#: builtin/index-pack.c:495

5202 msgid "offset value overflow for delta base object"

5203 msgstr "indexvärdespill för deltabasobjekt"

5204

5075 -#: builtin/index-pack.c:491

5205 +#: builtin/index-pack.c:503

5206 msgid "delta base offset is out of bound"

5207 msgstr "deltabasindex utanför gränsen"

5208

5079 -#: builtin/index-pack.c:499

5209 +#: builtin/index-pack.c:511

5210 #, c-format

5211 msgid "unknown object type %d"

5212 msgstr "okänd objekttyp %d"

5213

5084 -#: builtin/index-pack.c:530

5214 +#: builtin/index-pack.c:542

5215 msgid "cannot pread pack file"

5216 msgstr "kan inte utföra \"pread\" på paketfil"

5217

5088 -#: builtin/index-pack.c:532

5218 +#: builtin/index-pack.c:544

5219 #, c-format

5220 msgid "premature end of pack file, %lu byte missing"

5221 msgid_plural "premature end of pack file, %lu bytes missing"

5222 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

5223 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

5224

5095 -#: builtin/index-pack.c:558

5225 +#: builtin/index-pack.c:570

5226 msgid "serious inflate inconsistency"

5227 msgstr "allvarlig inflate-inkonsekvens"

5228

5099 -#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678

5100 -#: builtin/index-pack.c:712 builtin/index-pack.c:721

5229 +#: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690

5230 +#: builtin/index-pack.c:724 builtin/index-pack.c:733

5231 #, c-format

5232 msgid "SHA1 COLLISION FOUND WITH %s !"

5233 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

5234

5105 -#: builtin/index-pack.c:652 builtin/pack-objects.c:170

5235 +#: builtin/index-pack.c:664 builtin/pack-objects.c:170

5236 #: builtin/pack-objects.c:262

5237 #, c-format

5238 msgid "unable to read %s"

5239 msgstr "kunde inte läsa %s"

5240

5111 -#: builtin/index-pack.c:718

5241 +#: builtin/index-pack.c:730

5242 #, c-format

5243 msgid "cannot read existing object %s"

5244 msgstr "kan inte läsa befintligt objekt %s"

5245

5116 -#: builtin/index-pack.c:732

5246 +#: builtin/index-pack.c:744

5247 #, c-format

5248 msgid "invalid blob object %s"

5249 msgstr "ogiltigt blob-objekt %s"

5250

5121 -#: builtin/index-pack.c:747

5251 +#: builtin/index-pack.c:759

5252 #, c-format

5253 msgid "invalid %s"

5254 msgstr "ogiltigt %s"

5255

5126 -#: builtin/index-pack.c:749

5256 +#: builtin/index-pack.c:761

5257 msgid "Error in object"

5258 msgstr "Fel i objekt"

5259

5130 -#: builtin/index-pack.c:751

5260 +#: builtin/index-pack.c:763

5261 #, c-format

5262 msgid "Not all child objects of %s are reachable"

5263 msgstr "Inte alla barnobjekt för %s kan nås"

5264

5135 -#: builtin/index-pack.c:821 builtin/index-pack.c:847

5265 +#: builtin/index-pack.c:833 builtin/index-pack.c:863

5266 msgid "failed to apply delta"

5267 msgstr "misslyckades tillämpa delta"

5268

5139 -#: builtin/index-pack.c:986

5269 +#: builtin/index-pack.c:1004

5270 msgid "Receiving objects"

5271 msgstr "Tar emot objekt"

5272

5143 -#: builtin/index-pack.c:986

5273 +#: builtin/index-pack.c:1004

5274 msgid "Indexing objects"

5275 msgstr "Skapar index för objekt"

5276

5147 -#: builtin/index-pack.c:1012

5277 +#: builtin/index-pack.c:1030

5278 msgid "pack is corrupted (SHA1 mismatch)"

5279 msgstr "paketet är trasigt (SHA1 stämmer inte)"

5280

5151 -#: builtin/index-pack.c:1017

5281 +#: builtin/index-pack.c:1035

5282 msgid "cannot fstat packfile"

5283 msgstr "kan inte utföra \"fstat\" på paketfil"

5284

5155 -#: builtin/index-pack.c:1020

5285 +#: builtin/index-pack.c:1038

5286 msgid "pack has junk at the end"

5287 msgstr "paket har skräp i slutet"

5288

5159 -#: builtin/index-pack.c:1031

5289 +#: builtin/index-pack.c:1049

5290 msgid "confusion beyond insanity in parse_pack_objects()"

5291 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

5292

5163 -#: builtin/index-pack.c:1054

5293 +#: builtin/index-pack.c:1072

5294 msgid "Resolving deltas"

5295 msgstr "Analyserar delta"

5296

5167 -#: builtin/index-pack.c:1064

5297 +#: builtin/index-pack.c:1082

5298 #, c-format

5299 msgid "unable to create thread: %s"

5300 msgstr "kunde inte skapa tråd: %s"

5301

5172 -#: builtin/index-pack.c:1106

5302 +#: builtin/index-pack.c:1124

5303 msgid "confusion beyond insanity"

5304 msgstr "förvirrad bortom vanvett"

5305

5176 -#: builtin/index-pack.c:1112

5306 +#: builtin/index-pack.c:1132

5307 #, c-format

5308 msgid "completed with %d local objects"

5309 msgstr "slutfördes med %d lokala objekt"

5310

5181 -#: builtin/index-pack.c:1121

5311 +#: builtin/index-pack.c:1142

5312 #, c-format

5313 msgid "Unexpected tail checksum for %s (disk corruption?)"

5314 msgstr "Oväntad svanschecksumma för %s (trasig disk?)"

5315

5186 -#: builtin/index-pack.c:1125

5316 +#: builtin/index-pack.c:1146

5317 #, c-format

5318 msgid "pack has %d unresolved delta"

5319 msgid_plural "pack has %d unresolved deltas"

5320 msgstr[0] "paketet har %d oanalyserat delta"

5321 msgstr[1] "paketet har %d oanalyserade delta"

5322

5193 -#: builtin/index-pack.c:1150

5323 +#: builtin/index-pack.c:1171

5324 #, c-format

5325 msgid "unable to deflate appended object (%d)"

5326 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

5327

5198 -#: builtin/index-pack.c:1229

5328 +#: builtin/index-pack.c:1250

5329 #, c-format

5330 msgid "local object %s is corrupt"

5331 msgstr "lokalt objekt %s är trasigt"

5332

5203 -#: builtin/index-pack.c:1253

5333 +#: builtin/index-pack.c:1274

5334 msgid "error while closing pack file"

5335 msgstr "fel vid stängning av paketfil"

5336

5207 -#: builtin/index-pack.c:1266

5337 +#: builtin/index-pack.c:1287

5338 #, c-format

5339 msgid "cannot write keep file '%s'"

5340 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

5341

5212 -#: builtin/index-pack.c:1274

5342 +#: builtin/index-pack.c:1295

5343 #, c-format

5344 msgid "cannot close written keep file '%s'"

5345 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

5346

5217 -#: builtin/index-pack.c:1287

5347 +#: builtin/index-pack.c:1308

5348 msgid "cannot store pack file"

5349 msgstr "kan inte spara paketfil"

5350

5221 -#: builtin/index-pack.c:1298

5351 +#: builtin/index-pack.c:1319

5352 msgid "cannot store index file"

5353 msgstr "kan inte spara indexfil"

5354

5225 -#: builtin/index-pack.c:1331

5355 +#: builtin/index-pack.c:1352

5356 #, c-format

5357 msgid "bad pack.indexversion=%<PRIu32>"

5358 msgstr "felaktig pack.indexversion=%<PRIu32>"

5359

5230 -#: builtin/index-pack.c:1337

5360 +#: builtin/index-pack.c:1358

5361 #, c-format

5362 msgid "invalid number of threads specified (%d)"

5363 msgstr "felaktigt antal trådar angivet (%d)"

5364

5235 -#: builtin/index-pack.c:1341 builtin/index-pack.c:1514

5365 +#: builtin/index-pack.c:1362 builtin/index-pack.c:1535

5366 #, c-format

5367 msgid "no threads support, ignoring %s"

5368 msgstr "trådstöd saknas, ignorerar %s"

5369

5240 -#: builtin/index-pack.c:1399

5370 +#: builtin/index-pack.c:1420

5371 #, c-format

5372 msgid "Cannot open existing pack file '%s'"

5373 msgstr "Kan inte öppna befintlig paketfil \"%s\""

5374

5245 -#: builtin/index-pack.c:1401

5375 +#: builtin/index-pack.c:1422

5376 #, c-format

5377 msgid "Cannot open existing pack idx file for '%s'"

5378 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""

5379

5250 -#: builtin/index-pack.c:1448

5380 +#: builtin/index-pack.c:1469

5381 #, c-format

5382 msgid "non delta: %d object"

5383 msgid_plural "non delta: %d objects"

5384 msgstr[0] "icke-delta: %d objekt"

5385 msgstr[1] "icke-delta: %d objekt"

5386

5257 -#: builtin/index-pack.c:1455

5387 +#: builtin/index-pack.c:1476

5388 #, c-format

5389 msgid "chain length = %d: %lu object"

5390 msgid_plural "chain length = %d: %lu objects"

5391 msgstr[0] "kedjelängd = %d: %lu objekt"

5392 msgstr[1] "kedjelängd = %d: %lu objekt"

5393

5264 -#: builtin/index-pack.c:1482

5394 +#: builtin/index-pack.c:1503

5395 msgid "Cannot come back to cwd"

5396 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

5397

5268 -#: builtin/index-pack.c:1526 builtin/index-pack.c:1529

5269 -#: builtin/index-pack.c:1541 builtin/index-pack.c:1545

5398 +#: builtin/index-pack.c:1547 builtin/index-pack.c:1550

5399 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1566

5400 #, c-format

5401 msgid "bad %s"

5402 msgstr "felaktig %s"

5403

5274 -#: builtin/index-pack.c:1559

5404 +#: builtin/index-pack.c:1580

5405 msgid "--fix-thin cannot be used without --stdin"

5406 msgstr "--fix-thin kan inte användas med --stdin"

5407

5278 -#: builtin/index-pack.c:1563 builtin/index-pack.c:1573

5408 +#: builtin/index-pack.c:1584 builtin/index-pack.c:1594

5409 #, c-format

5410 msgid "packfile name '%s' does not end with '.pack'"

5411 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

5412

5283 -#: builtin/index-pack.c:1582

5413 +#: builtin/index-pack.c:1603

5414 msgid "--verify with no packfile name given"

5415 msgstr "--verify angavs utan paketfilnamn"

5416

@@ -5448,252 +5578,247 @@ msgstr "Kan inte komma åt aktuell arbetskatalog"

5578 msgid "Cannot access work tree '%s'"

5579 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

5580

5451 -#: builtin/log.c:39

5581 +#: builtin/log.c:40

5582 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n"

5583 msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n"

5584

5455 -#: builtin/log.c:40

5585 +#: builtin/log.c:41

5586 msgid " or: git show [options] <object>..."

5587 msgstr " eller: git show [flaggor] <objekt>..."

5588

5459 -#: builtin/log.c:102

5589 +#: builtin/log.c:103

5590 msgid "suppress diff output"

5591 msgstr "undertryck diff-utdata"

5592

5463 -#: builtin/log.c:103

5593 +#: builtin/log.c:104

5594 msgid "show source"

5595 msgstr "visa källkod"

5596

5467 -#: builtin/log.c:104

5597 +#: builtin/log.c:105

5598 msgid "Use mail map file"

5599 msgstr "Använd e-postmappningsfil"

5600

5471 -#: builtin/log.c:105

5601 +#: builtin/log.c:106

5602 msgid "decorate options"

5603 msgstr "dekoreringsflaggor"

5604

5475 -#: builtin/log.c:198

5605 +#: builtin/log.c:199

5606 #, c-format

5607 msgid "Final output: %d %s\n"

5608 msgstr "Slututdata: %d %s\n"

5609

5480 -#: builtin/log.c:419 builtin/log.c:511

5610 +#: builtin/log.c:422 builtin/log.c:514

5611 #, c-format

5612 msgid "Could not read object %s"

5613 msgstr "Kunde inte läsa objektet %s"

5614

5485 -#: builtin/log.c:535

5615 +#: builtin/log.c:538

5616 #, c-format

5617 msgid "Unknown type: %d"

5618 msgstr "Okänd typ: %d"

5619

5490 -#: builtin/log.c:627

5620 +#: builtin/log.c:630

5621 msgid "format.headers without value"

5622 msgstr "format.headers utan värde"

5623

5494 -#: builtin/log.c:701

5624 +#: builtin/log.c:704

5625 msgid "name of output directory is too long"

5626 msgstr "namnet på utdatakatalogen är för långt"

5627

5498 -#: builtin/log.c:717

5628 +#: builtin/log.c:720

5629 #, c-format

5630 msgid "Cannot open patch file %s"

5631 msgstr "Kan inte öppna patchfilen %s"

5632

5503 -#: builtin/log.c:731

5633 +#: builtin/log.c:734

5634 msgid "Need exactly one range."

5635 msgstr "Behöver precis ett intervall."

5636

5507 -#: builtin/log.c:739

5637 +#: builtin/log.c:742

5638 msgid "Not a range."

5639 msgstr "Inte ett intervall."

5640

5511 -#: builtin/log.c:812

5641 +#: builtin/log.c:815

5642 msgid "Cover letter needs email format"

5643 msgstr "Omslagsbrevet behöver e-postformat"

5644

5515 -#: builtin/log.c:885

5645 +#: builtin/log.c:888

5646 #, c-format

5647 msgid "insane in-reply-to: %s"

5648 msgstr "tokigt in-reply-to: %s"

5649

5520 -#: builtin/log.c:913

5650 +#: builtin/log.c:916

5651 msgid "git format-patch [options] [<since> | <revision range>]"

5652 msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]"

5653

5524 -#: builtin/log.c:958

5654 +#: builtin/log.c:961

5655 msgid "Two output directories?"

5656 msgstr "Två utdatakataloger?"

5657

5528 -#: builtin/log.c:1097

5658 +#: builtin/log.c:1099

5659 msgid "use [PATCH n/m] even with a single patch"

5660 msgstr "använd [PATCH n/m] även för en ensam patch"

5661

5532 -#: builtin/log.c:1100

5662 +#: builtin/log.c:1102

5663 msgid "use [PATCH] even with multiple patches"

5664 msgstr "använd [PATCH] även för flera patchar"

5665

5536 -#: builtin/log.c:1104

5666 +#: builtin/log.c:1106

5667 msgid "print patches to standard out"

5668 msgstr "skriv patcharna på stnadard ut"

5669

5540 -#: builtin/log.c:1106

5670 +#: builtin/log.c:1108

5671 msgid "generate a cover letter"

5672 msgstr "generera ett följebrev"

5673

5544 -#: builtin/log.c:1108

5674 +#: builtin/log.c:1110

5675 msgid "use simple number sequence for output file names"

5676 msgstr "använd enkel nummersekvens för utdatafilnamn"

5677

5548 -#: builtin/log.c:1109

5678 +#: builtin/log.c:1111

5679 msgid "sfx"

5680 msgstr "sfx"

5681

5552 -#: builtin/log.c:1110

5682 +#: builtin/log.c:1112

5683 msgid "use <sfx> instead of '.patch'"

5684 msgstr "använd <sfx> istället för \".patch\""

5685

5556 -#: builtin/log.c:1112

5686 +#: builtin/log.c:1114

5687 msgid "start numbering patches at <n> instead of 1"

5688 msgstr "börja numrera patchar på <n> istället för 1"

5689

5560 -#: builtin/log.c:1114

5690 +#: builtin/log.c:1116

5691 msgid "mark the series as Nth re-roll"

5692 msgstr "markera serien som N:te försök"

5693

5564 -#: builtin/log.c:1116

5694 +#: builtin/log.c:1118

5695 msgid "Use [<prefix>] instead of [PATCH]"

5696 msgstr "Använd [<prefix>] istället för [PATCH]"

5697

5568 -#: builtin/log.c:1119

5698 +#: builtin/log.c:1121

5699 msgid "store resulting files in <dir>"

5700 msgstr "spara filerna i <katalog>"

5701

5572 -#: builtin/log.c:1122

5702 +#: builtin/log.c:1124

5703 msgid "don't strip/add [PATCH]"

5704 msgstr "ta inte bort eller lägg till [PATCH]"

5705

5576 -#: builtin/log.c:1125

5706 +#: builtin/log.c:1127

5707 msgid "don't output binary diffs"

5708 msgstr "skriv inte binära diffar"

5709

5580 -#: builtin/log.c:1127

5710 +#: builtin/log.c:1129

5711 msgid "don't include a patch matching a commit upstream"

5712 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"

5713

5584 -#: builtin/log.c:1129

5714 +#: builtin/log.c:1131

5715 msgid "show patch format instead of default (patch + stat)"

5716 msgstr "visa patchformat istället för standard (patch + stat)"

5717

5588 -#: builtin/log.c:1131

5718 +#: builtin/log.c:1133

5719 msgid "Messaging"

5720 msgstr "E-post"

5721

5592 -#: builtin/log.c:1132

5722 +#: builtin/log.c:1134

5723 msgid "header"

5724 msgstr "huvud"

5725

5596 -#: builtin/log.c:1133

5726 +#: builtin/log.c:1135

5727 msgid "add email header"

5728 msgstr "lägg till e-posthuvud"

5729

5600 -#: builtin/log.c:1134 builtin/log.c:1136

5730 +#: builtin/log.c:1136 builtin/log.c:1138

5731 msgid "email"

5732 msgstr "epost"

5733

5604 -#: builtin/log.c:1134

5734 +#: builtin/log.c:1136

5735 msgid "add To: header"

5736 msgstr "Lägg till mottagarhuvud (\"To:\")"

5737

5608 -#: builtin/log.c:1136

5738 +#: builtin/log.c:1138

5739 msgid "add Cc: header"

5740 msgstr "Lägg till kopiehuvud (\"Cc:\")"

5741

5612 -#: builtin/log.c:1138

5742 +#: builtin/log.c:1140

5743 msgid "message-id"

5744 msgstr "meddelande-id"

5745

5616 -#: builtin/log.c:1139

5746 +#: builtin/log.c:1141

5747 msgid "make first mail a reply to <message-id>"

5748 msgstr "Gör det första brevet ett svar till <meddelande-id>"

5749

5620 -#: builtin/log.c:1140 builtin/log.c:1143

5750 +#: builtin/log.c:1142 builtin/log.c:1145

5751 msgid "boundary"

5752 msgstr "gräns"

5753

5624 -#: builtin/log.c:1141

5754 +#: builtin/log.c:1143

5755 msgid "attach the patch"

5756 msgstr "bifoga patchen"

5757

5628 -#: builtin/log.c:1144

5758 +#: builtin/log.c:1146

5759 msgid "inline the patch"

5760 msgstr "gör patchen ett inline-objekt"

5761

5632 -#: builtin/log.c:1148

5762 +#: builtin/log.c:1150

5763 msgid "enable message threading, styles: shallow, deep"

5764 msgstr "aktivera brevtrådning, typer: shallow, deep"

5765

5636 -#: builtin/log.c:1150

5766 +#: builtin/log.c:1152

5767 msgid "signature"

5768 msgstr "signatur"

5769

5640 -#: builtin/log.c:1151

5770 +#: builtin/log.c:1153

5771 msgid "add a signature"

5772 msgstr "lägg till signatur"

5773

5644 -#: builtin/log.c:1153

5774 +#: builtin/log.c:1155

5775 msgid "don't print the patch filenames"

5776 msgstr "visa inte filnamn för patchar"

5777

5648 -#: builtin/log.c:1202

5649 -#, c-format

5650 -msgid "bogus committer info %s"

5651 -msgstr "felaktig incheckarinformation %s"

5652 -

5653 -#: builtin/log.c:1247

5778 +#: builtin/log.c:1239

5779 msgid "-n and -k are mutually exclusive."

5780 msgstr "-n och -k kan inte användas samtidigt."

5781

5657 -#: builtin/log.c:1249

5782 +#: builtin/log.c:1241

5783 msgid "--subject-prefix and -k are mutually exclusive."

5784 msgstr "--subject-prefix och -k kan inte användas samtidigt."

5785

5661 -#: builtin/log.c:1257

5786 +#: builtin/log.c:1249

5787 msgid "--name-only does not make sense"

5788 msgstr "kan inte använda --name-only"

5789

5665 -#: builtin/log.c:1259

5790 +#: builtin/log.c:1251

5791 msgid "--name-status does not make sense"

5792 msgstr "kan inte använda --name-status"

5793

5669 -#: builtin/log.c:1261

5794 +#: builtin/log.c:1253

5795 msgid "--check does not make sense"

5796 msgstr "kan inte använda --check"

5797

5673 -#: builtin/log.c:1284

5798 +#: builtin/log.c:1276

5799 msgid "standard output, or directory, which one?"

5800 msgstr "standard ut, eller katalog, vilken skall det vara?"

5801

5677 -#: builtin/log.c:1286

5802 +#: builtin/log.c:1278

5803 #, c-format

5804 msgid "Could not create directory '%s'"

5805 msgstr "Kunde inte skapa katalogen \"%s\""

5806

5682 -#: builtin/log.c:1439

5807 +#: builtin/log.c:1431

5808 msgid "Failed to create output files"

5809 msgstr "Misslyckades skapa utdatafiler"

5810

5686 -#: builtin/log.c:1488

5811 +#: builtin/log.c:1480

5812 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"

5813 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"

5814

5690 -#: builtin/log.c:1543

5815 +#: builtin/log.c:1535

5816 #, c-format

5817 msgid ""

5818 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

5819 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

5820

5696 -#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570

5821 +#: builtin/log.c:1548 builtin/log.c:1550 builtin/log.c:1562

5822 #, c-format

5823 msgid "Unknown commit %s"

5824 msgstr "Okänd incheckning %s"

@@ -5894,110 +6019,114 @@ msgstr "tillåt snabbspolning (standard)"

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

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

6021

5897 -#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112

6022 +#: builtin/merge.c:203

6023 +msgid "Verify that the named commit has a valid GPG signature"

6024 +msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"

6025 +

6026 +#: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112

6027 msgid "strategy"

6028 msgstr "strategi"

6029

5901 -#: builtin/merge.c:203

6030 +#: builtin/merge.c:205

6031 msgid "merge strategy to use"

6032 msgstr "sammanslagninsstrategi att använda"

6033

5905 -#: builtin/merge.c:204

6034 +#: builtin/merge.c:206

6035 msgid "option=value"

6036 msgstr "alternativ=värde"

6037

5909 -#: builtin/merge.c:205

6038 +#: builtin/merge.c:207

6039 msgid "option for selected merge strategy"

6040 msgstr "alternativ för vald sammanslagningsstrategi"

6041

5913 -#: builtin/merge.c:207

6042 +#: builtin/merge.c:209

6043 msgid "merge commit message (for a non-fast-forward merge)"

6044 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"

6045

5917 -#: builtin/merge.c:211

6046 +#: builtin/merge.c:213

6047 msgid "abort the current in-progress merge"

6048 msgstr "avbryt den pågående sammanslagningen"

6049

5921 -#: builtin/merge.c:240

6050 +#: builtin/merge.c:242

6051 msgid "could not run stash."

6052 msgstr "kunde köra stash."

6053

5925 -#: builtin/merge.c:245

6054 +#: builtin/merge.c:247

6055 msgid "stash failed"

6056 msgstr "stash misslyckades"

6057

5929 -#: builtin/merge.c:250

6058 +#: builtin/merge.c:252

6059 #, c-format

6060 msgid "not a valid object: %s"

6061 msgstr "inte ett giltigt objekt: %s"

6062

5934 -#: builtin/merge.c:269 builtin/merge.c:286

6063 +#: builtin/merge.c:271 builtin/merge.c:288

6064 msgid "read-tree failed"

6065 msgstr "read-tree misslyckades"

6066

5938 -#: builtin/merge.c:316

6067 +#: builtin/merge.c:318

6068 msgid " (nothing to squash)"

6069 msgstr " (inget att platta till)"

6070

5942 -#: builtin/merge.c:329

6071 +#: builtin/merge.c:331

6072 #, c-format

6073 msgid "Squash commit -- not updating HEAD\n"

6074 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"

6075

5947 -#: builtin/merge.c:361

6076 +#: builtin/merge.c:363

6077 msgid "Writing SQUASH_MSG"

6078 msgstr "Skriver SQUASH_MSG"

6079

5951 -#: builtin/merge.c:363

6080 +#: builtin/merge.c:365

6081 msgid "Finishing SQUASH_MSG"

6082 msgstr "Avslutar SQUASH_MSG"

6083

5955 -#: builtin/merge.c:386

6084 +#: builtin/merge.c:388

6085 #, c-format

6086 msgid "No merge message -- not updating HEAD\n"

6087 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

6088

5960 -#: builtin/merge.c:436

6089 +#: builtin/merge.c:438

6090 #, c-format

6091 msgid "'%s' does not point to a commit"

6092 msgstr "\"%s\" verkar inte peka på en incheckning"

6093

5965 -#: builtin/merge.c:535

6094 +#: builtin/merge.c:550

6095 #, c-format

6096 msgid "Bad branch.%s.mergeoptions string: %s"

6097 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

6098

5970 -#: builtin/merge.c:628

6099 +#: builtin/merge.c:643

6100 msgid "git write-tree failed to write a tree"

6101 msgstr "git write-tree misslyckades skriva ett träd"

6102

5974 -#: builtin/merge.c:656

6103 +#: builtin/merge.c:671

6104 msgid "Not handling anything other than two heads merge."

6105 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

6106

5978 -#: builtin/merge.c:670

6107 +#: builtin/merge.c:685

6108 #, c-format

6109 msgid "Unknown option for merge-recursive: -X%s"

6110 msgstr "Felaktig flagga för merge-recursive: -X%s"

6111

5983 -#: builtin/merge.c:684

6112 +#: builtin/merge.c:699

6113 #, c-format

6114 msgid "unable to write %s"

6115 msgstr "kunde inte skriva %s"

6116

5988 -#: builtin/merge.c:773

6117 +#: builtin/merge.c:788

6118 #, c-format

6119 msgid "Could not read from '%s'"

6120 msgstr "Kunde inte läsa från \"%s\""

6121

5993 -#: builtin/merge.c:782

6122 +#: builtin/merge.c:797

6123 #, c-format

6124 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

6125 msgstr ""

6126 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

6127 "den.\n"

6128

6000 -#: builtin/merge.c:788

6129 +#: builtin/merge.c:803

6130 #, c-format

6131 msgid ""

6132 "Please enter a commit message to explain why this merge is necessary,\n"

@@ -6013,53 +6142,53 @@ msgstr ""

6142 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"

6143 "avbryter incheckningen.\n"

6144

6016 -#: builtin/merge.c:812

6145 +#: builtin/merge.c:827

6146 msgid "Empty commit message."

6147 msgstr "Tomt incheckningsmeddelande."

6148

6020 -#: builtin/merge.c:824

6149 +#: builtin/merge.c:839

6150 #, c-format

6151 msgid "Wonderful.\n"

6152 msgstr "Underbart.\n"

6153

6025 -#: builtin/merge.c:889

6154 +#: builtin/merge.c:904

6155 #, c-format

6156 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

6157 msgstr ""

6158 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

6159

6031 -#: builtin/merge.c:905

6160 +#: builtin/merge.c:920

6161 #, c-format

6162 msgid "'%s' is not a commit"

6163 msgstr "\"%s\" är inte en incheckning"

6164

6036 -#: builtin/merge.c:946

6165 +#: builtin/merge.c:961

6166 msgid "No current branch."

6167 msgstr "Inte på någon gren."

6168

6040 -#: builtin/merge.c:948

6169 +#: builtin/merge.c:963

6170 msgid "No remote for the current branch."

6171 msgstr "Ingen fjärr för aktuell gren."

6172

6044 -#: builtin/merge.c:950

6173 +#: builtin/merge.c:965

6174 msgid "No default upstream defined for the current branch."

6175 msgstr "Ingen standarduppström angiven för aktuell gren."

6176

6048 -#: builtin/merge.c:955

6177 +#: builtin/merge.c:970

6178 #, c-format

6179 msgid "No remote tracking branch for %s from %s"

6180 msgstr "Ingen fjärrspårande gren för %s från %s"

6181

6053 -#: builtin/merge.c:1042 builtin/merge.c:1199

6182 +#: builtin/merge.c:1057 builtin/merge.c:1214

6183 #, c-format

6184 msgid "%s - not something we can merge"

6185 msgstr "%s - inte något vi kan slå ihop"

6186

6058 -#: builtin/merge.c:1110

6187 +#: builtin/merge.c:1125

6188 msgid "There is no merge to abort (MERGE_HEAD missing)."

6189 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

6190

6062 -#: builtin/merge.c:1126 git-pull.sh:31

6191 +#: builtin/merge.c:1141 git-pull.sh:31

6192 msgid ""

6193 "You have not concluded your merge (MERGE_HEAD exists).\n"

6194 "Please, commit your changes before you can merge."

@@ -6067,11 +6196,11 @@ msgstr ""

6196 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

6197 "Checka in dina ändringar innan du kan slå ihop."

6198

6070 -#: builtin/merge.c:1129 git-pull.sh:34

6199 +#: builtin/merge.c:1144 git-pull.sh:34

6200 msgid "You have not concluded your merge (MERGE_HEAD exists)."

6201 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

6202

6074 -#: builtin/merge.c:1133

6203 +#: builtin/merge.c:1148

6204 msgid ""

6205 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

6206 "Please, commit your changes before you can merge."

@@ -6079,79 +6208,102 @@ msgstr ""

6208 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

6209 "Checka in dina ändringar innan du kan slå ihop."

6210

6082 -#: builtin/merge.c:1136

6211 +#: builtin/merge.c:1151

6212 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

6213 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

6214

6086 -#: builtin/merge.c:1145

6215 +#: builtin/merge.c:1160

6216 msgid "You cannot combine --squash with --no-ff."

6217 msgstr "Du kan inte kombinera --squash med --no-ff."

6218

6090 -#: builtin/merge.c:1150

6219 +#: builtin/merge.c:1165

6220 msgid "You cannot combine --no-ff with --ff-only."

6221 msgstr "Du kan inte kombinera --no-ff med --ff-only."

6222

6094 -#: builtin/merge.c:1157

6223 +#: builtin/merge.c:1172

6224 msgid "No commit specified and merge.defaultToUpstream not set."

6225 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

6226

6098 -#: builtin/merge.c:1189

6227 +#: builtin/merge.c:1204

6228 msgid "Can merge only exactly one commit into empty head"

6229 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

6230

6102 -#: builtin/merge.c:1192

6231 +#: builtin/merge.c:1207

6232 msgid "Squash commit into empty head not supported yet"

6233 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

6234

6106 -#: builtin/merge.c:1194

6235 +#: builtin/merge.c:1209

6236 msgid "Non-fast-forward commit does not make sense into an empty head"

6237 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

6238

6110 -#: builtin/merge.c:1310

6239 +#: builtin/merge.c:1265

6240 +#, c-format

6241 +msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

6242 +msgstr ""

6243 +"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

6244 +

6245 +#: builtin/merge.c:1268

6246 +#, c-format

6247 +msgid "Commit %s has a bad GPG signature allegedly by %s."

6248 +msgstr ""

6249 +"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

6250 +

6251 +#. 'N'

6252 +#: builtin/merge.c:1271

6253 +#, c-format

6254 +msgid "Commit %s does not have a GPG signature."

6255 +msgstr "Incheckning %s har inte någon GPG-signatur."

6256 +

6257 +#: builtin/merge.c:1274

6258 +#, c-format

6259 +msgid "Commit %s has a good GPG signature by %s\n"

6260 +msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

6261 +

6262 +#: builtin/merge.c:1358

6263 #, c-format

6264 msgid "Updating %s..%s\n"

6265 msgstr "Uppdaterar %s..%s\n"

6266

6115 -#: builtin/merge.c:1349

6267 +#: builtin/merge.c:1397

6268 #, c-format

6269 msgid "Trying really trivial in-index merge...\n"

6270 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

6271

6120 -#: builtin/merge.c:1356

6272 +#: builtin/merge.c:1404

6273 #, c-format

6274 msgid "Nope.\n"

6275 msgstr "Nej.\n"

6276

6125 -#: builtin/merge.c:1388

6277 +#: builtin/merge.c:1436

6278 msgid "Not possible to fast-forward, aborting."

6279 msgstr "Kan inte snabbspola, avbryter."

6280

6129 -#: builtin/merge.c:1411 builtin/merge.c:1490

6281 +#: builtin/merge.c:1459 builtin/merge.c:1538

6282 #, c-format

6283 msgid "Rewinding the tree to pristine...\n"

6284 msgstr "Återspolar trädet till orört...\n"

6285

6134 -#: builtin/merge.c:1415

6286 +#: builtin/merge.c:1463

6287 #, c-format

6288 msgid "Trying merge strategy %s...\n"

6289 msgstr "Försöker sammanslagninsstrategin %s...\n"

6290

6139 -#: builtin/merge.c:1481

6291 +#: builtin/merge.c:1529

6292 #, c-format

6293 msgid "No merge strategy handled the merge.\n"

6294 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

6295

6144 -#: builtin/merge.c:1483

6296 +#: builtin/merge.c:1531

6297 #, c-format

6298 msgid "Merge with strategy %s failed.\n"

6299 msgstr "Sammanslagning med strategin %s misslyckades.\n"

6300

6149 -#: builtin/merge.c:1492

6301 +#: builtin/merge.c:1540

6302 #, c-format

6303 msgid "Using the %s to prepare resolving by hand.\n"

6304 msgstr "Använder %s för att förbereda lösning för hand.\n"

6305

6154 -#: builtin/merge.c:1504

6306 +#: builtin/merge.c:1552

6307 #, c-format

6308 msgid "Automatic merge went well; stopped before committing as requested\n"

6309 msgstr ""

@@ -7193,11 +7345,15 @@ msgstr "ta bort lokalt borttagna referenser"

7345 msgid "bypass pre-push hook"

7346 msgstr "förbigå pre-push-krok"

7347

7196 -#: builtin/push.c:448

7348 +#: builtin/push.c:440

7349 +msgid "push missing but relevant tags"

7350 +msgstr "sänd in saknade men relevanta taggar"

7351 +

7352 +#: builtin/push.c:450

7353 msgid "--delete is incompatible with --all, --mirror and --tags"

7354 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

7355

7200 -#: builtin/push.c:450

7356 +#: builtin/push.c:452

7357 msgid "--delete doesn't make sense without any refs"

7358 msgstr "--delete kan inte användas utan referenser"

7359

@@ -9123,7 +9279,7 @@ msgstr ""

9279 msgid "Pull is not possible because you have unmerged files."

9280 msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."

9281

9126 -#: git-pull.sh:197

9282 +#: git-pull.sh:203

9283 msgid "updating an unborn branch with changes added to the index"

9284 msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"

9285

@@ -9131,7 +9287,7 @@ msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"

9287 #. The working tree and the index file is still based on the

9288 #. $orig_head commit, but we are merging into $curr_head.

9289 #. First update the working tree to match $curr_head.

9134 -#: git-pull.sh:229

9290 +#: git-pull.sh:235

9291 #, sh-format

9292 msgid ""

9293 "Warning: fetch updated the current branch head.\n"

@@ -9142,11 +9298,11 @@ msgstr ""

9298 "Varning: snabbspolar din arbetskatalog från\n"

9299 "Varning: incheckningen $orig_head."

9300

9145 -#: git-pull.sh:254

9301 +#: git-pull.sh:260

9302 msgid "Cannot merge multiple branches into empty head"

9303 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

9304

9149 -#: git-pull.sh:258

9305 +#: git-pull.sh:264

9306 msgid "Cannot rebase onto multiple branches"

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

9308

@@ -9403,38 +9559,38 @@ msgstr "Inget grennamn angavs"

9559 msgid "(To restore them type \"git stash apply\")"

9560 msgstr "(För att återställa dem, skriv \"git stash apply\")"

9561

9406 -#: git-submodule.sh:90

9562 +#: git-submodule.sh:91

9563 #, sh-format

9564 msgid "cannot strip one component off url '$remoteurl'"

9565 msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""

9566

9411 -#: git-submodule.sh:195

9567 +#: git-submodule.sh:196

9568 #, sh-format

9569 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

9570 msgstr ""

9571 "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""

9572

9417 -#: git-submodule.sh:238

9573 +#: git-submodule.sh:239

9574 #, sh-format

9575 msgid "Clone of '$url' into submodule path '$sm_path' failed"

9576 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""

9577

9422 -#: git-submodule.sh:250

9578 +#: git-submodule.sh:251

9579 #, sh-format

9580 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

9581 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"

9582

9427 -#: git-submodule.sh:343

9583 +#: git-submodule.sh:349

9584 #, sh-format

9585 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

9586 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

9587

9432 -#: git-submodule.sh:360

9588 +#: git-submodule.sh:366

9589 #, sh-format

9590 msgid "'$sm_path' already exists in the index"

9591 msgstr "\"$sm_path\" finns redan i indexet"

9592

9437 -#: git-submodule.sh:364

9593 +#: git-submodule.sh:370

9594 #, sh-format

9595 msgid ""

9596 "The following path is ignored by one of your .gitignore files:\n"

@@ -9445,22 +9601,22 @@ msgstr ""

9601 "$sm_path\n"

9602 "Använd -f om du verkligen vill lägga till den"

9603

9448 -#: git-submodule.sh:382

9604 +#: git-submodule.sh:388

9605 #, sh-format

9606 msgid "Adding existing repo at '$sm_path' to the index"

9607 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"

9608

9453 -#: git-submodule.sh:384

9609 +#: git-submodule.sh:390

9610 #, sh-format

9611 msgid "'$sm_path' already exists and is not a valid git repo"

9612 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"

9613

9458 -#: git-submodule.sh:392

9614 +#: git-submodule.sh:398

9615 #, sh-format

9616 msgid "A git directory for '$sm_name' is found locally with remote(s):"

9617 msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"

9618

9463 -#: git-submodule.sh:394

9619 +#: git-submodule.sh:400

9620 #, sh-format

9621 msgid ""

9622 "If you want to reuse this local git directory instead of cloning again from"

@@ -9468,14 +9624,14 @@ msgstr ""

9624 "För att återanvända den lokala git-katalogen istället för att på nytt klona "

9625 "från"

9626

9471 -#: git-submodule.sh:396

9627 +#: git-submodule.sh:402

9628 #, sh-format

9629 msgid ""

9630 "use the '--force' option. If the local git directory is not the correct repo"

9631 msgstr ""

9632 "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv"

9633

9478 -#: git-submodule.sh:397

9634 +#: git-submodule.sh:403

9635 #, sh-format

9636 msgid ""

9637 "or you are unsure what this means choose another name with the '--name' "

@@ -9484,154 +9640,223 @@ msgstr ""

9640 "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name"

9641 "\"."

9642

9487 -#: git-submodule.sh:399

9643 +#: git-submodule.sh:405

9644 #, sh-format

9645 msgid "Reactivating local git directory for submodule '$sm_name'."

9646 msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."

9647

9492 -#: git-submodule.sh:411

9648 +#: git-submodule.sh:417

9649 #, sh-format

9650 msgid "Unable to checkout submodule '$sm_path'"

9651 msgstr "Kan inte checka ut undermodulen \"$sm_path\""

9652

9497 -#: git-submodule.sh:416

9653 +#: git-submodule.sh:422

9654 #, sh-format

9655 msgid "Failed to add submodule '$sm_path'"

9656 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""

9657

9502 -#: git-submodule.sh:425

9658 +#: git-submodule.sh:431

9659 #, sh-format

9660 msgid "Failed to register submodule '$sm_path'"

9661 msgstr "Misslyckades registrera undermodulen \"$sm_path\""

9662

9507 -#: git-submodule.sh:468

9663 +#: git-submodule.sh:474

9664 #, sh-format

9665 msgid "Entering '$prefix$sm_path'"

9666 msgstr "Går in i \"$prefix$sm_path\""

9667

9512 -#: git-submodule.sh:482

9668 +#: git-submodule.sh:488

9669 #, sh-format

9670 msgid "Stopping at '$sm_path'; script returned non-zero status."

9671 msgstr ""

9672 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."

9673

9518 -#: git-submodule.sh:526

9674 +#: git-submodule.sh:532

9675 #, sh-format

9676 msgid "No url found for submodule path '$sm_path' in .gitmodules"

9677 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"

9678

9523 -#: git-submodule.sh:535

9679 +#: git-submodule.sh:541

9680 #, sh-format

9681 msgid "Failed to register url for submodule path '$sm_path'"

9682 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""

9683

9528 -#: git-submodule.sh:537

9684 +#: git-submodule.sh:543

9685 #, sh-format

9686 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

9687 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""

9688

9533 -#: git-submodule.sh:545

9689 +#: git-submodule.sh:551

9690 #, sh-format

9691 msgid "Failed to register update mode for submodule path '$sm_path'"

9692 msgstr ""

9693 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""

9694

9539 -#: git-submodule.sh:649

9695 +#: git-submodule.sh:588

9696 +#, sh-format

9697 +msgid "Use '.' if you really want to deinitialize all submodules"

9698 +msgstr "Använd \".\" om du verkligen vill avinitiera alla undermoduler"

9699 +

9700 +#: git-submodule.sh:603

9701 +#, sh-format

9702 +msgid "Submodule work tree '$sm_path' contains a .git directory"

9703 +msgstr "Undermodulens arbetskatalog \"$sm_path\" innehåller katalogen \".git\""

9704 +

9705 +#: git-submodule.sh:604

9706 +#, sh-format

9707 +msgid ""

9708 +"(use 'rm -rf' if you really want to remove it including all of its history)"

9709 +msgstr ""

9710 +"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"

9711 +

9712 +#: git-submodule.sh:610

9713 #, sh-format

9714 msgid ""

9542 -"Submodule path '$sm_path' not initialized\n"

9715 +"Submodule work tree '$sm_path' contains local modifications; use '-f' to "

9716 +"discard them"

9717 +msgstr ""

9718 +"Undermodulens arbetskatalog \"$sm_path\" har lokala ändringar; \"-f\" kastar "

9719 +"bort dem"

9720 +

9721 +#: git-submodule.sh:613

9722 +#, sh-format

9723 +msgid "Cleared directory '$sm_path'"

9724 +msgstr "Rensade katalogen \"$sm_path\""

9725 +

9726 +#: git-submodule.sh:614

9727 +#, sh-format

9728 +msgid "Could not remove submodule work tree '$sm_path'"

9729 +msgstr "Kunde inte ta bort underkatalogens arbetskatalog \"$sm_path\""

9730 +

9731 +#: git-submodule.sh:617

9732 +#, sh-format

9733 +msgid "Could not create empty submodule directory '$sm_path'"

9734 +msgstr "Kunde inte skapa tom undermodulskatalog \"$sm_path\""

9735 +

9736 +#: git-submodule.sh:626

9737 +#, sh-format

9738 +msgid "Submodule '$name' ($url) unregistered for path '$sm_path'"

9739 +msgstr "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$sm_path\""

9740 +

9741 +#: git-submodule.sh:731

9742 +#, sh-format

9743 +msgid ""

9744 +"Submodule path '$prefix$sm_path' not initialized\n"

9745 "Maybe you want to use 'update --init'?"

9746 msgstr ""

9545 -"Undermodulen \"$sm_path\" har inte initierats\n"

9747 +"Undermodulen \"$prefix$sm_path\" har inte initierats\n"

9748 "Kanske du vill köra \"update --init\"?"

9749

9548 -#: git-submodule.sh:662

9750 +#: git-submodule.sh:744

9751 #, sh-format

9550 -msgid "Unable to find current revision in submodule path '$sm_path'"

9551 -msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""

9752 +msgid "Unable to find current revision in submodule path '$prefix$sm_path'"

9753 +msgstr ""

9754 +"Kan inte hitta aktuell revision i undermodulsökvägen \"$prefix$sm_path\""

9755

9553 -#: git-submodule.sh:671 git-submodule.sh:695

9756 +#: git-submodule.sh:753

9757 #, sh-format

9758 msgid "Unable to fetch in submodule path '$sm_path'"

9759 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""

9760

9558 -#: git-submodule.sh:709

9761 +#: git-submodule.sh:777

9762 #, sh-format

9560 -msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

9561 -msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""

9763 +msgid "Unable to fetch in submodule path '$prefix$sm_path'"

9764 +msgstr "Kan inte hämta i undermodulsökväg \"$prefix$sm_path\""

9765

9563 -#: git-submodule.sh:710

9766 +#: git-submodule.sh:791

9767 #, sh-format

9565 -msgid "Submodule path '$sm_path': rebased into '$sha1'"

9566 -msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""

9768 +msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'"

9769 +msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\""

9770

9568 -#: git-submodule.sh:715

9771 +#: git-submodule.sh:792

9772 #, sh-format

9570 -msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

9571 -msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""

9773 +msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'"

9774 +msgstr "Undermodulsökvägen \"$prefix$sm_path\": ombaserade in i \"$sha1\""

9775

9573 -#: git-submodule.sh:716

9776 +#: git-submodule.sh:797

9777 #, sh-format

9575 -msgid "Submodule path '$sm_path': merged in '$sha1'"

9576 -msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""

9778 +msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'"

9779 +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\""

9780

9578 -#: git-submodule.sh:721

9781 +#: git-submodule.sh:798

9782 #, sh-format

9580 -msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

9581 -msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""

9783 +msgid "Submodule path '$prefix$sm_path': merged in '$sha1'"

9784 +msgstr "Undermodulsökvägen \"$prefix$sm_path\": sammanslagen i \"$sha1\""

9785

9583 -#: git-submodule.sh:722

9786 +#: git-submodule.sh:803

9787 #, sh-format

9585 -msgid "Submodule path '$sm_path': checked out '$sha1'"

9586 -msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""

9788 +msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'"

9789 +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$prefix$sm_path\""

9790

9588 -#: git-submodule.sh:744 git-submodule.sh:1066

9791 +#: git-submodule.sh:804

9792 #, sh-format

9590 -msgid "Failed to recurse into submodule path '$sm_path'"

9591 -msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

9793 +msgid "Submodule path '$prefix$sm_path': checked out '$sha1'"

9794 +msgstr "Undermodulsökvägen \"$prefix$sm_path\": checkade ut \"$sha1\""

9795

9593 -#: git-submodule.sh:852

9796 +#: git-submodule.sh:831

9797 +#, sh-format

9798 +msgid "Failed to recurse into submodule path '$prefix$sm_path'"

9799 +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$prefix$sm_path\""

9800 +

9801 +#: git-submodule.sh:939

9802 msgid "The --cached option cannot be used with the --files option"

9803 msgstr "Flaggan --cached kan inte användas med flaggan --files"

9804

9805 #. unexpected type

9598 -#: git-submodule.sh:892

9806 +#: git-submodule.sh:979

9807 #, sh-format

9808 msgid "unexpected mode $mod_dst"

9809 msgstr "oväntat läge $mod_dst"

9810

9603 -#: git-submodule.sh:910

9811 +#: git-submodule.sh:997

9812 #, sh-format

9813 msgid " Warn: $name doesn't contain commit $sha1_src"

9814 msgstr " Varning: $name innehåller inte incheckning $sha1_src"

9815

9608 -#: git-submodule.sh:913

9816 +#: git-submodule.sh:1000

9817 #, sh-format

9818 msgid " Warn: $name doesn't contain commit $sha1_dst"

9819 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"

9820

9613 -#: git-submodule.sh:916

9821 +#: git-submodule.sh:1003

9822 #, sh-format

9823 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

9824 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"

9825

9618 -#: git-submodule.sh:941

9826 +#: git-submodule.sh:1028

9827 msgid "blob"

9828 msgstr "blob"

9829

9622 -#: git-submodule.sh:979

9830 +#: git-submodule.sh:1066

9831 msgid "Submodules changed but not updated:"

9832 msgstr "Undermoduler ändrade men inte uppdaterade:"

9833

9626 -#: git-submodule.sh:981

9834 +#: git-submodule.sh:1068

9835 msgid "Submodule changes to be committed:"

9836 msgstr "Undermodulers ändringar att checka in:"

9837

9630 -#: git-submodule.sh:1129

9838 +#: git-submodule.sh:1153

9839 +#, sh-format

9840 +msgid "Failed to recurse into submodule path '$sm_path'"

9841 +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

9842 +

9843 +#: git-submodule.sh:1216

9844 #, sh-format

9845 msgid "Synchronizing submodule url for '$prefix$sm_path'"

9846 msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\""

9847

9848 +#~ msgid "use any ref in .git/refs"

9849 +#~ msgstr "använd alla referenser i .git/refs"

9850 +

9851 +#~ msgid "use any tag in .git/refs/tags"

9852 +#~ msgstr "använd alla taggar i .git/refs/tags"

9853 +

9854 +#~ msgid "bad object %s"

9855 +#~ msgstr "felaktigt objekt %s"

9856 +

9857 +#~ msgid "bogus committer info %s"

9858 +#~ msgstr "felaktig incheckarinformation %s"

9859 +

9860 #~ msgid "can't fdopen 'show' output fd"

9861 #~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"

9862

l10n: Update Swedish translation (2048t0f0u)