8ed2d3fb15 · matheusbsbs/matheus-bagliano

@@ -5,12 +5,12 @@

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2016-05-24 23:42+0800\n"

11 -"PO-Revision-Date: 2016-05-27 14:04+0100\n"

10 +"POT-Creation-Date: 2016-08-27 23:21+0800\n"

11 +"PO-Revision-Date: 2016-08-27 20:41+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"

@@ -23,7 +23,42 @@ msgstr ""

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

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

25

26 -#: advice.c:88

26 +#: advice.c:83

27 +msgid "Cherry-picking is not possible because you have unmerged files."

28 +msgstr ""

29 +"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "

30 +"samman."

31 +

32 +#: advice.c:85

33 +msgid "Committing is not possible because you have unmerged files."

34 +msgstr ""

35 +"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "

36 +"samman."

37 +

38 +#: advice.c:87

39 +msgid "Merging is not possible because you have unmerged files."

40 +msgstr ""

41 +"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "

42 +"samman."

43 +

44 +#: advice.c:89

45 +msgid "Pulling is not possible because you have unmerged files."

46 +msgstr ""

47 +"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."

48 +

49 +#: advice.c:91

50 +msgid "Reverting is not possible because you have unmerged files."

51 +msgstr ""

52 +"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "

53 +"samman."

54 +

55 +#: advice.c:93

56 +#, c-format

57 +msgid "It is not possible to %s because you have unmerged files."

58 +msgstr ""

59 +"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."

60 +

61 +#: advice.c:101

62 msgid ""

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

64 "as appropriate to mark resolution and make a commit."

@@ -31,18 +66,51 @@ msgstr ""

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

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

68

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

69 +#: advice.c:109

70 +msgid "Exiting because of an unresolved conflict."

71 +msgstr "Avslutar på grund av olöst konflikgt."

72 +

73 +#: advice.c:114 builtin/merge.c:1181

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

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

76

38 -#: advice.c:103

77 +#: advice.c:116

78 msgid "Please, commit your changes before merging."

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

80

42 -#: advice.c:104

81 +#: advice.c:117

82 msgid "Exiting because of unfinished merge."

83 msgstr "Avslutar på grund av ofullbordad sammanslagning."

84

85 +#: advice.c:123

86 +#, c-format

87 +msgid ""

88 +"Note: checking out '%s'.\n"

89 +"\n"

90 +"You are in 'detached HEAD' state. You can look around, make experimental\n"

91 +"changes and commit them, and you can discard any commits you make in this\n"

92 +"state without impacting any branches by performing another checkout.\n"

93 +"\n"

94 +"If you want to create a new branch to retain commits you create, you may\n"

95 +"do so (now or later) by using -b with the checkout command again. Example:\n"

96 +"\n"

97 +" git checkout -b <new-branch-name>\n"

98 +"\n"

99 +msgstr ""

100 +"Observera: checkar ut \"%s\".\n"

101 +"\n"

102 +"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"

103 +"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"

104 +"i det här läget utan att det påverkar grenar genom att checka ut på\n"

105 +"nytt.\n"

106 +"\n"

107 +"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"

108 +"du göra det (nu eller senare) genom att använda checkout-kommandot igen\n"

109 +"med -b. Till exempel:\n"

110 +"\n"

111 +" git checkout -b <namn-på-ny-gren>\n"

112 +"\n"

113 +

114 #: archive.c:12

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

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

@@ -62,7 +130,7 @@ msgstr ""

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

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

132

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

133 +#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327

134 #, c-format

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

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

@@ -75,7 +143,7 @@ msgstr "fmt"

143 msgid "archive format"

144 msgstr "arkivformat"

145

78 -#: archive.c:430 builtin/log.c:1395

146 +#: archive.c:430 builtin/log.c:1422

147 msgid "prefix"

148 msgstr "prefix"

149

@@ -83,11 +151,11 @@ msgstr "prefix"

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

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

153

86 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548

87 -#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987

154 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553

155 +#: builtin/blame.c:2554 builtin/config.c:59 builtin/fast-export.c:987

156 #: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

89 -#: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

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

157 +#: builtin/ls-files.c:460 builtin/ls-files.c:463 builtin/notes.c:399

158 +#: builtin/notes.c:562 builtin/read-tree.c:109 parse-options.h:153

159 msgid "file"

160 msgstr "fil"

161

@@ -120,7 +188,7 @@ msgid "list supported archive formats"

188 msgstr "visa understödda arkivformat"

189

190 #: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

123 -#: builtin/submodule--helper.c:776

191 +#: builtin/submodule--helper.c:832

192 msgid "repo"

193 msgstr "arkiv"

194

@@ -128,7 +196,7 @@ msgstr "arkiv"

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

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

198

131 -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:482

199 +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483

200 msgid "command"

201 msgstr "kommando"

202

@@ -136,6 +204,28 @@ msgstr "kommando"

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

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

206

207 +#: archive.c:461

208 +msgid "Unexpected option --remote"

209 +msgstr "Oväntad flagga --remote"

210 +

211 +#: archive.c:463

212 +msgid "Option --exec can only be used together with --remote"

213 +msgstr "Flaggan --exec kan endast användas tillsammans med --remote"

214 +

215 +#: archive.c:465

216 +msgid "Unexpected option --output"

217 +msgstr "Oväntad flagga --output"

218 +

219 +#: archive.c:487

220 +#, c-format

221 +msgid "Unknown archive format '%s'"

222 +msgstr "Okänt arkivformat \"%s\""

223 +

224 +#: archive.c:494

225 +#, c-format

226 +msgid "Argument not supported for format '%s': -%d"

227 +msgstr "Argumentet stöd inte för formatet \"%s\": -%d"

228 +

229 #: attr.c:263

230 msgid ""

231 "Negative patterns are ignored in git attributes\n"

@@ -144,6 +234,130 @@ msgstr ""

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

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

236

237 +#: bisect.c:441

238 +#, c-format

239 +msgid "Could not open file '%s'"

240 +msgstr "Kunde inte öppna filen \"%s\""

241 +

242 +#: bisect.c:446

243 +#, c-format

244 +msgid "Badly quoted content in file '%s': %s"

245 +msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"

246 +

247 +#: bisect.c:655

248 +#, c-format

249 +msgid "We cannot bisect more!\n"

250 +msgstr "Det finns inte mer att göra \"bisect\" på!\n"

251 +

252 +#: bisect.c:708

253 +#, c-format

254 +msgid "Not a valid commit name %s"

255 +msgstr "Namnet på incheckningen är inte giltigt: %s"

256 +

257 +#: bisect.c:732

258 +#, c-format

259 +msgid ""

260 +"The merge base %s is bad.\n"

261 +"This means the bug has been fixed between %s and [%s].\n"

262 +msgstr ""

263 +"Sammanslagningsbasen %s är trasig.\n"

264 +"Det betyder att felet har rättats mellan %s och [%s].\n"

265 +

266 +#: bisect.c:737

267 +#, c-format

268 +msgid ""

269 +"The merge base %s is new.\n"

270 +"The property has changed between %s and [%s].\n"

271 +msgstr ""

272 +"Sammanslagningsbasen %s är ny.\n"

273 +"Egenskapen har ändrats mellan %s och [%s].\n"

274 +

275 +#: bisect.c:742

276 +#, c-format

277 +msgid ""

278 +"The merge base %s is %s.\n"

279 +"This means the first '%s' commit is between %s and [%s].\n"

280 +msgstr ""

281 +"Sammanslagningsbasen %s är %s.\n"

282 +"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"

283 +

284 +#: bisect.c:750

285 +#, c-format

286 +msgid ""

287 +"Some %s revs are not ancestor of the %s rev.\n"

288 +"git bisect cannot work properly in this case.\n"

289 +"Maybe you mistook %s and %s revs?\n"

290 +msgstr ""

291 +"Några %s-revisioner är inte föräldrar till %s-revisionen.\n"

292 +"git bisect kan inte arbeta korrekt i detta fall.\n"

293 +"Kanske du skrev fel %s- och %s-revisioner?\n"

294 +

295 +#: bisect.c:763

296 +#, c-format

297 +msgid ""

298 +"the merge base between %s and [%s] must be skipped.\n"

299 +"So we cannot be sure the first %s commit is between %s and %s.\n"

300 +"We continue anyway."

301 +msgstr ""

302 +"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n"

303 +"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och "

304 +"%s.\n"

305 +"Vi fortsätter ändå."

306 +

307 +#: bisect.c:798

308 +#, c-format

309 +msgid "Bisecting: a merge base must be tested\n"

310 +msgstr "Bisect: en sammanslagningsbas måste testas\n"

311 +

312 +#: bisect.c:849

313 +#, c-format

314 +msgid "a %s revision is needed"

315 +msgstr "en %s-revision behövs"

316 +

317 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248

318 +#, c-format

319 +msgid "could not create file '%s'"

320 +msgstr "kunde inte skapa filen \"%s\""

321 +

322 +#: bisect.c:917

323 +#, c-format

324 +msgid "could not read file '%s'"

325 +msgstr "kunde inte läsa filen \"%s\""

326 +

327 +#: bisect.c:947

328 +msgid "reading bisect refs failed"

329 +msgstr "misslyckades läsa bisect-referenser"

330 +

331 +#: bisect.c:967

332 +#, c-format

333 +msgid "%s was both %s and %s\n"

334 +msgstr "%s var både %s och %s\n"

335 +

336 +#: bisect.c:975

337 +#, c-format

338 +msgid ""

339 +"No testable commit found.\n"

340 +"Maybe you started with bad path parameters?\n"

341 +msgstr ""

342 +"Ingen testbar incheckning hittades.\n"

343 +"Kanske du startade med felaktiga sökvägsparametrar?\n"

344 +

345 +#: bisect.c:994

346 +#, c-format

347 +msgid "(roughly %d step)"

348 +msgid_plural "(roughly %d steps)"

349 +msgstr[0] "(ungefär %d steg)"

350 +msgstr[1] "(ungefär %d steg)"

351 +

352 +#. TRANSLATORS: the last %s will be replaced with

353 +#. "(roughly %d steps)" translation

354 +#: bisect.c:998

355 +#, c-format

356 +msgid "Bisecting: %d revision left to test after this %s\n"

357 +msgid_plural "Bisecting: %d revisions left to test after this %s\n"

358 +msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"

359 +msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"

360 +

361 #: branch.c:53

362 #, c-format

363 msgid ""

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

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

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

508

295 -#: bundle.c:87 builtin/commit.c:777

509 +#: bundle.c:87 builtin/commit.c:778

510 #, c-format

511 msgid "could not open '%s'"

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

@@ -301,10 +515,10 @@ msgstr "kunde inte öppna \"%s\""

515 msgid "Repository lacks these prerequisite commits:"

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

517

304 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

305 -#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

306 -#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

307 -#: builtin/merge.c:361 builtin/shortlog.c:170

518 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085

519 +#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348

520 +#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901

521 +#: builtin/merge.c:356 builtin/shortlog.c:170

522 msgid "revision walk setup failed"

523 msgstr "misslyckades skapa revisionstraversering"

524

@@ -343,7 +557,7 @@ msgstr "rev-list dog"

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

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

559

346 -#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

560 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273

561 #, c-format

562 msgid "unrecognized argument: %s"

563 msgstr "okänt argument: %s"

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

575 msgid "index-pack died"

576 msgstr "index-pack dog"

577

364 -#: color.c:275

578 +#: color.c:290

579 #, c-format

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

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

582

369 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

370 -#: builtin/am.c:2134

583 +#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505

584 +#: builtin/am.c:2119

585 #, c-format

586 msgid "could not parse %s"

587 msgstr "kunde inte tolka %s"

@@ -381,128 +595,199 @@ msgstr "%s %s är inte en incheckning!"

595 msgid "memory exhausted"

596 msgstr "minnet slut"

597

384 -#: config.c:475 config.c:477

598 +#: config.c:516

599 +#, c-format

600 +msgid "bad config line %d in blob %s"

601 +msgstr "felaktig konfigurationsfil rad %d i blob:en %s"

602 +

603 +#: config.c:520

604 +#, c-format

605 +msgid "bad config line %d in file %s"

606 +msgstr "felaktig konfigurationsfil rad %d i filen %s"

607 +

608 +#: config.c:524

609 +#, c-format

610 +msgid "bad config line %d in standard input"

611 +msgstr "felaktig konfigurationsfil rad %d i standard in"

612 +

613 +#: config.c:528

614 #, c-format

386 -msgid "bad config line %d in %s %s"

387 -msgstr "felaktig konfigurationsfil rad %d i %s %s"

615 +msgid "bad config line %d in submodule-blob %s"

616 +msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"

617

389 -#: config.c:593

618 +#: config.c:532

619 #, c-format

391 -msgid "bad numeric config value '%s' for '%s' in %s %s: %s"

392 -msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s %s: %s"

620 +msgid "bad config line %d in command line %s"

621 +msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

622

394 -#: config.c:595

623 +#: config.c:536

624 +#, c-format

625 +msgid "bad config line %d in %s"

626 +msgstr "felaktig konfigurationsfil rad %d i %s"

627 +

628 +#: config.c:655

629 +msgid "out of range"

630 +msgstr "utanför intervallet"

631 +

632 +#: config.c:655

633 +msgid "invalid unit"

634 +msgstr "ogiltig enhet"

635 +

636 +#: config.c:661

637 #, c-format

638 msgid "bad numeric config value '%s' for '%s': %s"

639 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

640

399 -#: config.c:680

641 +#: config.c:666

642 +#, c-format

643 +msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

644 +msgstr ""

645 +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"

646 +

647 +#: config.c:669

648 +#, c-format

649 +msgid "bad numeric config value '%s' for '%s' in file %s: %s"

650 +msgstr ""

651 +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"

652 +

653 +#: config.c:672

654 +#, c-format

655 +msgid "bad numeric config value '%s' for '%s' in standard input: %s"

656 +msgstr ""

657 +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"

658 +

659 +#: config.c:675

660 +#, c-format

661 +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

662 +msgstr ""

663 +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"

664 +"en %s: %s"

665 +

666 +#: config.c:678

667 +#, c-format

668 +msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

669 +msgstr ""

670 +"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "

671 +"%s: %s"

672 +

673 +#: config.c:681

674 +#, c-format

675 +msgid "bad numeric config value '%s' for '%s' in %s: %s"

676 +msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"

677 +

678 +#: config.c:768

679 #, c-format

680 msgid "failed to expand user dir in: '%s'"

681 msgstr "misslyckades expandera användarkatalog i: \"%s\""

682

404 -#: config.c:761 config.c:772

683 +#: config.c:849 config.c:860

684 #, c-format

685 msgid "bad zlib compression level %d"

686 msgstr "felaktigt zlib-komprimeringsgrad %d"

687

409 -#: config.c:890

688 +#: config.c:978

689 #, c-format

690 msgid "invalid mode for object creation: %s"

691 msgstr "felaktigt läge för skapande av objekt: %s"

692

414 -#: config.c:1228

693 +#: config.c:1312

694 msgid "unable to parse command-line config"

695 msgstr "kan inte tolka kommandoradskonfiguration"

696

418 -#: config.c:1284

419 -msgid "unknown error occured while reading the configuration files"

697 +#: config.c:1362

698 +msgid "unknown error occurred while reading the configuration files"

699 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"

700

422 -#: config.c:1629

701 +#: config.c:1716

702 #, c-format

703 msgid "unable to parse '%s' from command-line config"

704 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"

705

427 -#: config.c:1631

706 +#: config.c:1718

707 #, c-format

708 msgid "bad config variable '%s' in file '%s' at line %d"

709 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"

710

432 -#: config.c:1690

711 +#: config.c:1777

712 #, c-format

713 msgid "%s has multiple values"

714 msgstr "%s har flera värden"

715

437 -#: config.c:2224

716 +#: config.c:2311

717 #, c-format

718 msgid "could not set '%s' to '%s'"

719 msgstr "kunde inte ställa in \"%s\" till \"%s\""

720

442 -#: config.c:2226

721 +#: config.c:2313

722 #, c-format

723 msgid "could not unset '%s'"

724 msgstr "kunde inte ta bort inställning för \"%s\""

725

447 -#: connected.c:69

726 +# Vague original, not networking-related, but rather related to the actual

727 +# objects in the database.

728 +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140

729 +msgid "Checking connectivity"

730 +msgstr "Kontrollerar konnektivitet"

731 +

732 +#: connected.c:74

733 msgid "Could not run 'git rev-list'"

734 msgstr "Kunde inte köra \"git rev-list\""

735

451 -#: connected.c:89

736 +#: connected.c:94

737 msgid "failed write to rev-list"

738 msgstr "kunde inte skriva till rev-list"

739

455 -#: connected.c:96

740 +#: connected.c:101

741 msgid "failed to close rev-list's stdin"

742 msgstr "kunde inte stänga rev-list:s standard in"

743

459 -#: date.c:95

744 +#: date.c:97

745 msgid "in the future"

746 msgstr "i framtiden"

747

463 -#: date.c:101

748 +#: date.c:103

749 #, c-format

750 msgid "%lu second ago"

751 msgid_plural "%lu seconds ago"

752 msgstr[0] "%lu sekund sedan"

753 msgstr[1] "%lu sekunder sedan"

754

470 -#: date.c:108

755 +#: date.c:110

756 #, c-format

757 msgid "%lu minute ago"

758 msgid_plural "%lu minutes ago"

759 msgstr[0] "%lu minut sedan"

760 msgstr[1] "%lu minuter sedan"

761

477 -#: date.c:115

762 +#: date.c:117

763 #, c-format

764 msgid "%lu hour ago"

765 msgid_plural "%lu hours ago"

766 msgstr[0] "%lu timme sedan"

767 msgstr[1] "%lu timmar sedan"

768

484 -#: date.c:122

769 +#: date.c:124

770 #, c-format

771 msgid "%lu day ago"

772 msgid_plural "%lu days ago"

773 msgstr[0] "%lu dag sedan"

774 msgstr[1] "%lu dagar sedan"

775

491 -#: date.c:128

776 +#: date.c:130

777 #, c-format

778 msgid "%lu week ago"

779 msgid_plural "%lu weeks ago"

780 msgstr[0] "%lu vecka sedan"

781 msgstr[1] "%lu veckor sedan"

782

498 -#: date.c:135

783 +#: date.c:137

784 #, c-format

785 msgid "%lu month ago"

786 msgid_plural "%lu months ago"

