5331bfd785 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2014-08-04 14:48+0800\n"

11 -"PO-Revision-Date: 2014-08-05 13:44+0100\n"

10 +"POT-Creation-Date: 2014-11-01 07:46+0800\n"

11 +"PO-Revision-Date: 2014-11-01 20:10+0100\n"

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

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

14 "Language: sv\n"

@@ -25,106 +25,104 @@ msgstr "tips: %.*s\n"

25 #: advice.c:88

26 msgid ""

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

28 -"as appropriate to mark resolution and make a commit, or use\n"

29 -"'git commit -a'."

28 +"as appropriate to mark resolution and make a commit."

29 msgstr ""

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

32 -"som lämpligt för att ange lösning och checka in, eller använd\n"

33 -"\"git commit -a\"."

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

32

35 -#: archive.c:10

33 +#: archive.c:11

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

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

36

39 -#: archive.c:11

37 +#: archive.c:12

38 msgid "git archive --list"

39 msgstr "git archive --list"

40

43 -#: archive.c:12

41 +#: archive.c:13

42 msgid ""

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

44 msgstr ""

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

46 "[<sökväg>...]"

47

50 -#: archive.c:13

48 +#: archive.c:14

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

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

51

54 -#: archive.c:243 builtin/add.c:136 builtin/add.c:427 builtin/rm.c:328

52 +#: archive.c:334 builtin/add.c:137 builtin/add.c:427 builtin/rm.c:328

53 #, c-format

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

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

56

59 -#: archive.c:328

57 +#: archive.c:419

58 msgid "fmt"

59 msgstr "fmt"

60

63 -#: archive.c:328

61 +#: archive.c:419

62 msgid "archive format"

63 msgstr "arkivformat"

64

67 -#: archive.c:329 builtin/log.c:1201

65 +#: archive.c:420 builtin/log.c:1204

66 msgid "prefix"

67 msgstr "prefix"

68

71 -#: archive.c:330

69 +#: archive.c:421

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

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

72

75 -#: archive.c:331 builtin/archive.c:88 builtin/blame.c:2517

76 -#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:709

77 -#: builtin/fast-export.c:711 builtin/grep.c:712 builtin/hash-object.c:77

78 -#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:412

79 -#: builtin/notes.c:569 builtin/read-tree.c:108 parse-options.h:151

73 +#: archive.c:422 builtin/archive.c:88 builtin/blame.c:2517

74 +#: builtin/blame.c:2518 builtin/config.c:57 builtin/fast-export.c:986

75 +#: builtin/fast-export.c:988 builtin/grep.c:712 builtin/hash-object.c:101

76 +#: builtin/ls-files.c:489 builtin/ls-files.c:492 builtin/notes.c:411

77 +#: builtin/notes.c:568 builtin/read-tree.c:109 parse-options.h:151

78 msgid "file"

79 msgstr "fil"

80

83 -#: archive.c:332 builtin/archive.c:89

81 +#: archive.c:423 builtin/archive.c:89

82 msgid "write the archive to this file"

83 msgstr "skriv arkivet till filen"

84

87 -#: archive.c:334

85 +#: archive.c:425

86 msgid "read .gitattributes in working directory"

87 msgstr "läs .gitattributes i arbetskatalogen"

88

91 -#: archive.c:335

89 +#: archive.c:426

90 msgid "report archived files on stderr"

91 msgstr "rapportera arkiverade filer på standard fel"

92

95 -#: archive.c:336

93 +#: archive.c:427

94 msgid "store only"

95 msgstr "endast spara"

96

99 -#: archive.c:337

97 +#: archive.c:428

98 msgid "compress faster"

99 msgstr "komprimera snabbare"

100

103 -#: archive.c:345

101 +#: archive.c:436

102 msgid "compress better"

103 msgstr "komprimera bättre"

104

107 -#: archive.c:348

105 +#: archive.c:439

106 msgid "list supported archive formats"

107 msgstr "visa understödda arkivformat"

108

111 -#: archive.c:350 builtin/archive.c:90 builtin/clone.c:84

109 +#: archive.c:441 builtin/archive.c:90 builtin/clone.c:85

110 msgid "repo"

111 msgstr "arkiv"

112

115 -#: archive.c:351 builtin/archive.c:91

113 +#: archive.c:442 builtin/archive.c:91

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

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

116

119 -#: archive.c:352 builtin/archive.c:92 builtin/notes.c:491

117 +#: archive.c:443 builtin/archive.c:92 builtin/notes.c:490

118 msgid "command"

119 msgstr "kommando"

120

123 -#: archive.c:353 builtin/archive.c:93

121 +#: archive.c:444 builtin/archive.c:93

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

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

124

127 -#: attr.c:259

125 +#: attr.c:258

126 msgid ""

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

128 "Use '\\!' for literal leading exclamation."

@@ -184,31 +182,31 @@ msgstr "Grenen %s ställdes in att spåra den lokala referensen %s."

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

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

184

187 -#: branch.c:178

185 +#: branch.c:162

186 #, c-format

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

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

189

192 -#: branch.c:183

190 +#: branch.c:167

191 #, c-format

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

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

194

197 -#: branch.c:191

195 +#: branch.c:175

196 msgid "Cannot force update the current branch."

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

198

201 -#: branch.c:211

199 +#: branch.c:195

200 #, c-format

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

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

203

206 -#: branch.c:213

204 +#: branch.c:197

205 #, c-format

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

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

208

211 -#: branch.c:215

209 +#: branch.c:199

210 msgid ""

211 "\n"

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

@@ -228,107 +226,105 @@ msgstr ""

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

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

228

231 -#: branch.c:260

229 +#: branch.c:243

230 #, c-format

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

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

233

236 -#: branch.c:280

234 +#: branch.c:263

235 #, c-format

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

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

238

241 -#: branch.c:285

239 +#: branch.c:268

240 #, c-format

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

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

243

246 -#: branch.c:291

247 -msgid "Failed to lock ref for update"

248 -msgstr "Misslyckades låsa referens för uppdatering"

249 -

250 -#: branch.c:309

251 -msgid "Failed to write ref"

252 -msgstr "Misslyckades skriva referens"

253 -

254 -#: bundle.c:33

244 +#: bundle.c:34

245 #, c-format

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

247 msgstr "'%s' ser inte ut som en v2-bundle-fil"

248

259 -#: bundle.c:60

249 +#: bundle.c:61

250 #, c-format

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

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

253

264 -#: bundle.c:86 builtin/commit.c:755

254 +#: bundle.c:87 builtin/commit.c:788

255 #, c-format

256 msgid "could not open '%s'"

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

258

269 -#: bundle.c:138

259 +#: bundle.c:139

260 msgid "Repository lacks these prerequisite commits:"

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

262

273 -#: bundle.c:162 sequencer.c:630 sequencer.c:1085 builtin/log.c:330

274 -#: builtin/log.c:821 builtin/log.c:1428 builtin/log.c:1665 builtin/merge.c:357

263 +#: bundle.c:163 sequencer.c:641 sequencer.c:1096 builtin/blame.c:2706

264 +#: builtin/branch.c:652 builtin/commit.c:1085 builtin/log.c:330

265 +#: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:357

266 #: builtin/shortlog.c:158

267 msgid "revision walk setup failed"

268 msgstr "misslyckades skapa revisionstraversering"

269

279 -#: bundle.c:184

270 +#: bundle.c:185

271 #, c-format

272 msgid "The bundle contains this ref:"

273 msgid_plural "The bundle contains these %d refs:"

274 msgstr[0] "Paketet (bundlen) innehåller denna referens:"

275 msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"

276

286 -#: bundle.c:191

277 +#: bundle.c:192

278 msgid "The bundle records a complete history."

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

280

290 -#: bundle.c:193

281 +#: bundle.c:194

282 #, c-format

283 msgid "The bundle requires this ref:"

284 msgid_plural "The bundle requires these %d refs:"

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

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

287

297 -#: bundle.c:289

288 +#: bundle.c:292

289 msgid "rev-list died"

290 msgstr "rev-list dog"

291

301 -#: bundle.c:295 builtin/log.c:1339 builtin/shortlog.c:261

292 +#: bundle.c:298 builtin/log.c:153 builtin/log.c:1342 builtin/shortlog.c:261

293 #, c-format

294 msgid "unrecognized argument: %s"

295 msgstr "okänt argument: %s"

296

306 -#: bundle.c:330

297 +#: bundle.c:333

298 #, c-format

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

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

301

311 -#: bundle.c:375

302 +#: bundle.c:378

303 msgid "Refusing to create empty bundle."

304 msgstr "Vägrar skapa ett tomt paket (bundle)."

305

315 -#: bundle.c:390

306 +#: bundle.c:393

307 msgid "Could not spawn pack-objects"

308 msgstr "Kunde inte starta pack-objects"

309

319 -#: bundle.c:408

310 +#: bundle.c:411

311 msgid "pack-objects died"

312 msgstr "pack-objects misslyckades"

313

323 -#: bundle.c:411

314 +#: bundle.c:414

315 #, c-format

316 msgid "cannot create '%s'"

317 msgstr "kan inte skapa \"%s\""

318

328 -#: bundle.c:433

319 +#: bundle.c:435

320 msgid "index-pack died"

321 msgstr "index-pack dog"

322

323 +#: color.c:157

324 +#, c-format

325 +msgid "invalid color value: %.*s"

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

327 +

328 #: commit.c:40

329 #, c-format

330 msgid "could not parse %s"

@@ -343,16 +339,69 @@ msgstr "%s %s är inte en incheckning!"

339 msgid "memory exhausted"

340 msgstr "minnet slut"

341

346 -#: connected.c:70

342 +#: config.c:469 config.c:471

343 +#, c-format

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

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

346 +

347 +#: config.c:587

348 +#, c-format

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

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

351 +

352 +#: config.c:589

353 +#, c-format

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

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

356 +

357 +#: config.c:674

358 +#, c-format

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

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

361 +

362 +#: config.c:752 config.c:763

363 +#, c-format

364 +msgid "bad zlib compression level %d"

365 +msgstr "felaktigt zlib-komprimeringsgrad %d"

366 +

367 +#: config.c:885

368 +#, c-format

369 +msgid "invalid mode for object creation: %s"

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

371 +

372 +#: config.c:1201

373 +msgid "unable to parse command-line config"

374 +msgstr "kan inte tolka kommandoradskonfiguration"

375 +

376 +#: config.c:1262

377 +msgid "unknown error occured while reading the configuration files"

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

379 +

380 +#: config.c:1586

381 +#, c-format

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

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

384 +

385 +#: config.c:1588

386 +#, c-format

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

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

389 +

390 +#: config.c:1647

391 +#, c-format

392 +msgid "%s has multiple values"

393 +msgstr "%s har flera värden"

394 +

395 +#: connected.c:69

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

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

398

350 -#: connected.c:90

399 +#: connected.c:89

400 #, c-format

401 msgid "failed write to rev-list: %s"

402 msgstr "kunde inte skriva till rev-list: %s"

403

355 -#: connected.c:98

404 +#: connected.c:97

405 #, c-format

406 msgid "failed to close rev-list's stdin: %s"

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

@@ -430,7 +479,7 @@ msgstr[1] "%lu år sedan"

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

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

481

433 -#: diffcore-rename.c:514

482 +#: diffcore-rename.c:516

483 msgid "Performing inexact rename detection"

484 msgstr "Utför onöjaktig namnbytesdetektering"

485

@@ -449,7 +498,7 @@ msgstr " Okänd dirstat-parameter \"%s\"\n"

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

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

500

452 -#: diff.c:267

501 +#: diff.c:266

502 #, c-format

503 msgid ""

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

@@ -458,16 +507,16 @@ msgstr ""

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

508 "%s"

509

461 -#: diff.c:2934

510 +#: diff.c:2957

511 #, c-format

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

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

514

466 -#: diff.c:3329

515 +#: diff.c:3352

516 msgid "--follow requires exactly one pathspec"

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

518

470 -#: diff.c:3492

519 +#: diff.c:3515

520 #, c-format

521 msgid ""

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

@@ -476,44 +525,44 @@ msgstr ""

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

526 "%s"

527

479 -#: diff.c:3506

528 +#: diff.c:3529

529 #, c-format

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

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

532

484 -#: gpg-interface.c:73 gpg-interface.c:145

533 +#: gpg-interface.c:129 gpg-interface.c:200

534 msgid "could not run gpg."

535 msgstr "kunde inte köra gpg."

536

488 -#: gpg-interface.c:85

537 +#: gpg-interface.c:141

538 msgid "gpg did not accept the data"

539 msgstr "gpg godtog inte data"

540

492 -#: gpg-interface.c:96

541 +#: gpg-interface.c:152

542 msgid "gpg failed to sign the data"

543 msgstr "gpg misslyckades signera data"

544

496 -#: gpg-interface.c:129

545 +#: gpg-interface.c:185

546 #, c-format

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

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

549

501 -#: gpg-interface.c:132

550 +#: gpg-interface.c:188

551 #, c-format

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

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

554

506 -#: grep.c:1703

555 +#: grep.c:1718

556 #, c-format

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

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

559

511 -#: grep.c:1720

560 +#: grep.c:1735

561 #, c-format

562 msgid "'%s': %s"

563 msgstr "\"%s\": %s"

564

516 -#: grep.c:1731

565 +#: grep.c:1746

566 #, c-format

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

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

@@ -582,87 +631,95 @@ msgstr[1] ""

631 msgid "%s: %s - %s"

632 msgstr "%s: %s - %s"

633

585 -#: merge.c:40

634 +#: lockfile.c:275

635 +msgid "BUG: reopen a lockfile that is still open"

636 +msgstr "FEL: återöppna en låsfil som fortfarande är öppen"

637 +

638 +#: lockfile.c:277

639 +msgid "BUG: reopen a lockfile that has been committed"

640 +msgstr "FEL: återöppna en låsfil som har överlämnats"

641 +

642 +#: merge.c:41

643 msgid "failed to read the cache"

644 msgstr "misslyckades läsa cachen"

645

589 -#: merge.c:93 builtin/checkout.c:356 builtin/checkout.c:556

590 -#: builtin/clone.c:661

646 +#: merge.c:94 builtin/checkout.c:356 builtin/checkout.c:562

647 +#: builtin/clone.c:659

648 msgid "unable to write new index file"

649 msgstr "kunde inte skriva ny indexfil"

650

594 -#: merge-recursive.c:190

651 +#: merge-recursive.c:189

652 #, c-format

653 msgid "(bad commit)\n"

654 msgstr "(felaktig incheckning)\n"

655

599 -#: merge-recursive.c:210

656 +#: merge-recursive.c:209

657 #, c-format

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

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

660

604 -#: merge-recursive.c:271

661 +#: merge-recursive.c:270

662 msgid "error building trees"

663 msgstr "fel vid byggande av träd"

664

608 -#: merge-recursive.c:692

665 +#: merge-recursive.c:691

666 #, c-format

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

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

669

613 -#: merge-recursive.c:703

670 +#: merge-recursive.c:702

671 #, c-format

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

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

674

618 -#: merge-recursive.c:717 merge-recursive.c:738

675 +#: merge-recursive.c:716 merge-recursive.c:737

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

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

678

622 -#: merge-recursive.c:728

679 +#: merge-recursive.c:727

680 #, c-format

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

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

683

627 -#: merge-recursive.c:768

684 +#: merge-recursive.c:767

685 #, c-format

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

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

688

632 -#: merge-recursive.c:770

689 +#: merge-recursive.c:769

690 #, c-format

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

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

693

637 -#: merge-recursive.c:793 builtin/clone.c:317

694 +#: merge-recursive.c:792 builtin/clone.c:318

695 #, c-format

696 msgid "failed to open '%s'"

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

698

642 -#: merge-recursive.c:801

699 +#: merge-recursive.c:800

700 #, c-format

701 msgid "failed to symlink '%s'"

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

703

647 -#: merge-recursive.c:804

704 +#: merge-recursive.c:803

705 #, c-format

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

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

708

652 -#: merge-recursive.c:942

709 +#: merge-recursive.c:941

710 msgid "Failed to execute internal merge"

711 msgstr "Misslyckades exekvera intern sammanslagning"

712

656 -#: merge-recursive.c:946

713 +#: merge-recursive.c:945

714 #, c-format

715 msgid "Unable to add %s to database"

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

717

661 -#: merge-recursive.c:962

718 +#: merge-recursive.c:961

719 msgid "unsupported object type in the tree"

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

721

665 -#: merge-recursive.c:1037 merge-recursive.c:1051

722 +#: merge-recursive.c:1036 merge-recursive.c:1050

723 #, c-format

724 msgid ""

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

@@ -671,7 +728,7 @@ msgstr ""

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

729 "i trädet."

730

674 -#: merge-recursive.c:1043 merge-recursive.c:1056

731 +#: merge-recursive.c:1042 merge-recursive.c:1055

732 #, c-format

733 msgid ""

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

@@ -680,20 +737,20 @@ msgstr ""

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

738 "i trädet vid %s."

739

683 -#: merge-recursive.c:1097

740 +#: merge-recursive.c:1096

741 msgid "rename"

742 msgstr "namnbyte"

743

687 -#: merge-recursive.c:1097

744 +#: merge-recursive.c:1096

745 msgid "renamed"

746 msgstr "namnbytt"

747

691 -#: merge-recursive.c:1153

748 +#: merge-recursive.c:1152

749 #, c-format

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

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

752

696 -#: merge-recursive.c:1175

753 +#: merge-recursive.c:1174

754 #, c-format

755 msgid ""

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

@@ -702,144 +759,144 @@ msgstr ""

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

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

761

705 -#: merge-recursive.c:1180

762 +#: merge-recursive.c:1179

763 msgid " (left unresolved)"

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

765

709 -#: merge-recursive.c:1234

766 +#: merge-recursive.c:1233

767 #, c-format

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

769 msgstr ""

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

771

715 -#: merge-recursive.c:1264

772 +#: merge-recursive.c:1263

773 #, c-format

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

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

776

720 -#: merge-recursive.c:1463

777 +#: merge-recursive.c:1462

778 #, c-format

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

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

781

725 -#: merge-recursive.c:1473

782 +#: merge-recursive.c:1472

783 #, c-format

784 msgid "Adding merged %s"

785 msgstr "Lägger till sammanslagen %s"

786

730 -#: merge-recursive.c:1478 merge-recursive.c:1676

787 +#: merge-recursive.c:1477 merge-recursive.c:1675

788 #, c-format

789 msgid "Adding as %s instead"

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

791

735 -#: merge-recursive.c:1529

792 +#: merge-recursive.c:1528

793 #, c-format

794 msgid "cannot read object %s"

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

796

740 -#: merge-recursive.c:1532

797 +#: merge-recursive.c:1531

798 #, c-format

799 msgid "object %s is not a blob"

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

801

745 -#: merge-recursive.c:1580

802 +#: merge-recursive.c:1579

803 msgid "modify"

804 msgstr "ändra"

805

749 -#: merge-recursive.c:1580

806 +#: merge-recursive.c:1579

807 msgid "modified"

808 msgstr "ändrad"

809

753 -#: merge-recursive.c:1590

810 +#: merge-recursive.c:1589

811 msgid "content"

812 msgstr "innehåll"

813

757 -#: merge-recursive.c:1597

814 +#: merge-recursive.c:1596

815 msgid "add/add"

816 msgstr "tillägg/tillägg"

817

