fbc63eb656 · matheusbsbs/matheus-bagliano

@@ -7,10 +7,10 @@ msgid ""

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2015-09-05 09:16+0800\n"

11 -"PO-Revision-Date: 2015-09-09 21:45+0100\n"

10 +"POT-Creation-Date: 2015-12-11 23:36+0800\n"

11 +"PO-Revision-Date: 2015-12-18 09:06+0100\n"

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

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

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

14 "Language: sv\n"

15 "MIME-Version: 1.0\n"

16 "Content-Type: text/plain; charset=UTF-8\n"

@@ -31,13 +31,13 @@ msgstr ""

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

32 "som lämpligt för att ange lösning och checka in."

33

34 -#: advice.c:101 builtin/merge.c:1227

34 +#: advice.c:101 builtin/merge.c:1225

35 msgid "You have not concluded your merge (MERGE_HEAD exists)."

36 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."

37

38 #: advice.c:103

39 -msgid "Please, commit your changes before you can merge."

40 -msgstr "Ange ett incheckningsmeddelande för dina ändringar."

39 +msgid "Please, commit your changes before merging."

40 +msgstr "Checka in dina ändringar innan du utför sammanslagningen."

41

42 #: advice.c:104

43 msgid "Exiting because of unfinished merge."

@@ -62,76 +62,76 @@ msgstr ""

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

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

64

65 -#: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327

65 +#: archive.c:344 builtin/add.c:137 builtin/add.c:420 builtin/rm.c:327

66 #, c-format

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

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

69

70 -#: archive.c:428

70 +#: archive.c:429

71 msgid "fmt"

72 msgstr "fmt"

73

74 -#: archive.c:428

74 +#: archive.c:429

75 msgid "archive format"

76 msgstr "arkivformat"

77

78 -#: archive.c:429 builtin/log.c:1229

78 +#: archive.c:430 builtin/log.c:1228

79 msgid "prefix"

80 msgstr "prefix"

81

82 -#: archive.c:430

82 +#: archive.c:431

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

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

85

86 -#: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516

87 -#: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987

88 -#: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99

86 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2535

87 +#: builtin/blame.c:2536 builtin/config.c:58 builtin/fast-export.c:987

88 +#: builtin/fast-export.c:989 builtin/grep.c:707 builtin/hash-object.c:99

89 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395

90 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153

91 msgid "file"

92 msgstr "fil"

93

94 -#: archive.c:432 builtin/archive.c:89

94 +#: archive.c:433 builtin/archive.c:89

95 msgid "write the archive to this file"

96 msgstr "skriv arkivet till filen"

97

98 -#: archive.c:434

98 +#: archive.c:435

99 msgid "read .gitattributes in working directory"

100 msgstr "läs .gitattributes i arbetskatalogen"

101

102 -#: archive.c:435

102 +#: archive.c:436

103 msgid "report archived files on stderr"

104 msgstr "rapportera arkiverade filer på standard fel"

105

106 -#: archive.c:436

106 +#: archive.c:437

107 msgid "store only"

108 msgstr "endast spara"

109

110 -#: archive.c:437

110 +#: archive.c:438

111 msgid "compress faster"

112 msgstr "komprimera snabbare"

113

114 -#: archive.c:445

114 +#: archive.c:446

115 msgid "compress better"

116 msgstr "komprimera bättre"

117

118 -#: archive.c:448

118 +#: archive.c:449

119 msgid "list supported archive formats"

120 msgstr "visa understödda arkivformat"

121

122 -#: archive.c:450 builtin/archive.c:90 builtin/clone.c:77

122 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:77

123 msgid "repo"

124 msgstr "arkiv"

125

126 -#: archive.c:451 builtin/archive.c:91

126 +#: archive.c:452 builtin/archive.c:91

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

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

129

130 -#: archive.c:452 builtin/archive.c:92 builtin/notes.c:479

130 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:479

131 msgid "command"

132 msgstr "kommando"

133

134 -#: archive.c:453 builtin/archive.c:93

134 +#: archive.c:454 builtin/archive.c:93

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

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

137

@@ -143,83 +143,83 @@ msgstr ""

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

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

145

146 -#: branch.c:60

146 +#: branch.c:61

147 #, c-format

148 msgid "Not setting branch %s as its own upstream."

149 msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."

150

151 -#: branch.c:83

151 +#: branch.c:84

152 #, c-format

153 msgid "Branch %s set up to track remote branch %s from %s by rebasing."

154 msgstr ""

155 "Grenen %s ställdes in att spåra fjärrgrenen %s från %s genom ombasering."

156

157 -#: branch.c:84

157 +#: branch.c:85

158 #, c-format

159 msgid "Branch %s set up to track remote branch %s from %s."

160 msgstr "Grenen %s ställdes in att spåra fjärrgrenen %s från %s."

161

162 -#: branch.c:88

162 +#: branch.c:89

163 #, c-format

164 msgid "Branch %s set up to track local branch %s by rebasing."

165 msgstr "Grenen %s ställdes in att spåra den lokala grenen %s genom ombasering."

166

167 -#: branch.c:89

167 +#: branch.c:90

168 #, c-format

169 msgid "Branch %s set up to track local branch %s."

170 msgstr "Grenen %s ställdes in att spåra den lokala grenen %s."

171

172 -#: branch.c:94

172 +#: branch.c:95

173 #, c-format

174 msgid "Branch %s set up to track remote ref %s by rebasing."

175 msgstr "Grenen %s ställdes in att spåra fjärreferensen %s genom ombasering."

176

177 -#: branch.c:95

177 +#: branch.c:96

178 #, c-format

179 msgid "Branch %s set up to track remote ref %s."

180 msgstr "Grenen %s ställdes in att spåra fjärreferensen %s."

181

182 -#: branch.c:99

182 +#: branch.c:100

183 #, c-format

184 msgid "Branch %s set up to track local ref %s by rebasing."

185 msgstr ""

186 "Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."

187

188 -#: branch.c:100

188 +#: branch.c:101

189 #, c-format

190 msgid "Branch %s set up to track local ref %s."

191 msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."

192

193 -#: branch.c:133

193 +#: branch.c:134

194 #, c-format

195 msgid "Not tracking: ambiguous information for ref %s"

196 msgstr "Spårar inte: tvetydig information för referensen %s"

197

198 -#: branch.c:162

198 +#: branch.c:163

199 #, c-format

200 msgid "'%s' is not a valid branch name."

201 msgstr "\"%s\" är inte ett giltigt grennamn."

202

203 -#: branch.c:167

203 +#: branch.c:168

204 #, c-format

205 msgid "A branch named '%s' already exists."

206 msgstr "Det finns redan en gren som heter \"%s\""

207

208 -#: branch.c:175

208 +#: branch.c:176

209 msgid "Cannot force update the current branch."

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

211

212 -#: branch.c:195

212 +#: branch.c:196

213 #, c-format

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

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

216

217 -#: branch.c:197

217 +#: branch.c:198

218 #, c-format

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

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

221

222 -#: branch.c:199

222 +#: branch.c:200

223 msgid ""

224 "\n"

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

@@ -239,22 +239,22 @@ msgstr ""

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

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

241

242 -#: branch.c:243

242 +#: branch.c:244

243 #, c-format

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

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

246

247 -#: branch.c:263

247 +#: branch.c:264

248 #, c-format

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

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

251

252 -#: branch.c:268

252 +#: branch.c:269

253 #, c-format

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

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

256

257 -#: branch.c:399

257 +#: branch.c:322

258 #, c-format

259 msgid "'%s' is already checked out at '%s'"

260 msgstr "\"%s\" är redan utcheckad på \"%s\""

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

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

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

271

272 -#: bundle.c:87 builtin/commit.c:765

272 +#: bundle.c:87 builtin/commit.c:766

273 #, c-format

274 msgid "could not open '%s'"

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

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

278 msgid "Repository lacks these prerequisite commits:"

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

280

281 -#: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708

282 -#: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334

283 -#: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358

281 +#: bundle.c:163 ref-filter.c:1372 sequencer.c:636 sequencer.c:1083

282 +#: builtin/blame.c:2734 builtin/commit.c:1045 builtin/log.c:334

283 +#: builtin/log.c:849 builtin/log.c:1456 builtin/log.c:1689 builtin/merge.c:358

284 #: builtin/shortlog.c:158

285 msgid "revision walk setup failed"

286 msgstr "misslyckades skapa revisionstraversering"

@@ -320,7 +320,7 @@ msgstr "rev-list dog"

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

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

322

323 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261

323 +#: bundle.c:443 builtin/log.c:157 builtin/log.c:1366 builtin/shortlog.c:261

324 #, c-format

325 msgid "unrecognized argument: %s"

326 msgstr "okänt argument: %s"

@@ -338,13 +338,13 @@ msgstr "kan inte skapa \"%s\""

338 msgid "index-pack died"

339 msgstr "index-pack dog"

340

341 -#: color.c:260

341 +#: color.c:275

342 #, c-format

343 msgid "invalid color value: %.*s"

344 msgstr "felaktigt färgvärde: %.*s"

345

346 -#: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1489

347 -#: builtin/am.c:2101

346 +#: commit.c:40 builtin/am.c:452 builtin/am.c:488 builtin/am.c:1520

347 +#: builtin/am.c:2149

348 #, c-format

349 msgid "could not parse %s"

350 msgstr "kunde inte tolka %s"

@@ -502,22 +502,22 @@ msgstr "kunde inte läsa orderfilen \"%s\""

502 msgid "Performing inexact rename detection"

503 msgstr "Utför onöjaktig namnbytesdetektering"

504

505 -#: diff.c:116

505 +#: diff.c:115

506 #, c-format

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

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

509

510 -#: diff.c:121

510 +#: diff.c:120

511 #, c-format

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

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

514

515 -#: diff.c:216

515 +#: diff.c:215

516 #, c-format

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

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

519

520 -#: diff.c:268

520 +#: diff.c:267

521 #, c-format

522 msgid ""

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

@@ -526,16 +526,16 @@ msgstr ""

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

527 "%s"

528

529 -#: diff.c:2998

529 +#: diff.c:3000

530 #, c-format

531 msgid "external diff died, stopping at %s"

532 msgstr "extern diff dog, stannar vid %s"

533

534 -#: diff.c:3394

534 +#: diff.c:3396

535 msgid "--follow requires exactly one pathspec"

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

537

538 -#: diff.c:3557

538 +#: diff.c:3559

539 #, c-format

540 msgid ""

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

@@ -544,16 +544,16 @@ msgstr ""

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

545 "%s"

546

547 -#: diff.c:3571

547 +#: diff.c:3573

548 #, c-format

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

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

551

552 -#: dir.c:1853

552 +#: dir.c:1915

553 msgid "failed to get kernel name and information"

554 msgstr "misslyckades hämta kärnans namn och information"

555

556 -#: dir.c:1936

556 +#: dir.c:1998

557 msgid "Untracked cache is disabled on this system."

558 msgstr "Ospårad cache är inaktiverad på detta system."

559

@@ -662,8 +662,8 @@ msgstr "%s: %s - %s"

662 msgid "failed to read the cache"

663 msgstr "misslyckades läsa cachen"

664

665 -#: merge.c:94 builtin/am.c:1974 builtin/am.c:2009 builtin/checkout.c:375

666 -#: builtin/checkout.c:586 builtin/clone.c:715

665 +#: merge.c:94 builtin/am.c:2022 builtin/am.c:2057 builtin/checkout.c:376

666 +#: builtin/checkout.c:587 builtin/clone.c:722

667 msgid "unable to write new index file"

668 msgstr "kunde inte skriva ny indexfil"

669

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

681 msgid "error building trees"

682 msgstr "fel vid byggande av träd"

683

684 -#: merge-recursive.c:687

684 +#: merge-recursive.c:686

685 #, c-format

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

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

688

689 -#: merge-recursive.c:698

689 +#: merge-recursive.c:697

690 #, c-format

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

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

693

694 -#: merge-recursive.c:712 merge-recursive.c:733

694 +#: merge-recursive.c:711 merge-recursive.c:732

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

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

697

698 -#: merge-recursive.c:723

698 +#: merge-recursive.c:722

699 #, c-format

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

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

702

703 -#: merge-recursive.c:763

703 +#: merge-recursive.c:762

704 #, c-format

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

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

707

708 -#: merge-recursive.c:765

708 +#: merge-recursive.c:764

709 #, c-format

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

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

712

713 -#: merge-recursive.c:788 builtin/clone.c:364

713 +#: merge-recursive.c:787 builtin/clone.c:369

714 #, c-format

715 msgid "failed to open '%s'"

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

717

718 -#: merge-recursive.c:796

718 +#: merge-recursive.c:795

719 #, c-format

720 msgid "failed to symlink '%s'"

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

722

723 -#: merge-recursive.c:799

723 +#: merge-recursive.c:798

724 #, c-format

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

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

727

728 -#: merge-recursive.c:937

728 +#: merge-recursive.c:936

729 msgid "Failed to execute internal merge"

730 msgstr "Misslyckades exekvera intern sammanslagning"

731

732 -#: merge-recursive.c:941

732 +#: merge-recursive.c:940

733 #, c-format

734 msgid "Unable to add %s to database"

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

736

737 -#: merge-recursive.c:957

737 +#: merge-recursive.c:956

738 msgid "unsupported object type in the tree"

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

740

741 -#: merge-recursive.c:1032 merge-recursive.c:1046

741 +#: merge-recursive.c:1031 merge-recursive.c:1045

742 #, c-format

743 msgid ""

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

@@ -747,7 +747,7 @@ msgstr ""

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

748 "i trädet."

749

750 -#: merge-recursive.c:1038 merge-recursive.c:1051

750 +#: merge-recursive.c:1037 merge-recursive.c:1050

751 #, c-format

752 msgid ""

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

@@ -756,20 +756,20 @@ msgstr ""

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

757 "i trädet vid %s."

758

759 -#: merge-recursive.c:1092

759 +#: merge-recursive.c:1091

760 msgid "rename"

761 msgstr "namnbyte"

762

763 -#: merge-recursive.c:1092

763 +#: merge-recursive.c:1091

764 msgid "renamed"

765 msgstr "namnbytt"

766

767 -#: merge-recursive.c:1148

767 +#: merge-recursive.c:1147

768 #, c-format

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

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

771

772 -#: merge-recursive.c:1170

772 +#: merge-recursive.c:1169

773 #, c-format

774 msgid ""

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

@@ -778,144 +778,144 @@ msgstr ""

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

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

780

781 -#: merge-recursive.c:1175

781 +#: merge-recursive.c:1174

782 msgid " (left unresolved)"

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

784

785 -#: merge-recursive.c:1229

785 +#: merge-recursive.c:1228

786 #, c-format

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

788 msgstr ""

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

790

791 -#: merge-recursive.c:1259

791 +#: merge-recursive.c:1258

792 #, c-format

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

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

795

796 -#: merge-recursive.c:1458

796 +#: merge-recursive.c:1457

797 #, c-format

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

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

800

801 -#: merge-recursive.c:1468

801 +#: merge-recursive.c:1467

802 #, c-format

803 msgid "Adding merged %s"

804 msgstr "Lägger till sammanslagen %s"

805

806 -#: merge-recursive.c:1473 merge-recursive.c:1671

806 +#: merge-recursive.c:1472 merge-recursive.c:1674

807 #, c-format

808 msgid "Adding as %s instead"

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

810

811 -#: merge-recursive.c:1524

811 +#: merge-recursive.c:1523

812 #, c-format

813 msgid "cannot read object %s"

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

815

816 -#: merge-recursive.c:1527

816 +#: merge-recursive.c:1526

817 #, c-format

818 msgid "object %s is not a blob"

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

820

821 -#: merge-recursive.c:1575

821 +#: merge-recursive.c:1578

822 msgid "modify"

823 msgstr "ändra"

824

825 -#: merge-recursive.c:1575

825 +#: merge-recursive.c:1578

826 msgid "modified"

827 msgstr "ändrad"

828

829 -#: merge-recursive.c:1585

829 +#: merge-recursive.c:1588

830 msgid "content"

831 msgstr "innehåll"

832

833 -#: merge-recursive.c:1592

833 +#: merge-recursive.c:1595

834 msgid "add/add"

835 msgstr "tillägg/tillägg"

836

837 -#: merge-recursive.c:1626

837 +#: merge-recursive.c:1629

838 #, c-format

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

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

841

842 -#: merge-recursive.c:1640

842 +#: merge-recursive.c:1643

843 #, c-format

844 msgid "Auto-merging %s"

845 msgstr "Slår ihop %s automatiskt"

846

847 -#: merge-recursive.c:1644 git-submodule.sh:1150

847 +#: merge-recursive.c:1647 git-submodule.sh:1025

848 msgid "submodule"

849 msgstr "undermodul"

850

851 -#: merge-recursive.c:1645

851 +#: merge-recursive.c:1648

852 #, c-format

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

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

855

856 -#: merge-recursive.c:1731

856 +#: merge-recursive.c:1734

857 #, c-format

858 msgid "Removing %s"

859 msgstr "Tar bort %s"

860

861 -#: merge-recursive.c:1756

861 +#: merge-recursive.c:1759

862 msgid "file/directory"

863 msgstr "fil/katalog"

864

865 -#: merge-recursive.c:1762

865 +#: merge-recursive.c:1765

866 msgid "directory/file"

867 msgstr "katalog/fil"

868

869 -#: merge-recursive.c:1767

869 +#: merge-recursive.c:1770

870 #, c-format

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

872 msgstr ""

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

874

875 -#: merge-recursive.c:1777

875 +#: merge-recursive.c:1780

876 #, c-format

877 msgid "Adding %s"

878 msgstr "Lägger till %s"

879

880 -#: merge-recursive.c:1794

880 +#: merge-recursive.c:1797

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

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

883

884 -#: merge-recursive.c:1813

884 +#: merge-recursive.c:1816

885 msgid "Already up-to-date!"

886 msgstr "Redan à jour!"

887

888 -#: merge-recursive.c:1822

888 +#: merge-recursive.c:1825

889 #, c-format

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

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

892

893 -#: merge-recursive.c:1852

893 +#: merge-recursive.c:1855

894 #, c-format

895 msgid "Unprocessed path??? %s"

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

897

898 -#: merge-recursive.c:1900

898 +#: merge-recursive.c:1903

899 msgid "Merging:"

900 msgstr "Slår ihop:"

901

902 -#: merge-recursive.c:1913

902 +#: merge-recursive.c:1916

903 #, c-format

904 msgid "found %u common ancestor:"

905 msgid_plural "found %u common ancestors:"

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

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

908

909 -#: merge-recursive.c:1950

909 +#: merge-recursive.c:1953

910 msgid "merge returned no commit"

911 msgstr "sammanslagningen returnerade ingen incheckning"

912

913 -#: merge-recursive.c:2007

913 +#: merge-recursive.c:2010

914 #, c-format

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

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

917

918 -#: merge-recursive.c:2018 builtin/merge.c:645

918 +#: merge-recursive.c:2021 builtin/merge.c:645

919 msgid "Unable to write index."

920 msgstr "Kunde inte skriva indexet."

921

@@ -945,31 +945,41 @@ msgstr "Felaktigt värde på %s: \"%s\""

945 msgid "unable to parse object: %s"

946 msgstr "kunde inte tolka objektet: %s"

947

948 -#: parse-options.c:563

948 +#: parse-options.c:570

949 msgid "..."

950 msgstr "..."

951

952 -#: parse-options.c:581

952 +#: parse-options.c:588

