a6cfc0e3d6 · matheusbsbs/matheus-bagliano

@@ -1,14 +1,14 @@

1 # Swedish translations for Git.

3 # This file is distributed under the same license as the Git package.

4 -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.

4 +# Peter Krefting <peter@softwolves.pp.se>, 2010-2020.

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2020-03-11 15:26+0800\n"

11 -"PO-Revision-Date: 2020-03-17 18:30+0100\n"

10 +"POT-Creation-Date: 2020-05-15 09:11+0800\n"

11 +"PO-Revision-Date: 2020-05-15 12:20+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"

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

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

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

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

19 -"X-Generator: Gtranslator 2.91.7\n"

19 +"X-Generator: Gtranslator 3.30.1\n"

20

21 #: add-interactive.c:368

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

26 -#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124

27 -#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687

28 -#: builtin/rebase.c:2086 builtin/rebase.c:2130

26 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142

27 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518

28 +#: builtin/rebase.c:1919

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

31

@@ -53,8 +53,7 @@ msgstr "Uppdatera"

53 msgid "could not stage '%s'"

54 msgstr "kunde inte köa \"%s\""

55

56 -#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317

57 -#: builtin/rebase.c:899

56 +#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3336

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

@@ -70,8 +69,8 @@ msgstr[1] "uppdaterade %d sökvägar\n"

69 msgid "note: %s is untracked now.\n"

70 msgstr "observera: %s spåras inte längre.\n"

71

73 -#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281

74 -#: builtin/reset.c:144

72 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294

73 +#: builtin/reset.c:145

74 #, c-format

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

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

@@ -194,11 +193,11 @@ msgstr "markera en numrerad post"

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

197 -#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851

196 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

201 -#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848

200 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848

201 msgid "What now"

202 msgstr "Vad nu"

203

@@ -210,12 +209,13 @@ msgstr "köad"

209 msgid "unstaged"

210 msgstr "ej köad"

211

213 -#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251

214 -#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144

215 -#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409

212 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250

213 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145

214 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409

215 #: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397

216 #: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905

218 -#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213

217 +#: builtin/submodule--helper.c:2148 bugreport.c:129

218 +#: git-add--interactive.perl:213

219 msgid "path"

220 msgstr "sökväg"

221

@@ -223,27 +223,27 @@ msgstr "sökväg"

223 msgid "could not refresh index"

224 msgstr "kunde inte uppdatera indexet"

225

226 -#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765

226 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Hej då.\n"

230

231 -#: add-patch.c:33 git-add--interactive.perl:1428

231 +#: add-patch.c:34 git-add--interactive.perl:1428

232 #, c-format, perl-format

233 msgid "Stage mode change [y,n,q,a,d%s,?]? "

234 msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "

235

236 -#: add-patch.c:34 git-add--interactive.perl:1429

236 +#: add-patch.c:35 git-add--interactive.perl:1429

237 #, c-format, perl-format

238 msgid "Stage deletion [y,n,q,a,d%s,?]? "

239 msgstr "Köa borttagning [y,n,q,a,d%s,?]? "

240

241 -#: add-patch.c:35 git-add--interactive.perl:1430

241 +#: add-patch.c:36 git-add--interactive.perl:1430

242 #, c-format, perl-format

243 msgid "Stage this hunk [y,n,q,a,d%s,?]? "

244 msgstr "Köa stycket [y,n,q,a,d%s,?]? "

245

246 -#: add-patch.c:37

246 +#: add-patch.c:38

247 msgid ""

248 "If the patch applies cleanly, the edited hunk will immediately be marked for "

249 "staging."

@@ -251,7 +251,7 @@ msgstr ""

251 "Om patchen kan appliceras rent kommer det redigerade stycket att köas "

252 "omedelbart."

253

254 -#: add-patch.c:40

254 +#: add-patch.c:41

255 msgid ""

256 "y - stage this hunk\n"

257 "n - do not stage this hunk\n"

@@ -265,22 +265,22 @@ msgstr ""

265 "a - köa stycket och alla följande i filen\n"

266 "d - köa inte stycket eller något av de följande i filen\n"

267

268 -#: add-patch.c:54 git-add--interactive.perl:1433

268 +#: add-patch.c:55 git-add--interactive.perl:1433

269 #, c-format, perl-format

270 msgid "Stash mode change [y,n,q,a,d%s,?]? "

271 msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "

272

273 -#: add-patch.c:55 git-add--interactive.perl:1434

273 +#: add-patch.c:56 git-add--interactive.perl:1434

274 #, c-format, perl-format

275 msgid "Stash deletion [y,n,q,a,d%s,?]? "

276 msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "

277

278 -#: add-patch.c:56 git-add--interactive.perl:1435

278 +#: add-patch.c:57 git-add--interactive.perl:1435

279 #, c-format, perl-format

280 msgid "Stash this hunk [y,n,q,a,d%s,?]? "

281 msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "

282

283 -#: add-patch.c:58

283 +#: add-patch.c:59

284 msgid ""

285 "If the patch applies cleanly, the edited hunk will immediately be marked for "

286 "stashing."

@@ -288,7 +288,7 @@ msgstr ""

288 "Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "

289 "i \"stash\" omedelbart."

290

291 -#: add-patch.c:61

291 +#: add-patch.c:62

292 msgid ""

293 "y - stash this hunk\n"

294 "n - do not stash this hunk\n"

@@ -302,22 +302,22 @@ msgstr ""

302 "a - \"stash\":a stycket och alla följande i filen\n"

303 "d - \"stash\":a inte stycket eller något av de följande i filen\n"

304

305 -#: add-patch.c:77 git-add--interactive.perl:1438

305 +#: add-patch.c:78 git-add--interactive.perl:1438

306 #, c-format, perl-format

307 msgid "Unstage mode change [y,n,q,a,d%s,?]? "

308 msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "

309

310 -#: add-patch.c:78 git-add--interactive.perl:1439

310 +#: add-patch.c:79 git-add--interactive.perl:1439

311 #, c-format, perl-format

312 msgid "Unstage deletion [y,n,q,a,d%s,?]? "

313 msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "

314

315 -#: add-patch.c:79 git-add--interactive.perl:1440

315 +#: add-patch.c:80 git-add--interactive.perl:1440

316 #, c-format, perl-format

317 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "

318 msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "

319

320 -#: add-patch.c:81

320 +#: add-patch.c:82

321 msgid ""

322 "If the patch applies cleanly, the edited hunk will immediately be marked for "

323 "unstaging."

@@ -325,7 +325,7 @@ msgstr ""

325 "Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "

326 "från kön omedelbart."

327

328 -#: add-patch.c:84

328 +#: add-patch.c:85

329 msgid ""

330 "y - unstage this hunk\n"

331 "n - do not unstage this hunk\n"

@@ -339,22 +339,22 @@ msgstr ""

339 "a - ta bort stycket och alla följande i filen från kön\n"

340 "d - ta inte bort stycket eller något av de följande i filen från kön\n"

341

342 -#: add-patch.c:99 git-add--interactive.perl:1443

342 +#: add-patch.c:100 git-add--interactive.perl:1443

343 #, c-format, perl-format

344 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "

345 msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "

346

347 -#: add-patch.c:100 git-add--interactive.perl:1444

347 +#: add-patch.c:101 git-add--interactive.perl:1444

348 #, c-format, perl-format

349 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "

350 msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "

351

352 -#: add-patch.c:101 git-add--interactive.perl:1445

352 +#: add-patch.c:102 git-add--interactive.perl:1445

353 #, c-format, perl-format

354 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "

355 msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "

356

357 -#: add-patch.c:103 add-patch.c:168 add-patch.c:211

357 +#: add-patch.c:104 add-patch.c:169 add-patch.c:212

358 msgid ""

359 "If the patch applies cleanly, the edited hunk will immediately be marked for "

360 "applying."

@@ -362,7 +362,7 @@ msgstr ""

362 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "

363 "för applicering omedelbart."

364

365 -#: add-patch.c:106

365 +#: add-patch.c:107

366 msgid ""

367 "y - apply this hunk to index\n"

368 "n - do not apply this hunk to index\n"

@@ -376,25 +376,25 @@ msgstr ""

376 "a - applicera stycket och alla följande i filen\n"

377 "d - applicera inte stycket eller något av de följande i filen\n"

378

379 -#: add-patch.c:121 git-add--interactive.perl:1448

379 +#: add-patch.c:122 git-add--interactive.perl:1448

380 #: git-add--interactive.perl:1463

381 #, c-format, perl-format

382 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "

383 msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "

384

385 -#: add-patch.c:122 git-add--interactive.perl:1449

385 +#: add-patch.c:123 git-add--interactive.perl:1449

386 #: git-add--interactive.perl:1464

387 #, c-format, perl-format

388 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "

389 msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "

390

391 -#: add-patch.c:123 git-add--interactive.perl:1450

391 +#: add-patch.c:124 git-add--interactive.perl:1450

392 #: git-add--interactive.perl:1465

393 #, c-format, perl-format

394 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "

395 msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "

396

397 -#: add-patch.c:125 add-patch.c:147 add-patch.c:190

397 +#: add-patch.c:126 add-patch.c:148 add-patch.c:191

398 msgid ""

399 "If the patch applies cleanly, the edited hunk will immediately be marked for "

400 "discarding."

@@ -402,7 +402,7 @@ msgstr ""

402 "Om patchen kan appliceras rent kommer det redigerade stycket att markeras "

403 "för kasta omedelbart."

404

405 -#: add-patch.c:128 add-patch.c:193

405 +#: add-patch.c:129 add-patch.c:194

406 msgid ""

407 "y - discard this hunk from worktree\n"

408 "n - do not discard this hunk from worktree\n"

@@ -416,22 +416,22 @@ msgstr ""

416 "a - förkasta stycket och alla följande i filen\n"

417 "d - förkasta inte stycket eller något av de följande i filen\n"

418

419 -#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453

419 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453

420 #, c-format, perl-format

421 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "

422 msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

423

424 -#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454

424 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454

425 #, c-format, perl-format

426 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "

427 msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

428

429 -#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455

429 +#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455

430 #, c-format, perl-format

431 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "

432 msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

433

434 -#: add-patch.c:150

434 +#: add-patch.c:151

435 msgid ""

436 "y - discard this hunk from index and worktree\n"

437 "n - do not discard this hunk from index and worktree\n"

@@ -445,22 +445,22 @@ msgstr ""

445 "a - förkasta stycket och alla följande i filen\n"

446 "d - förkasta inte stycket eller något av de följande i filen\n"

447

448 -#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458

448 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458

449 #, c-format, perl-format

450 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "

451 msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

452

453 -#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459

453 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459

454 #, c-format, perl-format

455 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "

456 msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

457

458 -#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460

458 +#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460

459 #, c-format, perl-format

460 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "

461 msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

462

463 -#: add-patch.c:171

463 +#: add-patch.c:172

464 msgid ""

465 "y - apply this hunk to index and worktree\n"

466 "n - do not apply this hunk to index and worktree\n"

@@ -474,7 +474,7 @@ msgstr ""

474 "a - applicera stycket och alla följande i filen\n"

475 "d - applicera inte stycket eller något av de följande i filen\n"

476

477 -#: add-patch.c:214

477 +#: add-patch.c:215

478 msgid ""

479 "y - apply this hunk to worktree\n"

480 "n - do not apply this hunk to worktree\n"

@@ -488,34 +488,34 @@ msgstr ""

488 "a - applicera stycket och alla följande i filen\n"

489 "d - applicera inte stycket eller något av de följande i filen\n"

490

491 -#: add-patch.c:318

491 +#: add-patch.c:319

492 #, c-format

493 msgid "could not parse hunk header '%.*s'"

494 msgstr "kunde inte tolka styckehuvudet \"%.*s\""

495

496 -#: add-patch.c:337 add-patch.c:341

496 +#: add-patch.c:338 add-patch.c:342

497 #, c-format

498 msgid "could not parse colored hunk header '%.*s'"

499 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""

500

501 -#: add-patch.c:395

501 +#: add-patch.c:396

502 msgid "could not parse diff"

503 msgstr "kunde inte tolka diff"

504

505 -#: add-patch.c:414

505 +#: add-patch.c:415

506 msgid "could not parse colored diff"

507 msgstr "kunde inte tolka färgad diff"

508

509 -#: add-patch.c:428

509 +#: add-patch.c:429

510 #, c-format

511 msgid "failed to run '%s'"

512 msgstr "misslyckades att köra \"%s\""

513

514 -#: add-patch.c:587

514 +#: add-patch.c:588

515 msgid "mismatched output from interactive.diffFilter"

516 msgstr "omaka utdata från interactive.diffFilter"

517

518 -#: add-patch.c:588

518 +#: add-patch.c:589

519 msgid ""

520 "Your filter must maintain a one-to-one correspondence\n"

521 "between its input and output lines."

@@ -523,7 +523,7 @@ msgstr ""

523 "Alla rader i indata måste ha en motsvarande rad i utdata från\n"

524 "ditt filter."

525

526 -#: add-patch.c:761

526 +#: add-patch.c:762

527 #, c-format

528 msgid ""

529 "expected context line #%d in\n"

@@ -532,7 +532,7 @@ msgstr ""

532 "förväntade sammanhangsrad %d i\n"

533 "%.*s"

534

535 -#: add-patch.c:776

535 +#: add-patch.c:777

536 #, c-format

537 msgid ""

538 "hunks do not overlap:\n"

@@ -545,11 +545,11 @@ msgstr ""

545 "\tavslutas inte med:\n"

546 "%.*s"

547

548 -#: add-patch.c:1052 git-add--interactive.perl:1112

548 +#: add-patch.c:1053 git-add--interactive.perl:1112

549 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"

550 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"

551

552 -#: add-patch.c:1056

552 +#: add-patch.c:1057

553 #, c-format

554 msgid ""

555 "---\n"

@@ -563,7 +563,7 @@ msgstr ""

563 "Rader som börjar med %c kommer att tas bort.\n"

564

565 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.

566 -#: add-patch.c:1070 git-add--interactive.perl:1126

566 +#: add-patch.c:1071 git-add--interactive.perl:1126

567 msgid ""

568 "If it does not apply cleanly, you will be given an opportunity to\n"

569 "edit again. If all lines of the hunk are removed, then the edit is\n"

@@ -573,11 +573,11 @@ msgstr ""

573 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"

574 "redigeringen och stycket lämnas oförändrat.\n"

575

576 -#: add-patch.c:1103

576 +#: add-patch.c:1104

577 msgid "could not parse hunk header"

578 msgstr "kunde inte tolka styckehuvud"

579

580 -#: add-patch.c:1148

580 +#: add-patch.c:1149

581 msgid "'git apply --cached' failed"

582 msgstr "\"git apply --cached\" misslyckades"

583

@@ -700,47 +700,56 @@ msgstr "Beklagar, kan inte redigera stycket"

700 msgid "'git apply' failed"

701 msgstr "\"git apply\" misslyckades"

702

703 -#: advice.c:115

703 +#: advice.c:140

704 +#, c-format

705 +msgid ""

706 +"\n"

707 +"Disable this message with \"git config advice.%s false\""

708 +msgstr ""

709 +"\n"

710 +"Slå av meddelandet med \"git config advice.%s false\""

711 +

712 +#: advice.c:156

713 #, c-format

714 msgid "%shint: %.*s%s\n"

715 msgstr "%stips: %.*s%s\n"

716

708 -#: advice.c:168

717 +#: advice.c:247

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

719 msgstr ""

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

721 "samman."

722

714 -#: advice.c:170

723 +#: advice.c:249

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

725 msgstr ""

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

727 "samman."

728

720 -#: advice.c:172

729 +#: advice.c:251

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

731 msgstr ""

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

733 "samman."

734

726 -#: advice.c:174

735 +#: advice.c:253

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

737 msgstr ""

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

739

731 -#: advice.c:176

740 +#: advice.c:255

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

742 msgstr ""

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

744 "samman."

745

737 -#: advice.c:178

746 +#: advice.c:257

747 #, c-format

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

749 msgstr ""

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

751

743 -#: advice.c:186

752 +#: advice.c:265

753 msgid ""

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

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

@@ -748,23 +757,23 @@ msgstr ""

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

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

759

751 -#: advice.c:194

760 +#: advice.c:273

761 msgid "Exiting because of an unresolved conflict."

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

763

755 -#: advice.c:199 builtin/merge.c:1335

764 +#: advice.c:278 builtin/merge.c:1353

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

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

767

759 -#: advice.c:201

768 +#: advice.c:280

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

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

771

763 -#: advice.c:202

772 +#: advice.c:281

773 msgid "Exiting because of unfinished merge."

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

775

767 -#: advice.c:208

776 +#: advice.c:287

777 #, c-format

778 msgid ""

779 "Note: switching to '%s'.\n"

@@ -1056,7 +1065,7 @@ msgstr "patch misslyckades: %s:%ld"

1065 msgid "cannot checkout %s"

1066 msgstr "kan inte checka ut %s"

1067

1059 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298

1068 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1069 #, c-format

1070 msgid "failed to read %s"

1071 msgstr "misslyckades läsa %s"

@@ -1253,7 +1262,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

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

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

1264

1256 -#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201

1265 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1266 #, c-format

1267 msgid "cannot open %s"

1268 msgstr "kan inte öppna %s"

@@ -1319,7 +1328,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

1328 msgid "apply changes matching the given path"

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

1330

1322 -#: apply.c:4973 builtin/am.c:2260

1331 +#: apply.c:4973 builtin/am.c:2259

1332 msgid "num"

1333 msgstr "antal"

1334

@@ -1375,7 +1384,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"

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

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

1386

1378 -#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524

1387 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525

1388 msgid "paths are separated with NUL character"

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

1390

@@ -1383,9 +1392,9 @@ msgstr "sökvägar avdelas med NUL-tecken"

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

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

1394

1386 -#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98

1395 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98

1396 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102

1388 -#: builtin/pack-objects.c:3457 builtin/rebase.c:1508

1397 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332

1398 msgid "action"

1399 msgstr "åtgärd"

1400

@@ -1414,8 +1423,8 @@ msgid "allow overlapping hunks"

1423 msgstr "tillåt överlappande stycken"

1424

1425 #: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22

1417 -#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774

1418 -#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128

1426 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:774

1427 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128

1428 msgid "be verbose"

1429 msgstr "var pratsam"

1430

@@ -1427,7 +1436,7 @@ msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

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

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

1438

1430 -#: apply.c:5032 builtin/am.c:2248

1439 +#: apply.c:5032 builtin/am.c:2247

1440 msgid "root"

1441 msgstr "rot"

1442

@@ -1435,6 +1444,55 @@ msgstr "rot"

1444 msgid "prepend <root> to all filenames"

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

1446

1447 +#: archive-tar.c:125 archive-zip.c:351

1448 +#, c-format

1449 +msgid "cannot stream blob %s"

1450 +msgstr "kan inte strömma blob:en %s"

1451 +

1452 +#: archive-tar.c:266 archive-zip.c:369

1453 +#, c-format

1454 +msgid "unsupported file mode: 0%o (SHA1: %s)"

1455 +msgstr "filens läge stöds ej: 0%o (SHA1: %s)"

1456 +

1457 +#: archive-tar.c:293 archive-zip.c:359

1458 +#, c-format

1459 +msgid "cannot read %s"

1460 +msgstr "kan inte läsa %s"

1461 +

1462 +#: archive-tar.c:465

1463 +#, c-format

1464 +msgid "unable to start '%s' filter"

1465 +msgstr "kunde inte starta filtret \"%s\""

1466 +

1467 +#: archive-tar.c:468

1468 +msgid "unable to redirect descriptor"

1469 +msgstr "kan inte omdirigera handtag"

1470 +

1471 +#: archive-tar.c:475

1472 +#, c-format

1473 +msgid "'%s' filter reported error"

1474 +msgstr "filtret \"%s\" rapporterade fel"

1475 +

1476 +#: archive-zip.c:319

1477 +#, c-format

1478 +msgid "path is not valid UTF-8: %s"

1479 +msgstr "sökvägen är inte giltig UTF-8: %s"

1480 +

1481 +#: archive-zip.c:323

1482 +#, c-format

1483 +msgid "path too long (%d chars, SHA1: %s): %s"

1484 +msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"

1485 +

1486 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235

1487 +#, c-format

1488 +msgid "deflate error (%d)"

1489 +msgstr "fel i deflate (%d)"

1490 +

1491 +#: archive-zip.c:615

1492 +#, c-format

1493 +msgid "timestamp too large for this system: %<PRIuMAX>"

1494 +msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"

1495 +

1496 #: archive.c:14

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

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

@@ -1454,172 +1512,123 @@ msgstr ""

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

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