761 -#: merge-recursive.c:1631

818 +#: merge-recursive.c:1630

819 #, c-format

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

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

822

766 -#: merge-recursive.c:1645

823 +#: merge-recursive.c:1644

824 #, c-format

825 msgid "Auto-merging %s"

826 msgstr "Slår ihop %s automatiskt"

827

771 -#: merge-recursive.c:1649 git-submodule.sh:1150

828 +#: merge-recursive.c:1648 git-submodule.sh:1150

829 msgid "submodule"

830 msgstr "undermodul"

831

775 -#: merge-recursive.c:1650

832 +#: merge-recursive.c:1649

833 #, c-format

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

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

836

780 -#: merge-recursive.c:1740

837 +#: merge-recursive.c:1735

838 #, c-format

839 msgid "Removing %s"

840 msgstr "Tar bort %s"

841

785 -#: merge-recursive.c:1765

842 +#: merge-recursive.c:1760

843 msgid "file/directory"

844 msgstr "fil/katalog"

845

789 -#: merge-recursive.c:1771

846 +#: merge-recursive.c:1766

847 msgid "directory/file"

848 msgstr "katalog/fil"

849

793 -#: merge-recursive.c:1776

850 +#: merge-recursive.c:1771

851 #, c-format

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

853 msgstr ""

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

855

799 -#: merge-recursive.c:1786

856 +#: merge-recursive.c:1781

857 #, c-format

858 msgid "Adding %s"

859 msgstr "Lägger till %s"

860

804 -#: merge-recursive.c:1803

861 +#: merge-recursive.c:1798

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

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

864

808 -#: merge-recursive.c:1822

865 +#: merge-recursive.c:1817

866 msgid "Already up-to-date!"

867 msgstr "Redan à jour!"

868

812 -#: merge-recursive.c:1831

869 +#: merge-recursive.c:1826

870 #, c-format

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

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

873

817 -#: merge-recursive.c:1861

874 +#: merge-recursive.c:1856

875 #, c-format

876 msgid "Unprocessed path??? %s"

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

878

822 -#: merge-recursive.c:1906

879 +#: merge-recursive.c:1901

880 msgid "Merging:"

881 msgstr "Slår ihop:"

882

826 -#: merge-recursive.c:1919

883 +#: merge-recursive.c:1914

884 #, c-format

885 msgid "found %u common ancestor:"

886 msgid_plural "found %u common ancestors:"

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

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

889

833 -#: merge-recursive.c:1956

890 +#: merge-recursive.c:1951

891 msgid "merge returned no commit"

892 msgstr "sammanslagningen returnerade ingen incheckning"

893

837 -#: merge-recursive.c:2013

894 +#: merge-recursive.c:2008

895 #, c-format

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

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

898

842 -#: merge-recursive.c:2024 builtin/merge.c:666

899 +#: merge-recursive.c:2019 builtin/merge.c:666

900 msgid "Unable to write index."

901 msgstr "Kunde inte skriva indexet."

902

@@ -864,33 +921,33 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

923

867 -#: object.c:234

924 +#: object.c:241

925 #, c-format

926 msgid "unable to parse object: %s"

927 msgstr "kunde inte tolka objektet: %s"

928

872 -#: parse-options.c:534

929 +#: parse-options.c:546

930 msgid "..."

931 msgstr "..."

932

876 -#: parse-options.c:552

933 +#: parse-options.c:564

934 #, c-format

935 msgid "usage: %s"

936 msgstr "användning: %s"

937

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

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

883 -#: parse-options.c:556

940 +#: parse-options.c:568

941 #, c-format

942 msgid " or: %s"

943 msgstr " eller: %s"

944

888 -#: parse-options.c:559

945 +#: parse-options.c:571

946 #, c-format

947 msgid " %s"

948 msgstr " %s"

949

893 -#: parse-options.c:593

950 +#: parse-options.c:605

951 msgid "-NUM"

952 msgstr "-TAL"

953

@@ -959,11 +1016,15 @@ msgstr ""

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

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

1018

1019 +#: pretty.c:968

1020 +msgid "unable to parse --pretty format"

1021 +msgstr "kunde inte tolka format för --pretty"

1022 +

1023 #: progress.c:225

1024 msgid "done"

1025 msgstr "klart"

1026

966 -#: read-cache.c:1260

1027 +#: read-cache.c:1261

1028 #, c-format

1029 msgid ""

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

@@ -972,7 +1033,7 @@ msgstr ""

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

1034 "Använder version %i"

1035

975 -#: read-cache.c:1270

1036 +#: read-cache.c:1271

1037 #, c-format

1038 msgid ""

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

@@ -981,51 +1042,51 @@ msgstr ""

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

1043 "Använder version %i"

1044

984 -#: remote.c:753

1045 +#: remote.c:782

1046 #, c-format

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

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

1049

989 -#: remote.c:757

1050 +#: remote.c:786

1051 #, c-format

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

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

1054

994 -#: remote.c:761

1055 +#: remote.c:790

1056 #, c-format

1057 msgid "%s tracks both %s and %s"

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

1059

999 -#: remote.c:769

1060 +#: remote.c:798

1061 msgid "Internal error"

1062 msgstr "Internt fel"

1063

1003 -#: remote.c:1943

1064 +#: remote.c:1968

1065 #, c-format

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

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

1068

1008 -#: remote.c:1947

1069 +#: remote.c:1972

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

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

1072

1012 -#: remote.c:1950

1073 +#: remote.c:1975

1074 #, c-format

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

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

1077

1017 -#: remote.c:1954

1078 +#: remote.c:1979

1079 #, c-format

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

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

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

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

1084

1024 -#: remote.c:1960

1085 +#: remote.c:1985

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

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

1088

1028 -#: remote.c:1963

1089 +#: remote.c:1988

1090 #, c-format

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

1092 msgid_plural ""

@@ -1035,11 +1096,11 @@ msgstr[0] ""

1096 msgstr[1] ""

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

1098

1038 -#: remote.c:1971

1099 +#: remote.c:1996

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

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

1102

1042 -#: remote.c:1974

1103 +#: remote.c:1999

1104 #, c-format

1105 msgid ""

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

@@ -1054,32 +1115,40 @@ msgstr[1] ""

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

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

1117

1057 -#: remote.c:1984

1118 +#: remote.c:2009

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

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

1121

1061 -#: run-command.c:80

1122 +#: run-command.c:87

1123 msgid "open /dev/null failed"

1124 msgstr "misslyckades öppna /dev/null"

1125

1065 -#: run-command.c:82

1126 +#: run-command.c:89

1127 #, c-format

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

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

1130

1070 -#: sequencer.c:171 builtin/merge.c:782 builtin/merge.c:893

1071 -#: builtin/merge.c:1003 builtin/merge.c:1013

1131 +#: send-pack.c:265

1132 +msgid "failed to sign the push certificate"

1133 +msgstr "misslyckades underteckna push-certifikatet"

1134 +

1135 +#: send-pack.c:322

1136 +msgid "the receiving end does not support --signed push"

1137 +msgstr "mottagarsidan stöder inte push med --signed"

1138 +

1139 +#: sequencer.c:172 builtin/merge.c:781 builtin/merge.c:892

1140 +#: builtin/merge.c:1002 builtin/merge.c:1012

1141 #, c-format

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

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

1144

1076 -#: sequencer.c:173 builtin/merge.c:343 builtin/merge.c:785

1077 -#: builtin/merge.c:1005 builtin/merge.c:1018

1145 +#: sequencer.c:174 builtin/merge.c:343 builtin/merge.c:784

1146 +#: builtin/merge.c:1004 builtin/merge.c:1017

1147 #, c-format

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

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

1150

1082 -#: sequencer.c:194

1151 +#: sequencer.c:195

1152 msgid ""

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

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

@@ -1087,7 +1156,7 @@ msgstr ""

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

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

1158

1090 -#: sequencer.c:197

1159 +#: sequencer.c:198

1160 msgid ""

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

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

@@ -1097,228 +1166,224 @@ msgstr ""

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

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

1168

1100 -#: sequencer.c:210 sequencer.c:841 sequencer.c:924

1169 +#: sequencer.c:211 sequencer.c:852 sequencer.c:935

1170 #, c-format

1171 msgid "Could not write to %s"

1172 msgstr "Kunde inte skriva till %s"

1173

1105 -#: sequencer.c:213

1174 +#: sequencer.c:214

1175 #, c-format

1176 msgid "Error wrapping up %s"

1177 msgstr "Fel vid ombrytning av %s"

1178

1110 -#: sequencer.c:228

1179 +#: sequencer.c:229

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

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

1182

1114 -#: sequencer.c:230

1183 +#: sequencer.c:231

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

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

1186

1118 -#: sequencer.c:233

1187 +#: sequencer.c:234

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

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

1190

1122 -#: sequencer.c:250

1123 -msgid "Failed to lock HEAD during fast_forward_to"

1124 -msgstr "Misslyckades låsa HEAD under \"fast_forward_to\""

1125 -

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

1127 -#: sequencer.c:293

1192 +#: sequencer.c:304

1193 #, c-format

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

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

1196

1132 -#: sequencer.c:324

1197 +#: sequencer.c:335

1198 msgid "Could not resolve HEAD commit\n"

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

1200

1136 -#: sequencer.c:344

1201 +#: sequencer.c:355

1202 msgid "Unable to update cache tree\n"

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

1204

1140 -#: sequencer.c:391

1205 +#: sequencer.c:402

1206 #, c-format

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

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

1209

1145 -#: sequencer.c:396

1210 +#: sequencer.c:407

1211 #, c-format

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

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

1214

1150 -#: sequencer.c:462

1215 +#: sequencer.c:473

1216 msgid "Your index file is unmerged."

1217 msgstr "Din indexfil har inte slagits ihop."

1218

1154 -#: sequencer.c:481

1219 +#: sequencer.c:492

1220 #, c-format

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

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

1223

1159 -#: sequencer.c:489

1224 +#: sequencer.c:500

1225 #, c-format

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

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

1228

1164 -#: sequencer.c:493

1229 +#: sequencer.c:504

1230 #, c-format

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

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

1233

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

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

1171 -#: sequencer.c:506

1236 +#: sequencer.c:517

1237 #, c-format

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

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

1240

1176 -#: sequencer.c:510

1241 +#: sequencer.c:521

1242 #, c-format

1243 msgid "Cannot get commit message for %s"

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

1245

1181 -#: sequencer.c:596

1246 +#: sequencer.c:607

1247 #, c-format

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

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

1250

1186 -#: sequencer.c:597

1251 +#: sequencer.c:608

1252 #, c-format

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

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

1255

1191 -#: sequencer.c:633

1256 +#: sequencer.c:644

1257 msgid "empty commit set passed"

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

1259

1195 -#: sequencer.c:641

1260 +#: sequencer.c:652

1261 #, c-format

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

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

1264

1200 -#: sequencer.c:645

1265 +#: sequencer.c:656

1266 #, c-format

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

1268 msgstr "git %s: misslyckades uppdatera indexet"

1269

1205 -#: sequencer.c:705

1270 +#: sequencer.c:716

1271 #, c-format

1272 msgid "Cannot %s during a %s"

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

1274

1210 -#: sequencer.c:727

1275 +#: sequencer.c:738

1276 #, c-format

1277 msgid "Could not parse line %d."

1278 msgstr "Kan inte tolka rad %d."

1279

1215 -#: sequencer.c:732

1280 +#: sequencer.c:743

1281 msgid "No commits parsed."

1282 msgstr "Inga incheckningar lästes."

1283

1219 -#: sequencer.c:745

1284 +#: sequencer.c:756

1285 #, c-format

1286 msgid "Could not open %s"

1287 msgstr "Kunde inte öppna %s"

1288

1224 -#: sequencer.c:749

1289 +#: sequencer.c:760

1290 #, c-format

1291 msgid "Could not read %s."

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

1293

1229 -#: sequencer.c:756

1294 +#: sequencer.c:767

1295 #, c-format

1296 msgid "Unusable instruction sheet: %s"

1297 msgstr "Oanvändbart manus: %s"

1298

1234 -#: sequencer.c:786

1299 +#: sequencer.c:797

1300 #, c-format

1301 msgid "Invalid key: %s"

1302 msgstr "Felaktig nyckel: %s"

1303

1239 -#: sequencer.c:789

1304 +#: sequencer.c:800

1305 #, c-format

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

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

1308

1244 -#: sequencer.c:801

1309 +#: sequencer.c:812

1310 #, c-format

1311 msgid "Malformed options sheet: %s"

1312 msgstr "Trasigt manus: %s"

1313

1249 -#: sequencer.c:822

1314 +#: sequencer.c:833

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

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

1317

1253 -#: sequencer.c:823

1318 +#: sequencer.c:834

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

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

1321

1257 -#: sequencer.c:827

1322 +#: sequencer.c:838

1323 #, c-format

1324 msgid "Could not create sequencer directory %s"

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

1326

1262 -#: sequencer.c:843 sequencer.c:928

1327 +#: sequencer.c:854 sequencer.c:939

1328 #, c-format

1329 msgid "Error wrapping up %s."

1330 msgstr "Fel vid ombrytning av %s."

1331

1267 -#: sequencer.c:862 sequencer.c:998

1332 +#: sequencer.c:873 sequencer.c:1009

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

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

1335

1271 -#: sequencer.c:864

1336 +#: sequencer.c:875

1337 msgid "cannot resolve HEAD"

1338 msgstr "kan inte bestämma HEAD"

1339

1275 -#: sequencer.c:866

1340 +#: sequencer.c:877

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

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

1343

1279 -#: sequencer.c:888 builtin/apply.c:4062

1344 +#: sequencer.c:899 builtin/apply.c:4128

1345 #, c-format

1346 msgid "cannot open %s: %s"

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

1348

1284 -#: sequencer.c:891

1349 +#: sequencer.c:902

1350 #, c-format

1351 msgid "cannot read %s: %s"

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

1353

1289 -#: sequencer.c:892

1354 +#: sequencer.c:903

1355 msgid "unexpected end of file"

1356 msgstr "oväntat filslut"

1357

1293 -#: sequencer.c:898

1358 +#: sequencer.c:909

1359 #, c-format

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

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

1362

1298 -#: sequencer.c:921

1363 +#: sequencer.c:932

1364 #, c-format

1365 msgid "Could not format %s."

1366 msgstr "Kunde inte formatera %s."

1367

1303 -#: sequencer.c:1066

1368 +#: sequencer.c:1077

1369 #, c-format

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

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

1372

1308 -#: sequencer.c:1069

1373 +#: sequencer.c:1080

1374 #, c-format

1375 msgid "%s: bad revision"

1376 msgstr "%s: felaktig revision"

1377

1313 -#: sequencer.c:1103

1378 +#: sequencer.c:1114

1379 msgid "Can't revert as initial commit"

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

1381

1317 -#: sequencer.c:1104

1382 +#: sequencer.c:1115

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

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

1385

1321 -#: sha1_name.c:439

1386 +#: sha1_name.c:440

1387 msgid ""

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

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

@@ -1340,21 +1405,21 @@ msgstr ""

1405 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1406 "genom att köra \"git config advice.objectNameWarning false\""

1407

1343 -#: sha1_name.c:1060

1408 +#: sha1_name.c:1068

1409 msgid "HEAD does not point to a branch"

1410 msgstr "HEAD pekar inte på en gren"

1411

1347 -#: sha1_name.c:1063

1412 +#: sha1_name.c:1071

1413 #, c-format

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

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

1416

1352 -#: sha1_name.c:1065

1417 +#: sha1_name.c:1073

1418 #, c-format

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

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

1421

1357 -#: sha1_name.c:1069

1422 +#: sha1_name.c:1077

1423 #, c-format

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

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

@@ -1384,16 +1449,41 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1449 msgid "staging updated .gitmodules failed"

1450 msgstr "misslyckades köa uppdaterad .gitmodules"

1451

1387 -#: submodule.c:1118 builtin/init-db.c:363

1452 +#: submodule.c:1111 builtin/init-db.c:363

1453 #, c-format

1454 msgid "Could not create git link %s"

1455 msgstr "Kunde inte skapa gitlänk %s"

1456

1392 -#: submodule.c:1129

1457 +#: submodule.c:1122

1458 #, c-format

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

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

1461

1462 +#: trailer.c:500 trailer.c:504 trailer.c:508 trailer.c:562 trailer.c:566

1463 +#: trailer.c:570

1464 +#, c-format

1465 +msgid "unknown value '%s' for key '%s'"

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

1467 +

1468 +#: trailer.c:552 trailer.c:557 builtin/remote.c:288

1469 +#, c-format

1470 +msgid "more than one %s"

1471 +msgstr "mer än en %s"

1472 +

1473 +#: trailer.c:587

1474 +#, c-format

1475 +msgid "empty trailer token in trailer '%s'"

1476 +msgstr "tom släpradssymbol i släpraden \"%s\""

1477 +

1478 +#: trailer.c:706

1479 +#, c-format

1480 +msgid "could not read input file '%s'"

1481 +msgstr "kunde inte läsa indatafilen \"%s\""

1482 +

1483 +#: trailer.c:709

1484 +msgid "could not read from stdin"

1485 +msgstr "Kunde inte läsa från standard in"

1486 +

1487 #: unpack-trees.c:202

1488 msgid "Checking out files"

1489 msgstr "Checkar ut filer"

@@ -1427,25 +1517,29 @@ msgstr "felaktigt portnummer"

1517 msgid "invalid '..' path segment"

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

1519

1430 -#: wrapper.c:460

1520 +#: wrapper.c:509

1521 #, c-format

1522 msgid "unable to access '%s': %s"

1523 msgstr "kan inte komma åt \"%s\": %s"

1524

1435 -#: wrapper.c:481

1525 +#: wrapper.c:530

1526 #, c-format

1527 msgid "unable to access '%s'"

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

1529

1440 -#: wrapper.c:492

1530 +#: wrapper.c:541

1531 #, c-format

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

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

1534

1445 -#: wrapper.c:493

1535 +#: wrapper.c:542

1536 msgid "no such user"

1537 msgstr "okänd användare"

1538

1539 +#: wrapper.c:550

1540 +msgid "unable to get current working directory"

1541 +msgstr "kan inte hämta aktuell arbetskatalog"

1542 +

1543 #: wt-status.c:150

1544 msgid "Unmerged paths:"

1545 msgstr "Ej sammanslagna sökvägar:"

@@ -1589,15 +1683,15 @@ msgstr "ospårat innehåll, "

1683 msgid "bug: unhandled diff status %c"

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

1685

1592 -#: wt-status.c:764

1686 +#: wt-status.c:761

1687 msgid "Submodules changed but not updated:"

1688 msgstr "Undermoduler ändrade men inte uppdaterade:"

1689

1596 -#: wt-status.c:766

1690 +#: wt-status.c:763

1691 msgid "Submodule changes to be committed:"

1692 msgstr "Undermodulers ändringar att checka in:"

1693

1600 -#: wt-status.c:845

1694 +#: wt-status.c:842

1695 msgid ""

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

1697 "Everything below will be removed."

@@ -1605,68 +1699,68 @@ msgstr ""

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

1700 "Allt nedan kommer tas bort."

1701

1608 -#: wt-status.c:936

1702 +#: wt-status.c:933

1703 msgid "You have unmerged paths."

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

1705

1612 -#: wt-status.c:939

1706 +#: wt-status.c:936

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

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

1709