953 #, c-format

954 msgid "usage: %s"

955 msgstr "användning: %s"

956

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

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

959 -#: parse-options.c:585

959 +#: parse-options.c:592

960 #, c-format

961 msgid " or: %s"

962 msgstr " eller: %s"

963

964 -#: parse-options.c:588

964 +#: parse-options.c:595

965 #, c-format

966 msgid " %s"

967 msgstr " %s"

968

969 -#: parse-options.c:622

969 +#: parse-options.c:629

970 msgid "-NUM"

971 msgstr "-TAL"

972

973 +#: parse-options-cb.c:108

974 +#, c-format

975 +msgid "malformed object name '%s'"

976 +msgstr "felformat objektnamn \"%s\""

977 +

978 +#: path.c:752

979 +#, c-format

980 +msgid "Could not make %s writable by group"

981 +msgstr "Kunde inte göra %s skrivbar för gruppen"

982 +

983 #: pathspec.c:133

984 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"

985 msgstr ""

@@ -1039,11 +1049,11 @@ msgstr ""

1049 msgid "unable to parse --pretty format"

1050 msgstr "kunde inte tolka format för --pretty"

1051

1042 -#: progress.c:236

1052 +#: progress.c:235

1053 msgid "done"

1054 msgstr "klart"

1055

1046 -#: read-cache.c:1296

1056 +#: read-cache.c:1281

1057 #, c-format

1058 msgid ""

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

@@ -1052,7 +1062,7 @@ msgstr ""

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

1063 "Använder version %i"

1064

1055 -#: read-cache.c:1306

1065 +#: read-cache.c:1291

1066 #, c-format

1067 msgid ""

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

@@ -1061,118 +1071,163 @@ msgstr ""

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

1072 "Använder version %i"

1073

1064 -#: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1074 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973

1075 #: builtin/merge.c:983

1076 #, c-format

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

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

1079

1070 -#: refs.c:3001

1080 +#: refs/files-backend.c:2359

1081 #, c-format

1082 msgid "could not delete reference %s: %s"

1083 msgstr "kunde inte ta bort referensen %s: %s"

1084

1075 -#: refs.c:3004

1085 +#: refs/files-backend.c:2362

1086 #, c-format

1087 msgid "could not delete references: %s"

1088 msgstr "kunde inte ta bort referenser: %s"

1089

1080 -#: refs.c:3013

1090 +#: refs/files-backend.c:2371

1091 #, c-format

1092 msgid "could not remove reference %s"

1093 msgstr "kunde inte ta bort referensen %s"

1094

1085 -#: ref-filter.c:660

1095 +#: ref-filter.c:245

1096 +#, c-format

1097 +msgid "format: %%(end) atom used without corresponding atom"

1098 +msgstr "format: atomen %%(end) använd utan motsvarande atom"

1099 +

1100 +#: ref-filter.c:704

1101 +#, c-format

1102 +msgid "positive value expected contents:lines=%s"

1103 +msgstr "positivt värde förväntat contents:lines=%s"

1104 +

1105 +#: ref-filter.c:833

1106 +#, c-format

1107 +msgid "expected format: %%(color:<color>)"

1108 +msgstr "förväntat format: %%(color:<color>)"

1109 +

1110 +#: ref-filter.c:835

1111 msgid "unable to parse format"

1112 msgstr "kan inte tolka formatet"

1113

1089 -#: remote.c:792

1114 +#: ref-filter.c:870

1115 +#, c-format

1116 +msgid "expected format: %%(align:<width>,<position>)"

1117 +msgstr "förväntat format: %%(align:<bredd>,<position>)"

1118 +

1119 +#: ref-filter.c:893

1120 +#, c-format

1121 +msgid "improper format entered align:%s"

1122 +msgstr "felaktigt format angivet align:%s"

1123 +

1124 +#: ref-filter.c:898

1125 +#, c-format

1126 +msgid "positive width expected with the %%(align) atom"

1127 +msgstr "positiv bredd förväntad med atomen %%(align)"

1128 +

1129 +#: ref-filter.c:1219

1130 +#, c-format

1131 +msgid "malformed object at '%s'"

1132 +msgstr "felformat objekt vid \"%s\""

1133 +

1134 +#: ref-filter.c:1561

1135 +#, c-format

1136 +msgid "format: %%(end) atom missing"

1137 +msgstr "format: atomen %%(end) saknas"

1138 +

1139 +#: ref-filter.c:1615

1140 +#, c-format

1141 +msgid "malformed object name %s"

1142 +msgstr "felformat objektnamn %s"

1143 +

1144 +#: remote.c:756

1145 #, c-format

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

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

1148

1094 -#: remote.c:796

1149 +#: remote.c:760

1150 #, c-format

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

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

1153

1099 -#: remote.c:800

1154 +#: remote.c:764

1155 #, c-format

1156 msgid "%s tracks both %s and %s"

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

1158

1104 -#: remote.c:808

1159 +#: remote.c:772

1160 msgid "Internal error"

1161 msgstr "Internt fel"

1162

1108 -#: remote.c:1723 remote.c:1766

1163 +#: remote.c:1687 remote.c:1730

1164 msgid "HEAD does not point to a branch"

1165 msgstr "HEAD pekar inte på en gren"

1166

1112 -#: remote.c:1732

1167 +#: remote.c:1696

1168 #, c-format

1169 msgid "no such branch: '%s'"

1170 msgstr "okänd gren: \"%s\""

1171

1117 -#: remote.c:1735

1172 +#: remote.c:1699

1173 #, c-format

1174 msgid "no upstream configured for branch '%s'"

1175 msgstr "ingen standarduppström angiven för grenen \"%s\""

1176

1122 -#: remote.c:1741

1177 +#: remote.c:1705

1178 #, c-format

1179 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

1181

1127 -#: remote.c:1756

1182 +#: remote.c:1720

1183 #, c-format

1184 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1185 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"

1186

1132 -#: remote.c:1771

1187 +#: remote.c:1735

1188 #, c-format

1189 msgid "branch '%s' has no remote for pushing"

1190 msgstr "grenen \"%s\" har ingen fjärr för \"push\""

1191

1137 -#: remote.c:1782

1192 +#: remote.c:1746

1193 #, c-format

1194 msgid "push refspecs for '%s' do not include '%s'"

1195 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""

1196

1142 -#: remote.c:1795

1197 +#: remote.c:1759

1198 msgid "push has no destination (push.default is 'nothing')"

1199 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"

1200

1146 -#: remote.c:1817

1201 +#: remote.c:1781

1202 msgid "cannot resolve 'simple' push to a single destination"

1203 msgstr "\"enkel push\" motsvarar flera olika mål"

1204

1150 -#: remote.c:2124

1205 +#: remote.c:2083

1206 #, c-format

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

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

1209

1155 -#: remote.c:2128

1210 +#: remote.c:2087

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

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

1213

1159 -#: remote.c:2131

1214 +#: remote.c:2090

1215 #, c-format

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

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

1218

1164 -#: remote.c:2135

1219 +#: remote.c:2094

1220 #, c-format

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

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

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

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

1225

1171 -#: remote.c:2141

1226 +#: remote.c:2100

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

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

1229

1175 -#: remote.c:2144

1230 +#: remote.c:2103

1231 #, c-format

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

1233 msgid_plural ""

@@ -1182,11 +1237,11 @@ msgstr[0] ""

1237 msgstr[1] ""

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

1239

1185 -#: remote.c:2152

1240 +#: remote.c:2111

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

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

1243

1189 -#: remote.c:2155

1244 +#: remote.c:2114

1245 #, c-format

1246 msgid ""

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

@@ -1201,28 +1256,28 @@ msgstr[1] ""

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

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

1258

1204 -#: remote.c:2165

1259 +#: remote.c:2124

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

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

1262

1208 -#: revision.c:2198

1263 +#: revision.c:2191

1264 msgid "your current branch appears to be broken"

1265 msgstr "din nuvarande gren verkar vara trasig"

1266

1212 -#: revision.c:2201

1267 +#: revision.c:2194

1268 #, c-format

1269 msgid "your current branch '%s' does not have any commits yet"

1270 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

1271

1217 -#: revision.c:2395

1272 +#: revision.c:2388

1273 msgid "--first-parent is incompatible with --bisect"

1274 msgstr "--first-parent är inkompatibelt med --bisect"

1275

1221 -#: run-command.c:83

1276 +#: run-command.c:90

1277 msgid "open /dev/null failed"

1278 msgstr "misslyckades öppna /dev/null"

1279

1225 -#: run-command.c:85

1280 +#: run-command.c:92

1281 #, c-format

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

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

@@ -1440,7 +1495,7 @@ msgstr "kan inte bestämma HEAD"

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

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

1497

1443 -#: sequencer.c:887 builtin/apply.c:4291

1498 +#: sequencer.c:887 builtin/apply.c:4287

1499 #, c-format

1500 msgid "cannot open %s: %s"

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

@@ -1482,12 +1537,12 @@ msgstr "Kan inte ångra som första incheckning"

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

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

1539

1485 -#: setup.c:243

1540 +#: setup.c:248

1541 #, c-format

1542 msgid "failed to read %s"

1543 msgstr "misslyckades läsa %s"

1544

1490 -#: sha1_name.c:453

1545 +#: sha1_name.c:463

1546 msgid ""

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

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

@@ -1534,7 +1589,7 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1589 msgid "staging updated .gitmodules failed"

1590 msgstr "misslyckades köa uppdaterad .gitmodules"

1591

1537 -#: submodule.c:1045

1592 +#: submodule.c:1040

1593 #, c-format

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

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

@@ -1545,7 +1600,7 @@ msgstr "Kunde inte sätta core.worktree i %s"

1600 msgid "unknown value '%s' for key '%s'"

1601 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

1602

1548 -#: trailer.c:543 trailer.c:548 builtin/remote.c:290

1603 +#: trailer.c:543 trailer.c:548 builtin/remote.c:296

1604 #, c-format

1605 msgid "more than one %s"

1606 msgstr "mer än en %s"

@@ -1612,8 +1667,8 @@ msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

1667 msgid "could not open '%s' for writing"

1668 msgstr "kunde inte öppna \"%s\" för skrivning"

1669

1615 -#: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688

1616 -#: builtin/merge.c:1076 builtin/pull.c:380

1670 +#: wrapper.c:223 wrapper.c:366 builtin/am.c:338 builtin/commit.c:1691

1671 +#: builtin/merge.c:1074 builtin/pull.c:380

1672 #, c-format

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

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

@@ -1641,17 +1696,17 @@ msgstr "okänd användare"

1696 msgid "unable to get current working directory"

1697 msgstr "kan inte hämta aktuell arbetskatalog"

1698

1644 -#: wrapper.c:631

1699 +#: wrapper.c:647

1700 #, c-format

1701 msgid "could not open %s for writing"

1702 msgstr "kunde inte öppna %s för skrivning"

1703

1649 -#: wrapper.c:642 builtin/am.c:424

1704 +#: wrapper.c:658 builtin/am.c:425

1705 #, c-format

1706 msgid "could not write to %s"

1707 msgstr "kunde inte skriva till %s"

1708

1654 -#: wrapper.c:648

1709 +#: wrapper.c:664

1710 #, c-format

1711 msgid "could not close %s"

1712 msgstr "kunde inte stänga %s"

@@ -1994,27 +2049,27 @@ msgid " (use \"git bisect reset\" to get back to the original branch)"

2049 msgstr ""

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

2051

1997 -#: wt-status.c:1437

2052 +#: wt-status.c:1438

2053 msgid "On branch "

2054 msgstr "På grenen "

2055

2001 -#: wt-status.c:1445

2056 +#: wt-status.c:1444

2057 msgid "interactive rebase in progress; onto "

2058 msgstr "interaktiv ombasering pågår; ovanpå"

2059

2005 -#: wt-status.c:1447

2060 +#: wt-status.c:1446

2061 msgid "rebase in progress; onto "

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

2063

2009 -#: wt-status.c:1452

2064 +#: wt-status.c:1451

2065 msgid "HEAD detached at "

2066 msgstr "HEAD frånkopplad vid "

2067

2013 -#: wt-status.c:1454

2068 +#: wt-status.c:1453

2069 msgid "HEAD detached from "

2070 msgstr "HEAD frånkopplad från "

2071

2017 -#: wt-status.c:1457

2072 +#: wt-status.c:1456

2073 msgid "Not currently on any branch."

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

2075

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

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

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

2158

2104 -#: wt-status.c:1644

2105 -msgid "HEAD (no branch)"

2106 -msgstr "HEAD (ingen gren)"

2107 -

2108 -#: wt-status.c:1650

2159 +#: wt-status.c:1642

2160 msgid "Initial commit on "

2161 msgstr "Första incheckning på "

2162

2112 -#: wt-status.c:1677

2163 +#: wt-status.c:1646

2164 +msgid "HEAD (no branch)"

2165 +msgstr "HEAD (ingen gren)"

2166 +

2167 +#: wt-status.c:1675

2168 msgid "gone"

2169 msgstr "försvunnen"

2170

2116 -#: wt-status.c:1679 wt-status.c:1687

2171 +#: wt-status.c:1677 wt-status.c:1685

2172 msgid "behind "

2173 msgstr "efter "

2174

2120 -#: compat/precompose_utf8.c:55 builtin/clone.c:403

2175 +#: compat/precompose_utf8.c:56 builtin/clone.c:408

2176 #, c-format

2177 msgid "failed to unlink '%s'"

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

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

2186 msgid "unexpected diff status %c"

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

2188

2134 -#: builtin/add.c:70 builtin/commit.c:277

2189 +#: builtin/add.c:70 builtin/commit.c:278

2190 msgid "updating files failed"

2191 msgstr "misslyckades uppdatera filer"

2192

@@ -2144,7 +2199,7 @@ msgstr "ta bort \"%s\"\n"

2199 msgid "Unstaged changes after refreshing the index:"

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

2201

2147 -#: builtin/add.c:194 builtin/rev-parse.c:799

2202 +#: builtin/add.c:194 builtin/rev-parse.c:796

2203 msgid "Could not read the index"

2204 msgstr "Kunde inte läsa indexet"

2205

@@ -2179,15 +2234,15 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

2236

2182 -#: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110

2237 +#: builtin/add.c:249 builtin/clean.c:894 builtin/fetch.c:108 builtin/mv.c:110

2238 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545

2184 -#: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162

2239 +#: builtin/remote.c:1345 builtin/rm.c:268 builtin/send-pack.c:162

2240 msgid "dry run"

2241 msgstr "testkörning"

2242

2188 -#: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19

2189 -#: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636

2190 -#: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114

2243 +#: builtin/add.c:250 builtin/apply.c:4571 builtin/check-ignore.c:19

2244 +#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2245 +#: builtin/log.c:1640 builtin/mv.c:109 builtin/read-tree.c:114

2246 msgid "be verbose"

2247 msgstr "var pratsam"

2248

@@ -2195,7 +2250,7 @@ msgstr "var pratsam"

2250 msgid "interactive picking"

2251 msgstr "plocka interaktivt"

2252

2198 -#: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286

2253 +#: builtin/add.c:253 builtin/checkout.c:1153 builtin/reset.c:286

2254 msgid "select hunks interactively"

2255 msgstr "välj stycken interaktivt"

2256

@@ -2252,148 +2307,148 @@ msgstr "-A och -u är ömsesidigt inkompatibla"

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

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

2309

2255 -#: builtin/add.c:358

2310 +#: builtin/add.c:352

2311 #, c-format

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

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

2314

2260 -#: builtin/add.c:359

2315 +#: builtin/add.c:353

2316 #, c-format

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

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

2319

2265 -#: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940

2266 -#: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2320 +#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:938

2321 +#: builtin/commit.c:337 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298

2322 +#: builtin/submodule--helper.c:40

2323 msgid "index file corrupt"

2324 msgstr "indexfilen trasig"

2325

2270 -#: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430

2326 +#: builtin/add.c:439 builtin/apply.c:4669 builtin/mv.c:279 builtin/rm.c:430

2327 msgid "Unable to write new index file"

2328 msgstr "Kunde inte skriva ny indexfil"

2329

2274 -#: builtin/am.c:41

2330 +#: builtin/am.c:42

2331 #, c-format

2332 msgid "could not stat %s"

2333 msgstr "kunde inte ta status på %s"

2334

2279 -#: builtin/am.c:270 builtin/am.c:1318 builtin/commit.c:737

2280 -#: builtin/merge.c:1079

2335 +#: builtin/am.c:271 builtin/commit.c:738 builtin/merge.c:1077

2336 #, c-format

2337 msgid "could not read '%s'"

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

2339

2285 -#: builtin/am.c:444

2340 +#: builtin/am.c:445

2341 msgid "could not parse author script"

2342 msgstr "kunde inte tolka författarskript"

2343

2289 -#: builtin/am.c:521

2344 +#: builtin/am.c:522

2345 #, c-format

2346 msgid "'%s' was deleted by the applypatch-msg hook"

2347 msgstr "\"%s\" togs bort av kroken applypatch-msg"

2348

2294 -#: builtin/am.c:562 builtin/notes.c:300

2349 +#: builtin/am.c:563 builtin/notes.c:300

2350 #, c-format

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

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

2353

2299 -#: builtin/am.c:599 builtin/notes.c:315

2354 +#: builtin/am.c:600 builtin/notes.c:315

2355 #, c-format

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

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

2358

2304 -#: builtin/am.c:625

2359 +#: builtin/am.c:626

2360 msgid "fseek failed"

2361 msgstr "\"fseek\" misslyckades"

2362

2308 -#: builtin/am.c:786 builtin/am.c:874

2363 +#: builtin/am.c:787 builtin/am.c:875

2364 #, c-format

2365 msgid "could not open '%s' for reading: %s"

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

2367

2313 -#: builtin/am.c:793

2368 +#: builtin/am.c:794

2369 #, c-format

2370 msgid "could not open '%s' for writing: %s"

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

2372

2318 -#: builtin/am.c:802

2373 +#: builtin/am.c:803

2374 #, c-format

2375 msgid "could not parse patch '%s'"

2376 msgstr "kunde inte tolka patchen \"%s\""

2377

2323 -#: builtin/am.c:867

2378 +#: builtin/am.c:868

2379 msgid "Only one StGIT patch series can be applied at once"

2380 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

2381

2327 -#: builtin/am.c:915

2382 +#: builtin/am.c:916

2383 msgid "invalid timestamp"

2384 msgstr "ogiltig tidsstämpel"

2385

2331 -#: builtin/am.c:918 builtin/am.c:926

2386 +#: builtin/am.c:919 builtin/am.c:927

2387 msgid "invalid Date line"

2388 msgstr "ogiltig \"Date\"-rad"

2389

2335 -#: builtin/am.c:923

2390 +#: builtin/am.c:924

2391 msgid "invalid timezone offset"

2392 msgstr "ogiltig tidszons-offset"

2393

2339 -#: builtin/am.c:1010

2394 +#: builtin/am.c:1011

2395 msgid "Patch format detection failed."

2396 msgstr "Misslyckades detektera patchformat."

2397

2343 -#: builtin/am.c:1015 builtin/clone.c:368

2398 +#: builtin/am.c:1016 builtin/clone.c:373

2399 #, c-format

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

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

2402

2348 -#: builtin/am.c:1019

2403 +#: builtin/am.c:1020

2404 msgid "Failed to split patches."

2405 msgstr "Misslyckades dela patchar."

2406

2352 -#: builtin/am.c:1151 builtin/commit.c:362