787 msgstr[0] "%lu månad sedan"

788 msgstr[1] "%lu månader sedan"

789

505 -#: date.c:146

790 +#: date.c:148

791 #, c-format

792 msgid "%lu year"

793 msgid_plural "%lu years"

@@ -510,14 +795,14 @@ msgstr[0] "%lu år"

795 msgstr[1] "%lu år"

796

797 #. TRANSLATORS: "%s" is "<n> years"

513 -#: date.c:149

798 +#: date.c:151

799 #, c-format

800 msgid "%s, %lu month ago"

801 msgid_plural "%s, %lu months ago"

802 msgstr[0] "%s, %lu månad sedan"

803 msgstr[1] "%s, %lu månader sedan"

804

520 -#: date.c:154 date.c:159

805 +#: date.c:156 date.c:161

806 #, c-format

807 msgid "%lu year ago"

808 msgid_plural "%lu years ago"

@@ -529,7 +814,7 @@ msgstr[1] "%lu år sedan"

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

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

816

532 -#: diffcore-rename.c:538

817 +#: diffcore-rename.c:540

818 msgid "Performing inexact rename detection"

819 msgstr "Utför onöjaktig namnbytesdetektering"

820

@@ -557,16 +842,16 @@ msgstr ""

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

843 "%s"

844

560 -#: diff.c:3007

845 +#: diff.c:3017

846 #, c-format

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

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

849

565 -#: diff.c:3405

850 +#: diff.c:3415

851 msgid "--follow requires exactly one pathspec"

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

853

569 -#: diff.c:3568

854 +#: diff.c:3578

855 #, c-format

856 msgid ""

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

@@ -575,7 +860,7 @@ msgstr ""

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

861 "%s"

862

578 -#: diff.c:3582

863 +#: diff.c:3592

864 #, c-format

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

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

@@ -588,39 +873,30 @@ msgstr "misslyckades hämta kärnans namn och information"

873 msgid "Untracked cache is disabled on this system or location."

874 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."

875

591 -#: gpg-interface.c:166 gpg-interface.c:235

592 -msgid "could not run gpg."

593 -msgstr "kunde inte köra gpg."

594 -

876 #: gpg-interface.c:178

596 -msgid "gpg did not accept the data"

597 -msgstr "gpg godtog inte data"

598 -

599 -#: gpg-interface.c:189

877 msgid "gpg failed to sign the data"

878 msgstr "gpg misslyckades signera data"

879

603 -#: gpg-interface.c:222

604 -#, c-format

605 -msgid "could not create temporary file '%s'"

606 -msgstr "kunde inte skapa temporära filen \"%s\""

880 +#: gpg-interface.c:208

881 +msgid "could not create temporary file"

882 +msgstr "kunde inte skapa temporära fil"

883

608 -#: gpg-interface.c:224

884 +#: gpg-interface.c:210

885 #, c-format

886 msgid "failed writing detached signature to '%s'"

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

888

613 -#: grep.c:1718

889 +#: grep.c:1792

890 #, c-format

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

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

893

618 -#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

894 +#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

895 #, c-format

896 msgid "failed to stat '%s'"

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

898

623 -#: grep.c:1746

899 +#: grep.c:1820

900 #, c-format

901 msgid "'%s': short read"

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

@@ -670,7 +946,7 @@ msgstr "automatiskt om %0.1f sekunder..."

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

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

948

673 -#: help.c:404 help.c:464

949 +#: help.c:404 help.c:470

950 msgid ""

951 "\n"

952 "Did you mean this?"

@@ -684,7 +960,7 @@ msgstr[1] ""

960 "\n"

961 "Menade du ett av dessa?"

962

687 -#: help.c:460

963 +#: help.c:466

964 #, c-format

965 msgid "%s: %s - %s"

966 msgstr "%s: %s - %s"

@@ -718,83 +994,78 @@ msgstr "kunde inte skapa \"%s.lock\": %s"

994 msgid "failed to read the cache"

995 msgstr "misslyckades läsa cachen"

996

721 -#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

722 -#: builtin/checkout.c:586 builtin/clone.c:732

997 +#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375

998 +#: builtin/checkout.c:589 builtin/clone.c:732

999 msgid "unable to write new index file"

1000 msgstr "kunde inte skriva ny indexfil"

1001

726 -#: merge-recursive.c:189

727 -#, c-format

1002 +#: merge-recursive.c:209

1003 msgid "(bad commit)\n"

1004 msgstr "(felaktig incheckning)\n"

1005

731 -#: merge-recursive.c:209

1006 +#: merge-recursive.c:231

1007 #, c-format

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

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

1010

736 -#: merge-recursive.c:270

1011 +#: merge-recursive.c:301

1012 msgid "error building trees"

1013 msgstr "fel vid byggande av träd"

1014

740 -#: merge-recursive.c:689

1015 +#: merge-recursive.c:720

1016 #, c-format

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

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

1019

745 -#: merge-recursive.c:700

1020 +#: merge-recursive.c:731

1021 #, c-format

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

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

1024

750 -#: merge-recursive.c:714 merge-recursive.c:735

1025 +#: merge-recursive.c:745 merge-recursive.c:764

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

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

1028

754 -#: merge-recursive.c:725

1029 +#: merge-recursive.c:754

1030 #, c-format

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

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

1033

759 -#: merge-recursive.c:765

1034 +#: merge-recursive.c:796

1035 #, c-format

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

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

1038

764 -#: merge-recursive.c:767

1039 +#: merge-recursive.c:798

1040 #, c-format

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

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

1043

769 -#: merge-recursive.c:790 builtin/clone.c:376

1044 +#: merge-recursive.c:822

1045 #, c-format

771 -msgid "failed to open '%s'"

772 -msgstr "misslyckades öppna \"%s\""

1046 +msgid "failed to open '%s': %s"

1047 +msgstr "misslyckades öppna \"%s\": %s"

1048

774 -#: merge-recursive.c:798

1049 +#: merge-recursive.c:833

1050 #, c-format

776 -msgid "failed to symlink '%s'"

777 -msgstr "misslyckades skapa symboliska länken \"%s\""

1051 +msgid "failed to symlink '%s': %s"

1052 +msgstr "misslyckades skapa symboliska länken \"%s\": %s"

1053

779 -#: merge-recursive.c:801

1054 +#: merge-recursive.c:838

1055 #, c-format

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

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

1058

784 -#: merge-recursive.c:939

1059 +#: merge-recursive.c:978

1060 msgid "Failed to execute internal merge"

1061 msgstr "Misslyckades exekvera intern sammanslagning"

1062

788 -#: merge-recursive.c:943

1063 +#: merge-recursive.c:982

1064 #, c-format

1065 msgid "Unable to add %s to database"

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

1067

793 -#: merge-recursive.c:959

794 -msgid "unsupported object type in the tree"

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

796 -

797 -#: merge-recursive.c:1034 merge-recursive.c:1048

1068 +#: merge-recursive.c:1081 merge-recursive.c:1095

1069 #, c-format

1070 msgid ""

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

@@ -803,7 +1074,7 @@ msgstr ""

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

1075 "i trädet."

1076

806 -#: merge-recursive.c:1040 merge-recursive.c:1053

1077 +#: merge-recursive.c:1087 merge-recursive.c:1100

1078 #, c-format

1079 msgid ""

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

@@ -812,20 +1083,20 @@ msgstr ""

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

1084 "i trädet vid %s."

1085

815 -#: merge-recursive.c:1094

1086 +#: merge-recursive.c:1143

1087 msgid "rename"

1088 msgstr "namnbyte"

1089

819 -#: merge-recursive.c:1094

1090 +#: merge-recursive.c:1143

1091 msgid "renamed"

1092 msgstr "namnbytt"

1093

823 -#: merge-recursive.c:1150

1094 +#: merge-recursive.c:1200

1095 #, c-format

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

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

1098

828 -#: merge-recursive.c:1172

1099 +#: merge-recursive.c:1225

1100 #, c-format

1101 msgid ""

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

@@ -834,144 +1105,135 @@ msgstr ""

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

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

1107

837 -#: merge-recursive.c:1177

1108 +#: merge-recursive.c:1230

1109 msgid " (left unresolved)"

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

1111

841 -#: merge-recursive.c:1231

1112 +#: merge-recursive.c:1292

1113 #, c-format

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

1115 msgstr ""

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

1117

847 -#: merge-recursive.c:1261

1118 +#: merge-recursive.c:1325

1119 #, c-format

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

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

1122

852 -#: merge-recursive.c:1460

1123 +#: merge-recursive.c:1531

1124 #, c-format

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

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

1127

857 -#: merge-recursive.c:1470

1128 +#: merge-recursive.c:1546

1129 #, c-format

1130 msgid "Adding merged %s"

1131 msgstr "Lägger till sammanslagen %s"

1132

862 -#: merge-recursive.c:1475 merge-recursive.c:1677

1133 +#: merge-recursive.c:1553 merge-recursive.c:1766

1134 #, c-format

1135 msgid "Adding as %s instead"

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

1137

867 -#: merge-recursive.c:1526

1138 +#: merge-recursive.c:1610

1139 #, c-format

1140 msgid "cannot read object %s"

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

1142

872 -#: merge-recursive.c:1529

1143 +#: merge-recursive.c:1613

1144 #, c-format

1145 msgid "object %s is not a blob"

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

1147

877 -#: merge-recursive.c:1581

1148 +#: merge-recursive.c:1666

1149 msgid "modify"

1150 msgstr "ändra"

1151

881 -#: merge-recursive.c:1581

1152 +#: merge-recursive.c:1666

1153 msgid "modified"

1154 msgstr "ändrad"

1155

885 -#: merge-recursive.c:1591

1156 +#: merge-recursive.c:1676

1157 msgid "content"

1158 msgstr "innehåll"

1159

889 -#: merge-recursive.c:1598

1160 +#: merge-recursive.c:1683

1161 msgid "add/add"

1162 msgstr "tillägg/tillägg"

1163

893 -#: merge-recursive.c:1632

1164 +#: merge-recursive.c:1718

1165 #, c-format

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

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

1168

898 -#: merge-recursive.c:1646

1169 +#: merge-recursive.c:1732

1170 #, c-format

1171 msgid "Auto-merging %s"

1172 msgstr "Slår ihop %s automatiskt"

1173

903 -#: merge-recursive.c:1650 git-submodule.sh:941

1174 +#: merge-recursive.c:1736 git-submodule.sh:919

1175 msgid "submodule"

1176 msgstr "undermodul"

1177

907 -#: merge-recursive.c:1651

1178 +#: merge-recursive.c:1737

1179 #, c-format

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

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

1182

912 -#: merge-recursive.c:1737

1183 +#: merge-recursive.c:1831

1184 #, c-format

1185 msgid "Removing %s"

1186 msgstr "Tar bort %s"

1187

917 -#: merge-recursive.c:1762

1188 +#: merge-recursive.c:1857

1189 msgid "file/directory"

1190 msgstr "fil/katalog"

1191

921 -#: merge-recursive.c:1768

1192 +#: merge-recursive.c:1863

1193 msgid "directory/file"

1194 msgstr "katalog/fil"

1195

925 -#: merge-recursive.c:1773

1196 +#: merge-recursive.c:1868

1197 #, c-format

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

1199 msgstr ""

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

1201

931 -#: merge-recursive.c:1781

1202 +#: merge-recursive.c:1877

1203 #, c-format

1204 msgid "Adding %s"

1205 msgstr "Lägger till %s"

1206

936 -#: merge-recursive.c:1798

937 -msgid "Fatal merge failure, shouldn't happen."

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

939 -

940 -#: merge-recursive.c:1817

1207 +#: merge-recursive.c:1914

1208 msgid "Already up-to-date!"

1209 msgstr "Redan à jour!"

1210

944 -#: merge-recursive.c:1826

1211 +#: merge-recursive.c:1923

1212 #, c-format

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

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

1215

949 -#: merge-recursive.c:1856

950 -#, c-format

951 -msgid "Unprocessed path??? %s"

952 -msgstr "Obehandlad sökväg??? %s"

953 -

954 -#: merge-recursive.c:1904

1216 +#: merge-recursive.c:2006

1217 msgid "Merging:"

1218 msgstr "Slår ihop:"

1219

958 -#: merge-recursive.c:1917

1220 +#: merge-recursive.c:2019

1221 #, c-format

1222 msgid "found %u common ancestor:"

1223 msgid_plural "found %u common ancestors:"

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

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

1226

965 -#: merge-recursive.c:1954

1227 +#: merge-recursive.c:2058

1228 msgid "merge returned no commit"

1229 msgstr "sammanslagningen returnerade ingen incheckning"

1230

969 -#: merge-recursive.c:2011

1231 +#: merge-recursive.c:2121

1232 #, c-format

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

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

1235

974 -#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

1236 +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788

1237 msgid "Unable to write index."

1238 msgstr "Kunde inte skriva indexet."

1239

@@ -1031,7 +1293,7 @@ msgstr "-TAL"

1293 msgid "malformed object name '%s'"

1294 msgstr "felformat objektnamn \"%s\""

1295

1034 -#: path.c:796

1296 +#: path.c:798

1297 #, c-format

1298 msgid "Could not make %s writable by group"

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

@@ -1101,7 +1363,7 @@ msgstr ""

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

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

1365

1104 -#: pretty.c:971

1366 +#: pretty.c:973

1367 msgid "unable to parse --pretty format"

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

1369

@@ -1127,23 +1389,22 @@ msgstr ""

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

1390 "Använder version %i"

1391

1130 -#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1131 -#: builtin/merge.c:995

1392 +#: refs.c:551 builtin/merge.c:840

1393 #, c-format

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

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

1396

1136 -#: refs/files-backend.c:2243

1397 +#: refs/files-backend.c:2534

1398 #, c-format

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

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

1401

1141 -#: refs/files-backend.c:2246

1402 +#: refs/files-backend.c:2537

1403 #, c-format

1404 msgid "could not delete references: %s"

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

1406

1146 -#: refs/files-backend.c:2255

1407 +#: refs/files-backend.c:2546

1408 #, c-format

1409 msgid "could not remove reference %s"

1410 msgstr "kunde inte ta bort referensen %s"

@@ -1301,74 +1562,74 @@ msgstr "%s spårar både %s och %s"

1562 msgid "Internal error"

1563 msgstr "Internt fel"

1564

1304 -#: remote.c:1678 remote.c:1721

1565 +#: remote.c:1677 remote.c:1720

1566 msgid "HEAD does not point to a branch"

1567 msgstr "HEAD pekar inte på en gren"

1568

1308 -#: remote.c:1687

1569 +#: remote.c:1686

1570 #, c-format

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

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

1573

1313 -#: remote.c:1690

1574 +#: remote.c:1689

1575 #, c-format

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

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

1578

1318 -#: remote.c:1696

1579 +#: remote.c:1695

1580 #, c-format

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

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

1583

1323 -#: remote.c:1711

1584 +#: remote.c:1710

1585 #, c-format

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

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

1588

1328 -#: remote.c:1726

1589 +#: remote.c:1725

1590 #, c-format

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

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

1593

1333 -#: remote.c:1737

1594 +#: remote.c:1736

1595 #, c-format

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

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

1598

1338 -#: remote.c:1750

1599 +#: remote.c:1749

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

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

1602

1342 -#: remote.c:1772

1603 +#: remote.c:1771

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

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

1606

1346 -#: remote.c:2074

1607 +#: remote.c:2073

1608 #, c-format

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

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

1611

1351 -#: remote.c:2078

1612 +#: remote.c:2077

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

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

1615

1355 -#: remote.c:2081

1616 +#: remote.c:2080

1617 #, c-format

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

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

1620

1360 -#: remote.c:2085

1621 +#: remote.c:2084

1622 #, c-format

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

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

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

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

1627

1367 -#: remote.c:2091

1628 +#: remote.c:2090

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

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

1631

1371 -#: remote.c:2094

1632 +#: remote.c:2093

1633 #, c-format

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

1635 msgid_plural ""

@@ -1378,11 +1639,11 @@ msgstr[0] ""

1639 msgstr[1] ""

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

1641

1381 -#: remote.c:2102

1642 +#: remote.c:2101

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

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

1645

1385 -#: remote.c:2105

1646 +#: remote.c:2104

1647 #, c-format

1648 msgid ""

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

@@ -1397,20 +1658,20 @@ msgstr[1] ""

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

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

1660

1400 -#: remote.c:2115

1661 +#: remote.c:2114

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

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

1664

1404 -#: revision.c:2142

1665 +#: revision.c:2132

1666 msgid "your current branch appears to be broken"

1667 msgstr "din nuvarande gren verkar vara trasig"

1668

1408 -#: revision.c:2145

1669 +#: revision.c:2135

1670 #, c-format

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

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

1673

1413 -#: revision.c:2339

1674 +#: revision.c:2329

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

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

1677

@@ -1423,15 +1684,15 @@ msgstr "misslyckades öppna /dev/null"

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

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

1686

1426 -#: send-pack.c:295

1687 +#: send-pack.c:298

1688 msgid "failed to sign the push certificate"

1689 msgstr "misslyckades underteckna push-certifikatet"

1690

1430 -#: send-pack.c:404

1691 +#: send-pack.c:411

1692 msgid "the receiving end does not support --signed push"

1693 msgstr "mottagarsidan stöder inte push med --signed"

1694

1434 -#: send-pack.c:406

1695 +#: send-pack.c:413

1696 msgid ""

1697 "not sending a push certificate since the receiving end does not support --"

1698 "signed push"

@@ -1439,10 +1700,14 @@ msgstr ""

1700 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

1701 "signed"

1702

1442 -#: send-pack.c:418

1703 +#: send-pack.c:425

1704 msgid "the receiving end does not support --atomic push"

1705 msgstr "mottagarsidan stöder inte push med --atomic"

1706

1707 +#: send-pack.c:430

1708 +msgid "the receiving end does not support push options"

1709 +msgstr "mottagarsidan stöder inte push-flaggor"

1710 +

1711 #: sequencer.c:174

1712 msgid ""

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

@@ -1461,15 +1726,15 @@ msgstr ""

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

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

1728

1464 -#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1729 +#: sequencer.c:190 sequencer.c:841 sequencer.c:924

1730 #, c-format

1731 msgid "Could not write to %s"

1732 msgstr "Kunde inte skriva till %s"

1733

1469 -#: sequencer.c:193

1734 +#: sequencer.c:193 sequencer.c:843 sequencer.c:928