1616 -#: wt-status.c:942

1710 +#: wt-status.c:939

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

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

1713

1620 -#: wt-status.c:945

1714 +#: wt-status.c:942

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

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

1717

1624 -#: wt-status.c:955

1718 +#: wt-status.c:952

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

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

1721

1628 -#: wt-status.c:958

1722 +#: wt-status.c:955

1723 msgid "The current patch is empty."

1724 msgstr "Aktuell patch är tom."

1725

1632 -#: wt-status.c:962

1726 +#: wt-status.c:959

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

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

1729

1636 -#: wt-status.c:964

1730 +#: wt-status.c:961

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

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

1733

1640 -#: wt-status.c:966

1734 +#: wt-status.c:963

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

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

1737

1644 -#: wt-status.c:1026 wt-status.c:1043

1738 +#: wt-status.c:1023 wt-status.c:1040

1739 #, c-format

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

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

1742

1649 -#: wt-status.c:1031 wt-status.c:1048

1743 +#: wt-status.c:1028 wt-status.c:1045

1744 msgid "You are currently rebasing."

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

1746

1653 -#: wt-status.c:1034

1747 +#: wt-status.c:1031

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

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

1750

1657 -#: wt-status.c:1036

1751 +#: wt-status.c:1033

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

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

1754

1661 -#: wt-status.c:1038

1755 +#: wt-status.c:1035

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

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

1758

1665 -#: wt-status.c:1051

1759 +#: wt-status.c:1048

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

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

1762

1669 -#: wt-status.c:1055

1763 +#: wt-status.c:1052

1764 #, c-format

1765 msgid ""

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

@@ -1674,118 +1768,118 @@ msgstr ""

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

1769 "ovanpå \"%s\"."

1770

1677 -#: wt-status.c:1060

1771 +#: wt-status.c:1057

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

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

1774

1681 -#: wt-status.c:1063

1775 +#: wt-status.c:1060

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

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

1778

1685 -#: wt-status.c:1067

1779 +#: wt-status.c:1064

1780 #, c-format

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

1782 msgstr ""

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

1784 "ovanpå \"%s\"."

1785

1692 -#: wt-status.c:1072

1786 +#: wt-status.c:1069

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

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

1789

1696 -#: wt-status.c:1075

1790 +#: wt-status.c:1072

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

1792 msgstr ""

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

1794

1701 -#: wt-status.c:1077

1795 +#: wt-status.c:1074

1796 msgid ""

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

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

1799

1706 -#: wt-status.c:1087

1800 +#: wt-status.c:1084

1801 #, c-format

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

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

1804

1711 -#: wt-status.c:1092

1805 +#: wt-status.c:1089

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

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

1808

1715 -#: wt-status.c:1095

1809 +#: wt-status.c:1092

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

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

1812

1719 -#: wt-status.c:1097

1813 +#: wt-status.c:1094

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

1815 msgstr ""

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

1817 "operationen)"

1818

1725 -#: wt-status.c:1106

1819 +#: wt-status.c:1103

1820 #, c-format

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

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

1823

1730 -#: wt-status.c:1111

1824 +#: wt-status.c:1108

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

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

1827

1734 -#: wt-status.c:1114

1828 +#: wt-status.c:1111

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

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

1831

1738 -#: wt-status.c:1116

1832 +#: wt-status.c:1113

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

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

1835

1742 -#: wt-status.c:1127

1836 +#: wt-status.c:1124

1837 #, c-format

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

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

1840

1747 -#: wt-status.c:1131

1841 +#: wt-status.c:1128

1842 msgid "You are currently bisecting."

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

1844

1751 -#: wt-status.c:1134

1845 +#: wt-status.c:1131

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

1847 msgstr ""

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

1849

1756 -#: wt-status.c:1309

1850 +#: wt-status.c:1306

1851 msgid "On branch "

1852 msgstr "På grenen "

1853

1760 -#: wt-status.c:1316

1854 +#: wt-status.c:1313

1855 msgid "rebase in progress; onto "

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

1857

1764 -#: wt-status.c:1323

1858 +#: wt-status.c:1320

1859 msgid "HEAD detached at "

1860 msgstr "HEAD frånkopplad vid "

1861

1768 -#: wt-status.c:1325

1862 +#: wt-status.c:1322

1863 msgid "HEAD detached from "

1864 msgstr "HEAD frånkopplad från "

1865

1772 -#: wt-status.c:1328

1866 +#: wt-status.c:1325

1867 msgid "Not currently on any branch."

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

1869

1776 -#: wt-status.c:1345

1870 +#: wt-status.c:1342

1871 msgid "Initial commit"

1872 msgstr "Första incheckning"

1873

1780 -#: wt-status.c:1359

1874 +#: wt-status.c:1356

1875 msgid "Untracked files"

1876 msgstr "Ospårade filer"

1877

1784 -#: wt-status.c:1361

1878 +#: wt-status.c:1358

1879 msgid "Ignored files"

1880 msgstr "Ignorerade filer"

1881

1788 -#: wt-status.c:1365

1882 +#: wt-status.c:1362

1883 #, c-format

1884 msgid ""

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

@@ -1797,32 +1891,32 @@ msgstr ""

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

1892

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

1800 -#: wt-status.c:1371

1894 +#: wt-status.c:1368

1895 #, c-format

1896 msgid "Untracked files not listed%s"

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

1898

1805 -#: wt-status.c:1373

1899 +#: wt-status.c:1370

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

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

1902

1809 -#: wt-status.c:1379

1903 +#: wt-status.c:1376

1904 msgid "No changes"

1905 msgstr "Inga ändringar"

1906

1813 -#: wt-status.c:1384

1907 +#: wt-status.c:1381

1908 #, c-format

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

1910 msgstr ""

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

1912 "\")\n"

1913

1820 -#: wt-status.c:1387

1914 +#: wt-status.c:1384

1915 #, c-format

1916 msgid "no changes added to commit\n"

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

1918

1825 -#: wt-status.c:1390

1919 +#: wt-status.c:1387

1920 #, c-format

1921 msgid ""

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

@@ -1831,93 +1925,93 @@ msgstr ""

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

1926 "\")\n"

1927

1834 -#: wt-status.c:1393

1928 +#: wt-status.c:1390

1929 #, c-format

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

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

1932

1839 -#: wt-status.c:1396

1933 +#: wt-status.c:1393

1934 #, c-format

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

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

1937

1844 -#: wt-status.c:1399 wt-status.c:1404

1938 +#: wt-status.c:1396 wt-status.c:1401

1939 #, c-format

1940 msgid "nothing to commit\n"

1941 msgstr "inget att checka in\n"

1942

1849 -#: wt-status.c:1402

1943 +#: wt-status.c:1399

1944 #, c-format

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

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

1947

1854 -#: wt-status.c:1406

1948 +#: wt-status.c:1403

1949 #, c-format

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

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

1952

1859 -#: wt-status.c:1515

1953 +#: wt-status.c:1512

1954 msgid "HEAD (no branch)"

1955 msgstr "HEAD (ingen gren)"

1956

1863 -#: wt-status.c:1521

1957 +#: wt-status.c:1518

1958 msgid "Initial commit on "

1959 msgstr "Första incheckning på "

1960

1867 -#: wt-status.c:1553

1961 +#: wt-status.c:1550

1962 msgid "gone"

1963 msgstr "försvunnen"

1964

1871 -#: wt-status.c:1555 wt-status.c:1563

1965 +#: wt-status.c:1552 wt-status.c:1560

1966 msgid "behind "

1967 msgstr "efter "

1968

1875 -#: compat/precompose_utf8.c:55 builtin/clone.c:356

1969 +#: compat/precompose_utf8.c:55 builtin/clone.c:357

1970 #, c-format

1971 msgid "failed to unlink '%s'"

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

1973

1880 -#: builtin/add.c:21

1974 +#: builtin/add.c:22

1975 msgid "git add [options] [--] <pathspec>..."

1976 msgstr "git add [flaggor] [--] <sökväg>..."

1977

1884 -#: builtin/add.c:64

1978 +#: builtin/add.c:65

1979 #, c-format

1980 msgid "unexpected diff status %c"

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

1982

1889 -#: builtin/add.c:69 builtin/commit.c:261

1983 +#: builtin/add.c:70 builtin/commit.c:275

1984 msgid "updating files failed"

1985 msgstr "misslyckades uppdatera filer"

1986

1893 -#: builtin/add.c:79

1987 +#: builtin/add.c:80

1988 #, c-format

1989 msgid "remove '%s'\n"

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

1991

1898 -#: builtin/add.c:133

1992 +#: builtin/add.c:134

1993 msgid "Unstaged changes after refreshing the index:"

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

1995

1902 -#: builtin/add.c:193 builtin/rev-parse.c:781

1996 +#: builtin/add.c:194 builtin/rev-parse.c:785

1997 msgid "Could not read the index"

1998 msgstr "Kunde inte läsa indexet"

1999

1906 -#: builtin/add.c:204

2000 +#: builtin/add.c:205

2001 #, c-format

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

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

2004

1911 -#: builtin/add.c:208

2005 +#: builtin/add.c:209

2006 msgid "Could not write patch"

2007 msgstr "Kunde inte skriva patch"

2008

1915 -#: builtin/add.c:213

2009 +#: builtin/add.c:214

2010 #, c-format

2011 msgid "Could not stat '%s'"

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

2013

1920 -#: builtin/add.c:215

2014 +#: builtin/add.c:216

2015 msgid "Empty patch. Aborted."

2016 msgstr "Tom patch. Avbryter."

2017

@@ -1930,15 +2024,15 @@ msgstr "Kunde inte tillämpa \"%s\""

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

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

2026

1933 -#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:70

1934 -#: builtin/prune-packed.c:77 builtin/push.c:488 builtin/remote.c:1367

2027 +#: builtin/add.c:248 builtin/clean.c:875 builtin/fetch.c:108 builtin/mv.c:110

2028 +#: builtin/prune-packed.c:55 builtin/push.c:499 builtin/remote.c:1375

2029 #: builtin/rm.c:269

2030 msgid "dry run"

2031 msgstr "testkörning"

2032

1939 -#: builtin/add.c:249 builtin/apply.c:4411 builtin/check-ignore.c:19

1940 -#: builtin/commit.c:1328 builtin/count-objects.c:95 builtin/fsck.c:606

1941 -#: builtin/log.c:1613 builtin/mv.c:69 builtin/read-tree.c:113

2033 +#: builtin/add.c:249 builtin/apply.c:4415 builtin/check-ignore.c:19

2034 +#: builtin/commit.c:1362 builtin/count-objects.c:63 builtin/fsck.c:608

2035 +#: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114

2036 msgid "be verbose"

2037 msgstr "var pratsam"

2038

@@ -1946,7 +2040,7 @@ msgstr "var pratsam"

2040 msgid "interactive picking"

2041 msgstr "plocka interaktivt"

2042

1949 -#: builtin/add.c:252 builtin/checkout.c:1102 builtin/reset.c:285

2043 +#: builtin/add.c:252 builtin/checkout.c:1108 builtin/reset.c:286

2044 msgid "select hunks interactively"

2045 msgstr "välj stycken interaktivt"

2046

@@ -2018,74 +2112,74 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2113

2114 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:919

2021 -#: builtin/commit.c:319 builtin/mv.c:90 builtin/reset.c:234 builtin/rm.c:299

2115 +#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299

2116 msgid "index file corrupt"

2117 msgstr "indexfilen trasig"

2118

2025 -#: builtin/add.c:446 builtin/apply.c:4506 builtin/mv.c:280 builtin/rm.c:431

2119 +#: builtin/add.c:446 builtin/apply.c:4510 builtin/mv.c:279 builtin/rm.c:431

2120 msgid "Unable to write new index file"

2121 msgstr "Kunde inte skriva ny indexfil"

2122

2029 -#: builtin/apply.c:57

2123 +#: builtin/apply.c:58

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

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

2126

2033 -#: builtin/apply.c:110

2127 +#: builtin/apply.c:111

2128 #, c-format

2129 msgid "unrecognized whitespace option '%s'"

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

2131

2038 -#: builtin/apply.c:125

2132 +#: builtin/apply.c:126

2133 #, c-format

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

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

2136

2043 -#: builtin/apply.c:825

2137 +#: builtin/apply.c:826

2138 #, c-format

2139 msgid "Cannot prepare timestamp regexp %s"

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

2141

2048 -#: builtin/apply.c:834

2142 +#: builtin/apply.c:835

2143 #, c-format

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

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

2146

2053 -#: builtin/apply.c:915

2147 +#: builtin/apply.c:916

2148 #, c-format

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

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

2151

2058 -#: builtin/apply.c:947

2152 +#: builtin/apply.c:948

2153 #, c-format

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

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

2156

2063 -#: builtin/apply.c:951

2157 +#: builtin/apply.c:952

2158 #, c-format

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

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

2161

2068 -#: builtin/apply.c:952

2162 +#: builtin/apply.c:953

2163 #, c-format

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

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

2166

2073 -#: builtin/apply.c:959

2167 +#: builtin/apply.c:960

2168 #, c-format

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

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

2171

2078 -#: builtin/apply.c:1422

2172 +#: builtin/apply.c:1423

2173 #, c-format

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

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

2176

2083 -#: builtin/apply.c:1479

2177 +#: builtin/apply.c:1480

2178 #, c-format

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

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

2181

2088 -#: builtin/apply.c:1496

2182 +#: builtin/apply.c:1497

2183 #, c-format

2184 msgid ""

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

@@ -2101,77 +2195,77 @@ msgstr[1] ""

2195 "sökvägskomponenter\n"

2196 "tas bort (rad %d)"

2197

2104 -#: builtin/apply.c:1656

2198 +#: builtin/apply.c:1657

2199 msgid "new file depends on old contents"

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

2201

2108 -#: builtin/apply.c:1658

2202 +#: builtin/apply.c:1659

2203 msgid "deleted file still has contents"

2204 msgstr "borttagen fil har fortfarande innehåll"

2205

2112 -#: builtin/apply.c:1684

2206 +#: builtin/apply.c:1685

2207 #, c-format

2208 msgid "corrupt patch at line %d"

2209 msgstr "trasig patch på rad %d"

2210

2117 -#: builtin/apply.c:1720

2211 +#: builtin/apply.c:1721

2212 #, c-format

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

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

2215

2122 -#: builtin/apply.c:1722

2216 +#: builtin/apply.c:1723

2217 #, c-format

2218 msgid "deleted file %s still has contents"

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

2220

2127 -#: builtin/apply.c:1725

2221 +#: builtin/apply.c:1726

2222 #, c-format

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

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

2225

2132 -#: builtin/apply.c:1871

2226 +#: builtin/apply.c:1872

2227 #, c-format

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

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

2230

2137 -#: builtin/apply.c:1900

2231 +#: builtin/apply.c:1901

2232 #, c-format

2233 msgid "unrecognized binary patch at line %d"

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

2235

2142 -#: builtin/apply.c:1986

2236 +#: builtin/apply.c:2052

2237 #, c-format

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

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

2240

2147 -#: builtin/apply.c:2076

2241 +#: builtin/apply.c:2142

2242 #, c-format

2243 msgid "unable to read symlink %s"

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

2245

2152 -#: builtin/apply.c:2080

2246 +#: builtin/apply.c:2146

2247 #, c-format

2248 msgid "unable to open or read %s"

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

2250

2157 -#: builtin/apply.c:2688

2251 +#: builtin/apply.c:2754

2252 #, c-format

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

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

2255

2162 -#: builtin/apply.c:2806

2256 +#: builtin/apply.c:2872

2257 #, c-format

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

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

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

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

2262

2169 -#: builtin/apply.c:2818

2263 +#: builtin/apply.c:2884

2264 #, c-format

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

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

2267

2174 -#: builtin/apply.c:2824

2268 +#: builtin/apply.c:2890

2269 #, c-format

2270 msgid ""

2271 "while searching for:\n"

@@ -2180,317 +2274,317 @@ msgstr ""

2274 "vid sökning efter:\n"

2275 "%.*s"

2276

2183 -#: builtin/apply.c:2843

2277 +#: builtin/apply.c:2909

2278 #, c-format

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

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

2281

2188 -#: builtin/apply.c:2944

2282 +#: builtin/apply.c:3010

2283 #, c-format

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

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

2286

2193 -#: builtin/apply.c:2950

2287 +#: builtin/apply.c:3016

2288 #, c-format

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

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

2291

2198 -#: builtin/apply.c:2971

2292 +#: builtin/apply.c:3037

2293 #, c-format

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

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

2296

2203 -#: builtin/apply.c:3095

2297 +#: builtin/apply.c:3161

2298 #, c-format

2299 msgid "cannot checkout %s"

2300 msgstr "kan inte checka ut %s"

2301

2208 -#: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3194

2302 +#: builtin/apply.c:3206 builtin/apply.c:3215 builtin/apply.c:3260

2303 #, c-format

2304 msgid "read of %s failed"

2305 msgstr "misslyckades läsa %s"

2306

2213 -#: builtin/apply.c:3174 builtin/apply.c:3396

2307 +#: builtin/apply.c:3240 builtin/apply.c:3462

2308 #, c-format

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

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

2311

2218 -#: builtin/apply.c:3255 builtin/apply.c:3410

2312 +#: builtin/apply.c:3321 builtin/apply.c:3476

2313 #, c-format

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

2315 msgstr "%s: finns inte i indexet"

2316

2223 -#: builtin/apply.c:3259 builtin/apply.c:3402 builtin/apply.c:3424

2317 +#: builtin/apply.c:3325 builtin/apply.c:3468 builtin/apply.c:3490

2318 #, c-format

2319 msgid "%s: %s"

2320 msgstr "%s: %s"

2321

2228 -#: builtin/apply.c:3264 builtin/apply.c:3418

2322 +#: builtin/apply.c:3330 builtin/apply.c:3484

2323 #, c-format

2324 msgid "%s: does not match index"

2325 msgstr "%s: motsvarar inte indexet"

2326

2233 -#: builtin/apply.c:3366

2327 +#: builtin/apply.c:3432

2328 msgid "removal patch leaves file contents"

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

2330

2237 -#: builtin/apply.c:3435

2331 +#: builtin/apply.c:3501

2332 #, c-format

2333 msgid "%s: wrong type"

2334 msgstr "%s: fel typ"

2335

2242 -#: builtin/apply.c:3437

2336 +#: builtin/apply.c:3503

2337 #, c-format

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

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

2340

2247 -#: builtin/apply.c:3538

2341 +#: builtin/apply.c:3604

2342 #, c-format

2343 msgid "%s: already exists in index"

2344 msgstr "%s: finns redan i indexet"

2345

2252 -#: builtin/apply.c:3541

2346 +#: builtin/apply.c:3607

2347 #, c-format

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

2349 msgstr "%s: finns redan i arbetskatalogen"

2350

2257 -#: builtin/apply.c:3561

2351 +#: builtin/apply.c:3627

2352 #, c-format

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

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

2355

2262 -#: builtin/apply.c:3566

2356 +#: builtin/apply.c:3632

2357 #, c-format

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

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

2360

2267 -#: builtin/apply.c:3574

2361 +#: builtin/apply.c:3640

2362 #, c-format

2363 msgid "%s: patch does not apply"

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

2365

2272 -#: builtin/apply.c:3587

2366 +#: builtin/apply.c:3653

2367 #, c-format

2368 msgid "Checking patch %s..."