2407 +#: builtin/am.c:1152 builtin/commit.c:363

2408 msgid "unable to write index file"

2409 msgstr "kan inte skriva indexfil"

2410

2356 -#: builtin/am.c:1202

2411 +#: builtin/am.c:1203

2412 #, c-format

2413 msgid "When you have resolved this problem, run \"%s --continue\"."

2414 msgstr "När du har löst problemet, kör \"%s --continue\"."

2415

2361 -#: builtin/am.c:1203

2416 +#: builtin/am.c:1204

2417 #, c-format

2418 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2419 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

2420

2366 -#: builtin/am.c:1204

2421 +#: builtin/am.c:1205

2422 #, c-format

2423 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2424 msgstr ""

2425 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

2426

2372 -#: builtin/am.c:1312

2427 +#: builtin/am.c:1343

2428 msgid "Patch is empty. Was it split wrong?"

2429 msgstr "Patchen är tom. Delades den upp felaktigt?"

2430

2376 -#: builtin/am.c:1386 builtin/log.c:1345

2431 +#: builtin/am.c:1417 builtin/log.c:1344

2432 #, c-format

2433 msgid "invalid ident line: %s"

2434 msgstr "ogiltig ident-rad: %s"

2435

2381 -#: builtin/am.c:1413

2436 +#: builtin/am.c:1444

2437 #, c-format

2438 msgid "unable to parse commit %s"

2439 msgstr "kunde inte tolka incheckningen %s"

2440

2386 -#: builtin/am.c:1587

2441 +#: builtin/am.c:1646

2442 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2443 msgstr ""

2444 "Arkivet saknar objekt som behövs för att falla tillbaka på 3-"

2445 "vägssammanslagning."

2446

2392 -#: builtin/am.c:1589

2447 +#: builtin/am.c:1648

2448 msgid "Using index info to reconstruct a base tree..."

2449 msgstr "Använder indexinfo för att återskapa ett basträd..."

2450

2396 -#: builtin/am.c:1608

2451 +#: builtin/am.c:1667

2452 msgid ""

2453 "Did you hand edit your patch?\n"

2454 "It does not apply to blobs recorded in its index."

@@ -2401,39 +2456,39 @@ msgstr ""

2456 "Har du handredigerat din patch?\n"

2457 "Den kan inte tillämpas på blobbar som antecknats i dess index."

2458

2404 -#: builtin/am.c:1614

2459 +#: builtin/am.c:1673

2460 msgid "Falling back to patching base and 3-way merge..."

2461 msgstr ""

2462 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

2463

2409 -#: builtin/am.c:1639

2464 +#: builtin/am.c:1688

2465 msgid "Failed to merge in the changes."

2466 msgstr "Misslyckades slå ihop ändringarna."

2467

2413 -#: builtin/am.c:1664 builtin/merge.c:632

2468 +#: builtin/am.c:1712 builtin/merge.c:632

2469 msgid "git write-tree failed to write a tree"

2470 msgstr "git write-tree misslyckades skriva ett träd"

2471

2417 -#: builtin/am.c:1671

2472 +#: builtin/am.c:1719

2473 msgid "applying to an empty history"

2474 msgstr "tillämpar på en tom historik"

2475

2421 -#: builtin/am.c:1684 builtin/commit.c:1752 builtin/merge.c:829

2476 +#: builtin/am.c:1732 builtin/commit.c:1755 builtin/merge.c:829

2477 #: builtin/merge.c:854

2478 msgid "failed to write commit object"

2479 msgstr "kunde inte skriva incheckningsobjekt"

2480

2426 -#: builtin/am.c:1716 builtin/am.c:1720

2481 +#: builtin/am.c:1764 builtin/am.c:1768

2482 #, c-format

2483 msgid "cannot resume: %s does not exist."

2484 msgstr "kan inte återuppta: %s finns inte."

2485

2431 -#: builtin/am.c:1736

2486 +#: builtin/am.c:1784

2487 msgid "cannot be interactive without stdin connected to a terminal."

2488 msgstr ""

2489 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

2490

2436 -#: builtin/am.c:1741

2491 +#: builtin/am.c:1789

2492 msgid "Commit Body is:"

2493 msgstr "Incheckningskroppen är:"

2494

@@ -2441,35 +2496,35 @@ msgstr "Incheckningskroppen är:"

2496 #. in your translation. The program will only accept English

2497 #. input at this point.

2498 #.

2444 -#: builtin/am.c:1751

2499 +#: builtin/am.c:1799

2500 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2501 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

2502

2448 -#: builtin/am.c:1801

2503 +#: builtin/am.c:1849

2504 #, c-format

2505 msgid "Dirty index: cannot apply patches (dirty: %s)"

2506 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

2507

2453 -#: builtin/am.c:1836 builtin/am.c:1907

2508 +#: builtin/am.c:1884 builtin/am.c:1955

2509 #, c-format

2510 msgid "Applying: %.*s"

2511 msgstr "Tillämpar: %.*s"

2512

2458 -#: builtin/am.c:1852

2513 +#: builtin/am.c:1900

2514 msgid "No changes -- Patch already applied."

2515 msgstr "Inga ändringar -- Patchen har redan tillämpats."

2516

2462 -#: builtin/am.c:1860

2517 +#: builtin/am.c:1908

2518 #, c-format

2519 msgid "Patch failed at %s %.*s"

2520 msgstr "Patch misslyckades på %s %.*s"

2521

2467 -#: builtin/am.c:1866

2522 +#: builtin/am.c:1914

2523 #, c-format

2524 msgid "The copy of the patch that failed is found in: %s"

2525 msgstr "En kopia av patchen som misslyckades finns i: %s"

2526

2472 -#: builtin/am.c:1910

2527 +#: builtin/am.c:1958

2528 msgid ""

2529 "No changes - did you forget to use 'git add'?\n"

2530 "If there is nothing left to stage, chances are that something else\n"

@@ -2479,7 +2534,7 @@ msgstr ""

2534 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

2535 "introducerat samma ändringar; kanske du bör hoppa över patchen."

2536

2482 -#: builtin/am.c:1917

2537 +#: builtin/am.c:1965

2538 msgid ""

2539 "You still have unmerged paths in your index.\n"

2540 "Did you forget to use 'git add'?"

@@ -2487,17 +2542,17 @@ msgstr ""

2542 "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"

2543 "Glömde du använda \"git add\"?"

2544

2490 -#: builtin/am.c:2025 builtin/am.c:2029 builtin/am.c:2041 builtin/reset.c:308

2545 +#: builtin/am.c:2073 builtin/am.c:2077 builtin/am.c:2089 builtin/reset.c:308

2546 #: builtin/reset.c:316

2547 #, c-format

2548 msgid "Could not parse object '%s'."

2549 msgstr "Kan inte tolka objektet \"%s\""

2550

2496 -#: builtin/am.c:2077

2551 +#: builtin/am.c:2125

2552 msgid "failed to clean index"

2553 msgstr "misslyckades städa upp indexet"

2554

2500 -#: builtin/am.c:2111

2555 +#: builtin/am.c:2159

2556 msgid ""

2557 "You seem to have moved HEAD since the last 'am' failure.\n"

2558 "Not rewinding to ORIG_HEAD"

@@ -2505,150 +2560,152 @@ msgstr ""

2560 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

2561 "Återställer inte till ORIG_HEAD"

2562

2508 -#: builtin/am.c:2172

2563 +#: builtin/am.c:2220

2564 #, c-format

2565 msgid "Invalid value for --patch-format: %s"

2566 msgstr "Felaktigt värde för --patch-format: %s"

2567

2513 -#: builtin/am.c:2194

2514 -msgid "git am [options] [(<mbox>|<Maildir>)...]"

2515 -msgstr "git am [flaggor] [(<mbox>|<Maildir>)...]"

2568 +#: builtin/am.c:2253

2569 +msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2570 +msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"

2571

2517 -#: builtin/am.c:2195

2518 -msgid "git am [options] (--continue | --skip | --abort)"

2519 -msgstr "git am [flaggor] (--continue | --skip | --abort)"

2572 +#: builtin/am.c:2254

2573 +msgid "git am [<options>] (--continue | --skip | --abort)"

2574 +msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

2575

2521 -#: builtin/am.c:2201

2576 +#: builtin/am.c:2260

2577 msgid "run interactively"

2578 msgstr "kör interaktivt"

2579

2525 -#: builtin/am.c:2203

2580 +#: builtin/am.c:2262

2581 msgid "historical option -- no-op"

2582 msgstr "historisk flagga -- no-op"

2583

2529 -#: builtin/am.c:2205

2584 +#: builtin/am.c:2264

2585 msgid "allow fall back on 3way merging if needed"

2586 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

2587

2533 -#: builtin/am.c:2206 builtin/init-db.c:509 builtin/prune-packed.c:57

2588 +#: builtin/am.c:2265 builtin/init-db.c:474 builtin/prune-packed.c:57

2589 #: builtin/repack.c:171

2590 msgid "be quiet"

2591 msgstr "var tyst"

2592

2538 -#: builtin/am.c:2208

2593 +#: builtin/am.c:2267

2594 msgid "add a Signed-off-by line to the commit message"

2595 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

2596

2542 -#: builtin/am.c:2211

2597 +#: builtin/am.c:2270

2598 msgid "recode into utf8 (default)"

2599 msgstr "koda om till utf8 (standard)"

2600

2546 -#: builtin/am.c:2213

2601 +#: builtin/am.c:2272

2602 msgid "pass -k flag to git-mailinfo"

2603 msgstr "sänd flaggan -k till git-mailinfo"

2604

2550 -#: builtin/am.c:2215

2605 +#: builtin/am.c:2274

2606 msgid "pass -b flag to git-mailinfo"

2607 msgstr "sänd flaggan -b till git-mailinfo"

2608

2554 -#: builtin/am.c:2217

2609 +#: builtin/am.c:2276

2610 msgid "pass -m flag to git-mailinfo"

2611 msgstr "sänd flaggan -m till git-mailinfo"

2612

2558 -#: builtin/am.c:2219

2613 +#: builtin/am.c:2278

2614 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

2615 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

2616

2562 -#: builtin/am.c:2222

2617 +#: builtin/am.c:2281

2618 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

2619 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

2620

2566 -#: builtin/am.c:2225

2621 +#: builtin/am.c:2284

2622 msgid "strip everything before a scissors line"

2623 msgstr "ta bort allting före en saxlinje"

2624

2570 -#: builtin/am.c:2226 builtin/apply.c:4563

2625 +#: builtin/am.c:2285 builtin/apply.c:4554

2626 msgid "action"

2627 msgstr "åtgärd"

2628

2574 -#: builtin/am.c:2227 builtin/am.c:2230 builtin/am.c:2233 builtin/am.c:2236

2575 -#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248

2576 -#: builtin/am.c:2254

2629 +#: builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292 builtin/am.c:2295

2630 +#: builtin/am.c:2298 builtin/am.c:2301 builtin/am.c:2304 builtin/am.c:2307

2631 +#: builtin/am.c:2313

2632 msgid "pass it through git-apply"

2633 msgstr "sänd det genom git-apply"

2634

2580 -#: builtin/am.c:2235 builtin/apply.c:4587

2635 +#: builtin/am.c:2294 builtin/apply.c:4578

2636 msgid "root"

2637 msgstr "rot"

2638

2584 -#: builtin/am.c:2238 builtin/am.c:2241 builtin/apply.c:4525

2585 -#: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93

2586 -#: builtin/pull.c:167

2639 +#: builtin/am.c:2297 builtin/am.c:2300 builtin/apply.c:4516

2640 +#: builtin/apply.c:4519 builtin/clone.c:85 builtin/fetch.c:93

2641 +#: builtin/pull.c:167 builtin/submodule--helper.c:78

2642 +#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

2643 msgid "path"

2644 msgstr "sökväg"

2645

2590 -#: builtin/am.c:2244 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672

2591 -#: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127

2592 -#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664

2593 -#: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132

2594 -#: parse-options.h:134 parse-options.h:243

2646 +#: builtin/am.c:2303 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2647 +#: builtin/grep.c:693 builtin/merge.c:198 builtin/pull.c:127

2648 +#: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:645

2649 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132

2650 +#: parse-options.h:134 parse-options.h:244

2651 msgid "n"

2652 msgstr "n"

2653

2598 -#: builtin/am.c:2247 builtin/apply.c:4531

2654 +#: builtin/am.c:2306 builtin/apply.c:4522

2655 msgid "num"

2656 msgstr "antal"

2657

2602 -#: builtin/am.c:2250 builtin/for-each-ref.c:34 builtin/replace.c:438

2658 +#: builtin/am.c:2309 builtin/for-each-ref.c:37 builtin/replace.c:438

2659 +#: builtin/tag.c:372

2660 msgid "format"

2661 msgstr "format"

2662

2606 -#: builtin/am.c:2251

2663 +#: builtin/am.c:2310

2664 msgid "format the patch(es) are in"

2665 msgstr "format för patch(ar)"

2666

2610 -#: builtin/am.c:2257

2667 +#: builtin/am.c:2316

2668 msgid "override error message when patch failure occurs"

2669 msgstr "överstyr felmeddelanden när patchfel uppstår"

2670

2614 -#: builtin/am.c:2259

2671 +#: builtin/am.c:2318

2672 msgid "continue applying patches after resolving a conflict"

2673 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

2674

2618 -#: builtin/am.c:2262

2675 +#: builtin/am.c:2321

2676 msgid "synonyms for --continue"

2677 msgstr "synonymer till --continue"

2678

2622 -#: builtin/am.c:2265

2679 +#: builtin/am.c:2324

2680 msgid "skip the current patch"

2681 msgstr "hoppa över den aktuella grenen"

2682

2626 -#: builtin/am.c:2268

2683 +#: builtin/am.c:2327

2684 msgid "restore the original branch and abort the patching operation."

2685 msgstr "återställ originalgrenen och avbryt patchningen."

2686

2630 -#: builtin/am.c:2272

2687 +#: builtin/am.c:2331

2688 msgid "lie about committer date"

2689 msgstr "ljug om incheckningsdatum"

2690

2634 -#: builtin/am.c:2274

2691 +#: builtin/am.c:2333

2692 msgid "use current timestamp for author date"

2693 msgstr "använd nuvarande tidsstämpel för författardatum"

2694

2638 -#: builtin/am.c:2276 builtin/commit.c:1590 builtin/merge.c:225

2639 -#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606

2695 +#: builtin/am.c:2335 builtin/commit.c:1593 builtin/merge.c:225

2696 +#: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:355

2697 msgid "key-id"

2698 msgstr "nyckel-id"

2699

2643 -#: builtin/am.c:2277

2700 +#: builtin/am.c:2336

2701 msgid "GPG-sign commits"

2702 msgstr "GPG-signera incheckningar"

2703

2647 -#: builtin/am.c:2280

2704 +#: builtin/am.c:2339

2705 msgid "(internal use for git-rebase)"

2706 msgstr "(används internt av git-rebase)"

2707

2651 -#: builtin/am.c:2295

2708 +#: builtin/am.c:2354

2709 msgid ""

2710 "The -b/--binary option has been a no-op for long time, and\n"

2711 "it will be removed. Please do not use it anymore."

@@ -2656,16 +2713,16 @@ msgstr ""

2713 "Flaggan -b/--binary har varit utan funktion länge, och\n"

2714 "kommer tas bort. Vi ber dig att inte använda den längre."

2715

2659 -#: builtin/am.c:2302

2716 +#: builtin/am.c:2361

2717 msgid "failed to read the index"

2718 msgstr "misslyckades läsa indexet"

2719

2663 -#: builtin/am.c:2317

2720 +#: builtin/am.c:2376

2721 #, c-format

2722 msgid "previous rebase directory %s still exists but mbox given."

2723 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

2724

2668 -#: builtin/am.c:2341

2725 +#: builtin/am.c:2400

2726 #, c-format

2727 msgid ""

2728 "Stray %s directory found.\n"

@@ -2674,7 +2731,7 @@ msgstr ""

2731 "Kvarbliven katalog %s hittades.\n"

2732 "Använd \"git am --abort\" för att ta bort den."

2733

2677 -#: builtin/am.c:2347

2734 +#: builtin/am.c:2406

2735 msgid "Resolve operation not in progress, we are not resuming."

2736 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

2737

@@ -2682,62 +2739,62 @@ msgstr "Lösningsoperation pågår inte, vi återupptar inte."

2739 msgid "git apply [<options>] [<patch>...]"

2740 msgstr "git apply [<flaggor>] [<patch>...]"

2741

2685 -#: builtin/apply.c:112

2742 +#: builtin/apply.c:111

2743 #, c-format

2744 msgid "unrecognized whitespace option '%s'"

2745 msgstr "okänt alternativ för whitespace: \"%s\""

2746

2690 -#: builtin/apply.c:127

2747 +#: builtin/apply.c:126

2748 #, c-format

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

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

2751

2695 -#: builtin/apply.c:822

2752 +#: builtin/apply.c:818

2753 #, c-format

2754 msgid "Cannot prepare timestamp regexp %s"

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

2756

2700 -#: builtin/apply.c:831

2757 +#: builtin/apply.c:827

2758 #, c-format

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

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

2761

2705 -#: builtin/apply.c:912

2762 +#: builtin/apply.c:908

2763 #, c-format

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

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

2766

2710 -#: builtin/apply.c:944

2767 +#: builtin/apply.c:940

2768 #, c-format

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

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

2771

2715 -#: builtin/apply.c:948

2772 +#: builtin/apply.c:944

2773 #, c-format

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

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

2776

2720 -#: builtin/apply.c:949

2777 +#: builtin/apply.c:945

2778 #, c-format

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

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

2781

2725 -#: builtin/apply.c:956

2782 +#: builtin/apply.c:952

2783 #, c-format

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

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

2786

2730 -#: builtin/apply.c:1419

2787 +#: builtin/apply.c:1415

2788 #, c-format

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

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

2791

2735 -#: builtin/apply.c:1476

2792 +#: builtin/apply.c:1472

2793 #, c-format

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

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

2796

2740 -#: builtin/apply.c:1493

2797 +#: builtin/apply.c:1489

2798 #, c-format

2799 msgid ""

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

@@ -2753,77 +2810,77 @@ msgstr[1] ""

2810 "sökvägskomponenter\n"

2811 "tas bort (rad %d)"

2812

2756 -#: builtin/apply.c:1659

2813 +#: builtin/apply.c:1655

2814 msgid "new file depends on old contents"

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

2816

2760 -#: builtin/apply.c:1661

2817 +#: builtin/apply.c:1657

2818 msgid "deleted file still has contents"

2819 msgstr "borttagen fil har fortfarande innehåll"

2820

2764 -#: builtin/apply.c:1687

2821 +#: builtin/apply.c:1683

2822 #, c-format

2823 msgid "corrupt patch at line %d"

2824 msgstr "trasig patch på rad %d"

2825

2769 -#: builtin/apply.c:1723

2826 +#: builtin/apply.c:1719

2827 #, c-format

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

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

2830

2774 -#: builtin/apply.c:1725

2831 +#: builtin/apply.c:1721

2832 #, c-format

2833 msgid "deleted file %s still has contents"

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

2835

2779 -#: builtin/apply.c:1728

2836 +#: builtin/apply.c:1724

2837 #, c-format

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

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

2840

2784 -#: builtin/apply.c:1874

2841 +#: builtin/apply.c:1870

2842 #, c-format

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

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

2845

2789 -#: builtin/apply.c:1903