1514

1457 -#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1515 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1516 #, c-format

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

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

1519

1462 -#: archive.c:396

1520 +#: archive.c:401

1521 #, c-format

1522 msgid "no such ref: %.*s"

1523 msgstr "ingen sådan referens: %.*s"

1524

1467 -#: archive.c:401

1525 +#: archive.c:407

1526 #, c-format

1527 msgid "not a valid object name: %s"

1528 msgstr "objektnamnet är inte giltigt: %s"

1529

1472 -#: archive.c:414

1530 +#: archive.c:420

1531 #, c-format

1532 msgid "not a tree object: %s"

1533 msgstr "inte ett trädobjekt: %s"

1534

1477 -#: archive.c:426

1535 +#: archive.c:432

1536 msgid "current working directory is untracked"

1537 msgstr "aktuell arbetskatalog är inte spårad"

1538

1481 -#: archive.c:457

1539 +#: archive.c:464

1540 msgid "fmt"

1541 msgstr "fmt"

1542

1485 -#: archive.c:457

1543 +#: archive.c:464

1544 msgid "archive format"

1545 msgstr "arkivformat"

1546

1489 -#: archive.c:458 builtin/log.c:1653

1547 +#: archive.c:465 builtin/log.c:1674

1548 msgid "prefix"

1549 msgstr "prefix"

1550

1493 -#: archive.c:459

1551 +#: archive.c:466

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

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

1554

1497 -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1555 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1556 #: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162

1499 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887

1500 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563

1557 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907

1558 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564

1559 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123

1560 #: parse-options.h:190

1561 msgid "file"

1562 msgstr "fil"

1563

1506 -#: archive.c:461 builtin/archive.c:90

1564 +#: archive.c:468 builtin/archive.c:90

1565 msgid "write the archive to this file"

1566 msgstr "skriv arkivet till filen"

1567

1510 -#: archive.c:463

1568 +#: archive.c:470

1569 msgid "read .gitattributes in working directory"

1570 msgstr "läs .gitattributes i arbetskatalogen"

1571

1514 -#: archive.c:464

1572 +#: archive.c:471

1573 msgid "report archived files on stderr"

1574 msgstr "rapportera arkiverade filer på standard fel"

1575

1518 -#: archive.c:465

1576 +#: archive.c:472

1577 msgid "store only"

1578 msgstr "endast spara"

1579

1522 -#: archive.c:466

1580 +#: archive.c:473

1581 msgid "compress faster"

1582 msgstr "komprimera snabbare"

1583

1526 -#: archive.c:474

1584 +#: archive.c:481

1585 msgid "compress better"

1586 msgstr "komprimera bättre"

1587

1530 -#: archive.c:477

1588 +#: archive.c:484

1589 msgid "list supported archive formats"

1590 msgstr "visa understödda arkivformat"

1591

1534 -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1592 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1593 #: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911

1594 msgid "repo"

1595 msgstr "arkiv"

1596

1539 -#: archive.c:480 builtin/archive.c:92

1597 +#: archive.c:487 builtin/archive.c:92

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

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

1600

1543 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

1601 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1602 #: builtin/notes.c:498

1603 msgid "command"

1604 msgstr "kommando"

1605

1548 -#: archive.c:482 builtin/archive.c:94

1606 +#: archive.c:489 builtin/archive.c:94

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

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

1609

1552 -#: archive.c:489

1610 +#: archive.c:496

1611 msgid "Unexpected option --remote"

1612 msgstr "Oväntad flagga --remote"

1613

1556 -#: archive.c:491

1614 +#: archive.c:498

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

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

1617

1560 -#: archive.c:493

1618 +#: archive.c:500

1619 msgid "Unexpected option --output"

1620 msgstr "Oväntad flagga --output"

1621

1564 -#: archive.c:515

1622 +#: archive.c:522

1623 #, c-format

1624 msgid "Unknown archive format '%s'"

1625 msgstr "Okänt arkivformat \"%s\""

1626

1569 -#: archive.c:522

1627 +#: archive.c:529

1628 #, c-format

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

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

1631

1574 -#: archive-tar.c:125 archive-zip.c:351

1575 -#, c-format

1576 -msgid "cannot stream blob %s"

1577 -msgstr "kan inte strömma blob:en %s"

1578 -

1579 -#: archive-tar.c:266 archive-zip.c:369

1580 -#, c-format

1581 -msgid "unsupported file mode: 0%o (SHA1: %s)"

1582 -msgstr "filens läge stöds ej: 0%o (SHA1: %s)"

1583 -

1584 -#: archive-tar.c:293 archive-zip.c:359

1585 -#, c-format

1586 -msgid "cannot read %s"

1587 -msgstr "kan inte läsa %s"

1588 -

1589 -#: archive-tar.c:465

1590 -#, c-format

1591 -msgid "unable to start '%s' filter"

1592 -msgstr "kunde inte starta filtret \"%s\""

1593 -

1594 -#: archive-tar.c:468

1595 -msgid "unable to redirect descriptor"

1596 -msgstr "kan inte omdirigera handtag"

1597 -

1598 -#: archive-tar.c:475

1599 -#, c-format

1600 -msgid "'%s' filter reported error"

1601 -msgstr "filtret \"%s\" rapporterade fel"

1602 -

1603 -#: archive-zip.c:319

1604 -#, c-format

1605 -msgid "path is not valid UTF-8: %s"

1606 -msgstr "sökvägen är inte giltig UTF-8: %s"

1607 -

1608 -#: archive-zip.c:323

1609 -#, c-format

1610 -msgid "path too long (%d chars, SHA1: %s): %s"

1611 -msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"

1612 -

1613 -#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234

1614 -#, c-format

1615 -msgid "deflate error (%d)"

1616 -msgstr "fel i deflate (%d)"

1617 -

1618 -#: archive-zip.c:615

1619 -#, c-format

1620 -msgid "timestamp too large for this system: %<PRIuMAX>"

1621 -msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"

1622 -

1632 #: attr.c:212

1633 #, c-format

1634 msgid "%.*s is not a valid attribute name"

@@ -1713,12 +1722,12 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n"

1722 msgid "a %s revision is needed"

1723 msgstr "en %s-revision behövs"

1724

1716 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254

1725 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1726 #, c-format

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

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

1729

1721 -#: bisect.c:966 builtin/merge.c:149

1730 +#: bisect.c:966 builtin/merge.c:151

1731 #, c-format

1732 msgid "could not read file '%s'"

1733 msgstr "kunde inte läsa filen \"%s\""

@@ -1758,41 +1767,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

1769

1761 -#: blame.c:2700

1770 +#: blame.c:2777

1771 msgid "--contents and --reverse do not blend well."

1772 msgstr "--contents och --reverse fungerar inte så bra tillsammans."

1773

1765 -#: blame.c:2714

1774 +#: blame.c:2791

1775 msgid "cannot use --contents with final commit object name"

1776 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"

1777

1769 -#: blame.c:2735

1778 +#: blame.c:2812

1779 msgid "--reverse and --first-parent together require specified latest commit"

1780 msgstr ""

1781 "--reverse och --first-parent tillsammans kräver att du anger senaste "

1782 "incheckningen"

1783

1775 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006

1776 -#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388

1777 -#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215

1778 -#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290

1784 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1785 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1786 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1787 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291

1788 #: builtin/shortlog.c:192

1789 msgid "revision walk setup failed"

1790 msgstr "misslyckades skapa revisionstraversering"

1791

1783 -#: blame.c:2762

1792 +#: blame.c:2839

1793 msgid ""

1794 "--reverse --first-parent together require range along first-parent chain"

1795 msgstr ""

1796 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"

1797 "kedjan"

1798

1790 -#: blame.c:2773

1799 +#: blame.c:2850

1800 #, c-format

1801 msgid "no such path %s in %s"

1802 msgstr "sökvägen %s i %s finns inte"

1803

1795 -#: blame.c:2784

1804 +#: blame.c:2861

1805 #, c-format

1806 msgid "cannot read blob %s for path %s"

1807 msgstr "kan inte läsa objektet %s för sökvägen %s"

@@ -1930,12 +1939,12 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."

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

1940 msgstr "Avgreningspunkten är inte giltig: \"%s\"."

1941

1933 -#: branch.c:364

1942 +#: branch.c:365

1943 #, c-format

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

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

1946

1938 -#: branch.c:387

1947 +#: branch.c:388

1948 #, c-format

1949 msgid "HEAD of working tree %s is not updated"

1950 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

@@ -1950,8 +1959,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1961

1953 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016

1954 -#: builtin/commit.c:815

1962 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

1963 +#: builtin/commit.c:814

1964 #, c-format

1965 msgid "could not open '%s'"

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

@@ -2003,7 +2012,7 @@ msgstr "rev-list dog"

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

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

2014

2006 -#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306

2015 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2016 #, c-format

2017 msgid "unrecognized argument: %s"

2018 msgstr "okänt argument: %s"

@@ -2026,305 +2035,258 @@ msgstr "index-pack dog"

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

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

2037

2029 -#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403

2030 -#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457

2031 -#, c-format

2032 -msgid "could not parse %s"

2033 -msgstr "kunde inte tolka %s"

2034 -

2035 -#: commit.c:53

2036 -#, c-format

2037 -msgid "%s %s is not a commit!"

2038 -msgstr "%s %s är inte en incheckning!"

2039 -

2040 -#: commit.c:193

2041 -msgid ""

2042 -"Support for <GIT_DIR>/info/grafts is deprecated\n"

2043 -"and will be removed in a future Git version.\n"

2044 -"\n"

2045 -"Please use \"git replace --convert-graft-file\"\n"

2046 -"to convert the grafts into replace refs.\n"

2047 -"\n"

2048 -"Turn this message off by running\n"

2049 -"\"git config advice.graftFileDeprecated false\""

2050 -msgstr ""

2051 -"Stöd för <GIT_DIR>/info/grafts avråds från och\n"

2052 -"kommer tas bort i en framtida version av Git.\n"

2053 -"\n"

2054 -"Använd \"git replace --convert-graft-file\"\n"

2055 -"för att omvandla grafts till ersättningsreferenser.\n"

2056 -"\n"

2057 -"Slå av detta meddelande genom att skriva\n"

2058 -"\"git config advice.graftFileDeprecated false\""

2059 -

2060 -#: commit.c:1153

2061 -#, c-format

2062 -msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2063 -msgstr ""

2064 -"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

2065 -

2066 -#: commit.c:1157

2067 -#, c-format

2068 -msgid "Commit %s has a bad GPG signature allegedly by %s."

2069 -msgstr ""

2070 -"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

2071 -

2072 -#: commit.c:1160

2073 -#, c-format

2074 -msgid "Commit %s does not have a GPG signature."

2075 -msgstr "Incheckning %s har inte någon GPG-signatur."

2076 -

2077 -#: commit.c:1163

2078 -#, c-format

2079 -msgid "Commit %s has a good GPG signature by %s\n"

2080 -msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

2081 -

2082 -#: commit.c:1417

2083 -msgid ""

2084 -"Warning: commit message did not conform to UTF-8.\n"

2085 -"You may want to amend it after fixing the message, or set the config\n"

2086 -"variable i18n.commitencoding to the encoding your project uses.\n"

2087 -msgstr ""

2088 -"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"

2089 -"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"

2090 -"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"

2091 -

2092 -#: commit-graph.c:122

2038 +#: commit-graph.c:183

2039 msgid "commit-graph file is too small"

2040 msgstr "incheckningsgraffilen %s är för liten"

2041

2096 -#: commit-graph.c:189

2042 +#: commit-graph.c:248

2043 #, c-format

2044 msgid "commit-graph signature %X does not match signature %X"

2045 msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"

2046

2101 -#: commit-graph.c:196

2047 +#: commit-graph.c:255

2048 #, c-format

2049 msgid "commit-graph version %X does not match version %X"

2050 msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"

2051

2106 -#: commit-graph.c:203

2052 +#: commit-graph.c:262

2053 #, c-format

2054 msgid "commit-graph hash version %X does not match version %X"

2055 msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"

2056

2111 -#: commit-graph.c:226

2057 +#: commit-graph.c:284

2058 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"

2059 msgstr ""

2060 "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "

2061 "ofullständig"

2062

2117 -#: commit-graph.c:237

2063 +#: commit-graph.c:294

2064 #, c-format

2065 msgid "commit-graph improper chunk offset %08x%08x"

2066 msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"

2067

2122 -#: commit-graph.c:280

2068 +#: commit-graph.c:362

2069 #, c-format

2070 msgid "commit-graph chunk id %08x appears multiple times"

2071 msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"

2072

2127 -#: commit-graph.c:343

2073 +#: commit-graph.c:436

2074 msgid "commit-graph has no base graphs chunk"

2075 msgstr "incheckningsgrafen har inga bas-graf-stycken"

2076

2131 -#: commit-graph.c:353

2077 +#: commit-graph.c:446

2078 msgid "commit-graph chain does not match"

2079 msgstr "incheckningsgrafens kedja stämmer inte"

2080

2135 -#: commit-graph.c:401

2081 +#: commit-graph.c:494

2082 #, c-format

2083 msgid "invalid commit-graph chain: line '%s' not a hash"

2084 msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"

2085

2140 -#: commit-graph.c:425

2086 +#: commit-graph.c:518

2087 msgid "unable to find all commit-graph files"

2088 msgstr "kan inte hitta alla incheckingsgraffiler"

2089

2144 -#: commit-graph.c:558 commit-graph.c:618

2090 +#: commit-graph.c:651 commit-graph.c:711

2091 msgid "invalid commit position. commit-graph is likely corrupt"

2092 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

2093

2148 -#: commit-graph.c:579

2094 +#: commit-graph.c:672

2095 #, c-format

2096 msgid "could not find commit %s"

2097 msgstr "kunde inte hitta incheckningen %s"

2098

2153 -#: commit-graph.c:852 builtin/am.c:1292

2099 +#: commit-graph.c:948 builtin/am.c:1292

2100 #, c-format

2101 msgid "unable to parse commit %s"

2102 msgstr "kunde inte tolka incheckningen %s"

2103

2158 -#: commit-graph.c:1011 builtin/pack-objects.c:2782

2104 +#: commit-graph.c:1096

2105 +msgid "Writing changed paths Bloom filters index"

2106 +msgstr "Skriver Bloom-filterindex för ändrade sökvägar"

2107 +

2108 +#: commit-graph.c:1121

2109 +msgid "Writing changed paths Bloom filters data"

2110 +msgstr "Skriver Bloom-filterdata för ändrade sökvägar"

2111 +

2112 +#: commit-graph.c:1160 builtin/pack-objects.c:2783

2113 #, c-format

2114 msgid "unable to get type of object %s"

2115 msgstr "kunde inte hämta typ för objektet %s"

2116

2163 -#: commit-graph.c:1043

2117 +#: commit-graph.c:1196

2118 msgid "Loading known commits in commit graph"

2119 msgstr "Läser in kända incheckningar i incheckningsgraf"

2120

2167 -#: commit-graph.c:1060

2121 +#: commit-graph.c:1213

2122 msgid "Expanding reachable commits in commit graph"

2123 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

2124

2171 -#: commit-graph.c:1079

2125 +#: commit-graph.c:1233

2126 msgid "Clearing commit marks in commit graph"

2127 msgstr "Rensar incheckningsmärken i incheckningsgraf"

2128

2175 -#: commit-graph.c:1098

2129 +#: commit-graph.c:1252

2130 msgid "Computing commit graph generation numbers"

2131 msgstr "Beräknar generationsvärden för incheckningsgraf"

2132

2179 -#: commit-graph.c:1173

2133 +#: commit-graph.c:1300

2134 +msgid "Computing commit changed paths Bloom filters"

2135 +msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"

2136 +

2137 +#: commit-graph.c:1359

2138 #, c-format

2139 msgid "Finding commits for commit graph in %d pack"

2140 msgid_plural "Finding commits for commit graph in %d packs"

2141 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"

2142 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"

2143

2186 -#: commit-graph.c:1186

2144 +#: commit-graph.c:1372

2145 #, c-format

2146 msgid "error adding pack %s"

2147 msgstr "fel vid tillägg av paketet %s"

2148

2191 -#: commit-graph.c:1190

2149 +#: commit-graph.c:1376

2150 #, c-format

2151 msgid "error opening index for %s"

2152 msgstr "fel vid öppning av indexet för %s"

2153

2196 -#: commit-graph.c:1214

2154 +#: commit-graph.c:1405

2155 #, c-format

2156 msgid "Finding commits for commit graph from %d ref"

2157 msgid_plural "Finding commits for commit graph from %d refs"

2158 msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"

2159 msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"

2160

2203 -#: commit-graph.c:1234

2161 +#: commit-graph.c:1426

2162 #, c-format

2163 msgid "invalid commit object id: %s"

2164 msgstr "ogiltigt inchecknings-objekt-id %s"

2165

2208 -#: commit-graph.c:1249

2166 +#: commit-graph.c:1442

2167 msgid "Finding commits for commit graph among packed objects"

2168 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"

2169

2212 -#: commit-graph.c:1264

2170 +#: commit-graph.c:1457

2171 msgid "Counting distinct commits in commit graph"

2172 msgstr "Räknar olika incheckningar i incheckningsgraf"

2173

2216 -#: commit-graph.c:1294

2174 +#: commit-graph.c:1489

2175 msgid "Finding extra edges in commit graph"

2176 msgstr "Söker ytterligare kanter i incheckingsgraf"

2177

2220 -#: commit-graph.c:1340

2178 +#: commit-graph.c:1538

2179 msgid "failed to write correct number of base graph ids"

2180 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"

2181

2224 -#: commit-graph.c:1373 midx.c:814

2182 +#: commit-graph.c:1572 midx.c:812

2183 #, c-format

2184 msgid "unable to create leading directories of %s"

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

2186

2229 -#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248

2187 +#: commit-graph.c:1585

2188 +msgid "unable to create temporary graph layer"

2189 +msgstr "kan inte skapa temporärt graflager"

2190 +

2191 +#: commit-graph.c:1590

2192 #, c-format

2231 -msgid "unable to create '%s'"

2232 -msgstr "kunde inte skapa \"%s\""

2193 +msgid "unable to adjust shared permissions for '%s'"

2194 +msgstr "kan inte justera delade behörigheter för \"%s\""

2195

2234 -#: commit-graph.c:1445

2196 +#: commit-graph.c:1667

2197 #, c-format

2198 msgid "Writing out commit graph in %d pass"

2199 msgid_plural "Writing out commit graph in %d passes"

2200 msgstr[0] "Skriver ut incheckningsgraf i %d pass"

2201 msgstr[1] "Skriver ut incheckningsgraf i %d pass"

2202

2241 -#: commit-graph.c:1486

2203 +#: commit-graph.c:1712

2204 msgid "unable to open commit-graph chain file"

2205 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

2206

2245 -#: commit-graph.c:1498

2207 +#: commit-graph.c:1728

2208 msgid "failed to rename base commit-graph file"

2209 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"

2210

2249 -#: commit-graph.c:1518

2211 +#: commit-graph.c:1748

2212 msgid "failed to rename temporary commit-graph file"

2213 msgstr "kunde inte byta namn på temporär incheckningsgraffil"

2214

2253 -#: commit-graph.c:1631

2215 +#: commit-graph.c:1874

2216 msgid "Scanning merged commits"

2217 msgstr "Söker sammanslagna incheckningar"

2218

2257 -#: commit-graph.c:1642

2219 +#: commit-graph.c:1885

2220 #, c-format

2221 msgid "unexpected duplicate commit id %s"

2222 msgstr "oväntat duplicerat inchecknings-id %s"

2223

2262 -#: commit-graph.c:1665

2224 +#: commit-graph.c:1908

2225 msgid "Merging commit-graph"

2226 msgstr "Slår ihop incheckningsgraf"

2227

2266 -#: commit-graph.c:1844

2228 +#: commit-graph.c:2096

2229 #, c-format

2230 msgid "the commit graph format cannot write %d commits"

2231 msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"

2232

2271 -#: commit-graph.c:1855

2233 +#: commit-graph.c:2107

2234 msgid "too many commits to write graph"

2235 msgstr "för många incheckningar för att skriva graf"

2236

2275 -#: commit-graph.c:1944

2237 +#: commit-graph.c:2200

2238 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2239 msgstr ""

2240 "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"

2241

2280 -#: commit-graph.c:1954

2242 +#: commit-graph.c:2210

2243 #, c-format

2244 msgid "commit-graph has incorrect OID order: %s then %s"

2245 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"

2246

2285 -#: commit-graph.c:1964 commit-graph.c:1979

2247 +#: commit-graph.c:2220 commit-graph.c:2235

2248 #, c-format

2249 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2250 msgstr ""