2369 msgstr "Kontrollerar patchen %s..."

2370

2277 -#: builtin/apply.c:3680 builtin/checkout.c:213 builtin/reset.c:134

2371 +#: builtin/apply.c:3746 builtin/checkout.c:213 builtin/reset.c:135

2372 #, c-format

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

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

2375

2282 -#: builtin/apply.c:3823

2376 +#: builtin/apply.c:3889

2377 #, c-format

2378 msgid "unable to remove %s from index"

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

2380

2287 -#: builtin/apply.c:3852

2381 +#: builtin/apply.c:3918

2382 #, c-format

2383 msgid "corrupt patch for submodule %s"

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

2385

2292 -#: builtin/apply.c:3856

2386 +#: builtin/apply.c:3922

2387 #, c-format

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

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

2390

2297 -#: builtin/apply.c:3861

2391 +#: builtin/apply.c:3927

2392 #, c-format

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

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

2395

2302 -#: builtin/apply.c:3864 builtin/apply.c:3972

2396 +#: builtin/apply.c:3930 builtin/apply.c:4038

2397 #, c-format

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

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

2400

2307 -#: builtin/apply.c:3897

2401 +#: builtin/apply.c:3963

2402 #, c-format

2403 msgid "closing file '%s'"

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

2405

2312 -#: builtin/apply.c:3946

2406 +#: builtin/apply.c:4012

2407 #, c-format

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

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

2410

2317 -#: builtin/apply.c:4033

2411 +#: builtin/apply.c:4099

2412 #, c-format

2413 msgid "Applied patch %s cleanly."

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

2415

2322 -#: builtin/apply.c:4041

2416 +#: builtin/apply.c:4107

2417 msgid "internal error"

2418 msgstr "internt fel"

2419

2326 -#: builtin/apply.c:4044

2420 +#: builtin/apply.c:4110

2421 #, c-format

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

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

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

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

2426

2333 -#: builtin/apply.c:4054

2427 +#: builtin/apply.c:4120

2428 #, c-format

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

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

2431

2338 -#: builtin/apply.c:4075

2432 +#: builtin/apply.c:4141

2433 #, c-format

2434 msgid "Hunk #%d applied cleanly."

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

2436

2343 -#: builtin/apply.c:4078

2437 +#: builtin/apply.c:4144

2438 #, c-format

2439 msgid "Rejected hunk #%d."

2440 msgstr "Refuserar stycke %d."

2441

2348 -#: builtin/apply.c:4228

2442 +#: builtin/apply.c:4234

2443 msgid "unrecognized input"

2444 msgstr "indata känns inte igen"

2445

2352 -#: builtin/apply.c:4239

2446 +#: builtin/apply.c:4245

2447 msgid "unable to read index file"

2448 msgstr "kan inte läsa indexfilen"

2449

2356 -#: builtin/apply.c:4358 builtin/apply.c:4361 builtin/clone.c:90

2450 +#: builtin/apply.c:4362 builtin/apply.c:4365 builtin/clone.c:91

2451 #: builtin/fetch.c:93

2452 msgid "path"

2453 msgstr "sökväg"

2454

2361 -#: builtin/apply.c:4359

2455 +#: builtin/apply.c:4363

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

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

2458

2365 -#: builtin/apply.c:4362

2459 +#: builtin/apply.c:4366

2460 msgid "apply changes matching the given path"

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

2462

2369 -#: builtin/apply.c:4364

2463 +#: builtin/apply.c:4368

2464 msgid "num"

2465 msgstr "antal"

2466

2373 -#: builtin/apply.c:4365

2467 +#: builtin/apply.c:4369

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

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

2470

2377 -#: builtin/apply.c:4368

2471 +#: builtin/apply.c:4372

2472 msgid "ignore additions made by the patch"

2473 msgstr "ignorera tillägg gjorda av patchen"

2474

2381 -#: builtin/apply.c:4370

2475 +#: builtin/apply.c:4374

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

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

2478

2385 -#: builtin/apply.c:4374

2479 +#: builtin/apply.c:4378

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

2481 msgstr "visa antal tillagda och borttagna rader decimalt"

2482

2389 -#: builtin/apply.c:4376

2483 +#: builtin/apply.c:4380

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

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

2486

2393 -#: builtin/apply.c:4378

2487 +#: builtin/apply.c:4382

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

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

2490

2397 -#: builtin/apply.c:4380

2491 +#: builtin/apply.c:4384

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

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

2494

2401 -#: builtin/apply.c:4382

2495 +#: builtin/apply.c:4386

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

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

2498

2405 -#: builtin/apply.c:4384

2499 +#: builtin/apply.c:4388

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

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

2502

2409 -#: builtin/apply.c:4386

2503 +#: builtin/apply.c:4390

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

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

2506

2413 -#: builtin/apply.c:4388

2507 +#: builtin/apply.c:4392

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

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

2510

2417 -#: builtin/apply.c:4390 builtin/checkout-index.c:198 builtin/ls-files.c:455

2511 +#: builtin/apply.c:4394 builtin/checkout-index.c:198 builtin/ls-files.c:455

2512 msgid "paths are separated with NUL character"

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

2514

2421 -#: builtin/apply.c:4393

2515 +#: builtin/apply.c:4397

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

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

2518

2425 -#: builtin/apply.c:4394

2519 +#: builtin/apply.c:4398

2520 msgid "action"

2521 msgstr "åtgärd"

2522

2429 -#: builtin/apply.c:4395

2523 +#: builtin/apply.c:4399

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

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

2526

2433 -#: builtin/apply.c:4398 builtin/apply.c:4401

2527 +#: builtin/apply.c:4402 builtin/apply.c:4405

2528 msgid "ignore changes in whitespace when finding context"

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

2530

2437 -#: builtin/apply.c:4404

2531 +#: builtin/apply.c:4408

2532 msgid "apply the patch in reverse"

2533 msgstr "tillämpa patchen baklänges"

2534

2441 -#: builtin/apply.c:4406

2535 +#: builtin/apply.c:4410

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

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

2538

2445 -#: builtin/apply.c:4408

2539 +#: builtin/apply.c:4412

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

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

2542

2449 -#: builtin/apply.c:4410

2543 +#: builtin/apply.c:4414

2544 msgid "allow overlapping hunks"

2545 msgstr "tillåt överlappande stycken"

2546

2453 -#: builtin/apply.c:4413

2547 +#: builtin/apply.c:4417

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

2549 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

2550

2457 -#: builtin/apply.c:4416

2551 +#: builtin/apply.c:4420

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

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

2554

2461 -#: builtin/apply.c:4418

2555 +#: builtin/apply.c:4422

2556 msgid "root"

2557 msgstr "rot"

2558

2465 -#: builtin/apply.c:4419

2559 +#: builtin/apply.c:4423

2560 msgid "prepend <root> to all filenames"

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

2562

2469 -#: builtin/apply.c:4441

2563 +#: builtin/apply.c:4445

2564 msgid "--3way outside a repository"

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

2566

2473 -#: builtin/apply.c:4449

2567 +#: builtin/apply.c:4453

2568 msgid "--index outside a repository"

2569 msgstr "--index utanför arkiv"

2570

2477 -#: builtin/apply.c:4452

2571 +#: builtin/apply.c:4456

2572 msgid "--cached outside a repository"

2573 msgstr "--cached utanför arkiv"

2574

2481 -#: builtin/apply.c:4468

2575 +#: builtin/apply.c:4472

2576 #, c-format

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

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

2579

2486 -#: builtin/apply.c:4482

2580 +#: builtin/apply.c:4486

2581 #, c-format

2582 msgid "squelched %d whitespace error"

2583 msgid_plural "squelched %d whitespace errors"

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

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

2586

2493 -#: builtin/apply.c:4488 builtin/apply.c:4498

2587 +#: builtin/apply.c:4492 builtin/apply.c:4502

2588 #, c-format

2589 msgid "%d line adds whitespace errors."

2590 msgid_plural "%d lines add whitespace errors."

@@ -2650,7 +2744,7 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

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

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

2746 #. fewer display columns.

2653 -#: builtin/blame.c:2599

2747 +#: builtin/blame.c:2602

2748 msgid "4 years, 11 months ago"

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

2750

@@ -2670,7 +2764,7 @@ msgstr "git branch [flaggor] [-r] (-d | -D) <grennamn>..."

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

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

2766

2673 -#: builtin/branch.c:150

2767 +#: builtin/branch.c:152

2768 #, c-format

2769 msgid ""

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

@@ -2679,7 +2773,7 @@ msgstr ""

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

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

2775

2682 -#: builtin/branch.c:154

2776 +#: builtin/branch.c:156

2777 #, c-format

2778 msgid ""

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

@@ -2688,12 +2782,12 @@ msgstr ""

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

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

2784

2691 -#: builtin/branch.c:168

2785 +#: builtin/branch.c:170

2786 #, c-format

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

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

2789

2696 -#: builtin/branch.c:172

2790 +#: builtin/branch.c:174

2791 #, c-format

2792 msgid ""

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

@@ -2702,343 +2796,343 @@ msgstr ""

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

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

2798

2705 -#: builtin/branch.c:185

2799 +#: builtin/branch.c:187

2800 msgid "Update of config-file failed"

2801 msgstr "Misslyckades uppdatera konfigurationsfil"

2802

2709 -#: builtin/branch.c:213

2803 +#: builtin/branch.c:215

2804 msgid "cannot use -a with -d"

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

2806

2713 -#: builtin/branch.c:219

2807 +#: builtin/branch.c:221

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

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

2810

2717 -#: builtin/branch.c:227

2811 +#: builtin/branch.c:229

2812 #, c-format

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

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

2815

2722 -#: builtin/branch.c:240

2816 +#: builtin/branch.c:245

2817 #, c-format

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

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

2820

2727 -#: builtin/branch.c:241

2821 +#: builtin/branch.c:246

2822 #, c-format

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

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

2825

2732 -#: builtin/branch.c:255

2826 +#: builtin/branch.c:260

2827 #, c-format

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

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

2830

2737 -#: builtin/branch.c:256

2831 +#: builtin/branch.c:261

2832 #, c-format

2833 msgid "Error deleting branch '%s'"

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

2835

2742 -#: builtin/branch.c:263

2836 +#: builtin/branch.c:268

2837 #, c-format

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

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

2840

2747 -#: builtin/branch.c:264

2841 +#: builtin/branch.c:269

2842 #, c-format

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

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

2845

2752 -#: builtin/branch.c:366

2846 +#: builtin/branch.c:370

2847 #, c-format

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

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

2850

2757 -#: builtin/branch.c:454

2851 +#: builtin/branch.c:459

2852 #, c-format

2853 msgid "[%s: gone]"

2854 msgstr "[%s: försvunnen]"

2855

2762 -#: builtin/branch.c:459

2856 +#: builtin/branch.c:464

2857 #, c-format

2858 msgid "[%s]"

2859 msgstr "[%s]"

2860

2767 -#: builtin/branch.c:464

2861 +#: builtin/branch.c:469

2862 #, c-format

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

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

2865

2772 -#: builtin/branch.c:466

2866 +#: builtin/branch.c:471

2867 #, c-format

2868 msgid "[behind %d]"

2869 msgstr "[bakom %d] "

2870

2777 -#: builtin/branch.c:470

2871 +#: builtin/branch.c:475

2872 #, c-format

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

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

2875

2782 -#: builtin/branch.c:472

2876 +#: builtin/branch.c:477

2877 #, c-format

2878 msgid "[ahead %d]"

2879 msgstr "[före %d] "

2880

2787 -#: builtin/branch.c:475

2881 +#: builtin/branch.c:480

2882 #, c-format

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

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

2885

2792 -#: builtin/branch.c:478

2886 +#: builtin/branch.c:483

2887 #, c-format

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

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

2890

2797 -#: builtin/branch.c:502

2891 +#: builtin/branch.c:496

2892 msgid " **** invalid ref ****"

2893 msgstr " **** ogiltig ref ****"

2894

2801 -#: builtin/branch.c:594

2895 +#: builtin/branch.c:587

2896 #, c-format

2897 msgid "(no branch, rebasing %s)"

2898 msgstr "(ingen gren, ombaserar %s)"

2899

2806 -#: builtin/branch.c:597

2900 +#: builtin/branch.c:590

2901 #, c-format

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

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

2904

2811 -#: builtin/branch.c:600

2905 +#: builtin/branch.c:593

2906 #, c-format

2907 msgid "(detached from %s)"

2908 msgstr "(frånkopplad från %s)"

2909

2816 -#: builtin/branch.c:603

2910 +#: builtin/branch.c:596

2911 msgid "(no branch)"

2912 msgstr "(ingen gren)"

2913

2820 -#: builtin/branch.c:649

2914 +#: builtin/branch.c:643

2915 #, c-format

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

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

2918

2825 -#: builtin/branch.c:681

2919 +#: builtin/branch.c:691

2920 msgid "some refs could not be read"

2921 msgstr "vissa referenser kunde inte läsas"

2922

2829 -#: builtin/branch.c:694

2923 +#: builtin/branch.c:704

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

2925 msgstr ""

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

2927

2834 -#: builtin/branch.c:704

2928 +#: builtin/branch.c:714

2929 #, c-format

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

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

2932

2839 -#: builtin/branch.c:719

2933 +#: builtin/branch.c:729

2934 msgid "Branch rename failed"

2935 msgstr "Misslyckades byta namn på gren"

2936

2843 -#: builtin/branch.c:723

2937 +#: builtin/branch.c:733

2938 #, c-format

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

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

2941

2848 -#: builtin/branch.c:727

2942 +#: builtin/branch.c:737

2943 #, c-format

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

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

2946

2853 -#: builtin/branch.c:734

2947 +#: builtin/branch.c:744

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

2949 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

2950

2857 -#: builtin/branch.c:749

2951 +#: builtin/branch.c:759

2952 #, c-format

2953 msgid "malformed object name %s"

2954 msgstr "felformat objektnamn %s"

2955

2862 -#: builtin/branch.c:773

2956 +#: builtin/branch.c:783

2957 #, c-format

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

2959 msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2960

2867 -#: builtin/branch.c:803

2961 +#: builtin/branch.c:813

2962 msgid "Generic options"

2963 msgstr "Allmänna flaggor"

2964

2871 -#: builtin/branch.c:805

2965 +#: builtin/branch.c:815

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

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

2968

2875 -#: builtin/branch.c:806

2969 +#: builtin/branch.c:816

2970 msgid "suppress informational messages"

2971 msgstr "undertryck informationsmeddelanden"

2972

2879 -#: builtin/branch.c:807

2973 +#: builtin/branch.c:817

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

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

2976

2883 -#: builtin/branch.c:809

2977 +#: builtin/branch.c:819

2978 msgid "change upstream info"

2979 msgstr "ändra uppströmsinformation"

2980

2887 -#: builtin/branch.c:813

2981 +#: builtin/branch.c:823

2982 msgid "use colored output"

2983 msgstr "använd färgad utdata"

2984

2891 -#: builtin/branch.c:814

2985 +#: builtin/branch.c:824

2986 msgid "act on remote-tracking branches"

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

2988

2895 -#: builtin/branch.c:817 builtin/branch.c:823 builtin/branch.c:844

2896 -#: builtin/branch.c:850 builtin/commit.c:1573 builtin/commit.c:1574

2897 -#: builtin/commit.c:1575 builtin/commit.c:1576 builtin/tag.c:615

2898 -#: builtin/tag.c:621

2989 +#: builtin/branch.c:827 builtin/branch.c:833 builtin/branch.c:854

2990 +#: builtin/branch.c:860 builtin/commit.c:1622 builtin/commit.c:1623

2991 +#: builtin/commit.c:1624 builtin/commit.c:1625 builtin/tag.c:616

2992 +#: builtin/tag.c:622

2993 msgid "commit"

2994 msgstr "incheckning"

2995

2902 -#: builtin/branch.c:818 builtin/branch.c:824

2996 +#: builtin/branch.c:828 builtin/branch.c:834

2997 msgid "print only branches that contain the commit"

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

2999

2906 -#: builtin/branch.c:830

3000 +#: builtin/branch.c:840

3001 msgid "Specific git-branch actions:"

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

3003

2910 -#: builtin/branch.c:831

3004 +#: builtin/branch.c:841

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

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

3007

2914 -#: builtin/branch.c:833

3008 +#: builtin/branch.c:843

3009 msgid "delete fully merged branch"

3010 msgstr "ta bort helt sammanslagen gren"

3011

2918 -#: builtin/branch.c:834

3012 +#: builtin/branch.c:844

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

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

3015

2922 -#: builtin/branch.c:835

3016 +#: builtin/branch.c:845

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

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

3019

2926 -#: builtin/branch.c:836

3020 +#: builtin/branch.c:846

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

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

3023

2930 -#: builtin/branch.c:837

3024 +#: builtin/branch.c:847

3025 msgid "list branch names"

3026 msgstr "lista namn på grenar"

3027

2934 -#: builtin/branch.c:838

3028 +#: builtin/branch.c:848

3029 msgid "create the branch's reflog"

3030 msgstr "skapa grenens reflogg"

3031

2938 -#: builtin/branch.c:840

3032 +#: builtin/branch.c:850

3033 msgid "edit the description for the branch"

3034 msgstr "redigera beskrivning för grenen"

3035

2942 -#: builtin/branch.c:841

3036 +#: builtin/branch.c:851

3037 msgid "force creation (when already exists)"

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

3039

2946 -#: builtin/branch.c:844

3040 +#: builtin/branch.c:854

3041 msgid "print only not merged branches"

3042 msgstr "visa endast ej sammanslagna grenar"

3043

2950 -#: builtin/branch.c:850

3044 +#: builtin/branch.c:860

3045 msgid "print only merged branches"

3046 msgstr "visa endast sammanslagna grenar"

3047

2954 -#: builtin/branch.c:854

3048 +#: builtin/branch.c:864

3049 msgid "list branches in columns"

3050 msgstr "visa grenar i spalter"

3051

2958 -#: builtin/branch.c:867

3052 +#: builtin/branch.c:877

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

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

3055

2962 -#: builtin/branch.c:872 builtin/clone.c:636

3056 +#: builtin/branch.c:881 builtin/clone.c:634

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

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

3059

2966 -#: builtin/branch.c:896

3060 +#: builtin/branch.c:903

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

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

3063

2970 -#: builtin/branch.c:902 builtin/branch.c:941

3064 +#: builtin/branch.c:909 builtin/branch.c:948

3065 msgid "branch name required"

3066 msgstr "grennamn krävs"

3067

2974 -#: builtin/branch.c:917

3068 +#: builtin/branch.c:924

3069 msgid "Cannot give description to detached HEAD"

3070 msgstr "Kan inte beskriva frånkopplad HEAD"

3071

2978 -#: builtin/branch.c:922

3072 +#: builtin/branch.c:929

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

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

3075

2982 -#: builtin/branch.c:929

3076 +#: builtin/branch.c:936

3077 #, c-format

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

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

3080

2987 -#: builtin/branch.c:932

3081 +#: builtin/branch.c:939

3082 #, c-format

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

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

3085

2992 -#: builtin/branch.c:947

3086 +#: builtin/branch.c:954

3087 msgid "too many branches for a rename operation"

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

3089

2996 -#: builtin/branch.c:952

3090 +#: builtin/branch.c:959

3091 msgid "too many branches to set new upstream"

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

3093

3000 -#: builtin/branch.c:956