1735 #, c-format

1471 -msgid "Error wrapping up %s"

1472 -msgstr "Fel vid ombrytning av %s"

1736 +msgid "Error wrapping up %s."

1737 +msgstr "Fel vid ombrytning av %s."

1738

1739 #: sequencer.c:208

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

@@ -1483,202 +1748,242 @@ msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."

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

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

1750

1751 +#: sequencer.c:228

1752 +#, c-format

1753 +msgid "%s: fast-forward"

1754 +msgstr "%s: snabbspola"

1755 +

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

1487 -#: sequencer.c:300

1757 +#: sequencer.c:303

1758 #, c-format

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

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

1761

1492 -#: sequencer.c:318

1762 +#: sequencer.c:321

1763 msgid "Could not resolve HEAD commit\n"

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

1765

1496 -#: sequencer.c:338

1766 +#: sequencer.c:341

1767 msgid "Unable to update cache tree\n"

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

1769

1500 -#: sequencer.c:390

1770 +#: sequencer.c:393

1771 #, c-format

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

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

1774

1505 -#: sequencer.c:395

1775 +#: sequencer.c:398

1776 #, c-format

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

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

1779

1510 -#: sequencer.c:460

1780 +#: sequencer.c:463

1781 msgid "Your index file is unmerged."

1782 msgstr "Din indexfil har inte slagits ihop."

1783

1514 -#: sequencer.c:479

1784 +#: sequencer.c:482

1785 #, c-format

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

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

1788

1519 -#: sequencer.c:487

1789 +#: sequencer.c:490

1790 #, c-format

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

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

1793

1524 -#: sequencer.c:491

1794 +#: sequencer.c:494

1795 #, c-format

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

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

1798

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

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

1531 -#: sequencer.c:504

1801 +#: sequencer.c:507

1802 #, c-format

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

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

1805

1536 -#: sequencer.c:508

1806 +#: sequencer.c:511

1807 #, c-format

1808 msgid "Cannot get commit message for %s"

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

1810

1541 -#: sequencer.c:594

1811 +#: sequencer.c:597

1812 #, c-format

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

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

1815

1546 -#: sequencer.c:595

1816 +#: sequencer.c:598

1817 #, c-format

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

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

1820

1551 -#: sequencer.c:630

1821 +#: sequencer.c:633

1822 msgid "empty commit set passed"

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

1824

1555 -#: sequencer.c:638

1825 +#: sequencer.c:641

1826 #, c-format

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

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

1829

1560 -#: sequencer.c:642

1830 +#: sequencer.c:645

1831 #, c-format

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

1833 msgstr "git %s: misslyckades uppdatera indexet"

1834

1565 -#: sequencer.c:702

1566 -#, c-format

1567 -msgid "Cannot %s during a %s"

1568 -msgstr "kan inte %s under en %s"

1835 +#: sequencer.c:705

1836 +msgid "Cannot revert during another revert."

1837 +msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."

1838

1570 -#: sequencer.c:724

1839 +#: sequencer.c:706

1840 +msgid "Cannot revert during a cherry-pick."

1841 +msgstr "Kan inte utföra \"revert\" under en \"cherry-pick\"."

1842 +

1843 +#: sequencer.c:709

1844 +msgid "Cannot cherry-pick during a revert."

1845 +msgstr "Kan inte utföra \"cherry-pick\" under en \"revert\"."

1846 +

1847 +#: sequencer.c:710

1848 +msgid "Cannot cherry-pick during another cherry-pick."

1849 +msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."

1850 +

1851 +#: sequencer.c:732

1852 #, c-format

1853 msgid "Could not parse line %d."

1854 msgstr "Kan inte tolka rad %d."

1855

1575 -#: sequencer.c:729

1856 +#: sequencer.c:737

1857 msgid "No commits parsed."

1858 msgstr "Inga incheckningar lästes."

1859

1579 -#: sequencer.c:741

1860 +#: sequencer.c:749

1861 #, c-format

1862 msgid "Could not open %s"

1863 msgstr "Kunde inte öppna %s"

1864

1584 -#: sequencer.c:745

1865 +#: sequencer.c:753

1866 #, c-format

1867 msgid "Could not read %s."

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

1869

1589 -#: sequencer.c:752

1870 +#: sequencer.c:760

1871 #, c-format

1872 msgid "Unusable instruction sheet: %s"

1873 msgstr "Oanvändbart manus: %s"

1874

1594 -#: sequencer.c:782

1875 +#: sequencer.c:790

1876 #, c-format

1877 msgid "Invalid key: %s"

1878 msgstr "Felaktig nyckel: %s"

1879

1599 -#: sequencer.c:785 builtin/pull.c:50 builtin/pull.c:52

1880 +#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52

1881 #, c-format

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

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

1884

1604 -#: sequencer.c:795

1885 +#: sequencer.c:803

1886 #, c-format

1887 msgid "Malformed options sheet: %s"

1888 msgstr "Trasigt manus: %s"

1889

1609 -#: sequencer.c:814

1890 +#: sequencer.c:822

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

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

1893

1613 -#: sequencer.c:815

1894 +#: sequencer.c:823

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

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

1897

1617 -#: sequencer.c:819

1898 +#: sequencer.c:827

1899 #, c-format

1900 msgid "Could not create sequencer directory %s"

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

1902

1622 -#: sequencer.c:835 sequencer.c:916

1623 -#, c-format

1624 -msgid "Error wrapping up %s."

1625 -msgstr "Fel vid ombrytning av %s."

1626 -

1627 -#: sequencer.c:854 sequencer.c:986

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

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

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

1906

1631 -#: sequencer.c:856

1907 +#: sequencer.c:864

1908 msgid "cannot resolve HEAD"

1909 msgstr "kan inte bestämma HEAD"

1910

1635 -#: sequencer.c:858

1911 +#: sequencer.c:866 sequencer.c:900

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

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

1914

1639 -#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1915 +#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970

1916 #, c-format

1917 msgid "cannot open %s"

1918 msgstr "kan inte öppna %s"

1919

1644 -#: sequencer.c:880

1920 +#: sequencer.c:888

1921 #, c-format

1922 msgid "cannot read %s: %s"

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

1924

1649 -#: sequencer.c:881

1925 +#: sequencer.c:889

1926 msgid "unexpected end of file"

1927 msgstr "oväntat filslut"

1928

1653 -#: sequencer.c:887

1929 +#: sequencer.c:895

1930 #, c-format

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

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

1933

1658 -#: sequencer.c:909

1934 +#: sequencer.c:921

1935 #, c-format

1936 msgid "Could not format %s."

1937 msgstr "Kunde inte formatera %s."

1938

1663 -#: sequencer.c:1054

1939 +#: sequencer.c:1066

1940 #, c-format

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

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

1943

1668 -#: sequencer.c:1057

1944 +#: sequencer.c:1069

1945 #, c-format

1946 msgid "%s: bad revision"

1947 msgstr "%s: felaktig revision"

1948

1673 -#: sequencer.c:1091

1949 +#: sequencer.c:1102

1950 msgid "Can't revert as initial commit"

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

1952

1677 -#: sequencer.c:1092

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

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

1953 +#: setup.c:160

1954 +#, c-format

1955 +msgid ""

1956 +"%s: no such path in the working tree.\n"

1957 +"Use 'git <command> -- <path>...' to specify paths that do not exist locally."

1958 +msgstr ""

1959 +"%s: sökvägen finns inte i arbetskatalogen.\n"

1960 +"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "

1961 +"lokalt."

1962 +

1963 +#: setup.c:173

1964 +#, c-format

1965 +msgid ""

1966 +"ambiguous argument '%s': unknown revision or path not in the working tree.\n"

1967 +"Use '--' to separate paths from revisions, like this:\n"

1968 +"'git <command> [<revision>...] -- [<file>...]'"

1969 +msgstr ""

1970 +"tvetydigt argument \"%s\": okänd revision eller sökväg inte i "

1971 +"arbetskatalogen.\n"

1972 +"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

1973 +"\"git <kommando> [<revision>...] -- [<fil>...]\""

1974 +

1975 +#: setup.c:223

1976 +#, c-format

1977 +msgid ""

1978 +"ambiguous argument '%s': both revision and filename\n"

1979 +"Use '--' to separate paths from revisions, like this:\n"

1980 +"'git <command> [<revision>...] -- [<file>...]'"

1981 +msgstr ""

1982 +"tvetydigt argument \"%s\": både revision och filnamn\n"

1983 +"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

1984 +"\"git <kommando> [<revision>...] -- [<fil>...]\""

1985

1681 -#: setup.c:248

1986 +#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419

1987 #, c-format

1988 msgid "failed to read %s"

1989 msgstr "misslyckades läsa %s"

@@ -1692,16 +1997,53 @@ msgstr "Förväntade git-arkivversion <= %d, hittade %d"

1997 msgid "unknown repository extensions found:"

1998 msgstr "okända arkivutökningar hittades:"

1999

1695 -#: sha1_file.c:1080

2000 +#: setup.c:762

2001 +#, c-format

2002 +msgid "Not a git repository (or any of the parent directories): %s"

2003 +msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

2004 +

2005 +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641

2006 +msgid "Cannot come back to cwd"

2007 +msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

2008 +

2009 +#: setup.c:845

2010 +msgid "Unable to read current working directory"

2011 +msgstr "Kan inte läsa aktuell arbetskatalog"

2012 +

2013 +#: setup.c:920

2014 +#, c-format

2015 +msgid ""

2016 +"Not a git repository (or any parent up to mount point %s)\n"

2017 +"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

2018 +msgstr ""

2019 +"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "

2020 +"monteringspunkten %s)\n"

2021 +"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

2022 +

2023 +#: setup.c:927

2024 +#, c-format

2025 +msgid "Cannot change to '%s/..'"

2026 +msgstr "kan inte byta till \"%s/..\""

2027 +

2028 +#: setup.c:989

2029 +#, c-format

2030 +msgid ""

2031 +"Problem with core.sharedRepository filemode value (0%.3o).\n"

2032 +"The owner of files must always have read and write permissions."

2033 +msgstr ""

2034 +"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

2035 +"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

2036 +

2037 +#: sha1_file.c:1046

2038 msgid "offset before end of packfile (broken .idx?)"

2039 msgstr "offset före slutet av packfilen (trasig .idx?)"

2040

1699 -#: sha1_file.c:2458

2041 +#: sha1_file.c:2434

2042 #, c-format

2043 msgid "offset before start of pack index for %s (corrupt index?)"

2044 msgstr "offset före slutet av packindex för %s (trasigt index?)"

2045

1704 -#: sha1_file.c:2462

2046 +#: sha1_file.c:2438

2047 #, c-format

2048 msgid "offset beyond end of pack index for %s (truncated index?)"

2049 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -1757,7 +2099,7 @@ msgstr "misslyckades köa uppdaterad .gitmodules"

2099 msgid "negative values not allowed for submodule.fetchJobs"

2100 msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"

2101

1760 -#: submodule-config.c:355

2102 +#: submodule-config.c:358

2103 #, c-format

2104 msgid "invalid value for %s"

2105 msgstr "ogiltigt värde för %s"

@@ -1816,6 +2158,56 @@ msgstr "kunde inte öppna temporär file"

2158 msgid "could not rename temporary file to %s"

2159 msgstr "kunde inte byta nman på temporära file till %s"

2160

2161 +#: transport.c:62

2162 +#, c-format

2163 +msgid "Would set upstream of '%s' to '%s' of '%s'\n"

2164 +msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

2165 +

2166 +#: transport.c:151

2167 +#, c-format

2168 +msgid "transport: invalid depth option '%s'"

2169 +msgstr "transport: ogiltig flagga för depth: %s"

2170 +

2171 +#: transport.c:771

2172 +#, c-format

2173 +msgid ""

2174 +"The following submodule paths contain changes that can\n"

2175 +"not be found on any remote:\n"

2176 +msgstr ""

2177 +"Följande undermodulsökvägar innehåller ändringar som\n"

2178 +"inte kan hittas av fjärrarna:\n"

2179 +

2180 +#: transport.c:775

2181 +#, c-format

2182 +msgid ""

2183 +"\n"

2184 +"Please try\n"

2185 +"\n"

2186 +"\tgit push --recurse-submodules=on-demand\n"

2187 +"\n"

2188 +"or cd to the path and use\n"

2189 +"\n"

2190 +"\tgit push\n"

2191 +"\n"

2192 +"to push them to a remote.\n"

2193 +"\n"

2194 +msgstr ""

2195 +"\n"

2196 +"Testa\n"

2197 +"\n"

2198 +"\tgit push --recurse-submodules=on-demand\n"

2199 +"\n"

2200 +"eller cd till sökvägen och använd\n"

2201 +"\n"

2202 +"\tgit push\n"

2203 +"\n"

2204 +"för att sända dem till fjärren.\n"

2205 +"\n"

2206 +

2207 +#: transport.c:783

2208 +msgid "Aborting."

2209 +msgstr "Avbryter."

2210 +

2211 #: transport-helper.c:1041

2212 #, c-format

2213 msgid "Could not read ref %s"

@@ -1825,7 +2217,7 @@ msgstr "Kunde inte läsa referensen %s"

2217 #, c-format

2218 msgid ""

2219 "Your local changes to the following files would be overwritten by checkout:\n"

1828 -"%%sPlease commit your changes or stash them before you can switch branches."

2220 +"%%sPlease commit your changes or stash them before you switch branches."

2221 msgstr ""

2222 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

2223 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

@@ -1843,7 +2235,7 @@ msgstr ""

2235 #, c-format

2236 msgid ""

2237 "Your local changes to the following files would be overwritten by merge:\n"

1846 -"%%sPlease commit your changes or stash them before you can merge."

2238 +"%%sPlease commit your changes or stash them before you merge."

2239 msgstr ""

2240 "Dina lokala ändringar av följande filer skulle skrivas över av "

2241 "sammanslagning:\n"

@@ -1863,11 +2255,10 @@ msgstr ""

2255 #, c-format

2256 msgid ""

2257 "Your local changes to the following files would be overwritten by %s:\n"

1866 -"%%sPlease commit your changes or stash them before you can %s."

2258 +"%%sPlease commit your changes or stash them before you %s."

2259 msgstr ""

2260 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

1869 -"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s"

1870 -"\"."

2261 +"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

2262

2263 #: unpack-trees.c:76

2264 #, c-format

@@ -1892,7 +2283,7 @@ msgstr ""

2283 #, c-format

2284 msgid ""

2285 "The following untracked working tree files would be removed by checkout:\n"

1895 -"%%sPlease move or remove them before you can switch branches."

2286 +"%%sPlease move or remove them before you switch branches."

2287 msgstr ""

2288 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

2289 "%%sFlytta eller ta bort dem innan du byter gren."

@@ -1910,11 +2301,11 @@ msgstr ""

2301 #, c-format

2302 msgid ""

2303 "The following untracked working tree files would be removed by merge:\n"

1913 -"%%sPlease move or remove them before you can merge."

2304 +"%%sPlease move or remove them before you merge."

2305 msgstr ""

2306 "Följande ospårade filer i arbetskatalogen skulle tas bort av "

2307 "sammanslagningen:\n"

1917 -"%%sFlytta eller ta bort dem innan du byter gren."

2308 +"%%sFlytta eller ta bort dem innan du slår samman."

2309

2310 #: unpack-trees.c:92

2311 #, c-format

@@ -1930,10 +2321,10 @@ msgstr ""

2321 #, c-format

2322 msgid ""

2323 "The following untracked working tree files would be removed by %s:\n"

1933 -"%%sPlease move or remove them before you can %s."

2324 +"%%sPlease move or remove them before you %s."

2325 msgstr ""

2326 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

1936 -"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"."

2327 +"%%sFlytta eller ta bort dem innan du \"%s\"."

2328

2329 #: unpack-trees.c:97

2330 #, c-format

@@ -1949,7 +2340,7 @@ msgstr ""

2340 msgid ""

2341 "The following untracked working tree files would be overwritten by "

2342 "checkout:\n"

1952 -"%%sPlease move or remove them before you can switch branches."

2343 +"%%sPlease move or remove them before you switch branches."

2344 msgstr ""

2345 "Följande ospårade filer i arbetskatalogen skulle skrivas över av "

2346 "utcheckningen:\n"

@@ -1970,7 +2361,7 @@ msgstr ""

2361 #, c-format

2362 msgid ""

2363 "The following untracked working tree files would be overwritten by merge:\n"

1973 -"%%sPlease move or remove them before you can merge."

2364 +"%%sPlease move or remove them before you merge."

2365 msgstr ""

2366 "Följande ospårade filer i arbetskatalogen skulle skrivas över av "

2367 "sammanslagningen:\n"

@@ -1990,10 +2381,10 @@ msgstr ""

2381 #, c-format

2382 msgid ""

2383 "The following untracked working tree files would be overwritten by %s:\n"

1993 -"%%sPlease move or remove them before you can %s."

2384 +"%%sPlease move or remove them before you %s."

2385 msgstr ""

2386 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

1996 -"%%sFlytta eller ta bort dem innan du kan \"%s\"."

2387 +"%%sFlytta eller ta bort dem innan du \"%s\"."

2388

2389 #: unpack-trees.c:114

2390 #, c-format

@@ -2078,43 +2469,43 @@ msgstr "felaktigt portnummer"

2469 msgid "invalid '..' path segment"

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

2471

2081 -#: wrapper.c:222 wrapper.c:381

2472 +#: worktree.c:282

2473 +#, c-format

2474 +msgid "failed to read '%s'"

2475 +msgstr "misslyckades läsa \"%s\""

2476 +

2477 +#: wrapper.c:222 wrapper.c:392

2478 #, c-format

2479 msgid "could not open '%s' for reading and writing"

2480 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

2481

2086 -#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2482 +#: wrapper.c:224 wrapper.c:394 builtin/am.c:778

2483 #, c-format

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

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

2486

2091 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

2092 -#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2487 +#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771

2488 +#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029

2489 #: builtin/pull.c:407

2490 #, c-format

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

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

2493

2098 -#: wrapper.c:594 wrapper.c:615

2494 +#: wrapper.c:605 wrapper.c:626

2495 #, c-format

2496 msgid "unable to access '%s'"

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

2498

2103 -#: wrapper.c:623

2499 +#: wrapper.c:634

2500 msgid "unable to get current working directory"

2501 msgstr "kan inte hämta aktuell arbetskatalog"

2502

2107 -#: wrapper.c:650