2251 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"

2252

2291 -#: commit-graph.c:1971

2253 +#: commit-graph.c:2227

2254 #, c-format

2255 msgid "failed to parse commit %s from commit-graph"

2256 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"

2257

2296 -#: commit-graph.c:1989

2258 +#: commit-graph.c:2245

2259 msgid "Verifying commits in commit graph"

2260 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2261

2300 -#: commit-graph.c:2003

2262 +#: commit-graph.c:2259

2263 #, c-format

2264 msgid "failed to parse commit %s from object database for commit-graph"

2265 msgstr ""

2266 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"

2267

2306 -#: commit-graph.c:2010

2268 +#: commit-graph.c:2266

2269 #, c-format

2270 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2271 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"

2272

2311 -#: commit-graph.c:2020

2273 +#: commit-graph.c:2276

2274 #, c-format

2275 msgid "commit-graph parent list for commit %s is too long"

2276 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"

2277

2316 -#: commit-graph.c:2029

2278 +#: commit-graph.c:2285

2279 #, c-format

2280 msgid "commit-graph parent for %s is %s != %s"

2281 msgstr "incheckningsgrafens förälder för %s är %s != %s"

2282

2321 -#: commit-graph.c:2042

2283 +#: commit-graph.c:2298

2284 #, c-format

2285 msgid "commit-graph parent list for commit %s terminates early"

2286 msgstr ""

2287 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"

2288

2327 -#: commit-graph.c:2047

2289 +#: commit-graph.c:2303

2290 #, c-format

2291 msgid ""

2292 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

@@ -2332,7 +2294,7 @@ msgstr ""

2294 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"

2295 "noll på annan plats"

2296

2335 -#: commit-graph.c:2051

2297 +#: commit-graph.c:2307

2298 #, c-format

2299 msgid ""

2300 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

@@ -2340,23 +2302,86 @@ msgstr ""

2302 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "

2303 "%s, men noll på annan plats"

2304

2343 -#: commit-graph.c:2066

2305 +#: commit-graph.c:2322

2306 #, c-format

2307 msgid "commit-graph generation for commit %s is %u != %u"

2308 msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"

2309

2348 -#: commit-graph.c:2072

2310 +#: commit-graph.c:2328

2311 #, c-format

2312 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2313 msgstr ""

2314 "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"

2315 "= %<PRIuMAX>"

2316

2317 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2318 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2319 +#, c-format

2320 +msgid "could not parse %s"

2321 +msgstr "kunde inte tolka %s"

2322 +

2323 +#: commit.c:54

2324 +#, c-format

2325 +msgid "%s %s is not a commit!"

2326 +msgstr "%s %s är inte en incheckning!"

2327 +

2328 +#: commit.c:194

2329 +msgid ""

2330 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

2331 +"and will be removed in a future Git version.\n"

2332 +"\n"

2333 +"Please use \"git replace --convert-graft-file\"\n"

2334 +"to convert the grafts into replace refs.\n"

2335 +"\n"

2336 +"Turn this message off by running\n"

2337 +"\"git config advice.graftFileDeprecated false\""

2338 +msgstr ""

2339 +"Stöd för <GIT_DIR>/info/grafts avråds från och\n"

2340 +"kommer tas bort i en framtida version av Git.\n"

2341 +"\n"

2342 +"Använd \"git replace --convert-graft-file\"\n"

2343 +"för att omvandla grafts till ersättningsreferenser.\n"

2344 +"\n"

2345 +"Slå av detta meddelande genom att skriva\n"

2346 +"\"git config advice.graftFileDeprecated false\""

2347 +

2348 +#: commit.c:1168

2349 +#, c-format

2350 +msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2351 +msgstr ""

2352 +"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

2353 +

2354 +#: commit.c:1172

2355 +#, c-format

2356 +msgid "Commit %s has a bad GPG signature allegedly by %s."

2357 +msgstr ""

2358 +"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

2359 +

2360 +#: commit.c:1175

2361 +#, c-format

2362 +msgid "Commit %s does not have a GPG signature."

2363 +msgstr "Incheckning %s har inte någon GPG-signatur."

2364 +

2365 +#: commit.c:1178

2366 +#, c-format

2367 +msgid "Commit %s has a good GPG signature by %s\n"

2368 +msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

2369 +

2370 +#: commit.c:1432

2371 +msgid ""

2372 +"Warning: commit message did not conform to UTF-8.\n"

2373 +"You may want to amend it after fixing the message, or set the config\n"

2374 +"variable i18n.commitencoding to the encoding your project uses.\n"

2375 +msgstr ""

2376 +"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"

2377 +"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"

2378 +"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"

2379 +

2380 #: compat/obstack.c:406 compat/obstack.c:408

2381 msgid "memory exhausted"

2382 msgstr "minnet slut"

2383

2359 -#: config.c:124

2384 +#: config.c:125

2385 #, c-format

2386 msgid ""

2387 "exceeded maximum include depth (%d) while including\n"

@@ -2371,296 +2396,296 @@ msgstr ""

2396 "\t%s\n"

2397 "Det kan bero på cirkulära inkluderingar."

2398

2374 -#: config.c:140

2399 +#: config.c:141

2400 #, c-format

2401 msgid "could not expand include path '%s'"

2402 msgstr "kunde inte expandera inkluderingssökväg \"%s\""

2403

2379 -#: config.c:151

2404 +#: config.c:152

2405 msgid "relative config includes must come from files"

2406 msgstr "relativa konfigureringsinkluderingar måste komma från filer"

2407

2383 -#: config.c:197

2408 +#: config.c:198

2409 msgid "relative config include conditionals must come from files"

2410 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"

2411

2387 -#: config.c:376

2412 +#: config.c:378

2413 #, c-format

2414 msgid "key does not contain a section: %s"

2415 msgstr "nyckeln innehåller inte ett stycke: %s"

2416

2392 -#: config.c:382

2417 +#: config.c:384

2418 #, c-format

2419 msgid "key does not contain variable name: %s"

2420 msgstr "nyckeln innehåller inte variabelnamn: %s"

2421

2397 -#: config.c:406 sequencer.c:2444

2422 +#: config.c:408 sequencer.c:2456

2423 #, c-format

2424 msgid "invalid key: %s"

2425 msgstr "felaktig nyckel: %s"

2426

2402 -#: config.c:412

2427 +#: config.c:414

2428 #, c-format

2429 msgid "invalid key (newline): %s"

2430 msgstr "ogiltig nyckel (nyradstecken): %s"

2431

2407 -#: config.c:448 config.c:460

2432 +#: config.c:450 config.c:462

2433 #, c-format

2434 msgid "bogus config parameter: %s"

2435 msgstr "falsk konfigureringsparameter: %s"

2436

2412 -#: config.c:495

2437 +#: config.c:497

2438 #, c-format

2439 msgid "bogus format in %s"

2440 msgstr "felaktigt format i %s"

2441

2417 -#: config.c:821

2442 +#: config.c:836

2443 #, c-format

2444 msgid "bad config line %d in blob %s"

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

2446

2422 -#: config.c:825

2447 +#: config.c:840

2448 #, c-format

2449 msgid "bad config line %d in file %s"

2450 msgstr "felaktig konfigurationsfil rad %d i filen %s"

2451

2427 -#: config.c:829

2452 +#: config.c:844

2453 #, c-format

2454 msgid "bad config line %d in standard input"

2455 msgstr "felaktig konfigurationsfil rad %d i standard in"

2456

2432 -#: config.c:833

2457 +#: config.c:848

2458 #, c-format

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

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

2461

2437 -#: config.c:837

2462 +#: config.c:852

2463 #, c-format

2464 msgid "bad config line %d in command line %s"

2465 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

2466

2442 -#: config.c:841

2467 +#: config.c:856

2468 #, c-format

2469 msgid "bad config line %d in %s"

2470 msgstr "felaktig konfigurationsfil rad %d i %s"

2471

2447 -#: config.c:978

2472 +#: config.c:993

2473 msgid "out of range"

2474 msgstr "utanför intervallet"

2475

2451 -#: config.c:978

2476 +#: config.c:993

2477 msgid "invalid unit"

2478 msgstr "ogiltig enhet"

2479

2455 -#: config.c:979

2480 +#: config.c:994

2481 #, c-format

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

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

2484

2460 -#: config.c:998

2485 +#: config.c:1013

2486 #, c-format

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

2488 msgstr ""

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

2490

2466 -#: config.c:1001

2491 +#: config.c:1016

2492 #, c-format

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

2494 msgstr ""

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

2496

2472 -#: config.c:1004

2497 +#: config.c:1019

2498 #, c-format

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

2500 msgstr ""

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

2502

2478 -#: config.c:1007

2503 +#: config.c:1022

2504 #, c-format

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

2506 msgstr ""

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

2508 "en %s: %s"

2509

2485 -#: config.c:1010

2510 +#: config.c:1025

2511 #, c-format

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

2513 msgstr ""

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

2515 "%s: %s"

2516

2492 -#: config.c:1013

2517 +#: config.c:1028

2518 #, c-format

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

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

2521

2497 -#: config.c:1108

2522 +#: config.c:1123

2523 #, c-format

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

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

2526

2502 -#: config.c:1117

2527 +#: config.c:1132

2528 #, c-format

2529 msgid "'%s' for '%s' is not a valid timestamp"

2530 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

2531

2507 -#: config.c:1208

2532 +#: config.c:1223

2533 #, c-format

2534 msgid "abbrev length out of range: %d"

2535 msgstr "förkortningslängd utanför intervallet: %d"

2536

2512 -#: config.c:1222 config.c:1233

2537 +#: config.c:1237 config.c:1248

2538 #, c-format

2539 msgid "bad zlib compression level %d"

2540 msgstr "felaktigt zlib-komprimeringsgrad %d"

2541

2517 -#: config.c:1325

2542 +#: config.c:1340

2543 msgid "core.commentChar should only be one character"

2544 msgstr "core.commentChar kan bara vara ett tecken"

2545

2521 -#: config.c:1358

2546 +#: config.c:1373

2547 #, c-format

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

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

2550

2526 -#: config.c:1430

2551 +#: config.c:1445

2552 #, c-format

2553 msgid "malformed value for %s"

2554 msgstr "felformat värde för %s"

2555

2531 -#: config.c:1456

2556 +#: config.c:1471

2557 #, c-format

2558 msgid "malformed value for %s: %s"

2559 msgstr "felformat värde för %s: %s"

2560

2536 -#: config.c:1457

2561 +#: config.c:1472

2562 msgid "must be one of nothing, matching, simple, upstream or current"

2563 msgstr "måste vara en av nothing, matching, simple, upstream eller current"

2564

2540 -#: config.c:1518 builtin/pack-objects.c:3541

2565 +#: config.c:1533 builtin/pack-objects.c:3542

2566 #, c-format

2567 msgid "bad pack compression level %d"

2568 msgstr "felaktig paketkomprimeringsgrad %d"

2569

2545 -#: config.c:1639

2570 +#: config.c:1655

2571 #, c-format

2572 msgid "unable to load config blob object '%s'"

2573 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""

2574

2550 -#: config.c:1642

2575 +#: config.c:1658

2576 #, c-format

2577 msgid "reference '%s' does not point to a blob"

2578 msgstr "referensen \"%s\" pekar inte på en blob"

2579

2555 -#: config.c:1659

2580 +#: config.c:1675

2581 #, c-format

2582 msgid "unable to resolve config blob '%s'"

2583 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""

2584

2560 -#: config.c:1689

2585 +#: config.c:1705

2586 #, c-format

2587 msgid "failed to parse %s"

2588 msgstr "kunde inte tolka %s"

2589

2565 -#: config.c:1743

2590 +#: config.c:1759

2591 msgid "unable to parse command-line config"

2592 msgstr "kan inte tolka kommandoradskonfiguration"

2593

2569 -#: config.c:2097

2594 +#: config.c:2113

2595 msgid "unknown error occurred while reading the configuration files"

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

2597

2573 -#: config.c:2267

2598 +#: config.c:2283

2599 #, c-format

2600 msgid "Invalid %s: '%s'"

2601 msgstr "Felaktigt %s: \"%s\""

2602

2578 -#: config.c:2312

2603 +#: config.c:2328

2604 #, c-format

2605 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"

2606 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"

2607

2583 -#: config.c:2358

2608 +#: config.c:2374

2609 #, c-format

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

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

2612

2588 -#: config.c:2360

2613 +#: config.c:2376

2614 #, c-format

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

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

2617

2593 -#: config.c:2441

2618 +#: config.c:2457

2619 #, c-format

2620 msgid "invalid section name '%s'"

2621 msgstr "felaktigt sektionsnamn \"%s\""

2622

2598 -#: config.c:2473

2623 +#: config.c:2489

2624 #, c-format

2625 msgid "%s has multiple values"

2626 msgstr "%s har flera värden"

2627

2603 -#: config.c:2502

2628 +#: config.c:2518

2629 #, c-format

2630 msgid "failed to write new configuration file %s"

2631 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""

2632

2608 -#: config.c:2754 config.c:3078

2633 +#: config.c:2770 config.c:3094

2634 #, c-format

2635 msgid "could not lock config file %s"

2636 msgstr "kunde inte låsa konfigurationsfilen %s"

2637

2613 -#: config.c:2765

2638 +#: config.c:2781

2639 #, c-format

2640 msgid "opening %s"

2641 msgstr "öppnar %s"

2642

2618 -#: config.c:2800 builtin/config.c:344

2643 +#: config.c:2816 builtin/config.c:344

2644 #, c-format

2645 msgid "invalid pattern: %s"

2646 msgstr "ogiltigt mönster: %s"

2647

2623 -#: config.c:2825

2648 +#: config.c:2841

2649 #, c-format

2650 msgid "invalid config file %s"

2651 msgstr "ogiltig konfigurationsfil: \"%s\""

2652

2628 -#: config.c:2838 config.c:3091

2653 +#: config.c:2854 config.c:3107

2654 #, c-format

2655 msgid "fstat on %s failed"

2656 msgstr "fstat misslyckades på %s"

2657

2633 -#: config.c:2849

2658 +#: config.c:2865

2659 #, c-format

2660 msgid "unable to mmap '%s'"

2661 msgstr "kunde inte utföra mmap på \"%s\""

2662

2638 -#: config.c:2858 config.c:3096

2663 +#: config.c:2874 config.c:3112

2664 #, c-format

2665 msgid "chmod on %s failed"

2666 msgstr "chmod misslyckades på %s"

2667

2643 -#: config.c:2943 config.c:3193

2668 +#: config.c:2959 config.c:3209

2669 #, c-format

2670 msgid "could not write config file %s"

2671 msgstr "kunde inte skriva konfigurationsfilen %s"

2672

2648 -#: config.c:2977

2673 +#: config.c:2993

2674 #, c-format

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

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

2677

2653 -#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2678 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2679 #, c-format

2680 msgid "could not unset '%s'"

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

2682

2658 -#: config.c:3069

2683 +#: config.c:3085

2684 #, c-format

2685 msgid "invalid section name: %s"

2686 msgstr "felaktigt namn på stycke: %s"

2687

2663 -#: config.c:3236

2688 +#: config.c:3252

2689 #, c-format

2690 msgid "missing value for '%s'"

2691 msgstr "värde saknas för \"%s\""

@@ -2729,7 +2754,7 @@ msgstr "ogiltigt svar på ls-refs: %s"

2754

2755 #: connect.c:445

2756 msgid "expected flush after ref listing"

2732 -msgstr "oväntad \"flush\" efter ref-listan"

2757 +msgstr "förväntade \"flush\" efter ref-listan"

2758

2759 #: connect.c:544

2760 #, c-format

@@ -2826,19 +2851,19 @@ msgstr "kunde inte grena (fork)"

2851

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

2853 # objects in the database.

2829 -#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43

2854 +#: connected.c:107 builtin/fsck.c:208 builtin/prune.c:45

2855 msgid "Checking connectivity"

2856 msgstr "Kontrollerar konnektivitet"

2857

2833 -#: connected.c:110

2858 +#: connected.c:119

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

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

2861

2837 -#: connected.c:130

2862 +#: connected.c:139

2863 msgid "failed write to rev-list"

2864 msgstr "kunde inte skriva till rev-list"

2865

2841 -#: connected.c:137

2866 +#: connected.c:146

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

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

2869

@@ -2939,15 +2964,15 @@ msgstr "läsning från externt filter \"%s\" misslyckades"

2964 msgid "external filter '%s' failed"

2965 msgstr "externt filter \"%s\" misslyckades"

2966

2942 -#: convert.c:839

2967 +#: convert.c:840

2968 msgid "unexpected filter type"

2969 msgstr "oväntad filtertyp"

2970

2946 -#: convert.c:850

2971 +#: convert.c:851

2972 msgid "path name too long for external filter"

2973 msgstr "sökvägen för lång för externt filter"

2974

2950 -#: convert.c:924

2975 +#: convert.c:943

2976 #, c-format

2977 msgid ""

2978 "external filter '%s' is not available anymore although not all paths have "

@@ -2956,20 +2981,48 @@ msgstr ""

2981 "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "

2982 "inte har filtrerats"

2983

2959 -#: convert.c:1223

2984 +#: convert.c:1243

2985 msgid "true/false are no valid working-tree-encodings"

2986 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"

2987

2963 -#: convert.c:1411 convert.c:1445

2988 +#: convert.c:1431 convert.c:1465

2989 #, c-format

2990 msgid "%s: clean filter '%s' failed"

2991 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"

2992

2968 -#: convert.c:1489

2993 +#: convert.c:1511

2994 #, c-format

2995 msgid "%s: smudge filter %s failed"

2996 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"

2997

2998 +#: credential.c:96

2999 +#, c-format

3000 +msgid "skipping credential lookup for key: credential.%s"

3001 +msgstr "hoppar över uppslag av inloggningsuppgifter för nyckel: credential.%s"

3002 +

3003 +#: credential.c:112

3004 +msgid "refusing to work with credential missing host field"

3005 +msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"

3006 +

3007 +#: credential.c:114

3008 +msgid "refusing to work with credential missing protocol field"

3009 +msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"

3010 +

3011 +#: credential.c:396

3012 +#, c-format

3013 +msgid "url contains a newline in its %s component: %s"

3014 +msgstr "url innehåller radbrytning i komponenten %s: %s"

3015 +

3016 +#: credential.c:440

3017 +#, c-format

3018 +msgid "url has no scheme: %s"

3019 +msgstr "url saknar protokoll: %s"

3020 +

3021 +#: credential.c:513

3022 +#, c-format

3023 +msgid "credential url cannot be parsed: %s"

3024 +msgstr "kan inte tolka url för inloggingsuppgifter: %s"

3025 +

3026 #: date.c:138

3027 msgid "in the future"

3028 msgstr "i framtiden"

@@ -3062,15 +3115,6 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"

3115 msgid "Marked %d islands, done.\n"

3116 msgstr "Markerade %d öar, klar.\n"

3117

3065 -#: diffcore-order.c:24

3066 -#, c-format

3067 -msgid "failed to read orderfile '%s'"

3068 -msgstr "kunde inte läsa orderfilen \"%s\""

3069 -

3070 -#: diffcore-rename.c:543

3071 -msgid "Performing inexact rename detection"

3072 -msgstr "Utför onöjaktig namnbytesdetektering"

3073 -

3118 #: diff-no-index.c:238

3119 msgid "git diff --no-index [<options>] <path> <path>"

3120 msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"

@@ -3133,35 +3177,35 @@ msgstr ""

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

3178 "%s"

3179

3136 -#: diff.c:4202

3180 +#: diff.c:4238

3181 #, c-format

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

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

3184

3141 -#: diff.c:4547

3185 +#: diff.c:4583

3186 msgid "--name-only, --name-status, --check and -s are mutually exclusive"

3187 msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"

3188

3145 -#: diff.c:4550

3189 +#: diff.c:4586

3190 msgid "-G, -S and --find-object are mutually exclusive"

3191 msgstr "-G, -S och --find-object är ömsesidigt uteslutande"

3192

3149 -#: diff.c:4628

3193 +#: diff.c:4664

3194 msgid "--follow requires exactly one pathspec"

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

3196

3153 -#: diff.c:4676

3197 +#: diff.c:4712

3198 #, c-format

3199 msgid "invalid --stat value: %s"

3200 msgstr "ogiltigt värde för --stat: %s"

3201

3158 -#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209

3202 +#: diff.c:4717 diff.c:4722 diff.c:4727 diff.c:4732 diff.c:5245

3203 #: parse-options.c:197 parse-options.c:201

3204 #, c-format

3205 msgid "%s expects a numerical value"

3206 msgstr "%s förväntar ett numeriskt värde"

3207

3164 -#: diff.c:4713