3094 +#: builtin/branch.c:963

3095 #, c-format

3096 msgid ""

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

3098 msgstr ""

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

3100

3007 -#: builtin/branch.c:959 builtin/branch.c:981 builtin/branch.c:1002

3101 +#: builtin/branch.c:966 builtin/branch.c:988 builtin/branch.c:1009

3102 #, c-format

3103 msgid "no such branch '%s'"

3104 msgstr "okänd gren \"%s\""

3105

3012 -#: builtin/branch.c:963

3106 +#: builtin/branch.c:970

3107 #, c-format

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

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

3110

3017 -#: builtin/branch.c:975

3111 +#: builtin/branch.c:982

3112 msgid "too many branches to unset upstream"

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

3114

3021 -#: builtin/branch.c:979

3115 +#: builtin/branch.c:986

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

3117 msgstr ""

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

3119

3026 -#: builtin/branch.c:985

3120 +#: builtin/branch.c:992

3121 #, c-format

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

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

3124

3031 -#: builtin/branch.c:999

3125 +#: builtin/branch.c:1006

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

3127 msgstr "kan inte skapa \"HEAD\" manuellt"

3128

3035 -#: builtin/branch.c:1005

3129 +#: builtin/branch.c:1012

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

3131 msgstr ""

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

3133 "grennamn"

3134

3041 -#: builtin/branch.c:1008

3135 +#: builtin/branch.c:1015

3136 #, c-format

3137 msgid ""

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

@@ -3047,7 +3141,7 @@ msgstr ""

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

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

3143

3050 -#: builtin/branch.c:1025

3144 +#: builtin/branch.c:1032

3145 #, c-format

3146 msgid ""

3147 "\n"

@@ -3058,12 +3152,12 @@ msgstr ""

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

3153 "\n"

3154

3061 -#: builtin/branch.c:1026

3155 +#: builtin/branch.c:1033

3156 #, c-format

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

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

3159

3066 -#: builtin/branch.c:1027

3160 +#: builtin/branch.c:1034

3161 #, c-format

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

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

@@ -3081,43 +3175,43 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

3175 msgid "Need a repository to unbundle."

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

3177

3084 -#: builtin/cat-file.c:331

3178 +#: builtin/cat-file.c:332

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

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

3181

3088 -#: builtin/cat-file.c:332

3182 +#: builtin/cat-file.c:333

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

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

3185

3092 -#: builtin/cat-file.c:369

3186 +#: builtin/cat-file.c:370

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

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

3189

3096 -#: builtin/cat-file.c:370

3190 +#: builtin/cat-file.c:371

3191 msgid "show object type"

3192 msgstr "visa objekttyp"

3193

3100 -#: builtin/cat-file.c:371

3194 +#: builtin/cat-file.c:372

3195 msgid "show object size"

3196 msgstr "visa objektstorlek"

3197

3104 -#: builtin/cat-file.c:373

3198 +#: builtin/cat-file.c:374

3199 msgid "exit with zero when there's no error"

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

3201

3108 -#: builtin/cat-file.c:374

3202 +#: builtin/cat-file.c:375

3203 msgid "pretty-print object's content"

3204 msgstr "visa objektets innehåll snyggt"

3205

3112 -#: builtin/cat-file.c:376

3206 +#: builtin/cat-file.c:377

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

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

3209

3116 -#: builtin/cat-file.c:378

3210 +#: builtin/cat-file.c:379

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

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

3213

3120 -#: builtin/cat-file.c:381

3214 +#: builtin/cat-file.c:382

3215 msgid "show info about objects fed from the standard input"

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

3217

@@ -3137,7 +3231,7 @@ msgstr "visa alla attribut som satts på filen"

3231 msgid "use .gitattributes only from the index"

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

3233

3140 -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75

3234 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98

3235 msgid "read file names from stdin"

3236 msgstr "läs filnamn från standard in"

3237

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

3239 msgid "terminate input and output records by a NUL character"

3240 msgstr "avsluta in- och utdataposter med NUL-tecken"

3241

3148 -#: builtin/check-ignore.c:18 builtin/checkout.c:1083 builtin/gc.c:285

3242 +#: builtin/check-ignore.c:18 builtin/checkout.c:1089 builtin/gc.c:274

3243 msgid "suppress progress reporting"

3244 msgstr "undertryck förloppsrapportering"

3245

@@ -3309,46 +3403,46 @@ msgstr "sökvägen \"%s\" har inte slagits ihop"

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

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

3405

3312 -#: builtin/checkout.c:591

3406 +#: builtin/checkout.c:597

3407 #, c-format

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

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

3410

3317 -#: builtin/checkout.c:629

3411 +#: builtin/checkout.c:635

3412 msgid "HEAD is now at"

3413 msgstr "HEAD är nu på"

3414

3321 -#: builtin/checkout.c:636

3415 +#: builtin/checkout.c:642

3416 #, c-format

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

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

3419

3326 -#: builtin/checkout.c:639

3420 +#: builtin/checkout.c:645

3421 #, c-format

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

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

3424

3331 -#: builtin/checkout.c:643

3425 +#: builtin/checkout.c:649

3426 #, c-format

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

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

3429

3336 -#: builtin/checkout.c:645 builtin/checkout.c:1026

3430 +#: builtin/checkout.c:651 builtin/checkout.c:1032

3431 #, c-format

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

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

3434

3341 -#: builtin/checkout.c:647

3435 +#: builtin/checkout.c:653

3436 #, c-format

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

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

3439

3346 -#: builtin/checkout.c:699

3440 +#: builtin/checkout.c:705

3441 #, c-format

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

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

3444

3351 -#: builtin/checkout.c:705

3445 +#: builtin/checkout.c:711

3446 #, c-format

3447 msgid ""

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

@@ -3371,7 +3465,7 @@ msgstr[1] ""

3465 "\n"

3466 "%s\n"

3467

3374 -#: builtin/checkout.c:723

3468 +#: builtin/checkout.c:729

3469 #, c-format

3470 msgid ""

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

@@ -3386,139 +3480,139 @@ msgstr ""

3480 " git branch nytt_grennamn %s\n"

3481 "\n"

3482

3389 -#: builtin/checkout.c:753

3483 +#: builtin/checkout.c:759

3484 msgid "internal error in revision walk"

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

3486

3393 -#: builtin/checkout.c:757

3487 +#: builtin/checkout.c:763

3488 msgid "Previous HEAD position was"

3489 msgstr "Tidigare position för HEAD var"

3490

3397 -#: builtin/checkout.c:784 builtin/checkout.c:1021

3491 +#: builtin/checkout.c:790 builtin/checkout.c:1027

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

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

3494

3401 -#: builtin/checkout.c:928

3495 +#: builtin/checkout.c:934

3496 #, c-format

3497 msgid "only one reference expected, %d given."

3498 msgstr "endast en referens förväntades, %d gavs."

3499

3406 -#: builtin/checkout.c:967

3500 +#: builtin/checkout.c:973

3501 #, c-format

3502 msgid "invalid reference: %s"

3503 msgstr "felaktig referens: %s"

3504

3411 -#: builtin/checkout.c:996

3505 +#: builtin/checkout.c:1002

3506 #, c-format

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

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

3509

3416 -#: builtin/checkout.c:1035

3510 +#: builtin/checkout.c:1041

3511 msgid "paths cannot be used with switching branches"

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

3513

3420 -#: builtin/checkout.c:1038 builtin/checkout.c:1042

3514 +#: builtin/checkout.c:1044 builtin/checkout.c:1048

3515 #, c-format

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

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

3518

3425 -#: builtin/checkout.c:1046 builtin/checkout.c:1049 builtin/checkout.c:1054

3426 -#: builtin/checkout.c:1057

3519 +#: builtin/checkout.c:1052 builtin/checkout.c:1055 builtin/checkout.c:1060

3520 +#: builtin/checkout.c:1063

3521 #, c-format

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

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

3524

3431 -#: builtin/checkout.c:1062

3525 +#: builtin/checkout.c:1068

3526 #, c-format

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

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

3529

3436 -#: builtin/checkout.c:1084 builtin/checkout.c:1086 builtin/clone.c:88

3530 +#: builtin/checkout.c:1090 builtin/checkout.c:1092 builtin/clone.c:89

3531 #: builtin/remote.c:159 builtin/remote.c:161

3532 msgid "branch"

3533 msgstr "gren"

3534

3441 -#: builtin/checkout.c:1085

3535 +#: builtin/checkout.c:1091

3536 msgid "create and checkout a new branch"

3537 msgstr "skapa och checka ut en ny gren"

3538

3445 -#: builtin/checkout.c:1087

3539 +#: builtin/checkout.c:1093

3540 msgid "create/reset and checkout a branch"

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

3542

3449 -#: builtin/checkout.c:1088

3543 +#: builtin/checkout.c:1094

3544 msgid "create reflog for new branch"

3545 msgstr "skapa reflogg för ny gren"

3546

3453 -#: builtin/checkout.c:1089

3547 +#: builtin/checkout.c:1095

3548 msgid "detach the HEAD at named commit"

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

3550

3457 -#: builtin/checkout.c:1090

3551 +#: builtin/checkout.c:1096

3552 msgid "set upstream info for new branch"

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

3554

3461 -#: builtin/checkout.c:1092

3555 +#: builtin/checkout.c:1098

3556 msgid "new-branch"

3557 msgstr "ny-gren"

3558

3465 -#: builtin/checkout.c:1092

3559 +#: builtin/checkout.c:1098

3560 msgid "new unparented branch"

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

3562

3469 -#: builtin/checkout.c:1093

3563 +#: builtin/checkout.c:1099

3564 msgid "checkout our version for unmerged files"

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

3566

3473 -#: builtin/checkout.c:1095

3567 +#: builtin/checkout.c:1101

3568 msgid "checkout their version for unmerged files"

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

3570

3477 -#: builtin/checkout.c:1097

3571 +#: builtin/checkout.c:1103

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

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

3574

3481 -#: builtin/checkout.c:1098

3575 +#: builtin/checkout.c:1104

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

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

3578

3485 -#: builtin/checkout.c:1099 builtin/merge.c:225

3579 +#: builtin/checkout.c:1105 builtin/merge.c:226

3580 msgid "update ignored files (default)"

3581 msgstr "uppdatera ignorerade filer (standard)"

3582

3489 -#: builtin/checkout.c:1100 builtin/log.c:1236 parse-options.h:245

3583 +#: builtin/checkout.c:1106 builtin/log.c:1239 parse-options.h:245

3584 msgid "style"

3585 msgstr "stil"

3586

3493 -#: builtin/checkout.c:1101

3587 +#: builtin/checkout.c:1107

3588 msgid "conflict style (merge or diff3)"

3589 msgstr "konfliktstil (merge eller diff3)"

3590

3497 -#: builtin/checkout.c:1104

3591 +#: builtin/checkout.c:1110

3592 msgid "do not limit pathspecs to sparse entries only"

3593 msgstr "begränsa inte sökvägar till endast glesa poster"

3594

3501 -#: builtin/checkout.c:1106

3595 +#: builtin/checkout.c:1112

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

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

3598

3505 -#: builtin/checkout.c:1129

3599 +#: builtin/checkout.c:1135

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

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

3602

3509 -#: builtin/checkout.c:1146

3603 +#: builtin/checkout.c:1152

3604 msgid "--track needs a branch name"

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

3606

3513 -#: builtin/checkout.c:1153

3607 +#: builtin/checkout.c:1157

3608 msgid "Missing branch name; try -b"

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

3610

3517 -#: builtin/checkout.c:1190

3611 +#: builtin/checkout.c:1194

3612 msgid "invalid path specification"

3613 msgstr "felaktig sökvägsangivelse"

3614

3521 -#: builtin/checkout.c:1197

3615 +#: builtin/checkout.c:1201

3616 #, c-format

3617 msgid ""

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

@@ -3527,12 +3621,12 @@ msgstr ""

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

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

3623

3530 -#: builtin/checkout.c:1202

3624 +#: builtin/checkout.c:1206

3625 #, c-format

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

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

3628

3535 -#: builtin/checkout.c:1206

3629 +#: builtin/checkout.c:1210

3630 msgid ""

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

3632 "checking out of the index."

@@ -3684,7 +3778,7 @@ msgstr "städa interaktivt"

3778 msgid "remove whole directories"

3779 msgstr "ta bort hela kataloger"

3780

3687 -#: builtin/clean.c:880 builtin/describe.c:406 builtin/grep.c:714

3781 +#: builtin/clean.c:880 builtin/describe.c:407 builtin/grep.c:714

3782 #: builtin/ls-files.c:486 builtin/name-rev.c:311 builtin/show-ref.c:185

3783 msgid "pattern"

3784 msgstr "mönster"

@@ -3721,145 +3815,145 @@ msgstr ""

3815 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "

3816 "angavs; vägrar städa"

3817

3724 -#: builtin/clone.c:36

3818 +#: builtin/clone.c:37

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

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

3821

3728 -#: builtin/clone.c:64 builtin/fetch.c:112 builtin/merge.c:222

3729 -#: builtin/push.c:503

3822 +#: builtin/clone.c:65 builtin/fetch.c:112 builtin/merge.c:223

3823 +#: builtin/push.c:514

3824 msgid "force progress reporting"

3825 msgstr "tvinga förloppsrapportering"

3826

3733 -#: builtin/clone.c:66

3827 +#: builtin/clone.c:67

3828 msgid "don't create a checkout"

3829 msgstr "skapa inte någon utcheckning"

3830

3737 -#: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:486

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

3832 msgid "create a bare repository"

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

3834

3741 -#: builtin/clone.c:71

3835 +#: builtin/clone.c:72

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

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

3838

3745 -#: builtin/clone.c:73

3839 +#: builtin/clone.c:74

3840 msgid "to clone from a local repository"

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

3842

3749 -#: builtin/clone.c:75

3843 +#: builtin/clone.c:76

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

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

3846

3753 -#: builtin/clone.c:77

3847 +#: builtin/clone.c:78

3848 msgid "setup as shared repository"

3849 msgstr "skapa som ett delat arkiv"

3850

3757 -#: builtin/clone.c:79 builtin/clone.c:81

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

3852 msgid "initialize submodules in the clone"

3853 msgstr "initiera undermoduler i klonen"

3854

3761 -#: builtin/clone.c:82 builtin/init-db.c:483

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

3856 msgid "template-directory"

3857 msgstr "mallkatalog"

3858

3765 -#: builtin/clone.c:83 builtin/init-db.c:484

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

3860 msgid "directory from which templates will be used"

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

3862

3769 -#: builtin/clone.c:85

3863 +#: builtin/clone.c:86

3864 msgid "reference repository"

3865 msgstr "referensarkiv"

3866

3773 -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

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

3868 msgid "name"

3869 msgstr "namn"

3870

3777 -#: builtin/clone.c:87

3871 +#: builtin/clone.c:88

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

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

3874

3781 -#: builtin/clone.c:89

3875 +#: builtin/clone.c:90

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

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

3878

3785 -#: builtin/clone.c:91

3879 +#: builtin/clone.c:92

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

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

3882

3789 -#: builtin/clone.c:92 builtin/fetch.c:113 builtin/grep.c:659

3883 +#: builtin/clone.c:93 builtin/fetch.c:113 builtin/grep.c:659

3884 msgid "depth"

3885 msgstr "djup"

3886

3793 -#: builtin/clone.c:93

3887 +#: builtin/clone.c:94

3888 msgid "create a shallow clone of that depth"

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

3890

3797 -#: builtin/clone.c:95

3891 +#: builtin/clone.c:96

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

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

3894

3801 -#: builtin/clone.c:96 builtin/init-db.c:492

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

3896 msgid "gitdir"

3897 msgstr "gitkat"

3898

3805 -#: builtin/clone.c:97 builtin/init-db.c:493

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

3900 msgid "separate git dir from working tree"

3901 msgstr "separera gitkatalogen från arbetskatalogen"

3902

3809 -#: builtin/clone.c:98

3903 +#: builtin/clone.c:99

3904 msgid "key=value"

3905 msgstr "nyckel=värde"

3906

3813 -#: builtin/clone.c:99

3907 +#: builtin/clone.c:100

3908 msgid "set config inside the new repository"

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

3910

3817 -#: builtin/clone.c:252

3911 +#: builtin/clone.c:253

3912 #, c-format

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

3914 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3915

3822 -#: builtin/clone.c:256

3916 +#: builtin/clone.c:257

3917 #, c-format

3918 msgid "reference repository '%s' is shallow"

3919 msgstr "referensarkivet \"%s\" är grunt"

3920

3827 -#: builtin/clone.c:259

3921 +#: builtin/clone.c:260

3922 #, c-format

3923 msgid "reference repository '%s' is grafted"

3924 msgstr "referensarkivet \"%s\" är ympat"

3925

3832 -#: builtin/clone.c:321

3926 +#: builtin/clone.c:322

3927 #, c-format

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

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

3930

3837 -#: builtin/clone.c:323 builtin/diff.c:83

3931 +#: builtin/clone.c:324 builtin/diff.c:84

3932 #, c-format

3933 msgid "failed to stat '%s'"

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

3935

3842 -#: builtin/clone.c:325

3936 +#: builtin/clone.c:326

3937 #, c-format

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

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

3940

3847 -#: builtin/clone.c:339

3941 +#: builtin/clone.c:340

3942 #, c-format

3943 msgid "failed to stat %s\n"

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

3945

3852 -#: builtin/clone.c:361

3946 +#: builtin/clone.c:362

3947 #, c-format

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

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

3950

3857 -#: builtin/clone.c:365

3951 +#: builtin/clone.c:366

3952 #, c-format

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

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

3955

3862 -#: builtin/clone.c:388 builtin/clone.c:565

3956 +#: builtin/clone.c:389 builtin/clone.c:563

3957 #, c-format

3958 msgid "done.\n"

3959 msgstr "klart.\n"

@@ -3874,109 +3968,111 @@ msgstr ""

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

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

3970

3877 -#: builtin/clone.c:480

3971 +#: builtin/clone.c:478

3972 #, c-format

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

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

3975

3882 -#: builtin/clone.c:560

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

3977 +# objects in the database.

3978 +#: builtin/clone.c:558

3979 #, c-format

3980 msgid "Checking connectivity... "

3885 -msgstr "Kontrollerar anslutning..."

3981 +msgstr "Kontrollerar konnektivitet..."

3982

3887 -#: builtin/clone.c:563

3983 +#: builtin/clone.c:561

3984 msgid "remote did not send all necessary objects"

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

3986

3891 -#: builtin/clone.c:627

3987 +#: builtin/clone.c:625

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

3989 msgstr ""

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

3991

3896 -#: builtin/clone.c:658

3992 +#: builtin/clone.c:656

3993 msgid "unable to checkout working tree"

3994 msgstr "kunde inte checka ut arbetskatalogen"

3995

3900 -#: builtin/clone.c:768

3996 +#: builtin/clone.c:765

3997 msgid "Too many arguments."

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

3999

3904 -#: builtin/clone.c:772

4000 +#: builtin/clone.c:769

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

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

4003

3908 -#: builtin/clone.c:783

4004 +#: builtin/clone.c:780

4005 #, c-format

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

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

4008

3913 -#: builtin/clone.c:786

4009 +#: builtin/clone.c:783

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

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

4012

3917 -#: builtin/clone.c:799

4013 +#: builtin/clone.c:796

4014 #, c-format

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

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

4017