2108 -#, c-format

2109 -msgid "could not open %s for writing"

2110 -msgstr "kunde inte öppna %s för skrivning"

2111 -

2112 -#: wrapper.c:661 builtin/am.c:410

2503 +#: wrapper.c:658

2504 #, c-format

2505 msgid "could not write to %s"

2506 msgstr "kunde inte skriva till %s"

2507

2117 -#: wrapper.c:667

2508 +#: wrapper.c:660

2509 #, c-format

2510 msgid "could not close %s"

2511 msgstr "kunde inte stänga %s"

@@ -2144,11 +2535,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)

2535 msgid " (use \"git rm <file>...\" to mark resolution)"

2536 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

2537

2147 -#: wt-status.c:198 wt-status.c:881

2538 +#: wt-status.c:198 wt-status.c:882

2539 msgid "Changes to be committed:"

2540 msgstr "Ändringar att checka in:"

2541

2151 -#: wt-status.c:216 wt-status.c:890

2542 +#: wt-status.c:216 wt-status.c:891

2543 msgid "Changes not staged for commit:"

2544 msgstr "Ändringar ej i incheckningskön:"

2545

@@ -2208,11 +2599,6 @@ msgstr "tillagt av bägge:"

2599 msgid "both modified:"

2600 msgstr "ändrat av bägge:"

2601

2211 -#: wt-status.c:266

2212 -#, c-format

2213 -msgid "bug: unhandled unmerged status %x"

2214 -msgstr "programfel: ej hanterad \"unmerged\"-status %x"

2215 -

2602 #: wt-status.c:274

2603 msgid "new file:"

2604 msgstr "ny fil:"

@@ -2257,20 +2643,15 @@ msgstr "ändrat innehåll, "

2643 msgid "untracked content, "

2644 msgstr "ospårat innehåll, "

2645

2260 -#: wt-status.c:391

2261 -#, c-format

2262 -msgid "bug: unhandled diff status %c"

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

2264 -

2265 -#: wt-status.c:755

2646 +#: wt-status.c:756

2647 msgid "Submodules changed but not updated:"

2648 msgstr "Undermoduler ändrade men inte uppdaterade:"

2649

2269 -#: wt-status.c:757

2650 +#: wt-status.c:758

2651 msgid "Submodule changes to be committed:"

2652 msgstr "Undermodulers ändringar att checka in:"

2653

2273 -#: wt-status.c:838

2654 +#: wt-status.c:839

2655 msgid ""

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

2657 "Everything below will be removed."

@@ -2278,99 +2659,103 @@ msgstr ""

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

2660 "Allt nedan kommer tas bort."

2661

2281 -#: wt-status.c:949

2662 +#: wt-status.c:950

2663 msgid "You have unmerged paths."

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

2665

2285 -#: wt-status.c:952

2666 +#: wt-status.c:953

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

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

2669

2289 -#: wt-status.c:956

2670 +#: wt-status.c:955

2671 +msgid " (use \"git merge --abort\" to abort the merge)"

2672 +msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

2673 +

2674 +#: wt-status.c:960

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

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

2677

2293 -#: wt-status.c:959

2678 +#: wt-status.c:963

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

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

2681

2297 -#: wt-status.c:969

2682 +#: wt-status.c:973

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

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

2685

2301 -#: wt-status.c:972

2686 +#: wt-status.c:976

2687 msgid "The current patch is empty."

2688 msgstr "Aktuell patch är tom."

2689

2305 -#: wt-status.c:976

2690 +#: wt-status.c:980

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

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

2693

2309 -#: wt-status.c:978

2694 +#: wt-status.c:982

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

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

2697

2313 -#: wt-status.c:980

2698 +#: wt-status.c:984

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

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

2701

2317 -#: wt-status.c:1105

2702 +#: wt-status.c:1109

2703 msgid "No commands done."

2704 msgstr "Inga kommandon utförda."

2705

2321 -#: wt-status.c:1108

2706 +#: wt-status.c:1112

2707 #, c-format

2708 msgid "Last command done (%d command done):"

2709 msgid_plural "Last commands done (%d commands done):"

2710 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

2711 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

2712

2328 -#: wt-status.c:1119

2713 +#: wt-status.c:1123

2714 #, c-format

2715 msgid " (see more in file %s)"

2716 msgstr " (se fler i filen %s)"

2717

2333 -#: wt-status.c:1124

2718 +#: wt-status.c:1128

2719 msgid "No commands remaining."

2720 msgstr "Inga kommandon återstår."

2721

2337 -#: wt-status.c:1127

2722 +#: wt-status.c:1131

2723 #, c-format

2724 msgid "Next command to do (%d remaining command):"

2725 msgid_plural "Next commands to do (%d remaining commands):"

2726 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

2727 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

2728

2344 -#: wt-status.c:1135

2729 +#: wt-status.c:1139

2730 msgid " (use \"git rebase --edit-todo\" to view and edit)"

2731 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

2732

2348 -#: wt-status.c:1148

2733 +#: wt-status.c:1152

2734 #, c-format

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

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

2737

2353 -#: wt-status.c:1153

2738 +#: wt-status.c:1157

2739 msgid "You are currently rebasing."

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

2741

2357 -#: wt-status.c:1167

2742 +#: wt-status.c:1171

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

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

2745

2361 -#: wt-status.c:1169

2746 +#: wt-status.c:1173

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

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

2749

2365 -#: wt-status.c:1171

2750 +#: wt-status.c:1175

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

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

2753

2369 -#: wt-status.c:1177

2754 +#: wt-status.c:1181

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

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

2757

2373 -#: wt-status.c:1181

2758 +#: wt-status.c:1185

2759 #, c-format

2760 msgid ""

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

@@ -2378,122 +2763,122 @@ msgstr ""

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

2764 "ovanpå \"%s\"."

2765

2381 -#: wt-status.c:1186

2766 +#: wt-status.c:1190

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

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

2769

2385 -#: wt-status.c:1189

2770 +#: wt-status.c:1193

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

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

2773

2389 -#: wt-status.c:1193

2774 +#: wt-status.c:1197

2775 #, c-format

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

2777 msgstr ""

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

2779 "ovanpå \"%s\"."

2780

2396 -#: wt-status.c:1198

2781 +#: wt-status.c:1202

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

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

2784

2400 -#: wt-status.c:1201

2785 +#: wt-status.c:1205

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

2787 msgstr ""

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

2789

2405 -#: wt-status.c:1203

2790 +#: wt-status.c:1207

2791 msgid ""

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

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

2794

2410 -#: wt-status.c:1213

2795 +#: wt-status.c:1217

2796 #, c-format

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

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

2799

2415 -#: wt-status.c:1218

2800 +#: wt-status.c:1222

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

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

2803

2419 -#: wt-status.c:1221

2804 +#: wt-status.c:1225

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

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

2807

2423 -#: wt-status.c:1223

2808 +#: wt-status.c:1227

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

2810 msgstr ""

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

2812 "operationen)"

2813

2429 -#: wt-status.c:1232

2814 +#: wt-status.c:1236

2815 #, c-format

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

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

2818

2434 -#: wt-status.c:1237

2819 +#: wt-status.c:1241

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

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

2822

2438 -#: wt-status.c:1240

2823 +#: wt-status.c:1244

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

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

2826

2442 -#: wt-status.c:1242

2827 +#: wt-status.c:1246

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

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

2830

2446 -#: wt-status.c:1253

2831 +#: wt-status.c:1257

2832 #, c-format

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

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

2835

2451 -#: wt-status.c:1257

2836 +#: wt-status.c:1261

2837 msgid "You are currently bisecting."

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

2839

2455 -#: wt-status.c:1260

2840 +#: wt-status.c:1264

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

2842 msgstr ""

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

2844

2460 -#: wt-status.c:1460

2845 +#: wt-status.c:1464

2846 msgid "On branch "

2847 msgstr "På grenen "

2848

2464 -#: wt-status.c:1466

2849 +#: wt-status.c:1470

2850 msgid "interactive rebase in progress; onto "

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

2852

2468 -#: wt-status.c:1468

2853 +#: wt-status.c:1472

2854 msgid "rebase in progress; onto "

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

2856

2472 -#: wt-status.c:1473

2857 +#: wt-status.c:1477

2858 msgid "HEAD detached at "

2859 msgstr "HEAD frånkopplad vid "

2860

2476 -#: wt-status.c:1475

2861 +#: wt-status.c:1479

2862 msgid "HEAD detached from "

2863 msgstr "HEAD frånkopplad från "

2864

2480 -#: wt-status.c:1478

2865 +#: wt-status.c:1482

2866 msgid "Not currently on any branch."

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

2868

2484 -#: wt-status.c:1496

2869 +#: wt-status.c:1500

2870 msgid "Initial commit"

2871 msgstr "Första incheckning"

2872

2488 -#: wt-status.c:1510

2873 +#: wt-status.c:1514

2874 msgid "Untracked files"

2875 msgstr "Ospårade filer"

2876

2492 -#: wt-status.c:1512

2877 +#: wt-status.c:1516

2878 msgid "Ignored files"

2879 msgstr "Ignorerade filer"

2880

2496 -#: wt-status.c:1516

2881 +#: wt-status.c:1520

2882 #, c-format

2883 msgid ""

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

@@ -2505,32 +2890,32 @@ msgstr ""

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

2891

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

2508 -#: wt-status.c:1522

2893 +#: wt-status.c:1526

2894 #, c-format

2895 msgid "Untracked files not listed%s"

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

2897

2513 -#: wt-status.c:1524

2898 +#: wt-status.c:1528

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

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

2901

2517 -#: wt-status.c:1530

2902 +#: wt-status.c:1534

2903 msgid "No changes"

2904 msgstr "Inga ändringar"

2905

2521 -#: wt-status.c:1535

2906 +#: wt-status.c:1539

2907 #, c-format

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

2909 msgstr ""

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

2911 "\")\n"

2912

2528 -#: wt-status.c:1538

2913 +#: wt-status.c:1542

2914 #, c-format

2915 msgid "no changes added to commit\n"

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

2917

2533 -#: wt-status.c:1541

2918 +#: wt-status.c:1545

2919 #, c-format

2920 msgid ""

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

@@ -2539,48 +2924,48 @@ msgstr ""

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

2925 "\")\n"

2926

2542 -#: wt-status.c:1544

2927 +#: wt-status.c:1548

2928 #, c-format

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

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

2931

2547 -#: wt-status.c:1547

2932 +#: wt-status.c:1551

2933 #, c-format

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

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

2936

2552 -#: wt-status.c:1550 wt-status.c:1555

2937 +#: wt-status.c:1554 wt-status.c:1559

2938 #, c-format

2939 msgid "nothing to commit\n"

2940 msgstr "inget att checka in\n"

2941

2557 -#: wt-status.c:1553

2942 +#: wt-status.c:1557

2943 #, c-format

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

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

2946

2562 -#: wt-status.c:1557

2947 +#: wt-status.c:1561

2948 #, c-format

2564 -msgid "nothing to commit, working directory clean\n"

2949 +msgid "nothing to commit, working tree clean\n"

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

2951

2567 -#: wt-status.c:1664

2952 +#: wt-status.c:1668

2953 msgid "Initial commit on "

2954 msgstr "Första incheckning på "

2955

2571 -#: wt-status.c:1668

2956 +#: wt-status.c:1672

2957 msgid "HEAD (no branch)"

2958 msgstr "HEAD (ingen gren)"

2959

2575 -#: wt-status.c:1697

2960 +#: wt-status.c:1701

2961 msgid "gone"

2962 msgstr "försvunnen"

2963

2579 -#: wt-status.c:1699 wt-status.c:1707

2964 +#: wt-status.c:1703 wt-status.c:1711

2965 msgid "behind "

2966 msgstr "efter "

2967

2583 -#: wt-status.c:1702 wt-status.c:1705

2968 +#: wt-status.c:1706 wt-status.c:1709

2969 msgid "ahead "

2970 msgstr "före "

2971

@@ -2598,254 +2983,268 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."

2983 msgid "unexpected diff status %c"

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

2985

2601 -#: builtin/add.c:70 builtin/commit.c:280

2986 +#: builtin/add.c:71 builtin/commit.c:281

2987 msgid "updating files failed"

2988 msgstr "misslyckades uppdatera filer"

2989

2605 -#: builtin/add.c:80

2990 +#: builtin/add.c:81

2991 #, c-format

2992 msgid "remove '%s'\n"

2993 msgstr "ta bort \"%s\"\n"

2994

2610 -#: builtin/add.c:134

2995 +#: builtin/add.c:136

2996 msgid "Unstaged changes after refreshing the index:"

2997 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

2998

2614 -#: builtin/add.c:194 builtin/rev-parse.c:811

2999 +#: builtin/add.c:196 builtin/rev-parse.c:811

3000 msgid "Could not read the index"

3001 msgstr "Kunde inte läsa indexet"

3002

2618 -#: builtin/add.c:205

3003 +#: builtin/add.c:207

3004 #, c-format

3005 msgid "Could not open '%s' for writing."

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

3007

2623 -#: builtin/add.c:209

3008 +#: builtin/add.c:211

3009 msgid "Could not write patch"

3010 msgstr "Kunde inte skriva patch"

3011

2627 -#: builtin/add.c:212

3012 +#: builtin/add.c:214

3013 msgid "editing patch failed"

3014 msgstr "redigering av patch misslyckades"

3015

2631 -#: builtin/add.c:215

3016 +#: builtin/add.c:217

3017 #, c-format

3018 msgid "Could not stat '%s'"

3019 msgstr "Kunde inte ta status på \"%s\""

3020

2636 -#: builtin/add.c:217

3021 +#: builtin/add.c:219

3022 msgid "Empty patch. Aborted."

3023 msgstr "Tom patch. Avbryter."

3024

2640 -#: builtin/add.c:222

3025 +#: builtin/add.c:224

3026 #, c-format

3027 msgid "Could not apply '%s'"

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

3029

2645 -#: builtin/add.c:232

3030 +#: builtin/add.c:234

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

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

3033

2649 -#: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2650 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2651 -#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

3034 +#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111

3035 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521

3036 +#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162

3037 msgid "dry run"

3038 msgstr "testkörning"

3039

2655 -#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2656 -#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2657 -#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

3040 +#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19

3041 +#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593

3042 +#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114

3043 msgid "be verbose"

3044 msgstr "var pratsam"

3045

2661 -#: builtin/add.c:252

3046 +#: builtin/add.c:256

3047 msgid "interactive picking"

3048 msgstr "plocka interaktivt"

3049

2665 -#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

3050 +#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286

3051 msgid "select hunks interactively"

3052 msgstr "välj stycken interaktivt"

3053

2669 -#: builtin/add.c:254

3054 +#: builtin/add.c:258

3055 msgid "edit current diff and apply"

3056 msgstr "redigera aktuell diff och applicera"

3057

2673 -#: builtin/add.c:255

3058 +#: builtin/add.c:259

3059 msgid "allow adding otherwise ignored files"

3060 msgstr "tillåt lägga till annars ignorerade filer"

3061

2677 -#: builtin/add.c:256

3062 +#: builtin/add.c:260

3063 msgid "update tracked files"

3064 msgstr "uppdatera spårade filer"

3065

2681 -#: builtin/add.c:257

3066 +#: builtin/add.c:261

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

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

3069

2685 -#: builtin/add.c:258

3070 +#: builtin/add.c:262

3071 msgid "add changes from all tracked and untracked files"

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

3073

2689 -#: builtin/add.c:261

3074 +#: builtin/add.c:265

3075 msgid "ignore paths removed in the working tree (same as --no-all)"

3076 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"

3077

2693 -#: builtin/add.c:263

3078 +#: builtin/add.c:267

3079 msgid "don't add, only refresh the index"

3080 msgstr "lägg inte till, uppdatera endast indexet"

3081

2697 -#: builtin/add.c:264

3082 +#: builtin/add.c:268

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

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

3085

2701 -#: builtin/add.c:265

3086 +#: builtin/add.c:269

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

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

3089

2705 -#: builtin/add.c:287

3090 +#: builtin/add.c:270 builtin/update-index.c:958

3091 +msgid "(+/-)x"

3092 +msgstr "(+/-)x"

3093 +

3094 +#: builtin/add.c:270 builtin/update-index.c:959

3095 +msgid "override the executable bit of the listed files"

3096 +msgstr "överstyr exekveringsbiten för angivna filer"

3097 +

3098 +#: builtin/add.c:292

3099 #, c-format

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

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

3102

2710 -#: builtin/add.c:294

3103 +#: builtin/add.c:300

3104 msgid "adding files failed"

3105 msgstr "misslyckades lägga till filer"

3106

2714 -#: builtin/add.c:330

3107 +#: builtin/add.c:336

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

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

3110

2718 -#: builtin/add.c:337

3111 +#: builtin/add.c:343

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

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

3114

3115 #: builtin/add.c:352

3116 #, c-format

3117 +msgid "--chmod param '%s' must be either -x or +x"

3118 +msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

3119 +

3120 +#: builtin/add.c:367

3121 +#, c-format

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

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

3124

2727 -#: builtin/add.c:353

3125 +#: builtin/add.c:368

3126 #, c-format

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

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

3129

2732 -#: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2733 -#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

3130 +#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279

3131 +#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340

3132 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

3133 #: builtin/submodule--helper.c:240

3134 msgid "index file corrupt"

3135 msgstr "indexfilen trasig"

3136

2738 -#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

3137 +#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431

3138 msgid "Unable to write new index file"

3139 msgstr "Kunde inte skriva ny indexfil"

3140

2742 -#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

3141 +#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032

3142 #, c-format

3143 msgid "could not read '%s'"

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

3145

2747 -#: builtin/am.c:430

3146 +#: builtin/am.c:426

3147 msgid "could not parse author script"

3148 msgstr "kunde inte tolka författarskript"

3149

2751 -#: builtin/am.c:507

3150 +#: builtin/am.c:503

3151 #, c-format

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

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

3154

2756 -#: builtin/am.c:548 builtin/notes.c:300

3155 +#: builtin/am.c:544 builtin/notes.c:301

3156 #, c-format

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

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

3159

2761 -#: builtin/am.c:585 builtin/notes.c:315

3160 +#: builtin/am.c:581 builtin/notes.c:316

3161 #, c-format

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

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

3164

2766 -#: builtin/am.c:611

3165 +#: builtin/am.c:607

3166 msgid "fseek failed"

3167 msgstr "\"fseek\" misslyckades"