2846 +#: builtin/apply.c:1899

2847 #, c-format

2848 msgid "unrecognized binary patch at line %d"

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

2850

2794 -#: builtin/apply.c:2054

2851 +#: builtin/apply.c:2050

2852 #, c-format

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

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

2855

2799 -#: builtin/apply.c:2144

2856 +#: builtin/apply.c:2140

2857 #, c-format

2858 msgid "unable to read symlink %s"

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

2860

2804 -#: builtin/apply.c:2148

2861 +#: builtin/apply.c:2144

2862 #, c-format

2863 msgid "unable to open or read %s"

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

2865

2809 -#: builtin/apply.c:2781

2866 +#: builtin/apply.c:2777

2867 #, c-format

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

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

2870

2814 -#: builtin/apply.c:2900

2871 +#: builtin/apply.c:2896

2872 #, c-format

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

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

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

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

2877

2821 -#: builtin/apply.c:2912

2878 +#: builtin/apply.c:2908

2879 #, c-format

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

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

2882

2826 -#: builtin/apply.c:2918

2883 +#: builtin/apply.c:2914

2884 #, c-format

2885 msgid ""

2886 "while searching for:\n"

@@ -2832,319 +2889,319 @@ msgstr ""

2889 "vid sökning efter:\n"

2890 "%.*s"

2891

2835 -#: builtin/apply.c:2938

2892 +#: builtin/apply.c:2934

2893 #, c-format

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

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

2896

2840 -#: builtin/apply.c:3039

2897 +#: builtin/apply.c:3035

2898 #, c-format

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

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

2901

2845 -#: builtin/apply.c:3045

2902 +#: builtin/apply.c:3041

2903 #, c-format

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

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

2906

2850 -#: builtin/apply.c:3066

2907 +#: builtin/apply.c:3062

2908 #, c-format

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

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

2911

2855 -#: builtin/apply.c:3190

2912 +#: builtin/apply.c:3186

2913 #, c-format

2914 msgid "cannot checkout %s"

2915 msgstr "kan inte checka ut %s"

2916

2860 -#: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291

2917 +#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

2918 #, c-format

2919 msgid "read of %s failed"

2920 msgstr "misslyckades läsa %s"

2921

2865 -#: builtin/apply.c:3243

2922 +#: builtin/apply.c:3239

2923 #, c-format

2924 msgid "reading from '%s' beyond a symbolic link"

2925 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"

2926

2870 -#: builtin/apply.c:3271 builtin/apply.c:3493

2927 +#: builtin/apply.c:3267 builtin/apply.c:3489

2928 #, c-format

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

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

2931

2875 -#: builtin/apply.c:3352 builtin/apply.c:3507

2932 +#: builtin/apply.c:3348 builtin/apply.c:3503

2933 #, c-format

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

2935 msgstr "%s: finns inte i indexet"

2936

2880 -#: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521

2937 +#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

2938 #, c-format

2939 msgid "%s: %s"

2940 msgstr "%s: %s"

2941

2885 -#: builtin/apply.c:3361 builtin/apply.c:3515

2942 +#: builtin/apply.c:3357 builtin/apply.c:3511

2943 #, c-format

2944 msgid "%s: does not match index"

2945 msgstr "%s: motsvarar inte indexet"

2946

2890 -#: builtin/apply.c:3463

2947 +#: builtin/apply.c:3459

2948 msgid "removal patch leaves file contents"

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

2950

2894 -#: builtin/apply.c:3532

2951 +#: builtin/apply.c:3528

2952 #, c-format

2953 msgid "%s: wrong type"

2954 msgstr "%s: fel typ"

2955

2899 -#: builtin/apply.c:3534

2956 +#: builtin/apply.c:3530

2957 #, c-format

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

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

2960

2904 -#: builtin/apply.c:3693 builtin/apply.c:3695

2961 +#: builtin/apply.c:3689 builtin/apply.c:3691

2962 #, c-format

2963 msgid "invalid path '%s'"

2964 msgstr "ogiltig sökväg: %s"

2965

2909 -#: builtin/apply.c:3750

2966 +#: builtin/apply.c:3746

2967 #, c-format

2968 msgid "%s: already exists in index"

2969 msgstr "%s: finns redan i indexet"

2970

2914 -#: builtin/apply.c:3753

2971 +#: builtin/apply.c:3749

2972 #, c-format

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

2974 msgstr "%s: finns redan i arbetskatalogen"

2975

2919 -#: builtin/apply.c:3773

2976 +#: builtin/apply.c:3769

2977 #, c-format

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

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

2980

2924 -#: builtin/apply.c:3778

2981 +#: builtin/apply.c:3774

2982 #, c-format

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

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

2985

2929 -#: builtin/apply.c:3798

2986 +#: builtin/apply.c:3794

2987 #, c-format

2988 msgid "affected file '%s' is beyond a symbolic link"

2989 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"

2990

2934 -#: builtin/apply.c:3802

2991 +#: builtin/apply.c:3798

2992 #, c-format

2993 msgid "%s: patch does not apply"

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

2995

2939 -#: builtin/apply.c:3816

2996 +#: builtin/apply.c:3812

2997 #, c-format

2998 msgid "Checking patch %s..."

2999 msgstr "Kontrollerar patchen %s..."

3000

2944 -#: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135

3001 +#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3002 #, c-format

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

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

3005

2949 -#: builtin/apply.c:4052

3006 +#: builtin/apply.c:4048

3007 #, c-format

3008 msgid "unable to remove %s from index"

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

3010

2954 -#: builtin/apply.c:4081

3011 +#: builtin/apply.c:4077

3012 #, c-format

3013 msgid "corrupt patch for submodule %s"

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

3015

2959 -#: builtin/apply.c:4085

3016 +#: builtin/apply.c:4081

3017 #, c-format

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

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

3020

2964 -#: builtin/apply.c:4090

3021 +#: builtin/apply.c:4086

3022 #, c-format

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

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

3025

2969 -#: builtin/apply.c:4093 builtin/apply.c:4201

3026 +#: builtin/apply.c:4089 builtin/apply.c:4197

3027 #, c-format

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

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

3030

2974 -#: builtin/apply.c:4126

3031 +#: builtin/apply.c:4122

3032 #, c-format

3033 msgid "closing file '%s'"

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

3035

2979 -#: builtin/apply.c:4175

3036 +#: builtin/apply.c:4171

3037 #, c-format

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

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

3040

2984 -#: builtin/apply.c:4262

3041 +#: builtin/apply.c:4258

3042 #, c-format

3043 msgid "Applied patch %s cleanly."

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

3045

2989 -#: builtin/apply.c:4270

3046 +#: builtin/apply.c:4266

3047 msgid "internal error"

3048 msgstr "internt fel"

3049

2993 -#: builtin/apply.c:4273

3050 +#: builtin/apply.c:4269

3051 #, c-format

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

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

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

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

3056

3000 -#: builtin/apply.c:4283

3057 +#: builtin/apply.c:4279

3058 #, c-format

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

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

3061

3005 -#: builtin/apply.c:4304

3062 +#: builtin/apply.c:4300

3063 #, c-format

3064 msgid "Hunk #%d applied cleanly."

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

3066

3010 -#: builtin/apply.c:4307

3067 +#: builtin/apply.c:4303

3068 #, c-format

3069 msgid "Rejected hunk #%d."

3070 msgstr "Refuserar stycke %d."

3071

3015 -#: builtin/apply.c:4397

3072 +#: builtin/apply.c:4393

3073 msgid "unrecognized input"

3074 msgstr "indata känns inte igen"

3075

3019 -#: builtin/apply.c:4408

3076 +#: builtin/apply.c:4404

3077 msgid "unable to read index file"

3078 msgstr "kan inte läsa indexfilen"

3079

3023 -#: builtin/apply.c:4526

3080 +#: builtin/apply.c:4517

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

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

3083

3027 -#: builtin/apply.c:4529

3084 +#: builtin/apply.c:4520

3085 msgid "apply changes matching the given path"

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

3087

3031 -#: builtin/apply.c:4532

3088 +#: builtin/apply.c:4523

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

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

3091

3035 -#: builtin/apply.c:4535

3092 +#: builtin/apply.c:4526

3093 msgid "ignore additions made by the patch"

3094 msgstr "ignorera tillägg gjorda av patchen"

3095

3039 -#: builtin/apply.c:4537

3096 +#: builtin/apply.c:4528

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

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

3099

3043 -#: builtin/apply.c:4541

3100 +#: builtin/apply.c:4532

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

3102 msgstr "visa antal tillagda och borttagna rader decimalt"

3103

3047 -#: builtin/apply.c:4543

3104 +#: builtin/apply.c:4534

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

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

3107

3051 -#: builtin/apply.c:4545

3108 +#: builtin/apply.c:4536

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

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

3111

3055 -#: builtin/apply.c:4547

3112 +#: builtin/apply.c:4538

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

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

3115

3059 -#: builtin/apply.c:4549

3116 +#: builtin/apply.c:4540

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

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

3119

3063 -#: builtin/apply.c:4551

3120 +#: builtin/apply.c:4542

3121 msgid "accept a patch that touches outside the working area"

3122 msgstr "godta en patch som rör filer utanför arbetskatalogen"

3123

3067 -#: builtin/apply.c:4553

3124 +#: builtin/apply.c:4544

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

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

3127

3071 -#: builtin/apply.c:4555

3128 +#: builtin/apply.c:4546

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

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

3131

3075 -#: builtin/apply.c:4557

3132 +#: builtin/apply.c:4548

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

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

3135

3079 -#: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412

3136 +#: builtin/apply.c:4550 builtin/checkout-index.c:198 builtin/ls-files.c:412

3137 msgid "paths are separated with NUL character"

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

3139

3083 -#: builtin/apply.c:4562

3140 +#: builtin/apply.c:4553

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

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

3143

3087 -#: builtin/apply.c:4564

3144 +#: builtin/apply.c:4555

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

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

3147

3091 -#: builtin/apply.c:4567 builtin/apply.c:4570

3148 +#: builtin/apply.c:4558 builtin/apply.c:4561

3149 msgid "ignore changes in whitespace when finding context"

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

3151

3095 -#: builtin/apply.c:4573

3152 +#: builtin/apply.c:4564

3153 msgid "apply the patch in reverse"

3154 msgstr "tillämpa patchen baklänges"

3155

3099 -#: builtin/apply.c:4575

3156 +#: builtin/apply.c:4566

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

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

3159

3103 -#: builtin/apply.c:4577

3160 +#: builtin/apply.c:4568

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

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

3163

3107 -#: builtin/apply.c:4579

3164 +#: builtin/apply.c:4570

3165 msgid "allow overlapping hunks"

3166 msgstr "tillåt överlappande stycken"

3167

3111 -#: builtin/apply.c:4582

3168 +#: builtin/apply.c:4573

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

3170 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

3171

3115 -#: builtin/apply.c:4585

3172 +#: builtin/apply.c:4576

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

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

3175

3119 -#: builtin/apply.c:4588

3176 +#: builtin/apply.c:4579

3177 msgid "prepend <root> to all filenames"

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

3179

3123 -#: builtin/apply.c:4610

3180 +#: builtin/apply.c:4601

3181 msgid "--3way outside a repository"

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

3183

3127 -#: builtin/apply.c:4618

3184 +#: builtin/apply.c:4609

3185 msgid "--index outside a repository"

3186 msgstr "--index utanför arkiv"

3187

3131 -#: builtin/apply.c:4621

3188 +#: builtin/apply.c:4612

3189 msgid "--cached outside a repository"

3190 msgstr "--cached utanför arkiv"

3191

3135 -#: builtin/apply.c:4640

3192 +#: builtin/apply.c:4631

3193 #, c-format

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

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

3196

3140 -#: builtin/apply.c:4654

3197 +#: builtin/apply.c:4645

3198 #, c-format

3199 msgid "squelched %d whitespace error"

3200 msgid_plural "squelched %d whitespace errors"

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

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

3203

3147 -#: builtin/apply.c:4660 builtin/apply.c:4670

3204 +#: builtin/apply.c:4651 builtin/apply.c:4661

3205 #, c-format

3206 msgid "%d line adds whitespace errors."

3207 msgid_plural "%d lines add whitespace errors."

@@ -3206,95 +3263,95 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

3263 msgid "<rev-opts> are documented in git-rev-list(1)"

3264 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

3265

3209 -#: builtin/blame.c:2500

3266 +#: builtin/blame.c:2519

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

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

3269

3213 -#: builtin/blame.c:2501

3270 +#: builtin/blame.c:2520

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

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

3273

3217 -#: builtin/blame.c:2502

3274 +#: builtin/blame.c:2521

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

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

3277

3221 -#: builtin/blame.c:2503

3278 +#: builtin/blame.c:2522

3279 msgid "Show work cost statistics"

3280 msgstr "Visa statistik över arbetskostnad"

3281

3225 -#: builtin/blame.c:2504

3282 +#: builtin/blame.c:2523

3283 msgid "Show output score for blame entries"

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

3285

3229 -#: builtin/blame.c:2505

3286 +#: builtin/blame.c:2524

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

3288 msgstr "Visa originalfilnamn (Standard: auto)"

3289

3233 -#: builtin/blame.c:2506

3290 +#: builtin/blame.c:2525

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

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

3293

3237 -#: builtin/blame.c:2507

3294 +#: builtin/blame.c:2526

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

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

3297

3241 -#: builtin/blame.c:2508

3298 +#: builtin/blame.c:2527

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

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

3301

3245 -#: builtin/blame.c:2509

3302 +#: builtin/blame.c:2528

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

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

3305

3249 -#: builtin/blame.c:2510

3306 +#: builtin/blame.c:2529

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

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

3309

3253 -#: builtin/blame.c:2511

3310 +#: builtin/blame.c:2530

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

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

3313

3257 -#: builtin/blame.c:2512

3314 +#: builtin/blame.c:2531

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

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

3317

3261 -#: builtin/blame.c:2513

3318 +#: builtin/blame.c:2532

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

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

3321

3265 -#: builtin/blame.c:2514

3322 +#: builtin/blame.c:2533

3323 msgid "Ignore whitespace differences"

3324 msgstr "Ignorera ändringar i blanksteg"

3325

3269 -#: builtin/blame.c:2515

3326 +#: builtin/blame.c:2534

3327 msgid "Spend extra cycles to find better match"

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

3329

3273 -#: builtin/blame.c:2516

3330 +#: builtin/blame.c:2535

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

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

3333

3277 -#: builtin/blame.c:2517

3334 +#: builtin/blame.c:2536

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

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

3337

3281 -#: builtin/blame.c:2518 builtin/blame.c:2519

3338 +#: builtin/blame.c:2537 builtin/blame.c:2538

3339 msgid "score"

3340 msgstr "poäng"

3341

3285 -#: builtin/blame.c:2518

3342 +#: builtin/blame.c:2537

3343 msgid "Find line copies within and across files"

3344 msgstr "Hitta kopierade rader inuti och mellan filer"

3345

3289 -#: builtin/blame.c:2519

3346 +#: builtin/blame.c:2538

3347 msgid "Find line movements within and across files"

3348 msgstr "Hitta flyttade rader inuti och mellan filer"

3349

3293 -#: builtin/blame.c:2520

3350 +#: builtin/blame.c:2539

3351 msgid "n,m"

3352 msgstr "n,m"

3353

3297 -#: builtin/blame.c:2520

3354 +#: builtin/blame.c:2539

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

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

3357

@@ -3304,27 +3361,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

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

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

3363 #. fewer display columns.

3307 -#: builtin/blame.c:2601

3364 +#: builtin/blame.c:2620

3365 msgid "4 years, 11 months ago"

3366 msgstr "4 år, 11 månader sedan"

3367

3311 -#: builtin/branch.c:24

3368 +#: builtin/branch.c:25

3369 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3370 msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"

3371

3315 -#: builtin/branch.c:25

3372 +#: builtin/branch.c:26

3373 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

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

3375

3319 -#: builtin/branch.c:26

3376 +#: builtin/branch.c:27

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

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

3379

3323 -#: builtin/branch.c:27

3380 +#: builtin/branch.c:28

3381 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

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

3383

3327 -#: builtin/branch.c:150

3384 +#: builtin/branch.c:29

3385 +msgid "git branch [<options>] [-r | -a] [--points-at]"

3386 +msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"

3387 +

3388 +#: builtin/branch.c:142

3389 #, c-format

3390 msgid ""

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

@@ -3333,7 +3394,7 @@ msgstr ""

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

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

3396

3336 -#: builtin/branch.c:154

3397 +#: builtin/branch.c:146

3398 #, c-format

3399 msgid ""

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

@@ -3342,12 +3403,12 @@ msgstr ""

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

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

3405

3345 -#: builtin/branch.c:168

3406 +#: builtin/branch.c:160

3407 #, c-format

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

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

3410

3350 -#: builtin/branch.c:172

3411 +#: builtin/branch.c:164

3412 #, c-format

3413 msgid ""

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

@@ -3356,348 +3417,340 @@ msgstr ""

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

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

3419

3359 -#: builtin/branch.c:185

3420 +#: builtin/branch.c:177

3421 msgid "Update of config-file failed"

3422 msgstr "Misslyckades uppdatera konfigurationsfil"

3423

3363 -#: builtin/branch.c:213

3424 +#: builtin/branch.c:205

3425 msgid "cannot use -a with -d"

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

3427

3367 -#: builtin/branch.c:219

3428 +#: builtin/branch.c:211

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

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

3431

3371 -#: builtin/branch.c:227

3432 +#: builtin/branch.c:219

3433 #, c-format

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

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

3436

3376 -#: builtin/branch.c:243

3437 +#: builtin/branch.c:235

3438 #, c-format

3439 msgid "remote-tracking branch '%s' not found."

3440 msgstr "fjärrspårande grenen \"%s\" hittades inte."

3441

3381 -#: builtin/branch.c:244

3442 +#: builtin/branch.c:236

3443 #, c-format

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

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

3446

3386 -#: builtin/branch.c:259

3447 +#: builtin/branch.c:251

3448 #, c-format

3449 msgid "Error deleting remote-tracking branch '%s'"

3450 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""

3451

3391 -#: builtin/branch.c:260

3452 +#: builtin/branch.c:252

3453 #, c-format

3454 msgid "Error deleting branch '%s'"

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

3456

3396 -#: builtin/branch.c:267

3457 +#: builtin/branch.c:259

3458 #, c-format

3459 msgid "Deleted remote-tracking branch %s (was %s).\n"

3460 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

3461

3401 -#: builtin/branch.c:268

3462 +#: builtin/branch.c:260

3463 #, c-format

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

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

3466

3406 -#: builtin/branch.c:369

3407 -#, c-format

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

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

3410 -

3411 -#: builtin/branch.c:452

3467 +#: builtin/branch.c:303

3468 #, c-format

3469 msgid "[%s: gone]"

3470 msgstr "[%s: försvunnen]"

3471

3416 -#: builtin/branch.c:457

3472 +#: builtin/branch.c:308

3473 #, c-format

3474 msgid "[%s]"

3475 msgstr "[%s]"

3476

3421 -#: builtin/branch.c:462

3477 +#: builtin/branch.c:313

3478 #, c-format

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

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

3481

3426 -#: builtin/branch.c:464

3482 +#: builtin/branch.c:315

3483 #, c-format

3484 msgid "[behind %d]"

3485 msgstr "[bakom %d] "

3486

3431 -#: builtin/branch.c:468

3487 +#: builtin/branch.c:319

3488 #, c-format

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

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