3922 -#: builtin/clone.c:805 builtin/fetch.c:1143

4018 +#: builtin/clone.c:802 builtin/fetch.c:1155

4019 #, c-format

4020 msgid "depth %s is not a positive number"

4021 msgstr "djupet %s är inte ett positivt tal"

4022

3927 -#: builtin/clone.c:815

4023 +#: builtin/clone.c:812

4024 #, c-format

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

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

4027

3932 -#: builtin/clone.c:825

4028 +#: builtin/clone.c:822

4029 #, c-format

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

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

4032

3937 -#: builtin/clone.c:838 builtin/clone.c:850

4033 +#: builtin/clone.c:835 builtin/clone.c:847

4034 #, c-format

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

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

4037

3942 -#: builtin/clone.c:841

4038 +#: builtin/clone.c:838

4039 #, c-format

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

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

4042

3947 -#: builtin/clone.c:860

4043 +#: builtin/clone.c:857

4044 #, c-format

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

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

4047

3952 -#: builtin/clone.c:862

4048 +#: builtin/clone.c:859

4049 #, c-format

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

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

4052

3957 -#: builtin/clone.c:898

4053 +#: builtin/clone.c:895

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

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

4056

3961 -#: builtin/clone.c:901

4057 +#: builtin/clone.c:898

4058 msgid "source repository is shallow, ignoring --local"

4059 msgstr "källarkivet är grunt, ignorerar --local"

4060

3965 -#: builtin/clone.c:906

4061 +#: builtin/clone.c:903

4062 msgid "--local is ignored"

4063 msgstr "--local ignoreras"

4064

3969 -#: builtin/clone.c:910

4065 +#: builtin/clone.c:907

4066 #, c-format

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

4068 msgstr "Vet inte hur man klonar %s"

4069

3974 -#: builtin/clone.c:961 builtin/clone.c:969

4070 +#: builtin/clone.c:958 builtin/clone.c:966

4071 #, c-format

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

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

4074

3979 -#: builtin/clone.c:972

4075 +#: builtin/clone.c:969

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

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

4078

@@ -4012,15 +4108,42 @@ msgstr "Spaltfyllnad mellan spalter"

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

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

4110

4015 -#: builtin/commit.c:36

4111 +#: builtin/commit.c:37

4112 msgid "git commit [options] [--] <pathspec>..."

4113 msgstr "git commit [flaggor] [--] <sökväg>..."

4114

4019 -#: builtin/commit.c:41

4115 +#: builtin/commit.c:42

4116 msgid "git status [options] [--] <pathspec>..."

4117 msgstr "git status [flaggor] [--] <sökväg>..."

4118

4023 -#: builtin/commit.c:46

4119 +#: builtin/commit.c:47

4120 +msgid ""

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

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

4123 +"You can suppress this message by setting them explicitly. Run the\n"

4124 +"following command and follow the instructions in your editor to edit\n"

4125 +"your configuration file:\n"

4126 +"\n"

4127 +" git config --global --edit\n"

4128 +"\n"

4129 +"After doing this, you may fix the identity used for this commit with:\n"

4130 +"\n"

4131 +" git commit --amend --reset-author\n"

4132 +msgstr ""

4133 +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"

4134 +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"

4135 +"kan förhindra det här meddelandet genom att ställa dem explicit.\n"

4136 +"Kör följande kommandon och följ instruktionerna i textredigeraren\n"

4137 +"för att redigera din konfigurationsfil:\n"

4138 +"\n"

4139 +" git config --global --edit\n"

4140 +"\n"

4141 +"När du gjort det kan du rätta identiteten som användes för den här\n"

4142 +"incheckningen med:\n"

4143 +"\n"

4144 +" git commit --amend --reset-author\n"

4145 +

4146 +#: builtin/commit.c:60

4147 msgid ""

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

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

@@ -4045,7 +4168,7 @@ msgstr ""

4168 "\n"

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

4170

4048 -#: builtin/commit.c:58

4171 +#: builtin/commit.c:72

4172 msgid ""

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

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

@@ -4055,7 +4178,7 @@ msgstr ""

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

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

4180

4058 -#: builtin/commit.c:63

4181 +#: builtin/commit.c:77

4182 msgid ""

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

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

@@ -4069,11 +4192,11 @@ msgstr ""

4192 " git commit --allow-empty\n"

4193 "\n"

4194

4072 -#: builtin/commit.c:70

4195 +#: builtin/commit.c:84

4196 msgid "Otherwise, please use 'git reset'\n"

4197 msgstr "Använd annars \"git reset\"\n"

4198

4076 -#: builtin/commit.c:73

4199 +#: builtin/commit.c:87

4200 msgid ""

4201 "If you wish to skip this commit, use:\n"

4202 "\n"

@@ -4089,58 +4212,75 @@ msgstr ""

4212 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

4213 "cherry-pick för återstående incheckningar.\n"

4214

4092 -#: builtin/commit.c:288

4215 +#: builtin/commit.c:302

4216 msgid "failed to unpack HEAD tree object"

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

4218

4096 -#: builtin/commit.c:328

4219 +#: builtin/commit.c:342

4220 msgid "unable to create temporary index"

4221 msgstr "kunde inte skapa temporär indexfil"

4222

4100 -#: builtin/commit.c:334

4223 +#: builtin/commit.c:348

4224 msgid "interactive add failed"

4225 msgstr "interaktiv tilläggning misslyckades"

4226

4104 -#: builtin/commit.c:366 builtin/commit.c:387 builtin/commit.c:435

4227 +#: builtin/commit.c:359

4228 +msgid "unable to write index file"

4229 +msgstr "kan inte skriva indexfil"

4230 +

4231 +#: builtin/commit.c:361

4232 +msgid "unable to update temporary index"

4233 +msgstr "kan inte uppdatera temporärt index"

4234 +

4235 +#: builtin/commit.c:363

4236 +msgid "Failed to update main cache tree"

4237 +msgstr "Misslyckades uppdatera huvud-cacheträdet"

4238 +

4239 +#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461

4240 msgid "unable to write new_index file"

4241 msgstr "kunde inte skriva filen new_index"

4242

4108 -#: builtin/commit.c:418

4243 +#: builtin/commit.c:443

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

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

4246

4112 -#: builtin/commit.c:420

4247 +#: builtin/commit.c:445

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

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

4250

4116 -#: builtin/commit.c:429

4251 +#: builtin/commit.c:454

4252 msgid "cannot read the index"

4253 msgstr "kan inte läsa indexet"

4254

4120 -#: builtin/commit.c:447

4255 +#: builtin/commit.c:473

4256 msgid "unable to write temporary index file"

4257 msgstr "kunde inte skriva temporär indexfil"

4258

4124 -#: builtin/commit.c:557 builtin/commit.c:563

4259 +#: builtin/commit.c:592

4260 +#, c-format

4261 +msgid "commit '%s' lacks author header"

4262 +msgstr "incheckningen \"%s\" saknar författarhuvud"

4263 +

4264 +#: builtin/commit.c:594

4265 #, c-format

4126 -msgid "invalid commit: %s"

4127 -msgstr "felaktig incheckning: %s"

4266 +msgid "commit '%s' has malformed author line"

4267 +msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

4268

4129 -#: builtin/commit.c:585

4269 +#: builtin/commit.c:613

4270 msgid "malformed --author parameter"

4271 msgstr "felformad \"--author\"-flagga"

4272

4133 -#: builtin/commit.c:592

4273 +#: builtin/commit.c:621

4274 #, c-format

4275 msgid "invalid date format: %s"

4276 msgstr "felaktigt datumformat: %s"

4277

4138 -#: builtin/commit.c:609

4278 +#: builtin/commit.c:642

4279 #, c-format

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

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

4282

4143 -#: builtin/commit.c:642

4283 +#: builtin/commit.c:675

4284 msgid ""

4285 "unable to select a comment character that is not used\n"

4286 "in the current commit message"

@@ -4148,43 +4288,43 @@ msgstr ""

4288 "kunde inte välja ett kommentarstecken som inte använts\n"

4289 "i det befintliga incheckningsmeddelandet"

4290

4151 -#: builtin/commit.c:679 builtin/commit.c:712 builtin/commit.c:1086

4291 +#: builtin/commit.c:712 builtin/commit.c:745 builtin/commit.c:1120

4292 #, c-format

4293 msgid "could not lookup commit %s"

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

4295

4156 -#: builtin/commit.c:691 builtin/shortlog.c:273

4296 +#: builtin/commit.c:724 builtin/shortlog.c:273

4297 #, c-format

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

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

4300

4161 -#: builtin/commit.c:693

4301 +#: builtin/commit.c:726

4302 msgid "could not read log from standard input"

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

4304

4165 -#: builtin/commit.c:697

4305 +#: builtin/commit.c:730

4306 #, c-format

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

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

4309

4170 -#: builtin/commit.c:719

4310 +#: builtin/commit.c:752

4311 msgid "could not read MERGE_MSG"

4312 msgstr "kunde inte läsa MERGE_MSG"

4313

4174 -#: builtin/commit.c:723

4314 +#: builtin/commit.c:756

4315 msgid "could not read SQUASH_MSG"

4316 msgstr "kunde inte läsa SQUASH_MSG"

4317

4178 -#: builtin/commit.c:727

4318 +#: builtin/commit.c:760

4319 #, c-format

4320 msgid "could not read '%s'"

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

4322

4183 -#: builtin/commit.c:798

4323 +#: builtin/commit.c:831

4324 msgid "could not write commit template"

4325 msgstr "kunde inte skriva incheckningsmall"

4326

4187 -#: builtin/commit.c:816

4327 +#: builtin/commit.c:849

4328 #, c-format

4329 msgid ""

4330 "\n"

@@ -4199,7 +4339,7 @@ msgstr ""

4339 "\t%s\n"

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

4341

4202 -#: builtin/commit.c:821

4342 +#: builtin/commit.c:854

4343 #, c-format

4344 msgid ""

4345 "\n"

@@ -4214,7 +4354,7 @@ msgstr ""

4354 "\t%s\n"

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

4356

4217 -#: builtin/commit.c:834

4357 +#: builtin/commit.c:867

4358 #, c-format

4359 msgid ""

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

@@ -4224,7 +4364,7 @@ msgstr ""

4364 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

4365 "incheckningen.\n"

4366

4227 -#: builtin/commit.c:841

4367 +#: builtin/commit.c:874

4368 #, c-format

4369 msgid ""

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

@@ -4235,144 +4375,144 @@ msgstr ""

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

4376 "Ett tomt meddelande avbryter incheckningen.\n"

4377

4238 -#: builtin/commit.c:855

4378 +#: builtin/commit.c:888

4379 #, c-format

4380 msgid "%sAuthor: %.*s <%.*s>"

4381 msgstr "%sFörfattare: %.*s <%.*s>"

4382

4243 -#: builtin/commit.c:863

4383 +#: builtin/commit.c:896

4384 #, c-format

4385 msgid "%sDate: %s"

4386 msgstr "%sDatum: %s"

4387

4248 -#: builtin/commit.c:870

4388 +#: builtin/commit.c:903

4389 #, c-format

4390 msgid "%sCommitter: %.*s <%.*s>"

4391 msgstr "%sIncheckare: %.*s <%.*s>"

4392

4253 -#: builtin/commit.c:888

4393 +#: builtin/commit.c:921

4394 msgid "Cannot read index"

4395 msgstr "Kan inte läsa indexet"

4396

4257 -#: builtin/commit.c:945

4397 +#: builtin/commit.c:978

4398 msgid "Error building trees"

4399 msgstr "Fel vid byggande av träd"

4400

4261 -#: builtin/commit.c:960 builtin/tag.c:495

4401 +#: builtin/commit.c:993 builtin/tag.c:495

4402 #, c-format

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

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

4405

4266 -#: builtin/commit.c:1061

4406 +#: builtin/commit.c:1095

4407 #, c-format

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

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

4410

4271 -#: builtin/commit.c:1076 builtin/commit.c:1316

4411 +#: builtin/commit.c:1110 builtin/commit.c:1350

4412 #, c-format

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

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

4415

4276 -#: builtin/commit.c:1113

4416 +#: builtin/commit.c:1147

4417 msgid "--long and -z are incompatible"

4418 msgstr "--long och -z är inkompatibla"

4419

4280 -#: builtin/commit.c:1143

4420 +#: builtin/commit.c:1177

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

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

4423

4284 -#: builtin/commit.c:1152

4424 +#: builtin/commit.c:1186

4425 msgid "You have nothing to amend."

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

4427

4288 -#: builtin/commit.c:1155

4428 +#: builtin/commit.c:1189

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

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

4431

4292 -#: builtin/commit.c:1157

4432 +#: builtin/commit.c:1191

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

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

4435

4296 -#: builtin/commit.c:1160

4436 +#: builtin/commit.c:1194

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

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

4439

4300 -#: builtin/commit.c:1170

4440 +#: builtin/commit.c:1204

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

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

4443

4304 -#: builtin/commit.c:1172

4444 +#: builtin/commit.c:1206

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

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

4447

4308 -#: builtin/commit.c:1180

4448 +#: builtin/commit.c:1214

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

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

4451

4312 -#: builtin/commit.c:1197

4452 +#: builtin/commit.c:1231

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

4454 msgstr ""

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

4456

4317 -#: builtin/commit.c:1199

4457 +#: builtin/commit.c:1233

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

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

4460

4321 -#: builtin/commit.c:1201

4461 +#: builtin/commit.c:1235

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

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

4464

4325 -#: builtin/commit.c:1203

4465 +#: builtin/commit.c:1237

4466 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

4468

4329 -#: builtin/commit.c:1215 builtin/tag.c:727

4469 +#: builtin/commit.c:1249 builtin/tag.c:728

4470 #, c-format

4471 msgid "Invalid cleanup mode %s"

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

4473

4334 -#: builtin/commit.c:1220

4474 +#: builtin/commit.c:1254

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

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

4477

4338 -#: builtin/commit.c:1330 builtin/commit.c:1595

4478 +#: builtin/commit.c:1364 builtin/commit.c:1644

4479 msgid "show status concisely"

4480 msgstr "visa koncis status"

4481

4342 -#: builtin/commit.c:1332 builtin/commit.c:1597

4482 +#: builtin/commit.c:1366 builtin/commit.c:1646

4483 msgid "show branch information"

4484 msgstr "visa information om gren"

4485

4346 -#: builtin/commit.c:1334 builtin/commit.c:1599 builtin/push.c:489

4486 +#: builtin/commit.c:1368 builtin/commit.c:1648 builtin/push.c:500

4487 msgid "machine-readable output"

4488 msgstr "maskinläsbar utdata"

4489

4350 -#: builtin/commit.c:1337 builtin/commit.c:1601

4490 +#: builtin/commit.c:1371 builtin/commit.c:1650

4491 msgid "show status in long format (default)"

4492 msgstr "visa status i långt format (standard)"

4493

4354 -#: builtin/commit.c:1340 builtin/commit.c:1604

4494 +#: builtin/commit.c:1374 builtin/commit.c:1653

4495 msgid "terminate entries with NUL"

4496 msgstr "terminera poster med NUL"

4497

4358 -#: builtin/commit.c:1342 builtin/commit.c:1607 builtin/fast-export.c:703

4359 -#: builtin/fast-export.c:706 builtin/tag.c:602

4498 +#: builtin/commit.c:1376 builtin/commit.c:1656 builtin/fast-export.c:980

4499 +#: builtin/fast-export.c:983 builtin/tag.c:603

4500 msgid "mode"

4501 msgstr "läge"

4502

4363 -#: builtin/commit.c:1343 builtin/commit.c:1607

4503 +#: builtin/commit.c:1377 builtin/commit.c:1656

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

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

4506

4367 -#: builtin/commit.c:1346

4507 +#: builtin/commit.c:1380

4508 msgid "show ignored files"

4509 msgstr "visa ignorerade filer"

4510

4371 -#: builtin/commit.c:1347 parse-options.h:153

4511 +#: builtin/commit.c:1381 parse-options.h:153

4512 msgid "when"

4513 msgstr "när"

4514

4375 -#: builtin/commit.c:1348

4515 +#: builtin/commit.c:1382

4516 msgid ""

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

4518 "(Default: all)"

@@ -4380,220 +4520,212 @@ msgstr ""

4520 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

4521 "(Default: all)"

4522

4383 -#: builtin/commit.c:1350

4523 +#: builtin/commit.c:1384

4524 msgid "list untracked files in columns"

4525 msgstr "visa ospårade filer i spalter"

4526

4387 -#: builtin/commit.c:1419

4527 +#: builtin/commit.c:1471

4528 msgid "couldn't look up newly created commit"

4529 msgstr "kunde inte slå upp en precis skapad incheckning"

4530

4391 -#: builtin/commit.c:1421

4531 +#: builtin/commit.c:1473

4532 msgid "could not parse newly created commit"

4533 msgstr "kunde inte tolka en precis skapad incheckning"

4534

4395 -#: builtin/commit.c:1469

4535 +#: builtin/commit.c:1518

4536 msgid "detached HEAD"

4537 msgstr "frånkopplad HEAD"

4538

4399 -#: builtin/commit.c:1471

4539 +#: builtin/commit.c:1521

4540 msgid " (root-commit)"

4541 msgstr " (rotincheckning)"

4542

4403 -#: builtin/commit.c:1565

4543 +#: builtin/commit.c:1614

4544 msgid "suppress summary after successful commit"

4545 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

4546

4407 -#: builtin/commit.c:1566

4547 +#: builtin/commit.c:1615

4548 msgid "show diff in commit message template"

4549 msgstr "visa diff i mallen för incheckningsmeddelandet"

4550

4411 -#: builtin/commit.c:1568

4551 +#: builtin/commit.c:1617

4552 msgid "Commit message options"

4553 msgstr "Alternativ för incheckningsmeddelande"

4554

4415 -#: builtin/commit.c:1569 builtin/tag.c:600

4555 +#: builtin/commit.c:1618 builtin/tag.c:601

4556 msgid "read message from file"

4557 msgstr "läs meddelande från fil"

4558

4419 -#: builtin/commit.c:1570

4559 +#: builtin/commit.c:1619

4560 msgid "author"

4561 msgstr "författare"

4562

4423 -#: builtin/commit.c:1570

4563 +#: builtin/commit.c:1619

4564 msgid "override author for commit"

4565 msgstr "överstyr författare för incheckningen"

4566

4427 -#: builtin/commit.c:1571 builtin/gc.c:286

4567 +#: builtin/commit.c:1620 builtin/gc.c:275

4568 msgid "date"

4569 msgstr "datum"

4570

4431 -#: builtin/commit.c:1571

4571 +#: builtin/commit.c:1620

4572 msgid "override date for commit"

4573 msgstr "överstyr datum för incheckningen"

4574

4435 -#: builtin/commit.c:1572 builtin/merge.c:216 builtin/notes.c:409

4436 -#: builtin/notes.c:566 builtin/tag.c:598

4575 +#: builtin/commit.c:1621 builtin/merge.c:217 builtin/notes.c:408

4576 +#: builtin/notes.c:565 builtin/tag.c:599

4577 msgid "message"

4578 msgstr "meddelande"

4579

4440 -#: builtin/commit.c:1572

4580 +#: builtin/commit.c:1621

4581 msgid "commit message"

4582 msgstr "incheckningsmeddelande"

4583

4444 -#: builtin/commit.c:1573

4584 +#: builtin/commit.c:1622