3208 +#: diff.c:4749

3209 #, c-format

3210 msgid ""

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

@@ -3170,42 +3214,42 @@ msgstr ""

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

3215 "%s"

3216

3173 -#: diff.c:4798

3217 +#: diff.c:4834

3218 #, c-format

3219 msgid "unknown change class '%c' in --diff-filter=%s"

3220 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"

3221

3178 -#: diff.c:4822

3222 +#: diff.c:4858

3223 #, c-format

3224 msgid "unknown value after ws-error-highlight=%.*s"

3225 msgstr "okänt värde efter ws-error-highlight=%.*s"

3226

3183 -#: diff.c:4836

3227 +#: diff.c:4872

3228 #, c-format

3229 msgid "unable to resolve '%s'"

3230 msgstr "kunde inte slå upp \"%s\""

3231

3188 -#: diff.c:4886 diff.c:4892

3232 +#: diff.c:4922 diff.c:4928

3233 #, c-format

3234 msgid "%s expects <n>/<m> form"

3235 msgstr "%s förväntar formen <n>/<m>"

3236

3193 -#: diff.c:4904

3237 +#: diff.c:4940

3238 #, c-format

3239 msgid "%s expects a character, got '%s'"

3240 msgstr "%s förväntar ett tecken, fick \"%s\""

3241

3198 -#: diff.c:4925

3242 +#: diff.c:4961

3243 #, c-format

3244 msgid "bad --color-moved argument: %s"

3245 msgstr "felaktigt argument till --color-moved: %s"

3246

3203 -#: diff.c:4944

3247 +#: diff.c:4980

3248 #, c-format

3249 msgid "invalid mode '%s' in --color-moved-ws"

3250 msgstr "ogiltigt läge %s\" i --color-moved-ws"

3251

3208 -#: diff.c:4984

3252 +#: diff.c:5020

3253 msgid ""

3254 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3255 "\"histogram\""

@@ -3213,149 +3257,149 @@ msgstr ""

3257 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "

3258 "\"histogram\""

3259

3216 -#: diff.c:5020 diff.c:5040

3260 +#: diff.c:5056 diff.c:5076

3261 #, c-format

3262 msgid "invalid argument to %s"

3263 msgstr "ogiltigt argument för %s"

3264

3221 -#: diff.c:5178

3265 +#: diff.c:5214

3266 #, c-format

3267 msgid "failed to parse --submodule option parameter: '%s'"

3268 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""

3269

3226 -#: diff.c:5234

3270 +#: diff.c:5270

3271 #, c-format

3272 msgid "bad --word-diff argument: %s"

3273 msgstr "felaktigt argument --word-diff: %s"

3274

3231 -#: diff.c:5257

3275 +#: diff.c:5293

3276 msgid "Diff output format options"

3277 msgstr "Formatflaggor för diff-utdata"

3278

3235 -#: diff.c:5259 diff.c:5265

3279 +#: diff.c:5295 diff.c:5301

3280 msgid "generate patch"

3281 msgstr "skapar patch"

3282

3239 -#: diff.c:5262 builtin/log.c:173

3283 +#: diff.c:5298 builtin/log.c:177

3284 msgid "suppress diff output"

3285 msgstr "undertryck diff-utdata"

3286

3243 -#: diff.c:5267 diff.c:5381 diff.c:5388

3287 +#: diff.c:5303 diff.c:5417 diff.c:5424

3288 msgid "<n>"

3289 msgstr "<n>"

3290

3247 -#: diff.c:5268 diff.c:5271

3291 +#: diff.c:5304 diff.c:5307

3292 msgid "generate diffs with <n> lines context"

3293 msgstr "skapa diffar med <n> rader sammanhang"

3294

3251 -#: diff.c:5273

3295 +#: diff.c:5309

3296 msgid "generate the diff in raw format"

3297 msgstr "generera diff i råformat"

3298

3255 -#: diff.c:5276

3299 +#: diff.c:5312

3300 msgid "synonym for '-p --raw'"

3301 msgstr "synonym till \"-p --raw\""

3302

3259 -#: diff.c:5280

3303 +#: diff.c:5316

3304 msgid "synonym for '-p --stat'"

3305 msgstr "synonym till \"-p --stat\""

3306

3263 -#: diff.c:5284

3307 +#: diff.c:5320

3308 msgid "machine friendly --stat"

3309 msgstr "maskinläsbar --stat"

3310

3267 -#: diff.c:5287

3311 +#: diff.c:5323

3312 msgid "output only the last line of --stat"

3313 msgstr "skriv bara ut den sista raden för --stat"

3314

3271 -#: diff.c:5289 diff.c:5297

3315 +#: diff.c:5325 diff.c:5333

3316 msgid "<param1,param2>..."

3317 msgstr "<param1,param2>..."

3318

3275 -#: diff.c:5290

3319 +#: diff.c:5326

3320 msgid ""

3321 "output the distribution of relative amount of changes for each sub-directory"

3322 msgstr ""

3323 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3324

3281 -#: diff.c:5294

3325 +#: diff.c:5330

3326 msgid "synonym for --dirstat=cumulative"

3327 msgstr "synonym för --dirstat=cumulative"

3328

3285 -#: diff.c:5298

3329 +#: diff.c:5334

3330 msgid "synonym for --dirstat=files,param1,param2..."

3331 msgstr "synonym för --dirstat=filer,param1,param2..."

3332

3289 -#: diff.c:5302

3333 +#: diff.c:5338

3334 msgid "warn if changes introduce conflict markers or whitespace errors"

3335 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3336

3293 -#: diff.c:5305

3337 +#: diff.c:5341

3338 msgid "condensed summary such as creations, renames and mode changes"

3339 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3340

3297 -#: diff.c:5308

3341 +#: diff.c:5344

3342 msgid "show only names of changed files"

3343 msgstr "visa endast namnen på ändrade filer"

3344

3301 -#: diff.c:5311

3345 +#: diff.c:5347

3346 msgid "show only names and status of changed files"

3347 msgstr "visa endast namn och status för ändrade filer"

3348

3305 -#: diff.c:5313

3349 +#: diff.c:5349

3350 msgid "<width>[,<name-width>[,<count>]]"

3351 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3352

3309 -#: diff.c:5314

3353 +#: diff.c:5350

3354 msgid "generate diffstat"

3355 msgstr "skapa diffstat"

3356

3313 -#: diff.c:5316 diff.c:5319 diff.c:5322

3357 +#: diff.c:5352 diff.c:5355 diff.c:5358

3358 msgid "<width>"

3359 msgstr "<bredd>"

3360

3317 -#: diff.c:5317

3361 +#: diff.c:5353

3362 msgid "generate diffstat with a given width"

3363 msgstr "generera en diffstat med given bredd"

3364

3321 -#: diff.c:5320

3365 +#: diff.c:5356

3366 msgid "generate diffstat with a given name width"

3367 msgstr "generera en diffstat med given namnbredd"

3368

3325 -#: diff.c:5323

3369 +#: diff.c:5359

3370 msgid "generate diffstat with a given graph width"

3371 msgstr "generera en diffstat med given grafbredd"

3372

3329 -#: diff.c:5325

3373 +#: diff.c:5361

3374 msgid "<count>"

3375 msgstr "<antal>"

3376

3333 -#: diff.c:5326

3377 +#: diff.c:5362

3378 msgid "generate diffstat with limited lines"

3379 msgstr "generera diffstat med begränsade rader"

3380

3337 -#: diff.c:5329

3381 +#: diff.c:5365

3382 msgid "generate compact summary in diffstat"

3383 msgstr "skapa kompakt översikt i diffstat"

3384

3341 -#: diff.c:5332

3385 +#: diff.c:5368

3386 msgid "output a binary diff that can be applied"

3387 msgstr "skapa en binärdiff som kan appliceras"

3388

3345 -#: diff.c:5335

3389 +#: diff.c:5371

3390 msgid "show full pre- and post-image object names on the \"index\" lines"

3391 msgstr ""

3392 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3393

3350 -#: diff.c:5337

3394 +#: diff.c:5373

3395 msgid "show colored diff"

3396 msgstr "visa färgad diff"

3397

3354 -#: diff.c:5338

3398 +#: diff.c:5374

3399 msgid "<kind>"

3400 msgstr "<typ>"

3401

3358 -#: diff.c:5339

3402 +#: diff.c:5375

3403 msgid ""

3404 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3405 "diff"

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

3407 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3408 "\"new\" (nya) rader i diffen"

3409

3366 -#: diff.c:5342

3410 +#: diff.c:5378

3411 msgid ""

3412 "do not munge pathnames and use NULs as output field terminators in --raw or "

3413 "--numstat"

@@ -3371,87 +3415,87 @@ msgstr ""

3415 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3416 "eller --numstat"

3417

3374 -#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457

3418 +#: diff.c:5381 diff.c:5384 diff.c:5387 diff.c:5493

3419 msgid "<prefix>"

3420 msgstr "<prefix>"

3421

3378 -#: diff.c:5346

3422 +#: diff.c:5382

3423 msgid "show the given source prefix instead of \"a/\""

3424 msgstr "visa givet källprefix istället för \"a/\""

3425

3382 -#: diff.c:5349

3426 +#: diff.c:5385

3427 msgid "show the given destination prefix instead of \"b/\""

3428 msgstr "visa givet målprefix istället för \"b/\""

3429

3386 -#: diff.c:5352

3430 +#: diff.c:5388

3431 msgid "prepend an additional prefix to every line of output"

3432 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3433

3390 -#: diff.c:5355

3434 +#: diff.c:5391

3435 msgid "do not show any source or destination prefix"

3436 msgstr "visa inte käll- eller målprefix"

3437

3394 -#: diff.c:5358

3438 +#: diff.c:5394

3439 msgid "show context between diff hunks up to the specified number of lines"

3440 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3441

3398 -#: diff.c:5362 diff.c:5367 diff.c:5372

3442 +#: diff.c:5398 diff.c:5403 diff.c:5408

3443 msgid "<char>"

3444 msgstr "<tecken>"

3445

3402 -#: diff.c:5363

3446 +#: diff.c:5399

3447 msgid "specify the character to indicate a new line instead of '+'"

3448 msgstr "ange tecken för att ange ny rad istället för \"+\""

3449

3406 -#: diff.c:5368

3450 +#: diff.c:5404

3451 msgid "specify the character to indicate an old line instead of '-'"

3452 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3453

3410 -#: diff.c:5373

3454 +#: diff.c:5409

3455 msgid "specify the character to indicate a context instead of ' '"

3456 msgstr "ange tecken för att ange sammanhang istället för \" \""

3457

3414 -#: diff.c:5376

3458 +#: diff.c:5412

3459 msgid "Diff rename options"

3460 msgstr "Diff-namnbytesflaggor"

3461

3418 -#: diff.c:5377

3462 +#: diff.c:5413

3463 msgid "<n>[/<m>]"

3464 msgstr "<n>[/<m>]"

3465

3422 -#: diff.c:5378

3466 +#: diff.c:5414

3467 msgid "break complete rewrite changes into pairs of delete and create"

3468 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3469

3426 -#: diff.c:5382

3470 +#: diff.c:5418

3471 msgid "detect renames"

3472 msgstr "detektera namnändringar"

3473

3430 -#: diff.c:5386

3474 +#: diff.c:5422

3475 msgid "omit the preimage for deletes"

3476 msgstr "ta bort för-version för borttagningar"

3477

3434 -#: diff.c:5389

3478 +#: diff.c:5425

3479 msgid "detect copies"

3480 msgstr "detektera kopior"

3481

3438 -#: diff.c:5393

3482 +#: diff.c:5429

3483 msgid "use unmodified files as source to find copies"

3484 msgstr "använd oförändrade som källa för att hitta kopior"

3485

3442 -#: diff.c:5395

3486 +#: diff.c:5431

3487 msgid "disable rename detection"

3488 msgstr "inaktivera detektering av namnbyten"

3489

3446 -#: diff.c:5398

3490 +#: diff.c:5434

3491 msgid "use empty blobs as rename source"

3492 msgstr "använd tomma blob:ar som namnändringskälla"

3493

3450 -#: diff.c:5400

3494 +#: diff.c:5436

3495 msgid "continue listing the history of a file beyond renames"

3496 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3497

3454 -#: diff.c:5403

3498 +#: diff.c:5439

3499 msgid ""

3500 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3501 "given limit"

@@ -3459,159 +3503,159 @@ msgstr ""

3503 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3504 "given gräns"

3505

3462 -#: diff.c:5405

3506 +#: diff.c:5441

3507 msgid "Diff algorithm options"

3508 msgstr "Alternativ för diff-algoritm"

3509

3466 -#: diff.c:5407

3510 +#: diff.c:5443

3511 msgid "produce the smallest possible diff"

3512 msgstr "skapa minsta möjliga diff"

3513

3470 -#: diff.c:5410

3514 +#: diff.c:5446

3515 msgid "ignore whitespace when comparing lines"

3516 msgstr "ignorera blanktecken vid radjämförelse"

3517

3474 -#: diff.c:5413

3518 +#: diff.c:5449

3519 msgid "ignore changes in amount of whitespace"

3520 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3521

3478 -#: diff.c:5416

3522 +#: diff.c:5452

3523 msgid "ignore changes in whitespace at EOL"

3524 msgstr "ignorera blanktecken vid radslut"

3525

3482 -#: diff.c:5419

3526 +#: diff.c:5455

3527 msgid "ignore carrier-return at the end of line"

3528 msgstr "ignorera CR-tecken vid radslut"

3529

3486 -#: diff.c:5422

3530 +#: diff.c:5458

3531 msgid "ignore changes whose lines are all blank"

3532 msgstr "ignorera ändringar i rader som är helt blanka"

3533

3490 -#: diff.c:5425

3534 +#: diff.c:5461

3535 msgid "heuristic to shift diff hunk boundaries for easy reading"

3536 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3537

3494 -#: diff.c:5428

3538 +#: diff.c:5464

3539 msgid "generate diff using the \"patience diff\" algorithm"

3540 msgstr "skapa diffar med algoritmen \"patience diff\""

3541

3498 -#: diff.c:5432

3542 +#: diff.c:5468

3543 msgid "generate diff using the \"histogram diff\" algorithm"

3544 msgstr "skapa diffar med algoritmen \"histogram diff\""

3545

3502 -#: diff.c:5434

3546 +#: diff.c:5470

3547 msgid "<algorithm>"

3548 msgstr "<algoritm>"

3549

3506 -#: diff.c:5435

3550 +#: diff.c:5471

3551 msgid "choose a diff algorithm"

3552 msgstr "välj en diff-algoritm"

3553

3510 -#: diff.c:5437

3554 +#: diff.c:5473

3555 msgid "<text>"

3556 msgstr "<text>"

3557

3514 -#: diff.c:5438

3558 +#: diff.c:5474

3559 msgid "generate diff using the \"anchored diff\" algorithm"

3560 msgstr "skapa diffar med algoritmen \"anchored diff\""

3561

3518 -#: diff.c:5440 diff.c:5449 diff.c:5452

3562 +#: diff.c:5476 diff.c:5485 diff.c:5488

3563 msgid "<mode>"

3564 msgstr "<läge>"

3565

3522 -#: diff.c:5441

3566 +#: diff.c:5477

3567 msgid "show word diff, using <mode> to delimit changed words"

3568 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3569

3526 -#: diff.c:5443 diff.c:5446 diff.c:5491

3570 +#: diff.c:5479 diff.c:5482 diff.c:5527

3571 msgid "<regex>"

3572 msgstr "<reguttr>"

3573

3530 -#: diff.c:5444

3574 +#: diff.c:5480

3575 msgid "use <regex> to decide what a word is"

3576 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3577

3534 -#: diff.c:5447

3578 +#: diff.c:5483

3579 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3580 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3581

3538 -#: diff.c:5450

3582 +#: diff.c:5486

3583 msgid "moved lines of code are colored differently"

3584 msgstr "flyttade kodrader färgas på annat sätt"

3585

3542 -#: diff.c:5453

3586 +#: diff.c:5489

3587 msgid "how white spaces are ignored in --color-moved"

3588 msgstr "hur blanktecken ignoreras i --color-moved"

3589

3546 -#: diff.c:5456

3590 +#: diff.c:5492

3591 msgid "Other diff options"

3592 msgstr "Andra diff-flaggor"

3593

3550 -#: diff.c:5458

3594 +#: diff.c:5494

3595 msgid "when run from subdir, exclude changes outside and show relative paths"

3596 msgstr ""

3597 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3598 "sökvägar"

3599

3556 -#: diff.c:5462

3600 +#: diff.c:5498

3601 msgid "treat all files as text"

3602 msgstr "hantera alla filer som text"

3603

3560 -#: diff.c:5464

3604 +#: diff.c:5500

3605 msgid "swap two inputs, reverse the diff"

3606 msgstr "växla två indatafiler, vänd diffen"

3607

3564 -#: diff.c:5466

3608 +#: diff.c:5502

3609 msgid "exit with 1 if there were differences, 0 otherwise"

3610 msgstr "avsluta med 1 vid ändringar, annars 0"

3611

3568 -#: diff.c:5468

3612 +#: diff.c:5504

3613 msgid "disable all output of the program"

3614 msgstr "slå av alla utdata från programmet"

3615

3572 -#: diff.c:5470

3616 +#: diff.c:5506

3617 msgid "allow an external diff helper to be executed"

3618 msgstr "tillåt köra en extern diff-hjälpare"

3619

3576 -#: diff.c:5472

3620 +#: diff.c:5508

3621 msgid "run external text conversion filters when comparing binary files"

3622 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3623

3580 -#: diff.c:5474

3624 +#: diff.c:5510

3625 msgid "<when>"

3626 msgstr "<när>"

3627

3584 -#: diff.c:5475

3628 +#: diff.c:5511

3629 msgid "ignore changes to submodules in the diff generation"

3630 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3631

3588 -#: diff.c:5478

3632 +#: diff.c:5514

3633 msgid "<format>"

3634 msgstr "<format>"

3635

3592 -#: diff.c:5479

3636 +#: diff.c:5515

3637 msgid "specify how differences in submodules are shown"

3638 msgstr "ange hur ändringar i undermoduler visas"

3639

3596 -#: diff.c:5483

3640 +#: diff.c:5519

3641 msgid "hide 'git add -N' entries from the index"

3642 msgstr "dölj \"git add -N\"-poster från indexet"

3643

3600 -#: diff.c:5486

3644 +#: diff.c:5522

3645 msgid "treat 'git add -N' entries as real in the index"

3646 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3647

3604 -#: diff.c:5488

3648 +#: diff.c:5524

3649 msgid "<string>"

3650 msgstr "<sträng>"

3651

3608 -#: diff.c:5489

3652 +#: diff.c:5525

3653 msgid ""

3654 "look for differences that change the number of occurrences of the specified "

3655 "string"

3656 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3657

3614 -#: diff.c:5492

3658 +#: diff.c:5528

3659 msgid ""

3660 "look for differences that change the number of occurrences of the specified "

3661 "regex"

@@ -3619,60 +3663,69 @@ msgstr ""

3663 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3664 "uttryck"

3665

3622 -#: diff.c:5495

3666 +#: diff.c:5531

3667 msgid "show all changes in the changeset with -S or -G"

3668 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3669

3626 -#: diff.c:5498

3670 +#: diff.c:5534

3671 msgid "treat <string> in -S as extended POSIX regular expression"

3672 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3673

3630 -#: diff.c:5501

3674 +#: diff.c:5537

3675 msgid "control the order in which files appear in the output"

3676 msgstr "styr ordningen i vilken filer visas i utdata"

3677

3634 -#: diff.c:5502

3678 +#: diff.c:5538

3679 msgid "<object-id>"

3680 msgstr "<objekt-id>"

3681

3638 -#: diff.c:5503

3682 +#: diff.c:5539

3683 msgid ""

3684 "look for differences that change the number of occurrences of the specified "

3685 "object"

3686 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3687

3644 -#: diff.c:5505

3688 +#: diff.c:5541

3689 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3690 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3691

3648 -#: diff.c:5506

3692 +#: diff.c:5542

3693 msgid "select files by diff type"

3694 msgstr "välj filter efter diff-typ"

3695

3652 -#: diff.c:5508

3696 +#: diff.c:5544

3697 msgid "<file>"

3698 msgstr "<fil>"

3699

3656 -#: diff.c:5509

3700 +#: diff.c:5545

3701 msgid "Output to a specific file"

3702 msgstr "Skriv utdata till en specifik fil"

3703

3660 -#: diff.c:6164

3704 +#: diff.c:6200

3705 msgid "inexact rename detection was skipped due to too many files."

3706 msgstr ""

3707 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."

3708

3665 -#: diff.c:6167

3709 +#: diff.c:6203