3491

3436 -#: builtin/branch.c:470

3492 +#: builtin/branch.c:321

3493 #, c-format

3494 msgid "[ahead %d]"

3495 msgstr "[före %d] "

3496

3441 -#: builtin/branch.c:473

3497 +#: builtin/branch.c:324

3498 #, c-format

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

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

3501

3446 -#: builtin/branch.c:476

3502 +#: builtin/branch.c:327

3503 #, c-format

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

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

3506

3451 -#: builtin/branch.c:489

3507 +#: builtin/branch.c:340

3508 msgid " **** invalid ref ****"

3509 msgstr " **** ogiltig ref ****"

3510

3455 -#: builtin/branch.c:580

3511 +#: builtin/branch.c:366

3512 #, c-format

3513 msgid "(no branch, rebasing %s)"

3514 msgstr "(ingen gren, ombaserar %s)"

3515

3460 -#: builtin/branch.c:583

3516 +#: builtin/branch.c:369

3517 #, c-format

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

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

3520

3465 -#: builtin/branch.c:589

3521 +#: builtin/branch.c:375

3522 #, c-format

3523 msgid "(HEAD detached at %s)"

3524 msgstr "(HEAD frånkopplat vid %s)"

3525

3470 -#: builtin/branch.c:592

3526 +#: builtin/branch.c:378

3527 #, c-format

3528 msgid "(HEAD detached from %s)"

3529 msgstr "(HEAD frånkopplat från %s)"

3530

3475 -#: builtin/branch.c:596

3531 +#: builtin/branch.c:382

3532 msgid "(no branch)"

3533 msgstr "(ingen gren)"

3534

3479 -#: builtin/branch.c:643

3480 -#, c-format

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

3482 -msgstr "objektet \"%s\" pekar på en incheckning"

3483 -

3484 -#: builtin/branch.c:691

3485 -msgid "some refs could not be read"

3486 -msgstr "vissa referenser kunde inte läsas"

3487 -

3488 -#: builtin/branch.c:704

3535 +#: builtin/branch.c:524

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

3537 msgstr ""

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

3539

3493 -#: builtin/branch.c:714

3540 +#: builtin/branch.c:534

3541 #, c-format

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

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

3544

3498 -#: builtin/branch.c:729

3545 +#: builtin/branch.c:549

3546 msgid "Branch rename failed"

3547 msgstr "Misslyckades byta namn på gren"

3548

3502 -#: builtin/branch.c:733

3549 +#: builtin/branch.c:553

3550 #, c-format

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

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

3553

3507 -#: builtin/branch.c:737

3554 +#: builtin/branch.c:557

3555 #, c-format

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

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

3558

3512 -#: builtin/branch.c:744

3559 +#: builtin/branch.c:564

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

3561 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

3562

3516 -#: builtin/branch.c:759

3517 -#, c-format

3518 -msgid "malformed object name %s"

3519 -msgstr "felformat objektnamn %s"

3520 -

3521 -#: builtin/branch.c:781

3563 +#: builtin/branch.c:587

3564 #, c-format

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

3566 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

3567

3526 -#: builtin/branch.c:811

3568 +#: builtin/branch.c:616

3569 msgid "Generic options"

3570 msgstr "Allmänna flaggor"

3571

3530 -#: builtin/branch.c:813

3572 +#: builtin/branch.c:618

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

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

3575

3534 -#: builtin/branch.c:814

3576 +#: builtin/branch.c:619

3577 msgid "suppress informational messages"

3578 msgstr "undertryck informationsmeddelanden"

3579

3538 -#: builtin/branch.c:815

3580 +#: builtin/branch.c:620

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

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

3583

3542 -#: builtin/branch.c:817

3584 +#: builtin/branch.c:622

3585 msgid "change upstream info"

3586 msgstr "ändra uppströmsinformation"

3587

3546 -#: builtin/branch.c:821

3588 +#: builtin/branch.c:626

3589 msgid "use colored output"

3590 msgstr "använd färgad utdata"

3591

3550 -#: builtin/branch.c:822

3592 +#: builtin/branch.c:627

3593 msgid "act on remote-tracking branches"

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

3595

3554 -#: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852

3555 -#: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581

3556 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618

3557 -#: builtin/tag.c:624

3558 -msgid "commit"

3559 -msgstr "incheckning"

3560 -

3561 -#: builtin/branch.c:826 builtin/branch.c:832

3596 +#: builtin/branch.c:629 builtin/branch.c:630

3597 msgid "print only branches that contain the commit"

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

3599

3565 -#: builtin/branch.c:838

3600 +#: builtin/branch.c:633

3601 msgid "Specific git-branch actions:"

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

3603

3569 -#: builtin/branch.c:839

3604 +#: builtin/branch.c:634

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

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

3607

3573 -#: builtin/branch.c:841

3608 +#: builtin/branch.c:636

3609 msgid "delete fully merged branch"

3610 msgstr "ta bort helt sammanslagen gren"

3611

3577 -#: builtin/branch.c:842

3612 +#: builtin/branch.c:637

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

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

3615

3581 -#: builtin/branch.c:843

3616 +#: builtin/branch.c:638

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

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

3619

3585 -#: builtin/branch.c:844

3620 +#: builtin/branch.c:639

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

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

3623

3589 -#: builtin/branch.c:845

3624 +#: builtin/branch.c:640

3625 msgid "list branch names"

3626 msgstr "lista namn på grenar"

3627

3593 -#: builtin/branch.c:846

3628 +#: builtin/branch.c:641

3629 msgid "create the branch's reflog"

3630 msgstr "skapa grenens reflogg"

3631

3597 -#: builtin/branch.c:848

3632 +#: builtin/branch.c:643

3633 msgid "edit the description for the branch"

3634 msgstr "redigera beskrivning för grenen"

3635

3601 -#: builtin/branch.c:849

3636 +#: builtin/branch.c:644

3637 msgid "force creation, move/rename, deletion"

3638 msgstr "tvinga skapande, flytt/namnändring, borttagande"

3639

3605 -#: builtin/branch.c:852

3606 -msgid "print only not merged branches"

3607 -msgstr "visa endast ej sammanslagna grenar"

3608 -

3609 -#: builtin/branch.c:858

3610 -msgid "print only merged branches"

3640 +#: builtin/branch.c:645

3641 +msgid "print only branches that are merged"

3642 msgstr "visa endast sammanslagna grenar"

3643

3613 -#: builtin/branch.c:862

3644 +#: builtin/branch.c:646

3645 +msgid "print only branches that are not merged"

3646 +msgstr "visa endast ej sammanslagna grenar"

3647 +

3648 +#: builtin/branch.c:647

3649 msgid "list branches in columns"

3650 msgstr "visa grenar i spalter"

3651

3617 -#: builtin/branch.c:875

3652 +#: builtin/branch.c:648 builtin/for-each-ref.c:38 builtin/tag.c:366

3653 +msgid "key"

3654 +msgstr "nyckel"

3655 +

3656 +#: builtin/branch.c:649 builtin/for-each-ref.c:39 builtin/tag.c:367

3657 +msgid "field name to sort on"

3658 +msgstr "fältnamn att sortera på"

3659 +

3660 +#: builtin/branch.c:651 builtin/for-each-ref.c:41 builtin/notes.c:398

3661 +#: builtin/notes.c:401 builtin/notes.c:561 builtin/notes.c:564

3662 +#: builtin/tag.c:369

3663 +msgid "object"

3664 +msgstr "objekt"

3665 +

3666 +#: builtin/branch.c:652

3667 +msgid "print only branches of the object"

3668 +msgstr "visa endast grenar för objektet"

3669 +

3670 +#: builtin/branch.c:670

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

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

3673

3621 -#: builtin/branch.c:879 builtin/clone.c:690

3674 +#: builtin/branch.c:674 builtin/clone.c:697

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

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

3677

3625 -#: builtin/branch.c:901

3678 +#: builtin/branch.c:694

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

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

3681

3629 -#: builtin/branch.c:912 builtin/branch.c:951

3682 +#: builtin/branch.c:705 builtin/branch.c:747

3683 msgid "branch name required"

3684 msgstr "grennamn krävs"

3685

3633 -#: builtin/branch.c:927

3686 +#: builtin/branch.c:723

3687 msgid "Cannot give description to detached HEAD"

3688 msgstr "Kan inte beskriva frånkopplad HEAD"

3689

3637 -#: builtin/branch.c:932

3690 +#: builtin/branch.c:728

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

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

3693

3641 -#: builtin/branch.c:939

3694 +#: builtin/branch.c:735

3695 #, c-format

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

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

3698

3646 -#: builtin/branch.c:942

3699 +#: builtin/branch.c:738

3700 #, c-format

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

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

3703

3651 -#: builtin/branch.c:957

3704 +#: builtin/branch.c:753

3705 msgid "too many branches for a rename operation"

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

3707

3655 -#: builtin/branch.c:962

3708 +#: builtin/branch.c:758

3709 msgid "too many branches to set new upstream"

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

3711

3659 -#: builtin/branch.c:966

3712 +#: builtin/branch.c:762

3713 #, c-format

3714 msgid ""

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

3716 msgstr ""

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

3718

3666 -#: builtin/branch.c:969 builtin/branch.c:991 builtin/branch.c:1012

3719 +#: builtin/branch.c:765 builtin/branch.c:787 builtin/branch.c:808

3720 #, c-format

3721 msgid "no such branch '%s'"

3722 msgstr "okänd gren \"%s\""

3723

3671 -#: builtin/branch.c:973

3724 +#: builtin/branch.c:769

3725 #, c-format

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

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

3728

3676 -#: builtin/branch.c:985

3729 +#: builtin/branch.c:781

3730 msgid "too many branches to unset upstream"

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

3732

3680 -#: builtin/branch.c:989

3733 +#: builtin/branch.c:785

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

3735 msgstr ""

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

3737

3685 -#: builtin/branch.c:995

3738 +#: builtin/branch.c:791

3739 #, c-format

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

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

3742

3690 -#: builtin/branch.c:1009

3743 +#: builtin/branch.c:805

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

3745 msgstr "kan inte skapa \"HEAD\" manuellt"

3746

3694 -#: builtin/branch.c:1015

3747 +#: builtin/branch.c:811

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

3749 msgstr ""

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

3751 "grennamn"

3752

3700 -#: builtin/branch.c:1018

3753 +#: builtin/branch.c:814

3754 #, c-format

3755 msgid ""

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

@@ -3706,7 +3759,7 @@ msgstr ""

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

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

3761

3709 -#: builtin/branch.c:1035

3762 +#: builtin/branch.c:831

3763 #, c-format

3764 msgid ""

3765 "\n"

@@ -3717,12 +3770,12 @@ msgstr ""

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

3771 "\n"

3772

3720 -#: builtin/branch.c:1036

3773 +#: builtin/branch.c:832

3774 #, c-format

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

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

3777

3725 -#: builtin/branch.c:1037

3778 +#: builtin/branch.c:833

3779 #, c-format

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

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

@@ -3749,11 +3802,8 @@ msgstr ""

3802 "<typ>|--textconv) <objekt>"

3803

3804 #: builtin/cat-file.c:429

3752 -msgid ""

3753 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-"

3754 -"objects>"

3755 -msgstr ""

3756 -"git cat-file (--batch | --batch-check) [--follow-symlinks] < <objektlista>"

3805 +msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3806 +msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

3807

3808 #: builtin/cat-file.c:466

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

@@ -3809,8 +3859,8 @@ msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."

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

3860

3861 #: builtin/check-attr.c:12

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

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

3862 +msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"

3863 +msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"

3864

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

3866 msgid "report all attributes set on file"

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

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

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

3880

3831 -#: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267

3881 +#: builtin/check-ignore.c:18 builtin/checkout.c:1134 builtin/gc.c:325

3882 msgid "suppress progress reporting"

3883 msgstr "undertryck förloppsrapportering"

3884

@@ -3914,6 +3964,8 @@ msgid "write the content to temporary files"

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

3965

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

3967 +#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

3968 +#: builtin/submodule--helper.c:178 builtin/submodule--helper.c:181

3969 msgid "string"

3970 msgstr "sträng"

3971

@@ -3933,105 +3985,105 @@ msgstr "git checkout [<flaggor>] <gren>"

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

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

3987

3936 -#: builtin/checkout.c:133 builtin/checkout.c:166

3988 +#: builtin/checkout.c:134 builtin/checkout.c:167

3989 #, c-format

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

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

3992

3941 -#: builtin/checkout.c:135 builtin/checkout.c:168

3993 +#: builtin/checkout.c:136 builtin/checkout.c:169

3994 #, c-format

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

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

3997

3946 -#: builtin/checkout.c:151

3998 +#: builtin/checkout.c:152

3999 #, c-format

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

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

4002

3951 -#: builtin/checkout.c:195

4003 +#: builtin/checkout.c:196

4004 #, c-format

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

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

4007

3956 -#: builtin/checkout.c:212

4008 +#: builtin/checkout.c:213

4009 #, c-format

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

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

4012

3961 -#: builtin/checkout.c:229

4013 +#: builtin/checkout.c:230

4014 #, c-format

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

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

4017

3966 -#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

3967 -#: builtin/checkout.c:259

4018 +#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4019 +#: builtin/checkout.c:260

4020 #, c-format

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

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

4023

3972 -#: builtin/checkout.c:262 builtin/checkout.c:265

4024 +#: builtin/checkout.c:263 builtin/checkout.c:266

4025 #, c-format

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

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

4028

3977 -#: builtin/checkout.c:268

4029 +#: builtin/checkout.c:269

4030 #, c-format

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

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

4033

3982 -#: builtin/checkout.c:279 builtin/checkout.c:473

4034 +#: builtin/checkout.c:280 builtin/checkout.c:474

4035 msgid "corrupt index file"

4036 msgstr "indexfilen är trasig"

4037

3986 -#: builtin/checkout.c:339 builtin/checkout.c:346

4038 +#: builtin/checkout.c:340 builtin/checkout.c:347

4039 #, c-format

4040 msgid "path '%s' is unmerged"

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

4042

3991 -#: builtin/checkout.c:495

4043 +#: builtin/checkout.c:496

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

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

4046

3995 -#: builtin/checkout.c:622

4047 +#: builtin/checkout.c:623

4048 #, c-format

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

4050 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

4051

4000 -#: builtin/checkout.c:660

4052 +#: builtin/checkout.c:661

4053 msgid "HEAD is now at"

4054 msgstr "HEAD är nu på"

4055

4004 -#: builtin/checkout.c:667

4056 +#: builtin/checkout.c:668

4057 #, c-format

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

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

4060

4009 -#: builtin/checkout.c:670

4061 +#: builtin/checkout.c:671

4062 #, c-format

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

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

4065

4014 -#: builtin/checkout.c:674

4066 +#: builtin/checkout.c:675

4067 #, c-format

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

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

4070

4019 -#: builtin/checkout.c:676 builtin/checkout.c:1065

4071 +#: builtin/checkout.c:677 builtin/checkout.c:1066

4072 #, c-format

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

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

4075

4024 -#: builtin/checkout.c:678

4076 +#: builtin/checkout.c:679

4077 #, c-format

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

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

4080

4029 -#: builtin/checkout.c:730

4081 +#: builtin/checkout.c:731

4082 #, c-format

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

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

4085

4034 -#: builtin/checkout.c:736

4086 +#: builtin/checkout.c:737

4087 #, c-format

4088 msgid ""

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

@@ -4054,7 +4106,7 @@ msgstr[1] ""

4106 "\n"

4107 "%s\n"

4108

4057 -#: builtin/checkout.c:755

4109 +#: builtin/checkout.c:756

4110 #, c-format

4111 msgid ""

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

@@ -4081,145 +4133,151 @@ msgstr[1] ""

4133 " git branch <nytt_grennamn> %s\n"

4134 "\n"

4135

4084 -#: builtin/checkout.c:791

4136 +#: builtin/checkout.c:792

4137 msgid "internal error in revision walk"

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

4139

4088 -#: builtin/checkout.c:795

4140 +#: builtin/checkout.c:796

4141 msgid "Previous HEAD position was"

4142 msgstr "Tidigare position för HEAD var"

4143

4092 -#: builtin/checkout.c:822 builtin/checkout.c:1060

4144 +#: builtin/checkout.c:823 builtin/checkout.c:1061

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

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

4147

4096 -#: builtin/checkout.c:967

4148 +#: builtin/checkout.c:968

4149 #, c-format

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

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

4152

4101 -#: builtin/checkout.c:1006 builtin/worktree.c:210

4153 +#: builtin/checkout.c:1007 builtin/worktree.c:213

4154 #, c-format

4155 msgid "invalid reference: %s"

4156 msgstr "felaktig referens: %s"

4157

4106 -#: builtin/checkout.c:1035

4158 +#: builtin/checkout.c:1036

4159 #, c-format

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

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

4162

4111 -#: builtin/checkout.c:1074

4163 +#: builtin/checkout.c:1075

4164 msgid "paths cannot be used with switching branches"

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

4166

4115 -#: builtin/checkout.c:1077 builtin/checkout.c:1081

4167 +#: builtin/checkout.c:1078 builtin/checkout.c:1082

4168 #, c-format

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

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

4171

4120 -#: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093

4121 -#: builtin/checkout.c:1096

4172 +#: builtin/checkout.c:1086 builtin/checkout.c:1089 builtin/checkout.c:1094

4173 +#: builtin/checkout.c:1097

4174 #, c-format

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

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

4177

4126 -#: builtin/checkout.c:1101

4178 +#: builtin/checkout.c:1102

4179 #, c-format

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

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

4182

4131 -#: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83

4132 -#: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317

4133 -#: builtin/worktree.c:319

4183 +#: builtin/checkout.c:1135 builtin/checkout.c:1137 builtin/clone.c:83

4184 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:320

4185 +#: builtin/worktree.c:322

4186 msgid "branch"

4187 msgstr "gren"

4188

4137 -#: builtin/checkout.c:1135

4189 +#: builtin/checkout.c:1136

4190 msgid "create and checkout a new branch"

4191 msgstr "skapa och checka ut en ny gren"

4192

4141 -#: builtin/checkout.c:1137

4193 +#: builtin/checkout.c:1138

4194 msgid "create/reset and checkout a branch"

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

4196

4145 -#: builtin/checkout.c:1138

4197 +#: builtin/checkout.c:1139

4198 msgid "create reflog for new branch"

4199 msgstr "skapa reflogg för ny gren"

4200

4149 -#: builtin/checkout.c:1139

4201 +#: builtin/checkout.c:1140

4202 msgid "detach the HEAD at named commit"

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

4204

4153 -#: builtin/checkout.c:1140

4205 +#: builtin/checkout.c:1141

4206 msgid "set upstream info for new branch"

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

4208

4157 -#: builtin/checkout.c:1142

4209 +#: builtin/checkout.c:1143

4210 msgid "new-branch"

4211 msgstr "ny-gren"

4212

4161 -#: builtin/checkout.c:1142

4213 +#: builtin/checkout.c:1143

4214 msgid "new unparented branch"

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

4216

4165 -#: builtin/checkout.c:1143

4217 +#: builtin/checkout.c:1144

4218 msgid "checkout our version for unmerged files"

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

4220

4169 -#: builtin/checkout.c:1145

4221 +#: builtin/checkout.c:1146

4222 msgid "checkout their version for unmerged files"

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

4224

4173 -#: builtin/checkout.c:1147

4225 +#: builtin/checkout.c:1148

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

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

4228

4177 -#: builtin/checkout.c:1148