4585 msgid "reuse and edit message from specified commit"

4586 msgstr "återanvänd och redigera meddelande från angiven incheckning"

4587

4448 -#: builtin/commit.c:1574

4588 +#: builtin/commit.c:1623

4589 msgid "reuse message from specified commit"

4590 msgstr "återanvänd meddelande från angiven incheckning"

4591

4452 -#: builtin/commit.c:1575

4592 +#: builtin/commit.c:1624

4593 msgid "use autosquash formatted message to fixup specified commit"

4594 msgstr ""

4595 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

4596

4457 -#: builtin/commit.c:1576

4597 +#: builtin/commit.c:1625

4598 msgid "use autosquash formatted message to squash specified commit"

4599 msgstr ""

4600 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

4601 "incheckning"

4602

4463 -#: builtin/commit.c:1577

4603 +#: builtin/commit.c:1626

4604 msgid "the commit is authored by me now (used with -C/-c/--amend)"

4605 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

4606

4467 -#: builtin/commit.c:1578 builtin/log.c:1188 builtin/revert.c:86

4607 +#: builtin/commit.c:1627 builtin/log.c:1191 builtin/revert.c:86

4608 msgid "add Signed-off-by:"

4609 msgstr "lägg till Signed-off-by:"

4610

4471 -#: builtin/commit.c:1579

4611 +#: builtin/commit.c:1628

4612 msgid "use specified template file"

4613 msgstr "använd angiven mallfil"

4614

4475 -#: builtin/commit.c:1580

4615 +#: builtin/commit.c:1629

4616 msgid "force edit of commit"

4617 msgstr "tvinga redigering av incheckning"

4618

4479 -#: builtin/commit.c:1581

4619 +#: builtin/commit.c:1630

4620 msgid "default"

4621 msgstr "standard"

4622

4483 -#: builtin/commit.c:1581 builtin/tag.c:603

4623 +#: builtin/commit.c:1630 builtin/tag.c:604

4624 msgid "how to strip spaces and #comments from message"

4625 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

4626

4487 -#: builtin/commit.c:1582

4627 +#: builtin/commit.c:1631

4628 msgid "include status in commit message template"

4629 msgstr "inkludera status i mallen för incheckningsmeddelandet"

4630

4491 -#: builtin/commit.c:1583 builtin/merge.c:223 builtin/revert.c:92

4492 -#: builtin/tag.c:604

4631 +#: builtin/commit.c:1632 builtin/merge.c:224 builtin/revert.c:92

4632 +#: builtin/tag.c:605

4633 msgid "key-id"

4634 msgstr "nyckel-id"

4635

4496 -#: builtin/commit.c:1584 builtin/merge.c:224 builtin/revert.c:93

4636 +#: builtin/commit.c:1633 builtin/merge.c:225 builtin/revert.c:93

4637 msgid "GPG sign commit"

4638 msgstr "GPG-signera incheckning"

4639

4500 -#: builtin/commit.c:1587

4640 +#: builtin/commit.c:1636

4641 msgid "Commit contents options"

4642 msgstr "Alternativ för incheckningens innehåll"

4643

4504 -#: builtin/commit.c:1588

4644 +#: builtin/commit.c:1637

4645 msgid "commit all changed files"

4646 msgstr "checka in alla ändrade filer"

4647

4508 -#: builtin/commit.c:1589

4648 +#: builtin/commit.c:1638

4649 msgid "add specified files to index for commit"

4650 msgstr "lägg till angivna filer till indexet för incheckning"

4651

4512 -#: builtin/commit.c:1590

4652 +#: builtin/commit.c:1639

4653 msgid "interactively add files"

4654 msgstr "lägg till filer interaktivt"

4655

4516 -#: builtin/commit.c:1591

4656 +#: builtin/commit.c:1640

4657 msgid "interactively add changes"

4658 msgstr "lägg till ändringar interaktivt"

4659

4520 -#: builtin/commit.c:1592

4660 +#: builtin/commit.c:1641

4661 msgid "commit only specified files"

4662 msgstr "checka endast in angivna filer"

4663

4524 -#: builtin/commit.c:1593

4664 +#: builtin/commit.c:1642

4665 msgid "bypass pre-commit hook"

4666 msgstr "förbigå pre-commit-krok"

4667

4528 -#: builtin/commit.c:1594

4668 +#: builtin/commit.c:1643

4669 msgid "show what would be committed"

4670 msgstr "visa vad som skulle checkas in"

4671

4532 -#: builtin/commit.c:1605

4672 +#: builtin/commit.c:1654

4673 msgid "amend previous commit"

4674 msgstr "lägg till föregående incheckning"

4675

4536 -#: builtin/commit.c:1606

4676 +#: builtin/commit.c:1655

4677 msgid "bypass post-rewrite hook"

4678 msgstr "förbigå post-rewrite-krok"

4679

4540 -#: builtin/commit.c:1611

4680 +#: builtin/commit.c:1660

4681 msgid "ok to record an empty change"

4682 msgstr "ok att registrera en tom ändring"

4683

4544 -#: builtin/commit.c:1613

4684 +#: builtin/commit.c:1662

4685 msgid "ok to record a change with an empty message"

4686 msgstr "ok att registrera en ändring med tomt meddelande"

4687

4548 -#: builtin/commit.c:1641

4688 +#: builtin/commit.c:1691

4689 msgid "could not parse HEAD commit"

4690 msgstr "kunde inte tolka HEAD:s incheckning"

4691

4552 -#: builtin/commit.c:1680 builtin/merge.c:518

4692 +#: builtin/commit.c:1730 builtin/merge.c:518

4693 #, c-format

4694 msgid "could not open '%s' for reading"

4695 msgstr "kunde inte öppna \"%s\" för läsning"

4696

4557 -#: builtin/commit.c:1687

4697 +#: builtin/commit.c:1737

4698 #, c-format

4699 msgid "Corrupt MERGE_HEAD file (%s)"

4700 msgstr "Trasig MERGE_HEAD-fil (%s)"

4701

4562 -#: builtin/commit.c:1694

4702 +#: builtin/commit.c:1744

4703 msgid "could not read MERGE_MODE"

4704 msgstr "kunde inte läsa MERGE_MODE"

4705

4566 -#: builtin/commit.c:1713

4706 +#: builtin/commit.c:1763

4707 #, c-format

4708 msgid "could not read commit message: %s"

4709 msgstr "kunde inte läsa incheckningsmeddelande: %s"

4710

4571 -#: builtin/commit.c:1724

4711 +#: builtin/commit.c:1774

4712 #, c-format

4713 msgid "Aborting commit; you did not edit the message.\n"

4714 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

4715

4576 -#: builtin/commit.c:1729

4716 +#: builtin/commit.c:1779

4717 #, c-format

4718 msgid "Aborting commit due to empty commit message.\n"

4719 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

4720

4581 -#: builtin/commit.c:1744 builtin/merge.c:851 builtin/merge.c:876

4721 +#: builtin/commit.c:1794 builtin/merge.c:850 builtin/merge.c:875

4722 msgid "failed to write commit object"

4723 msgstr "kunde inte skriva incheckningsobjekt"

4724

4585 -#: builtin/commit.c:1756

4586 -msgid "cannot lock HEAD ref"

4587 -msgstr "kunde inte låsa HEAD-referens"

4588 -

4589 -#: builtin/commit.c:1769

4590 -msgid "cannot update HEAD ref"

4591 -msgstr "kunde inte uppdatera HEAD-referens"

4592 -

4593 -#: builtin/commit.c:1780

4725 +#: builtin/commit.c:1827

4726 msgid ""

4727 "Repository has been updated, but unable to write\n"

4596 -"new_index file. Check that disk is not full or quota is\n"

4728 +"new_index file. Check that disk is not full and quota is\n"

4729 "not exceeded, and then \"git reset HEAD\" to recover."

4730 msgstr ""

4731 "Arkivet har uppdaterats, men kunde inte skriva filen\n"

@@ -4729,63 +4861,87 @@ msgstr "terminera värden med NUL-byte"

4861 msgid "respect include directives on lookup"

4862 msgstr "respektera inkluderingsdirektiv vid uppslag"

4863

4732 -#: builtin/count-objects.c:82

4864 +#: builtin/config.c:315

4865 +msgid "unable to parse default color value"

4866 +msgstr "kan inte tolka standardfärgvärde"

4867 +

4868 +#: builtin/config.c:455

4869 +#, c-format

4870 +msgid ""

4871 +"# This is Git's per-user configuration file.\n"

4872 +"[core]\n"

4873 +"# Please adapt and uncomment the following lines:\n"

4874 +"#\tuser = %s\n"

4875 +"#\temail = %s\n"

4876 +msgstr ""

4877 +"# Detta är Gits användarspecifika konfigurationsfil\n"

4878 +"[core]\n"

4879 +"# Justera och ta bort kommenteringsmärket från följande rader:\n"

4880 +"#\tuser = %s\n"

4881 +"#\temail = %s\n"

4882 +

4883 +#: builtin/config.c:590

4884 +#, c-format

4885 +msgid "cannot create configuration file %s"

4886 +msgstr "kan inte skapa konfigurationsfilen \"%s\""

4887 +

4888 +#: builtin/count-objects.c:55

4889 msgid "git count-objects [-v] [-H | --human-readable]"

4890 msgstr "git count-objects [-v] [-H | --human-readable]"

4891

4736 -#: builtin/count-objects.c:97

4892 +#: builtin/count-objects.c:65

4893 msgid "print sizes in human readable format"

4894 msgstr "skriv storlekar i människoläsbart format"

4895

4740 -#: builtin/describe.c:16

4896 +#: builtin/describe.c:17

4897 msgid "git describe [options] <commit-ish>*"

4898 msgstr "git describe [flaggor] <incheckning-igt>*"

4899

4744 -#: builtin/describe.c:17

4900 +#: builtin/describe.c:18

4901 msgid "git describe [options] --dirty"

4902 msgstr "git describe [flaggor] --dirty"

4903

4748 -#: builtin/describe.c:216

4904 +#: builtin/describe.c:217

4905 #, c-format

4906 msgid "annotated tag %s not available"

4907 msgstr "den annoterade taggen %s inte tillgänglig"

4908

4753 -#: builtin/describe.c:220

4909 +#: builtin/describe.c:221

4910 #, c-format

4911 msgid "annotated tag %s has no embedded name"

4912 msgstr "den annoterade taggen %s har inget inbäddat namn"

4913

4758 -#: builtin/describe.c:222

4914 +#: builtin/describe.c:223

4915 #, c-format

4916 msgid "tag '%s' is really '%s' here"

4917 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

4918

4763 -#: builtin/describe.c:249

4919 +#: builtin/describe.c:250 builtin/log.c:452

4920 #, c-format

4921 msgid "Not a valid object name %s"

4922 msgstr "Objektnamnet är inte giltigt: %s"

4923

4768 -#: builtin/describe.c:252

4924 +#: builtin/describe.c:253

4925 #, c-format

4926 msgid "%s is not a valid '%s' object"

4927 msgstr "%s är inte ett giltigt \"%s\"-objekt"

4928

4773 -#: builtin/describe.c:269

4929 +#: builtin/describe.c:270

4930 #, c-format

4931 msgid "no tag exactly matches '%s'"

4932 msgstr "ingen tagg motsvarar \"%s\" exakt"

4933

4778 -#: builtin/describe.c:271

4934 +#: builtin/describe.c:272

4935 #, c-format

4936 msgid "searching to describe %s\n"

4937 msgstr "söker för att beskriva %s\n"

4938

4783 -#: builtin/describe.c:318

4939 +#: builtin/describe.c:319

4940 #, c-format

4941 msgid "finished search at %s\n"

4942 msgstr "avslutade sökning på %s\n"

4943

4788 -#: builtin/describe.c:345

4944 +#: builtin/describe.c:346

4945 #, c-format

4946 msgid ""

4947 "No annotated tags can describe '%s'.\n"

@@ -4794,7 +4950,7 @@ msgstr ""

4950 "Inga annoterade taggar kan beskriva \"%s\".\n"

4951 "Det finns dock oannoterade taggar: testa --tags."

4952

4797 -#: builtin/describe.c:349

4953 +#: builtin/describe.c:350

4954 #, c-format

4955 msgid ""

4956 "No tags can describe '%s'.\n"

@@ -4803,12 +4959,12 @@ msgstr ""

4959 "Inga taggar kan beskriva \"%s\".\n"

4960 "Testa --always, eller skapa några taggar."

4961

4806 -#: builtin/describe.c:370

4962 +#: builtin/describe.c:371

4963 #, c-format

4964 msgid "traversed %lu commits\n"

4965 msgstr "traverserade %lu incheckningar\n"

4966

4811 -#: builtin/describe.c:373

4967 +#: builtin/describe.c:374

4968 #, c-format

4969 msgid ""

4970 "more than %i tags found; listed %i most recent\n"

@@ -4817,143 +4973,147 @@ msgstr ""

4973 "mer än %i taggar hittades; listar de %i senaste\n"

4974 "gav upp sökningen vid %s\n"

4975

4820 -#: builtin/describe.c:395

4976 +#: builtin/describe.c:396

4977 msgid "find the tag that comes after the commit"

4978 msgstr "hitta taggen som kommer efter incheckningen"

4979

4824 -#: builtin/describe.c:396

4980 +#: builtin/describe.c:397

4981 msgid "debug search strategy on stderr"

4982 msgstr "felsök sökstrategin på standard fel"

4983

4828 -#: builtin/describe.c:397

4984 +#: builtin/describe.c:398

4985 msgid "use any ref"

4986 msgstr "använd alla referenser"

4987

4832 -#: builtin/describe.c:398

4988 +#: builtin/describe.c:399

4989 msgid "use any tag, even unannotated"

4990 msgstr "använd alla taggar, även oannoterade"

4991

4836 -#: builtin/describe.c:399

4992 +#: builtin/describe.c:400

4993 msgid "always use long format"

4994 msgstr "använd alltid långt format"

4995

4840 -#: builtin/describe.c:400

4996 +#: builtin/describe.c:401

4997 msgid "only follow first parent"

4998 msgstr "följ endast första föräldern"

4999

4844 -#: builtin/describe.c:403

5000 +#: builtin/describe.c:404

5001 msgid "only output exact matches"

5002 msgstr "skriv endast ut exakta träffar"

5003

4848 -#: builtin/describe.c:405

5004 +#: builtin/describe.c:406

5005 msgid "consider <n> most recent tags (default: 10)"

5006 msgstr "överväg de <n> nyaste taggarna (standard: 10)"

5007

4852 -#: builtin/describe.c:407

5008 +#: builtin/describe.c:408

5009 msgid "only consider tags matching <pattern>"

5010 msgstr "överväg endast taggar som motsvarar <mönster>"

5011

4856 -#: builtin/describe.c:409 builtin/name-rev.c:318

5012 +#: builtin/describe.c:410 builtin/name-rev.c:318

5013 msgid "show abbreviated commit object as fallback"

5014 msgstr "visa förkortade incheckningsobjekt som standard"

5015

4860 -#: builtin/describe.c:410

5016 +#: builtin/describe.c:411

5017 msgid "mark"

5018 msgstr "märke"

5019

4864 -#: builtin/describe.c:411

5020 +#: builtin/describe.c:412

5021 msgid "append <mark> on dirty working tree (default: \"-dirty\")"

5022 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"

5023

4868 -#: builtin/describe.c:429

5024 +#: builtin/describe.c:430

5025 msgid "--long is incompatible with --abbrev=0"

5026 msgstr "--long är inkompatibel med --abbrev=0"

5027

4872 -#: builtin/describe.c:455

5028 +#: builtin/describe.c:456

5029 msgid "No names found, cannot describe anything."

5030 msgstr "Inga namn hittades, kan inte beskriva något."

5031

4876 -#: builtin/describe.c:475

5032 +#: builtin/describe.c:476

5033 msgid "--dirty is incompatible with commit-ishes"

5034 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

5035

4880 -#: builtin/diff.c:85

5036 +#: builtin/diff.c:86

5037 #, c-format

5038 msgid "'%s': not a regular file or symlink"

5039 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

5040

4885 -#: builtin/diff.c:236

5041 +#: builtin/diff.c:237

5042 #, c-format

5043 msgid "invalid option: %s"

5044 msgstr "ogiltig flagga: %s"

5045

4890 -#: builtin/diff.c:357

5046 +#: builtin/diff.c:358

5047 msgid "Not a git repository"

5048 msgstr "Inte ett git-arkiv"

5049

4894 -#: builtin/diff.c:400

5050 +#: builtin/diff.c:401

5051 #, c-format

5052 msgid "invalid object '%s' given."

5053 msgstr "objektet \"%s\" som angavs är felaktigt."

5054

4899 -#: builtin/diff.c:409

5055 +#: builtin/diff.c:410

5056 #, c-format

5057 msgid "more than two blobs given: '%s'"

5058 msgstr "mer än två blobbar angavs: \"%s\""

5059

4904 -#: builtin/diff.c:416

5060 +#: builtin/diff.c:417

5061 #, c-format

5062 msgid "unhandled object '%s' given."

5063 msgstr "ej hanterat objekt \"%s\" angavs."

5064

4909 -#: builtin/fast-export.c:23

5065 +#: builtin/fast-export.c:24

5066 msgid "git fast-export [rev-list-opts]"

5067 msgstr "git fast-export [rev-list-flaggor]"

5068

4913 -#: builtin/fast-export.c:702

5069 +#: builtin/fast-export.c:979

5070 msgid "show progress after <n> objects"

5071 msgstr "visa förlopp efter <n> objekt"

5072

4917 -#: builtin/fast-export.c:704

5073 +#: builtin/fast-export.c:981

5074 msgid "select handling of signed tags"

5075 msgstr "välj hantering av signerade taggar"

5076

4921 -#: builtin/fast-export.c:707

5077 +#: builtin/fast-export.c:984

5078 msgid "select handling of tags that tag filtered objects"

5079 msgstr "välj hantering av taggar som har taggfiltrerade objekt"

5080

4925 -#: builtin/fast-export.c:710

5081 +#: builtin/fast-export.c:987

5082 msgid "Dump marks to this file"

5083 msgstr "Dump märken till filen"

5084

4929 -#: builtin/fast-export.c:712

5085 +#: builtin/fast-export.c:989

5086 msgid "Import marks from this file"

5087 msgstr "Importera märken från filen"

5088

4933 -#: builtin/fast-export.c:714

5089 +#: builtin/fast-export.c:991

5090 msgid "Fake a tagger when tags lack one"

5091 msgstr "Fejka taggare när taggen saknar en"

5092

4937 -#: builtin/fast-export.c:716

5093 +#: builtin/fast-export.c:993

5094 msgid "Output full tree for each commit"

5095 msgstr "Skriv ut hela trädet för varje incheckning"

5096

4941 -#: builtin/fast-export.c:718

5097 +#: builtin/fast-export.c:995

5098 msgid "Use the done feature to terminate the stream"

5099 msgstr "Använd done-funktionen för att avsluta strömmen"

5100

4945 -#: builtin/fast-export.c:719

5101 +#: builtin/fast-export.c:996

5102 msgid "Skip output of blob data"

5103 msgstr "Hoppa över skrivning av blob-data"

5104

4949 -#: builtin/fast-export.c:720

5105 +#: builtin/fast-export.c:997

5106 msgid "refspec"

5107 msgstr "referensspecifikation"