3710 msgid "only found copies from modified paths due to too many files."

3711 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

3712

3669 -#: diff.c:6170

3713 +#: diff.c:6206

3714 #, c-format

3715 msgid ""

3716 "you may want to set your %s variable to at least %d and retry the command."

3717 msgstr ""

3718 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."

3719

3720 +#: diffcore-order.c:24

3721 +#, c-format

3722 +msgid "failed to read orderfile '%s'"

3723 +msgstr "kunde inte läsa orderfilen \"%s\""

3724 +

3725 +#: diffcore-rename.c:592

3726 +msgid "Performing inexact rename detection"

3727 +msgstr "Utför onöjaktig namnbytesdetektering"

3728 +

3729 #: dir.c:555

3730 #, c-format

3731 msgid "pathspec '%s' did not match any file(s) known to git"

@@ -3704,35 +3757,35 @@ msgstr "inaktiverar konmönstermatchning"

3757 msgid "cannot use %s as an exclude file"

3758 msgstr "kan inte använda %s som exkluderingsfil"

3759

3707 -#: dir.c:2144

3760 +#: dir.c:2275

3761 #, c-format

3762 msgid "could not open directory '%s'"

3763 msgstr "kunde inte öppna katalogen \"%s\""

3764

3712 -#: dir.c:2479

3765 +#: dir.c:2575

3766 msgid "failed to get kernel name and information"

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

3768

3716 -#: dir.c:2603

3769 +#: dir.c:2699

3770 msgid "untracked cache is disabled on this system or location"

3771 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3772

3720 -#: dir.c:3407

3773 +#: dir.c:3481

3774 #, c-format

3775 msgid "index file corrupt in repo %s"

3776 msgstr "indexfilen trasig i arkivet %s"

3777

3725 -#: dir.c:3452 dir.c:3457

3778 +#: dir.c:3526 dir.c:3531

3779 #, c-format

3780 msgid "could not create directories for %s"

3781 msgstr "kunde inte skapa kataloger för %s"

3782

3730 -#: dir.c:3486

3783 +#: dir.c:3560

3784 #, c-format

3785 msgid "could not migrate git directory from '%s' to '%s'"

3786 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

3787

3735 -#: editor.c:73

3788 +#: editor.c:74

3789 #, c-format

3790 msgid "hint: Waiting for your editor to close the file...%c"

3791 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

@@ -3741,17 +3794,17 @@ msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

3794 msgid "Filtering content"

3795 msgstr "Filtrerar innehåll"

3796

3744 -#: entry.c:476

3797 +#: entry.c:479

3798 #, c-format

3799 msgid "could not stat file '%s'"

3800 msgstr "kunde inte ta status på filen \"%s\""

3801

3749 -#: environment.c:149

3802 +#: environment.c:150

3803 #, c-format

3804 msgid "bad git namespace path \"%s\""

3805 msgstr "felaktig git-namnrymdssökväg \"%s\""

3806

3754 -#: environment.c:331

3807 +#: environment.c:337

3808 #, c-format

3809 msgid "could not set GIT_DIR to '%s'"

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

@@ -3761,245 +3814,245 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""

3814 msgid "too many args to run %s"

3815 msgstr "för många flaggor för att köra %s"

3816

3764 -#: fetch-pack.c:150

3817 +#: fetch-pack.c:151

3818 msgid "git fetch-pack: expected shallow list"

3819 msgstr "git fetch-pack: förväntade grund lista"

3820

3768 -#: fetch-pack.c:153

3821 +#: fetch-pack.c:154

3822 msgid "git fetch-pack: expected a flush packet after shallow list"

3823 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

3824

3772 -#: fetch-pack.c:164

3825 +#: fetch-pack.c:165

3826 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3827 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

3828

3776 -#: fetch-pack.c:184

3829 +#: fetch-pack.c:185

3830 #, c-format

3831 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3832 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

3833

3781 -#: fetch-pack.c:195

3834 +#: fetch-pack.c:196

3835 msgid "unable to write to remote"

3836 msgstr "kunde inte skriva till fjärren"

3837

3785 -#: fetch-pack.c:257

3838 +#: fetch-pack.c:258

3839 msgid "--stateless-rpc requires multi_ack_detailed"

3840 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3841

3789 -#: fetch-pack.c:356 fetch-pack.c:1340

3842 +#: fetch-pack.c:357 fetch-pack.c:1364

3843 #, c-format

3844 msgid "invalid shallow line: %s"

3845 msgstr "ogiltig \"shallow\"-rad: %s"

3846

3794 -#: fetch-pack.c:362 fetch-pack.c:1346

3847 +#: fetch-pack.c:363 fetch-pack.c:1370

3848 #, c-format

3849 msgid "invalid unshallow line: %s"

3850 msgstr "ogiltig \"unshallow\"-rad: %s"

3851

3799 -#: fetch-pack.c:364 fetch-pack.c:1348

3852 +#: fetch-pack.c:365 fetch-pack.c:1372

3853 #, c-format

3854 msgid "object not found: %s"

3855 msgstr "objektet hittades inte: %s"

3856

3804 -#: fetch-pack.c:367 fetch-pack.c:1351

3857 +#: fetch-pack.c:368 fetch-pack.c:1375

3858 #, c-format

3859 msgid "error in object: %s"

3860 msgstr "fel i objekt: %s"

3861

3809 -#: fetch-pack.c:369 fetch-pack.c:1353

3862 +#: fetch-pack.c:370 fetch-pack.c:1377

3863 #, c-format

3864 msgid "no shallow found: %s"

3865 msgstr "ingen \"shallow\" hittades: %s"

3866

3814 -#: fetch-pack.c:372 fetch-pack.c:1357

3867 +#: fetch-pack.c:373 fetch-pack.c:1381

3868 #, c-format

3869 msgid "expected shallow/unshallow, got %s"

3870 msgstr "förväntade shallow/unshallow, fick %s"

3871

3819 -#: fetch-pack.c:414

3872 +#: fetch-pack.c:415

3873 #, c-format

3874 msgid "got %s %d %s"

3875 msgstr "fick %s %d %s"

3876

3824 -#: fetch-pack.c:431

3877 +#: fetch-pack.c:432

3878 #, c-format

3879 msgid "invalid commit %s"

3880 msgstr "ogiltig incheckning %s"

3881

3829 -#: fetch-pack.c:462

3882 +#: fetch-pack.c:463

3883 msgid "giving up"

3884 msgstr "ger upp"

3885

3833 -#: fetch-pack.c:475 progress.c:323

3886 +#: fetch-pack.c:476 progress.c:340

3887 msgid "done"

3888 msgstr "klart"

3889

3837 -#: fetch-pack.c:487

3890 +#: fetch-pack.c:488

3891 #, c-format

3892 msgid "got %s (%d) %s"

3893 msgstr "fick %s (%d) %s"

3894

3842 -#: fetch-pack.c:533

3895 +#: fetch-pack.c:534

3896 #, c-format

3897 msgid "Marking %s as complete"

3898 msgstr "Markerar %s som komplett"

3899

3847 -#: fetch-pack.c:754

3900 +#: fetch-pack.c:755

3901 #, c-format

3902 msgid "already have %s (%s)"

3903 msgstr "har redan %s (%s)"

3904

3852 -#: fetch-pack.c:818

3905 +#: fetch-pack.c:819

3906 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3907 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

3908

3856 -#: fetch-pack.c:826

3909 +#: fetch-pack.c:827

3910 msgid "protocol error: bad pack header"

3911 msgstr "protokollfel: felaktigt packhuvud"

3912

3860 -#: fetch-pack.c:900

3913 +#: fetch-pack.c:901

3914 #, c-format

3915 msgid "fetch-pack: unable to fork off %s"

3916 msgstr "fetch-patch: kunde inte grena av %s"

3917

3865 -#: fetch-pack.c:916

3918 +#: fetch-pack.c:917

3919 #, c-format

3920 msgid "%s failed"

3921 msgstr "%s misslyckades"

3922

3870 -#: fetch-pack.c:918

3923 +#: fetch-pack.c:919

3924 msgid "error in sideband demultiplexer"

3925 msgstr "fel i sidbands-avmultiplexare"

3926

3874 -#: fetch-pack.c:965

3927 +#: fetch-pack.c:966

3928 #, c-format

3929 msgid "Server version is %.*s"

3930 msgstr "Serverversionen är %.*s"

3931

3879 -#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985

3880 -#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001

3881 -#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017

3882 -#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039

3932 +#: fetch-pack.c:971 fetch-pack.c:977 fetch-pack.c:980 fetch-pack.c:986

3933 +#: fetch-pack.c:990 fetch-pack.c:994 fetch-pack.c:998 fetch-pack.c:1002

3934 +#: fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014 fetch-pack.c:1018

3935 +#: fetch-pack.c:1024 fetch-pack.c:1030 fetch-pack.c:1035 fetch-pack.c:1040

3936 #, c-format

3937 msgid "Server supports %s"

3938 msgstr "Servern stöder %s"

3939

3887 -#: fetch-pack.c:972

3940 +#: fetch-pack.c:973

3941 msgid "Server does not support shallow clients"

3942 msgstr "Servern stöder inte klienter med grunda arkiv"

3943

3891 -#: fetch-pack.c:1032

3944 +#: fetch-pack.c:1033

3945 msgid "Server does not support --shallow-since"

3946 msgstr "Servern stöder inte --shallow-since"

3947

3895 -#: fetch-pack.c:1037

3948 +#: fetch-pack.c:1038

3949 msgid "Server does not support --shallow-exclude"

3950 msgstr "Servern stöder inte --shallow-exclude"

3951

3899 -#: fetch-pack.c:1041

3952 +#: fetch-pack.c:1042

3953 msgid "Server does not support --deepen"

3954 msgstr "Servern stöder inte --deepen"

3955

3903 -#: fetch-pack.c:1058

3956 +#: fetch-pack.c:1059

3957 msgid "no common commits"

3958 msgstr "inga gemensamma incheckningar"

3959

3907 -#: fetch-pack.c:1070 fetch-pack.c:1536

3960 +#: fetch-pack.c:1071 fetch-pack.c:1563

3961 msgid "git fetch-pack: fetch failed."

3962 msgstr "git fetch-patch: hämtning misslyckades."

3963

3911 -#: fetch-pack.c:1209

3964 +#: fetch-pack.c:1211

3965 msgid "Server does not support shallow requests"

3966 msgstr "Servern stöder inte grunda förfrågningar"

3967

3915 -#: fetch-pack.c:1216

3968 +#: fetch-pack.c:1218

3969 msgid "Server supports filter"

3970 msgstr "Servern stöder filter"

3971

3919 -#: fetch-pack.c:1239

3972 +#: fetch-pack.c:1242

3973 msgid "unable to write request to remote"

3974 msgstr "kunde inte skriva anrop till fjärren"

3975

3923 -#: fetch-pack.c:1257

3976 +#: fetch-pack.c:1260

3977 #, c-format

3978 msgid "error reading section header '%s'"

3979 msgstr "fel vid läsning av styckehuvudet \"%s\""

3980

3928 -#: fetch-pack.c:1263

3981 +#: fetch-pack.c:1266

3982 #, c-format

3983 msgid "expected '%s', received '%s'"

3984 msgstr "förväntade \"%s\", tog emot \"%s\""

3985

3933 -#: fetch-pack.c:1303

3986 +#: fetch-pack.c:1327

3987 #, c-format

3988 msgid "unexpected acknowledgment line: '%s'"

3989 msgstr "förväntade bekräftelserad: \"%s\""

3990

3938 -#: fetch-pack.c:1308

3991 +#: fetch-pack.c:1332

3992 #, c-format

3993 msgid "error processing acks: %d"

3994 msgstr "fel vid hantering av bekräftelser: %d"

3995

3943 -#: fetch-pack.c:1318

3996 +#: fetch-pack.c:1342

3997 msgid "expected packfile to be sent after 'ready'"

3998 msgstr "väntade att paketfil skulle sändas efter \"ready\""

3999

3947 -#: fetch-pack.c:1320

4000 +#: fetch-pack.c:1344

4001 msgid "expected no other sections to be sent after no 'ready'"

4002 msgstr ""

4003 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4004

3952 -#: fetch-pack.c:1362

4005 +#: fetch-pack.c:1386

4006 #, c-format

4007 msgid "error processing shallow info: %d"

4008 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4009

3957 -#: fetch-pack.c:1409

4010 +#: fetch-pack.c:1433

4011 #, c-format

4012 msgid "expected wanted-ref, got '%s'"

4013 msgstr "förväntade wanted-ref, fick %s"

4014

3962 -#: fetch-pack.c:1414

4015 +#: fetch-pack.c:1438

4016 #, c-format

4017 msgid "unexpected wanted-ref: '%s'"

4018 msgstr "oväntad wanted-ref: \"%s\""

4019

3967 -#: fetch-pack.c:1419

4020 +#: fetch-pack.c:1443

4021 #, c-format

4022 msgid "error processing wanted refs: %d"

4023 msgstr "fel vid hantering av önskade referenser: %d"

4024

3972 -#: fetch-pack.c:1762

4025 +#: fetch-pack.c:1789

4026 msgid "no matching remote head"

4027 msgstr "inget motsvarande fjärrhuvud"

4028

3976 -#: fetch-pack.c:1785 builtin/clone.c:689

4029 +#: fetch-pack.c:1812 builtin/clone.c:692

4030 msgid "remote did not send all necessary objects"

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

4032

3980 -#: fetch-pack.c:1812

4033 +#: fetch-pack.c:1839

4034 #, c-format

4035 msgid "no such remote ref %s"

4036 msgstr "ingen sådan fjärreferens: %s"

4037

3985 -#: fetch-pack.c:1815

4038 +#: fetch-pack.c:1842

4039 #, c-format

4040 msgid "Server does not allow request for unadvertised object %s"

4041 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

4042

3990 -#: gpg-interface.c:408

3991 -msgid "gpg failed to sign the data"

3992 -msgstr "gpg misslyckades signera data"

3993 -

3994 -#: gpg-interface.c:434

4043 +#: gpg-interface.c:272

4044 msgid "could not create temporary file"

4045 msgstr "kunde inte skapa temporära fil"

4046

3998 -#: gpg-interface.c:437

4047 +#: gpg-interface.c:275

4048 #, c-format

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

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

4051

4052 +#: gpg-interface.c:457

4053 +msgid "gpg failed to sign the data"

4054 +msgstr "gpg misslyckades signera data"

4055 +

4056 #: graph.c:98

4057 #, c-format

4058 msgid "ignore invalid color '%.*s' in log.graphColors"

@@ -4018,7 +4071,7 @@ msgstr ""

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

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

4073

4021 -#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82

4074 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82

4075 #: builtin/rm.c:135

4076 #, c-format

4077 msgid "failed to stat '%s'"

@@ -4094,7 +4147,7 @@ msgstr "git-kommandon från andra platser i din $PATH"

4147 msgid "These are common Git commands used in various situations:"

4148 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

4149

4097 -#: help.c:363 git.c:98

4150 +#: help.c:363 git.c:99

4151 #, c-format

4152 msgid "unsupported command listing type '%s'"

4153 msgstr "okänd kommandolisttyp \"%s\""

@@ -4103,19 +4156,19 @@ msgstr "okänd kommandolisttyp \"%s\""

4156 msgid "The common Git guides are:"

4157 msgstr "De vanliga Git-vägledningarna är:"

4158

4106 -#: help.c:512

4159 +#: help.c:427

4160 msgid "See 'git help <command>' to read about a specific subcommand"

4161 msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"

4162

4110 -#: help.c:517

4163 +#: help.c:432

4164 msgid "External commands"

4165 msgstr "Externa kommandon"

4166

4114 -#: help.c:532

4167 +#: help.c:447

4168 msgid "Command aliases"

4169 msgstr "Kommadoalias"

4170

4118 -#: help.c:596

4171 +#: help.c:511

4172 #, c-format

4173 msgid ""

4174 "'%s' appears to be a git command, but we were not\n"

@@ -4124,32 +4177,32 @@ msgstr ""

4177 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

4178 "köra det. Kanske git-%s är trasigt?"

4179

4127 -#: help.c:655

4180 +#: help.c:570

4181 msgid "Uh oh. Your system reports no Git commands at all."

4182 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

4183

4131 -#: help.c:677

4184 +#: help.c:592

4185 #, c-format

4186 msgid "WARNING: You called a Git command named '%s', which does not exist."

4187 msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."

4188

4136 -#: help.c:682

4189 +#: help.c:597

4190 #, c-format

4191 msgid "Continuing under the assumption that you meant '%s'."

4192 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

4193

4141 -#: help.c:687

4194 +#: help.c:602

4195 #, c-format

4196 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4197 msgstr ""

4198 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."

4199

4147 -#: help.c:695

4200 +#: help.c:610

4201 #, c-format

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

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

4204

4152 -#: help.c:699

4205 +#: help.c:614

4206 msgid ""

4207 "\n"

4208 "The most similar command is"

@@ -4163,16 +4216,16 @@ msgstr[1] ""

4216 "\n"

4217 "Mest lika kommandon är"

4218

4166 -#: help.c:714

4219 +#: help.c:653

4220 msgid "git version [<options>]"

4221 msgstr "git version [<flaggor>]"

4222

4170 -#: help.c:783

4223 +#: help.c:708

4224 #, c-format

4225 msgid "%s: %s - %s"

4226 msgstr "%s: %s - %s"

4227

4175 -#: help.c:787

4228 +#: help.c:712

4229 msgid ""

4230 "\n"

4231 "Did you mean this?"

@@ -4240,36 +4293,11 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

4293 msgid "name consists only of disallowed characters: %s"

4294 msgstr "namnet består enbart av ej tillåtna tecken: %s"

4295

4243 -#: ident.c:436 builtin/commit.c:635

4296 +#: ident.c:436 builtin/commit.c:634

4297 #, c-format

4298 msgid "invalid date format: %s"

4299 msgstr "felaktigt datumformat: %s"

4300

4248 -#: list-objects.c:127

4249 -#, c-format

4250 -msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4251 -msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"

4252 -

4253 -#: list-objects.c:140

4254 -#, c-format

4255 -msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4256 -msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"

4257 -

4258 -#: list-objects.c:375

4259 -#, c-format

4260 -msgid "unable to load root tree for commit %s"

4261 -msgstr "kunde inte läsa in rot-trädet för incheckningen %s"

4262 -

4263 -#: list-objects-filter.c:492

4264 -#, c-format

4265 -msgid "unable to access sparse blob in '%s'"

4266 -msgstr "kunde inte nå gles blob på \"%s\""

4267 -

4268 -#: list-objects-filter.c:495

4269 -#, c-format

4270 -msgid "unable to parse sparse filter data in %s"

4271 -msgstr "kunde inte tolka gles filterdata i %s"

4272 -

4301 #: list-objects-filter-options.c:58

4302 msgid "expected 'tree:<depth>'"

4303 msgstr "förväntade \"tree:<djup>\""

@@ -4296,7 +4324,32 @@ msgstr "förväntade någonting efter combine:"

4324 msgid "multiple filter-specs cannot be combined"

4325 msgstr "flera filterspecifikationer kan inte kombineras"

4326

4299 -#: lockfile.c:151

4327 +#: list-objects-filter.c:492

4328 +#, c-format

4329 +msgid "unable to access sparse blob in '%s'"

4330 +msgstr "kunde inte nå gles blob på \"%s\""

4331 +

4332 +#: list-objects-filter.c:495

4333 +#, c-format

4334 +msgid "unable to parse sparse filter data in %s"

4335 +msgstr "kunde inte tolka gles filterdata i %s"

4336 +

4337 +#: list-objects.c:127

4338 +#, c-format

4339 +msgid "entry '%s' in tree %s has tree mode, but is not a tree"

4340 +msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"

4341 +

4342 +#: list-objects.c:140

4343 +#, c-format

4344 +msgid "entry '%s' in tree %s has blob mode, but is not a blob"

4345 +msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"

4346 +

4347 +#: list-objects.c:375

4348 +#, c-format

4349 +msgid "unable to load root tree for commit %s"

4350 +msgstr "kunde inte läsa in rot-trädet för incheckningen %s"

4351 +

4352 +#: lockfile.c:152

4353 #, c-format

4354 msgid ""

4355 "Unable to create '%s.lock': %s.\n"

@@ -4316,20 +4369,14 @@ msgstr ""

4369 "tidigare:\n"

4370 "ta bort filen manuellt för att fortsätta."

4371

4319 -#: lockfile.c:159

4372 +#: lockfile.c:160

4373 #, c-format

4374 msgid "Unable to create '%s.lock': %s"

4375 msgstr "Kunde inte skapa \"%s.lock\": %s"