4229 +#: builtin/checkout.c:1149

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

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

4232

4181 -#: builtin/checkout.c:1149 builtin/merge.c:227

4233 +#: builtin/checkout.c:1150 builtin/merge.c:227

4234 msgid "update ignored files (default)"

4235 msgstr "uppdatera ignorerade filer (standard)"

4236

4185 -#: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249

4237 +#: builtin/checkout.c:1151 builtin/log.c:1263 parse-options.h:250

4238 msgid "style"

4239 msgstr "stil"

4240

4189 -#: builtin/checkout.c:1151

4241 +#: builtin/checkout.c:1152

4242 msgid "conflict style (merge or diff3)"

4243 msgstr "konfliktstil (merge eller diff3)"

4244

4193 -#: builtin/checkout.c:1154

4245 +#: builtin/checkout.c:1155

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

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

4248

4197 -#: builtin/checkout.c:1156

4249 +#: builtin/checkout.c:1157

4250 msgid "second guess 'git checkout <no-such-branch>'"

4251 msgstr "förutspå \"git checkout <gren-saknas>\""

4252

4201 -#: builtin/checkout.c:1158

4253 +#: builtin/checkout.c:1159

4254 msgid "do not check if another worktree is holding the given ref"

4255 msgstr ""

4256 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

4257

4206 -#: builtin/checkout.c:1181

4258 +#: builtin/checkout.c:1160 builtin/clone.c:57 builtin/fetch.c:112

4259 +#: builtin/merge.c:224 builtin/pull.c:109 builtin/push.c:560

4260 +#: builtin/send-pack.c:168

4261 +msgid "force progress reporting"

4262 +msgstr "tvinga förloppsrapportering"

4263 +

4264 +#: builtin/checkout.c:1191

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

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

4267

4210 -#: builtin/checkout.c:1198

4268 +#: builtin/checkout.c:1208

4269 msgid "--track needs a branch name"

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

4271

4214 -#: builtin/checkout.c:1203

4272 +#: builtin/checkout.c:1213

4273 msgid "Missing branch name; try -b"

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

4275

4218 -#: builtin/checkout.c:1239

4276 +#: builtin/checkout.c:1249

4277 msgid "invalid path specification"

4278 msgstr "felaktig sökvägsangivelse"

4279

4222 -#: builtin/checkout.c:1246

4280 +#: builtin/checkout.c:1256

4281 #, c-format

4282 msgid ""

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

@@ -4228,12 +4286,12 @@ msgstr ""

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

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

4288

4231 -#: builtin/checkout.c:1251

4289 +#: builtin/checkout.c:1261

4290 #, c-format

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

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

4293

4236 -#: builtin/checkout.c:1255

4294 +#: builtin/checkout.c:1265

4295 msgid ""

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

4297 "checking out of the index."

@@ -4273,7 +4331,7 @@ msgstr "Skulle hoppa över arkivet %s\n"

4331 msgid "failed to remove %s"

4332 msgstr "misslyckades ta bort %s"

4333

4276 -#: builtin/clean.c:317

4334 +#: builtin/clean.c:315

4335 msgid ""

4336 "Prompt help:\n"

4337 "1 - select a numbered item\n"

@@ -4285,7 +4343,7 @@ msgstr ""

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

4344 " - (tomt) markera ingenting"

4345

4288 -#: builtin/clean.c:321

4346 +#: builtin/clean.c:319

4347 msgid ""

4348 "Prompt help:\n"

4349 "1 - select a single item\n"

@@ -4305,36 +4363,36 @@ msgstr ""

4363 "* - välj alla poster\n"

4364 " - (tomt) avsluta markering"

4365

4308 -#: builtin/clean.c:537

4366 +#: builtin/clean.c:535

4367 #, c-format

4368 msgid "Huh (%s)?"

4369 msgstr "Vadå (%s)?"

4370

4313 -#: builtin/clean.c:679

4371 +#: builtin/clean.c:677

4372 #, c-format

4373 msgid "Input ignore patterns>> "

4374 msgstr "Ange ignoreringsmönster>>"

4375

4318 -#: builtin/clean.c:716

4376 +#: builtin/clean.c:714

4377 #, c-format

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

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

4380

4323 -#: builtin/clean.c:737

4381 +#: builtin/clean.c:735

4382 msgid "Select items to delete"

4383 msgstr "Välj poster att ta bort"

4384

4385 #. TRANSLATORS: Make sure to keep [y/N] as is

4328 -#: builtin/clean.c:778

4386 +#: builtin/clean.c:776

4387 #, c-format

4388 msgid "Remove %s [y/N]? "

4389 msgstr "Ta bort %s [Y=ja / N=nej]?"

4390

4333 -#: builtin/clean.c:803

4391 +#: builtin/clean.c:801

4392 msgid "Bye."

4393 msgstr "Hej då."

4394

4337 -#: builtin/clean.c:811

4395 +#: builtin/clean.c:809

4396 msgid ""

4397 "clean - start cleaning\n"

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

@@ -4352,62 +4410,62 @@ msgstr ""

4410 "help - denna skärm\n"

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

4412

4355 -#: builtin/clean.c:838

4413 +#: builtin/clean.c:836

4414 msgid "*** Commands ***"

4415 msgstr "*** Kommandon ***"

4416

4359 -#: builtin/clean.c:839

4417 +#: builtin/clean.c:837

4418 msgid "What now"

4419 msgstr "Vad nu"

4420

4363 -#: builtin/clean.c:847

4421 +#: builtin/clean.c:845

4422 msgid "Would remove the following item:"

4423 msgid_plural "Would remove the following items:"

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

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

4426

4369 -#: builtin/clean.c:864

4427 +#: builtin/clean.c:862

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

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

4430

4373 -#: builtin/clean.c:895

4431 +#: builtin/clean.c:893

4432 msgid "do not print names of files removed"

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

4434

4377 -#: builtin/clean.c:897

4435 +#: builtin/clean.c:895

4436 msgid "force"

4437 msgstr "tvinga"

4438

4381 -#: builtin/clean.c:898

4439 +#: builtin/clean.c:896

4440 msgid "interactive cleaning"

4441 msgstr "städa interaktivt"

4442

4385 -#: builtin/clean.c:900

4443 +#: builtin/clean.c:898

4444 msgid "remove whole directories"

4445 msgstr "ta bort hela kataloger"

4446

4389 -#: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714

4390 -#: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187

4447 +#: builtin/clean.c:899 builtin/describe.c:407 builtin/grep.c:709

4448 +#: builtin/ls-files.c:443 builtin/name-rev.c:307 builtin/show-ref.c:182

4449 msgid "pattern"

4450 msgstr "mönster"

4451

4394 -#: builtin/clean.c:902

4452 +#: builtin/clean.c:900

4453 msgid "add <pattern> to ignore rules"

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

4455

4398 -#: builtin/clean.c:903

4456 +#: builtin/clean.c:901

4457 msgid "remove ignored files, too"

4458 msgstr "ta även bort ignorerade filer"

4459

4402 -#: builtin/clean.c:905

4460 +#: builtin/clean.c:903

4461 msgid "remove only ignored files"

4462 msgstr "ta endast bort ignorerade filer"

4463

4406 -#: builtin/clean.c:923

4464 +#: builtin/clean.c:921

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

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

4467

4410 -#: builtin/clean.c:927

4468 +#: builtin/clean.c:925

4469 msgid ""

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

4471 "clean"

@@ -4415,7 +4473,7 @@ msgstr ""

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

4474 "städa"

4475

4418 -#: builtin/clean.c:930

4476 +#: builtin/clean.c:928

4477 msgid ""

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

4479 "refusing to clean"

@@ -4427,16 +4485,11 @@ msgstr ""

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

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

4487

4430 -#: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224

4431 -#: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168

4432 -msgid "force progress reporting"

4433 -msgstr "tvinga förloppsrapportering"

4434 -

4488 #: builtin/clone.c:59

4489 msgid "don't create a checkout"

4490 msgstr "skapa inte någon utcheckning"

4491

4439 -#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504

4492 +#: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:469

4493 msgid "create a bare repository"

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

4495

@@ -4460,15 +4513,15 @@ msgstr "skapa som ett delat arkiv"

4513 msgid "initialize submodules in the clone"

4514 msgstr "initiera undermoduler i klonen"

4515

4463 -#: builtin/clone.c:75 builtin/init-db.c:501

4516 +#: builtin/clone.c:75 builtin/init-db.c:466

4517 msgid "template-directory"

4518 msgstr "mallkatalog"

4519

4467 -#: builtin/clone.c:76 builtin/init-db.c:502

4520 +#: builtin/clone.c:76 builtin/init-db.c:467

4521 msgid "directory from which templates will be used"

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

4523

4471 -#: builtin/clone.c:78

4524 +#: builtin/clone.c:78 builtin/submodule--helper.c:179

4525 msgid "reference repository"

4526 msgstr "referensarkiv"

4527

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

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

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

4547

4495 -#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659

4548 +#: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:654

4549 #: builtin/pull.c:186

4550 msgid "depth"

4551 msgstr "djup"

@@ -4505,11 +4558,11 @@ msgstr "skapa en grund klon på detta djup"

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

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

4560

4508 -#: builtin/clone.c:91 builtin/init-db.c:510

4561 +#: builtin/clone.c:91 builtin/init-db.c:475

4562 msgid "gitdir"

4563 msgstr "gitkat"

4564

4512 -#: builtin/clone.c:92 builtin/init-db.c:511

4565 +#: builtin/clone.c:92 builtin/init-db.c:476

4566 msgid "separate git dir from working tree"

4567 msgstr "separera gitkatalogen från arbetskatalogen"

4568

@@ -4521,52 +4574,57 @@ msgstr "nyckel=värde"

4574 msgid "set config inside the new repository"

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

4576

4524 -#: builtin/clone.c:298

4577 +#: builtin/clone.c:300

4578 +#, c-format

4579 +msgid "reference repository '%s' as a linked checkout is not supported yet."

4580 +msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

4581 +

4582 +#: builtin/clone.c:302

4583 #, c-format

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

4585 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

4586

4529 -#: builtin/clone.c:302

4587 +#: builtin/clone.c:307

4588 #, c-format

4589 msgid "reference repository '%s' is shallow"

4590 msgstr "referensarkivet \"%s\" är grunt"

4591

4534 -#: builtin/clone.c:305

4592 +#: builtin/clone.c:310

4593 #, c-format

4594 msgid "reference repository '%s' is grafted"

4595 msgstr "referensarkivet \"%s\" är ympat"

4596

4539 -#: builtin/clone.c:370 builtin/diff.c:84

4597 +#: builtin/clone.c:375 builtin/diff.c:84

4598 #, c-format

4599 msgid "failed to stat '%s'"

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

4601

4544 -#: builtin/clone.c:372

4602 +#: builtin/clone.c:377

4603 #, c-format

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

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

4606

4549 -#: builtin/clone.c:386

4607 +#: builtin/clone.c:391

4608 #, c-format

4609 msgid "failed to stat %s\n"

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

4611

4554 -#: builtin/clone.c:408

4612 +#: builtin/clone.c:413

4613 #, c-format

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

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

4616

4559 -#: builtin/clone.c:412

4617 +#: builtin/clone.c:417

4618 #, c-format

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

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

4621

4564 -#: builtin/clone.c:435 builtin/clone.c:619

4622 +#: builtin/clone.c:442 builtin/clone.c:626

4623 #, c-format

4624 msgid "done.\n"

4625 msgstr "klart.\n"

4626

4569 -#: builtin/clone.c:447

4627 +#: builtin/clone.c:454

4628 msgid ""

4629 "Clone succeeded, but checkout failed.\n"

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

@@ -4576,124 +4634,120 @@ msgstr ""

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

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

4636

4579 -#: builtin/clone.c:524

4637 +#: builtin/clone.c:531

4638 #, c-format

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

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

4641

4642 # Vague original, not networking-related, but rather related to the actual

4643 # objects downloaded.

4586 -#: builtin/clone.c:614

4644 +#: builtin/clone.c:621

4645 #, c-format

4646 msgid "Checking connectivity... "

4647 msgstr "Kontrollerar om vi fick alla objekt..."

4648

4591 -#: builtin/clone.c:617

4649 +#: builtin/clone.c:624

4650 msgid "remote did not send all necessary objects"

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

4652

4595 -#: builtin/clone.c:681

4653 +#: builtin/clone.c:688

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

4655 msgstr ""

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

4657

4600 -#: builtin/clone.c:712

4658 +#: builtin/clone.c:719

4659 msgid "unable to checkout working tree"

4660 msgstr "kunde inte checka ut arbetskatalogen"

4661

4604 -#: builtin/clone.c:799

4662 +#: builtin/clone.c:808

4663 msgid "cannot repack to clean up"

4664 msgstr "kan inte packa om för att städa upp"

4665

4608 -#: builtin/clone.c:801

4666 +#: builtin/clone.c:810

4667 msgid "cannot unlink temporary alternates file"

4668 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

4669

4612 -#: builtin/clone.c:831

4670 +#: builtin/clone.c:842

4671 msgid "Too many arguments."

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

4673

4616 -#: builtin/clone.c:835

4674 +#: builtin/clone.c:846

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

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

4677

4620 -#: builtin/clone.c:846

4678 +#: builtin/clone.c:857

4679 #, c-format

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

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

4682

4625 -#: builtin/clone.c:849

4683 +#: builtin/clone.c:860

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

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

4686

4629 -#: builtin/clone.c:862

4687 +#: builtin/clone.c:873

4688 #, c-format

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

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

4691

4634 -#: builtin/clone.c:868 builtin/fetch.c:1168

4692 +#: builtin/clone.c:879 builtin/fetch.c:1166

4693 #, c-format

4694 msgid "depth %s is not a positive number"

4695 msgstr "djupet %s är inte ett positivt tal"

4696

4639 -#: builtin/clone.c:878

4697 +#: builtin/clone.c:889

4698 #, c-format

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

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

4701

4644 -#: builtin/clone.c:888

4702 +#: builtin/clone.c:899

4703 #, c-format

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

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

4706

4649 -#: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218

4650 -#: builtin/worktree.c:245

4707 +#: builtin/clone.c:914 builtin/clone.c:925 builtin/submodule--helper.c:224

4708 +#: builtin/worktree.c:221 builtin/worktree.c:248

4709 #, c-format

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

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

4712

4655 -#: builtin/clone.c:906

4713 +#: builtin/clone.c:917

4714 #, c-format

4715 msgid "could not create work tree dir '%s'"

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

4717

4660 -#: builtin/clone.c:924

4718 +#: builtin/clone.c:935

4719 #, c-format

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

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

4722

4665 -#: builtin/clone.c:926

4723 +#: builtin/clone.c:937

4724 #, c-format

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

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

4727

4670 -#: builtin/clone.c:951

4671 -msgid "--dissociate given, but there is no --reference"

4672 -msgstr "--dissociate angavs, men --reference har inte angivits"

4673 -

4674 -#: builtin/clone.c:968

4728 +#: builtin/clone.c:975

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

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

4731

4678 -#: builtin/clone.c:971

4732 +#: builtin/clone.c:978

4733 msgid "source repository is shallow, ignoring --local"

4734 msgstr "källarkivet är grunt, ignorerar --local"

4735

4682 -#: builtin/clone.c:976

4736 +#: builtin/clone.c:983

4737 msgid "--local is ignored"

4738 msgstr "--local ignoreras"

4739

4686 -#: builtin/clone.c:980

4740 +#: builtin/clone.c:987

4741 #, c-format

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

4743 msgstr "Vet inte hur man klonar %s"

4744

4691 -#: builtin/clone.c:1029 builtin/clone.c:1037

4745 +#: builtin/clone.c:1036 builtin/clone.c:1044

4746 #, c-format

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

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

4749

4696 -#: builtin/clone.c:1040

4750 +#: builtin/clone.c:1047

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

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

4753

@@ -4729,15 +4783,15 @@ msgstr "Spaltfyllnad mellan spalter"

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

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

4785

4732 -#: builtin/commit.c:37

4786 +#: builtin/commit.c:38

4787 msgid "git commit [<options>] [--] <pathspec>..."

4788 msgstr "git commit [<flaggor>] [--] <sökväg>..."

4789

4736 -#: builtin/commit.c:42

4790 +#: builtin/commit.c:43

4791 msgid "git status [<options>] [--] <pathspec>..."

4792 msgstr "git status [<flaggor>] [--] <sökväg>..."

4793

4740 -#: builtin/commit.c:47

4794 +#: builtin/commit.c:48

4795 msgid ""

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

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

@@ -4764,7 +4818,7 @@ msgstr ""

4818 "\n"

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

4820

4767 -#: builtin/commit.c:60

4821 +#: builtin/commit.c:61

4822 msgid ""

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

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

@@ -4789,7 +4843,7 @@ msgstr ""

4843 "\n"

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

4845

4792 -#: builtin/commit.c:72

4846 +#: builtin/commit.c:73

4847 msgid ""

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

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

@@ -4799,7 +4853,7 @@ msgstr ""

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

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

4855

4802 -#: builtin/commit.c:77

4856 +#: builtin/commit.c:78

4857 msgid ""

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

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

@@ -4813,11 +4867,11 @@ msgstr ""

4867 " git commit --allow-empty\n"

4868 "\n"

4869

4816 -#: builtin/commit.c:84

4870 +#: builtin/commit.c:85

4871 msgid "Otherwise, please use 'git reset'\n"

4872 msgstr "Använd annars \"git reset\"\n"

4873

4820 -#: builtin/commit.c:87

4874 +#: builtin/commit.c:88

4875 msgid ""

4876 "If you wish to skip this commit, use:\n"

4877 "\n"

@@ -4833,66 +4887,66 @@ msgstr ""

4887 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

4888 "cherry-pick för återstående incheckningar.\n"

4889

4836 -#: builtin/commit.c:304

4890 +#: builtin/commit.c:305

4891 msgid "failed to unpack HEAD tree object"

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

4893

4840 -#: builtin/commit.c:345

4894 +#: builtin/commit.c:346

4895 msgid "unable to create temporary index"

4896 msgstr "kunde inte skapa temporär indexfil"

4897

4844 -#: builtin/commit.c:351

4898 +#: builtin/commit.c:352

4899 msgid "interactive add failed"

4900 msgstr "interaktiv tilläggning misslyckades"

4901

4848 -#: builtin/commit.c:364

4902 +#: builtin/commit.c:365

4903 msgid "unable to update temporary index"

4904 msgstr "kan inte uppdatera temporärt index"

4905

4852 -#: builtin/commit.c:366

4906 +#: builtin/commit.c:367

4907 msgid "Failed to update main cache tree"

4908 msgstr "Misslyckades uppdatera huvud-cacheträdet"

4909

4856 -#: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462

4910 +#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

4911 msgid "unable to write new_index file"

4912 msgstr "kunde inte skriva filen new_index"

4913

4860 -#: builtin/commit.c:444

4914 +#: builtin/commit.c:445

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

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

4917

4864 -#: builtin/commit.c:446

4918 +#: builtin/commit.c:447

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

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

4921

4868 -#: builtin/commit.c:455

4922 +#: builtin/commit.c:456

4923 msgid "cannot read the index"

4924 msgstr "kan inte läsa indexet"

4925

4872 -#: builtin/commit.c:474

4926 +#: builtin/commit.c:475

4927 msgid "unable to write temporary index file"

4928 msgstr "kunde inte skriva temporär indexfil"

4929

4876 -#: builtin/commit.c:579