5108

4953 -#: builtin/fast-export.c:721

5109 +#: builtin/fast-export.c:998

5110 msgid "Apply refspec to exported refs"

5111 msgstr "Applicera referensspecifikation på exporterade referenser"

5112

5113 +#: builtin/fast-export.c:999

5114 +msgid "anonymize output"

5115 +msgstr "anonymisera utdata"

5116 +

5117 #: builtin/fetch.c:20

5118 msgid "git fetch [<options>] [<repository> [<refspec>...]]"

5119 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"

@@ -5026,7 +5186,7 @@ msgstr "fördjupa historik för grund klon"

5186 msgid "convert to a complete repository"

5187 msgstr "konvertera till komplett arkiv"

5188

5029 -#: builtin/fetch.c:118 builtin/log.c:1205

5189 +#: builtin/fetch.c:118 builtin/log.c:1208

5190 msgid "dir"

5191 msgstr "kat"

5192

@@ -5054,77 +5214,77 @@ msgstr "ange referenskarta för \"fetch\""

5214 msgid "Couldn't find remote ref HEAD"

5215 msgstr "Kunde inte hitta fjärr-referensen HEAD"

5216

5057 -#: builtin/fetch.c:440

5217 +#: builtin/fetch.c:454

5218 #, c-format

5219 msgid "object %s not found"

5220 msgstr "objektet %s hittades inte"

5221

5062 -#: builtin/fetch.c:445

5222 +#: builtin/fetch.c:459

5223 msgid "[up to date]"

5224 msgstr "[àjour]"

5225

5066 -#: builtin/fetch.c:459

5226 +#: builtin/fetch.c:473

5227 #, c-format

5228 msgid "! %-*s %-*s -> %s (can't fetch in current branch)"

5229 msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"

5230

5071 -#: builtin/fetch.c:460 builtin/fetch.c:546

5231 +#: builtin/fetch.c:474 builtin/fetch.c:560

5232 msgid "[rejected]"

5233 msgstr "[refuserad]"

5234

5075 -#: builtin/fetch.c:471

5235 +#: builtin/fetch.c:485

5236 msgid "[tag update]"

5237 msgstr "[uppdaterad tagg]"

5238

5079 -#: builtin/fetch.c:473 builtin/fetch.c:508 builtin/fetch.c:526

5239 +#: builtin/fetch.c:487 builtin/fetch.c:522 builtin/fetch.c:540

5240 msgid " (unable to update local ref)"

5241 msgstr " (kunde inte uppdatera lokal ref)"

5242

5083 -#: builtin/fetch.c:491

5243 +#: builtin/fetch.c:505

5244 msgid "[new tag]"

5245 msgstr "[ny tagg]"

5246

5087 -#: builtin/fetch.c:494

5247 +#: builtin/fetch.c:508

5248 msgid "[new branch]"

5249 msgstr "[ny gren]"

5250

5091 -#: builtin/fetch.c:497

5251 +#: builtin/fetch.c:511

5252 msgid "[new ref]"

5253 msgstr "[ny ref]"

5254

5095 -#: builtin/fetch.c:542

5255 +#: builtin/fetch.c:556

5256 msgid "unable to update local ref"

5257 msgstr "kunde inte uppdatera lokal ref"

5258

5099 -#: builtin/fetch.c:542

5259 +#: builtin/fetch.c:556

5260 msgid "forced update"

5261 msgstr "tvingad uppdatering"

5262

5103 -#: builtin/fetch.c:548

5263 +#: builtin/fetch.c:562

5264 msgid "(non-fast-forward)"

5265 msgstr "(ej snabbspolad)"

5266

5107 -#: builtin/fetch.c:581 builtin/fetch.c:814

5267 +#: builtin/fetch.c:595 builtin/fetch.c:828

5268 #, c-format

5269 msgid "cannot open %s: %s\n"

5270 msgstr "kan inte öppna %s: %s\n"

5271

5112 -#: builtin/fetch.c:590

5272 +#: builtin/fetch.c:604

5273 #, c-format

5274 msgid "%s did not send all necessary objects\n"

5275 msgstr "%s sände inte alla nödvändiga objekt\n"

5276

5117 -#: builtin/fetch.c:608

5277 +#: builtin/fetch.c:622

5278 #, c-format

5279 msgid "reject %s because shallow roots are not allowed to be updated"

5280 msgstr "avvisa %s då grunda rötter inte kan uppdateras"

5281

5122 -#: builtin/fetch.c:696 builtin/fetch.c:779

5282 +#: builtin/fetch.c:710 builtin/fetch.c:793

5283 #, c-format

5284 msgid "From %.*s\n"

5285 msgstr "Från %.*s\n"

5286

5127 -#: builtin/fetch.c:707

5287 +#: builtin/fetch.c:721

5288 #, c-format

5289 msgid ""

5290 "some local refs could not be updated; try running\n"

@@ -5133,55 +5293,55 @@ msgstr ""

5293 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"

5294 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"

5295

5136 -#: builtin/fetch.c:759

5296 +#: builtin/fetch.c:773

5297 #, c-format

5298 msgid " (%s will become dangling)"

5299 msgstr " (%s kommer bli dinglande)"

5300

5141 -#: builtin/fetch.c:760

5301 +#: builtin/fetch.c:774

5302 #, c-format

5303 msgid " (%s has become dangling)"

5304 msgstr " (%s har blivit dinglande)"

5305

5146 -#: builtin/fetch.c:784

5306 +#: builtin/fetch.c:798

5307 msgid "[deleted]"

5308 msgstr "[borttagen]"

5309

5150 -#: builtin/fetch.c:785 builtin/remote.c:1059

5310 +#: builtin/fetch.c:799 builtin/remote.c:1063

5311 msgid "(none)"

5312 msgstr "(ingen)"

5313

5154 -#: builtin/fetch.c:804

5314 +#: builtin/fetch.c:818

5315 #, c-format

5316 msgid "Refusing to fetch into current branch %s of non-bare repository"

5317 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"

5318

5159 -#: builtin/fetch.c:823

5319 +#: builtin/fetch.c:837

5320 #, c-format

5321 msgid "Option \"%s\" value \"%s\" is not valid for %s"

5322 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"

5323

5164 -#: builtin/fetch.c:826

5324 +#: builtin/fetch.c:840

5325 #, c-format

5326 msgid "Option \"%s\" is ignored for %s\n"

5327 msgstr "Flaggan \"%s\" ignoreras för %s\n"

5328

5169 -#: builtin/fetch.c:882

5329 +#: builtin/fetch.c:896

5330 #, c-format

5331 msgid "Don't know how to fetch from %s"

5332 msgstr "Vet inte hur man hämtar från %s"

5333

5174 -#: builtin/fetch.c:1044

5334 +#: builtin/fetch.c:1058

5335 #, c-format

5336 msgid "Fetching %s\n"

5337 msgstr "Hämtar %s\n"

5338

5179 -#: builtin/fetch.c:1046 builtin/remote.c:90

5339 +#: builtin/fetch.c:1060 builtin/remote.c:90

5340 #, c-format

5341 msgid "Could not fetch %s"

5342 msgstr "Kunde inte hämta %s"

5343

5184 -#: builtin/fetch.c:1064

5344 +#: builtin/fetch.c:1078

5345 msgid ""

5346 "No remote repository specified. Please, specify either a URL or a\n"

5347 "remote name from which new revisions should be fetched."

@@ -5189,32 +5349,32 @@ msgstr ""

5349 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"

5350 "fjärrarkiv som nya incheckningar skall hämtas från."

5351

5192 -#: builtin/fetch.c:1087

5352 +#: builtin/fetch.c:1101

5353 msgid "You need to specify a tag name."

5354 msgstr "Du måste ange namnet på en tagg."

5355

5196 -#: builtin/fetch.c:1131

5356 +#: builtin/fetch.c:1143

5357 msgid "--depth and --unshallow cannot be used together"

5358 msgstr "--depth och --unshallow kan inte användas samtidigt"

5359

5200 -#: builtin/fetch.c:1133

5360 +#: builtin/fetch.c:1145

5361 msgid "--unshallow on a complete repository does not make sense"

5362 msgstr "--unshallow kan inte användas på ett komplett arkiv"

5363

5204 -#: builtin/fetch.c:1156

5364 +#: builtin/fetch.c:1168

5365 msgid "fetch --all does not take a repository argument"

5366 msgstr "fetch --all tar inte namnet på ett arkiv som argument"

5367

5208 -#: builtin/fetch.c:1158

5368 +#: builtin/fetch.c:1170

5369 msgid "fetch --all does not make sense with refspecs"

5370 msgstr "fetch --all kan inte anges med referensspecifikationer"

5371

5212 -#: builtin/fetch.c:1169

5372 +#: builtin/fetch.c:1181

5373 #, c-format

5374 msgid "No such remote or remote group: %s"

5375 msgstr "Fjärren eller fjärrgruppen finns inte: %s"

5376

5217 -#: builtin/fetch.c:1177

5377 +#: builtin/fetch.c:1189

5378 msgid "Fetching a group and specifying refspecs does not make sense"

5379 msgstr "Kan inte hämta från grupp och ange referensspecifikationer"

5380

@@ -5224,8 +5384,8 @@ msgstr ""

5384 "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]"

5385

5386 #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:698

5227 -#: builtin/merge.c:196 builtin/repack.c:179 builtin/repack.c:183

5228 -#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:589

5387 +#: builtin/merge.c:197 builtin/repack.c:179 builtin/repack.c:183

5388 +#: builtin/show-branch.c:654 builtin/show-ref.c:178 builtin/tag.c:590

5389 #: parse-options.h:132 parse-options.h:239

5390 msgid "n"

5391 msgstr "n"

@@ -5250,99 +5410,105 @@ msgstr "inled meddelande med <text>"

5410 msgid "file to read from"

5411 msgstr "fil att läsa från"

5412

5253 -#: builtin/for-each-ref.c:1051

5413 +#: builtin/for-each-ref.c:676

5414 +msgid "unable to parse format"

5415 +msgstr "kan inte tolka formatet"

5416 +

5417 +#: builtin/for-each-ref.c:1057

5418 msgid "git for-each-ref [options] [<pattern>]"

5419 msgstr "git for-each-ref [flaggor] [<mönster>]"

5420

5257 -#: builtin/for-each-ref.c:1066

5421 +#: builtin/for-each-ref.c:1072

5422 msgid "quote placeholders suitably for shells"

5423 msgstr "citera platshållare passande för skal"

5424

5261 -#: builtin/for-each-ref.c:1068

5425 +#: builtin/for-each-ref.c:1074

5426 msgid "quote placeholders suitably for perl"

5427 msgstr "citera platshållare passande för perl"

5428

5265 -#: builtin/for-each-ref.c:1070

5429 +#: builtin/for-each-ref.c:1076

5430 msgid "quote placeholders suitably for python"

5431 msgstr "citera platshållare passande för python"

5432

5269 -#: builtin/for-each-ref.c:1072

5433 +#: builtin/for-each-ref.c:1078

5434 msgid "quote placeholders suitably for tcl"

5435 msgstr "citera platshållare passande för tcl"

5436

5273 -#: builtin/for-each-ref.c:1075

5437 +#: builtin/for-each-ref.c:1081

5438 msgid "show only <n> matched refs"

5439 msgstr "visa endast <n> träffade refs"

5440

5277 -#: builtin/for-each-ref.c:1076 builtin/replace.c:435

5441 +#: builtin/for-each-ref.c:1082 builtin/replace.c:438

5442 msgid "format"

5443 msgstr "format"

5444

5281 -#: builtin/for-each-ref.c:1076

5445 +#: builtin/for-each-ref.c:1082

5446 msgid "format to use for the output"

5447 msgstr "format att använda för utdata"

5448

5285 -#: builtin/for-each-ref.c:1077

5449 +#: builtin/for-each-ref.c:1083

5450 msgid "key"

5451 msgstr "nyckel"

5452

5289 -#: builtin/for-each-ref.c:1078

5453 +#: builtin/for-each-ref.c:1084

5454 msgid "field name to sort on"

5455 msgstr "fältnamn att sortera på"

5456

5293 -#: builtin/fsck.c:147 builtin/prune.c:172

5457 +# Vague original, not networking-related, but rather related to the actual

5458 +# objects in the database.

5459 +#: builtin/fsck.c:147 builtin/prune.c:136

5460 msgid "Checking connectivity"

5461 msgstr "Kontrollerar konnektivitet"

5462

5297 -#: builtin/fsck.c:538

5463 +#: builtin/fsck.c:540

5464 msgid "Checking object directories"

5465 msgstr "Kontrollerar objektkataloger"

5466

5301 -#: builtin/fsck.c:601

5467 +#: builtin/fsck.c:603

5468 msgid "git fsck [options] [<object>...]"

5469 msgstr "git fsck [flaggor] [<objekt>...]"

5470

5305 -#: builtin/fsck.c:607

5471 +#: builtin/fsck.c:609

5472 msgid "show unreachable objects"

5473 msgstr "visa onåbara objekt"

5474

5309 -#: builtin/fsck.c:608

5475 +#: builtin/fsck.c:610

5476 msgid "show dangling objects"

5477 msgstr "visa dinglande objekt"

5478

5313 -#: builtin/fsck.c:609

5479 +#: builtin/fsck.c:611

5480 msgid "report tags"

5481 msgstr "rapportera taggar"

5482

5317 -#: builtin/fsck.c:610

5483 +#: builtin/fsck.c:612

5484 msgid "report root nodes"

5485 msgstr "rapportera rotnoder"

5486

5321 -#: builtin/fsck.c:611

5487 +#: builtin/fsck.c:613

5488 msgid "make index objects head nodes"

5489 msgstr "gör indexojekt till huvudnoder"

5490

5325 -#: builtin/fsck.c:612

5491 +#: builtin/fsck.c:614

5492 msgid "make reflogs head nodes (default)"

5493 msgstr "gör refloggar till huvudnoder (standard)"

5494

5329 -#: builtin/fsck.c:613

5495 +#: builtin/fsck.c:615

5496 msgid "also consider packs and alternate objects"

5497 msgstr "ta även hänsyn till paket och alternativa objekt"

5498

5333 -#: builtin/fsck.c:614

5499 +#: builtin/fsck.c:616

5500 msgid "enable more strict checking"

5501 msgstr "aktivera striktare kontroll"

5502

5337 -#: builtin/fsck.c:616

5503 +#: builtin/fsck.c:618

5504 msgid "write dangling objects in .git/lost-found"

5505 msgstr "skriv dinglande objekt i .git/lost-found"

5506

5341 -#: builtin/fsck.c:617 builtin/prune.c:144

5507 +#: builtin/fsck.c:619 builtin/prune.c:108

5508 msgid "show progress"

5509 msgstr "visa förlopp"

5510

5345 -#: builtin/fsck.c:667

5511 +#: builtin/fsck.c:669

5512 msgid "Checking objects"

5513 msgstr "Kontrollerar objekt"

5514

@@ -5350,48 +5516,48 @@ msgstr "Kontrollerar objekt"

5516 msgid "git gc [options]"

5517 msgstr "git gc [flaggor]"

5518

5353 -#: builtin/gc.c:91

5519 +#: builtin/gc.c:79

5520 #, c-format

5355 -msgid "Invalid %s: '%s'"

5356 -msgstr "Felaktigt %s: \"%s\""

5521 +msgid "Invalid gc.pruneexpire: '%s'"

5522 +msgstr "Ogiltig gc.pruneexpire: '%s'"

5523

5358 -#: builtin/gc.c:118

5524 +#: builtin/gc.c:107

5525 #, c-format

5526 msgid "insanely long object directory %.*s"

5527 msgstr "tokigt lång objektkatalog %.*s"

5528

5363 -#: builtin/gc.c:287

5529 +#: builtin/gc.c:276

5530 msgid "prune unreferenced objects"

5531 msgstr "rensa ej refererade objekt"

5532

5367 -#: builtin/gc.c:289

5533 +#: builtin/gc.c:278

5534 msgid "be more thorough (increased runtime)"

5535 msgstr "var mer grundlig (ökar körtiden)"

5536

5371 -#: builtin/gc.c:290

5537 +#: builtin/gc.c:279

5538 msgid "enable auto-gc mode"

5539 msgstr "aktivera auto-gc-läge"

5540

5375 -#: builtin/gc.c:291

5541 +#: builtin/gc.c:280

5542 msgid "force running gc even if there may be another gc running"

5543 msgstr "tvinga gc-körning även om en annan gc kanske körs"

5544

5379 -#: builtin/gc.c:332

5545 +#: builtin/gc.c:321

5546 #, c-format

5547 msgid "Auto packing the repository in background for optimum performance.\n"

5548 msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"

5549

5384 -#: builtin/gc.c:334

5550 +#: builtin/gc.c:323

5551 #, c-format

5552 msgid "Auto packing the repository for optimum performance.\n"

5553 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"

5554

5389 -#: builtin/gc.c:335

5555 +#: builtin/gc.c:324

5556 #, c-format

5557 msgid "See \"git help gc\" for manual housekeeping.\n"

5558 msgstr "Se \"git help gc\" för manuell hushållning.\n"

5559

5394 -#: builtin/gc.c:353

5560 +#: builtin/gc.c:342

5561 #, c-format

5562 msgid ""

5563 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"

@@ -5399,7 +5565,7 @@ msgstr ""

5565 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "

5566 "är fallet)"

5567

5402 -#: builtin/gc.c:375

5568 +#: builtin/gc.c:364

5569 msgid ""

5570 "There are too many unreachable loose objects; run 'git prune' to remove them."

5571 msgstr ""

@@ -5631,7 +5797,7 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

5797 msgid "both --cached and trees are given."

5798 msgstr "både --cached och träd angavs."

5799

5634 -#: builtin/hash-object.c:60

5800 +#: builtin/hash-object.c:82

5801 msgid ""

5802 "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] "

5803 "<file>..."

@@ -5639,31 +5805,37 @@ msgstr ""

5805 "git hash-object [-t <typ>] [-w] [--path=<fil>|--no-filters] [--stdin] [--] "

5806 "<fil>..."

5807

5642 -#: builtin/hash-object.c:61

5808 +#: builtin/hash-object.c:83

5809 msgid "git hash-object --stdin-paths < <list-of-paths>"

5810 msgstr "git hash-object --stdin-paths < <sökvägslista>"

5811

5646 -#: builtin/hash-object.c:72 builtin/tag.c:609

5812 +#: builtin/hash-object.c:94 builtin/tag.c:610

5813 msgid "type"

5814 msgstr "typ"

5815

5650 -#: builtin/hash-object.c:72

5816 +#: builtin/hash-object.c:94

5817 msgid "object type"

5818 msgstr "objekttyp"

5819

5654 -#: builtin/hash-object.c:73

5820 +#: builtin/hash-object.c:95

5821 msgid "write the object into the object database"

5822 msgstr "skriv objektet till objektdatabasen"

5823

5658 -#: builtin/hash-object.c:74

5824 +#: builtin/hash-object.c:97

5825 msgid "read the object from stdin"

5826 msgstr "läs objektet från standard in"

5827

5662 -#: builtin/hash-object.c:76

5828 +#: builtin/hash-object.c:99

5829 msgid "store file as is without filters"

5830 msgstr "spara filen som den är utan filer"

5831

5666 -#: builtin/hash-object.c:77

l10n: sv.po: Update Swedish translation (2296t0f0u)