4376

4324 -#: merge.c:41

4325 -msgid "failed to read the cache"

4326 -msgstr "misslyckades läsa cachen"

4327 -

4328 -#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913

4329 -#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810

4330 -#: builtin/stash.c:265

4331 -msgid "unable to write new index file"

4332 -msgstr "kunde inte skriva ny indexfil"

4377 +#: ls-refs.c:109

4378 +msgid "expected flush after ls-refs arguments"

4379 +msgstr "förväntade \"flush\" efter ls-refs-argument"

4380

4381 #: merge-recursive.c:356

4382 msgid "(bad commit)\n"

@@ -4643,7 +4690,7 @@ msgstr "tillägg/tillägg"

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

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

4692

4646 -#: merge-recursive.c:3089 git-submodule.sh:1003

4693 +#: merge-recursive.c:3089 git-submodule.sh:985

4694 msgid "submodule"

4695 msgstr "undermodul"

4696

@@ -4761,10 +4808,20 @@ msgstr ""

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

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

4810

4764 -#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877

4811 +#: merge-recursive.c:3774 builtin/merge.c:705 builtin/merge.c:885

4812 msgid "Unable to write index."

4813 msgstr "Kunde inte skriva indexet."

4814

4815 +#: merge.c:41

4816 +msgid "failed to read the cache"

4817 +msgstr "misslyckades läsa cachen"

4818 +

4819 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4820 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816

4821 +#: builtin/stash.c:265

4822 +msgid "unable to write new index file"

4823 +msgstr "kunde inte skriva ny indexfil"

4824 +

4825 #: midx.c:68

4826 #, c-format

4827 msgid "multi-pack-index file %s is too small"

@@ -4814,108 +4871,116 @@ msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

4871 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4872 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

4873

4817 -#: midx.c:210

4874 +#: midx.c:208

4875 #, c-format

4876 msgid "bad pack-int-id: %u (%u total packs)"

4877 msgstr "bad pack-int-id: %u (%u paket totalt)"

4878

4822 -#: midx.c:260

4879 +#: midx.c:258

4880 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4881 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

4882

4826 -#: midx.c:288

4883 +#: midx.c:286

4884 msgid "error preparing packfile from multi-pack-index"

4885 msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4886

4830 -#: midx.c:472

4887 +#: midx.c:470

4888 #, c-format

4889 msgid "failed to add packfile '%s'"

4890 msgstr "misslyckades läsa paketfilen \"%s\""

4891

4835 -#: midx.c:478

4892 +#: midx.c:476

4893 #, c-format

4894 msgid "failed to open pack-index '%s'"

4895 msgstr "misslyckades öppna paketindexet \"%s\""

4896

4840 -#: midx.c:538

4897 +#: midx.c:536

4898 #, c-format

4899 msgid "failed to locate object %d in packfile"

4900 msgstr "misslyckades hitta objekt %d i paketfilen"

4901

4845 -#: midx.c:842

4902 +#: midx.c:840

4903 msgid "Adding packfiles to multi-pack-index"

4904 msgstr "Lägger till paketfiler till multi-pack-index"

4905

4849 -#: midx.c:875

4906 +#: midx.c:873

4907 #, c-format

4908 msgid "did not see pack-file %s to drop"

4909 msgstr "såg inte paketfilen %s som skulle kastas"

4910

4854 -#: midx.c:973

4911 +#: midx.c:925

4912 +msgid "no pack files to index."

4913 +msgstr "inga paketfiler att indexera."

4914 +

4915 +#: midx.c:977

4916 msgid "Writing chunks to multi-pack-index"

4917 msgstr "Skriver stycken till multi-pack-index"

4918

4858 -#: midx.c:1052

4919 +#: midx.c:1056

4920 #, c-format

4921 msgid "failed to clear multi-pack-index at %s"

4922 msgstr "misslyckades städa multi-pack-index på %s"

4923

4863 -#: midx.c:1108

4924 +#: midx.c:1112

4925 msgid "Looking for referenced packfiles"

4926 msgstr "Ser efter refererade packfiler"

4927

4867 -#: midx.c:1123

4928 +#: midx.c:1127

4929 #, c-format

4930 msgid ""

4931 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4932 msgstr ""

4933 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4934

4874 -#: midx.c:1128

4935 +#: midx.c:1132

4936 +msgid "the midx contains no oid"

4937 +msgstr "midx saknar oid"

4938 +

4939 +#: midx.c:1141

4940 msgid "Verifying OID order in multi-pack-index"

4941 msgstr "Bekräftar OID-ordning i multi-pack-index"

4942

4878 -#: midx.c:1137

4943 +#: midx.c:1150

4944 #, c-format

4945 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4946 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

4947

4883 -#: midx.c:1157

4948 +#: midx.c:1170

4949 msgid "Sorting objects by packfile"

4950 msgstr "Sorterar objekt efter packfil"

4951

4887 -#: midx.c:1164

4952 +#: midx.c:1177

4953 msgid "Verifying object offsets"

4954 msgstr "Bekräftar offset för objekt"

4955

4891 -#: midx.c:1180

4956 +#: midx.c:1193

4957 #, c-format

4958 msgid "failed to load pack entry for oid[%d] = %s"

4959 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

4960

4896 -#: midx.c:1186

4961 +#: midx.c:1199

4962 #, c-format

4963 msgid "failed to load pack-index for packfile %s"

4964 msgstr "misslyckades läsa paketindex för paketfil %s"

4965

4901 -#: midx.c:1195

4966 +#: midx.c:1208

4967 #, c-format

4968 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4969 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4970

4906 -#: midx.c:1220

4971 +#: midx.c:1233

4972 msgid "Counting referenced objects"

4973 msgstr "Räknar refererade objekt"

4974

4910 -#: midx.c:1230

4975 +#: midx.c:1243

4976 msgid "Finding and deleting unreferenced packfiles"

4977 msgstr "Ser efter och tar bort orefererade packfiler"

4978

4914 -#: midx.c:1388

4979 +#: midx.c:1433

4980 msgid "could not start pack-objects"

4981 msgstr "kunde inte starta pack-objects"

4982

4918 -#: midx.c:1407

4983 +#: midx.c:1452

4984 msgid "could not finish pack-objects"

4985 msgstr "kunde inte avsluta pack-objects"

4986

@@ -4999,6 +5064,11 @@ msgstr "kunde inte tolka objektet: %s"

5064 msgid "hash mismatch %s"

5065 msgstr "hashvärde stämmer inte överens %s"

5066

5067 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2135

5068 +#, c-format

5069 +msgid "unable to get size of %s"

5070 +msgstr "kan inte hämta storlek på %s"

5071 +

5072 #: packfile.c:629

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

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

@@ -5013,10 +5083,26 @@ msgstr "offset före slutet av packindex för %s (trasigt index?)"

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

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

5085

5016 -#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134

5086 +#: parse-options-cb.c:20 parse-options-cb.c:24

5087 #, c-format

5018 -msgid "unable to get size of %s"

5019 -msgstr "kan inte hämta storlek på %s"

5088 +msgid "option `%s' expects a numerical value"

5089 +msgstr "flaggan \"%s\" antar ett numeriskt värde"

5090 +

5091 +#: parse-options-cb.c:41

5092 +#, c-format

5093 +msgid "malformed expiration date '%s'"

5094 +msgstr "trasigt utlöpsdatum: \"%s\""

5095 +

5096 +#: parse-options-cb.c:54

5097 +#, c-format

5098 +msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5099 +msgstr ""

5100 +"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

5101 +

5102 +#: parse-options-cb.c:130 parse-options-cb.c:147

5103 +#, c-format

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

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

5106

5107 #: parse-options.c:38

5108 #, c-format

@@ -5058,26 +5144,31 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

5144 msgid "did you mean `--%s` (with two dashes)?"

5145 msgstr "menade du \"--%s\" (med två bindestreck)?"

5146

5061 -#: parse-options.c:857

5147 +#: parse-options.c:663 parse-options.c:963

5148 +#, c-format

5149 +msgid "alias of --%s"

5150 +msgstr "alias för --%s"

5151 +

5152 +#: parse-options.c:854

5153 #, c-format

5154 msgid "unknown option `%s'"

5155 msgstr "okänd flagga \"%s\""

5156

5066 -#: parse-options.c:859

5157 +#: parse-options.c:856

5158 #, c-format

5159 msgid "unknown switch `%c'"

5160 msgstr "okänd flagga \"%c\""

5161

5071 -#: parse-options.c:861

5162 +#: parse-options.c:858

5163 #, c-format

5164 msgid "unknown non-ascii option in string: `%s'"

5165 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

5166

5076 -#: parse-options.c:885

5167 +#: parse-options.c:882

5168 msgid "..."

5169 msgstr "..."

5170

5080 -#: parse-options.c:904

5171 +#: parse-options.c:901

5172 #, c-format

5173 msgid "usage: %s"

5174 msgstr "användning: %s"

@@ -5085,46 +5176,20 @@ msgstr "användning: %s"

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

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

5178 #.

5088 -#: parse-options.c:910

5179 +#: parse-options.c:907

5180 #, c-format

5181 msgid " or: %s"

5182 msgstr " eller: %s"

5183

5093 -#: parse-options.c:913

5184 +#: parse-options.c:910

5185 #, c-format

5186 msgid " %s"

5187 msgstr " %s"

5188

5098 -#: parse-options.c:952

5189 +#: parse-options.c:949

5190 msgid "-NUM"

5191 msgstr "-TAL"

5192

5102 -#: parse-options.c:966

5103 -#, c-format

5104 -msgid "alias of --%s"

5105 -msgstr "alias för --%s"

5106 -

5107 -#: parse-options-cb.c:20 parse-options-cb.c:24

5108 -#, c-format

5109 -msgid "option `%s' expects a numerical value"

5110 -msgstr "flaggan \"%s\" antar ett numeriskt värde"

5111 -

5112 -#: parse-options-cb.c:41

5113 -#, c-format

5114 -msgid "malformed expiration date '%s'"

5115 -msgstr "trasigt utlöpsdatum: \"%s\""

5116 -

5117 -#: parse-options-cb.c:54

5118 -#, c-format

5119 -msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5120 -msgstr ""

5121 -"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

5122 -

5123 -#: parse-options-cb.c:130 parse-options-cb.c:147

5124 -#, c-format

5125 -msgid "malformed object name '%s'"

5126 -msgstr "felformat objektnamn \"%s\""

5127 -

5193 #: path.c:915

5194 #, c-format

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

@@ -5184,27 +5249,27 @@ msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""

5249 msgid "%s: 'literal' and 'glob' are incompatible"

5250 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"

5251

5187 -#: pathspec.c:442

5252 +#: pathspec.c:445

5253 #, c-format

5254 msgid "%s: '%s' is outside repository at '%s'"

5255 msgstr "%s: \"%s\" är utanför arkivet på \"%s\""

5256

5192 -#: pathspec.c:517

5257 +#: pathspec.c:521

5258 #, c-format

5259 msgid "'%s' (mnemonic: '%c')"

5260 msgstr "\"%s\" (minnesstöd: \"%c\")"

5261

5197 -#: pathspec.c:527

5262 +#: pathspec.c:531

5263 #, c-format

5264 msgid "%s: pathspec magic not supported by this command: %s"

5265 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"

5266

5202 -#: pathspec.c:594

5267 +#: pathspec.c:598

5268 #, c-format

5269 msgid "pathspec '%s' is beyond a symbolic link"

5270 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

5271

5207 -#: pathspec.c:639

5272 +#: pathspec.c:643

5273 #, c-format

5274 msgid "line is badly quoted: %s"

5275 msgstr "linjen er felaktigt citerad: %s"

@@ -5269,7 +5334,7 @@ msgstr "Uppdaterar indexet"

5334 msgid "unable to create threaded lstat: %s"

5335 msgstr "kunde inte skapa trådad lstat: %s"

5336

5272 -#: pretty.c:981

5337 +#: pretty.c:982

5338 msgid "unable to parse --pretty format"

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

5340

@@ -5282,29 +5347,42 @@ msgstr "Fjärr utan URL"

5347 msgid "promisor remote name cannot begin with '/': %s"

5348 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"

5349

5285 -#: range-diff.c:75

5350 +#: prune-packed.c:35

5351 +msgid "Removing duplicate objects"

5352 +msgstr "Tar bort duplicerade objekt"

5353 +

5354 +#: range-diff.c:77

5355 msgid "could not start `log`"

5356 msgstr "kunde inte starta \"log\""

5357

5289 -#: range-diff.c:77

5358 +#: range-diff.c:79

5359 msgid "could not read `log` output"

5360 msgstr "kunde inte läsa utdata från \"log\""

5361

5293 -#: range-diff.c:96 sequencer.c:5020

5362 +#: range-diff.c:98 sequencer.c:5143

5363 #, c-format

5364 msgid "could not parse commit '%s'"

5365 msgstr "kunde inte tolka incheckningen \"%s\""

5366

5298 -#: range-diff.c:122

5367 +#: range-diff.c:112

5368 +#, c-format

5369 +msgid ""

5370 +"could not parse first line of `log` output: did not start with 'commit ': "

5371 +"'%s'"

5372 +msgstr ""

5373 +"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "

5374 +"\"%s\""

5375 +

5376 +#: range-diff.c:137

5377 #, c-format

5378 msgid "could not parse git header '%.*s'"

5379 msgstr "kunde inte tolka git-huvudet \"%.*s\""

5380

5303 -#: range-diff.c:285

5381 +#: range-diff.c:301

5382 msgid "failed to generate diff"

5383 msgstr "misslyckades skapa diff"

5384

5307 -#: range-diff.c:518 range-diff.c:520

5385 +#: range-diff.c:534 range-diff.c:536

5386 #, c-format

5387 msgid "could not parse log for '%s'"

5388 msgstr "kunde inte tolka loggen för \"%s\""

@@ -5421,9 +5499,9 @@ msgstr "osorterade köposter för \"%s\""

5499

5500 #: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5501 #: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5424 -#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967

5425 -#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485

5426 -#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290

5502 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961

5503 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5504 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5505 #: builtin/submodule--helper.c:332

5506 msgid "index file corrupt"

5507 msgstr "indexfilen trasig"

@@ -5478,12 +5556,12 @@ msgstr "kunde inte uppdatera delat index \"%s\""

5556 msgid "broken index, expect %s in %s, got %s"

5557 msgstr "trasigt index, förväntade %s i %s, fick %s"

5558

5481 -#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122

5559 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130

5560 #, c-format

5561 msgid "could not close '%s'"

5562 msgstr "kunde inte stänga \"%s\""

5563

5486 -#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959

5564 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5565 #, c-format

5566 msgid "could not stat '%s'"

5567 msgstr "kunde inte ta status på \"%s\""

@@ -5617,14 +5695,14 @@ msgstr ""

5695 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

5696 "\n"

5697

5620 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444

5621 -#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252

5698 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5699 +#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:346 builtin/rebase.c:258

5700 #, c-format

5701 msgid "could not write '%s'"

5702 msgstr "kunde inte skriva \"%s\""

5703

5626 -#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210

5627 -#: builtin/rebase.c:234

5704 +#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5705 +#: builtin/rebase.c:240

5706 #, c-format

5707 msgid "could not write '%s'."

5708 msgstr "kunde inte skriva \"%s\"."

@@ -5658,191 +5736,73 @@ msgstr ""

5736 "\" (fel).\n"

5737 "\n"

5738

5661 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262

5662 -#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221

5663 -#: builtin/rebase.c:246

5739 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5740 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5741 +#: builtin/rebase.c:252

5742 #, c-format

5743 msgid "could not read '%s'."

5744 msgstr "kunde inte läsa \"%s\"."

5745

5668 -#: refs.c:262

5669 -#, c-format

5670 -msgid "%s does not point to a valid object!"

5671 -msgstr "\"%s\" pekar inte på ett giltigt objekt!"

5746 +#: ref-filter.c:42 wt-status.c:1936

5747 +msgid "gone"

5748 +msgstr "försvunnen"

5749

5673 -#: refs.c:667

5750 +#: ref-filter.c:43

5751 #, c-format

5675 -msgid "ignoring dangling symref %s"

5676 -msgstr "ignorerar dinglande symbolisk referens %s"

5752 +msgid "ahead %d"

5753 +msgstr "före %d"

5754

5678 -#: refs.c:669 ref-filter.c:2098

5755 +#: ref-filter.c:44

5756 #, c-format

5680 -msgid "ignoring broken ref %s"

5681 -msgstr "ignorerar trasig referens %s"

5757 +msgid "behind %d"

5758 +msgstr "bakom %d"

5759

5683 -#: refs.c:804

5760 +#: ref-filter.c:45

5761 #, c-format

5685 -msgid "could not open '%s' for writing: %s"

5686 -msgstr "kunde inte öppna \"%s\" för skrivning: %s"

5762 +msgid "ahead %d, behind %d"

5763 +msgstr "före %d, bakom %d"

5764

5688 -#: refs.c:814 refs.c:865

5765 +#: ref-filter.c:165

5766 #, c-format

5690 -msgid "could not read ref '%s'"

5691 -msgstr "Kunde inte läsa referensen \"%s\""

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

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

5769

5693 -#: refs.c:820

5770 +#: ref-filter.c:167

5771 #, c-format

5695 -msgid "ref '%s' already exists"

5696 -msgstr "referensen \"%s\" finns redan"

5772 +msgid "unrecognized color: %%(color:%s)"

5773 +msgstr "okänd färg: %%(color:%s)"

5774

5698 -#: refs.c:825

5775 +#: ref-filter.c:189

5776 #, c-format

5700 -msgid "unexpected object ID when writing '%s'"

5701 -msgstr "oväntat objekt-id vid skrivning \"%s\""

5777 +msgid "Integer value expected refname:lstrip=%s"

5778 +msgstr "Heltalsvärde förväntades refname:lstrip=%s"

5779

5703 -#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905

5704 -#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157

5705 -#: wrapper.c:620

5780 +#: ref-filter.c:193

5781 #, c-format

5707 -msgid "could not write to '%s'"

5708 -msgstr "kunde inte skriva till \"%s\""

5782 +msgid "Integer value expected refname:rstrip=%s"

5783 +msgstr "Heltalsvärde förväntades refname:rstrip=%s"

5784

5710 -#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719

5711 -#: builtin/rebase.c:1029

5785 +#: ref-filter.c:195

5786 #, c-format

5713 -msgid "could not open '%s' for writing"

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

5787 +msgid "unrecognized %%(%s) argument: %s"

5788 +msgstr "okänt %%(%s)-argument: %s"

5789

5716 -#: refs.c:867

5790 +#: ref-filter.c:250

5791 #, c-format

5718 -msgid "unexpected object ID when deleting '%s'"

5719 -msgstr "oväntat objekt-id vid borttagning \"%s\""

5792 +msgid "%%(objecttype) does not take arguments"

5793 +msgstr "%%(objecttype) tar inte argument"

5794

5721 -#: refs.c:998

5795 +#: ref-filter.c:272

5796 #, c-format

5723 -msgid "log for ref %s has gap after %s"

5724 -msgstr "loggen för referensen %s har lucka efter %s"

5797 +msgid "unrecognized %%(objectsize) argument: %s"

5798 +msgstr "okänt %%(objectsize)-argument: %s"

5799

5726 -#: refs.c:1004

5800 +#: ref-filter.c:280

5801 #, c-format

5728 -msgid "log for ref %s unexpectedly ended on %s"

5729 -msgstr "loggen för referensen %s slutade oväntat på %s"

5802 +msgid "%%(deltabase) does not take arguments"

5803 +msgstr "%%(deltabase) tar inte argument"

5804

5731 -#: refs.c:1063

5732 -#, c-format

5733 -msgid "log for %s is empty"

5734 -msgstr "loggen för %s är tom"

5735 -

5736 -#: refs.c:1155

5737 -#, c-format

5738 -msgid "refusing to update ref with bad name '%s'"

5739 -msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

5740 -

5741 -#: refs.c:1231

5742 -#, c-format

5743 -msgid "update_ref failed for ref '%s': %s"

5744 -msgstr "update_ref misslyckades för referensen \"%s\": %s"

5745 -

5746 -#: refs.c:2023

5747 -#, c-format

5748 -msgid "multiple updates for ref '%s' not allowed"

5749 -msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

5750 -

5751 -#: refs.c:2055

5752 -msgid "ref updates forbidden inside quarantine environment"

5753 -msgstr "referensuppdateringar förbjudna i karantänmiljö"

5754 -

5755 -#: refs.c:2151 refs.c:2181

5756 -#, c-format

5757 -msgid "'%s' exists; cannot create '%s'"

5758 -msgstr "\"%s\" finns; kan inte skapa \"%s\""

5759 -