4930 +#: builtin/commit.c:580

4931 #, c-format

4932 msgid "commit '%s' lacks author header"

4933 msgstr "incheckningen \"%s\" saknar författarhuvud"

4934

4881 -#: builtin/commit.c:581

4935 +#: builtin/commit.c:582

4936 #, c-format

4937 msgid "commit '%s' has malformed author line"

4938 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

4939

4886 -#: builtin/commit.c:600

4940 +#: builtin/commit.c:601

4941 msgid "malformed --author parameter"

4942 msgstr "felformad \"--author\"-flagga"

4943

4890 -#: builtin/commit.c:608

4944 +#: builtin/commit.c:609

4945 #, c-format

4946 msgid "invalid date format: %s"

4947 msgstr "felaktigt datumformat: %s"

4948

4895 -#: builtin/commit.c:652

4949 +#: builtin/commit.c:653

4950 msgid ""

4951 "unable to select a comment character that is not used\n"

4952 "in the current commit message"

@@ -4900,38 +4954,38 @@ msgstr ""

4954 "kunde inte välja ett kommentarstecken som inte använts\n"

4955 "i det befintliga incheckningsmeddelandet"

4956

4903 -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079

4957 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

4958 #, c-format

4959 msgid "could not lookup commit %s"

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

4961

4908 -#: builtin/commit.c:701 builtin/shortlog.c:273

4962 +#: builtin/commit.c:702 builtin/shortlog.c:273

4963 #, c-format

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

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

4966

4913 -#: builtin/commit.c:703

4967 +#: builtin/commit.c:704

4968 msgid "could not read log from standard input"

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

4970

4917 -#: builtin/commit.c:707

4971 +#: builtin/commit.c:708

4972 #, c-format

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

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

4975

4922 -#: builtin/commit.c:729

4976 +#: builtin/commit.c:730

4977 msgid "could not read MERGE_MSG"

4978 msgstr "kunde inte läsa MERGE_MSG"

4979

4926 -#: builtin/commit.c:733

4980 +#: builtin/commit.c:734

4981 msgid "could not read SQUASH_MSG"

4982 msgstr "kunde inte läsa SQUASH_MSG"

4983

4930 -#: builtin/commit.c:784

4984 +#: builtin/commit.c:785

4985 msgid "could not write commit template"

4986 msgstr "kunde inte skriva incheckningsmall"

4987

4934 -#: builtin/commit.c:802

4988 +#: builtin/commit.c:803

4989 #, c-format

4990 msgid ""

4991 "\n"

@@ -4946,7 +5000,7 @@ msgstr ""

5000 "\t%s\n"

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

5002

4949 -#: builtin/commit.c:807

5003 +#: builtin/commit.c:808

5004 #, c-format

5005 msgid ""

5006 "\n"

@@ -4961,7 +5015,7 @@ msgstr ""

5015 "\t%s\n"

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

5017

4964 -#: builtin/commit.c:820

5018 +#: builtin/commit.c:821

5019 #, c-format

5020 msgid ""

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

@@ -4971,7 +5025,7 @@ msgstr ""

5025 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

5026 "incheckningen.\n"

5027

4974 -#: builtin/commit.c:827

5028 +#: builtin/commit.c:828

5029 #, c-format

5030 msgid ""

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

@@ -4982,145 +5036,146 @@ msgstr ""

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

5037 "Ett tomt meddelande avbryter incheckningen.\n"

5038

4985 -#: builtin/commit.c:847

5039 +#: builtin/commit.c:848

5040 #, c-format

5041 msgid "%sAuthor: %.*s <%.*s>"

5042 msgstr "%sFörfattare: %.*s <%.*s>"

5043

4990 -#: builtin/commit.c:855

5044 +#: builtin/commit.c:856

5045 #, c-format

5046 msgid "%sDate: %s"

5047 msgstr "%sDatum: %s"

5048

4995 -#: builtin/commit.c:862

5049 +#: builtin/commit.c:863

5050 #, c-format

5051 msgid "%sCommitter: %.*s <%.*s>"

5052 msgstr "%sIncheckare: %.*s <%.*s>"

5053

5000 -#: builtin/commit.c:880

5054 +#: builtin/commit.c:881

5055 msgid "Cannot read index"

5056 msgstr "Kan inte läsa indexet"

5057

5004 -#: builtin/commit.c:937

5058 +#: builtin/commit.c:938

5059 msgid "Error building trees"

5060 msgstr "Fel vid byggande av träd"

5061

5008 -#: builtin/commit.c:952 builtin/tag.c:495

5062 +#: builtin/commit.c:953 builtin/tag.c:266

5063 #, c-format

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

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

5066

5013 -#: builtin/commit.c:1054

5067 +#: builtin/commit.c:1055

5068 #, c-format

5069 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5070 msgstr ""

5071 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

5072

5019 -#: builtin/commit.c:1069 builtin/commit.c:1309

5073 +#: builtin/commit.c:1070 builtin/commit.c:1310

5074 #, c-format

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

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

5077

5024 -#: builtin/commit.c:1106

5078 +#: builtin/commit.c:1107

5079 msgid "--long and -z are incompatible"

5080 msgstr "--long och -z är inkompatibla"

5081

5028 -#: builtin/commit.c:1136

5082 +#: builtin/commit.c:1137

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

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

5085

5032 -#: builtin/commit.c:1145

5086 +#: builtin/commit.c:1146

5087 msgid "You have nothing to amend."

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

5089

5036 -#: builtin/commit.c:1148

5090 +#: builtin/commit.c:1149

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

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

5093

5040 -#: builtin/commit.c:1150

5094 +#: builtin/commit.c:1151

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

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

5097

5044 -#: builtin/commit.c:1153

5098 +#: builtin/commit.c:1154

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

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

5101

5048 -#: builtin/commit.c:1163

5102 +#: builtin/commit.c:1164

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

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

5105

5052 -#: builtin/commit.c:1165

5106 +#: builtin/commit.c:1166

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

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

5109

5056 -#: builtin/commit.c:1173

5110 +#: builtin/commit.c:1174

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

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

5113

5060 -#: builtin/commit.c:1190

5114 +#: builtin/commit.c:1191

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

5116 msgstr ""

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

5118

5065 -#: builtin/commit.c:1192

5119 +#: builtin/commit.c:1193

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

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

5122

5069 -#: builtin/commit.c:1194

5123 +#: builtin/commit.c:1195

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

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

5126

5073 -#: builtin/commit.c:1196

5127 +#: builtin/commit.c:1197

5128 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

5130

5077 -#: builtin/commit.c:1208 builtin/tag.c:730

5131 +#: builtin/commit.c:1209 builtin/tag.c:475

5132 #, c-format

5133 msgid "Invalid cleanup mode %s"

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

5135

5082 -#: builtin/commit.c:1213

5136 +#: builtin/commit.c:1214

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

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

5139

5086 -#: builtin/commit.c:1323 builtin/commit.c:1602

5140 +#: builtin/commit.c:1324 builtin/commit.c:1605

5141 msgid "show status concisely"

5142 msgstr "visa koncis status"

5143

5090 -#: builtin/commit.c:1325 builtin/commit.c:1604

5144 +#: builtin/commit.c:1326 builtin/commit.c:1607

5145 msgid "show branch information"

5146 msgstr "visa information om gren"

5147

5094 -#: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546

5148 +#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:546

5149 +#: builtin/worktree.c:423

5150 msgid "machine-readable output"

5151 msgstr "maskinläsbar utdata"

5152

5098 -#: builtin/commit.c:1330 builtin/commit.c:1608

5153 +#: builtin/commit.c:1331 builtin/commit.c:1611

5154 msgid "show status in long format (default)"

5155 msgstr "visa status i långt format (standard)"

5156

5102 -#: builtin/commit.c:1333 builtin/commit.c:1611

5157 +#: builtin/commit.c:1334 builtin/commit.c:1614

5158 msgid "terminate entries with NUL"

5159 msgstr "terminera poster med NUL"

5160

5106 -#: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981

5107 -#: builtin/fast-export.c:984 builtin/tag.c:604

5161 +#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5162 +#: builtin/fast-export.c:984 builtin/tag.c:353

5163 msgid "mode"

5164 msgstr "läge"

5165

5111 -#: builtin/commit.c:1336 builtin/commit.c:1614

5166 +#: builtin/commit.c:1337 builtin/commit.c:1617

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

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

5169

5115 -#: builtin/commit.c:1339

5170 +#: builtin/commit.c:1340

5171 msgid "show ignored files"

5172 msgstr "visa ignorerade filer"

5173

5119 -#: builtin/commit.c:1340 parse-options.h:155

5174 +#: builtin/commit.c:1341 parse-options.h:155

5175 msgid "when"

5176 msgstr "när"

5177

5123 -#: builtin/commit.c:1341

5178 +#: builtin/commit.c:1342

5179 msgid ""

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

5181 "(Default: all)"

@@ -5128,196 +5183,201 @@ msgstr ""

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

5184 "(Default: all)"

5185

5131 -#: builtin/commit.c:1343

5186 +#: builtin/commit.c:1344

5187 msgid "list untracked files in columns"

5188 msgstr "visa ospårade filer i spalter"

5189

5135 -#: builtin/commit.c:1429

5190 +#: builtin/commit.c:1430

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

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

5193

5139 -#: builtin/commit.c:1431

5194 +#: builtin/commit.c:1432

5195 msgid "could not parse newly created commit"

5196 msgstr "kunde inte tolka en precis skapad incheckning"

5197

5143 -#: builtin/commit.c:1476

5198 +#: builtin/commit.c:1477

5199 msgid "detached HEAD"

5200 msgstr "frånkopplad HEAD"

5201

5147 -#: builtin/commit.c:1479

5202 +#: builtin/commit.c:1480

5203 msgid " (root-commit)"

5204 msgstr " (rotincheckning)"

5205

5151 -#: builtin/commit.c:1572

5206 +#: builtin/commit.c:1575

5207 msgid "suppress summary after successful commit"

5208 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

5209

5155 -#: builtin/commit.c:1573

5210 +#: builtin/commit.c:1576

5211 msgid "show diff in commit message template"

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

5213

5159 -#: builtin/commit.c:1575

5214 +#: builtin/commit.c:1578

5215 msgid "Commit message options"

5216 msgstr "Alternativ för incheckningsmeddelande"

5217

5163 -#: builtin/commit.c:1576 builtin/tag.c:602

5218 +#: builtin/commit.c:1579 builtin/tag.c:351

5219 msgid "read message from file"

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

5221

5167 -#: builtin/commit.c:1577

5222 +#: builtin/commit.c:1580

5223 msgid "author"

5224 msgstr "författare"

5225

5171 -#: builtin/commit.c:1577

5226 +#: builtin/commit.c:1580

5227 msgid "override author for commit"

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

5229

5175 -#: builtin/commit.c:1578 builtin/gc.c:268

5230 +#: builtin/commit.c:1581 builtin/gc.c:326

5231 msgid "date"

5232 msgstr "datum"

5233

5179 -#: builtin/commit.c:1578

5234 +#: builtin/commit.c:1581

5235 msgid "override date for commit"

5236 msgstr "överstyr datum för incheckningen"

5237

5183 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392

5184 -#: builtin/notes.c:555 builtin/tag.c:600

5238 +#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:392

5239 +#: builtin/notes.c:555 builtin/tag.c:349

5240 msgid "message"

5241 msgstr "meddelande"

5242

5188 -#: builtin/commit.c:1579

5243 +#: builtin/commit.c:1582

5244 msgid "commit message"

5245 msgstr "incheckningsmeddelande"

5246

5192 -#: builtin/commit.c:1580

5247 +#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5248 +#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5249 +msgid "commit"

5250 +msgstr "incheckning"

5251 +

5252 +#: builtin/commit.c:1583

5253 msgid "reuse and edit message from specified commit"

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

5255

5196 -#: builtin/commit.c:1581

5256 +#: builtin/commit.c:1584

5257 msgid "reuse message from specified commit"

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

5259

5200 -#: builtin/commit.c:1582

5260 +#: builtin/commit.c:1585

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

5262 msgstr ""

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

5264

5205 -#: builtin/commit.c:1583

5265 +#: builtin/commit.c:1586

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

5267 msgstr ""

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

5269 "incheckning"

5270

5211 -#: builtin/commit.c:1584

5271 +#: builtin/commit.c:1587

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

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

5274

5215 -#: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86

5275 +#: builtin/commit.c:1588 builtin/log.c:1215 builtin/revert.c:86

5276 msgid "add Signed-off-by:"

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

5278

5219 -#: builtin/commit.c:1586

5279 +#: builtin/commit.c:1589

5280 msgid "use specified template file"

5281 msgstr "använd angiven mallfil"

5282

5223 -#: builtin/commit.c:1587

5283 +#: builtin/commit.c:1590

5284 msgid "force edit of commit"

5285 msgstr "tvinga redigering av incheckning"

5286

5227 -#: builtin/commit.c:1588

5287 +#: builtin/commit.c:1591

5288 msgid "default"

5289 msgstr "standard"

5290

5231 -#: builtin/commit.c:1588 builtin/tag.c:605

5291 +#: builtin/commit.c:1591 builtin/tag.c:354

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

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

5294

5235 -#: builtin/commit.c:1589

5295 +#: builtin/commit.c:1592

5296 msgid "include status in commit message template"

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

5298

5239 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156

5299 +#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:156

5300 #: builtin/revert.c:93

5301 msgid "GPG sign commit"

5302 msgstr "GPG-signera incheckning"

5303

5244 -#: builtin/commit.c:1594

5304 +#: builtin/commit.c:1597

5305 msgid "Commit contents options"

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

5307

5248 -#: builtin/commit.c:1595

5308 +#: builtin/commit.c:1598

5309 msgid "commit all changed files"

5310 msgstr "checka in alla ändrade filer"

5311

5252 -#: builtin/commit.c:1596

5312 +#: builtin/commit.c:1599

5313 msgid "add specified files to index for commit"

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

5315

5256 -#: builtin/commit.c:1597

5316 +#: builtin/commit.c:1600

5317 msgid "interactively add files"

5318 msgstr "lägg till filer interaktivt"

5319

5260 -#: builtin/commit.c:1598

5320 +#: builtin/commit.c:1601

5321 msgid "interactively add changes"

5322 msgstr "lägg till ändringar interaktivt"

5323

5264 -#: builtin/commit.c:1599

5324 +#: builtin/commit.c:1602

5325 msgid "commit only specified files"

5326 msgstr "checka endast in angivna filer"

5327

5268 -#: builtin/commit.c:1600

5328 +#: builtin/commit.c:1603

5329 msgid "bypass pre-commit hook"

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

5331

5272 -#: builtin/commit.c:1601

5332 +#: builtin/commit.c:1604

5333 msgid "show what would be committed"

5334 msgstr "visa vad som skulle checkas in"

5335

5276 -#: builtin/commit.c:1612

5336 +#: builtin/commit.c:1615

5337 msgid "amend previous commit"

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

5339

5280 -#: builtin/commit.c:1613

5340 +#: builtin/commit.c:1616

5341 msgid "bypass post-rewrite hook"

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

5343

5284 -#: builtin/commit.c:1618

5344 +#: builtin/commit.c:1621

5345 msgid "ok to record an empty change"

5346 msgstr "ok att registrera en tom ändring"

5347

5288 -#: builtin/commit.c:1620

5348 +#: builtin/commit.c:1623

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

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

5351

5292 -#: builtin/commit.c:1649

5352 +#: builtin/commit.c:1652

5353 msgid "could not parse HEAD commit"

5354 msgstr "kunde inte tolka HEAD:s incheckning"

5355

5296 -#: builtin/commit.c:1695

5356 +#: builtin/commit.c:1698

5357 #, c-format

5358 msgid "Corrupt MERGE_HEAD file (%s)"

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

5360

5301 -#: builtin/commit.c:1702

5361 +#: builtin/commit.c:1705

5362 msgid "could not read MERGE_MODE"

5363 msgstr "kunde inte läsa MERGE_MODE"

5364

5305 -#: builtin/commit.c:1721

5365 +#: builtin/commit.c:1724

5366 #, c-format

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

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

5369

5310 -#: builtin/commit.c:1732

5370 +#: builtin/commit.c:1735

5371 #, c-format

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

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

5374

5315 -#: builtin/commit.c:1737

5375 +#: builtin/commit.c:1740

5376 #, c-format

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

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

5379

5320 -#: builtin/commit.c:1785

5380 +#: builtin/commit.c:1788

5381 msgid ""

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

5383 "new_index file. Check that disk is not full and quota is\n"

@@ -5456,11 +5516,11 @@ msgstr "visa endast variabelnamn"

5516 msgid "respect include directives on lookup"

5517 msgstr "respektera inkluderingsdirektiv vid uppslag"

5518

5459 -#: builtin/config.c:311

5519 +#: builtin/config.c:303

5520 msgid "unable to parse default color value"

5521 msgstr "kan inte tolka standardfärgvärde"

5522

5463 -#: builtin/config.c:449

5523 +#: builtin/config.c:441

5524 #, c-format

5525 msgid ""

5526 "# This is Git's per-user configuration file.\n"

@@ -5475,16 +5535,16 @@ msgstr ""

5535 "#\tname = %s\n"

5536 "#\temail = %s\n"

5537

5478 -#: builtin/config.c:583

5538 +#: builtin/config.c:575

5539 #, c-format

5540 msgid "cannot create configuration file %s"

5541 msgstr "kan inte skapa konfigurationsfilen \"%s\""

5542

5483 -#: builtin/count-objects.c:55

5543 +#: builtin/count-objects.c:77

5544 msgid "git count-objects [-v] [-H | --human-readable]"

5545 msgstr "git count-objects [-v] [-H | --human-readable]"

5546

5487 -#: builtin/count-objects.c:65

5547 +#: builtin/count-objects.c:87

5548 msgid "print sizes in human readable format"

5549 msgstr "skriv storlekar i människoläsbart format"

5550

@@ -5604,7 +5664,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"

5664 msgid "only consider tags matching <pattern>"

5665 msgstr "överväg endast taggar som motsvarar <mönster>"

5666

5607 -#: builtin/describe.c:410 builtin/name-rev.c:318

5667 +#: builtin/describe.c:410 builtin/name-rev.c:314

5668 msgid "show abbreviated commit object as fallback"

5669 msgstr "visa förkortade incheckningsobjekt som standard"

5670

@@ -5781,7 +5841,7 @@ msgstr "fördjupa historik för grund klon"

5841 msgid "convert to a complete repository"

5842 msgstr "konvertera till komplett arkiv"

5843

5784 -#: builtin/fetch.c:118 builtin/log.c:1233

5844 +#: builtin/fetch.c:118 builtin/log.c:1232

5845 msgid "dir"

5846 msgstr "kat"

5847

@@ -5823,7 +5883,7 @@ msgstr "[àjour]"

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

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

5885

5826 -#: builtin/fetch.c:478 builtin/fetch.c:564

5886 +#: builtin/fetch.c:478 builtin/fetch.c:566

5887 msgid "[rejected]"

5888 msgstr "[refuserad]"

5889

@@ -5847,39 +5907,39 @@ msgstr "[ny gren]"

5907 msgid "[new ref]"

5908 msgstr "[ny ref]"

5909

5850 -#: builtin/fetch.c:560

5910 +#: builtin/fetch.c:561

5911 msgid "unable to update local ref"

5912 msgstr "kunde inte uppdatera lokal ref"

5913

5854 -#: builtin/fetch.c:560