3168

2770 -#: builtin/am.c:788

3169 +#: builtin/am.c:787

3170 #, c-format

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

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

3173

2775 -#: builtin/am.c:853

3174 +#: builtin/am.c:852

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

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

3177

2779 -#: builtin/am.c:900

3178 +#: builtin/am.c:899

3179 msgid "invalid timestamp"

3180 msgstr "ogiltig tidsstämpel"

3181

2783 -#: builtin/am.c:903 builtin/am.c:911

3182 +#: builtin/am.c:902 builtin/am.c:910

3183 msgid "invalid Date line"

3184 msgstr "ogiltig \"Date\"-rad"

3185

2787 -#: builtin/am.c:908

3186 +#: builtin/am.c:907

3187 msgid "invalid timezone offset"

3188 msgstr "ogiltig tidszons-offset"

3189

2791 -#: builtin/am.c:995

3190 +#: builtin/am.c:996

3191 msgid "Patch format detection failed."

3192 msgstr "Misslyckades detektera patchformat."

3193

2795 -#: builtin/am.c:1000 builtin/clone.c:380

3194 +#: builtin/am.c:1001 builtin/clone.c:380

3195 #, c-format

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

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

3198

2800 -#: builtin/am.c:1004

3199 +#: builtin/am.c:1005

3200 msgid "Failed to split patches."

3201 msgstr "Misslyckades dela patchar."

3202

2804 -#: builtin/am.c:1136 builtin/commit.c:365

3203 +#: builtin/am.c:1137 builtin/commit.c:366

3204 msgid "unable to write index file"

3205 msgstr "kan inte skriva indexfil"

3206

2808 -#: builtin/am.c:1187

3207 +#: builtin/am.c:1188

3208 #, c-format

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

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

3211

2813 -#: builtin/am.c:1188

3212 +#: builtin/am.c:1189

3213 #, c-format

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

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

3216

2818 -#: builtin/am.c:1189

3217 +#: builtin/am.c:1190

3218 #, c-format

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

3220 msgstr ""

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

3222

2824 -#: builtin/am.c:1327

3223 +#: builtin/am.c:1328

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

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

3226

2828 -#: builtin/am.c:1401 builtin/log.c:1516

3227 +#: builtin/am.c:1402 builtin/log.c:1543

3228 #, c-format

3229 msgid "invalid ident line: %s"

3230 msgstr "ogiltig ident-rad: %s"

3231

2833 -#: builtin/am.c:1428

3232 +#: builtin/am.c:1429

3233 #, c-format

3234 msgid "unable to parse commit %s"

3235 msgstr "kunde inte tolka incheckningen %s"

3236

2838 -#: builtin/am.c:1630

3237 +#: builtin/am.c:1602

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

3239 msgstr ""

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

3241 "vägssammanslagning."

3242

2844 -#: builtin/am.c:1632

3243 +#: builtin/am.c:1604

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

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

3246

2848 -#: builtin/am.c:1651

3247 +#: builtin/am.c:1623

3248 msgid ""

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

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

@@ -2853,39 +3252,39 @@ msgstr ""

3252 "Har du handredigerat din patch?\n"

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

3254

2856 -#: builtin/am.c:1657

3255 +#: builtin/am.c:1629

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

3257 msgstr ""

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

3259

2861 -#: builtin/am.c:1672

3260 +#: builtin/am.c:1654

3261 msgid "Failed to merge in the changes."

3262 msgstr "Misslyckades slå ihop ändringarna."

3263

2865 -#: builtin/am.c:1696 builtin/merge.c:636

3264 +#: builtin/am.c:1679 builtin/merge.c:628

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

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

3267

2869 -#: builtin/am.c:1703

3268 +#: builtin/am.c:1686

3269 msgid "applying to an empty history"

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

3271

2873 -#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2874 -#: builtin/merge.c:866

3272 +#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798

3273 +#: builtin/merge.c:823

3274 msgid "failed to write commit object"

3275 msgstr "kunde inte skriva incheckningsobjekt"

3276

2878 -#: builtin/am.c:1748 builtin/am.c:1752

3277 +#: builtin/am.c:1731 builtin/am.c:1735

3278 #, c-format

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

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

3281

2883 -#: builtin/am.c:1768

3282 +#: builtin/am.c:1751

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

3284 msgstr ""

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

3286

2888 -#: builtin/am.c:1773

3287 +#: builtin/am.c:1756

3288 msgid "Commit Body is:"

3289 msgstr "Incheckningskroppen är:"

3290

@@ -2893,35 +3292,35 @@ msgstr "Incheckningskroppen är:"

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

3293 #. input at this point.

3294 #.

2896 -#: builtin/am.c:1783

3295 +#: builtin/am.c:1766

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

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

3298

2900 -#: builtin/am.c:1833

3299 +#: builtin/am.c:1816

3300 #, c-format

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

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

3303

2905 -#: builtin/am.c:1868 builtin/am.c:1940

3304 +#: builtin/am.c:1853 builtin/am.c:1925

3305 #, c-format

3306 msgid "Applying: %.*s"

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

3308

2910 -#: builtin/am.c:1884

3309 +#: builtin/am.c:1869

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

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

3312

2914 -#: builtin/am.c:1892

3313 +#: builtin/am.c:1877

3314 #, c-format

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

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

3317

2919 -#: builtin/am.c:1898

3318 +#: builtin/am.c:1883

3319 #, c-format

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

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

3322

2924 -#: builtin/am.c:1943

3323 +#: builtin/am.c:1928

3324 msgid ""

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

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

@@ -2931,7 +3330,7 @@ msgstr ""

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

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

3332

2934 -#: builtin/am.c:1950

3333 +#: builtin/am.c:1935

3334 msgid ""

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

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

@@ -2939,17 +3338,17 @@ msgstr ""

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

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

3340

2942 -#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

3341 +#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308

3342 #: builtin/reset.c:316

3343 #, c-format

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

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

3346

2948 -#: builtin/am.c:2110

3347 +#: builtin/am.c:2095

3348 msgid "failed to clean index"

3349 msgstr "misslyckades städa upp indexet"

3350

2952 -#: builtin/am.c:2144

3351 +#: builtin/am.c:2129

3352 msgid ""

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

3354 "Not rewinding to ORIG_HEAD"

@@ -2957,154 +3356,154 @@ msgstr ""

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

3357 "Återställer inte till ORIG_HEAD"

3358

2960 -#: builtin/am.c:2205

3359 +#: builtin/am.c:2192

3360 #, c-format

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

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

3363

2965 -#: builtin/am.c:2238

3364 +#: builtin/am.c:2225

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

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

3367

2969 -#: builtin/am.c:2239

3368 +#: builtin/am.c:2226

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

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

3371

2973 -#: builtin/am.c:2245

3372 +#: builtin/am.c:2232

3373 msgid "run interactively"

3374 msgstr "kör interaktivt"

3375

2977 -#: builtin/am.c:2247

3376 +#: builtin/am.c:2234

3377 msgid "historical option -- no-op"

3378 msgstr "historisk flagga -- no-op"

3379

2981 -#: builtin/am.c:2249

3380 +#: builtin/am.c:2236

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

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

3383

2985 -#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

2986 -#: builtin/repack.c:171

3384 +#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57

3385 +#: builtin/repack.c:172

3386 msgid "be quiet"

3387 msgstr "var tyst"

3388

2990 -#: builtin/am.c:2252

3389 +#: builtin/am.c:2239

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

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

3392

2994 -#: builtin/am.c:2255

3393 +#: builtin/am.c:2242

3394 msgid "recode into utf8 (default)"

3395 msgstr "koda om till utf8 (standard)"

3396

2998 -#: builtin/am.c:2257

3397 +#: builtin/am.c:2244

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

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

3400

3002 -#: builtin/am.c:2259

3401 +#: builtin/am.c:2246

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

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

3404

3006 -#: builtin/am.c:2261

3405 +#: builtin/am.c:2248

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

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

3408

3010 -#: builtin/am.c:2263

3409 +#: builtin/am.c:2250

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

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

3412

3014 -#: builtin/am.c:2266

3413 +#: builtin/am.c:2253

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

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

3416

3018 -#: builtin/am.c:2269

3417 +#: builtin/am.c:2256

3418 msgid "strip everything before a scissors line"

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

3420

3022 -#: builtin/am.c:2270 builtin/apply.c:4546

3421 +#: builtin/am.c:2257 builtin/apply.c:4837

3422 msgid "action"

3423 msgstr "åtgärd"

3424

3026 -#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

3027 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

3028 -#: builtin/am.c:2298

3425 +#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267

3426 +#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279

3427 +#: builtin/am.c:2285

3428 msgid "pass it through git-apply"

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

3430

3032 -#: builtin/am.c:2279 builtin/apply.c:4570

3431 +#: builtin/am.c:2266 builtin/apply.c:4861

3432 msgid "root"

3433 msgstr "rot"

3434

3036 -#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

3037 -#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3435 +#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799

3436 +#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96

3437 #: builtin/pull.c:179 builtin/submodule--helper.c:277

3039 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

3040 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

3041 -#: builtin/submodule--helper.c:770

3438 +#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482

3439 +#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823

3440 +#: builtin/submodule--helper.c:826

3441 msgid "path"

3442 msgstr "sökväg"

3443

3045 -#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3046 -#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134

3047 -#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182

3444 +#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3445 +#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134

3446 +#: builtin/pull.c:193 builtin/repack.c:181 builtin/repack.c:185

3447 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

3448 #: parse-options.h:132 parse-options.h:134 parse-options.h:244

3449 msgid "n"

3450 msgstr "n"

3451

3053 -#: builtin/am.c:2291 builtin/apply.c:4514

3452 +#: builtin/am.c:2278 builtin/apply.c:4805

3453 msgid "num"

3454 msgstr "antal"

3455

3057 -#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3456 +#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438

3457 #: builtin/tag.c:372

3458 msgid "format"

3459 msgstr "format"

3460

3062 -#: builtin/am.c:2295

3461 +#: builtin/am.c:2282

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

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

3464

3066 -#: builtin/am.c:2301

3465 +#: builtin/am.c:2288

3466 msgid "override error message when patch failure occurs"

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

3468

3070 -#: builtin/am.c:2303

3469 +#: builtin/am.c:2290

3470 msgid "continue applying patches after resolving a conflict"

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

3472

3074 -#: builtin/am.c:2306

3473 +#: builtin/am.c:2293

3474 msgid "synonyms for --continue"

3475 msgstr "synonymer till --continue"

3476

3078 -#: builtin/am.c:2309

3477 +#: builtin/am.c:2296

3478 msgid "skip the current patch"

3479 msgstr "hoppa över den aktuella grenen"

3480

3082 -#: builtin/am.c:2312

3481 +#: builtin/am.c:2299

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

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

3484

3086 -#: builtin/am.c:2316

3485 +#: builtin/am.c:2303

3486 msgid "lie about committer date"

3487 msgstr "ljug om incheckningsdatum"

3488

3090 -#: builtin/am.c:2318

3489 +#: builtin/am.c:2305

3490 msgid "use current timestamp for author date"

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

3492

3094 -#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3493 +#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229

3494 #: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3495 msgid "key-id"

3496 msgstr "nyckel-id"

3497

3099 -#: builtin/am.c:2321

3498 +#: builtin/am.c:2308

3499 msgid "GPG-sign commits"

3500 msgstr "GPG-signera incheckningar"

3501

3103 -#: builtin/am.c:2324

3502 +#: builtin/am.c:2311

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

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

3505

3107 -#: builtin/am.c:2339

3506 +#: builtin/am.c:2326

3507 msgid ""

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

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

@@ -3112,16 +3511,16 @@ msgstr ""

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

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

3513

3115 -#: builtin/am.c:2346

3514 +#: builtin/am.c:2333

3515 msgid "failed to read the index"

3516 msgstr "misslyckades läsa indexet"

3517

3119 -#: builtin/am.c:2361

3518 +#: builtin/am.c:2348

3519 #, c-format

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

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

3522

3124 -#: builtin/am.c:2385

3523 +#: builtin/am.c:2372

3524 #, c-format

3525 msgid ""

3526 "Stray %s directory found.\n"

@@ -3130,70 +3529,70 @@ msgstr ""

3529 "Kvarbliven katalog %s hittades.\n"

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

3531

3133 -#: builtin/am.c:2391

3532 +#: builtin/am.c:2378

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

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

3535

3137 -#: builtin/apply.c:59

3536 +#: builtin/apply.c:122

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

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

3539

3141 -#: builtin/apply.c:111

3540 +#: builtin/apply.c:153

3541 #, c-format

3542 msgid "unrecognized whitespace option '%s'"

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

3544

3146 -#: builtin/apply.c:126

3545 +#: builtin/apply.c:169

3546 #, c-format

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

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

3549

3151 -#: builtin/apply.c:818

3550 +#: builtin/apply.c:854

3551 #, c-format

3552 msgid "Cannot prepare timestamp regexp %s"

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

3554

3156 -#: builtin/apply.c:827

3555 +#: builtin/apply.c:863

3556 #, c-format

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

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

3559

3161 -#: builtin/apply.c:908

3560 +#: builtin/apply.c:947

3561 #, c-format

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

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

3564

3166 -#: builtin/apply.c:937

3565 +#: builtin/apply.c:984

3566 #, c-format

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

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

3569

3171 -#: builtin/apply.c:942

3570 +#: builtin/apply.c:989

3571 #, c-format

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

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

3574

3176 -#: builtin/apply.c:943

3575 +#: builtin/apply.c:990

3576 #, c-format

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

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

3579

3181 -#: builtin/apply.c:949

3580 +#: builtin/apply.c:995

3581 #, c-format

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

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

3584

3186 -#: builtin/apply.c:1406

3585 +#: builtin/apply.c:1489

3586 #, c-format

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

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

3589

3191 -#: builtin/apply.c:1463

3590 +#: builtin/apply.c:1550

3591 #, c-format

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

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

3594

3196 -#: builtin/apply.c:1480

3595 +#: builtin/apply.c:1567

3596 #, c-format

3597 msgid ""

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

@@ -3209,77 +3608,77 @@ msgstr[1] ""

3608 "sökvägskomponenter\n"

3609 "tas bort (rad %d)"

3610

3212 -#: builtin/apply.c:1646

3611 +#: builtin/apply.c:1743

3612 msgid "new file depends on old contents"

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

3614

3216 -#: builtin/apply.c:1648

3615 +#: builtin/apply.c:1745

3616 msgid "deleted file still has contents"

3617 msgstr "borttagen fil har fortfarande innehåll"

3618

3220 -#: builtin/apply.c:1674

3619 +#: builtin/apply.c:1774

3620 #, c-format

3621 msgid "corrupt patch at line %d"

3622 msgstr "trasig patch på rad %d"

3623

3225 -#: builtin/apply.c:1710

3624 +#: builtin/apply.c:1810

3625 #, c-format

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

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

3628

3230 -#: builtin/apply.c:1712

3629 +#: builtin/apply.c:1812

3630 #, c-format

3631 msgid "deleted file %s still has contents"

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

3633

3235 -#: builtin/apply.c:1715

3634 +#: builtin/apply.c:1815

3635 #, c-format

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

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

3638

3240 -#: builtin/apply.c:1861

3639 +#: builtin/apply.c:1962

3640 #, c-format

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

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

3643

3245 -#: builtin/apply.c:1895

3644 +#: builtin/apply.c:1999

3645 #, c-format

3646 msgid "unrecognized binary patch at line %d"

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

3648

3250 -#: builtin/apply.c:2048

3649 +#: builtin/apply.c:2154

3650 #, c-format

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

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

3653

3255 -#: builtin/apply.c:2138

3654 +#: builtin/apply.c:2244

3655 #, c-format

3656 msgid "unable to read symlink %s"

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

3658

3260 -#: builtin/apply.c:2142

3659 +#: builtin/apply.c:2248

3660 #, c-format

3661 msgid "unable to open or read %s"

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

3663

3265 -#: builtin/apply.c:2775

3664 +#: builtin/apply.c:2901

3665 #, c-format

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

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

3668

3270 -#: builtin/apply.c:2894

3669 +#: builtin/apply.c:3020

3670 #, c-format

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

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

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

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

3675

3277 -#: builtin/apply.c:2906

3676 +#: builtin/apply.c:3032

3677 #, c-format

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

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

3680

3282 -#: builtin/apply.c:2912

3681 +#: builtin/apply.c:3038

3682 #, c-format

3683 msgid ""

3684 "while searching for:\n"

@@ -3288,335 +3687,330 @@ msgstr ""

3687 "vid sökning efter:\n"

3688 "%.*s"

3689

3291 -#: builtin/apply.c:2932

3690 +#: builtin/apply.c:3060

3691 #, c-format

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

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

3694

3296 -#: builtin/apply.c:3033

3695 +#: builtin/apply.c:3163

3696 #, c-format

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

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

3699

3301 -#: builtin/apply.c:3039

3700 +#: builtin/apply.c:3169

3701 #, c-format

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

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

3704

3306 -#: builtin/apply.c:3060

3705 +#: builtin/apply.c:3190

3706 #, c-format

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

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

3709

3311 -#: builtin/apply.c:3184

3710 +#: builtin/apply.c:3314

3711 #, c-format

3712 msgid "cannot checkout %s"

3713 msgstr "kan inte checka ut %s"

3714

3316 -#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3317 -#, c-format

3318 -msgid "read of %s failed"

3319 -msgstr "misslyckades läsa %s"

3320 -

3321 -#: builtin/apply.c:3237

3715 +#: builtin/apply.c:3370

3716 #, c-format

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

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

3719

3326 -#: builtin/apply.c:3265 builtin/apply.c:3487

3720 +#: builtin/apply.c:3399 builtin/apply.c:3630

3721 #, c-format

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

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

3724

3331 -#: builtin/apply.c:3346 builtin/apply.c:3501

3725 +#: builtin/apply.c:3482 builtin/apply.c:3644

3726 #, c-format

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

3728 msgstr "%s: finns inte i indexet"

3729

3336 -#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3730 +#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658

3731 #, c-format

3732 msgid "%s: %s"

3733 msgstr "%s: %s"

3734

3341 -#: builtin/apply.c:3355 builtin/apply.c:3509

3735 +#: builtin/apply.c:3491 builtin/apply.c:3652

3736 #, c-format

3737 msgid "%s: does not match index"

3738 msgstr "%s: motsvarar inte indexet"

3739

3346 -#: builtin/apply.c:3457