5760 -#: refs.c:2157 refs.c:2192

5761 -#, c-format

5762 -msgid "cannot process '%s' and '%s' at the same time"

5763 -msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

5764 -

5765 -#: refs/files-backend.c:1233

5766 -#, c-format

5767 -msgid "could not remove reference %s"

5768 -msgstr "kunde inte ta bort referensen %s"

5769 -

5770 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

5771 -#: refs/packed-backend.c:1551

5772 -#, c-format

5773 -msgid "could not delete reference %s: %s"

5774 -msgstr "kunde inte ta bort referensen %s: %s"

5775 -

5776 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

5777 -#, c-format

5778 -msgid "could not delete references: %s"

5779 -msgstr "kunde inte ta bort referenser: %s"

5780 -

5781 -#: refspec.c:137

5782 -#, c-format

5783 -msgid "invalid refspec '%s'"

5784 -msgstr "felaktig referensspecifikation: \"%s\""

5785 -

5786 -#: ref-filter.c:42 wt-status.c:1938

5787 -msgid "gone"

5788 -msgstr "försvunnen"

5789 -

5790 -#: ref-filter.c:43

5791 -#, c-format

5792 -msgid "ahead %d"

5793 -msgstr "före %d"

5794 -

5795 -#: ref-filter.c:44

5796 -#, c-format

5797 -msgid "behind %d"

5798 -msgstr "bakom %d"

5799 -

5800 -#: ref-filter.c:45

5801 -#, c-format

5802 -msgid "ahead %d, behind %d"

5803 -msgstr "före %d, bakom %d"

5804 -

5805 -#: ref-filter.c:165

5806 -#, c-format

5807 -msgid "expected format: %%(color:<color>)"

5808 -msgstr "förväntat format: %%(color:<color>)"

5809 -

5810 -#: ref-filter.c:167

5811 -#, c-format

5812 -msgid "unrecognized color: %%(color:%s)"

5813 -msgstr "okänd färg: %%(color:%s)"

5814 -

5815 -#: ref-filter.c:189

5816 -#, c-format

5817 -msgid "Integer value expected refname:lstrip=%s"

5818 -msgstr "Heltalsvärde förväntades refname:lstrip=%s"

5819 -

5820 -#: ref-filter.c:193

5821 -#, c-format

5822 -msgid "Integer value expected refname:rstrip=%s"

5823 -msgstr "Heltalsvärde förväntades refname:rstrip=%s"

5824 -

5825 -#: ref-filter.c:195

5826 -#, c-format

5827 -msgid "unrecognized %%(%s) argument: %s"

5828 -msgstr "okänt %%(%s)-argument: %s"

5829 -

5830 -#: ref-filter.c:250

5831 -#, c-format

5832 -msgid "%%(objecttype) does not take arguments"

5833 -msgstr "%%(objecttype) tar inte argument"

5834 -

5835 -#: ref-filter.c:272

5836 -#, c-format

5837 -msgid "unrecognized %%(objectsize) argument: %s"

5838 -msgstr "okänt %%(objectsize)-argument: %s"

5839 -

5840 -#: ref-filter.c:280

5841 -#, c-format

5842 -msgid "%%(deltabase) does not take arguments"

5843 -msgstr "%%(deltabase) tar inte argument"

5844 -

5845 -#: ref-filter.c:292

5805 +#: ref-filter.c:292

5806 #, c-format

5807 msgid "%%(body) does not take arguments"

5808 msgstr "%%(body) tar inte argument"

@@ -5969,114 +5929,232 @@ msgstr "format: atomen %%(end) använd utan motsvarande atom"

5929 msgid "malformed format string %s"

5930 msgstr "felformad formatsträng %s"

5931

5972 -#: ref-filter.c:1488

5932 +#: ref-filter.c:1486

5933 #, c-format

5934 msgid "no branch, rebasing %s"

5935 msgstr "ingen gren, ombaserar %s"

5936

5977 -#: ref-filter.c:1491

5937 +#: ref-filter.c:1489

5938 #, c-format

5939 msgid "no branch, rebasing detached HEAD %s"

5940 msgstr "ingen gren, ombaserar frånkopplat HEAD %s"

5941

5982 -#: ref-filter.c:1494

5942 +#: ref-filter.c:1492

5943 #, c-format

5944 msgid "no branch, bisect started on %s"

5945 msgstr "ingen gren, \"bisect\" startad på %s"

5946

5987 -#: ref-filter.c:1504

5947 +#: ref-filter.c:1502

5948 msgid "no branch"

5949 msgstr "ingen gren"

5950

5991 -#: ref-filter.c:1540 ref-filter.c:1749

5951 +#: ref-filter.c:1538 ref-filter.c:1747

5952 #, c-format

5953 msgid "missing object %s for %s"

5954 msgstr "objektet %s saknas för %s"

5955

5996 -#: ref-filter.c:1550

5956 +#: ref-filter.c:1548

5957 #, c-format

5958 msgid "parse_object_buffer failed on %s for %s"

5959 msgstr "parse_object_buffer misslyckades på %s för %s"

5960

6001 -#: ref-filter.c:2004

5961 +#: ref-filter.c:2001

5962 #, c-format

5963 msgid "malformed object at '%s'"

5964 msgstr "felformat objekt vid \"%s\""

5965

6006 -#: ref-filter.c:2093

5966 +#: ref-filter.c:2090

5967 #, c-format

5968 msgid "ignoring ref with broken name %s"

5969 msgstr "ignorerar referens med trasigt namn %s"

5970

6011 -#: ref-filter.c:2389

5971 +#: ref-filter.c:2095 refs.c:625

5972 +#, c-format

5973 +msgid "ignoring broken ref %s"

5974 +msgstr "ignorerar trasig referens %s"

5975 +

5976 +#: ref-filter.c:2395

5977 #, c-format

5978 msgid "format: %%(end) atom missing"

5979 msgstr "format: atomen %%(end) saknas"

5980

6016 -#: ref-filter.c:2489

5981 +#: ref-filter.c:2495

5982 #, c-format

5983 msgid "option `%s' is incompatible with --merged"

5984 msgstr "flaggan \"%s\" är inkompatibel med --merged"

5985

6021 -#: ref-filter.c:2492

5986 +#: ref-filter.c:2498

5987 #, c-format

5988 msgid "option `%s' is incompatible with --no-merged"

5989 msgstr "flaggan \"%s\" är inkompatibel med --no-merged"

5990

6026 -#: ref-filter.c:2502

5991 +#: ref-filter.c:2508

5992 #, c-format

5993 msgid "malformed object name %s"

5994 msgstr "felformat objektnamn %s"

5995

6031 -#: ref-filter.c:2507

5996 +#: ref-filter.c:2513

5997 #, c-format

5998 msgid "option `%s' must point to a commit"

5999 msgstr "flaggan \"%s\" måste peka på en incheckning"

6000

6036 -#: remote.c:366

6001 +#: refs.c:262

6002 +#, c-format

6003 +msgid "%s does not point to a valid object!"

6004 +msgstr "\"%s\" pekar inte på ett giltigt objekt!"

6005 +

6006 +#: refs.c:623

6007 +#, c-format

6008 +msgid "ignoring dangling symref %s"

6009 +msgstr "ignorerar dinglande symbolisk referens %s"

6010 +

6011 +#: refs.c:760

6012 +#, c-format

6013 +msgid "could not open '%s' for writing: %s"

6014 +msgstr "kunde inte öppna \"%s\" för skrivning: %s"

6015 +

6016 +#: refs.c:770 refs.c:821

6017 +#, c-format

6018 +msgid "could not read ref '%s'"

6019 +msgstr "Kunde inte läsa referensen \"%s\""

6020 +

6021 +#: refs.c:776

6022 +#, c-format

6023 +msgid "ref '%s' already exists"

6024 +msgstr "referensen \"%s\" finns redan"

6025 +

6026 +#: refs.c:781

6027 +#, c-format

6028 +msgid "unexpected object ID when writing '%s'"

6029 +msgstr "oväntat objekt-id vid skrivning \"%s\""

6030 +

6031 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6032 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173

6033 +#: wrapper.c:620

6034 +#, c-format

6035 +msgid "could not write to '%s'"

6036 +msgstr "kunde inte skriva till \"%s\""

6037 +

6038 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719

6039 +#: builtin/rebase.c:852

6040 +#, c-format

6041 +msgid "could not open '%s' for writing"

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

6043 +

6044 +#: refs.c:823

6045 +#, c-format

6046 +msgid "unexpected object ID when deleting '%s'"

6047 +msgstr "oväntat objekt-id vid borttagning \"%s\""

6048 +

6049 +#: refs.c:954

6050 +#, c-format

6051 +msgid "log for ref %s has gap after %s"

6052 +msgstr "loggen för referensen %s har lucka efter %s"

6053 +

6054 +#: refs.c:960

6055 +#, c-format

6056 +msgid "log for ref %s unexpectedly ended on %s"

6057 +msgstr "loggen för referensen %s slutade oväntat på %s"

6058 +

6059 +#: refs.c:1019

6060 +#, c-format

6061 +msgid "log for %s is empty"

6062 +msgstr "loggen för %s är tom"

6063 +

6064 +#: refs.c:1111

6065 +#, c-format

6066 +msgid "refusing to update ref with bad name '%s'"

6067 +msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

6068 +

6069 +#: refs.c:1187

6070 +#, c-format

6071 +msgid "update_ref failed for ref '%s': %s"

6072 +msgstr "update_ref misslyckades för referensen \"%s\": %s"

6073 +

6074 +#: refs.c:1979

6075 +#, c-format

6076 +msgid "multiple updates for ref '%s' not allowed"

6077 +msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

6078 +

6079 +#: refs.c:2011

6080 +msgid "ref updates forbidden inside quarantine environment"

6081 +msgstr "referensuppdateringar förbjudna i karantänmiljö"

6082 +

6083 +#: refs.c:2107 refs.c:2137

6084 +#, c-format

6085 +msgid "'%s' exists; cannot create '%s'"

6086 +msgstr "\"%s\" finns; kan inte skapa \"%s\""

6087 +

6088 +#: refs.c:2113 refs.c:2148

6089 +#, c-format

6090 +msgid "cannot process '%s' and '%s' at the same time"

6091 +msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

6092 +

6093 +#: refs/files-backend.c:1233

6094 +#, c-format

6095 +msgid "could not remove reference %s"

6096 +msgstr "kunde inte ta bort referensen %s"

6097 +

6098 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6099 +#: refs/packed-backend.c:1551

6100 +#, c-format

6101 +msgid "could not delete reference %s: %s"

6102 +msgstr "kunde inte ta bort referensen %s: %s"

6103 +

6104 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6105 +#, c-format

6106 +msgid "could not delete references: %s"

6107 +msgstr "kunde inte ta bort referenser: %s"

6108 +

6109 +#: refspec.c:137

6110 +#, c-format

6111 +msgid "invalid refspec '%s'"

6112 +msgstr "felaktig referensspecifikation: \"%s\""

6113 +

6114 +#: remote.c:355

6115 #, c-format

6116 msgid "config remote shorthand cannot begin with '/': %s"

6117 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"

6118

6041 -#: remote.c:414

6119 +#: remote.c:403

6120 msgid "more than one receivepack given, using the first"

6121 msgstr "mer än en receivepack angavs, använder den första"

6122

6045 -#: remote.c:422

6123 +#: remote.c:411

6124 msgid "more than one uploadpack given, using the first"

6125 msgstr "mer än en uploadpack angavs, använder den första"

6126

6049 -#: remote.c:612

6127 +#: remote.c:594

6128 #, c-format

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

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

6131

6054 -#: remote.c:616

6132 +#: remote.c:598

6133 #, c-format

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

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

6136

6059 -#: remote.c:620

6137 +#: remote.c:602

6138 #, c-format

6139 msgid "%s tracks both %s and %s"

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

6141

6064 -#: remote.c:688

6142 +#: remote.c:670

6143 #, c-format

6144 msgid "key '%s' of pattern had no '*'"

6145 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""

6146

6069 -#: remote.c:698

6147 +#: remote.c:680

6148 #, c-format

6149 msgid "value '%s' of pattern has no '*'"

6150 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""

6151

6074 -#: remote.c:1004

6152 +#: remote.c:986

6153 #, c-format

6154 msgid "src refspec %s does not match any"

6155 msgstr "käll-referensspecifikationen %s motsvarar ingen"

6156

6079 -#: remote.c:1009

6157 +#: remote.c:991

6158 #, c-format

6159 msgid "src refspec %s matches more than one"

6160 msgstr "käll-referensspecifikationen %s motsvarar mer än en"

@@ -6085,7 +6163,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"

6163 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6164 #. the <src>.

6165 #.

6088 -#: remote.c:1024

6166 +#: remote.c:1006

6167 #, c-format

6168 msgid ""

6169 "The destination you provided is not a full refname (i.e.,\n"

@@ -6108,7 +6186,7 @@ msgstr ""

6186 "\n"

6187 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."

6188

6111 -#: remote.c:1044

6189 +#: remote.c:1026

6190 #, c-format

6191 msgid ""

6192 "The <src> part of the refspec is a commit object.\n"

@@ -6119,7 +6197,7 @@ msgstr ""

6197 "Var det meningen att skapa en ny gren genom att sända\n"

6198 "till \"%s:refs/heads/%s\"?"

6199

6122 -#: remote.c:1049

6200 +#: remote.c:1031

6201 #, c-format

6202 msgid ""

6203 "The <src> part of the refspec is a tag object.\n"

@@ -6130,7 +6208,7 @@ msgstr ""

6208 "Var det meningen att skapa en ny tagg genom att sända\n"

6209 "till \"%s:refs/tags/%s\"?"

6210

6133 -#: remote.c:1054

6211 +#: remote.c:1036

6212 #, c-format

6213 msgid ""

6214 "The <src> part of the refspec is a tree object.\n"

@@ -6141,7 +6219,7 @@ msgstr ""

6219 "Var det meningen att tagga ett nytt träd genom att sända\n"

6220 "till \"%s:refs/tags/%s\"?"

6221

6144 -#: remote.c:1059

6222 +#: remote.c:1041

6223 #, c-format

6224 msgid ""

6225 "The <src> part of the refspec is a blob object.\n"

@@ -6152,114 +6230,114 @@ msgstr ""

6230 "Var det meningen att tagga en ny blob genom att sända\n"

6231 "till \"%s:refs/tags/%s\"?"

6232

6155 -#: remote.c:1095

6233 +#: remote.c:1077

6234 #, c-format

6235 msgid "%s cannot be resolved to branch"

6236 msgstr "%s kan inte slås upp till en gren"

6237

6160 -#: remote.c:1106

6238 +#: remote.c:1088

6239 #, c-format

6240 msgid "unable to delete '%s': remote ref does not exist"

6241 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"

6242

6165 -#: remote.c:1118

6243 +#: remote.c:1100

6244 #, c-format

6245 msgid "dst refspec %s matches more than one"

6246 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

6247

6170 -#: remote.c:1125

6248 +#: remote.c:1107

6249 #, c-format

6250 msgid "dst ref %s receives from more than one src"

6251 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

6252

6175 -#: remote.c:1628 remote.c:1729

6253 +#: remote.c:1610 remote.c:1711

6254 msgid "HEAD does not point to a branch"

6255 msgstr "HEAD pekar inte på en gren"

6256

6179 -#: remote.c:1637

6257 +#: remote.c:1619

6258 #, c-format

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

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

6261

6184 -#: remote.c:1640

6262 +#: remote.c:1622

6263 #, c-format

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

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

6266

6189 -#: remote.c:1646

6267 +#: remote.c:1628

6268 #, c-format

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

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

6271

6194 -#: remote.c:1661

6272 +#: remote.c:1643

6273 #, c-format

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

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

6276

6199 -#: remote.c:1673

6277 +#: remote.c:1655

6278 #, c-format

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

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

6281

6204 -#: remote.c:1683

6282 +#: remote.c:1665

6283 #, c-format

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

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

6286

6209 -#: remote.c:1696

6287 +#: remote.c:1678

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

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

6290

6213 -#: remote.c:1718

6291 +#: remote.c:1700

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

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

6294

6217 -#: remote.c:1844

6295 +#: remote.c:1826

6296 #, c-format

6297 msgid "couldn't find remote ref %s"

6298 msgstr "Kunde inte hitta fjärr-referensen %s"

6299

6222 -#: remote.c:1857

6300 +#: remote.c:1839

6301 #, c-format

6302 msgid "* Ignoring funny ref '%s' locally"

6303 msgstr "* Ignorerar märklig referens \"%s\" lokalt"

6304

6227 -#: remote.c:2020

6305 +#: remote.c:2002

6306 #, c-format

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

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

6309

6232 -#: remote.c:2024

6310 +#: remote.c:2006

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

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

6313

6236 -#: remote.c:2027

6314 +#: remote.c:2009

6315 #, c-format

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

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

6318

6241 -#: remote.c:2031

6319 +#: remote.c:2013

6320 #, c-format

6321 msgid "Your branch and '%s' refer to different commits.\n"

6322 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

6323

6246 -#: remote.c:2034

6324 +#: remote.c:2016

6325 #, c-format

6326 msgid " (use \"%s\" for details)\n"

6327 msgstr " (använd \"%s\" för detaljer)\n"

6328

6251 -#: remote.c:2038

6329 +#: remote.c:2020

6330 #, c-format

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

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

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

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

6335

6258 -#: remote.c:2044

6336 +#: remote.c:2026

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

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

6339

6262 -#: remote.c:2047

6340 +#: remote.c:2029

6341 #, c-format

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

6343 msgid_plural ""

@@ -6269,11 +6347,11 @@ msgstr[0] ""

6347 msgstr[1] ""

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

6349

6272 -#: remote.c:2055

6350 +#: remote.c:2037

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

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

6353

6276 -#: remote.c:2058

6354 +#: remote.c:2040

6355 #, c-format

6356 msgid ""

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

@@ -6288,11 +6366,11 @@ msgstr[1] ""

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

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

6368

6291 -#: remote.c:2068

6369 +#: remote.c:2050

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

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

6372

6295 -#: remote.c:2251

6373 +#: remote.c:2233

6374 #, c-format

6375 msgid "cannot parse expected object name '%s'"

6376 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -6312,6 +6390,11 @@ msgstr "duplicerat ersättningsreferensnamn: %s"

6390 msgid "replace depth too high for object %s"

6391 msgstr "ersättningsdjupet för högt för objektet %s"

6392

6393 +#: repository.c:94 builtin/init-db.c:188

6394 +#, c-format

6395 +msgid "The hash algorithm %s is not supported in this build."

6396 +msgstr "Hashningsalgoritmen %s stöds inte i detta bygge."

6397 +

6398 #: rerere.c:217 rerere.c:226 rerere.c:229

6399 msgid "corrupt MERGE_RR"

6400 msgstr "trasig MERGE_RR"

@@ -6370,7 +6453,7 @@ msgstr "kan inte ta bort lös länk \"%s\""

6453 msgid "Recorded preimage for '%s'"

6454 msgstr "Sparade förhandsbild för \"%s\""

6455

6373 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1871

6456 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6457 #: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6458 #, c-format

6459 msgid "could not create directory '%s'"

@@ -6405,20 +6488,29 @@ msgstr "Glömde lösning för \"%s\"\n"

6488 msgid "unable to open rr-cache directory"

6489 msgstr "kan inte uppdatera katalogen rr-cache"

6490

6408 -#: revision.c:2497

6491 +#: reset.c:42

6492 +msgid "could not determine HEAD revision"

6493 +msgstr "kunde inte bestämma HEAD-revision"

6494 +

6495 +#: reset.c:70 reset.c:76 sequencer.c:3318

6496 +#, c-format

6497 +msgid "failed to find tree of %s"

6498 +msgstr "kunde inte hitta trädet för %s."

6499 +

6500 +#: revision.c:2655

6501 msgid "your current branch appears to be broken"

6502 msgstr "din nuvarande gren verkar vara trasig"

6503

6412 -#: revision.c:2500

6504 +#: revision.c:2658

6505 #, c-format

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

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

6508

6417 -#: revision.c:2708

6509 +#: revision.c:2866

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

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

6512

6421 -#: revision.c:2712

6513 +#: revision.c:2870

6514 msgid "-L does not yet support diff formats besides -p and -s"

6515 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6516

@@ -6440,29 +6532,29 @@ msgstr ""

6532 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

6533 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

6534

6443 -#: send-pack.c:144

6535 +#: send-pack.c:145

6536 msgid "unexpected flush packet while reading remote unpack status"

6537 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

6538

6447 -#: send-pack.c:146

6539 +#: send-pack.c:147

6540 #, c-format

6541 msgid "unable to parse remote unpack status: %s"

6542 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