5914 +#: builtin/fetch.c:561

5915 msgid "forced update"

5916 msgstr "tvingad uppdatering"

5917

5858 -#: builtin/fetch.c:566

5918 +#: builtin/fetch.c:568

5919 msgid "(non-fast-forward)"

5920 msgstr "(ej snabbspolad)"

5921

5862 -#: builtin/fetch.c:600 builtin/fetch.c:842

5922 +#: builtin/fetch.c:602 builtin/fetch.c:843

5923 #, c-format

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

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

5926

5867 -#: builtin/fetch.c:609

5927 +#: builtin/fetch.c:611

5928 #, c-format

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

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

5931

5872 -#: builtin/fetch.c:627

5932 +#: builtin/fetch.c:629

5933 #, c-format

5934 msgid "reject %s because shallow roots are not allowed to be updated"

5935 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5936

5877 -#: builtin/fetch.c:715 builtin/fetch.c:807

5937 +#: builtin/fetch.c:716 builtin/fetch.c:808

5938 #, c-format

5939 msgid "From %.*s\n"

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

5941

5882 -#: builtin/fetch.c:726

5942 +#: builtin/fetch.c:727

5943 #, c-format

5944 msgid ""

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

@@ -5888,55 +5948,55 @@ msgstr ""

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

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

5950

5891 -#: builtin/fetch.c:778

5951 +#: builtin/fetch.c:779

5952 #, c-format

5953 msgid " (%s will become dangling)"

5954 msgstr " (%s kommer bli dinglande)"

5955

5896 -#: builtin/fetch.c:779

5956 +#: builtin/fetch.c:780

5957 #, c-format

5958 msgid " (%s has become dangling)"

5959 msgstr " (%s har blivit dinglande)"

5960

5901 -#: builtin/fetch.c:811

5961 +#: builtin/fetch.c:812

5962 msgid "[deleted]"

5963 msgstr "[borttagen]"

5964

5905 -#: builtin/fetch.c:812 builtin/remote.c:1034

5965 +#: builtin/fetch.c:813 builtin/remote.c:1040

5966 msgid "(none)"

5967 msgstr "(ingen)"

5968

5909 -#: builtin/fetch.c:832

5969 +#: builtin/fetch.c:833

5970 #, c-format

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

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

5973

5914 -#: builtin/fetch.c:851

5974 +#: builtin/fetch.c:852

5975 #, c-format

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

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

5978

5919 -#: builtin/fetch.c:854

5979 +#: builtin/fetch.c:855

5980 #, c-format

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

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

5983

5924 -#: builtin/fetch.c:910

5984 +#: builtin/fetch.c:911

5985 #, c-format

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

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

5988

5929 -#: builtin/fetch.c:1071

5989 +#: builtin/fetch.c:1072

5990 #, c-format

5991 msgid "Fetching %s\n"

5992 msgstr "Hämtar %s\n"

5993

5934 -#: builtin/fetch.c:1073 builtin/remote.c:90

5994 +#: builtin/fetch.c:1074 builtin/remote.c:96

5995 #, c-format

5996 msgid "Could not fetch %s"

5997 msgstr "Kunde inte hämta %s"

5998

5939 -#: builtin/fetch.c:1091

5999 +#: builtin/fetch.c:1092

6000 msgid ""

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

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

@@ -5944,32 +6004,32 @@ msgstr ""

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

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

6006

5947 -#: builtin/fetch.c:1114

6007 +#: builtin/fetch.c:1115

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

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

6010

5951 -#: builtin/fetch.c:1156

6011 +#: builtin/fetch.c:1157

6012 msgid "--depth and --unshallow cannot be used together"

6013 msgstr "--depth och --unshallow kan inte användas samtidigt"

6014

5955 -#: builtin/fetch.c:1158

6015 +#: builtin/fetch.c:1159

6016 msgid "--unshallow on a complete repository does not make sense"

6017 msgstr "--unshallow kan inte användas på ett komplett arkiv"

6018

5959 -#: builtin/fetch.c:1181

6019 +#: builtin/fetch.c:1179

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

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

6022

5963 -#: builtin/fetch.c:1183

6023 +#: builtin/fetch.c:1181

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

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

6026

5967 -#: builtin/fetch.c:1194

6027 +#: builtin/fetch.c:1192

6028 #, c-format

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

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

6031

5972 -#: builtin/fetch.c:1202

6032 +#: builtin/fetch.c:1200

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

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

6035

@@ -5979,23 +6039,23 @@ msgid ""

6039 msgstr ""

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

6041

5982 -#: builtin/fmt-merge-msg.c:670

6042 +#: builtin/fmt-merge-msg.c:667

6043 msgid "populate log with at most <n> entries from shortlog"

6044 msgstr "fyll i loggen med som mest <n> poster från shortlog"

6045

5986 -#: builtin/fmt-merge-msg.c:673

6046 +#: builtin/fmt-merge-msg.c:670

6047 msgid "alias for --log (deprecated)"

6048 msgstr "alias för --log (avråds)"

6049

5990 -#: builtin/fmt-merge-msg.c:676

6050 +#: builtin/fmt-merge-msg.c:673

6051 msgid "text"

6052 msgstr "text"

6053

5994 -#: builtin/fmt-merge-msg.c:677

6054 +#: builtin/fmt-merge-msg.c:674

6055 msgid "use <text> as start of message"

6056 msgstr "inled meddelande med <text>"

6057

5998 -#: builtin/fmt-merge-msg.c:678

6058 +#: builtin/fmt-merge-msg.c:675

6059 msgid "file to read from"

6060 msgstr "fil att läsa från"

6061

@@ -6003,99 +6063,119 @@ msgstr "fil att läsa från"

6063 msgid "git for-each-ref [<options>] [<pattern>]"

6064 msgstr "git for-each-ref [<flaggor>] [<mönster>]"

6065

6006 -#: builtin/for-each-ref.c:24

6066 +#: builtin/for-each-ref.c:10

6067 +msgid "git for-each-ref [--points-at <object>]"

6068 +msgstr "git for-each-ref [--points-at <objekt>]"

6069 +

6070 +#: builtin/for-each-ref.c:11

6071 +msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"

6072 +msgstr "git for-each-ref [(--merged | --no-merged) [<objekt>]]"

6073 +

6074 +#: builtin/for-each-ref.c:12

6075 +msgid "git for-each-ref [--contains [<object>]]"

6076 +msgstr "git for-each-ref [--contains [<objekt>]]"

6077 +

6078 +#: builtin/for-each-ref.c:27

6079 msgid "quote placeholders suitably for shells"

6080 msgstr "citera platshållare passande för skal"

6081

6010 -#: builtin/for-each-ref.c:26

6082 +#: builtin/for-each-ref.c:29

6083 msgid "quote placeholders suitably for perl"

6084 msgstr "citera platshållare passande för perl"

6085

6014 -#: builtin/for-each-ref.c:28

6086 +#: builtin/for-each-ref.c:31

6087 msgid "quote placeholders suitably for python"

6088 msgstr "citera platshållare passande för python"

6089

6018 -#: builtin/for-each-ref.c:30

6090 +#: builtin/for-each-ref.c:33

6091 msgid "quote placeholders suitably for Tcl"

6092 msgstr "citera platshållare passande för Tcl"

6093

6022 -#: builtin/for-each-ref.c:33

6094 +#: builtin/for-each-ref.c:36

6095 msgid "show only <n> matched refs"

6096 msgstr "visa endast <n> träffade refs"

6097

6026 -#: builtin/for-each-ref.c:34

6098 +#: builtin/for-each-ref.c:37 builtin/tag.c:372

6099 msgid "format to use for the output"

6100 msgstr "format att använda för utdata"

6101

6030 -#: builtin/for-each-ref.c:35

6031 -msgid "key"

6032 -msgstr "nyckel"

6102 +#: builtin/for-each-ref.c:41

6103 +msgid "print only refs which points at the given object"

6104 +msgstr "visa endast referenser som pekar på objektet"

6105

6034 -#: builtin/for-each-ref.c:36

6035 -msgid "field name to sort on"

6036 -msgstr "fältnamn att sortera på"

6106 +#: builtin/for-each-ref.c:43

6107 +msgid "print only refs that are merged"

6108 +msgstr "visa endast referenser som slagits samman"

6109 +

6110 +#: builtin/for-each-ref.c:44

6111 +msgid "print only refs that are not merged"

6112 +msgstr "visa endast referenser som ej slagits samman"

6113 +

6114 +#: builtin/for-each-ref.c:45

6115 +msgid "print only refs which contain the commit"

6116 +msgstr "visa endast referenser som innehåller incheckningen"

6117

6118 # Vague original, not networking-related, but rather related to the actual

6119 # objects in the database.

6040 -#: builtin/fsck.c:163 builtin/prune.c:137

6120 +#: builtin/fsck.c:156 builtin/prune.c:140

6121 msgid "Checking connectivity"

6122 msgstr "Kontrollerar konnektivitet"

6123

6044 -#: builtin/fsck.c:568

6124 +#: builtin/fsck.c:486

6125 msgid "Checking object directories"

6126 msgstr "Kontrollerar objektkataloger"

6127

6048 -#: builtin/fsck.c:631

6128 +#: builtin/fsck.c:553

6129 msgid "git fsck [<options>] [<object>...]"

6130 msgstr "git fsck [<flaggor>] [<objekt>...]"

6131

6052 -#: builtin/fsck.c:637

6132 +#: builtin/fsck.c:559

6133 msgid "show unreachable objects"

6134 msgstr "visa onåbara objekt"

6135

6056 -#: builtin/fsck.c:638

6136 +#: builtin/fsck.c:560

6137 msgid "show dangling objects"

6138 msgstr "visa dinglande objekt"

6139

6060 -#: builtin/fsck.c:639

6140 +#: builtin/fsck.c:561

6141 msgid "report tags"

6142 msgstr "rapportera taggar"

6143

6064 -#: builtin/fsck.c:640

6144 +#: builtin/fsck.c:562

6145 msgid "report root nodes"

6146 msgstr "rapportera rotnoder"

6147

6068 -#: builtin/fsck.c:641

6148 +#: builtin/fsck.c:563

6149 msgid "make index objects head nodes"

6150 msgstr "gör indexojekt till huvudnoder"

6151

6072 -#: builtin/fsck.c:642

6152 +#: builtin/fsck.c:564

6153 msgid "make reflogs head nodes (default)"

6154 msgstr "gör refloggar till huvudnoder (standard)"

6155

6076 -#: builtin/fsck.c:643

6156 +#: builtin/fsck.c:565

6157 msgid "also consider packs and alternate objects"

6158 msgstr "ta även hänsyn till paket och alternativa objekt"

6159

6160 # Vague original, not networking-related, but rather related to the actual

6161 # objects in the database.

6082 -#: builtin/fsck.c:644

6162 +#: builtin/fsck.c:566

6163 msgid "check only connectivity"

6164 msgstr "kontrollera endast konnektivitet"

6165

6086 -#: builtin/fsck.c:645

6166 +#: builtin/fsck.c:567

6167 msgid "enable more strict checking"

6168 msgstr "aktivera striktare kontroll"

6169

6090 -#: builtin/fsck.c:647

6170 +#: builtin/fsck.c:569

6171 msgid "write dangling objects in .git/lost-found"

6172 msgstr "skriv dinglande objekt i .git/lost-found"

6173

6094 -#: builtin/fsck.c:648 builtin/prune.c:107

6174 +#: builtin/fsck.c:570 builtin/prune.c:107

6175 msgid "show progress"

6176 msgstr "visa förlopp"

6177

6098 -#: builtin/fsck.c:707

6178 +#: builtin/fsck.c:631

6179 msgid "Checking objects"

6180 msgstr "Kontrollerar objekt"

6181

@@ -6103,48 +6183,63 @@ msgstr "Kontrollerar objekt"

6183 msgid "git gc [<options>]"

6184 msgstr "git gc [<flaggor>]"

6185

6106 -#: builtin/gc.c:55

6186 +#: builtin/gc.c:72

6187 #, c-format

6188 msgid "Invalid %s: '%s'"

6189 msgstr "Felaktigt %s: \"%s\""

6190

6111 -#: builtin/gc.c:100

6191 +#: builtin/gc.c:139

6192 #, c-format

6193 msgid "insanely long object directory %.*s"

6194 msgstr "tokigt lång objektkatalog %.*s"

6195

6116 -#: builtin/gc.c:269

6196 +#: builtin/gc.c:290

6197 +#, c-format

6198 +msgid ""

6199 +"The last gc run reported the following. Please correct the root cause\n"

6200 +"and remove %s.\n"

6201 +"Automatic cleanup will not be performed until the file is removed.\n"

6202 +"\n"

6203 +"%s"

6204 +msgstr ""

6205 +"Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n"

6206 +"och ta bort %s.\n"

6207 +"Automatisk städning kommer inte utföras förrän filen tas bort.\n"

6208 +"\n"

6209 +"%s"

6210 +

6211 +#: builtin/gc.c:327

6212 msgid "prune unreferenced objects"

6213 msgstr "rensa ej refererade objekt"

6214

6120 -#: builtin/gc.c:271

6215 +#: builtin/gc.c:329

6216 msgid "be more thorough (increased runtime)"

6217 msgstr "var mer grundlig (ökar körtiden)"

6218

6124 -#: builtin/gc.c:272

6219 +#: builtin/gc.c:330

6220 msgid "enable auto-gc mode"

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

6222

6128 -#: builtin/gc.c:273

6223 +#: builtin/gc.c:331

6224 msgid "force running gc even if there may be another gc running"

6225 msgstr "tvinga gc-körning även om en annan gc kanske körs"

6226

6132 -#: builtin/gc.c:315

6227 +#: builtin/gc.c:373

6228 #, c-format

6229 msgid "Auto packing the repository in background for optimum performance.\n"

6230 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

6231

6137 -#: builtin/gc.c:317

6232 +#: builtin/gc.c:375

6233 #, c-format

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

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

6236

6142 -#: builtin/gc.c:318

6237 +#: builtin/gc.c:376

6238 #, c-format

6239 msgid "See \"git help gc\" for manual housekeeping.\n"

6240 msgstr "Se \"git help gc\" för manuell hushållning.\n"

6241

6147 -#: builtin/gc.c:336

6242 +#: builtin/gc.c:397

6243 #, c-format

6244 msgid ""

6245 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -6152,7 +6247,7 @@ msgstr ""

6247 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

6248 "är fallet)"

6249

6155 -#: builtin/gc.c:364

6250 +#: builtin/gc.c:441

6251 msgid ""

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

6253 msgstr ""

@@ -6188,199 +6283,195 @@ msgstr "flaggan \"%c\" antar ett numeriskt värde"

6283 msgid "cannot open '%s'"

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

6285

6191 -#: builtin/grep.c:638

6286 +#: builtin/grep.c:633

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

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

6289

6195 -#: builtin/grep.c:640

6290 +#: builtin/grep.c:635

6291 msgid "find in contents not managed by git"

6292 msgstr "sök i innehåll som inte hanteras av git"

6293

6199 -#: builtin/grep.c:642

6294 +#: builtin/grep.c:637

6295 msgid "search in both tracked and untracked files"

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

6297

6203 -#: builtin/grep.c:644

6298 +#: builtin/grep.c:639

6299 msgid "ignore files specified via '.gitignore'"

6300 msgstr "ignorera filer angivna i \".gitignore\""

6301

6207 -#: builtin/grep.c:647

6302 +#: builtin/grep.c:642

6303 msgid "show non-matching lines"

6304 msgstr "visa rader som inte träffas"

6305

6211 -#: builtin/grep.c:649

6306 +#: builtin/grep.c:644

6307 msgid "case insensitive matching"

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

6309

6215 -#: builtin/grep.c:651

6310 +#: builtin/grep.c:646

6311 msgid "match patterns only at word boundaries"

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

6313

6219 -#: builtin/grep.c:653

6314 +#: builtin/grep.c:648

6315 msgid "process binary files as text"

6316 msgstr "hantera binärfiler som text"

6317

6223 -#: builtin/grep.c:655

6318 +#: builtin/grep.c:650

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

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

6321

6227 -#: builtin/grep.c:658

6322 +#: builtin/grep.c:653

6323 msgid "process binary files with textconv filters"

6324 msgstr "hantera binärfiler med textconv-filter"

6325

6231 -#: builtin/grep.c:660

6326 +#: builtin/grep.c:655

6327 msgid "descend at most <depth> levels"

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

6329

6235 -#: builtin/grep.c:664

6330 +#: builtin/grep.c:659

6331 msgid "use extended POSIX regular expressions"

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

6333

6239 -#: builtin/grep.c:667

6334 +#: builtin/grep.c:662

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

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

6337

6243 -#: builtin/grep.c:670

6338 +#: builtin/grep.c:665

6339 msgid "interpret patterns as fixed strings"

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

6341

6247 -#: builtin/grep.c:673

6342 +#: builtin/grep.c:668

6343 msgid "use Perl-compatible regular expressions"

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

6345

6251 -#: builtin/grep.c:676

6346 +#: builtin/grep.c:671

6347 msgid "show line numbers"

6348 msgstr "visa radnummer"

6349

6255 -#: builtin/grep.c:677

6350 +#: builtin/grep.c:672

6351 msgid "don't show filenames"

6352 msgstr "visa inte filnamn"

6353

6259 -#: builtin/grep.c:678

6354 +#: builtin/grep.c:673

6355 msgid "show filenames"

6356 msgstr "visa filnamn"

6357

6263 -#: builtin/grep.c:680

6358 +#: builtin/grep.c:675

6359 msgid "show filenames relative to top directory"

6360 msgstr "visa filnamn relativa till toppkatalogen"

6361

6267 -#: builtin/grep.c:682

6362 +#: builtin/grep.c:677

6363 msgid "show only filenames instead of matching lines"

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

6365

6271 -#: builtin/grep.c:684

6366 +#: builtin/grep.c:679

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

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

6369

6275 -#: builtin/grep.c:687

6370 +#: builtin/grep.c:682

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

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

6373

6279 -#: builtin/grep.c:689

6374 +#: builtin/grep.c:684

6375 msgid "print NUL after filenames"

6376 msgstr "skriv NUL efter filnamn"

6377

6283 -#: builtin/grep.c:691

6378 +#: builtin/grep.c:686

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

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

6381

6287 -#: builtin/grep.c:692

6382 +#: builtin/grep.c:687

6383 msgid "highlight matches"

6384 msgstr "ljusmarkera träffar"

6385

6291 -#: builtin/grep.c:694

6386 +#: builtin/grep.c:689

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

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

6389

6295 -#: builtin/grep.c:696

6390 +#: builtin/grep.c:691

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

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

6393

6299 -#: builtin/grep.c:699

6394 +#: builtin/grep.c:694

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

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

6397

6303 -#: builtin/grep.c:702

6398 +#: builtin/grep.c:697

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

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

6401

6307 -#: builtin/grep.c:704

6402 +#: builtin/grep.c:699

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

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

6405

6311 -#: builtin/grep.c:705

6406 +#: builtin/grep.c:700

6407 msgid "shortcut for -C NUM"

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

6409

6315 -#: builtin/grep.c:708

6410 +#: builtin/grep.c:703

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

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

6413

6319 -#: builtin/grep.c:710

6414 +#: builtin/grep.c:705

6415 msgid "show the surrounding function"

6416 msgstr "visa den omkringliggande funktionen"

6417

6323 -#: builtin/grep.c:713

l10n: sv.po: Update Swedish translation (2477t0f0u)