3740 +#: builtin/apply.c:3597

3741 msgid "removal patch leaves file contents"

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

3743

3350 -#: builtin/apply.c:3526

3744 +#: builtin/apply.c:3669

3745 #, c-format

3746 msgid "%s: wrong type"

3747 msgstr "%s: fel typ"

3748

3355 -#: builtin/apply.c:3528

3749 +#: builtin/apply.c:3671

3750 #, c-format

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

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

3753

3360 -#: builtin/apply.c:3687 builtin/apply.c:3689

3754 +#: builtin/apply.c:3822 builtin/apply.c:3824

3755 #, c-format

3756 msgid "invalid path '%s'"

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

3758

3365 -#: builtin/apply.c:3744

3759 +#: builtin/apply.c:3879

3760 #, c-format

3761 msgid "%s: already exists in index"

3762 msgstr "%s: finns redan i indexet"

3763

3370 -#: builtin/apply.c:3747

3764 +#: builtin/apply.c:3882

3765 #, c-format

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

3767 msgstr "%s: finns redan i arbetskatalogen"

3768

3375 -#: builtin/apply.c:3767

3769 +#: builtin/apply.c:3902

3770 #, c-format

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

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

3773

3380 -#: builtin/apply.c:3772

3774 +#: builtin/apply.c:3907

3775 #, c-format

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

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

3778

3385 -#: builtin/apply.c:3792

3779 +#: builtin/apply.c:3927

3780 #, c-format

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

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

3783

3390 -#: builtin/apply.c:3796

3784 +#: builtin/apply.c:3931

3785 #, c-format

3786 msgid "%s: patch does not apply"

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

3788

3395 -#: builtin/apply.c:3810

3789 +#: builtin/apply.c:3945

3790 #, c-format

3791 msgid "Checking patch %s..."

3792 msgstr "Kontrollerar patchen %s..."

3793

3400 -#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3794 +#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135

3795 #, c-format

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

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

3798

3405 -#: builtin/apply.c:4046

3799 +#: builtin/apply.c:4182

3800 #, c-format

3801 msgid "unable to remove %s from index"

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

3803

3410 -#: builtin/apply.c:4075

3804 +#: builtin/apply.c:4215

3805 #, c-format

3806 msgid "corrupt patch for submodule %s"

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

3808

3415 -#: builtin/apply.c:4079

3809 +#: builtin/apply.c:4219

3810 #, c-format

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

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

3813

3420 -#: builtin/apply.c:4084

3814 +#: builtin/apply.c:4224

3815 #, c-format

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

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

3818

3425 -#: builtin/apply.c:4087 builtin/apply.c:4195

3819 +#: builtin/apply.c:4227 builtin/apply.c:4340

3820 #, c-format

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

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

3823

3430 -#: builtin/apply.c:4120

3824 +#: builtin/apply.c:4260

3825 #, c-format

3826 msgid "closing file '%s'"

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

3828

3435 -#: builtin/apply.c:4169

3829 +#: builtin/apply.c:4313

3830 #, c-format

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

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

3833

3440 -#: builtin/apply.c:4256

3834 +#: builtin/apply.c:4403

3835 #, c-format

3836 msgid "Applied patch %s cleanly."

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

3838

3445 -#: builtin/apply.c:4264

3839 +#: builtin/apply.c:4411

3840 msgid "internal error"

3841 msgstr "internt fel"

3842

3449 -#: builtin/apply.c:4267

3843 +#: builtin/apply.c:4414

3844 #, c-format

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

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

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

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

3849

3456 -#: builtin/apply.c:4277

3850 +#: builtin/apply.c:4424

3851 #, c-format

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

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

3854

3461 -#: builtin/apply.c:4285

3855 +#: builtin/apply.c:4432

3856 #, c-format

3857 msgid "cannot open %s: %s"

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

3859

3466 -#: builtin/apply.c:4298

3860 +#: builtin/apply.c:4445

3861 #, c-format

3862 msgid "Hunk #%d applied cleanly."

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

3864

3471 -#: builtin/apply.c:4301

3865 +#: builtin/apply.c:4448

3866 #, c-format

3867 msgid "Rejected hunk #%d."

3868 msgstr "Refuserar stycke %d."

3869

3476 -#: builtin/apply.c:4387

3870 +#: builtin/apply.c:4537

3871 #, c-format

3872 msgid "Skipped patch '%s'."

3873 msgstr "Ignorerar patch \"%s\"."

3874

3481 -#: builtin/apply.c:4395

3875 +#: builtin/apply.c:4545

3876 msgid "unrecognized input"

3877 msgstr "indata känns inte igen"

3878

3485 -#: builtin/apply.c:4406

3879 +#: builtin/apply.c:4556

3880 msgid "unable to read index file"

3881 msgstr "kan inte läsa indexfilen"

3882

3489 -#: builtin/apply.c:4509

3883 +#: builtin/apply.c:4701

3884 +msgid "--3way outside a repository"

3885 +msgstr "--3way utanför arkiv"

3886 +

3887 +#: builtin/apply.c:4709

3888 +msgid "--index outside a repository"

3889 +msgstr "--index utanför arkiv"

3890 +

3891 +#: builtin/apply.c:4712

3892 +msgid "--cached outside a repository"

3893 +msgstr "--cached utanför arkiv"

3894 +

3895 +#: builtin/apply.c:4745

3896 +#, c-format

3897 +msgid "can't open patch '%s'"

3898 +msgstr "kan inte öppna patchen \"%s\""

3899 +

3900 +#: builtin/apply.c:4760

3901 +#, c-format

3902 +msgid "squelched %d whitespace error"

3903 +msgid_plural "squelched %d whitespace errors"

3904 +msgstr[0] "undertryckte %d fel i blanksteg"

3905 +msgstr[1] "undertryckte %d fel i blanksteg"

3906 +

3907 +#: builtin/apply.c:4766 builtin/apply.c:4776

3908 +#, c-format

3909 +msgid "%d line adds whitespace errors."

3910 +msgid_plural "%d lines add whitespace errors."

3911 +msgstr[0] "%d rad lägger till fel i blanksteg."

3912 +msgstr[1] "%d rader lägger till fel i blanksteg."

3913 +

3914 +#: builtin/apply.c:4800

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

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

3917

3493 -#: builtin/apply.c:4512

3918 +#: builtin/apply.c:4803

3919 msgid "apply changes matching the given path"

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

3921

3497 -#: builtin/apply.c:4515

3922 +#: builtin/apply.c:4806

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

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

3925

3501 -#: builtin/apply.c:4518

3926 +#: builtin/apply.c:4809

3927 msgid "ignore additions made by the patch"

3928 msgstr "ignorera tillägg gjorda av patchen"

3929

3505 -#: builtin/apply.c:4520

3930 +#: builtin/apply.c:4811

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

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

3933

3509 -#: builtin/apply.c:4524

3934 +#: builtin/apply.c:4815

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

3936 msgstr "visa antal tillagda och borttagna rader decimalt"

3937

3513 -#: builtin/apply.c:4526

3938 +#: builtin/apply.c:4817

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

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

3941

3517 -#: builtin/apply.c:4528

3942 +#: builtin/apply.c:4819

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

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

3945

3521 -#: builtin/apply.c:4530

3946 +#: builtin/apply.c:4821

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

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

3949

3525 -#: builtin/apply.c:4532

3950 +#: builtin/apply.c:4823

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

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

3953

3529 -#: builtin/apply.c:4534

3954 +#: builtin/apply.c:4825

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

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

3957

3533 -#: builtin/apply.c:4536

3958 +#: builtin/apply.c:4827

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

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

3961

3537 -#: builtin/apply.c:4538

3962 +#: builtin/apply.c:4829

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

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

3965

3541 -#: builtin/apply.c:4540

3966 +#: builtin/apply.c:4831

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

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

3969

3545 -#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3970 +#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426

3971 msgid "paths are separated with NUL character"

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

3973

3549 -#: builtin/apply.c:4545

3974 +#: builtin/apply.c:4836

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

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

3977

3553 -#: builtin/apply.c:4547

3978 +#: builtin/apply.c:4838

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

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

3981

3557 -#: builtin/apply.c:4550 builtin/apply.c:4553

3982 +#: builtin/apply.c:4841 builtin/apply.c:4844

3983 msgid "ignore changes in whitespace when finding context"

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

3985

3561 -#: builtin/apply.c:4556

3986 +#: builtin/apply.c:4847

3987 msgid "apply the patch in reverse"

3988 msgstr "tillämpa patchen baklänges"

3989

3565 -#: builtin/apply.c:4558

3990 +#: builtin/apply.c:4849

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

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

3993

3569 -#: builtin/apply.c:4560

3994 +#: builtin/apply.c:4851

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

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

3997

3573 -#: builtin/apply.c:4562

3998 +#: builtin/apply.c:4853

3999 msgid "allow overlapping hunks"

4000 msgstr "tillåt överlappande stycken"

4001

3577 -#: builtin/apply.c:4565

4002 +#: builtin/apply.c:4856

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

4004 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

4005

3581 -#: builtin/apply.c:4568

4006 +#: builtin/apply.c:4859

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

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

4009

3585 -#: builtin/apply.c:4571

4010 +#: builtin/apply.c:4862

4011 msgid "prepend <root> to all filenames"

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

4013

3589 -#: builtin/apply.c:4593

3590 -msgid "--3way outside a repository"

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

3592 -

3593 -#: builtin/apply.c:4601

3594 -msgid "--index outside a repository"

3595 -msgstr "--index utanför arkiv"

3596 -

3597 -#: builtin/apply.c:4604

3598 -msgid "--cached outside a repository"

3599 -msgstr "--cached utanför arkiv"

3600 -

3601 -#: builtin/apply.c:4623

3602 -#, c-format

3603 -msgid "can't open patch '%s'"

3604 -msgstr "kan inte öppna patchen \"%s\""

3605 -

3606 -#: builtin/apply.c:4637

3607 -#, c-format

3608 -msgid "squelched %d whitespace error"

3609 -msgid_plural "squelched %d whitespace errors"

3610 -msgstr[0] "undertryckte %d fel i blanksteg"

3611 -msgstr[1] "undertryckte %d fel i blanksteg"

3612 -

3613 -#: builtin/apply.c:4643 builtin/apply.c:4653

3614 -#, c-format

3615 -msgid "%d line adds whitespace errors."

3616 -msgid_plural "%d lines add whitespace errors."

3617 -msgstr[0] "%d rad lägger till fel i blanksteg."

3618 -msgstr[1] "%d rader lägger till fel i blanksteg."

3619 -

4014 #: builtin/archive.c:17

4015 #, c-format

4016 msgid "could not create archive file '%s'"

@@ -3672,103 +4066,103 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

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

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

4068

3675 -#: builtin/blame.c:1782

4069 +#: builtin/blame.c:1781

4070 msgid "Blaming lines"

4071 msgstr "Klandra rader"

4072

3679 -#: builtin/blame.c:2531

4073 +#: builtin/blame.c:2536

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

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

4076

3683 -#: builtin/blame.c:2532

4077 +#: builtin/blame.c:2537

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

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

4080

3687 -#: builtin/blame.c:2533

4081 +#: builtin/blame.c:2538

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

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

4084

3691 -#: builtin/blame.c:2534

4085 +#: builtin/blame.c:2539

4086 msgid "Show work cost statistics"

4087 msgstr "Visa statistik över arbetskostnad"

4088

3695 -#: builtin/blame.c:2535

4089 +#: builtin/blame.c:2540

4090 msgid "Force progress reporting"

4091 msgstr "Tvinga förloppsrapportering"

4092

3699 -#: builtin/blame.c:2536

4093 +#: builtin/blame.c:2541

4094 msgid "Show output score for blame entries"

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

4096

3703 -#: builtin/blame.c:2537

4097 +#: builtin/blame.c:2542

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

4099 msgstr "Visa originalfilnamn (Standard: auto)"

4100

3707 -#: builtin/blame.c:2538

4101 +#: builtin/blame.c:2543

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

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

4104

3711 -#: builtin/blame.c:2539

4105 +#: builtin/blame.c:2544

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

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

4108

3715 -#: builtin/blame.c:2540

4109 +#: builtin/blame.c:2545

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

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

4112

3719 -#: builtin/blame.c:2541

4113 +#: builtin/blame.c:2546

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

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

4116

3723 -#: builtin/blame.c:2542

4117 +#: builtin/blame.c:2547

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

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

4120

3727 -#: builtin/blame.c:2543

4121 +#: builtin/blame.c:2548

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

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

4124

3731 -#: builtin/blame.c:2544

4125 +#: builtin/blame.c:2549

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

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

4128

3735 -#: builtin/blame.c:2545

4129 +#: builtin/blame.c:2550

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

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

4132

3739 -#: builtin/blame.c:2546

4133 +#: builtin/blame.c:2551

4134 msgid "Ignore whitespace differences"

4135 msgstr "Ignorera ändringar i blanksteg"

4136

3743 -#: builtin/blame.c:2547

4137 +#: builtin/blame.c:2552

4138 msgid "Spend extra cycles to find better match"

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

4140

3747 -#: builtin/blame.c:2548

4141 +#: builtin/blame.c:2553

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

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

4144

3751 -#: builtin/blame.c:2549

4145 +#: builtin/blame.c:2554

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

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

4148

3755 -#: builtin/blame.c:2550 builtin/blame.c:2551

4149 +#: builtin/blame.c:2555 builtin/blame.c:2556

4150 msgid "score"

4151 msgstr "poäng"

4152

3759 -#: builtin/blame.c:2550

4153 +#: builtin/blame.c:2555

4154 msgid "Find line copies within and across files"

4155 msgstr "Hitta kopierade rader inuti och mellan filer"

4156

3763 -#: builtin/blame.c:2551

4157 +#: builtin/blame.c:2556

4158 msgid "Find line movements within and across files"

4159 msgstr "Hitta flyttade rader inuti och mellan filer"

4160

3767 -#: builtin/blame.c:2552

4161 +#: builtin/blame.c:2557

4162 msgid "n,m"

4163 msgstr "n,m"

4164

3771 -#: builtin/blame.c:2552

4165 +#: builtin/blame.c:2557

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

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

4168

@@ -3778,7 +4172,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

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

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

4174 #. fewer display columns.

3781 -#: builtin/blame.c:2641

4175 +#: builtin/blame.c:2649

4176 msgid "4 years, 11 months ago"

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

4178

@@ -3881,119 +4275,126 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

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

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

4277

3884 -#: builtin/branch.c:309

4278 +#: builtin/branch.c:312

4279 #, c-format

4280 msgid "[%s: gone]"

4281 msgstr "[%s: försvunnen]"

4282

3889 -#: builtin/branch.c:314

4283 +#: builtin/branch.c:317

4284 #, c-format

4285 msgid "[%s]"

4286 msgstr "[%s]"

4287

3894 -#: builtin/branch.c:319

4288 +#: builtin/branch.c:322

4289 #, c-format

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

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

4292

3899 -#: builtin/branch.c:321

4293 +#: builtin/branch.c:324

4294 #, c-format

4295 msgid "[behind %d]"

4296 msgstr "[bakom %d] "

4297

3904 -#: builtin/branch.c:325

4298 +#: builtin/branch.c:328

4299 #, c-format

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

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

4302

3909 -#: builtin/branch.c:327

4303 +#: builtin/branch.c:330

4304 #, c-format

4305 msgid "[ahead %d]"

4306 msgstr "[före %d] "

4307

3914 -#: builtin/branch.c:330

4308 +#: builtin/branch.c:333

4309 #, c-format

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

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

4312

3919 -#: builtin/branch.c:333

4313 +#: builtin/branch.c:336

4314 #, c-format

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

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

4317

3924 -#: builtin/branch.c:346

4318 +#: builtin/branch.c:349

4319 msgid " **** invalid ref ****"

4320 msgstr " **** ogiltig ref ****"

4321

3928 -#: builtin/branch.c:372

4322 +#: builtin/branch.c:375

4323 #, c-format

4324 msgid "(no branch, rebasing %s)"

4325 msgstr "(ingen gren, ombaserar %s)"

4326

3933 -#: builtin/branch.c:375

4327 +#: builtin/branch.c:378

4328 #, c-format

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

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

4331

4332 #. TRANSLATORS: make sure this matches

4333 #. "HEAD detached at " in wt-status.c

3940 -#: builtin/branch.c:381

4334 +#: builtin/branch.c:384

4335 #, c-format

4336 msgid "(HEAD detached at %s)"

4337 msgstr "(HEAD frånkopplat vid %s)"

4338

4339 #. TRANSLATORS: make sure this matches

4340 #. "HEAD detached from " in wt-status.c

3947 -#: builtin/branch.c:386

4341 +#: builtin/branch.c:389

4342 #, c-format

4343 msgid "(HEAD detached from %s)"

4344 msgstr "(HEAD frånkopplat från %s)"

4345

3952 -#: builtin/branch.c:390

4346 +#: builtin/branch.c:393

4347 msgid "(no branch)"

4348 msgstr "(ingen gren)"

4349

3956 -#: builtin/branch.c:541

4350 +#: builtin/branch.c:544

4351 #, c-format

4352 msgid "Branch %s is being rebased at %s"

4353 msgstr "Grenen %s ombaseras på %s"

4354

3961 -#: builtin/branch.c:545

4355 +#: builtin/branch.c:548

4356 #, c-format

4357 msgid "Branch %s is being bisected at %s"

4358 msgstr "Grenen %s är i en \"bisect\" på %s"

4359

3966 -#: builtin/branch.c:560

4360 +#: builtin/branch.c:563

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

4362 msgstr ""

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

4364

3971 -#: builtin/branch.c:570

4365 +#: builtin/branch.c:573

4366 #, c-format

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

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

4369

3976 -#: builtin/branch.c:587

4370 +#: builtin/branch.c:590

4371 msgid "Branch rename failed"

4372 msgstr "Misslyckades byta namn på gren"

4373

3980 -#: builtin/branch.c:591

4374 +#: builtin/branch.c:594

4375 #, c-format

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

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

4378

3985 -#: builtin/branch.c:594

4379 +#: builtin/branch.c:597

4380 #, c-format

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

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

4383

3990 -#: builtin/branch.c:601

4384 +#: builtin/branch.c:604

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

4386 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

4387

3994 -#: builtin/branch.c:623

3995 -msgid "could not write branch description template"

3996 -msgstr "kunde inte skriva grenbeskrivningsmall"

4388 +#: builtin/branch.c:620