6543

6452 -#: send-pack.c:148

6544 +#: send-pack.c:149

6545 #, c-format

6546 msgid "remote unpack failed: %s"

6547 msgstr "fjärruppackning misslyckades: %s"

6548

6457 -#: send-pack.c:309

6549 +#: send-pack.c:308

6550 msgid "failed to sign the push certificate"

6551 msgstr "misslyckades underteckna push-certifikatet"

6552

6461 -#: send-pack.c:423

6553 +#: send-pack.c:399

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

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

6556

6465 -#: send-pack.c:425

6557 +#: send-pack.c:401

6558 msgid ""

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

6560 "signed push"

@@ -6470,47 +6562,47 @@ msgstr ""

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

6563 "signed"

6564

6473 -#: send-pack.c:437

6565 +#: send-pack.c:413

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

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

6568

6477 -#: send-pack.c:442

6569 +#: send-pack.c:418

6570 msgid "the receiving end does not support push options"

6571 msgstr "mottagarsidan stöder inte push-flaggor"

6572

6481 -#: sequencer.c:191

6573 +#: sequencer.c:192

6574 #, c-format

6575 msgid "invalid commit message cleanup mode '%s'"

6576 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

6577

6486 -#: sequencer.c:296

6578 +#: sequencer.c:297

6579 #, c-format

6580 msgid "could not delete '%s'"

6581 msgstr "kunde inte ta bort \"%s\""

6582

6491 -#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385

6583 +#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6584 #, c-format

6585 msgid "could not remove '%s'"

6586 msgstr "kunde inte ta bort \"%s\""

6587

6496 -#: sequencer.c:325

6588 +#: sequencer.c:326

6589 msgid "revert"

6590 msgstr "revert"

6591

6500 -#: sequencer.c:327

6592 +#: sequencer.c:328

6593 msgid "cherry-pick"

6594 msgstr "cherry-pick"

6595

6504 -#: sequencer.c:329

6596 +#: sequencer.c:330

6597 msgid "rebase"

6598 msgstr "rebase"

6599

6508 -#: sequencer.c:331

6600 +#: sequencer.c:332

6601 #, c-format

6602 msgid "unknown action: %d"

6603 msgstr "okänd funktion: %d"

6604

6513 -#: sequencer.c:389

6605 +#: sequencer.c:390

6606 msgid ""

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

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

@@ -6518,7 +6610,7 @@ msgstr ""

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

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

6612

6521 -#: sequencer.c:392

6613 +#: sequencer.c:393

6614 msgid ""

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

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

@@ -6528,44 +6620,43 @@ msgstr ""

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

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

6622

6531 -#: sequencer.c:405 sequencer.c:2901

6623 +#: sequencer.c:406 sequencer.c:2921

6624 #, c-format

6625 msgid "could not lock '%s'"

6626 msgstr "kunde inte låsa \"%s\""

6627

6536 -#: sequencer.c:412

6628 +#: sequencer.c:413

6629 #, c-format

6630 msgid "could not write eol to '%s'"

6631 msgstr "kunde inte skriva radslut till \"%s\""

6632

6541 -#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921

6542 -#: sequencer.c:3185

6633 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6634 +#: sequencer.c:3203

6635 #, c-format

6636 msgid "failed to finalize '%s'"

6637 msgstr "misslyckades färdigställa \"%s\""

6638

6547 -#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167

6548 -#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120

6549 -#: builtin/rebase.c:593

6639 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6640 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6641 #, c-format

6642 msgid "could not read '%s'"

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

6644

6554 -#: sequencer.c:466

6645 +#: sequencer.c:457

6646 #, c-format

6647 msgid "your local changes would be overwritten by %s."

6648 msgstr "dina lokala ändringar skulle skrivas över av %s."

6649

6559 -#: sequencer.c:470

6650 +#: sequencer.c:461

6651 msgid "commit your changes or stash them to proceed."

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

6653

6563 -#: sequencer.c:502

6654 +#: sequencer.c:493

6655 #, c-format

6656 msgid "%s: fast-forward"

6657 msgstr "%s: snabbspola"

6658

6568 -#: sequencer.c:541 builtin/tag.c:565

6659 +#: sequencer.c:532 builtin/tag.c:566

6660 #, c-format

6661 msgid "Invalid cleanup mode %s"

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

@@ -6573,65 +6664,65 @@ msgstr "Felaktigt städningsläge %s"

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

6665 #. "rebase".

6666 #.

6576 -#: sequencer.c:635

6667 +#: sequencer.c:626

6668 #, c-format

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

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

6671

6581 -#: sequencer.c:652

6672 +#: sequencer.c:643

6673 msgid "unable to update cache tree"

6674 msgstr "kan inte uppdatera cacheträd"

6675

6585 -#: sequencer.c:666

6676 +#: sequencer.c:657

6677 msgid "could not resolve HEAD commit"

6678 msgstr "kunde inte bestämma HEAD:s incheckning"

6679

6589 -#: sequencer.c:746

6680 +#: sequencer.c:737

6681 #, c-format

6682 msgid "no key present in '%.*s'"

6683 msgstr "ingen nyckel i \"%.*s\""

6684

6594 -#: sequencer.c:757

6685 +#: sequencer.c:748

6686 #, c-format

6687 msgid "unable to dequote value of '%s'"

6688 msgstr "kan inte ta bort citering av värdet \"%s\""

6689

6599 -#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6600 -#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072

6690 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710

6691 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6692 #, c-format

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

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

6695

6605 -#: sequencer.c:804

6696 +#: sequencer.c:795

6697 msgid "'GIT_AUTHOR_NAME' already given"

6698 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

6699

6609 -#: sequencer.c:809

6700 +#: sequencer.c:800

6701 msgid "'GIT_AUTHOR_EMAIL' already given"

6702 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

6703

6613 -#: sequencer.c:814

6704 +#: sequencer.c:805

6705 msgid "'GIT_AUTHOR_DATE' already given"

6706 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

6707

6617 -#: sequencer.c:818

6708 +#: sequencer.c:809

6709 #, c-format

6710 msgid "unknown variable '%s'"

6711 msgstr "okänd variabel \"%s\""

6712

6622 -#: sequencer.c:823

6713 +#: sequencer.c:814

6714 msgid "missing 'GIT_AUTHOR_NAME'"

6715 msgstr "\"GIT_AUTHOR_NAME\" saknas"

6716

6626 -#: sequencer.c:825

6717 +#: sequencer.c:816

6718 msgid "missing 'GIT_AUTHOR_EMAIL'"

6719 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

6720

6630 -#: sequencer.c:827

6721 +#: sequencer.c:818

6722 msgid "missing 'GIT_AUTHOR_DATE'"

6723 msgstr "\"GIT_AUTHOR_DATE\" saknas"

6724

6634 -#: sequencer.c:876

6725 +#: sequencer.c:867

6726 #, c-format

6727 msgid ""

6728 "you have staged changes in your working tree\n"

@@ -6660,11 +6751,11 @@ msgstr ""

6751 "\n"

6752 " git rebase --continue\n"

6753

6663 -#: sequencer.c:1148

6754 +#: sequencer.c:1141

6755 msgid "'prepare-commit-msg' hook failed"

6756 msgstr "kroken \"prepare-commit-msg\" misslyckades"

6757

6667 -#: sequencer.c:1154

6758 +#: sequencer.c:1147

6759 msgid ""

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

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

@@ -6691,7 +6782,7 @@ msgstr ""

6782 "\n"

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

6784

6694 -#: sequencer.c:1167

6785 +#: sequencer.c:1160

6786 msgid ""

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

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

@@ -6716,326 +6807,331 @@ msgstr ""

6807 "\n"

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

6809

6719 -#: sequencer.c:1209

6810 +#: sequencer.c:1202

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

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

6813

6723 -#: sequencer.c:1211

6814 +#: sequencer.c:1204

6815 msgid "could not parse newly created commit"

6816 msgstr "kunde inte tolka en precis skapad incheckning"

6817

6727 -#: sequencer.c:1257

6818 +#: sequencer.c:1250

6819 msgid "unable to resolve HEAD after creating commit"

6820 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

6821

6731 -#: sequencer.c:1259

6822 +#: sequencer.c:1252

6823 msgid "detached HEAD"

6824 msgstr "frånkopplad HEAD"

6825

6735 -#: sequencer.c:1263

6826 +#: sequencer.c:1256

6827 msgid " (root-commit)"

6828 msgstr " (rotincheckning)"

6829

6739 -#: sequencer.c:1284

6830 +#: sequencer.c:1277

6831 msgid "could not parse HEAD"

6832 msgstr "kunde inte tolka HEAD"

6833

6743 -#: sequencer.c:1286

6834 +#: sequencer.c:1279

6835 #, c-format

6836 msgid "HEAD %s is not a commit!"

6837 msgstr "HEAD %s är inte en incheckning!"

6838

6748 -#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574

6839 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579

6840 msgid "could not parse HEAD commit"

6841 msgstr "kunde inte tolka HEAD:s incheckning"

6842

6752 -#: sequencer.c:1342 sequencer.c:1968

6843 +#: sequencer.c:1335 sequencer.c:1980

6844 msgid "unable to parse commit author"

6845 msgstr "kunde inte tolka incheckningens författare"

6846

6756 -#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687

6847 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695

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

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

6850

6760 -#: sequencer.c:1386 sequencer.c:1447

6851 +#: sequencer.c:1379 sequencer.c:1450

6852 #, c-format

6853 msgid "unable to read commit message from '%s'"

6854 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6855

6765 -#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886

6766 -#: builtin/merge.c:911

6856 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894

6857 +#: builtin/merge.c:919

6858 msgid "failed to write commit object"

6859 msgstr "kunde inte skriva incheckningsobjekt"

6860

6770 -#: sequencer.c:1474

6861 +#: sequencer.c:1433 sequencer.c:4118

6862 +#, c-format

6863 +msgid "could not update %s"

6864 +msgstr "kunde inte uppdatera %s"

6865 +

6866 +#: sequencer.c:1481

6867 #, c-format

6868 msgid "could not parse commit %s"

6869 msgstr "kunde inte tolka incheckningen %s"

6870

6775 -#: sequencer.c:1479

6871 +#: sequencer.c:1486

6872 #, c-format

6873 msgid "could not parse parent commit %s"

6874 msgstr "kunde inte tolka föräldraincheckningen %s"

6875

6780 -#: sequencer.c:1562 sequencer.c:1673

6876 +#: sequencer.c:1569 sequencer.c:1680

6877 #, c-format

6878 msgid "unknown command: %d"

6879 msgstr "okänt kommando: %d"

6880

6785 -#: sequencer.c:1620 sequencer.c:1645

6881 +#: sequencer.c:1627 sequencer.c:1652

6882 #, c-format

6883 msgid "This is a combination of %d commits."

6884 msgstr "Det här är en kombination av %d incheckningar."

6885

6790 -#: sequencer.c:1630

6886 +#: sequencer.c:1637

6887 msgid "need a HEAD to fixup"

6888 msgstr "behöver en HEAD-incheckning att rätta"

6889

6794 -#: sequencer.c:1632 sequencer.c:3212

6890 +#: sequencer.c:1639 sequencer.c:3230

6891 msgid "could not read HEAD"

6892 msgstr "kunde inte läsa HEAD"

6893

6798 -#: sequencer.c:1634

6894 +#: sequencer.c:1641

6895 msgid "could not read HEAD's commit message"

6896 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

6897

6802 -#: sequencer.c:1640

6898 +#: sequencer.c:1647

6899 #, c-format

6900 msgid "cannot write '%s'"

6901 msgstr "kan inte skriva \"%s\""

6902

6807 -#: sequencer.c:1647 git-rebase--preserve-merges.sh:496

6903 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496

6904 msgid "This is the 1st commit message:"

6905 msgstr "Det här är 1:a incheckningsmeddelandet:"

6906

6811 -#: sequencer.c:1655

6907 +#: sequencer.c:1662

6908 #, c-format

6909 msgid "could not read commit message of %s"

6910 msgstr "kunde inte läsa incheckningsmeddelande för %s"

6911

6816 -#: sequencer.c:1662

6912 +#: sequencer.c:1669

6913 #, c-format

6914 msgid "This is the commit message #%d:"

6915 msgstr "Det här är incheckningsmeddelande %d:"

6916

6821 -#: sequencer.c:1668

6917 +#: sequencer.c:1675

6918 #, c-format

6919 msgid "The commit message #%d will be skipped:"

6920 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

6921

6826 -#: sequencer.c:1756

6922 +#: sequencer.c:1763

6923 msgid "your index file is unmerged."

6924 msgstr "din indexfil har inte slagits ihop."

6925

6830 -#: sequencer.c:1763

6926 +#: sequencer.c:1770

6927 msgid "cannot fixup root commit"

6928 msgstr "kan inte göra \"fixup\" på rotincheckning"

6929

6834 -#: sequencer.c:1782

6930 +#: sequencer.c:1789

6931 #, c-format

6932 msgid "commit %s is a merge but no -m option was given."

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

6934

6839 -#: sequencer.c:1790 sequencer.c:1798

6935 +#: sequencer.c:1797 sequencer.c:1805

6936 #, c-format

6937 msgid "commit %s does not have parent %d"

6938 msgstr "incheckning %s har inte förälder %d"

6939

6844 -#: sequencer.c:1804

6940 +#: sequencer.c:1811

6941 #, c-format

6942 msgid "cannot get commit message for %s"

6943 msgstr "kan inte hämta incheckningsmeddelande för %s"

6944

6945 #. TRANSLATORS: The first %s will be a "todo" command like

6946 #. "revert" or "pick", the second %s a SHA1.

6851 -#: sequencer.c:1823

6947 +#: sequencer.c:1830

6948 #, c-format

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

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

6951

6856 -#: sequencer.c:1888

6952 +#: sequencer.c:1895

6953 #, c-format

6954 msgid "could not rename '%s' to '%s'"

6955 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

6956

6861 -#: sequencer.c:1943

6957 +#: sequencer.c:1952

6958 #, c-format

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

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

6961

6866 -#: sequencer.c:1944

6962 +#: sequencer.c:1953

6963 #, c-format

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

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

6966

6871 -#: sequencer.c:1961

6967 +#: sequencer.c:1972

6968 #, c-format

6969 msgid "dropping %s %s -- patch contents already upstream\n"

6970 msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"

6971

6876 -#: sequencer.c:2018

6972 +#: sequencer.c:2030

6973 #, c-format

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

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

6976

6881 -#: sequencer.c:2025

6977 +#: sequencer.c:2037

6978 #, c-format

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

6980 msgstr "git %s: misslyckades uppdatera indexet"

6981

6886 -#: sequencer.c:2102

6982 +#: sequencer.c:2114

6983 #, c-format

6984 msgid "%s does not accept arguments: '%s'"

6985 msgstr "%s tar inte argument: \"%s\""

6986

6891 -#: sequencer.c:2111

6987 +#: sequencer.c:2123

6988 #, c-format

6989 msgid "missing arguments for %s"

6990 msgstr "argument saknas för %s"

6991

6896 -#: sequencer.c:2142

6992 +#: sequencer.c:2154

6993 #, c-format

6994 msgid "could not parse '%s'"

6995 msgstr "kunde inte tolka \"%s\""

6996

6901 -#: sequencer.c:2203

6997 +#: sequencer.c:2215

6998 #, c-format

6999 msgid "invalid line %d: %.*s"

7000 msgstr "ogiltig rad %d: %.*s"

7001

6906 -#: sequencer.c:2214

7002 +#: sequencer.c:2226

7003 #, c-format

7004 msgid "cannot '%s' without a previous commit"

7005 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

7006

6911 -#: sequencer.c:2298

7007 +#: sequencer.c:2310

7008 msgid "cancelling a cherry picking in progress"

7009 msgstr "avbryter pågående \"cherry-pick\""

7010

6915 -#: sequencer.c:2305

7011 +#: sequencer.c:2317

7012 msgid "cancelling a revert in progress"

7013 msgstr "avbryter pågående \"revert\""

7014

6919 -#: sequencer.c:2349

7015 +#: sequencer.c:2361

7016 msgid "please fix this using 'git rebase --edit-todo'."

7017 msgstr "rätta det med \"git rebase --edit-todo\"."

7018

6923 -#: sequencer.c:2351

7019 +#: sequencer.c:2363

7020 #, c-format

7021 msgid "unusable instruction sheet: '%s'"

7022 msgstr "oanvändbart manus: \"%s\""

7023

6928 -#: sequencer.c:2356

7024 +#: sequencer.c:2368

7025 msgid "no commits parsed."

7026 msgstr "inga incheckningar lästes."

7027

6932 -#: sequencer.c:2367

7028 +#: sequencer.c:2379

7029 msgid "cannot cherry-pick during a revert."

7030 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

7031

6936 -#: sequencer.c:2369

7032 +#: sequencer.c:2381

7033 msgid "cannot revert during a cherry-pick."

7034 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

7035

6940 -#: sequencer.c:2447

7036 +#: sequencer.c:2459

7037 #, c-format

7038 msgid "invalid value for %s: %s"

7039 msgstr "felaktigt värde för %s: %s"

7040

6945 -#: sequencer.c:2540

7041 +#: sequencer.c:2556

7042 msgid "unusable squash-onto"

7043 msgstr "oanvändbar squash-onto"

7044

6949 -#: sequencer.c:2556

7045 +#: sequencer.c:2576

7046 #, c-format

7047 msgid "malformed options sheet: '%s'"

7048 msgstr "trasigt manus: \"%s\""

7049

6954 -#: sequencer.c:2644 sequencer.c:4361

7050 +#: sequencer.c:2664 sequencer.c:4469

7051 msgid "empty commit set passed"

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

7053

6958 -#: sequencer.c:2660

7054 +#: sequencer.c:2680

7055 msgid "revert is already in progress"

7056 msgstr "en \"revert\" pågår redan"

7057

6962 -#: sequencer.c:2662

7058 +#: sequencer.c:2682

7059 #, c-format

7060 msgid "try \"git revert (--continue | %s--abort | --quit)\""

7061 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""

7062

6967 -#: sequencer.c:2665

7063 +#: sequencer.c:2685

7064 msgid "cherry-pick is already in progress"

7065 msgstr "en \"cherry-pick\" pågår redan"

7066

6971 -#: sequencer.c:2667

7067 +#: sequencer.c:2687

7068 #, c-format

7069 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""

7070 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""

7071

6976 -#: sequencer.c:2681

7072 +#: sequencer.c:2701

7073 #, c-format

7074 msgid "could not create sequencer directory '%s'"

7075 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

7076

6981 -#: sequencer.c:2696

7077 +#: sequencer.c:2716

7078 msgid "could not lock HEAD"

7079 msgstr "kunde inte låsa HEAD"

7080

6985 -#: sequencer.c:2756 sequencer.c:4099

7081 +#: sequencer.c:2776 sequencer.c:4206

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

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

7084

6989 -#: sequencer.c:2758 sequencer.c:2769

7085 +#: sequencer.c:2778 sequencer.c:2789

7086 msgid "cannot resolve HEAD"

7087 msgstr "kan inte bestämma HEAD"

7088

6993 -#: sequencer.c:2760 sequencer.c:2804

7089 +#: sequencer.c:2780 sequencer.c:2824

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

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

7092

6997 -#: sequencer.c:2790 builtin/grep.c:724

7093 +#: sequencer.c:2810 builtin/grep.c:744

7094 #, c-format

7095 msgid "cannot open '%s'"

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

7097

7002 -#: sequencer.c:2792

7098 +#: sequencer.c:2812

7099 #, c-format

7100 msgid "cannot read '%s': %s"

7101 msgstr "kan inte läsa \"%s\": %s"

7102

7007 -#: sequencer.c:2793

7103 +#: sequencer.c:2813

7104 msgid "unexpected end of file"

7105 msgstr "oväntat filslut"

7106

7011 -#: sequencer.c:2799

7107 +#: sequencer.c:2819

7108 #, c-format

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

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

7111

7016 -#: sequencer.c:2810

7112 +#: sequencer.c:2830

7113 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

7114 msgstr ""

7115 "Du verkar ha flyttat HEAD.\n"

7116 "Spolar inte tillbaka, kontrollera HEAD!"

7117

7022 -#: sequencer.c:2851

7118 +#: sequencer.c:2871

7119 msgid "no revert in progress"

7120 msgstr "ingen \"revers\" pågår"

7121

7026 -#: sequencer.c:2859

7122 +#: sequencer.c:2879

7123 msgid "no cherry-pick in progress"

7124 msgstr "ingen \"cherry-pick\" pågår"

7125

7030 -#: sequencer.c:2869

7126 +#: sequencer.c:2889

l10n: sv.po: Update Swedish translation (4839t0f0u)