4389 +#, c-format

4390 +msgid ""

4391 +"Please edit the description for the branch\n"

4392 +" %s\n"

4393 +"Lines starting with '%c' will be stripped.\n"

4394 +msgstr ""

4395 +"Redigera beskrivningen för grenen\n"

4396 +" %s\n"

4397 +"Rader som inleds med \"%c\" ignoreras.\n"

4398

4399 #: builtin/branch.c:651

4400 msgid "Generic options"

@@ -4095,8 +4496,8 @@ msgstr "nyckel"

4496 msgid "field name to sort on"

4497 msgstr "fältnamn att sortera på"

4498

4098 -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

4099 -#: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4499 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402

4500 +#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568

4501 #: builtin/tag.c:369

4502 msgid "object"

4503 msgstr "objekt"

@@ -4221,7 +4622,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

4622 msgid "Need a repository to unbundle."

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

4624

4224 -#: builtin/cat-file.c:428

4625 +#: builtin/cat-file.c:443

4626 msgid ""

4627 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

4628 "<type>|--textconv) <object>"

@@ -4229,56 +4630,56 @@ msgstr ""

4630 "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|"

4631 "<typ>|--textconv) <objekt>"

4632

4232 -#: builtin/cat-file.c:429

4633 +#: builtin/cat-file.c:444

4634 msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4635 msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]"

4636

4236 -#: builtin/cat-file.c:466

4637 +#: builtin/cat-file.c:481

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

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

4640

4240 -#: builtin/cat-file.c:467

4641 +#: builtin/cat-file.c:482

4642 msgid "show object type"

4643 msgstr "visa objekttyp"

4644

4244 -#: builtin/cat-file.c:468

4645 +#: builtin/cat-file.c:483

4646 msgid "show object size"

4647 msgstr "visa objektstorlek"

4648

4248 -#: builtin/cat-file.c:470

4649 +#: builtin/cat-file.c:485

4650 msgid "exit with zero when there's no error"

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

4652

4252 -#: builtin/cat-file.c:471

4653 +#: builtin/cat-file.c:486

4654 msgid "pretty-print object's content"

4655 msgstr "visa objektets innehåll snyggt"

4656

4256 -#: builtin/cat-file.c:473

4657 +#: builtin/cat-file.c:488

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

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

4660

4260 -#: builtin/cat-file.c:475

4661 +#: builtin/cat-file.c:490

4662 msgid "allow -s and -t to work with broken/corrupt objects"

4663 msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"

4664

4264 -#: builtin/cat-file.c:476

4665 +#: builtin/cat-file.c:491

4666 msgid "buffer --batch output"

4667 msgstr "buffra utdata från --batch"

4668

4268 -#: builtin/cat-file.c:478

4669 +#: builtin/cat-file.c:493

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

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

4672

4272 -#: builtin/cat-file.c:481

4673 +#: builtin/cat-file.c:496

4674 msgid "show info about objects fed from the standard input"

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

4676

4276 -#: builtin/cat-file.c:484

4677 +#: builtin/cat-file.c:499

4678 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

4679 msgstr ""

4680 "följ symboliska länkar i trädet (använd med --batch eller --batch-check)"

4681

4281 -#: builtin/cat-file.c:486

4682 +#: builtin/cat-file.c:501

4683 msgid "show all objects with --batch or --batch-check"

4684 msgstr "visa alla objekt med --batch eller --batch-check"

4685

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

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

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

4709

4309 -#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4710 +#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325

4711 msgid "suppress progress reporting"

4712 msgstr "undertryck förloppsrapportering"

4713

@@ -4396,9 +4797,9 @@ msgid "write the content to temporary files"

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

4798

4799 #: builtin/checkout-index.c:174 builtin/column.c:30

4399 -#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4400 -#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4401 -#: builtin/submodule--helper.c:774

4800 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491

4801 +#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497

4802 +#: builtin/submodule--helper.c:830 builtin/worktree.c:469

4803 msgid "string"

4804 msgstr "sträng"

4805

@@ -4464,10 +4865,6 @@ msgstr "\"%s\" kan inte användas med %s"

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

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

4867

4467 -#: builtin/checkout.c:279 builtin/checkout.c:473

4468 -msgid "corrupt index file"

4469 -msgstr "indexfilen är trasig"

4470 -

4868 #: builtin/checkout.c:339 builtin/checkout.c:346

4869 #, c-format

4870 msgid "path '%s' is unmerged"

@@ -4477,50 +4874,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop"

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

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

4876

4480 -#: builtin/checkout.c:622

4877 +#: builtin/checkout.c:625

4878 #, c-format

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

4880 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

4881

4485 -#: builtin/checkout.c:660

4882 +#: builtin/checkout.c:664

4883 msgid "HEAD is now at"

4884 msgstr "HEAD är nu på"

4885

4489 -#: builtin/checkout.c:664 builtin/clone.c:661

4886 +#: builtin/checkout.c:668 builtin/clone.c:661

4887 msgid "unable to update HEAD"

4888 msgstr "kan inte uppdatera HEAD"

4889

4493 -#: builtin/checkout.c:668

4890 +#: builtin/checkout.c:672

4891 #, c-format

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

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

4894

4498 -#: builtin/checkout.c:671

4895 +#: builtin/checkout.c:675

4896 #, c-format

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

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

4899

4503 -#: builtin/checkout.c:675

4900 +#: builtin/checkout.c:679

4901 #, c-format

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

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

4904

4508 -#: builtin/checkout.c:677 builtin/checkout.c:1067

4905 +#: builtin/checkout.c:681 builtin/checkout.c:1070

4906 #, c-format

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

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

4909

4513 -#: builtin/checkout.c:679

4910 +#: builtin/checkout.c:683

4911 #, c-format

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

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

4914

4518 -#: builtin/checkout.c:731

4915 +#: builtin/checkout.c:734

4916 #, c-format

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

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

4919

4523 -#: builtin/checkout.c:737

4920 +#: builtin/checkout.c:740

4921 #, c-format

4922 msgid ""

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

@@ -4543,7 +4940,7 @@ msgstr[1] ""

4940 "\n"

4941 "%s\n"

4942

4546 -#: builtin/checkout.c:756

4943 +#: builtin/checkout.c:759

4944 #, c-format

4945 msgid ""

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

@@ -4570,151 +4967,151 @@ msgstr[1] ""

4967 " git branch <nytt_grennamn> %s\n"

4968 "\n"

4969

4573 -#: builtin/checkout.c:792

4970 +#: builtin/checkout.c:795

4971 msgid "internal error in revision walk"

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

4973

4577 -#: builtin/checkout.c:796

4974 +#: builtin/checkout.c:799

4975 msgid "Previous HEAD position was"

4976 msgstr "Tidigare position för HEAD var"

4977

4581 -#: builtin/checkout.c:823 builtin/checkout.c:1062

4978 +#: builtin/checkout.c:826 builtin/checkout.c:1065

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

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

4981

4585 -#: builtin/checkout.c:968

4982 +#: builtin/checkout.c:971

4983 #, c-format

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

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

4986

4590 -#: builtin/checkout.c:1008 builtin/worktree.c:212

4987 +#: builtin/checkout.c:1011 builtin/worktree.c:214

4988 #, c-format

4989 msgid "invalid reference: %s"

4990 msgstr "felaktig referens: %s"

4991

4595 -#: builtin/checkout.c:1037

4992 +#: builtin/checkout.c:1040

4993 #, c-format

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

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

4996

4600 -#: builtin/checkout.c:1076

4997 +#: builtin/checkout.c:1079

4998 msgid "paths cannot be used with switching branches"

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

5000

4604 -#: builtin/checkout.c:1079 builtin/checkout.c:1083

5001 +#: builtin/checkout.c:1082 builtin/checkout.c:1086

5002 #, c-format

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

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

5005

4609 -#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4610 -#: builtin/checkout.c:1098

5006 +#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098

5007 +#: builtin/checkout.c:1101

5008 #, c-format

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

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

5011

4615 -#: builtin/checkout.c:1103

5012 +#: builtin/checkout.c:1106

5013 #, c-format

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

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

5016

4620 -#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4621 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4622 -#: builtin/worktree.c:325

5017 +#: builtin/checkout.c:1139 builtin/checkout.c:1141 builtin/clone.c:88

5018 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324

5019 +#: builtin/worktree.c:326

5020 msgid "branch"

5021 msgstr "gren"

5022

4626 -#: builtin/checkout.c:1137

5023 +#: builtin/checkout.c:1140

5024 msgid "create and checkout a new branch"

5025 msgstr "skapa och checka ut en ny gren"

5026

4630 -#: builtin/checkout.c:1139

5027 +#: builtin/checkout.c:1142

5028 msgid "create/reset and checkout a branch"

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

5030

4634 -#: builtin/checkout.c:1140

5031 +#: builtin/checkout.c:1143

5032 msgid "create reflog for new branch"

5033 msgstr "skapa reflogg för ny gren"

5034

4638 -#: builtin/checkout.c:1141

4639 -msgid "detach the HEAD at named commit"

5035 +#: builtin/checkout.c:1144 builtin/worktree.c:328

5036 +msgid "detach HEAD at named commit"

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

5038

4642 -#: builtin/checkout.c:1142

5039 +#: builtin/checkout.c:1145

5040 msgid "set upstream info for new branch"

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

5042

4646 -#: builtin/checkout.c:1144

5043 +#: builtin/checkout.c:1147

5044 msgid "new-branch"

5045 msgstr "ny-gren"

5046

4650 -#: builtin/checkout.c:1144

5047 +#: builtin/checkout.c:1147

5048 msgid "new unparented branch"

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

5050

4654 -#: builtin/checkout.c:1145

5051 +#: builtin/checkout.c:1148

5052 msgid "checkout our version for unmerged files"

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

5054

4658 -#: builtin/checkout.c:1147

5055 +#: builtin/checkout.c:1150

5056 msgid "checkout their version for unmerged files"

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

5058

4662 -#: builtin/checkout.c:1149

5059 +#: builtin/checkout.c:1152

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

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

5062

4666 -#: builtin/checkout.c:1150

5063 +#: builtin/checkout.c:1153

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

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

5066

4670 -#: builtin/checkout.c:1151 builtin/merge.c:230

5067 +#: builtin/checkout.c:1154 builtin/merge.c:231

5068 msgid "update ignored files (default)"

5069 msgstr "uppdatera ignorerade filer (standard)"

5070

4674 -#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

5071 +#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250

5072 msgid "style"

5073 msgstr "stil"

5074

4678 -#: builtin/checkout.c:1153

5075 +#: builtin/checkout.c:1156

5076 msgid "conflict style (merge or diff3)"

5077 msgstr "konfliktstil (merge eller diff3)"

5078

4682 -#: builtin/checkout.c:1156

5079 +#: builtin/checkout.c:1159

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

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

5082

4686 -#: builtin/checkout.c:1158

5083 +#: builtin/checkout.c:1161

5084 msgid "second guess 'git checkout <no-such-branch>'"

5085 msgstr "förutspå \"git checkout <gren-saknas>\""

5086

4690 -#: builtin/checkout.c:1160

5087 +#: builtin/checkout.c:1163

5088 msgid "do not check if another worktree is holding the given ref"

5089 msgstr ""

5090 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

5091

4695 -#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4696 -#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

5092 +#: builtin/checkout.c:1164 builtin/clone.c:60 builtin/fetch.c:117

5093 +#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536

5094 #: builtin/send-pack.c:168

5095 msgid "force progress reporting"

5096 msgstr "tvinga förloppsrapportering"

5097

4701 -#: builtin/checkout.c:1192

5098 +#: builtin/checkout.c:1195

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

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

5101

4705 -#: builtin/checkout.c:1209

5102 +#: builtin/checkout.c:1212

5103 msgid "--track needs a branch name"

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

5105

4709 -#: builtin/checkout.c:1214

5106 +#: builtin/checkout.c:1217

5107 msgid "Missing branch name; try -b"

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

5109

4713 -#: builtin/checkout.c:1250

5110 +#: builtin/checkout.c:1253

5111 msgid "invalid path specification"

5112 msgstr "felaktig sökvägsangivelse"

5113

4717 -#: builtin/checkout.c:1257

5114 +#: builtin/checkout.c:1260

5115 #, c-format

5116 msgid ""

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

@@ -4723,12 +5120,12 @@ msgstr ""

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

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

5122

4726 -#: builtin/checkout.c:1262

5123 +#: builtin/checkout.c:1265

5124 #, c-format

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

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

5127

4731 -#: builtin/checkout.c:1266

5128 +#: builtin/checkout.c:1269

5129 msgid ""

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

5131 "checking out of the index."

@@ -4882,7 +5279,7 @@ msgid "remove whole directories"

5279 msgstr "ta bort hela kataloger"

5280

5281 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

4885 -#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

5282 +#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182

5283 msgid "pattern"

5284 msgstr "mönster"

5285

@@ -4926,7 +5323,7 @@ msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

5323 msgid "don't create a checkout"

5324 msgstr "skapa inte någon utcheckning"

5325

4929 -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

5326 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476

5327 msgid "create a bare repository"

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

5329

@@ -4954,16 +5351,16 @@ msgstr "initiera undermoduler i klonen"

5351 msgid "number of submodules cloned in parallel"

5352 msgstr "antal undermoduler som klonas parallellt"

5353

4957 -#: builtin/clone.c:80 builtin/init-db.c:470

5354 +#: builtin/clone.c:80 builtin/init-db.c:473

5355 msgid "template-directory"

5356 msgstr "mallkatalog"

5357

4961 -#: builtin/clone.c:81 builtin/init-db.c:471

5358 +#: builtin/clone.c:81 builtin/init-db.c:474

5359 msgid "directory from which templates will be used"

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

5361

4965 -#: builtin/clone.c:83 builtin/submodule--helper.c:498

4966 -#: builtin/submodule--helper.c:777

5362 +#: builtin/clone.c:83 builtin/submodule--helper.c:495

5363 +#: builtin/submodule--helper.c:833

5364 msgid "reference repository"

5365 msgstr "referensarkiv"

5366

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

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

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

5386

4990 -#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

5387 +#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667

5388 #: builtin/pull.c:201

5389 msgid "depth"

5390 msgstr "djup"

@@ -5004,11 +5401,11 @@ msgstr "klona endast en gren, HEAD eller --branch"

5401 msgid "any cloned submodules will be shallow"

5402 msgstr "klonade undermoduler kommer vara grunda"

5403

5007 -#: builtin/clone.c:98 builtin/init-db.c:479

5404 +#: builtin/clone.c:98 builtin/init-db.c:482

5405 msgid "gitdir"

5406 msgstr "gitkat"

5407

5011 -#: builtin/clone.c:99 builtin/init-db.c:480

5408 +#: builtin/clone.c:99 builtin/init-db.c:483

5409 msgid "separate git dir from working tree"

5410 msgstr "separera gitkatalogen från arbetskatalogen"

5411

@@ -5020,11 +5417,11 @@ msgstr "nyckel=värde"

5417 msgid "set config inside the new repository"

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

5419

5023 -#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5420 +#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547

5421 msgid "use IPv4 addresses only"

5422 msgstr "använd endast IPv4-adresser"

5423

5027 -#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5424 +#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549

5425 msgid "use IPv6 addresses only"

5426 msgstr "använd endast IPv6-adresser"

5427

@@ -5056,6 +5453,11 @@ msgstr "referensarkivet \"%s\" är grunt"

5453 msgid "reference repository '%s' is grafted"

5454 msgstr "referensarkivet \"%s\" är ympat"

5455

5456 +#: builtin/clone.c:376

5457 +#, c-format

5458 +msgid "failed to open '%s'"

5459 +msgstr "misslyckades öppna \"%s\""

5460 +

5461 #: builtin/clone.c:384

5462 #, c-format

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

@@ -5076,7 +5478,7 @@ msgstr "misslyckades skapa länken \"%s\""

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

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

5480

5079 -#: builtin/clone.c:449 builtin/clone.c:633

5481 +#: builtin/clone.c:449

5482 #, c-format

5483 msgid "done.\n"

5484 msgstr "klart.\n"

@@ -5096,14 +5498,7 @@ msgstr ""

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

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

5500

5099 -# Vague original, not networking-related, but rather related to the actual

5100 -# objects downloaded.

5101 -#: builtin/clone.c:628

5102 -#, c-format

5103 -msgid "Checking connectivity... "

5104 -msgstr "Kontrollerar om vi fick alla objekt..."

5105 -

5106 -#: builtin/clone.c:631

5501 +#: builtin/clone.c:633

5502 msgid "remote did not send all necessary objects"

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

5504

@@ -5121,99 +5516,99 @@ msgstr ""

5516 msgid "unable to checkout working tree"

5517 msgstr "kunde inte checka ut arbetskatalogen"

5518

5124 -#: builtin/clone.c:767

5519 +#: builtin/clone.c:766

5520 msgid "unable to write parameters to config file"

5521 msgstr "kunde inte skriva parametrar till konfigurationsfilen"

5522

5128 -#: builtin/clone.c:830

5523 +#: builtin/clone.c:829

5524 msgid "cannot repack to clean up"

5525 msgstr "kan inte packa om för att städa upp"

5526

5132 -#: builtin/clone.c:832

5527 +#: builtin/clone.c:831

5528 msgid "cannot unlink temporary alternates file"

5529 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

5530

5136 -#: builtin/clone.c:864 builtin/receive-pack.c:1731

5531 +#: builtin/clone.c:863 builtin/receive-pack.c:1855

5532 msgid "Too many arguments."

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

5534

5140 -#: builtin/clone.c:868

5535 +#: builtin/clone.c:867

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

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

5538

5144 -#: builtin/clone.c:879

5539 +#: builtin/clone.c:878

5540 #, c-format

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

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

5543

5149 -#: builtin/clone.c:882

5544 +#: builtin/clone.c:881

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

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

5547

5153 -#: builtin/clone.c:895

5548 +#: builtin/clone.c:894

5549 #, c-format

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

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

5552

5158 -#: builtin/clone.c:901 builtin/fetch.c:1174

5553 +#: builtin/clone.c:900 builtin/fetch.c:1293

5554 #, c-format

5555 msgid "depth %s is not a positive number"

5556 msgstr "djupet %s är inte ett positivt tal"

5557

5163 -#: builtin/clone.c:911

5558 +#: builtin/clone.c:910

5559 #, c-format

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

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

5562

5168 -#: builtin/clone.c:921

5563 +#: builtin/clone.c:920

5564 #, c-format

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

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

5567

5173 -#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5174 -#: builtin/worktree.c:220 builtin/worktree.c:247

5568 +#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544

5569 +#: builtin/worktree.c:222 builtin/worktree.c:249

5570 #, c-format

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

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

5573

5179 -#: builtin/clone.c:939

5574 +#: builtin/clone.c:938

5575 #, c-format

5576 msgid "could not create work tree dir '%s'"

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

5578

5184 -#: builtin/clone.c:957

5579 +#: builtin/clone.c:956

5580 #, c-format

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

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

5583

5189 -#: builtin/clone.c:959

5584 +#: builtin/clone.c:958

5585 #, c-format

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

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

5588

5194 -#: builtin/clone.c:998

5589 +#: builtin/clone.c:997

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

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

5592

5198 -#: builtin/clone.c:1001

5593 +#: builtin/clone.c:1000

5594 msgid "source repository is shallow, ignoring --local"

5595 msgstr "källarkivet är grunt, ignorerar --local"

5596

5202 -#: builtin/clone.c:1006

5597 +#: builtin/clone.c:1005

5598 msgid "--local is ignored"

5599 msgstr "--local ignoreras"

5600

5206 -#: builtin/clone.c:1010

5601 +#: builtin/clone.c:1009

5602 #, c-format

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

5604 msgstr "Vet inte hur man klonar %s"

5605

5211 -#: builtin/clone.c:1059 builtin/clone.c:1067

5606 +#: builtin/clone.c:1058 builtin/clone.c:1066

5607 #, c-format

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

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

5610

5216 -#: builtin/clone.c:1070

5611 +#: builtin/clone.c:1069

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

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

5614

@@ -5353,66 +5748,66 @@ msgstr ""

5748 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

5749 "cherry-pick för återstående incheckningar.\n"

5750

5356 -#: builtin/commit.c:307

5751 +#: builtin/commit.c:308

5752 msgid "failed to unpack HEAD tree object"

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

5754

5360 -#: builtin/commit.c:348

5755 +#: builtin/commit.c:349

5756 msgid "unable to create temporary index"

5757 msgstr "kunde inte skapa temporär indexfil"

5758

5364 -#: builtin/commit.c:354

5759 +#: builtin/commit.c:355

5760 msgid "interactive add failed"

5761 msgstr "interaktiv tilläggning misslyckades"

5762

5368 -#: builtin/commit.c:367

5763 +#: builtin/commit.c:368

5764 msgid "unable to update temporary index"

5765 msgstr "kan inte uppdatera temporärt index"

5766

5372 -#: builtin/commit.c:369

5767 +#: builtin/commit.c:370

5768 msgid "Failed to update main cache tree"

5769 msgstr "Misslyckades uppdatera huvud-cacheträdet"

5770

5376 -#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5771 +#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466

5772 msgid "unable to write new_index file"

5773 msgstr "kunde inte skriva filen new_index"

5774

5380 -#: builtin/commit.c:447

5775 +#: builtin/commit.c:448

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

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

5778

5384 -#: builtin/commit.c:449

5779 +#: builtin/commit.c:450

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

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

5782

5388 -#: builtin/commit.c:458

5783 +#: builtin/commit.c:459

5784 msgid "cannot read the index"

5785 msgstr "kan inte läsa indexet"

5786

5392 -#: builtin/commit.c:477

5787 +#: builtin/commit.c:478

5788 msgid "unable to write temporary index file"

5789 msgstr "kunde inte skriva temporär indexfil"

5790

5396 -#: builtin/commit.c:582

5791 +#: builtin/commit.c:583

5792 #, c-format

5793 msgid "commit '%s' lacks author header"

5794 msgstr "incheckningen \"%s\" saknar författarhuvud"

5795

5401 -#: builtin/commit.c:584

5796 +#: builtin/commit.c:585

5797 #, c-format

5798 msgid "commit '%s' has malformed author line"

5799 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

5800

5406 -#: builtin/commit.c:603

5801 +#: builtin/commit.c:604

5802 msgid "malformed --author parameter"

5803 msgstr "felformad \"--author\"-flagga"

5804

5410 -#: builtin/commit.c:611

5805 +#: builtin/commit.c:612

5806 #, c-format

5807 msgid "invalid date format: %s"

5808 msgstr "felaktigt datumformat: %s"

5809

5415 -#: builtin/commit.c:655

5810 +#: builtin/commit.c:656

5811 msgid ""

5812 "unable to select a comment character that is not used\n"

5813 "in the current commit message"

@@ -5420,38 +5815,38 @@ msgstr ""

5815 "kunde inte välja ett kommentarstecken som inte använts\n"

5816 "i det befintliga incheckningsmeddelandet"

5817

5423 -#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5818 +#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092

5819 #, c-format

5820 msgid "could not lookup commit %s"

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

5822

5428 -#: builtin/commit.c:704 builtin/shortlog.c:285

5823 +#: builtin/commit.c:705 builtin/shortlog.c:286

5824 #, c-format

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

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

5827

5433 -#: builtin/commit.c:706

5828 +#: builtin/commit.c:707

5829 msgid "could not read log from standard input"

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

5831

5437 -#: builtin/commit.c:710

5832 +#: builtin/commit.c:711

5833 #, c-format

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

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

5836

5442 -#: builtin/commit.c:737 builtin/commit.c:745

5837 +#: builtin/commit.c:738 builtin/commit.c:746

5838 msgid "could not read SQUASH_MSG"

5839 msgstr "kunde inte läsa SQUASH_MSG"

5840

5446 -#: builtin/commit.c:742

5841 +#: builtin/commit.c:743

5842 msgid "could not read MERGE_MSG"

5843 msgstr "kunde inte läsa MERGE_MSG"

5844

5450 -#: builtin/commit.c:796

5845 +#: builtin/commit.c:797

5846 msgid "could not write commit template"

5847 msgstr "kunde inte skriva incheckningsmall"

5848

5454 -#: builtin/commit.c:814

5849 +#: builtin/commit.c:815

5850 #, c-format

5851 msgid ""

5852 "\n"

@@ -5466,7 +5861,7 @@ msgstr ""

5861 "\t%s\n"

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

5863

5469 -#: builtin/commit.c:819

5864 +#: builtin/commit.c:820

5865 #, c-format

5866 msgid ""

5867 "\n"

@@ -5481,7 +5876,7 @@ msgstr ""

5876 "\t%s\n"

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

5878

5484 -#: builtin/commit.c:832

5879 +#: builtin/commit.c:833

5880 #, c-format

5881 msgid ""

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

@@ -5491,7 +5886,7 @@ msgstr ""

5886 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

5887 "incheckningen.\n"

5888

5494 -#: builtin/commit.c:839

5889 +#: builtin/commit.c:840

5890 #, c-format

5891 msgid ""

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

@@ -5502,146 +5897,146 @@ msgstr ""

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

5898 "Ett tomt meddelande avbryter incheckningen.\n"

5899

5505 -#: builtin/commit.c:859

5900 +#: builtin/commit.c:860

5901 #, c-format

5902 msgid "%sAuthor: %.*s <%.*s>"

5903 msgstr "%sFörfattare: %.*s <%.*s>"

5904

5510 -#: builtin/commit.c:867

5905 +#: builtin/commit.c:868

5906 #, c-format

5907 msgid "%sDate: %s"

5908 msgstr "%sDatum: %s"

5909

5515 -#: builtin/commit.c:874

5910 +#: builtin/commit.c:875

5911 #, c-format

5912 msgid "%sCommitter: %.*s <%.*s>"

5913 msgstr "%sIncheckare: %.*s <%.*s>"

5914

5520 -#: builtin/commit.c:892

5915 +#: builtin/commit.c:893

5916 msgid "Cannot read index"

5917 msgstr "Kan inte läsa indexet"

5918

5524 -#: builtin/commit.c:949

5919 +#: builtin/commit.c:950

5920 msgid "Error building trees"

5921 msgstr "Fel vid byggande av träd"

5922

5528 -#: builtin/commit.c:964 builtin/tag.c:266

5923 +#: builtin/commit.c:965 builtin/tag.c:266

5924 #, c-format

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

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

5927

5533 -#: builtin/commit.c:1066

5928 +#: builtin/commit.c:1067

5929 #, c-format

5930 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5931 msgstr ""

5932 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

5933

5539 -#: builtin/commit.c:1081 builtin/commit.c:1321

5934 +#: builtin/commit.c:1082 builtin/commit.c:1322

5935 #, c-format

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

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

5938

5544 -#: builtin/commit.c:1118

5939 +#: builtin/commit.c:1119

5940 msgid "--long and -z are incompatible"

5941 msgstr "--long och -z är inkompatibla"

5942

5548 -#: builtin/commit.c:1148

5943 +#: builtin/commit.c:1149

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

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

5946

5552 -#: builtin/commit.c:1157

5947 +#: builtin/commit.c:1158

5948 msgid "You have nothing to amend."

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

5950

5556 -#: builtin/commit.c:1160

5951 +#: builtin/commit.c:1161

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

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

5954

5560 -#: builtin/commit.c:1162

5955 +#: builtin/commit.c:1163

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

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

5958

5564 -#: builtin/commit.c:1165

5959 +#: builtin/commit.c:1166

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

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

5962

5568 -#: builtin/commit.c:1175

5963 +#: builtin/commit.c:1176

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

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

5966

5572 -#: builtin/commit.c:1177

5967 +#: builtin/commit.c:1178

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

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

5970

5576 -#: builtin/commit.c:1185

5971 +#: builtin/commit.c:1186

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

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

5974

5580 -#: builtin/commit.c:1202

5975 +#: builtin/commit.c:1203

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

5977 msgstr ""

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

5979

5585 -#: builtin/commit.c:1204

5980 +#: builtin/commit.c:1205

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

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

5983

5589 -#: builtin/commit.c:1206

5984 +#: builtin/commit.c:1207

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

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

5987

5593 -#: builtin/commit.c:1208

5988 +#: builtin/commit.c:1209

5989 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

5991

5597 -#: builtin/commit.c:1220 builtin/tag.c:474

5992 +#: builtin/commit.c:1221 builtin/tag.c:474

5993 #, c-format

5994 msgid "Invalid cleanup mode %s"

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

5996

5602 -#: builtin/commit.c:1225

5997 +#: builtin/commit.c:1226

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

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

6000

5606 -#: builtin/commit.c:1335 builtin/commit.c:1621

6001 +#: builtin/commit.c:1336 builtin/commit.c:1622

6002 msgid "show status concisely"

6003 msgstr "visa koncis status"

6004

5610 -#: builtin/commit.c:1337 builtin/commit.c:1623

6005 +#: builtin/commit.c:1338 builtin/commit.c:1624

6006 msgid "show branch information"

6007 msgstr "visa information om gren"

6008

5614 -#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5615 -#: builtin/worktree.c:437

6009 +#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522

6010 +#: builtin/worktree.c:440

6011 msgid "machine-readable output"

6012 msgstr "maskinläsbar utdata"

6013

5619 -#: builtin/commit.c:1342 builtin/commit.c:1627

6014 +#: builtin/commit.c:1343 builtin/commit.c:1628

6015 msgid "show status in long format (default)"

6016 msgstr "visa status i långt format (standard)"

6017

5623 -#: builtin/commit.c:1345 builtin/commit.c:1630

6018 +#: builtin/commit.c:1346 builtin/commit.c:1631

6019 msgid "terminate entries with NUL"

6020 msgstr "terminera poster med NUL"

6021

5627 -#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

6022 +#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981

6023 #: builtin/fast-export.c:984 builtin/tag.c:353

6024 msgid "mode"

6025 msgstr "läge"

6026

5632 -#: builtin/commit.c:1348 builtin/commit.c:1633

6027 +#: builtin/commit.c:1349 builtin/commit.c:1634

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

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

6030

5636 -#: builtin/commit.c:1351

6031 +#: builtin/commit.c:1352

6032 msgid "show ignored files"

6033 msgstr "visa ignorerade filer"

6034

5640 -#: builtin/commit.c:1352 parse-options.h:155

6035 +#: builtin/commit.c:1353 parse-options.h:155

6036 msgid "when"

6037 msgstr "när"

6038

5644 -#: builtin/commit.c:1353

6039 +#: builtin/commit.c:1354

6040 msgid ""

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

6042 "(Default: all)"

@@ -5649,201 +6044,201 @@ msgstr ""

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

6045 "(Default: all)"

6046

5652 -#: builtin/commit.c:1355

6047 +#: builtin/commit.c:1356

6048 msgid "list untracked files in columns"

6049 msgstr "visa ospårade filer i spalter"

6050

5656 -#: builtin/commit.c:1441

6051 +#: builtin/commit.c:1442

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

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

6054

5660 -#: builtin/commit.c:1443

6055 +#: builtin/commit.c:1444

6056 msgid "could not parse newly created commit"

6057 msgstr "kunde inte tolka en precis skapad incheckning"

6058

5664 -#: builtin/commit.c:1488

6059 +#: builtin/commit.c:1489

6060 msgid "detached HEAD"

6061 msgstr "frånkopplad HEAD"

6062

5668 -#: builtin/commit.c:1491

6063 +#: builtin/commit.c:1492

6064 msgid " (root-commit)"

6065 msgstr " (rotincheckning)"

6066

5672 -#: builtin/commit.c:1591

6067 +#: builtin/commit.c:1592

6068 msgid "suppress summary after successful commit"

6069 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

6070

5676 -#: builtin/commit.c:1592

6071 +#: builtin/commit.c:1593

6072 msgid "show diff in commit message template"

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

6074

5680 -#: builtin/commit.c:1594

6075 +#: builtin/commit.c:1595

6076 msgid "Commit message options"

6077 msgstr "Alternativ för incheckningsmeddelande"

6078

5684 -#: builtin/commit.c:1595 builtin/tag.c:351

6079 +#: builtin/commit.c:1596 builtin/tag.c:351

6080 msgid "read message from file"

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

6082

5688 -#: builtin/commit.c:1596

6083 +#: builtin/commit.c:1597

6084 msgid "author"

6085 msgstr "författare"

6086

5692 -#: builtin/commit.c:1596

6087 +#: builtin/commit.c:1597

6088 msgid "override author for commit"

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

6090

5696 -#: builtin/commit.c:1597 builtin/gc.c:326

6091 +#: builtin/commit.c:1598 builtin/gc.c:326

6092 msgid "date"

6093 msgstr "datum"

6094

5700 -#: builtin/commit.c:1597

6095 +#: builtin/commit.c:1598

6096 msgid "override date for commit"

6097 msgstr "överstyr datum för incheckningen"

6098

5704 -#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5705 -#: builtin/notes.c:558 builtin/tag.c:349

6099 +#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396

6100 +#: builtin/notes.c:559 builtin/tag.c:349

6101 msgid "message"

6102 msgstr "meddelande"

6103

5709 -#: builtin/commit.c:1598

6104 +#: builtin/commit.c:1599

6105 msgid "commit message"

6106 msgstr "incheckningsmeddelande"

6107

5713 -#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5714 -#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

6108 +#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602

6109 +#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79

6110 msgid "commit"

6111 msgstr "incheckning"

6112

5718 -#: builtin/commit.c:1599

6113 +#: builtin/commit.c:1600

6114 msgid "reuse and edit message from specified commit"

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

6116

5722 -#: builtin/commit.c:1600

6117 +#: builtin/commit.c:1601

6118 msgid "reuse message from specified commit"

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

6120

5726 -#: builtin/commit.c:1601

6121 +#: builtin/commit.c:1602

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

6123 msgstr ""

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

6125

5731 -#: builtin/commit.c:1602

6126 +#: builtin/commit.c:1603

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

6128 msgstr ""

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

6130 "incheckning"

6131

5737 -#: builtin/commit.c:1603

6132 +#: builtin/commit.c:1604

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

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

6135

5741 -#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

6136 +#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86

6137 msgid "add Signed-off-by:"

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

6139

5745 -#: builtin/commit.c:1605

6140 +#: builtin/commit.c:1606

6141 msgid "use specified template file"

6142 msgstr "använd angiven mallfil"

6143

5749 -#: builtin/commit.c:1606

6144 +#: builtin/commit.c:1607

6145 msgid "force edit of commit"

6146 msgstr "tvinga redigering av incheckning"

6147

5753 -#: builtin/commit.c:1607

6148 +#: builtin/commit.c:1608

6149 msgid "default"

6150 msgstr "standard"

6151

5757 -#: builtin/commit.c:1607 builtin/tag.c:354

6152 +#: builtin/commit.c:1608 builtin/tag.c:354

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

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

6155

5761 -#: builtin/commit.c:1608

6156 +#: builtin/commit.c:1609

6157 msgid "include status in commit message template"

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

6159

5765 -#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

6160 +#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165

6161 #: builtin/revert.c:93

6162 msgid "GPG sign commit"

6163 msgstr "GPG-signera incheckning"

6164

5770 -#: builtin/commit.c:1613

6165 +#: builtin/commit.c:1614

6166 msgid "Commit contents options"

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

6168

5774 -#: builtin/commit.c:1614

6169 +#: builtin/commit.c:1615

6170 msgid "commit all changed files"

6171 msgstr "checka in alla ändrade filer"

6172

5778 -#: builtin/commit.c:1615

6173 +#: builtin/commit.c:1616

6174 msgid "add specified files to index for commit"

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

6176

5782 -#: builtin/commit.c:1616

6177 +#: builtin/commit.c:1617

6178 msgid "interactively add files"

6179 msgstr "lägg till filer interaktivt"

6180

5786 -#: builtin/commit.c:1617

6181 +#: builtin/commit.c:1618

6182 msgid "interactively add changes"

6183 msgstr "lägg till ändringar interaktivt"

6184

5790 -#: builtin/commit.c:1618

6185 +#: builtin/commit.c:1619

6186 msgid "commit only specified files"

6187 msgstr "checka endast in angivna filer"

6188

5794 -#: builtin/commit.c:1619

5795 -msgid "bypass pre-commit hook"

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

5797 -

6189 #: builtin/commit.c:1620

6190 +msgid "bypass pre-commit and commit-msg hooks"

6191 +msgstr "förbigå pre-commit- och commit-msg-krokar"

6192 +

6193 +#: builtin/commit.c:1621

6194 msgid "show what would be committed"

6195 msgstr "visa vad som skulle checkas in"

6196

l10n: sv.po: Update Swedish translation (2757t0f0u)