db7ca47599 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2020-07-10 09:53+0800\n"

11 -"PO-Revision-Date: 2020-07-11 17:50+0100\n"

10 +"POT-Creation-Date: 2020-10-10 09:32+0800\n"

11 +"PO-Revision-Date: 2020-10-11 11:52+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"

@@ -23,9 +23,9 @@ msgstr ""

23 msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

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

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

27 +#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526

28 +#: builtin/rebase.c:1944

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

31

@@ -53,7 +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 reset.c:89 sequencer.c:3336

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

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

@@ -69,7 +69,7 @@ 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

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

72 +#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295

73 #: builtin/reset.c:145

74 #, c-format

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

@@ -111,21 +111,21 @@ msgstr[1] "lade till %d sökvägar\n"

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorerar ej sammanslagen: %s"

113

114 -#: add-interactive.c:929 add-patch.c:1691 git-add--interactive.perl:1368

114 +#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr "Endast binära filer ändrade.\n"

118

119 -#: add-interactive.c:931 add-patch.c:1689 git-add--interactive.perl:1370

119 +#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

123

124 -#: add-interactive.c:935 git-add--interactive.perl:1378

124 +#: add-interactive.c:935 git-add--interactive.perl:1381

125 msgid "Patch update"

126 msgstr "Uppdatera patch"

127

128 -#: add-interactive.c:974 git-add--interactive.perl:1771

128 +#: add-interactive.c:974 git-add--interactive.perl:1794

129 msgid "Review diff"

130 msgstr "Granska diff"

131

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

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

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

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

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

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

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

201 msgid "What now"

202 msgstr "Vad nu"

203

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

209 msgid "unstaged"

210 msgstr "ej köad"

211

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

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

212 +#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270

213 +#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123

214 +#: builtin/fetch.c:147 builtin/merge.c:275 builtin/pull.c:190

215 +#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818

216 +#: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326

217 +#: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572

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

219 msgid "path"

220 msgstr "sökväg"

@@ -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:781 git-add--interactive.perl:1782

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

227 #, c-format

228 msgid "Bye.\n"

229 msgstr "Hej då.\n"

230

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

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

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:35 git-add--interactive.perl:1431

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

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:36 git-add--interactive.perl:1432

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

242 #, c-format, perl-format

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

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

245

246 -#: add-patch.c:37 git-add--interactive.perl:1433

246 +#: add-patch.c:37 git-add--interactive.perl:1436

247 #, c-format, perl-format

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

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

@@ -270,22 +270,22 @@ msgstr ""

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

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

272

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

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

274 #, c-format, perl-format

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

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

277

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

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

279 #, c-format, perl-format

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

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

282

283 -#: add-patch.c:58 git-add--interactive.perl:1438

283 +#: add-patch.c:58 git-add--interactive.perl:1441

284 #, c-format, perl-format

285 msgid "Stash addition [y,n,q,a,d%s,?]? "

286 msgstr "Stash:a tillägg [y,n,q,a,d%s,?]? "

287

288 -#: add-patch.c:59 git-add--interactive.perl:1439

288 +#: add-patch.c:59 git-add--interactive.perl:1442

289 #, c-format, perl-format

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

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

@@ -312,22 +312,22 @@ msgstr ""

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

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

314

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

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

316 #, c-format, perl-format

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

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

319

320 -#: add-patch.c:81 git-add--interactive.perl:1443

320 +#: add-patch.c:81 git-add--interactive.perl:1446

321 #, c-format, perl-format

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

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

324

325 -#: add-patch.c:82 git-add--interactive.perl:1444

325 +#: add-patch.c:82 git-add--interactive.perl:1447

326 #, c-format, perl-format

327 msgid "Unstage addition [y,n,q,a,d%s,?]? "

328 msgstr "Ta bort tillägg från kön [y,n,q,a,d%s,?]? "

329

330 -#: add-patch.c:83 git-add--interactive.perl:1445

330 +#: add-patch.c:83 git-add--interactive.perl:1448

331 #, c-format, perl-format

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

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

@@ -354,22 +354,22 @@ msgstr ""

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

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

356

357 -#: add-patch.c:103 git-add--interactive.perl:1448

357 +#: add-patch.c:103 git-add--interactive.perl:1451

358 #, c-format, perl-format

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

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

361

362 -#: add-patch.c:104 git-add--interactive.perl:1449

362 +#: add-patch.c:104 git-add--interactive.perl:1452

363 #, c-format, perl-format

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

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

366

367 -#: add-patch.c:105 git-add--interactive.perl:1450

367 +#: add-patch.c:105 git-add--interactive.perl:1453

368 #, c-format, perl-format

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

370 msgstr "Applicera tillägg på indexet [y,n,q,a,d%s,?]? "

371

372 -#: add-patch.c:106 git-add--interactive.perl:1451

372 +#: add-patch.c:106 git-add--interactive.perl:1454

373 #, c-format, perl-format

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

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

@@ -396,26 +396,26 @@ msgstr ""

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

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

398

399 -#: add-patch.c:126 git-add--interactive.perl:1454

400 -#: git-add--interactive.perl:1472

399 +#: add-patch.c:126 git-add--interactive.perl:1457

400 +#: git-add--interactive.perl:1475

401 #, c-format, perl-format

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

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

404

405 -#: add-patch.c:127 git-add--interactive.perl:1455

406 -#: git-add--interactive.perl:1473

405 +#: add-patch.c:127 git-add--interactive.perl:1458

406 +#: git-add--interactive.perl:1476

407 #, c-format, perl-format

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

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

410

411 -#: add-patch.c:128 git-add--interactive.perl:1456

412 -#: git-add--interactive.perl:1474

411 +#: add-patch.c:128 git-add--interactive.perl:1459

412 +#: git-add--interactive.perl:1477

413 #, c-format, perl-format

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

415 msgstr "Kasta tillägg från arbetskatalogen [y,n,q,a,d%s,?]? "

416

417 -#: add-patch.c:129 git-add--interactive.perl:1457

418 -#: git-add--interactive.perl:1475

417 +#: add-patch.c:129 git-add--interactive.perl:1460

418 +#: git-add--interactive.perl:1478

419 #, c-format, perl-format

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

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

@@ -442,22 +442,22 @@ msgstr ""

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

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

444

445 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1460

445 +#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1463

446 #, c-format, perl-format

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

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

449

450 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1461

450 +#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1464

451 #, c-format, perl-format

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

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

454

455 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1462

455 +#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1465

456 #, c-format, perl-format

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

458 msgstr "Kasta tillägg från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

459

460 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1463

460 +#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1466

461 #, c-format, perl-format

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

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

@@ -476,22 +476,22 @@ msgstr ""

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

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

478

479 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1466

479 +#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1469

480 #, c-format, perl-format

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

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

483

484 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1467

484 +#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1470

485 #, c-format, perl-format

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

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

488

489 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1468

489 +#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1471

490 #, c-format, perl-format

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

492 msgstr "Applicera tillägg på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "

493

494 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1469

494 +#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1472

495 #, c-format, perl-format

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

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

@@ -524,34 +524,34 @@ msgstr ""

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

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

526

527 -#: add-patch.c:328

527 +#: add-patch.c:342

528 #, c-format

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

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

531

532 -#: add-patch.c:347 add-patch.c:351

532 +#: add-patch.c:361 add-patch.c:365

533 #, c-format

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

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

536

537 -#: add-patch.c:405

537 +#: add-patch.c:419

538 msgid "could not parse diff"

539 msgstr "kunde inte tolka diff"

540

541 -#: add-patch.c:424

541 +#: add-patch.c:438

542 msgid "could not parse colored diff"

543 msgstr "kunde inte tolka färgad diff"

544

545 -#: add-patch.c:438

545 +#: add-patch.c:452

546 #, c-format

547 msgid "failed to run '%s'"

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

549

550 -#: add-patch.c:602

550 +#: add-patch.c:611

551 msgid "mismatched output from interactive.diffFilter"

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

553

554 -#: add-patch.c:603

554 +#: add-patch.c:612

555 msgid ""

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

557 "between its input and output lines."

@@ -559,7 +559,7 @@ msgstr ""

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

560 "ditt filter."

561

562 -#: add-patch.c:776

562 +#: add-patch.c:785

563 #, c-format

564 msgid ""

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

@@ -568,7 +568,7 @@ msgstr ""

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

569 "%.*s"

570

571 -#: add-patch.c:791

571 +#: add-patch.c:800

572 #, c-format

573 msgid ""

574 "hunks do not overlap:\n"

@@ -581,11 +581,11 @@ msgstr ""

581 "\tavslutas inte med:\n"

582 "%.*s"

583

584 -#: add-patch.c:1067 git-add--interactive.perl:1114

584 +#: add-patch.c:1076 git-add--interactive.perl:1117

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

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

587

588 -#: add-patch.c:1071

588 +#: add-patch.c:1080

589 #, c-format

590 msgid ""

591 "---\n"

@@ -599,7 +599,7 @@ msgstr ""

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

600

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

602 -#: add-patch.c:1085 git-add--interactive.perl:1128

602 +#: add-patch.c:1094 git-add--interactive.perl:1131

603 msgid ""

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

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

@@ -609,11 +609,11 @@ msgstr ""

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

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

611

612 -#: add-patch.c:1118

612 +#: add-patch.c:1127

613 msgid "could not parse hunk header"

614 msgstr "kunde inte tolka styckehuvud"

615

616 -#: add-patch.c:1163

616 +#: add-patch.c:1172

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

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

619

@@ -629,26 +629,26 @@ msgstr "\"git apply --cached\" misslyckades"

629 #. Consider translating (saying "no" discards!) as

630 #. (saying "n" for "no" discards!) if the translation

631 #. of the word "no" does not start with n.

632 -#: add-patch.c:1232 git-add--interactive.perl:1241

632 +#: add-patch.c:1241 git-add--interactive.perl:1244

633 msgid ""

634 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "

635 msgstr ""

636 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "

637 "[y/n]? "

638

639 -#: add-patch.c:1275

639 +#: add-patch.c:1284

640 msgid "The selected hunks do not apply to the index!"

641 msgstr "Markerade stycken kan inte appliceras på indexet!"

642

643 -#: add-patch.c:1276 git-add--interactive.perl:1345

643 +#: add-patch.c:1285 git-add--interactive.perl:1348

644 msgid "Apply them to the worktree anyway? "

645 msgstr "Applicera dem på arbetskatalogen trots det? "

646

647 -#: add-patch.c:1283 git-add--interactive.perl:1348

647 +#: add-patch.c:1292 git-add--interactive.perl:1351

648 msgid "Nothing was applied.\n"

649 msgstr "Ingenting applicerades.\n"

650

651 -#: add-patch.c:1340

651 +#: add-patch.c:1349

652 msgid ""

653 "j - leave this hunk undecided, see next undecided hunk\n"

654 "J - leave this hunk undecided, see next hunk\n"

@@ -670,69 +670,69 @@ msgstr ""

670 "e - redigera aktuellt stycke manuellt\n"

671 "? - visa hjälp\n"

672

673 -#: add-patch.c:1463 add-patch.c:1473

673 +#: add-patch.c:1511 add-patch.c:1521

674 msgid "No previous hunk"

675 msgstr "Inget föregående stycke"

676

677 -#: add-patch.c:1468 add-patch.c:1478

677 +#: add-patch.c:1516 add-patch.c:1526

678 msgid "No next hunk"

679 msgstr "Inget följande stycke"

680

681 -#: add-patch.c:1484

681 +#: add-patch.c:1532

682 msgid "No other hunks to goto"

683 msgstr "Inga andra stycken att gå till"

684

685 -#: add-patch.c:1495 git-add--interactive.perl:1594

685 +#: add-patch.c:1543 git-add--interactive.perl:1608

686 msgid "go to which hunk (<ret> to see more)? "

687 msgstr "gå till vilket stycke (<ret> för att se fler)? "

688

689 -#: add-patch.c:1496 git-add--interactive.perl:1596

689 +#: add-patch.c:1544 git-add--interactive.perl:1610

690 msgid "go to which hunk? "

691 msgstr "gå till vilket stycke? "

692

693 -#: add-patch.c:1507

693 +#: add-patch.c:1555

694 #, c-format

695 msgid "Invalid number: '%s'"

696 msgstr "Ogiltigt siffervärde: \"%s\""

697

698 -#: add-patch.c:1512

698 +#: add-patch.c:1560

699 #, c-format

700 msgid "Sorry, only %d hunk available."

701 msgid_plural "Sorry, only %d hunks available."

702 msgstr[0] "Beklagar, det finns bara %d stycke."

703 msgstr[1] "Beklagar, det finns bara %d stycken."

704

705 -#: add-patch.c:1521

705 +#: add-patch.c:1569

706 msgid "No other hunks to search"

707 msgstr "Inga andra stycken att söka efter"

708

709 -#: add-patch.c:1527 git-add--interactive.perl:1640

709 +#: add-patch.c:1575 git-add--interactive.perl:1663

710 msgid "search for regex? "

711 msgstr "sök efter reguljärt uttryck? "

712

713 -#: add-patch.c:1542

713 +#: add-patch.c:1590

714 #, c-format

715 msgid "Malformed search regexp %s: %s"

716 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"

717

718 -#: add-patch.c:1559

718 +#: add-patch.c:1607

719 msgid "No hunk matches the given pattern"

720 msgstr "Inga stycken motsvarar givet mönster"

721

722 -#: add-patch.c:1566

722 +#: add-patch.c:1614

723 msgid "Sorry, cannot split this hunk"

724 msgstr "Beklagar, kan inte dela stycket"

725

726 -#: add-patch.c:1570

726 +#: add-patch.c:1618

727 #, c-format

728 msgid "Split into %d hunks."

729 msgstr "Dela i %d stycken."

730

731 -#: add-patch.c:1574

731 +#: add-patch.c:1622

732 msgid "Sorry, cannot edit this hunk"

733 msgstr "Beklagar, kan inte redigera stycket"

734

735 -#: add-patch.c:1625

735 +#: add-patch.c:1674

736 msgid "'git apply' failed"

737 msgstr "\"git apply\" misslyckades"

738

@@ -797,7 +797,7 @@ msgstr ""

797 msgid "Exiting because of an unresolved conflict."

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

799

800 -#: advice.c:278 builtin/merge.c:1353

800 +#: advice.c:278 builtin/merge.c:1349

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

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

803

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

1101 msgid "cannot checkout %s"

1102 msgstr "kan inte checka ut %s"

1103

1104 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308

1104 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308

1105 #, c-format

1106 msgid "failed to read %s"

1107 msgstr "misslyckades läsa %s"

@@ -1121,7 +1121,7 @@ msgstr "sökvägen %s har ändrat namn/tagits bort"

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

1122 msgstr "%s: finns inte i indexet"

1123

1124 -#: apply.c:3537 apply.c:3708

1124 +#: apply.c:3537 apply.c:3708 apply.c:3953

1125 #, c-format

1126 msgid "%s: does not match index"

1127 msgstr "%s: motsvarar inte indexet"

@@ -1171,360 +1171,355 @@ msgstr "%s: fel typ"

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

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

1173

1174 -#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856

1175 -#: read-cache.c:1325

1174 +#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858

1175 +#: read-cache.c:1313

1176 #, c-format

1177 msgid "invalid path '%s'"

1178 msgstr "ogiltig sökväg \"%s\""

1179

1180 -#: apply.c:3936

1180 +#: apply.c:3950

1181 #, c-format

1182 msgid "%s: already exists in index"

1183 msgstr "%s: finns redan i indexet"

1184

1185 -#: apply.c:3939

1185 +#: apply.c:3956

1186 #, c-format

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

1188 msgstr "%s: finns redan i arbetskatalogen"

1189

1190 -#: apply.c:3959

1190 +#: apply.c:3976

1191 #, c-format

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

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

1194

1195 -#: apply.c:3964

1195 +#: apply.c:3981

1196 #, c-format

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

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

1199

1200 -#: apply.c:3984

1200 +#: apply.c:4001

1201 #, c-format

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

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

1204

1205 -#: apply.c:3988

1205 +#: apply.c:4005

1206 #, c-format

1207 msgid "%s: patch does not apply"

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

1209

1210 -#: apply.c:4003

1210 +#: apply.c:4020

1211 #, c-format

1212 msgid "Checking patch %s..."

1213 msgstr "Kontrollerar patchen %s..."

1214

1215 -#: apply.c:4095

1215 +#: apply.c:4112

1216 #, c-format

1217 msgid "sha1 information is lacking or useless for submodule %s"

1218 msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"

1219

1220 -#: apply.c:4102

1220 +#: apply.c:4119

1221 #, c-format

1222 msgid "mode change for %s, which is not in current HEAD"

1223 msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

1224

1225 -#: apply.c:4105

1225 +#: apply.c:4122

1226 #, c-format

1227 msgid "sha1 information is lacking or useless (%s)."

1228 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."

1229

1230 -#: apply.c:4114

1230 +#: apply.c:4131

1231 #, c-format

1232 msgid "could not add %s to temporary index"

1233 msgstr "kunde inte lägga till %s till temporärt index"

1234

1235 -#: apply.c:4124

1235 +#: apply.c:4141

1236 #, c-format

1237 msgid "could not write temporary index to %s"

1238 msgstr "kunde inte skriva temporärt index till %s"

1239

1240 -#: apply.c:4262

1240 +#: apply.c:4279

1241 #, c-format

1242 msgid "unable to remove %s from index"

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

1244

1245 -#: apply.c:4296

1245 +#: apply.c:4313

1246 #, c-format

1247 msgid "corrupt patch for submodule %s"

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

1249

1250 -#: apply.c:4302

1250 +#: apply.c:4319

1251 #, c-format

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

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

1254

1255 -#: apply.c:4310

1255 +#: apply.c:4327

1256 #, c-format

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

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

1259

1260 -#: apply.c:4316 apply.c:4461

1260 +#: apply.c:4333 apply.c:4478

1261 #, c-format

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

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

1264

1265 -#: apply.c:4359

1265 +#: apply.c:4376 builtin/bisect--helper.c:537

1266 #, c-format

1267 msgid "failed to write to '%s'"

1268 msgstr "misslyckades skriva till \"%s\""

1269

1270 -#: apply.c:4363

1270 +#: apply.c:4380

1271 #, c-format

1272 msgid "closing file '%s'"

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

1274

1275 -#: apply.c:4433

1275 +#: apply.c:4450

1276 #, c-format

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

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

1279

1280 -#: apply.c:4531

1280 +#: apply.c:4548

1281 #, c-format

1282 msgid "Applied patch %s cleanly."

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

1284

1285 -#: apply.c:4539

1285 +#: apply.c:4556

1286 msgid "internal error"

1287 msgstr "internt fel"

1288

1289 -#: apply.c:4542

1289 +#: apply.c:4559

1290 #, c-format

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

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

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

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

1295

1296 -#: apply.c:4553

1296 +#: apply.c:4570

1297 #, c-format

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

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

1300

1301 -#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195

1301 +#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228

1302 #, c-format

1303 msgid "cannot open %s"

1304 msgstr "kan inte öppna %s"

1305

1306 -#: apply.c:4575

1306 +#: apply.c:4592

1307 #, c-format

1308 msgid "Hunk #%d applied cleanly."

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

1310

1311 -#: apply.c:4579

1311 +#: apply.c:4596

1312 #, c-format

1313 msgid "Rejected hunk #%d."

1314 msgstr "Refuserar stycke %d."

1315

1316 -#: apply.c:4698

1316 +#: apply.c:4715

1317 #, c-format

1318 msgid "Skipped patch '%s'."

1319 msgstr "Ignorerar patch \"%s\"."

1320

1321 -#: apply.c:4706

1321 +#: apply.c:4723

1322 msgid "unrecognized input"

1323 msgstr "indata känns inte igen"

1324

1325 -#: apply.c:4726

1325 +#: apply.c:4743

1326 msgid "unable to read index file"

1327 msgstr "kan inte läsa indexfilen"

1328

1329 -#: apply.c:4883

1329 +#: apply.c:4900

1330 #, c-format

1331 msgid "can't open patch '%s': %s"

1332 msgstr "kan inte öppna patchen \"%s\": %s"

1333

1334 -#: apply.c:4910

1334 +#: apply.c:4927

1335 #, c-format

1336 msgid "squelched %d whitespace error"

1337 msgid_plural "squelched %d whitespace errors"

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

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

1340

1341 -#: apply.c:4916 apply.c:4931

1341 +#: apply.c:4933 apply.c:4948

1342 #, c-format

1343 msgid "%d line adds whitespace errors."

1344 msgid_plural "%d lines add whitespace errors."

1345 msgstr[0] "%d rad lägger till fel i blanksteg."

1346 msgstr[1] "%d rader lägger till fel i blanksteg."

1347

1348 -#: apply.c:4924

1348 +#: apply.c:4941

1349 #, c-format

1350 msgid "%d line applied after fixing whitespace errors."

1351 msgid_plural "%d lines applied after fixing whitespace errors."

1352 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."

1353 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

1354

1355 -#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406

1355 +#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406

1356 msgid "Unable to write new index file"

1357 msgstr "Kunde inte skriva ny indexfil"

1358

1359 -#: apply.c:4968

1359 +#: apply.c:4985

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

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

1362

1363 -#: apply.c:4971

1363 +#: apply.c:4988

1364 msgid "apply changes matching the given path"

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

1366

1367 -#: apply.c:4973 builtin/am.c:2259

1367 +#: apply.c:4990 builtin/am.c:2279

1368 msgid "num"

1369 msgstr "antal"

1370

1371 -#: apply.c:4974

1371 +#: apply.c:4991

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

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

1374

1375 -#: apply.c:4977

1375 +#: apply.c:4994

1376 msgid "ignore additions made by the patch"

1377 msgstr "ignorera tillägg gjorda av patchen"

1378

1379 -#: apply.c:4979

1379 +#: apply.c:4996

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

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

1382

1383 -#: apply.c:4983

1383 +#: apply.c:5000

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

1385 msgstr "visa antal tillagda och borttagna rader decimalt"

1386

1387 -#: apply.c:4985

1387 +#: apply.c:5002

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

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

1390

1391 -#: apply.c:4987

1391 +#: apply.c:5004

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

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

1394

1395 -#: apply.c:4989

1395 +#: apply.c:5006

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

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

1398

1399 -#: apply.c:4991

1399 +#: apply.c:5008

1400 msgid "mark new files with `git add --intent-to-add`"

1401 msgstr "markera nya filer med \"git add --intent-to-add\""

1402

1403 -#: apply.c:4993

1403 +#: apply.c:5010

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

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

1406

1407 -#: apply.c:4995

1407 +#: apply.c:5012

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

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

1410

1411 -#: apply.c:4998

1411 +#: apply.c:5015

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

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

1414

1415 -#: apply.c:5000

1415 +#: apply.c:5017

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

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

1418

1419 -#: apply.c:5002

1419 +#: apply.c:5019

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

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

1422

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

1423 +#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525

1424 msgid "paths are separated with NUL character"

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

1426

1427 -#: apply.c:5007

1427 +#: apply.c:5024

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

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

1430

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

1431 +#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98

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

1433 -#: builtin/pack-objects.c:3530 builtin/rebase.c:1332

1433 +#: builtin/pack-objects.c:3562 builtin/rebase.c:1340

1434 msgid "action"

1435 msgstr "åtgärd"

1436

1437 -#: apply.c:5009

1437 +#: apply.c:5026

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

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

1440

1441 -#: apply.c:5012 apply.c:5015

1441 +#: apply.c:5029 apply.c:5032

1442 msgid "ignore changes in whitespace when finding context"

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

1444

1445 -#: apply.c:5018

1445 +#: apply.c:5035

1446 msgid "apply the patch in reverse"

1447 msgstr "tillämpa patchen baklänges"

1448

1449 -#: apply.c:5020

1449 +#: apply.c:5037

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

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

1452

1453 -#: apply.c:5022

1453 +#: apply.c:5039

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

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

1456

1457 -#: apply.c:5024

1457 +#: apply.c:5041

1458 msgid "allow overlapping hunks"

1459 msgstr "tillåt överlappande stycken"

1460

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

1462 -#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775

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

1461 +#: apply.c:5042 builtin/add.c:329 builtin/check-ignore.c:22

1462 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775

1463 +#: builtin/log.c:2270 builtin/mv.c:123 builtin/read-tree.c:128

1464 msgid "be verbose"

1465 msgstr "var pratsam"

1466

1467 -#: apply.c:5027

1467 +#: apply.c:5044

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

1469 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1470

1471 -#: apply.c:5030

1471 +#: apply.c:5047

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

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

1474

1475 -#: apply.c:5032 builtin/am.c:2247

1475 +#: apply.c:5049 builtin/am.c:2267

1476 msgid "root"

1477 msgstr "rot"

1478

1479 -#: apply.c:5033

1479 +#: apply.c:5050

1480 msgid "prepend <root> to all filenames"

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

1482

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

1483 +#: archive-tar.c:125 archive-zip.c:345

1484 #, c-format

1485 msgid "cannot stream blob %s"

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

1487

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

1488 +#: archive-tar.c:265 archive-zip.c:358

1489 #, c-format

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

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

1492

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

1494 -#, c-format

1495 -msgid "cannot read %s"

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

1497 -

1498 -#: archive-tar.c:465

1493 +#: archive-tar.c:449

1494 #, c-format

1495 msgid "unable to start '%s' filter"

1496 msgstr "kunde inte starta filtret \"%s\""

1497

1503 -#: archive-tar.c:468

1498 +#: archive-tar.c:452

1499 msgid "unable to redirect descriptor"

1500 msgstr "kan inte omdirigera handtag"

1501

1507 -#: archive-tar.c:475

1502 +#: archive-tar.c:459

1503 #, c-format

1504 msgid "'%s' filter reported error"

1505 msgstr "filtret \"%s\" rapporterade fel"

1506

1512 -#: archive-zip.c:319

1507 +#: archive-zip.c:318

1508 #, c-format

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

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

1511

1517 -#: archive-zip.c:323

1512 +#: archive-zip.c:322

1513 #, c-format

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

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

1516

1522 -#: archive-zip.c:480 builtin/pack-objects.c:243 builtin/pack-objects.c:246

1517 +#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247

1518 #, c-format

1519 msgid "deflate error (%d)"

1520 msgstr "fel i deflate (%d)"

1521

1527 -#: archive-zip.c:615

1522 +#: archive-zip.c:603

1523 #, c-format

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

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

@@ -1548,119 +1543,149 @@ msgstr ""

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

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

1545

1551 -#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315

1546 +#: archive.c:192

1547 +#, c-format

1548 +msgid "cannot read %s"

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

1550 +

1551 +#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852

1552 +#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786

1553 +#: builtin/merge.c:1124

1554 +#, c-format

1555 +msgid "could not read '%s'"

1556 +msgstr "kunde inte läsa \"%s\""

1557 +

1558 +#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315

1559 #, c-format

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

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

1562

1556 -#: archive.c:401

1563 +#: archive.c:454

1564 #, c-format

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

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

1567

1561 -#: archive.c:407

1568 +#: archive.c:460

1569 #, c-format

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

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

1572

1566 -#: archive.c:420

1573 +#: archive.c:473

1574 #, c-format

1575 msgid "not a tree object: %s"

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

1577

1571 -#: archive.c:432

1578 +#: archive.c:485

1579 msgid "current working directory is untracked"

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

1581

1575 -#: archive.c:464

1582 +#: archive.c:526

1583 +#, c-format

1584 +msgid "File not found: %s"

1585 +msgstr "Hittar inte filen: %s"

1586 +

1587 +#: archive.c:528

1588 +#, c-format

1589 +msgid "Not a regular file: %s"

1590 +msgstr "Inte en vanlig fil: %s"

1591 +

1592 +#: archive.c:553

1593 msgid "fmt"

1594 msgstr "fmt"

1595

1579 -#: archive.c:464

1596 +#: archive.c:553

1597 msgid "archive format"

1598 msgstr "arkivformat"

1599

1583 -#: archive.c:465 builtin/log.c:1674

1600 +#: archive.c:554 builtin/log.c:1760

1601 msgid "prefix"

1602 msgstr "prefix"

1603

1587 -#: archive.c:466

1604 +#: archive.c:555

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

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

1607

1591 -#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866

1592 -#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1208

1593 -#: builtin/fast-export.c:1210 builtin/fast-export.c:1214 builtin/grep.c:907

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

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

1596 -#: parse-options.h:190

1608 +#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888

1609 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133

1610 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1611 +#: builtin/fast-export.c:1214 builtin/grep.c:908 builtin/hash-object.c:105

1612 +#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412

1613 +#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190

1614 msgid "file"

1615 msgstr "fil"

1616

1600 -#: archive.c:468 builtin/archive.c:90

1617 +#: archive.c:557

1618 +msgid "add untracked file to archive"

1619 +msgstr "ta med ospårade filer i arkivet"

1620 +

1621 +#: archive.c:560 builtin/archive.c:90

1622 msgid "write the archive to this file"

1623 msgstr "skriv arkivet till filen"

1624

1604 -#: archive.c:470

1625 +#: archive.c:562

1626 msgid "read .gitattributes in working directory"

1627 msgstr "läs .gitattributes i arbetskatalogen"

1628

1608 -#: archive.c:471

1629 +#: archive.c:563

1630 msgid "report archived files on stderr"

1631 msgstr "rapportera arkiverade filer på standard fel"

1632

1612 -#: archive.c:472

1633 +#: archive.c:564

1634 msgid "store only"

1635 msgstr "endast spara"

1636

1616 -#: archive.c:473

1637 +#: archive.c:565

1638 msgid "compress faster"

1639 msgstr "komprimera snabbare"

1640

1620 -#: archive.c:481

1641 +#: archive.c:573

1642 msgid "compress better"

1643 msgstr "komprimera bättre"

1644

1624 -#: archive.c:484

1645 +#: archive.c:576

1646 msgid "list supported archive formats"

1647 msgstr "visa understödda arkivformat"

1648

1628 -#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

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

1649 +#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116

1650 +#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335

1651 msgid "repo"

1652 msgstr "arkiv"

1653

1633 -#: archive.c:487 builtin/archive.c:92

1654 +#: archive.c:579 builtin/archive.c:92

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

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

1657

1637 -#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715

1658 +#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715

1659 #: builtin/notes.c:498

1660 msgid "command"

1661 msgstr "kommando"

1662

1642 -#: archive.c:489 builtin/archive.c:94

1663 +#: archive.c:581 builtin/archive.c:94

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

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

1666

1646 -#: archive.c:496

1667 +#: archive.c:588

1668 msgid "Unexpected option --remote"

1669 msgstr "Oväntad flagga --remote"

1670

1650 -#: archive.c:498

1671 +#: archive.c:590

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

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

1674

1654 -#: archive.c:500

1675 +#: archive.c:592

1676 msgid "Unexpected option --output"

1677 msgstr "Oväntad flagga --output"

1678

1658 -#: archive.c:522

1679 +#: archive.c:594

1680 +msgid "Options --add-file and --remote cannot be used together"

1681 +msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"

1682 +

1683 +#: archive.c:616

1684 #, c-format

1685 msgid "Unknown archive format '%s'"

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

1687

1663 -#: archive.c:529

1688 +#: archive.c:623

1689 #, c-format

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

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

@@ -1683,22 +1708,22 @@ msgstr ""

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

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

1710

1686 -#: bisect.c:468

1711 +#: bisect.c:476

1712 #, c-format

1713 msgid "Badly quoted content in file '%s': %s"

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

1715

1691 -#: bisect.c:678

1716 +#: bisect.c:686

1717 #, c-format

1718 msgid "We cannot bisect more!\n"

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

1720

1696 -#: bisect.c:745

1721 +#: bisect.c:753

1722 #, c-format

1723 msgid "Not a valid commit name %s"

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

1725

1701 -#: bisect.c:770

1726 +#: bisect.c:778

1727 #, c-format

1728 msgid ""

1729 "The merge base %s is bad.\n"

@@ -1707,7 +1732,7 @@ msgstr ""

1732 "Sammanslagningsbasen %s är trasig.\n"

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

1734

1710 -#: bisect.c:775

1735 +#: bisect.c:783

1736 #, c-format

1737 msgid ""

1738 "The merge base %s is new.\n"

@@ -1716,7 +1741,7 @@ msgstr ""

1741 "Sammanslagningsbasen %s är ny.\n"

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

1743

1719 -#: bisect.c:780

1744 +#: bisect.c:788

1745 #, c-format

1746 msgid ""

1747 "The merge base %s is %s.\n"

@@ -1725,7 +1750,7 @@ msgstr ""

1750 "Sammanslagningsbasen %s är %s.\n"

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

1752

1728 -#: bisect.c:788

1753 +#: bisect.c:796

1754 #, c-format

1755 msgid ""

1756 "Some %s revs are not ancestors of the %s rev.\n"

@@ -1736,7 +1761,7 @@ msgstr ""

1761 "git bisect kan inte fungera korrekt i detta fall.\n"

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

1763

1739 -#: bisect.c:801

1764 +#: bisect.c:809

1765 #, c-format

1766 msgid ""

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

@@ -1748,36 +1773,36 @@ msgstr ""

1773 "%s.\n"

1774 "Vi fortsätter ändå."

1775

1751 -#: bisect.c:840

1776 +#: bisect.c:848

1777 #, c-format

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

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

1780

1756 -#: bisect.c:890

1781 +#: bisect.c:898

1782 #, c-format

1783 msgid "a %s revision is needed"

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

1785

1761 -#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255

1786 +#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255

1787 #, c-format

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

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

1790

1766 -#: bisect.c:966 builtin/merge.c:151

1791 +#: bisect.c:974 builtin/merge.c:150

1792 #, c-format

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

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

1795

1771 -#: bisect.c:997

1796 +#: bisect.c:1014

1797 msgid "reading bisect refs failed"

1798 msgstr "misslyckades läsa bisect-referenser"

1799

1775 -#: bisect.c:1019

1800 +#: bisect.c:1044

1801 #, c-format

1802 msgid "%s was both %s and %s\n"

1803 msgstr "%s var både %s och %s\n"

1804

1780 -#: bisect.c:1028

1805 +#: bisect.c:1053

1806 #, c-format

1807 msgid ""

1808 "No testable commit found.\n"

@@ -1786,7 +1811,7 @@ msgstr ""

1811 "Ingen testbar incheckning hittades.\n"

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

1813

1789 -#: bisect.c:1057

1814 +#: bisect.c:1082

1815 #, c-format

1816 msgid "(roughly %d step)"

1817 msgid_plural "(roughly %d steps)"

@@ -1796,48 +1821,48 @@ msgstr[1] "(ungefär %d steg)"

1821 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

1822 #. steps)" translation.

1823 #.

1799 -#: bisect.c:1063

1824 +#: bisect.c:1088

1825 #, c-format

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

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

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

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

1830

1806 -#: blame.c:2777

1831 +#: blame.c:2778

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

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

1834

1810 -#: blame.c:2791

1835 +#: blame.c:2792

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

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

1838

1814 -#: blame.c:2812

1839 +#: blame.c:2813

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

1841 msgstr ""

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

1843 "incheckningen"

1844

1820 -#: blame.c:2821 bundle.c:187 ref-filter.c:2200 remote.c:1924 sequencer.c:2018

1821 -#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405

1822 -#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235

1823 -#: builtin/merge.c:415 builtin/pack-objects.c:3348 builtin/pack-objects.c:3363

1824 -#: builtin/shortlog.c:192

1845 +#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105

1846 +#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404

1847 +#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319

1848 +#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395

1849 +#: builtin/shortlog.c:320

1850 msgid "revision walk setup failed"

1851 msgstr "misslyckades skapa revisionstraversering"

1852

1828 -#: blame.c:2839

1853 +#: blame.c:2840

1854 msgid ""

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

1856 msgstr ""

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

1858 "kedjan"

1859

1835 -#: blame.c:2850

1860 +#: blame.c:2851

1861 #, c-format

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

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

1864

1840 -#: blame.c:2861

1865 +#: blame.c:2862

1866 #, c-format

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

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

@@ -1985,88 +2010,104 @@ msgstr "\"%s\" är redan utcheckad på \"%s\""

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

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

2012

1988 -#: bundle.c:47

2013 +#: bundle.c:41

2014 +#, c-format

2015 +msgid "unrecognized bundle hash algorithm: %s"

2016 +msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""

2017 +

2018 +#: bundle.c:45

2019 #, c-format

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

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

2020 +msgid "unknown capability '%s'"

2021 +msgstr "okänd kapabilitet \"%s\""

2022

1993 -#: bundle.c:69

1994 -msgid "unknown hash algorithm length"

1995 -msgstr "okänd hashningsalgoritmlängd"

2023 +#: bundle.c:71

2024 +#, c-format

2025 +msgid "'%s' does not look like a v2 or v3 bundle file"

2026 +msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"

2027

1997 -#: bundle.c:84

2028 +#: bundle.c:110

2029 #, c-format

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

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

2032

2002 -#: bundle.c:110 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034

2033 +#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142

2034 #: builtin/commit.c:814

2035 #, c-format

2036 msgid "could not open '%s'"

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

2038

2008 -#: bundle.c:163

2039 +#: bundle.c:189

2040 msgid "Repository lacks these prerequisite commits:"

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

2042

2012 -#: bundle.c:166

2043 +#: bundle.c:192

2044 msgid "need a repository to verify a bundle"

2045 msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."

2046

2016 -#: bundle.c:217

2047 +#: bundle.c:243

2048 #, c-format

2049 msgid "The bundle contains this ref:"

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

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

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

2053

2023 -#: bundle.c:224

2054 +#: bundle.c:250

2055 msgid "The bundle records a complete history."

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

2057

2027 -#: bundle.c:226

2058 +#: bundle.c:252

2059 #, c-format

2060 msgid "The bundle requires this ref:"

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

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

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

2064

2034 -#: bundle.c:293

2065 +#: bundle.c:319

2066 msgid "unable to dup bundle descriptor"

2067 msgstr "kan inte duplicera pakethandtag"

2068

2038 -#: bundle.c:300

2069 +#: bundle.c:326

2070 msgid "Could not spawn pack-objects"

2071 msgstr "Kunde inte starta pack-objects"

2072

2042 -#: bundle.c:311

2073 +#: bundle.c:337

2074 msgid "pack-objects died"

2075 msgstr "pack-objects misslyckades"

2076

2046 -#: bundle.c:353

2077 +#: bundle.c:379

2078 msgid "rev-list died"

2079 msgstr "rev-list dog"

2080

2050 -#: bundle.c:402

2081 +#: bundle.c:428

2082 #, c-format

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

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

2085

2055 -#: bundle.c:481 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306

2086 +#: bundle.c:498

2087 +#, c-format

2088 +msgid "unsupported bundle version %d"

2089 +msgstr "version %d för paket (bundle) stöds ej"

2090 +

2091 +#: bundle.c:500

2092 +#, c-format

2093 +msgid "cannot write bundle version %d with algorithm %s"

2094 +msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"

2095 +

2096 +#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461

2097 #, c-format

2098 msgid "unrecognized argument: %s"

2099 msgstr "okänt argument: %s"

2100

2060 -#: bundle.c:489

2101 +#: bundle.c:530

2102 msgid "Refusing to create empty bundle."

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

2104

2064 -#: bundle.c:499

2105 +#: bundle.c:540

2106 #, c-format

2107 msgid "cannot create '%s'"

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

2109

2069 -#: bundle.c:524

2110 +#: bundle.c:565

2111 msgid "index-pack died"

2112 msgstr "index-pack dog"

2113

@@ -2075,250 +2116,245 @@ msgstr "index-pack dog"

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

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

2118

2078 -#: commit-graph.c:238

2119 +#: commit-graph.c:188 midx.c:46

2120 +msgid "invalid hash version"

2121 +msgstr "felaktig hashnings-version"

2122 +

2123 +#: commit-graph.c:246

2124 msgid "commit-graph file is too small"

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

2126

2082 -#: commit-graph.c:303

2127 +#: commit-graph.c:311

2128 #, c-format

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

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

2131

2087 -#: commit-graph.c:310

2132 +#: commit-graph.c:318

2133 #, c-format

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

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

2136

2092 -#: commit-graph.c:317

2137 +#: commit-graph.c:325

2138 #, c-format

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

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

2141

2097 -#: commit-graph.c:339

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

2099 -msgstr ""

2100 -"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "

2101 -"ofullständig"

2142 +#: commit-graph.c:342

2143 +#, c-format

2144 +msgid "commit-graph file is too small to hold %u chunks"

2145 +msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"

2146

2103 -#: commit-graph.c:349

2147 +#: commit-graph.c:361

2148 #, c-format

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

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

2151

2108 -#: commit-graph.c:417

2152 +#: commit-graph.c:433

2153 #, c-format

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

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

2156

2113 -#: commit-graph.c:491

2157 +#: commit-graph.c:499

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

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

2160

2117 -#: commit-graph.c:501

2161 +#: commit-graph.c:509

2162 msgid "commit-graph chain does not match"

2163 msgstr "incheckningsgrafens kedja stämmer inte"

2164

2121 -#: commit-graph.c:549

2165 +#: commit-graph.c:557

2166 #, c-format

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

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

2169

2126 -#: commit-graph.c:573

2170 +#: commit-graph.c:581

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

2172 msgstr "kan inte hitta alla incheckingsgraffiler"

2173

2130 -#: commit-graph.c:706 commit-graph.c:770

2174 +#: commit-graph.c:721 commit-graph.c:785

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

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

2177

2134 -#: commit-graph.c:727

2178 +#: commit-graph.c:742

2179 #, c-format

2180 msgid "could not find commit %s"

2181 msgstr "kunde inte hitta incheckningen %s"

2182

2139 -#: commit-graph.c:1009 builtin/am.c:1292

2183 +#: commit-graph.c:1042 builtin/am.c:1306

2184 #, c-format

2185 msgid "unable to parse commit %s"

2186 msgstr "kunde inte tolka incheckningen %s"

2187

2144 -#: commit-graph.c:1157

2145 -msgid "Writing changed paths Bloom filters index"

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

2147 -

2148 -#: commit-graph.c:1182

2149 -msgid "Writing changed paths Bloom filters data"

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

2151 -

2152 -#: commit-graph.c:1221 builtin/pack-objects.c:2832

2188 +#: commit-graph.c:1265 builtin/pack-objects.c:2864

2189 #, c-format

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

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

2192

2157 -#: commit-graph.c:1257

2193 +#: commit-graph.c:1301

2194 msgid "Loading known commits in commit graph"

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

2196

2161 -#: commit-graph.c:1274

2197 +#: commit-graph.c:1318

2198 msgid "Expanding reachable commits in commit graph"

2199 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

2200

2165 -#: commit-graph.c:1294

2201 +#: commit-graph.c:1338

2202 msgid "Clearing commit marks in commit graph"

2203 msgstr "Rensar incheckningsmärken i incheckningsgraf"

2204

2169 -#: commit-graph.c:1313

2205 +#: commit-graph.c:1357

2206 msgid "Computing commit graph generation numbers"

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

2208

2173 -#: commit-graph.c:1367

2209 +#: commit-graph.c:1424

2210 msgid "Computing commit changed paths Bloom filters"

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

2212

2177 -#: commit-graph.c:1423

2213 +#: commit-graph.c:1501

2214 msgid "Collecting referenced commits"

2215 msgstr "Samlar refererade incheckningar"

2216

2181 -#: commit-graph.c:1447

2217 +#: commit-graph.c:1526

2218 #, c-format

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

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

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

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

2223

2188 -#: commit-graph.c:1460

2224 +#: commit-graph.c:1539

2225 #, c-format

2226 msgid "error adding pack %s"

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

2228

2193 -#: commit-graph.c:1464

2229 +#: commit-graph.c:1543

2230 #, c-format

2231 msgid "error opening index for %s"

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

2233

2198 -#: commit-graph.c:1503

2234 +#: commit-graph.c:1582

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

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

2237

2202 -#: commit-graph.c:1518

2238 +#: commit-graph.c:1597

2239 msgid "Counting distinct commits in commit graph"

2240 msgstr "Räknar olika incheckningar i incheckningsgraf"

2241

2206 -#: commit-graph.c:1550

2242 +#: commit-graph.c:1629

2243 msgid "Finding extra edges in commit graph"

2244 msgstr "Söker ytterligare kanter i incheckingsgraf"

2245

2210 -#: commit-graph.c:1599

2246 +#: commit-graph.c:1678

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

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

2249

2214 -#: commit-graph.c:1633 midx.c:812

2250 +#: commit-graph.c:1720 midx.c:826

2251 #, c-format

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

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

2254

2219 -#: commit-graph.c:1646

2255 +#: commit-graph.c:1733

2256 msgid "unable to create temporary graph layer"

2257 msgstr "kan inte skapa temporärt graflager"

2258

2223 -#: commit-graph.c:1651

2259 +#: commit-graph.c:1738

2260 #, c-format

2261 msgid "unable to adjust shared permissions for '%s'"

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

2263

2228 -#: commit-graph.c:1728

2264 +#: commit-graph.c:1808

2265 #, c-format

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

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

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

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

2270

2235 -#: commit-graph.c:1773

2271 +#: commit-graph.c:1853

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

2273 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

2274

2239 -#: commit-graph.c:1789

2275 +#: commit-graph.c:1869

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

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

2278

2243 -#: commit-graph.c:1809

2279 +#: commit-graph.c:1889

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

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

2282

2247 -#: commit-graph.c:1935

2283 +#: commit-graph.c:2015

2284 msgid "Scanning merged commits"

2285 msgstr "Söker sammanslagna incheckningar"

2286

2251 -#: commit-graph.c:1946

2287 +#: commit-graph.c:2026

2288 #, c-format

2289 msgid "unexpected duplicate commit id %s"

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

2291

2256 -#: commit-graph.c:1969

2292 +#: commit-graph.c:2049

2293 msgid "Merging commit-graph"

2294 msgstr "Slår ihop incheckningsgraf"

2295

2260 -#: commit-graph.c:2156

2296 +#: commit-graph.c:2259

2297 #, c-format

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

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

2300

2265 -#: commit-graph.c:2167

2301 +#: commit-graph.c:2270

2302 msgid "too many commits to write graph"

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

2304

2269 -#: commit-graph.c:2260

2305 +#: commit-graph.c:2363

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

2307 msgstr ""

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

2309

2274 -#: commit-graph.c:2270

2310 +#: commit-graph.c:2373

2311 #, c-format

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

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

2314

2279 -#: commit-graph.c:2280 commit-graph.c:2295

2315 +#: commit-graph.c:2383 commit-graph.c:2398

2316 #, c-format

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

2318 msgstr ""

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

2320

2285 -#: commit-graph.c:2287

2321 +#: commit-graph.c:2390

2322 #, c-format

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

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

2325

2290 -#: commit-graph.c:2305

2326 +#: commit-graph.c:2408

2327 msgid "Verifying commits in commit graph"

2328 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2329

2294 -#: commit-graph.c:2320

2330 +#: commit-graph.c:2423

2331 #, c-format

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

2333 msgstr ""

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

2335

2300 -#: commit-graph.c:2327

2336 +#: commit-graph.c:2430

2337 #, c-format

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

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

2340

2305 -#: commit-graph.c:2337

2341 +#: commit-graph.c:2440

2342 #, c-format

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

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

2345

2310 -#: commit-graph.c:2346

2346 +#: commit-graph.c:2449

2347 #, c-format

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

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

2350

2315 -#: commit-graph.c:2360

2351 +#: commit-graph.c:2463

2352 #, c-format

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

2354 msgstr ""

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

2356

2321 -#: commit-graph.c:2365

2357 +#: commit-graph.c:2468

2358 #, c-format

2359 msgid ""

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

@@ -2326,7 +2362,7 @@ msgstr ""

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

2363 "noll på annan plats"

2364

2329 -#: commit-graph.c:2369

2365 +#: commit-graph.c:2472

2366 #, c-format

2367 msgid ""

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

@@ -2334,20 +2370,20 @@ msgstr ""

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

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

2372

2337 -#: commit-graph.c:2385

2373 +#: commit-graph.c:2488

2374 #, c-format

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

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

2377

2342 -#: commit-graph.c:2391

2378 +#: commit-graph.c:2494

2379 #, c-format

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

2381 msgstr ""

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

2383 "= %<PRIuMAX>"

2384

2349 -#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403

2350 -#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457

2385 +#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417

2386 +#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457

2387 #, c-format

2388 msgid "could not parse %s"

2389 msgstr "kunde inte tolka %s"

@@ -2451,7 +2487,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s"

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

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

2489

2454 -#: config.c:408 sequencer.c:2456

2490 +#: config.c:408 sequencer.c:2547

2491 #, c-format

2492 msgid "invalid key: %s"

2493 msgstr "felaktig nyckel: %s"

@@ -2594,7 +2630,7 @@ msgstr "felformat värde för %s: %s"

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

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

2632

2597 -#: config.c:1533 builtin/pack-objects.c:3617

2633 +#: config.c:1533 builtin/pack-objects.c:3649

2634 #, c-format

2635 msgid "bad pack compression level %d"

2636 msgstr "felaktig paketkomprimeringsgrad %d"

@@ -2623,101 +2659,101 @@ msgstr "kunde inte tolka %s"

2659 msgid "unable to parse command-line config"

2660 msgstr "kan inte tolka kommandoradskonfiguration"

2661

2626 -#: config.c:2113

2662 +#: config.c:2122

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

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

2665

2630 -#: config.c:2283

2666 +#: config.c:2296

2667 #, c-format

2668 msgid "Invalid %s: '%s'"

2669 msgstr "Felaktigt %s: \"%s\""

2670

2635 -#: config.c:2328

2671 +#: config.c:2341

2672 #, c-format

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

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

2675

2640 -#: config.c:2374

2676 +#: config.c:2387

2677 #, c-format

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

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

2680

2645 -#: config.c:2376

2681 +#: config.c:2389

2682 #, c-format

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

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

2685

2650 -#: config.c:2457

2686 +#: config.c:2470

2687 #, c-format

2688 msgid "invalid section name '%s'"

2689 msgstr "felaktigt sektionsnamn \"%s\""

2690

2655 -#: config.c:2489

2691 +#: config.c:2502

2692 #, c-format

2693 msgid "%s has multiple values"

2694 msgstr "%s har flera värden"

2695

2660 -#: config.c:2518

2696 +#: config.c:2531

2697 #, c-format

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

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

2700

2665 -#: config.c:2770 config.c:3094

2701 +#: config.c:2783 config.c:3107

2702 #, c-format

2703 msgid "could not lock config file %s"

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

2705

2670 -#: config.c:2781

2706 +#: config.c:2794

2707 #, c-format

2708 msgid "opening %s"

2709 msgstr "öppnar %s"

2710

2675 -#: config.c:2816 builtin/config.c:344

2711 +#: config.c:2829 builtin/config.c:354

2712 #, c-format

2713 msgid "invalid pattern: %s"

2714 msgstr "ogiltigt mönster: %s"

2715

2680 -#: config.c:2841

2716 +#: config.c:2854

2717 #, c-format

2718 msgid "invalid config file %s"

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

2720

2685 -#: config.c:2854 config.c:3107

2721 +#: config.c:2867 config.c:3120

2722 #, c-format

2723 msgid "fstat on %s failed"

2724 msgstr "fstat misslyckades på %s"

2725

2690 -#: config.c:2865

2726 +#: config.c:2878

2727 #, c-format

2728 msgid "unable to mmap '%s'"

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

2730

2695 -#: config.c:2874 config.c:3112

2731 +#: config.c:2887 config.c:3125

2732 #, c-format

2733 msgid "chmod on %s failed"

2734 msgstr "chmod misslyckades på %s"

2735

2700 -#: config.c:2959 config.c:3209

2736 +#: config.c:2972 config.c:3222

2737 #, c-format

2738 msgid "could not write config file %s"

2739 msgstr "kunde inte skriva konfigurationsfilen %s"

2740

2705 -#: config.c:2993

2741 +#: config.c:3006

2742 #, c-format

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

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

2745

2710 -#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857

2746 +#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858

2747 #, c-format

2748 msgid "could not unset '%s'"

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

2750

2715 -#: config.c:3085

2751 +#: config.c:3098

2752 #, c-format

2753 msgid "invalid section name: %s"

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

2755

2720 -#: config.c:3252

2756 +#: config.c:3265

2757 #, c-format

2758 msgid "missing value for '%s'"

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

@@ -2886,25 +2922,25 @@ msgstr "ssh-varianten \"simple\" stöder inte val av port"

2922 msgid "strange pathname '%s' blocked"

2923 msgstr "konstigt sökvägsnamn \"%s\" blockerat"

2924

2889 -#: connect.c:1407

2925 +#: connect.c:1408

2926 msgid "unable to fork"

2927 msgstr "kunde inte grena (fork)"

2928

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

2930 # objects in the database.

2895 -#: connected.c:109 builtin/fsck.c:209 builtin/prune.c:45

2931 +#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45

2932 msgid "Checking connectivity"

2933 msgstr "Kontrollerar konnektivitet"

2934

2899 -#: connected.c:121

2935 +#: connected.c:120

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

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

2938

2903 -#: connected.c:141

2939 +#: connected.c:144

2940 msgid "failed write to rev-list"

2941 msgstr "kunde inte skriva till rev-list"

2942

2907 -#: connected.c:148

2943 +#: connected.c:149

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

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

2946

@@ -2980,40 +3016,40 @@ msgid "encoding '%s' from %s to %s and back is not the same"

3016 msgstr ""

3017 "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"

3018

2983 -#: convert.c:668

3019 +#: convert.c:665

3020 #, c-format

3021 msgid "cannot fork to run external filter '%s'"

3022 msgstr "kan inte grena (fork) för att köra externt filter \"%s\""

3023

2988 -#: convert.c:688

3024 +#: convert.c:685

3025 #, c-format

3026 msgid "cannot feed the input to external filter '%s'"

3027 msgstr "kunde inte skicka indata till externt filter \"%s\""

3028

2993 -#: convert.c:695

3029 +#: convert.c:692

3030 #, c-format

3031 msgid "external filter '%s' failed %d"

3032 msgstr "externt filter \"%s\" misslyckades %d"

3033

2998 -#: convert.c:730 convert.c:733

3034 +#: convert.c:727 convert.c:730

3035 #, c-format

3036 msgid "read from external filter '%s' failed"

3037 msgstr "läsning från externt filter \"%s\" misslyckades"

3038

3003 -#: convert.c:736 convert.c:791

3039 +#: convert.c:733 convert.c:788

3040 #, c-format

3041 msgid "external filter '%s' failed"

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

3043

3008 -#: convert.c:840

3044 +#: convert.c:837

3045 msgid "unexpected filter type"

3046 msgstr "oväntad filtertyp"

3047

3012 -#: convert.c:851

3048 +#: convert.c:848

3049 msgid "path name too long for external filter"

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

3051

3016 -#: convert.c:943

3052 +#: convert.c:940

3053 #, c-format

3054 msgid ""

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

@@ -3022,16 +3058,16 @@ msgstr ""

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

3059 "inte har filtrerats"

3060

3025 -#: convert.c:1243

3061 +#: convert.c:1240

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

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

3064

3029 -#: convert.c:1431 convert.c:1465

3065 +#: convert.c:1428 convert.c:1462

3066 #, c-format

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

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

3069

3034 -#: convert.c:1511

3070 +#: convert.c:1508

3071 #, c-format

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

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

@@ -3049,17 +3085,17 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"

3085 msgid "refusing to work with credential missing protocol field"

3086 msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"

3087

3052 -#: credential.c:396

3088 +#: credential.c:394

3089 #, c-format

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

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

3092

3057 -#: credential.c:440

3093 +#: credential.c:438

3094 #, c-format

3095 msgid "url has no scheme: %s"

3096 msgstr "url saknar protokoll: %s"

3097

3062 -#: credential.c:513

3098 +#: credential.c:511

3099 #, c-format

3100 msgid "credential url cannot be parsed: %s"

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

@@ -3218,35 +3254,35 @@ msgstr ""

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

3255 "%s"

3256

3221 -#: diff.c:4243

3257 +#: diff.c:4269

3258 #, c-format

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

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

3261

3226 -#: diff.c:4589

3262 +#: diff.c:4618

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

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

3265

3230 -#: diff.c:4592

3266 +#: diff.c:4621

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

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

3269

3234 -#: diff.c:4670

3270 +#: diff.c:4699

3271 msgid "--follow requires exactly one pathspec"

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

3273

3238 -#: diff.c:4718

3274 +#: diff.c:4747

3275 #, c-format

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

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

3278

3243 -#: diff.c:4723 diff.c:4728 diff.c:4733 diff.c:4738 diff.c:5250

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

3279 +#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279

3280 +#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3281 #, c-format

3282 msgid "%s expects a numerical value"

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

3284

3249 -#: diff.c:4755

3285 +#: diff.c:4784

3286 #, c-format

3287 msgid ""

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

@@ -3255,42 +3291,42 @@ msgstr ""

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

3292 "%s"

3293

3258 -#: diff.c:4840

3294 +#: diff.c:4869

3295 #, c-format

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

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

3298

3263 -#: diff.c:4864

3299 +#: diff.c:4893

3300 #, c-format

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

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

3303

3268 -#: diff.c:4878

3304 +#: diff.c:4907

3305 #, c-format

3306 msgid "unable to resolve '%s'"

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

3308

3273 -#: diff.c:4928 diff.c:4934

3309 +#: diff.c:4957 diff.c:4963

3310 #, c-format

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

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

3313

3278 -#: diff.c:4946

3314 +#: diff.c:4975

3315 #, c-format

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

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

3318

3283 -#: diff.c:4967

3319 +#: diff.c:4996

3320 #, c-format

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

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

3323

3288 -#: diff.c:4986

3324 +#: diff.c:5015

3325 #, c-format

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

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

3328

3293 -#: diff.c:5026

3329 +#: diff.c:5055

3330 msgid ""

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

3332 "\"histogram\""

@@ -3298,149 +3334,149 @@ msgstr ""

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

3335 "\"histogram\""

3336

3301 -#: diff.c:5062 diff.c:5082

3337 +#: diff.c:5091 diff.c:5111

3338 #, c-format

3339 msgid "invalid argument to %s"

3340 msgstr "ogiltigt argument för %s"

3341

3306 -#: diff.c:5219

3342 +#: diff.c:5248

3343 #, c-format

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

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

3346

3311 -#: diff.c:5275

3347 +#: diff.c:5304

3348 #, c-format

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

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

3351

3316 -#: diff.c:5298

3352 +#: diff.c:5327

3353 msgid "Diff output format options"

3354 msgstr "Formatflaggor för diff-utdata"

3355

3320 -#: diff.c:5300 diff.c:5306

3356 +#: diff.c:5329 diff.c:5335

3357 msgid "generate patch"

3358 msgstr "skapar patch"

3359

3324 -#: diff.c:5303 builtin/log.c:177

3360 +#: diff.c:5332 builtin/log.c:176

3361 msgid "suppress diff output"

3362 msgstr "undertryck diff-utdata"

3363

3328 -#: diff.c:5308 diff.c:5422 diff.c:5429

3364 +#: diff.c:5337 diff.c:5451 diff.c:5458

3365 msgid "<n>"

3366 msgstr "<n>"

3367

3332 -#: diff.c:5309 diff.c:5312

3368 +#: diff.c:5338 diff.c:5341

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

3370 msgstr "skapa diffar med <n> rader sammanhang"

3371

3336 -#: diff.c:5314

3372 +#: diff.c:5343

3373 msgid "generate the diff in raw format"

3374 msgstr "generera diff i råformat"

3375

3340 -#: diff.c:5317

3376 +#: diff.c:5346

3377 msgid "synonym for '-p --raw'"

3378 msgstr "synonym till \"-p --raw\""

3379

3344 -#: diff.c:5321

3380 +#: diff.c:5350

3381 msgid "synonym for '-p --stat'"

3382 msgstr "synonym till \"-p --stat\""

3383

3348 -#: diff.c:5325

3384 +#: diff.c:5354

3385 msgid "machine friendly --stat"

3386 msgstr "maskinläsbar --stat"

3387

3352 -#: diff.c:5328

3388 +#: diff.c:5357

3389 msgid "output only the last line of --stat"

3390 msgstr "skriv bara ut den sista raden för --stat"

3391

3356 -#: diff.c:5330 diff.c:5338

3392 +#: diff.c:5359 diff.c:5367

3393 msgid "<param1,param2>..."

3394 msgstr "<param1,param2>..."

3395

3360 -#: diff.c:5331

3396 +#: diff.c:5360

3397 msgid ""

3398 "output the distribution of relative amount of changes for each sub-directory"

3399 msgstr ""

3400 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3401

3366 -#: diff.c:5335

3402 +#: diff.c:5364

3403 msgid "synonym for --dirstat=cumulative"

3404 msgstr "synonym för --dirstat=cumulative"

3405

3370 -#: diff.c:5339

3406 +#: diff.c:5368

3407 msgid "synonym for --dirstat=files,param1,param2..."

3408 msgstr "synonym för --dirstat=filer,param1,param2..."

3409

3374 -#: diff.c:5343

3410 +#: diff.c:5372

3411 msgid "warn if changes introduce conflict markers or whitespace errors"

3412 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3413

3378 -#: diff.c:5346

3414 +#: diff.c:5375

3415 msgid "condensed summary such as creations, renames and mode changes"

3416 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3417

3382 -#: diff.c:5349

3418 +#: diff.c:5378

3419 msgid "show only names of changed files"

3420 msgstr "visa endast namnen på ändrade filer"

3421

3386 -#: diff.c:5352

3422 +#: diff.c:5381

3423 msgid "show only names and status of changed files"

3424 msgstr "visa endast namn och status för ändrade filer"

3425

3390 -#: diff.c:5354

3426 +#: diff.c:5383

3427 msgid "<width>[,<name-width>[,<count>]]"

3428 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3429

3394 -#: diff.c:5355

3430 +#: diff.c:5384

3431 msgid "generate diffstat"

3432 msgstr "skapa diffstat"

3433

3398 -#: diff.c:5357 diff.c:5360 diff.c:5363

3434 +#: diff.c:5386 diff.c:5389 diff.c:5392

3435 msgid "<width>"

3436 msgstr "<bredd>"

3437

3402 -#: diff.c:5358

3438 +#: diff.c:5387

3439 msgid "generate diffstat with a given width"

3440 msgstr "generera en diffstat med given bredd"

3441

3406 -#: diff.c:5361

3442 +#: diff.c:5390

3443 msgid "generate diffstat with a given name width"

3444 msgstr "generera en diffstat med given namnbredd"

3445

3410 -#: diff.c:5364

3446 +#: diff.c:5393

3447 msgid "generate diffstat with a given graph width"

3448 msgstr "generera en diffstat med given grafbredd"

3449

3414 -#: diff.c:5366

3450 +#: diff.c:5395

3451 msgid "<count>"

3452 msgstr "<antal>"

3453

3418 -#: diff.c:5367

3454 +#: diff.c:5396

3455 msgid "generate diffstat with limited lines"

3456 msgstr "generera diffstat med begränsade rader"

3457

3422 -#: diff.c:5370

3458 +#: diff.c:5399

3459 msgid "generate compact summary in diffstat"

3460 msgstr "skapa kompakt översikt i diffstat"

3461

3426 -#: diff.c:5373

3462 +#: diff.c:5402

3463 msgid "output a binary diff that can be applied"

3464 msgstr "skapa en binärdiff som kan appliceras"

3465

3430 -#: diff.c:5376

3466 +#: diff.c:5405

3467 msgid "show full pre- and post-image object names on the \"index\" lines"

3468 msgstr ""

3469 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3470

3435 -#: diff.c:5378

3471 +#: diff.c:5407

3472 msgid "show colored diff"

3473 msgstr "visa färgad diff"

3474

3439 -#: diff.c:5379

3475 +#: diff.c:5408

3476 msgid "<kind>"

3477 msgstr "<typ>"

3478

3443 -#: diff.c:5380

3479 +#: diff.c:5409

3480 msgid ""

3481 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3482 "diff"

@@ -3448,7 +3484,7 @@ msgstr ""

3484 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3485 "\"new\" (nya) rader i diffen"

3486

3451 -#: diff.c:5383

3487 +#: diff.c:5412

3488 msgid ""

3489 "do not munge pathnames and use NULs as output field terminators in --raw or "

3490 "--numstat"

@@ -3456,87 +3492,87 @@ msgstr ""

3492 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3493 "eller --numstat"

3494

3459 -#: diff.c:5386 diff.c:5389 diff.c:5392 diff.c:5498

3495 +#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527

3496 msgid "<prefix>"

3497 msgstr "<prefix>"

3498

3463 -#: diff.c:5387

3499 +#: diff.c:5416

3500 msgid "show the given source prefix instead of \"a/\""

3501 msgstr "visa givet källprefix istället för \"a/\""

3502

3467 -#: diff.c:5390

3503 +#: diff.c:5419

3504 msgid "show the given destination prefix instead of \"b/\""

3505 msgstr "visa givet målprefix istället för \"b/\""

3506

3471 -#: diff.c:5393

3507 +#: diff.c:5422

3508 msgid "prepend an additional prefix to every line of output"

3509 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3510

3475 -#: diff.c:5396

3511 +#: diff.c:5425

3512 msgid "do not show any source or destination prefix"

3513 msgstr "visa inte käll- eller målprefix"

3514

3479 -#: diff.c:5399

3515 +#: diff.c:5428

3516 msgid "show context between diff hunks up to the specified number of lines"

3517 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3518

3483 -#: diff.c:5403 diff.c:5408 diff.c:5413

3519 +#: diff.c:5432 diff.c:5437 diff.c:5442

3520 msgid "<char>"

3521 msgstr "<tecken>"

3522

3487 -#: diff.c:5404

3523 +#: diff.c:5433

3524 msgid "specify the character to indicate a new line instead of '+'"

3525 msgstr "ange tecken för att ange ny rad istället för \"+\""

3526

3491 -#: diff.c:5409

3527 +#: diff.c:5438

3528 msgid "specify the character to indicate an old line instead of '-'"

3529 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3530

3495 -#: diff.c:5414

3531 +#: diff.c:5443

3532 msgid "specify the character to indicate a context instead of ' '"

3533 msgstr "ange tecken för att ange sammanhang istället för \" \""

3534

3499 -#: diff.c:5417

3535 +#: diff.c:5446

3536 msgid "Diff rename options"

3537 msgstr "Diff-namnbytesflaggor"

3538

3503 -#: diff.c:5418

3539 +#: diff.c:5447

3540 msgid "<n>[/<m>]"

3541 msgstr "<n>[/<m>]"

3542

3507 -#: diff.c:5419

3543 +#: diff.c:5448

3544 msgid "break complete rewrite changes into pairs of delete and create"

3545 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3546

3511 -#: diff.c:5423

3547 +#: diff.c:5452

3548 msgid "detect renames"

3549 msgstr "detektera namnändringar"

3550

3515 -#: diff.c:5427

3551 +#: diff.c:5456

3552 msgid "omit the preimage for deletes"

3553 msgstr "ta bort för-version för borttagningar"

3554

3519 -#: diff.c:5430

3555 +#: diff.c:5459

3556 msgid "detect copies"

3557 msgstr "detektera kopior"

3558

3523 -#: diff.c:5434

3559 +#: diff.c:5463

3560 msgid "use unmodified files as source to find copies"

3561 msgstr "använd oförändrade som källa för att hitta kopior"

3562

3527 -#: diff.c:5436

3563 +#: diff.c:5465

3564 msgid "disable rename detection"

3565 msgstr "inaktivera detektering av namnbyten"

3566

3531 -#: diff.c:5439

3567 +#: diff.c:5468

3568 msgid "use empty blobs as rename source"

3569 msgstr "använd tomma blob:ar som namnändringskälla"

3570

3535 -#: diff.c:5441

3571 +#: diff.c:5470

3572 msgid "continue listing the history of a file beyond renames"

3573 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3574

3539 -#: diff.c:5444

3575 +#: diff.c:5473

3576 msgid ""

3577 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3578 "given limit"

@@ -3544,159 +3580,159 @@ msgstr ""

3580 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3581 "given gräns"

3582

3547 -#: diff.c:5446

3583 +#: diff.c:5475

3584 msgid "Diff algorithm options"

3585 msgstr "Alternativ för diff-algoritm"

3586

3551 -#: diff.c:5448

3587 +#: diff.c:5477

3588 msgid "produce the smallest possible diff"

3589 msgstr "skapa minsta möjliga diff"

3590

3555 -#: diff.c:5451

3591 +#: diff.c:5480

3592 msgid "ignore whitespace when comparing lines"

3593 msgstr "ignorera blanktecken vid radjämförelse"

3594

3559 -#: diff.c:5454

3595 +#: diff.c:5483

3596 msgid "ignore changes in amount of whitespace"

3597 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3598

3563 -#: diff.c:5457

3599 +#: diff.c:5486

3600 msgid "ignore changes in whitespace at EOL"

3601 msgstr "ignorera blanktecken vid radslut"

3602

3567 -#: diff.c:5460

3603 +#: diff.c:5489

3604 msgid "ignore carrier-return at the end of line"

3605 msgstr "ignorera CR-tecken vid radslut"

3606

3571 -#: diff.c:5463

3607 +#: diff.c:5492

3608 msgid "ignore changes whose lines are all blank"

3609 msgstr "ignorera ändringar i rader som är helt blanka"

3610

3575 -#: diff.c:5466

3611 +#: diff.c:5495

3612 msgid "heuristic to shift diff hunk boundaries for easy reading"

3613 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3614

3579 -#: diff.c:5469

3615 +#: diff.c:5498

3616 msgid "generate diff using the \"patience diff\" algorithm"

3617 msgstr "skapa diffar med algoritmen \"patience diff\""

3618

3583 -#: diff.c:5473

3619 +#: diff.c:5502

3620 msgid "generate diff using the \"histogram diff\" algorithm"

3621 msgstr "skapa diffar med algoritmen \"histogram diff\""

3622

3587 -#: diff.c:5475

3623 +#: diff.c:5504

3624 msgid "<algorithm>"

3625 msgstr "<algoritm>"

3626

3591 -#: diff.c:5476

3627 +#: diff.c:5505

3628 msgid "choose a diff algorithm"

3629 msgstr "välj en diff-algoritm"

3630

3595 -#: diff.c:5478

3631 +#: diff.c:5507

3632 msgid "<text>"

3633 msgstr "<text>"

3634

3599 -#: diff.c:5479

3635 +#: diff.c:5508

3636 msgid "generate diff using the \"anchored diff\" algorithm"

3637 msgstr "skapa diffar med algoritmen \"anchored diff\""

3638

3603 -#: diff.c:5481 diff.c:5490 diff.c:5493

3639 +#: diff.c:5510 diff.c:5519 diff.c:5522

3640 msgid "<mode>"

3641 msgstr "<läge>"

3642

3607 -#: diff.c:5482

3643 +#: diff.c:5511

3644 msgid "show word diff, using <mode> to delimit changed words"

3645 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3646

3611 -#: diff.c:5484 diff.c:5487 diff.c:5532

3647 +#: diff.c:5513 diff.c:5516 diff.c:5561

3648 msgid "<regex>"

3649 msgstr "<reguttr>"

3650

3615 -#: diff.c:5485

3651 +#: diff.c:5514

3652 msgid "use <regex> to decide what a word is"

3653 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3654

3619 -#: diff.c:5488

3655 +#: diff.c:5517

3656 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3657 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3658

3623 -#: diff.c:5491

3659 +#: diff.c:5520

3660 msgid "moved lines of code are colored differently"

3661 msgstr "flyttade kodrader färgas på annat sätt"

3662

3627 -#: diff.c:5494

3663 +#: diff.c:5523

3664 msgid "how white spaces are ignored in --color-moved"

3665 msgstr "hur blanktecken ignoreras i --color-moved"

3666

3631 -#: diff.c:5497

3667 +#: diff.c:5526

3668 msgid "Other diff options"

3669 msgstr "Andra diff-flaggor"

3670

3635 -#: diff.c:5499

3671 +#: diff.c:5528

3672 msgid "when run from subdir, exclude changes outside and show relative paths"

3673 msgstr ""

3674 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3675 "sökvägar"

3676

3641 -#: diff.c:5503

3677 +#: diff.c:5532

3678 msgid "treat all files as text"

3679 msgstr "hantera alla filer som text"

3680

3645 -#: diff.c:5505

3681 +#: diff.c:5534

3682 msgid "swap two inputs, reverse the diff"

3683 msgstr "växla två indatafiler, vänd diffen"

3684

3649 -#: diff.c:5507

3685 +#: diff.c:5536

3686 msgid "exit with 1 if there were differences, 0 otherwise"

3687 msgstr "avsluta med 1 vid ändringar, annars 0"

3688

3653 -#: diff.c:5509

3689 +#: diff.c:5538

3690 msgid "disable all output of the program"

3691 msgstr "slå av alla utdata från programmet"

3692

3657 -#: diff.c:5511

3693 +#: diff.c:5540

3694 msgid "allow an external diff helper to be executed"

3695 msgstr "tillåt köra en extern diff-hjälpare"

3696

3661 -#: diff.c:5513

3697 +#: diff.c:5542

3698 msgid "run external text conversion filters when comparing binary files"

3699 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3700

3665 -#: diff.c:5515

3701 +#: diff.c:5544

3702 msgid "<when>"

3703 msgstr "<när>"

3704

3669 -#: diff.c:5516

3705 +#: diff.c:5545

3706 msgid "ignore changes to submodules in the diff generation"

3707 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3708

3673 -#: diff.c:5519

3709 +#: diff.c:5548

3710 msgid "<format>"

3711 msgstr "<format>"

3712

3677 -#: diff.c:5520

3713 +#: diff.c:5549

3714 msgid "specify how differences in submodules are shown"

3715 msgstr "ange hur ändringar i undermoduler visas"

3716

3681 -#: diff.c:5524

3717 +#: diff.c:5553

3718 msgid "hide 'git add -N' entries from the index"

3719 msgstr "dölj \"git add -N\"-poster från indexet"

3720

3685 -#: diff.c:5527

3721 +#: diff.c:5556

3722 msgid "treat 'git add -N' entries as real in the index"

3723 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3724

3689 -#: diff.c:5529

3725 +#: diff.c:5558

3726 msgid "<string>"

3727 msgstr "<sträng>"

3728

3693 -#: diff.c:5530

3729 +#: diff.c:5559

3730 msgid ""

3731 "look for differences that change the number of occurrences of the specified "

3732 "string"

3733 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3734

3699 -#: diff.c:5533

3735 +#: diff.c:5562

3736 msgid ""

3737 "look for differences that change the number of occurrences of the specified "

3738 "regex"

@@ -3704,54 +3740,54 @@ msgstr ""

3740 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3741 "uttryck"

3742

3707 -#: diff.c:5536

3743 +#: diff.c:5565

3744 msgid "show all changes in the changeset with -S or -G"

3745 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3746

3711 -#: diff.c:5539

3747 +#: diff.c:5568

3748 msgid "treat <string> in -S as extended POSIX regular expression"

3749 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3750

3715 -#: diff.c:5542

3751 +#: diff.c:5571

3752 msgid "control the order in which files appear in the output"

3753 msgstr "styr ordningen i vilken filer visas i utdata"

3754

3719 -#: diff.c:5543

3755 +#: diff.c:5572

3756 msgid "<object-id>"

3757 msgstr "<objekt-id>"

3758

3723 -#: diff.c:5544

3759 +#: diff.c:5573

3760 msgid ""

3761 "look for differences that change the number of occurrences of the specified "

3762 "object"

3763 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3764

3729 -#: diff.c:5546

3765 +#: diff.c:5575

3766 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3767 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3768

3733 -#: diff.c:5547

3769 +#: diff.c:5576

3770 msgid "select files by diff type"

3771 msgstr "välj filter efter diff-typ"

3772

3737 -#: diff.c:5549

3773 +#: diff.c:5578

3774 msgid "<file>"

3775 msgstr "<fil>"

3776

3741 -#: diff.c:5550

3777 +#: diff.c:5579

3778 msgid "Output to a specific file"

3779 msgstr "Skriv utdata till en specifik fil"

3780

3745 -#: diff.c:6205

3781 +#: diff.c:6236

3782 msgid "inexact rename detection was skipped due to too many files."

3783 msgstr ""

3784 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."

3785

3750 -#: diff.c:6208

3786 +#: diff.c:6239

3787 msgid "only found copies from modified paths due to too many files."

3788 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

3789

3754 -#: diff.c:6211

3790 +#: diff.c:6242

3791 #, c-format

3792 msgid ""

3793 "you may want to set your %s variable to at least %d and retry the command."

@@ -3767,61 +3803,61 @@ msgstr "kunde inte läsa orderfilen \"%s\""

3803 msgid "Performing inexact rename detection"

3804 msgstr "Utför onöjaktig namnbytesdetektering"

3805

3770 -#: dir.c:573

3806 +#: dir.c:578

3807 #, c-format

3808 msgid "pathspec '%s' did not match any file(s) known to git"

3809 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"

3810

3775 -#: dir.c:713 dir.c:742 dir.c:755

3811 +#: dir.c:718 dir.c:747 dir.c:760

3812 #, c-format

3813 msgid "unrecognized pattern: '%s'"

3814 msgstr "okänt mönster: %s"

3815

3780 -#: dir.c:772 dir.c:786

3816 +#: dir.c:777 dir.c:791

3817 #, c-format

3818 msgid "unrecognized negative pattern: '%s'"

3819 msgstr "okänt negativt mönster: %s"

3820

3785 -#: dir.c:804

3821 +#: dir.c:809

3822 #, c-format

3823 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"

3824 msgstr ""

3825 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "

3826 "gånger"

3827

3792 -#: dir.c:814

3828 +#: dir.c:819

3829 msgid "disabling cone pattern matching"

3830 msgstr "inaktiverar konmönstermatchning"

3831

3796 -#: dir.c:1191

3832 +#: dir.c:1198

3833 #, c-format

3834 msgid "cannot use %s as an exclude file"

3835 msgstr "kan inte använda %s som exkluderingsfil"

3836

3801 -#: dir.c:2296

3837 +#: dir.c:2305

3838 #, c-format

3839 msgid "could not open directory '%s'"

3840 msgstr "kunde inte öppna katalogen \"%s\""

3841

3806 -#: dir.c:2596

3842 +#: dir.c:2605

3843 msgid "failed to get kernel name and information"

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

3845

3810 -#: dir.c:2720

3846 +#: dir.c:2729

3847 msgid "untracked cache is disabled on this system or location"

3848 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3849

3814 -#: dir.c:3502

3850 +#: dir.c:3520

3851 #, c-format

3852 msgid "index file corrupt in repo %s"

3853 msgstr "indexfilen trasig i arkivet %s"

3854

3819 -#: dir.c:3547 dir.c:3552

3855 +#: dir.c:3565 dir.c:3570

3856 #, c-format

3857 msgid "could not create directories for %s"

3858 msgstr "kunde inte skapa kataloger för %s"

3859

3824 -#: dir.c:3581

3860 +#: dir.c:3599

3861 #, c-format

3862 msgid "could not migrate git directory from '%s' to '%s'"

3863 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

@@ -3855,246 +3891,246 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""

3891 msgid "too many args to run %s"

3892 msgstr "för många flaggor för att köra %s"

3893

3858 -#: fetch-pack.c:152

3894 +#: fetch-pack.c:176

3895 msgid "git fetch-pack: expected shallow list"

3896 msgstr "git fetch-pack: förväntade grund lista"

3897

3862 -#: fetch-pack.c:155

3898 +#: fetch-pack.c:179

3899 msgid "git fetch-pack: expected a flush packet after shallow list"

3900 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

3901

3866 -#: fetch-pack.c:166

3902 +#: fetch-pack.c:190

3903 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

3904 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

3905

3870 -#: fetch-pack.c:186

3906 +#: fetch-pack.c:210

3907 #, c-format

3908 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

3909 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

3910

3875 -#: fetch-pack.c:197

3911 +#: fetch-pack.c:221

3912 msgid "unable to write to remote"

3913 msgstr "kunde inte skriva till fjärren"

3914

3879 -#: fetch-pack.c:259

3915 +#: fetch-pack.c:282

3916 msgid "--stateless-rpc requires multi_ack_detailed"

3917 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3918

3883 -#: fetch-pack.c:358 fetch-pack.c:1408

3919 +#: fetch-pack.c:375 fetch-pack.c:1397

3920 #, c-format

3921 msgid "invalid shallow line: %s"

3922 msgstr "ogiltig \"shallow\"-rad: %s"

3923

3888 -#: fetch-pack.c:364 fetch-pack.c:1414

3924 +#: fetch-pack.c:381 fetch-pack.c:1403

3925 #, c-format

3926 msgid "invalid unshallow line: %s"

3927 msgstr "ogiltig \"unshallow\"-rad: %s"

3928

3893 -#: fetch-pack.c:366 fetch-pack.c:1416

3929 +#: fetch-pack.c:383 fetch-pack.c:1405

3930 #, c-format

3931 msgid "object not found: %s"

3932 msgstr "objektet hittades inte: %s"

3933

3898 -#: fetch-pack.c:369 fetch-pack.c:1419

3934 +#: fetch-pack.c:386 fetch-pack.c:1408

3935 #, c-format

3936 msgid "error in object: %s"

3937 msgstr "fel i objekt: %s"

3938

3903 -#: fetch-pack.c:371 fetch-pack.c:1421

3939 +#: fetch-pack.c:388 fetch-pack.c:1410

3940 #, c-format

3941 msgid "no shallow found: %s"

3942 msgstr "ingen \"shallow\" hittades: %s"

3943

3908 -#: fetch-pack.c:374 fetch-pack.c:1425

3944 +#: fetch-pack.c:391 fetch-pack.c:1414

3945 #, c-format

3946 msgid "expected shallow/unshallow, got %s"

3947 msgstr "förväntade shallow/unshallow, fick %s"

3948

3913 -#: fetch-pack.c:416

3949 +#: fetch-pack.c:431

3950 #, c-format

3951 msgid "got %s %d %s"

3952 msgstr "fick %s %d %s"

3953

3918 -#: fetch-pack.c:433

3954 +#: fetch-pack.c:448

3955 #, c-format

3956 msgid "invalid commit %s"

3957 msgstr "ogiltig incheckning %s"

3958

3923 -#: fetch-pack.c:464

3959 +#: fetch-pack.c:479

3960 msgid "giving up"

3961 msgstr "ger upp"

3962

3927 -#: fetch-pack.c:477 progress.c:336

3963 +#: fetch-pack.c:492 progress.c:339

3964 msgid "done"

3965 msgstr "klart"

3966

3931 -#: fetch-pack.c:489

3967 +#: fetch-pack.c:504

3968 #, c-format

3969 msgid "got %s (%d) %s"

3970 msgstr "fick %s (%d) %s"

3971

3936 -#: fetch-pack.c:535

3972 +#: fetch-pack.c:540

3973 #, c-format

3974 msgid "Marking %s as complete"

3975 msgstr "Markerar %s som komplett"

3976

3941 -#: fetch-pack.c:756

3977 +#: fetch-pack.c:755

3978 #, c-format

3979 msgid "already have %s (%s)"

3980 msgstr "har redan %s (%s)"

3981

3946 -#: fetch-pack.c:821

3982 +#: fetch-pack.c:824

3983 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3984 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

3985

3950 -#: fetch-pack.c:829

3986 +#: fetch-pack.c:832

3987 msgid "protocol error: bad pack header"

3988 msgstr "protokollfel: felaktigt packhuvud"

3989

3954 -#: fetch-pack.c:910

3990 +#: fetch-pack.c:916

3991 #, c-format

3992 msgid "fetch-pack: unable to fork off %s"

3993 msgstr "fetch-patch: kunde inte grena av %s"

3994

3959 -#: fetch-pack.c:927

3995 +#: fetch-pack.c:933

3996 #, c-format

3997 msgid "%s failed"

3998 msgstr "%s misslyckades"

3999

3964 -#: fetch-pack.c:929

4000 +#: fetch-pack.c:935

4001 msgid "error in sideband demultiplexer"

4002 msgstr "fel i sidbands-avmultiplexare"

4003

3968 -#: fetch-pack.c:976

4004 +#: fetch-pack.c:978

4005 #, c-format

4006 msgid "Server version is %.*s"

4007 msgstr "Serverversionen är %.*s"

4008

3973 -#: fetch-pack.c:981 fetch-pack.c:987 fetch-pack.c:990 fetch-pack.c:996

3974 -#: fetch-pack.c:1000 fetch-pack.c:1004 fetch-pack.c:1008 fetch-pack.c:1012

3975 -#: fetch-pack.c:1016 fetch-pack.c:1020 fetch-pack.c:1024 fetch-pack.c:1028

3976 -#: fetch-pack.c:1034 fetch-pack.c:1040 fetch-pack.c:1045 fetch-pack.c:1050

4009 +#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998

4010 +#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014

4011 +#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030

4012 +#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052

4013 #, c-format

4014 msgid "Server supports %s"

4015 msgstr "Servern stöder %s"

4016

3981 -#: fetch-pack.c:983

4017 +#: fetch-pack.c:985

4018 msgid "Server does not support shallow clients"

4019 msgstr "Servern stöder inte klienter med grunda arkiv"

4020

3985 -#: fetch-pack.c:1043

4021 +#: fetch-pack.c:1045

4022 msgid "Server does not support --shallow-since"

4023 msgstr "Servern stöder inte --shallow-since"

4024

3989 -#: fetch-pack.c:1048

4025 +#: fetch-pack.c:1050

4026 msgid "Server does not support --shallow-exclude"

4027 msgstr "Servern stöder inte --shallow-exclude"

4028

3993 -#: fetch-pack.c:1052

4029 +#: fetch-pack.c:1054

4030 msgid "Server does not support --deepen"

4031 msgstr "Servern stöder inte --deepen"

4032

3997 -#: fetch-pack.c:1054

4033 +#: fetch-pack.c:1056

4034 msgid "Server does not support this repository's object format"

4035 msgstr "Servern stöder inte det här arkivets objektformat"

4036

4001 -#: fetch-pack.c:1071

4037 +#: fetch-pack.c:1069

4038 msgid "no common commits"

4039 msgstr "inga gemensamma incheckningar"

4040

4005 -#: fetch-pack.c:1083 fetch-pack.c:1639

4041 +#: fetch-pack.c:1081 fetch-pack.c:1619

4042 msgid "git fetch-pack: fetch failed."

4043 msgstr "git fetch-patch: hämtning misslyckades."

4044

4009 -#: fetch-pack.c:1211

4045 +#: fetch-pack.c:1205

4046 #, c-format

4047 msgid "mismatched algorithms: client %s; server %s"

4048 msgstr "omaka algoritmer: klient %s; server %s"

4049

4014 -#: fetch-pack.c:1215

4050 +#: fetch-pack.c:1209

4051 #, c-format

4052 msgid "the server does not support algorithm '%s'"

4053 msgstr "servern stöder inte algoritmen \"%s\""

4054

4019 -#: fetch-pack.c:1235

4055 +#: fetch-pack.c:1229

4056 msgid "Server does not support shallow requests"

4057 msgstr "Servern stöder inte grunda förfrågningar"

4058

4023 -#: fetch-pack.c:1242

4059 +#: fetch-pack.c:1236

4060 msgid "Server supports filter"

4061 msgstr "Servern stöder filter"

4062

4027 -#: fetch-pack.c:1286

4063 +#: fetch-pack.c:1275

4064 msgid "unable to write request to remote"

4065 msgstr "kunde inte skriva anrop till fjärren"

4066

4031 -#: fetch-pack.c:1304

4067 +#: fetch-pack.c:1293

4068 #, c-format

4069 msgid "error reading section header '%s'"

4070 msgstr "fel vid läsning av styckehuvudet \"%s\""

4071

4036 -#: fetch-pack.c:1310

4072 +#: fetch-pack.c:1299

4073 #, c-format

4074 msgid "expected '%s', received '%s'"

4075 msgstr "förväntade \"%s\", tog emot \"%s\""

4076

4041 -#: fetch-pack.c:1371

4077 +#: fetch-pack.c:1360

4078 #, c-format

4079 msgid "unexpected acknowledgment line: '%s'"

4080 msgstr "oväntad bekräftelserad: \"%s\""

4081

4046 -#: fetch-pack.c:1376

4082 +#: fetch-pack.c:1365

4083 #, c-format

4084 msgid "error processing acks: %d"

4085 msgstr "fel vid hantering av bekräftelser: %d"

4086

4051 -#: fetch-pack.c:1386

4087 +#: fetch-pack.c:1375

4088 msgid "expected packfile to be sent after 'ready'"

4089 msgstr "väntade att paketfil skulle sändas efter \"ready\""

4090

4055 -#: fetch-pack.c:1388

4091 +#: fetch-pack.c:1377

4092 msgid "expected no other sections to be sent after no 'ready'"

4093 msgstr ""

4094 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4095

4060 -#: fetch-pack.c:1430

4096 +#: fetch-pack.c:1419

4097 #, c-format

4098 msgid "error processing shallow info: %d"

4099 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4100

4065 -#: fetch-pack.c:1477

4101 +#: fetch-pack.c:1466

4102 #, c-format

4103 msgid "expected wanted-ref, got '%s'"

4104 msgstr "förväntade wanted-ref, fick %s"

4105

4070 -#: fetch-pack.c:1482

4106 +#: fetch-pack.c:1471

4107 #, c-format

4108 msgid "unexpected wanted-ref: '%s'"

4109 msgstr "oväntad wanted-ref: \"%s\""

4110

4075 -#: fetch-pack.c:1487

4111 +#: fetch-pack.c:1476

4112 #, c-format

4113 msgid "error processing wanted refs: %d"

4114 msgstr "fel vid hantering av önskade referenser: %d"

4115

4080 -#: fetch-pack.c:1517

4116 +#: fetch-pack.c:1506

4117 msgid "git fetch-pack: expected response end packet"

4118 msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4119

4084 -#: fetch-pack.c:1921

4120 +#: fetch-pack.c:1887

4121 msgid "no matching remote head"

4122 msgstr "inget motsvarande fjärrhuvud"

4123

4088 -#: fetch-pack.c:1944 builtin/clone.c:692

4124 +#: fetch-pack.c:1910 builtin/clone.c:692

4125 msgid "remote did not send all necessary objects"

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

4127

4092 -#: fetch-pack.c:1971

4128 +#: fetch-pack.c:1937

4129 #, c-format

4130 msgid "no such remote ref %s"

4131 msgstr "ingen sådan fjärreferens: %s"

4132

4097 -#: fetch-pack.c:1974

4133 +#: fetch-pack.c:1940

4134 #, c-format

4135 msgid "Server does not allow request for unadvertised object %s"

4136 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

@@ -4193,41 +4229,41 @@ msgstr "Lågnivåkommandon / synka arkiv"

4229 msgid "Low-level Commands / Internal Helpers"

4230 msgstr "Lågnivåkommandon / interna hjälpare"

4231

4196 -#: help.c:298

4232 +#: help.c:300

4233 #, c-format

4234 msgid "available git commands in '%s'"

4235 msgstr "git-kommandon tillgängliga i \"%s\""

4236

4201 -#: help.c:305

4237 +#: help.c:307

4238 msgid "git commands available from elsewhere on your $PATH"

4239 msgstr "git-kommandon från andra platser i din $PATH"

4240

4205 -#: help.c:314

4241 +#: help.c:316

4242 msgid "These are common Git commands used in various situations:"

4243 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

4244

4209 -#: help.c:363 git.c:99

4245 +#: help.c:365 git.c:99

4246 #, c-format

4247 msgid "unsupported command listing type '%s'"

4248 msgstr "okänd kommandolisttyp \"%s\""

4249

4214 -#: help.c:403

4215 -msgid "The common Git guides are:"

4216 -msgstr "De vanliga Git-vägledningarna är:"

4250 +#: help.c:405

4251 +msgid "The Git concept guides are:"

4252 +msgstr "Vägledningar för Git-koncept:"

4253

4218 -#: help.c:427

4254 +#: help.c:429

4255 msgid "See 'git help <command>' to read about a specific subcommand"

4256 msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"

4257

4222 -#: help.c:432

4258 +#: help.c:434

4259 msgid "External commands"

4260 msgstr "Externa kommandon"

4261

4226 -#: help.c:447

4262 +#: help.c:449

4263 msgid "Command aliases"

4264 msgstr "Kommadoalias"

4265

4230 -#: help.c:511

4266 +#: help.c:513

4267 #, c-format

4268 msgid ""

4269 "'%s' appears to be a git command, but we were not\n"

@@ -4236,32 +4272,32 @@ msgstr ""

4272 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

4273 "köra det. Kanske git-%s är trasigt?"

4274

4239 -#: help.c:570

4275 +#: help.c:572

4276 msgid "Uh oh. Your system reports no Git commands at all."

4277 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

4278

4243 -#: help.c:592

4279 +#: help.c:594

4280 #, c-format

4281 msgid "WARNING: You called a Git command named '%s', which does not exist."

4282 msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."

4283

4248 -#: help.c:597

4284 +#: help.c:599

4285 #, c-format

4286 msgid "Continuing under the assumption that you meant '%s'."

4287 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

4288

4253 -#: help.c:602

4289 +#: help.c:604

4290 #, c-format

4291 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4292 msgstr ""

4293 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."

4294

4259 -#: help.c:610

4295 +#: help.c:612

4296 #, c-format

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

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

4299

4264 -#: help.c:614

4300 +#: help.c:616

4301 msgid ""

4302 "\n"

4303 "The most similar command is"

@@ -4275,16 +4311,16 @@ msgstr[1] ""

4311 "\n"

4312 "Mest lika kommandon är"

4313

4278 -#: help.c:654

4314 +#: help.c:656

4315 msgid "git version [<options>]"

4316 msgstr "git version [<flaggor>]"

4317

4282 -#: help.c:709

4318 +#: help.c:711

4319 #, c-format

4320 msgid "%s: %s - %s"

4321 msgstr "%s: %s - %s"

4322

4287 -#: help.c:713

4323 +#: help.c:715

4324 msgid ""

4325 "\n"

4326 "Did you mean this?"

@@ -4298,7 +4334,15 @@ msgstr[1] ""

4334 "\n"

4335 "Menade du ett av dessa?"

4336

4301 -#: ident.c:349

4337 +#: ident.c:353

4338 +msgid "Author identity unknown\n"

4339 +msgstr "Författar-identitet okänd\n"

4340 +

4341 +#: ident.c:356

4342 +msgid "Committer identity unknown\n"

4343 +msgstr "Incheckar-identitet okänd\n"

4344 +

4345 +#: ident.c:362

4346 msgid ""

4347 "\n"

4348 "*** Please tell me who you are.\n"

@@ -4324,66 +4368,66 @@ msgstr ""

4368 "Kör utan --global för att endast ändra i aktuellt arkiv.\n"

4369 "\n"

4370

4327 -#: ident.c:379

4371 +#: ident.c:397

4372 msgid "no email was given and auto-detection is disabled"

4373 msgstr "ingen e-post angavs och autodetektering är inaktiverad"

4374

4331 -#: ident.c:384

4375 +#: ident.c:402

4376 #, c-format

4377 msgid "unable to auto-detect email address (got '%s')"

4378 msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"

4379

4336 -#: ident.c:401

4380 +#: ident.c:419

4381 msgid "no name was given and auto-detection is disabled"

4382 msgstr "inget namn angavs och autodetektering är inaktiverad"

4383

4340 -#: ident.c:407

4384 +#: ident.c:425

4385 #, c-format

4386 msgid "unable to auto-detect name (got '%s')"

4387 msgstr "kunde inte autodetektera namn (fick \"%s\")"

4388

4345 -#: ident.c:415

4389 +#: ident.c:433

4390 #, c-format

4391 msgid "empty ident name (for <%s>) not allowed"

4392 msgstr "tomt ident-namn (för <%s>) ej tillåtet"

4393

4350 -#: ident.c:421

4394 +#: ident.c:439

4395 #, c-format

4396 msgid "name consists only of disallowed characters: %s"

4397 msgstr "namnet består enbart av ej tillåtna tecken: %s"

4398

4355 -#: ident.c:436 builtin/commit.c:634

4399 +#: ident.c:454 builtin/commit.c:634

4400 #, c-format

4401 msgid "invalid date format: %s"

4402 msgstr "felaktigt datumformat: %s"

4403

4360 -#: list-objects-filter-options.c:58

4404 +#: list-objects-filter-options.c:81

4405 msgid "expected 'tree:<depth>'"

4406 msgstr "förväntade \"tree:<djup>\""

4407

4364 -#: list-objects-filter-options.c:73

4408 +#: list-objects-filter-options.c:96

4409 msgid "sparse:path filters support has been dropped"

4410 msgstr "sparse:sökväg-filter stöds inte längre"

4411

4368 -#: list-objects-filter-options.c:86

4412 +#: list-objects-filter-options.c:109

4413 #, c-format

4414 msgid "invalid filter-spec '%s'"

4415 msgstr "felaktig filterspecifikation: \"%s\""

4416

4373 -#: list-objects-filter-options.c:102

4417 +#: list-objects-filter-options.c:125

4418 #, c-format

4419 msgid "must escape char in sub-filter-spec: '%c'"

4420 msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""

4421

4378 -#: list-objects-filter-options.c:144

4422 +#: list-objects-filter-options.c:167

4423 msgid "expected something after combine:"

4424 msgstr "förväntade någonting efter combine:"

4425

4382 -#: list-objects-filter-options.c:226

4426 +#: list-objects-filter-options.c:249

4427 msgid "multiple filter-specs cannot be combined"

4428 msgstr "flera filterspecifikationer kan inte kombineras"

4429

4386 -#: list-objects-filter-options.c:330

4430 +#: list-objects-filter-options.c:361

4431 msgid "unable to upgrade repository format to support partial clone"

4432 msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"

4433

@@ -4753,7 +4797,7 @@ msgstr "tillägg/tillägg"

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

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

4799

4756 -#: merge-recursive.c:3101 git-submodule.sh:959

4800 +#: merge-recursive.c:3101

4801 msgid "submodule"

4802 msgstr "undermodul"

4803

@@ -4841,22 +4885,22 @@ msgstr "Redan à jour!"

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

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

4887

4844 -#: merge-recursive.c:3549

4888 +#: merge-recursive.c:3550

4889 msgid "Merging:"

4890 msgstr "Slår ihop:"

4891

4848 -#: merge-recursive.c:3562

4892 +#: merge-recursive.c:3563

4893 #, c-format

4894 msgid "found %u common ancestor:"

4895 msgid_plural "found %u common ancestors:"

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

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

4898

4855 -#: merge-recursive.c:3612

4899 +#: merge-recursive.c:3613

4900 msgid "merge returned no commit"

4901 msgstr "sammanslagningen returnerade ingen incheckning"

4902

4859 -#: merge-recursive.c:3671

4903 +#: merge-recursive.c:3672

4904 #, c-format

4905 msgid ""

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

@@ -4866,12 +4910,12 @@ msgstr ""

4910 "sammanslagning:\n"

4911 " %s"

4912

4869 -#: merge-recursive.c:3768

4913 +#: merge-recursive.c:3769

4914 #, c-format

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

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

4917

4874 -#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885

4918 +#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881

4919 msgid "Unable to write index."

4920 msgstr "Kunde inte skriva indexet."

4921

@@ -4879,171 +4923,175 @@ msgstr "Kunde inte skriva indexet."

4923 msgid "failed to read the cache"

4924 msgstr "misslyckades läsa cachen"

4925

4882 -#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912

4883 -#: builtin/checkout.c:559 builtin/checkout.c:822 builtin/clone.c:816

4926 +#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930

4927 +#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816

4928 #: builtin/stash.c:265

4929 msgid "unable to write new index file"

4930 msgstr "kunde inte skriva ny indexfil"

4931

4888 -#: midx.c:68

4932 +#: midx.c:79

4933 #, c-format

4934 msgid "multi-pack-index file %s is too small"

4935 msgstr "multi-pack-indexfilen %s är för liten"

4936

4893 -#: midx.c:84

4937 +#: midx.c:95

4938 #, c-format

4939 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4940 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

4941

4898 -#: midx.c:89

4942 +#: midx.c:100

4943 #, c-format

4944 msgid "multi-pack-index version %d not recognized"

4945 msgstr "multi-pack-indexversionen %d stöds inte"

4946

4903 -#: midx.c:94

4947 +#: midx.c:105

4948 #, c-format

4905 -msgid "hash version %u does not match"

4906 -msgstr "hash-versionen %u stämmer inte"

4949 +msgid "multi-pack-index hash version %u does not match version %u"

4950 +msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"

4951

4908 -#: midx.c:108

4952 +#: midx.c:122

4953 msgid "invalid chunk offset (too large)"

4954 msgstr "felaktigt offset för stycke (för stort)"

4955

4912 -#: midx.c:132

4956 +#: midx.c:146

4957 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4958 msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat"

4959

4916 -#: midx.c:145

4960 +#: midx.c:159

4961 msgid "multi-pack-index missing required pack-name chunk"

4962 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

4963

4920 -#: midx.c:147

4964 +#: midx.c:161

4965 msgid "multi-pack-index missing required OID fanout chunk"

4966 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

4967

4924 -#: midx.c:149

4968 +#: midx.c:163

4969 msgid "multi-pack-index missing required OID lookup chunk"

4970 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

4971

4928 -#: midx.c:151

4972 +#: midx.c:165

4973 msgid "multi-pack-index missing required object offsets chunk"

4974 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

4975

4932 -#: midx.c:165

4976 +#: midx.c:179

4977 #, c-format

4978 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4979 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

4980

4937 -#: midx.c:208

4981 +#: midx.c:222

4982 #, c-format

4983 msgid "bad pack-int-id: %u (%u total packs)"

4984 msgstr "bad pack-int-id: %u (%u paket totalt)"

4985

4942 -#: midx.c:258

4986 +#: midx.c:272

4987 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4988 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

4989

4946 -#: midx.c:286

4990 +#: midx.c:300

4991 msgid "error preparing packfile from multi-pack-index"

4992 msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4993

4950 -#: midx.c:470

4994 +#: midx.c:485

4995 #, c-format

4996 msgid "failed to add packfile '%s'"

4997 msgstr "misslyckades läsa paketfilen \"%s\""

4998

4955 -#: midx.c:476

4999 +#: midx.c:491

5000 #, c-format

5001 msgid "failed to open pack-index '%s'"

5002 msgstr "misslyckades öppna paketindexet \"%s\""

5003

4960 -#: midx.c:536

5004 +#: midx.c:551

5005 #, c-format

5006 msgid "failed to locate object %d in packfile"

5007 msgstr "misslyckades hitta objekt %d i paketfilen"

5008

4965 -#: midx.c:840

5009 +#: midx.c:853

5010 msgid "Adding packfiles to multi-pack-index"

5011 msgstr "Lägger till paketfiler till multi-pack-index"

5012

4969 -#: midx.c:873

5013 +#: midx.c:886

5014 #, c-format

5015 msgid "did not see pack-file %s to drop"

5016 msgstr "såg inte paketfilen %s som skulle kastas"

5017

4974 -#: midx.c:925

5018 +#: midx.c:938

5019 msgid "no pack files to index."

5020 msgstr "inga paketfiler att indexera."

5021

4978 -#: midx.c:977

5022 +#: midx.c:990

5023 msgid "Writing chunks to multi-pack-index"

5024 msgstr "Skriver stycken till multi-pack-index"

5025

4982 -#: midx.c:1056

5026 +#: midx.c:1068

5027 #, c-format

5028 msgid "failed to clear multi-pack-index at %s"

5029 msgstr "misslyckades städa multi-pack-index på %s"

5030

4987 -#: midx.c:1112

5031 +#: midx.c:1124

5032 +msgid "multi-pack-index file exists, but failed to parse"

5033 +msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"

5034 +

5035 +#: midx.c:1132

5036 msgid "Looking for referenced packfiles"

5037 msgstr "Ser efter refererade packfiler"

5038

4991 -#: midx.c:1127

5039 +#: midx.c:1147

5040 #, c-format

5041 msgid ""

5042 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5043 msgstr ""

5044 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5045

4998 -#: midx.c:1132

5046 +#: midx.c:1152

5047 msgid "the midx contains no oid"

5048 msgstr "midx saknar oid"

5049

5002 -#: midx.c:1141

5050 +#: midx.c:1161

5051 msgid "Verifying OID order in multi-pack-index"

5052 msgstr "Bekräftar OID-ordning i multi-pack-index"

5053

5006 -#: midx.c:1150

5054 +#: midx.c:1170

5055 #, c-format

5056 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5057 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

5058

5011 -#: midx.c:1170

5059 +#: midx.c:1190

5060 msgid "Sorting objects by packfile"

5061 msgstr "Sorterar objekt efter packfil"

5062

5015 -#: midx.c:1177

5063 +#: midx.c:1197

5064 msgid "Verifying object offsets"

5065 msgstr "Bekräftar offset för objekt"

5066

5019 -#: midx.c:1193

5067 +#: midx.c:1213

5068 #, c-format

5069 msgid "failed to load pack entry for oid[%d] = %s"

5070 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

5071

5024 -#: midx.c:1199

5072 +#: midx.c:1219

5073 #, c-format

5074 msgid "failed to load pack-index for packfile %s"

5075 msgstr "misslyckades läsa paketindex för paketfil %s"

5076

5029 -#: midx.c:1208

5077 +#: midx.c:1228

5078 #, c-format

5079 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5080 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5081

5034 -#: midx.c:1233

5082 +#: midx.c:1253

5083 msgid "Counting referenced objects"

5084 msgstr "Räknar refererade objekt"

5085

5038 -#: midx.c:1243

5086 +#: midx.c:1263

5087 msgid "Finding and deleting unreferenced packfiles"

5088 msgstr "Ser efter och tar bort orefererade packfiler"

5089

5042 -#: midx.c:1433

5090 +#: midx.c:1454

5091 msgid "could not start pack-objects"

5092 msgstr "kunde inte starta pack-objects"

5093

5046 -#: midx.c:1452

5094 +#: midx.c:1474

5095 msgid "could not finish pack-objects"

5096 msgstr "kunde inte avsluta pack-objects"

5097

@@ -5127,7 +5175,7 @@ msgstr "kunde inte tolka objektet: %s"

5175 msgid "hash mismatch %s"

5176 msgstr "hashvärde stämmer inte överens %s"

5177

5130 -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2184

5178 +#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216

5179 #, c-format

5180 msgid "unable to get size of %s"

5181 msgstr "kan inte hämta storlek på %s"

@@ -5136,12 +5184,12 @@ msgstr "kan inte hämta storlek på %s"

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

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

5186

5139 -#: packfile.c:1900

5187 +#: packfile.c:1922

5188 #, c-format

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

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

5191

5144 -#: packfile.c:1904

5192 +#: packfile.c:1926

5193 #, c-format

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

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

@@ -5162,7 +5210,7 @@ msgid "option `%s' expects \"always\", \"auto\", or \"never\""

5210 msgstr ""

5211 "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

5212

5165 -#: parse-options-cb.c:130 parse-options-cb.c:147

5213 +#: parse-options-cb.c:132 parse-options-cb.c:149

5214 #, c-format

5215 msgid "malformed object name '%s'"

5216 msgstr "felformat objektnamn \"%s\""

@@ -5207,31 +5255,31 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

5255 msgid "did you mean `--%s` (with two dashes)?"

5256 msgstr "menade du \"--%s\" (med två bindestreck)?"

5257

5210 -#: parse-options.c:663 parse-options.c:963

5258 +#: parse-options.c:666 parse-options.c:971

5259 #, c-format

5260 msgid "alias of --%s"

5261 msgstr "alias för --%s"

5262

5215 -#: parse-options.c:854

5263 +#: parse-options.c:862

5264 #, c-format

5265 msgid "unknown option `%s'"

5266 msgstr "okänd flagga \"%s\""

5267

5220 -#: parse-options.c:856

5268 +#: parse-options.c:864

5269 #, c-format

5270 msgid "unknown switch `%c'"

5271 msgstr "okänd flagga \"%c\""

5272

5225 -#: parse-options.c:858

5273 +#: parse-options.c:866

5274 #, c-format

5275 msgid "unknown non-ascii option in string: `%s'"

5276 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

5277

5230 -#: parse-options.c:882

5278 +#: parse-options.c:890

5279 msgid "..."

5280 msgstr "..."

5281

5234 -#: parse-options.c:901

5282 +#: parse-options.c:909

5283 #, c-format

5284 msgid "usage: %s"

5285 msgstr "användning: %s"

@@ -5239,17 +5287,17 @@ msgstr "användning: %s"

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

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

5289 #.

5242 -#: parse-options.c:907

5290 +#: parse-options.c:915

5291 #, c-format

5292 msgid " or: %s"

5293 msgstr " eller: %s"

5294

5247 -#: parse-options.c:910

5295 +#: parse-options.c:918

5296 #, c-format

5297 msgid " %s"

5298 msgstr " %s"

5299

5252 -#: parse-options.c:949

5300 +#: parse-options.c:957

5301 msgid "-NUM"

5302 msgstr "-TAL"

5303

@@ -5387,7 +5435,7 @@ msgstr "protokollfel: felaktig radlängdstecken: %.4s"

5435 msgid "protocol error: bad line length %d"

5436 msgstr "protokollfel: felaktig radlängd: %d"

5437

5390 -#: pkt-line.c:373

5438 +#: pkt-line.c:373 sideband.c:150

5439 #, c-format

5440 msgid "remote error: %s"

5441 msgstr "fjärrfel: %s"

@@ -5401,15 +5449,24 @@ msgstr "Uppdaterar indexet"

5449 msgid "unable to create threaded lstat: %s"

5450 msgstr "kunde inte skapa trådad lstat: %s"

5451

5404 -#: pretty.c:982

5452 +#: pretty.c:983

5453 msgid "unable to parse --pretty format"

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

5455

5408 -#: promisor-remote.c:23

5409 -msgid "Remote with no URL"

5410 -msgstr "Fjärr utan URL"

5456 +#: promisor-remote.c:30

5457 +msgid "promisor-remote: unable to fork off fetch subprocess"

5458 +msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"

5459 +

5460 +#: promisor-remote.c:35 promisor-remote.c:37

5461 +msgid "promisor-remote: could not write to fetch subprocess"

5462 +msgstr "promisor-remote: kunde skriva till underprocessen för fetch"

5463 +

5464 +#: promisor-remote.c:41

5465 +msgid "promisor-remote: could not close stdin to fetch subprocess"

5466 +msgstr ""

5467 +"promisor-remote: kunde inte stänga standard in för underprocessen för fetch"

5468

5412 -#: promisor-remote.c:58

5469 +#: promisor-remote.c:53

5470 #, c-format

5471 msgid "promisor remote name cannot begin with '/': %s"

5472 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"

@@ -5426,7 +5483,7 @@ msgstr "kunde inte starta \"log\""

5483 msgid "could not read `log` output"

5484 msgstr "kunde inte läsa utdata från \"log\""

5485

5429 -#: range-diff.c:98 sequencer.c:5143

5486 +#: range-diff.c:98 sequencer.c:5283

5487 #, c-format

5488 msgid "could not parse commit '%s'"

5489 msgstr "kunde inte tolka incheckningen \"%s\""

@@ -5454,51 +5511,51 @@ msgstr "misslyckades skapa diff"

5511 msgid "could not parse log for '%s'"

5512 msgstr "kunde inte tolka loggen för \"%s\""

5513

5457 -#: read-cache.c:680

5514 +#: read-cache.c:682

5515 #, c-format

5516 msgid "will not add file alias '%s' ('%s' already exists in index)"

5517 msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"

5518

5462 -#: read-cache.c:696

5519 +#: read-cache.c:698

5520 msgid "cannot create an empty blob in the object database"

5521 msgstr "kan inte skapa tom blob i objektdatabasen"

5522

5466 -#: read-cache.c:718

5523 +#: read-cache.c:720

5524 #, c-format

5525 msgid "%s: can only add regular files, symbolic links or git-directories"

5526 msgstr ""

5527 "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"

5528

5472 -#: read-cache.c:723

5529 +#: read-cache.c:725

5530 #, c-format

5531 msgid "'%s' does not have a commit checked out"

5532 msgstr "\"%s\" har inte någon utcheckad incheckning"

5533

5477 -#: read-cache.c:775

5534 +#: read-cache.c:777

5535 #, c-format

5536 msgid "unable to index file '%s'"

5537 msgstr "kan inte indexera filen \"%s\""

5538

5482 -#: read-cache.c:794

5539 +#: read-cache.c:796

5540 #, c-format

5541 msgid "unable to add '%s' to index"

5542 msgstr "kan inte lägga till \"%s\" till indexet"

5543

5487 -#: read-cache.c:805

5544 +#: read-cache.c:807

5545 #, c-format

5546 msgid "unable to stat '%s'"

5547 msgstr "kan inte ta status på \"%s\""

5548

5492 -#: read-cache.c:1330

5549 +#: read-cache.c:1318

5550 #, c-format

5551 msgid "'%s' appears as both a file and as a directory"

5552 msgstr "\"%s\" finns både som en fil och en katalog"

5553

5497 -#: read-cache.c:1536

5554 +#: read-cache.c:1524

5555 msgid "Refresh index"

5556 msgstr "Uppdatera indexet"

5557

5501 -#: read-cache.c:1651

5558 +#: read-cache.c:1639

5559 #, c-format

5560 msgid ""

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

@@ -5507,7 +5564,7 @@ msgstr ""

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

5565 "Använder version %i"

5566

5510 -#: read-cache.c:1661

5567 +#: read-cache.c:1649

5568 #, c-format

5569 msgid ""

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

@@ -5516,139 +5573,139 @@ msgstr ""

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

5574 "Använder version %i"

5575

5519 -#: read-cache.c:1717

5576 +#: read-cache.c:1705

5577 #, c-format

5578 msgid "bad signature 0x%08x"

5579 msgstr "felaktig signatur 0x%08x"

5580

5524 -#: read-cache.c:1720

5581 +#: read-cache.c:1708

5582 #, c-format

5583 msgid "bad index version %d"

5584 msgstr "felaktig indexversion %d"

5585

5529 -#: read-cache.c:1729

5586 +#: read-cache.c:1717

5587 msgid "bad index file sha1 signature"

5588 msgstr "felaktig sha1-signatur för indexfil"

5589

5533 -#: read-cache.c:1759

5590 +#: read-cache.c:1747

5591 #, c-format

5592 msgid "index uses %.4s extension, which we do not understand"

5593 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

5594

5538 -#: read-cache.c:1761

5595 +#: read-cache.c:1749

5596 #, c-format

5597 msgid "ignoring %.4s extension"

5598 msgstr "ignorerar filtillägget %.4s"

5599

5543 -#: read-cache.c:1798

5600 +#: read-cache.c:1786

5601 #, c-format

5602 msgid "unknown index entry format 0x%08x"

5603 msgstr "okänt format 0x%08x på indexpost"

5604

5548 -#: read-cache.c:1814

5605 +#: read-cache.c:1802

5606 #, c-format

5607 msgid "malformed name field in the index, near path '%s'"

5608 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

5609

5553 -#: read-cache.c:1871

5610 +#: read-cache.c:1859

5611 msgid "unordered stage entries in index"

5612 msgstr "osorterade köposter i index"

5613

5557 -#: read-cache.c:1874

5614 +#: read-cache.c:1862

5615 #, c-format

5616 msgid "multiple stage entries for merged file '%s'"

5617 msgstr "flera köposter för den sammanslagna filen \"%s\""

5618

5562 -#: read-cache.c:1877

5619 +#: read-cache.c:1865

5620 #, c-format

5621 msgid "unordered stage entries for '%s'"

5622 msgstr "osorterade köposter för \"%s\""

5623

5567 -#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111

5568 -#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181

5569 -#: builtin/checkout.c:488 builtin/checkout.c:674 builtin/clean.c:991

5624 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111

5625 +#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181

5626 +#: builtin/checkout.c:489 builtin/checkout.c:675 builtin/clean.c:991

5627 #: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507

5571 -#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290

5628 +#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290

5629 #: builtin/submodule--helper.c:332

5630 msgid "index file corrupt"

5631 msgstr "indexfilen trasig"

5632

5576 -#: read-cache.c:2124

5633 +#: read-cache.c:2115

5634 #, c-format

5635 msgid "unable to create load_cache_entries thread: %s"

5636 msgstr "kunde inte läsa in cache_entries-tråden: %s"

5637

5581 -#: read-cache.c:2137

5638 +#: read-cache.c:2128

5639 #, c-format

5640 msgid "unable to join load_cache_entries thread: %s"

5641 msgstr "kunde inte utföra join på cache_entries-tråden: %s"

5642

5586 -#: read-cache.c:2170

5643 +#: read-cache.c:2161

5644 #, c-format

5645 msgid "%s: index file open failed"

5646 msgstr "%s: öppning av indexfilen misslyckades"

5647

5591 -#: read-cache.c:2174

5648 +#: read-cache.c:2165

5649 #, c-format

5650 msgid "%s: cannot stat the open index"

5651 msgstr "%s: kan inte ta startus på det öppna indexet"

5652

5596 -#: read-cache.c:2178

5653 +#: read-cache.c:2169

5654 #, c-format

5655 msgid "%s: index file smaller than expected"

5656 msgstr "%s: indexfilen mindre än förväntat"

5657

5601 -#: read-cache.c:2182

5658 +#: read-cache.c:2173

5659 #, c-format

5660 msgid "%s: unable to map index file"

5661 msgstr "%s: kan inte koppla indexfilen"

5662

5606 -#: read-cache.c:2224

5663 +#: read-cache.c:2215

5664 #, c-format

5665 msgid "unable to create load_index_extensions thread: %s"

5666 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

5667

5611 -#: read-cache.c:2251

5668 +#: read-cache.c:2242

5669 #, c-format

5670 msgid "unable to join load_index_extensions thread: %s"

5671 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

5672

5616 -#: read-cache.c:2283

5673 +#: read-cache.c:2274

5674 #, c-format

5675 msgid "could not freshen shared index '%s'"

5676 msgstr "kunde inte uppdatera delat index \"%s\""

5677

5621 -#: read-cache.c:2330

5678 +#: read-cache.c:2321

5679 #, c-format

5680 msgid "broken index, expect %s in %s, got %s"

5681 msgstr "trasigt index, förväntade %s i %s, fick %s"

5682

5626 -#: read-cache.c:3026 strbuf.c:1171 wrapper.c:630 builtin/merge.c:1130

5683 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126

5684 #, c-format

5685 msgid "could not close '%s'"

5686 msgstr "kunde inte stänga \"%s\""

5687

5631 -#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066

5688 +#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185

5689 #, c-format

5690 msgid "could not stat '%s'"

5691 msgstr "kunde inte ta status på \"%s\""

5692

5636 -#: read-cache.c:3142

5693 +#: read-cache.c:3133

5694 #, c-format

5695 msgid "unable to open git dir: %s"

5696 msgstr "kunde inte öppna git-katalog: %s"

5697

5641 -#: read-cache.c:3154

5698 +#: read-cache.c:3145

5699 #, c-format

5700 msgid "unable to unlink: %s"

5701 msgstr "misslyckades ta bort länken: %s"

5702

5646 -#: read-cache.c:3179

5703 +#: read-cache.c:3170

5704 #, c-format

5705 msgid "cannot fix permission bits on '%s'"

5706 msgstr "kan inte rätta behörighetsbitar på \"%s\""

5707

5651 -#: read-cache.c:3328

5708 +#: read-cache.c:3319

5709 #, c-format

5710 msgid "%s: cannot drop to stage #0"

5711 msgstr "%s: kan inte återgå till kö 0"

@@ -5721,7 +5778,7 @@ msgid_plural "Rebase %s onto %s (%d commands)"

5778 msgstr[0] "Ombasera %s på %s (%d kommando)"

5779 msgstr[1] "Ombasera %s på %s (%d kommandon)"

5780

5724 -#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228

5781 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218

5782 msgid ""

5783 "\n"

5784 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

@@ -5730,7 +5787,7 @@ msgstr ""

5787 "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "

5788 "incheckning.\n"

5789

5733 -#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232

5790 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222

5791 msgid ""

5792 "\n"

5793 "If you remove a line here THAT COMMIT WILL BE LOST.\n"

@@ -5738,7 +5795,7 @@ msgstr ""

5795 "\n"

5796 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"

5797

5741 -#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871

5798 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861

5799 msgid ""

5800 "\n"

5801 "You are editing the todo file of an ongoing interactive rebase.\n"

@@ -5752,7 +5809,7 @@ msgstr ""

5809 " git rebase --continue\n"

5810 "\n"

5811

5755 -#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948

5812 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938

5813 msgid ""

5814 "\n"

5815 "However, if you remove everything, the rebase will be aborted.\n"

@@ -5762,14 +5819,14 @@ msgstr ""

5819 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

5820 "\n"

5821

5765 -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3463

5766 -#: sequencer.c:3489 sequencer.c:5248 builtin/fsck.c:347 builtin/rebase.c:258

5822 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571

5823 +#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264

5824 #, c-format

5825 msgid "could not write '%s'"

5826 msgstr "kunde inte skriva \"%s\""

5827

5771 -#: rebase-interactive.c:116 builtin/rebase.c:190 builtin/rebase.c:216

5772 -#: builtin/rebase.c:240

5828 +#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222

5829 +#: builtin/rebase.c:246

5830 #, c-format

5831 msgid "could not write '%s'."

5832 msgstr "kunde inte skriva \"%s\"."

@@ -5803,14 +5860,14 @@ msgstr ""

5860 "\" (fel).\n"

5861 "\n"

5862

5806 -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274

5807 -#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227

5808 -#: builtin/rebase.c:252

5863 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361

5864 +#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233

5865 +#: builtin/rebase.c:258

5866 #, c-format

5867 msgid "could not read '%s'."

5868 msgstr "kunde inte läsa \"%s\"."

5869

5813 -#: ref-filter.c:42 wt-status.c:1977

5870 +#: ref-filter.c:42 wt-status.c:1973

5871 msgid "gone"

5872 msgstr "försvunnen"

5873

@@ -5829,238 +5886,233 @@ msgstr "bakom %d"

5886 msgid "ahead %d, behind %d"

5887 msgstr "före %d, bakom %d"

5888

5832 -#: ref-filter.c:165

5889 +#: ref-filter.c:169

5890 #, c-format

5891 msgid "expected format: %%(color:<color>)"

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

5893

5837 -#: ref-filter.c:167

5894 +#: ref-filter.c:171

5895 #, c-format

5896 msgid "unrecognized color: %%(color:%s)"

5897 msgstr "okänd färg: %%(color:%s)"

5898

5842 -#: ref-filter.c:189

5899 +#: ref-filter.c:193

5900 #, c-format

5901 msgid "Integer value expected refname:lstrip=%s"

5902 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

5903

5847 -#: ref-filter.c:193

5904 +#: ref-filter.c:197

5905 #, c-format

5906 msgid "Integer value expected refname:rstrip=%s"

5907 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

5908

5852 -#: ref-filter.c:195

5909 +#: ref-filter.c:199

5910 #, c-format

5911 msgid "unrecognized %%(%s) argument: %s"

5912 msgstr "okänt %%(%s)-argument: %s"

5913

5857 -#: ref-filter.c:250

5914 +#: ref-filter.c:254

5915 #, c-format

5916 msgid "%%(objecttype) does not take arguments"

5917 msgstr "%%(objecttype) tar inte argument"

5918

5862 -#: ref-filter.c:272

5919 +#: ref-filter.c:276

5920 #, c-format

5921 msgid "unrecognized %%(objectsize) argument: %s"

5922 msgstr "okänt %%(objectsize)-argument: %s"

5923

5867 -#: ref-filter.c:280

5924 +#: ref-filter.c:284

5925 #, c-format

5926 msgid "%%(deltabase) does not take arguments"

5927 msgstr "%%(deltabase) tar inte argument"

5928

5872 -#: ref-filter.c:292

5929 +#: ref-filter.c:296

5930 #, c-format

5931 msgid "%%(body) does not take arguments"

5932 msgstr "%%(body) tar inte argument"

5933

5877 -#: ref-filter.c:301

5934 +#: ref-filter.c:309

5935 #, c-format

5879 -msgid "%%(subject) does not take arguments"

5880 -msgstr "%%(subject) tar inte argument"

5936 +msgid "unrecognized %%(subject) argument: %s"

5937 +msgstr "okänt %%(subject)-argument: %s"

5938

5882 -#: ref-filter.c:323

5939 +#: ref-filter.c:330

5940 #, c-format

5941 msgid "unknown %%(trailers) argument: %s"

5942 msgstr "okänt %%(trailers)-argument: %s"

5943

5887 -#: ref-filter.c:352

5944 +#: ref-filter.c:363

5945 #, c-format

5946 msgid "positive value expected contents:lines=%s"

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

5948

5892 -#: ref-filter.c:354

5949 +#: ref-filter.c:365

5950 #, c-format

5951 msgid "unrecognized %%(contents) argument: %s"

5952 msgstr "okänt %%(contents)-argument: %s"

5953

5897 -#: ref-filter.c:369

5954 +#: ref-filter.c:380

5955 +#, c-format

5956 +msgid "positive value expected '%s' in %%(%s)"

5957 +msgstr "positivt värde förväntat \"%s\" i %%(%s)"

5958 +

5959 +#: ref-filter.c:384

5960 #, c-format

5899 -msgid "positive value expected objectname:short=%s"

5900 -msgstr "positivt värde förväntat objectname:short=%s"

5961 +msgid "unrecognized argument '%s' in %%(%s)"

5962 +msgstr "okänt argument \"%s\" i %%(%s)"

5963

5902 -#: ref-filter.c:373

5964 +#: ref-filter.c:398

5965 #, c-format

5904 -msgid "unrecognized %%(objectname) argument: %s"

5905 -msgstr "okänt %%(objectname)-argument: %s"

5966 +msgid "unrecognized email option: %s"

5967 +msgstr "okänd e-postalternativ: %s"

5968

5907 -#: ref-filter.c:403

5969 +#: ref-filter.c:428

5970 #, c-format

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

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

5973

5912 -#: ref-filter.c:415

5974 +#: ref-filter.c:440

5975 #, c-format

5976 msgid "unrecognized position:%s"

5977 msgstr "okänd position:%s"

5978

5917 -#: ref-filter.c:422

5979 +#: ref-filter.c:447

5980 #, c-format

5981 msgid "unrecognized width:%s"

5982 msgstr "okänd bredd:%s"

5983

5922 -#: ref-filter.c:431

5984 +#: ref-filter.c:456

5985 #, c-format

5986 msgid "unrecognized %%(align) argument: %s"

5987 msgstr "okänt %%(align)-argument: %s"

5988

5927 -#: ref-filter.c:439

5989 +#: ref-filter.c:464

5990 #, c-format

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

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

5993

5932 -#: ref-filter.c:457

5994 +#: ref-filter.c:482

5995 #, c-format

5996 msgid "unrecognized %%(if) argument: %s"

5997 msgstr "okänt %%(if)-argument: %s"

5998

5937 -#: ref-filter.c:559

5999 +#: ref-filter.c:584

6000 #, c-format

6001 msgid "malformed field name: %.*s"

6002 msgstr "felformat fältnamn: %.*s"

6003

5942 -#: ref-filter.c:586

6004 +#: ref-filter.c:611

6005 #, c-format

6006 msgid "unknown field name: %.*s"

6007 msgstr "okänt fältnamn: %.*s"

6008

5947 -#: ref-filter.c:590

6009 +#: ref-filter.c:615

6010 #, c-format

6011 msgid ""

6012 "not a git repository, but the field '%.*s' requires access to object data"

6013 msgstr ""

6014 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

6015

5954 -#: ref-filter.c:714

6016 +#: ref-filter.c:739

6017 #, c-format

6018 msgid "format: %%(if) atom used without a %%(then) atom"

6019 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

6020

5959 -#: ref-filter.c:777

6021 +#: ref-filter.c:802

6022 #, c-format

6023 msgid "format: %%(then) atom used without an %%(if) atom"

6024 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

6025

5964 -#: ref-filter.c:779

6026 +#: ref-filter.c:804

6027 #, c-format

6028 msgid "format: %%(then) atom used more than once"

6029 msgstr "format: atomen %%(then) använd mer än en gång"

6030

5969 -#: ref-filter.c:781

6031 +#: ref-filter.c:806

6032 #, c-format

6033 msgid "format: %%(then) atom used after %%(else)"

6034 msgstr "format: atomen %%(then) använd efter %%(else)"

6035

5974 -#: ref-filter.c:809

6036 +#: ref-filter.c:834

6037 #, c-format

6038 msgid "format: %%(else) atom used without an %%(if) atom"

6039 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

6040

5979 -#: ref-filter.c:811

6041 +#: ref-filter.c:836

6042 #, c-format

6043 msgid "format: %%(else) atom used without a %%(then) atom"

6044 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

6045

5984 -#: ref-filter.c:813

6046 +#: ref-filter.c:838

6047 #, c-format

6048 msgid "format: %%(else) atom used more than once"

6049 msgstr "format: atomen %%(else) använd mer än en gång"

6050

5989 -#: ref-filter.c:828

6051 +#: ref-filter.c:853

6052 #, c-format

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

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

6055

5994 -#: ref-filter.c:885

6056 +#: ref-filter.c:910

6057 #, c-format

6058 msgid "malformed format string %s"

6059 msgstr "felformad formatsträng %s"

6060

5999 -#: ref-filter.c:1486

6061 +#: ref-filter.c:1541

6062 #, c-format

6063 msgid "no branch, rebasing %s"

6064 msgstr "ingen gren, ombaserar %s"

6065

6004 -#: ref-filter.c:1489

6066 +#: ref-filter.c:1544

6067 #, c-format

6068 msgid "no branch, rebasing detached HEAD %s"

6069 msgstr "ingen gren, ombaserar frånkopplat HEAD %s"

6070

6009 -#: ref-filter.c:1492

6071 +#: ref-filter.c:1547

6072 #, c-format

6073 msgid "no branch, bisect started on %s"

6074 msgstr "ingen gren, \"bisect\" startad på %s"

6075

6014 -#: ref-filter.c:1502

6076 +#: ref-filter.c:1557

6077 msgid "no branch"

6078 msgstr "ingen gren"

6079

6018 -#: ref-filter.c:1538 ref-filter.c:1747

6080 +#: ref-filter.c:1591 ref-filter.c:1800

6081 #, c-format

6082 msgid "missing object %s for %s"

6083 msgstr "objektet %s saknas för %s"

6084

6023 -#: ref-filter.c:1548

6085 +#: ref-filter.c:1601

6086 #, c-format

6087 msgid "parse_object_buffer failed on %s for %s"

6088 msgstr "parse_object_buffer misslyckades på %s för %s"

6089

6028 -#: ref-filter.c:2001

6090 +#: ref-filter.c:2054

6091 #, c-format

6092 msgid "malformed object at '%s'"

6093 msgstr "felformat objekt vid \"%s\""

6094

6033 -#: ref-filter.c:2090

6095 +#: ref-filter.c:2143

6096 #, c-format

6097 msgid "ignoring ref with broken name %s"

6098 msgstr "ignorerar referens med trasigt namn %s"

6099

6038 -#: ref-filter.c:2095 refs.c:657

6100 +#: ref-filter.c:2148 refs.c:657

6101 #, c-format

6102 msgid "ignoring broken ref %s"

6103 msgstr "ignorerar trasig referens %s"

6104

6043 -#: ref-filter.c:2395

6105 +#: ref-filter.c:2464

6106 #, c-format

6107 msgid "format: %%(end) atom missing"

6108 msgstr "format: atomen %%(end) saknas"

6109

6048 -#: ref-filter.c:2495

6049 -#, c-format

6050 -msgid "option `%s' is incompatible with --merged"

6051 -msgstr "flaggan \"%s\" är inkompatibel med --merged"

6052 -

6053 -#: ref-filter.c:2498

6054 -#, c-format

6055 -msgid "option `%s' is incompatible with --no-merged"

6056 -msgstr "flaggan \"%s\" är inkompatibel med --no-merged"

6057 -

6058 -#: ref-filter.c:2508

6110 +#: ref-filter.c:2563

6111 #, c-format

6112 msgid "malformed object name %s"

6113 msgstr "felformat objektnamn %s"

6114

6063 -#: ref-filter.c:2513

6115 +#: ref-filter.c:2568

6116 #, c-format

6117 msgid "option `%s' must point to a commit"

6118 msgstr "flaggan \"%s\" måste peka på en incheckning"

@@ -6085,157 +6137,119 @@ msgstr "felaktigt namn på gren: %s = %s"

6137 msgid "ignoring dangling symref %s"

6138 msgstr "ignorerar dinglande symbolisk referens %s"

6139

6088 -#: refs.c:792

6089 -#, c-format

6090 -msgid "could not open '%s' for writing: %s"

6091 -msgstr "kunde inte öppna \"%s\" för skrivning: %s"

6092 -

6093 -#: refs.c:802 refs.c:853

6094 -#, c-format

6095 -msgid "could not read ref '%s'"

6096 -msgstr "Kunde inte läsa referensen \"%s\""

6097 -

6098 -#: refs.c:808

6099 -#, c-format

6100 -msgid "ref '%s' already exists"

6101 -msgstr "referensen \"%s\" finns redan"

6102 -

6103 -#: refs.c:813

6104 -#, c-format

6105 -msgid "unexpected object ID when writing '%s'"

6106 -msgstr "oväntat objekt-id vid skrivning \"%s\""

6107 -

6108 -#: refs.c:821 sequencer.c:408 sequencer.c:2721 sequencer.c:2925

6109 -#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1168

6110 -#: wrapper.c:628

6111 -#, c-format

6112 -msgid "could not write to '%s'"

6113 -msgstr "kunde inte skriva till \"%s\""

6114 -

6115 -#: refs.c:848 strbuf.c:1166 wrapper.c:196 wrapper.c:366 builtin/am.c:719

6116 -#: builtin/rebase.c:852

6117 -#, c-format

6118 -msgid "could not open '%s' for writing"

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

6120 -

6121 -#: refs.c:855

6122 -#, c-format

6123 -msgid "unexpected object ID when deleting '%s'"

6124 -msgstr "oväntat objekt-id vid borttagning \"%s\""

6125 -

6126 -#: refs.c:986

6140 +#: refs.c:892

6141 #, c-format

6142 msgid "log for ref %s has gap after %s"

6143 msgstr "loggen för referensen %s har lucka efter %s"

6144

6131 -#: refs.c:992

6145 +#: refs.c:898

6146 #, c-format

6147 msgid "log for ref %s unexpectedly ended on %s"

6148 msgstr "loggen för referensen %s slutade oväntat på %s"

6149

6136 -#: refs.c:1051

6150 +#: refs.c:957

6151 #, c-format

6152 msgid "log for %s is empty"

6153 msgstr "loggen för %s är tom"

6154

6141 -#: refs.c:1143

6155 +#: refs.c:1049

6156 #, c-format

6157 msgid "refusing to update ref with bad name '%s'"

6158 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

6159

6146 -#: refs.c:1219

6160 +#: refs.c:1120

6161 #, c-format

6162 msgid "update_ref failed for ref '%s': %s"

6163 msgstr "update_ref misslyckades för referensen \"%s\": %s"

6164

6151 -#: refs.c:2011

6165 +#: refs.c:1944

6166 #, c-format

6167 msgid "multiple updates for ref '%s' not allowed"

6168 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

6169

6156 -#: refs.c:2098

6170 +#: refs.c:2024

6171 msgid "ref updates forbidden inside quarantine environment"

6172 msgstr "referensuppdateringar förbjudna i karantänmiljö"

6173

6160 -#: refs.c:2109

6174 +#: refs.c:2035

6175 msgid "ref updates aborted by hook"

6176 msgstr "referensuppdateringar avbrutna av krok"

6177

6164 -#: refs.c:2209 refs.c:2239

6178 +#: refs.c:2135 refs.c:2165

6179 #, c-format

6180 msgid "'%s' exists; cannot create '%s'"

6181 msgstr "\"%s\" finns; kan inte skapa \"%s\""

6182

6169 -#: refs.c:2215 refs.c:2250

6183 +#: refs.c:2141 refs.c:2176

6184 #, c-format

6185 msgid "cannot process '%s' and '%s' at the same time"

6186 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

6187

6174 -#: refs/files-backend.c:1233

6188 +#: refs/files-backend.c:1228

6189 #, c-format

6190 msgid "could not remove reference %s"

6191 msgstr "kunde inte ta bort referensen %s"

6192

6179 -#: refs/files-backend.c:1247 refs/packed-backend.c:1541

6180 -#: refs/packed-backend.c:1551

6193 +#: refs/files-backend.c:1242 refs/packed-backend.c:1542

6194 +#: refs/packed-backend.c:1552

6195 #, c-format

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

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

6198

6185 -#: refs/files-backend.c:1250 refs/packed-backend.c:1554

6199 +#: refs/files-backend.c:1245 refs/packed-backend.c:1555

6200 #, c-format

6201 msgid "could not delete references: %s"

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

6203

6190 -#: refspec.c:137

6204 +#: refspec.c:167

6205 #, c-format

6206 msgid "invalid refspec '%s'"

6207 msgstr "felaktig referensspecifikation: \"%s\""

6208

6195 -#: remote.c:355

6209 +#: remote.c:351

6210 #, c-format

6211 msgid "config remote shorthand cannot begin with '/': %s"

6212 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"

6213

6200 -#: remote.c:403

6214 +#: remote.c:399

6215 msgid "more than one receivepack given, using the first"

6216 msgstr "mer än en receivepack angavs, använder den första"

6217

6204 -#: remote.c:411

6218 +#: remote.c:407

6219 msgid "more than one uploadpack given, using the first"

6220 msgstr "mer än en uploadpack angavs, använder den första"

6221

6208 -#: remote.c:594

6222 +#: remote.c:590

6223 #, c-format

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

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

6226

6213 -#: remote.c:598

6227 +#: remote.c:594

6228 #, c-format

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

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

6231

6218 -#: remote.c:602

6232 +#: remote.c:598

6233 #, c-format

6234 msgid "%s tracks both %s and %s"

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

6236

6223 -#: remote.c:670

6237 +#: remote.c:666

6238 #, c-format

6239 msgid "key '%s' of pattern had no '*'"

6240 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""

6241

6228 -#: remote.c:680

6242 +#: remote.c:676

6243 #, c-format

6244 msgid "value '%s' of pattern has no '*'"

6245 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""

6246

6233 -#: remote.c:986

6247 +#: remote.c:1073

6248 #, c-format

6249 msgid "src refspec %s does not match any"

6250 msgstr "käll-referensspecifikationen %s motsvarar ingen"

6251

6238 -#: remote.c:991

6252 +#: remote.c:1078

6253 #, c-format

6254 msgid "src refspec %s matches more than one"

6255 msgstr "käll-referensspecifikationen %s motsvarar mer än en"

@@ -6244,7 +6258,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"

6258 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

6259 #. the <src>.

6260 #.

6247 -#: remote.c:1006

6261 +#: remote.c:1093

6262 #, c-format

6263 msgid ""

6264 "The destination you provided is not a full refname (i.e.,\n"

@@ -6267,7 +6281,7 @@ msgstr ""

6281 "\n"

6282 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."

6283

6270 -#: remote.c:1026

6284 +#: remote.c:1113

6285 #, c-format

6286 msgid ""

6287 "The <src> part of the refspec is a commit object.\n"

@@ -6278,7 +6292,7 @@ msgstr ""

6292 "Var det meningen att skapa en ny gren genom att sända\n"

6293 "till \"%s:refs/heads/%s\"?"

6294

6281 -#: remote.c:1031

6295 +#: remote.c:1118

6296 #, c-format

6297 msgid ""

6298 "The <src> part of the refspec is a tag object.\n"

@@ -6289,7 +6303,7 @@ msgstr ""

6303 "Var det meningen att skapa en ny tagg genom att sända\n"

6304 "till \"%s:refs/tags/%s\"?"

6305

6292 -#: remote.c:1036

6306 +#: remote.c:1123

6307 #, c-format

6308 msgid ""

6309 "The <src> part of the refspec is a tree object.\n"

@@ -6300,7 +6314,7 @@ msgstr ""

6314 "Var det meningen att tagga ett nytt träd genom att sända\n"

6315 "till \"%s:refs/tags/%s\"?"

6316

6303 -#: remote.c:1041

6317 +#: remote.c:1128

6318 #, c-format

6319 msgid ""

6320 "The <src> part of the refspec is a blob object.\n"

@@ -6311,114 +6325,114 @@ msgstr ""

6325 "Var det meningen att tagga en ny blob genom att sända\n"

6326 "till \"%s:refs/tags/%s\"?"

6327

6314 -#: remote.c:1077

6328 +#: remote.c:1164

6329 #, c-format

6330 msgid "%s cannot be resolved to branch"

6331 msgstr "%s kan inte slås upp till en gren"

6332

6319 -#: remote.c:1088

6333 +#: remote.c:1175

6334 #, c-format

6335 msgid "unable to delete '%s': remote ref does not exist"

6336 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"

6337

6324 -#: remote.c:1100

6338 +#: remote.c:1187

6339 #, c-format

6340 msgid "dst refspec %s matches more than one"

6341 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

6342

6329 -#: remote.c:1107

6343 +#: remote.c:1194

6344 #, c-format

6345 msgid "dst ref %s receives from more than one src"

6346 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

6347

6334 -#: remote.c:1610 remote.c:1711

6348 +#: remote.c:1703 remote.c:1804

6349 msgid "HEAD does not point to a branch"

6350 msgstr "HEAD pekar inte på en gren"

6351

6338 -#: remote.c:1619

6352 +#: remote.c:1712

6353 #, c-format

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

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

6356

6343 -#: remote.c:1622

6357 +#: remote.c:1715

6358 #, c-format

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

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

6361

6348 -#: remote.c:1628

6362 +#: remote.c:1721

6363 #, c-format

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

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

6366

6353 -#: remote.c:1643

6367 +#: remote.c:1736

6368 #, c-format

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

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

6371

6358 -#: remote.c:1655

6372 +#: remote.c:1748

6373 #, c-format

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

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

6376

6363 -#: remote.c:1665

6377 +#: remote.c:1758

6378 #, c-format

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

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

6381

6368 -#: remote.c:1678

6382 +#: remote.c:1771

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

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

6385

6372 -#: remote.c:1700

6386 +#: remote.c:1793

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

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

6389

6376 -#: remote.c:1826

6390 +#: remote.c:1922

6391 #, c-format

6392 msgid "couldn't find remote ref %s"

6393 msgstr "Kunde inte hitta fjärr-referensen %s"

6394

6381 -#: remote.c:1839

6395 +#: remote.c:1935

6396 #, c-format

6397 msgid "* Ignoring funny ref '%s' locally"

6398 msgstr "* Ignorerar märklig referens \"%s\" lokalt"

6399

6386 -#: remote.c:2002

6400 +#: remote.c:2098

6401 #, c-format

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

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

6404

6391 -#: remote.c:2006

6405 +#: remote.c:2102

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

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

6408

6395 -#: remote.c:2009

6409 +#: remote.c:2105

6410 #, c-format

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

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

6413

6400 -#: remote.c:2013

6414 +#: remote.c:2109

6415 #, c-format

6416 msgid "Your branch and '%s' refer to different commits.\n"

6417 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

6418

6405 -#: remote.c:2016

6419 +#: remote.c:2112

6420 #, c-format

6421 msgid " (use \"%s\" for details)\n"

6422 msgstr " (använd \"%s\" för detaljer)\n"

6423

6410 -#: remote.c:2020

6424 +#: remote.c:2116

6425 #, c-format

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

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

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

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

6430

6417 -#: remote.c:2026

6431 +#: remote.c:2122

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

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

6434

6421 -#: remote.c:2029

6435 +#: remote.c:2125

6436 #, c-format

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

6438 msgid_plural ""

@@ -6428,11 +6442,11 @@ msgstr[0] ""

6442 msgstr[1] ""

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

6444

6431 -#: remote.c:2037

6445 +#: remote.c:2133

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

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

6448

6435 -#: remote.c:2040

6449 +#: remote.c:2136

6450 #, c-format

6451 msgid ""

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

@@ -6447,11 +6461,11 @@ msgstr[1] ""

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

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

6463

6450 -#: remote.c:2050

6464 +#: remote.c:2146

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

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

6467

6454 -#: remote.c:2241

6468 +#: remote.c:2337

6469 #, c-format

6470 msgid "cannot parse expected object name '%s'"

6471 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -6471,11 +6485,6 @@ msgstr "duplicerat ersättningsreferensnamn: %s"

6485 msgid "replace depth too high for object %s"

6486 msgstr "ersättningsdjupet för högt för objektet %s"

6487

6474 -#: repository.c:94 builtin/init-db.c:188

6475 -#, c-format

6476 -msgid "The hash algorithm %s is not supported in this build."

6477 -msgstr "Hashningsalgoritmen %s stöds inte i detta bygge."

6478 -

6488 #: rerere.c:217 rerere.c:226 rerere.c:229

6489 msgid "corrupt MERGE_RR"

6490 msgstr "trasig MERGE_RR"

@@ -6534,8 +6543,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

6543 msgid "Recorded preimage for '%s'"

6544 msgstr "Sparade förhandsbild för \"%s\""

6545

6537 -#: rerere.c:881 submodule.c:2078 builtin/log.c:1891

6538 -#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466

6546 +#: rerere.c:881 submodule.c:2082 builtin/log.c:1975

6547 +#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890

6548 #, c-format

6549 msgid "could not create directory '%s'"

6550 msgstr "kunde inte skapa katalogen \"%s\""

@@ -6573,25 +6582,30 @@ msgstr "kan inte uppdatera katalogen rr-cache"

6582 msgid "could not determine HEAD revision"

6583 msgstr "kunde inte bestämma HEAD-revision"

6584

6576 -#: reset.c:70 reset.c:76 sequencer.c:3318

6585 +#: reset.c:70 reset.c:76 sequencer.c:3426

6586 #, c-format

6587 msgid "failed to find tree of %s"

6588 msgstr "kunde inte hitta trädet för %s."

6589

6581 -#: revision.c:2661

6590 +#: revision.c:2344

6591 +msgid "--unpacked=<packfile> no longer supported"

6592 +msgstr "--unpacked=<paketfil> stöds inte längre"

6593 +

6594 +#: revision.c:2364

6595 +#, c-format

6596 +msgid "unknown value for --diff-merges: %s"

6597 +msgstr "okänt värde för --diff-merges: %s"

6598 +

6599 +#: revision.c:2702

6600 msgid "your current branch appears to be broken"

6601 msgstr "din nuvarande gren verkar vara trasig"

6602

6585 -#: revision.c:2664

6603 +#: revision.c:2705

6604 #, c-format

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

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

6607

6590 -#: revision.c:2873

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

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

6593 -

6594 -#: revision.c:2877

6608 +#: revision.c:2915

6609 msgid "-L does not yet support diff formats besides -p and -s"

6610 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6611

@@ -6599,12 +6613,12 @@ msgstr "-L stöder ännu inte andra diff-format än -p och -s"

6613 msgid "open /dev/null failed"

6614 msgstr "misslyckades öppna /dev/null"

6615

6602 -#: run-command.c:1269

6616 +#: run-command.c:1270

6617 #, c-format

6618 msgid "cannot create async thread: %s"

6619 msgstr "kan inte skapa asynkron tråd: %s"

6620

6607 -#: run-command.c:1333

6621 +#: run-command.c:1334

6622 #, c-format

6623 msgid ""

6624 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -6627,19 +6641,19 @@ msgstr "kunde inte tolka fjärruppackningsstatus: %s"

6641 msgid "remote unpack failed: %s"

6642 msgstr "fjärruppackning misslyckades: %s"

6643

6630 -#: send-pack.c:308

6644 +#: send-pack.c:372

6645 msgid "failed to sign the push certificate"

6646 msgstr "misslyckades underteckna push-certifikatet"

6647

6634 -#: send-pack.c:394

6648 +#: send-pack.c:460

6649 msgid "the receiving end does not support this repository's hash algorithm"

6650 msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"

6651

6638 -#: send-pack.c:403

6652 +#: send-pack.c:469

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

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

6655

6642 -#: send-pack.c:405

6656 +#: send-pack.c:471

6657 msgid ""

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

6659 "signed push"

@@ -6647,47 +6661,47 @@ msgstr ""

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

6662 "signed"

6663

6650 -#: send-pack.c:417

6664 +#: send-pack.c:483

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

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

6667

6654 -#: send-pack.c:422

6668 +#: send-pack.c:488

6669 msgid "the receiving end does not support push options"

6670 msgstr "mottagarsidan stöder inte push-flaggor"

6671

6658 -#: sequencer.c:192

6672 +#: sequencer.c:194

6673 #, c-format

6674 msgid "invalid commit message cleanup mode '%s'"

6675 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

6676

6663 -#: sequencer.c:297

6677 +#: sequencer.c:308

6678 #, c-format

6679 msgid "could not delete '%s'"

6680 msgstr "kunde inte ta bort \"%s\""

6681

6668 -#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385

6682 +#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385

6683 #, c-format

6684 msgid "could not remove '%s'"

6685 msgstr "kunde inte ta bort \"%s\""

6686

6673 -#: sequencer.c:326

6687 +#: sequencer.c:339

6688 msgid "revert"

6689 msgstr "revert"

6690

6677 -#: sequencer.c:328

6691 +#: sequencer.c:341

6692 msgid "cherry-pick"

6693 msgstr "cherry-pick"

6694

6681 -#: sequencer.c:330

6695 +#: sequencer.c:343

6696 msgid "rebase"

6697 msgstr "rebase"

6698

6685 -#: sequencer.c:332

6699 +#: sequencer.c:345

6700 #, c-format

6701 msgid "unknown action: %d"

6702 msgstr "okänd funktion: %d"

6703

6690 -#: sequencer.c:390

6704 +#: sequencer.c:404

6705 msgid ""

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

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

@@ -6695,7 +6709,7 @@ msgstr ""

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

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

6711

6698 -#: sequencer.c:393

6712 +#: sequencer.c:407

6713 msgid ""

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

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

@@ -6705,43 +6719,43 @@ msgstr ""

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

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

6721

6708 -#: sequencer.c:406 sequencer.c:2921

6722 +#: sequencer.c:420 sequencer.c:3028

6723 #, c-format

6724 msgid "could not lock '%s'"

6725 msgstr "kunde inte låsa \"%s\""

6726

6713 -#: sequencer.c:413

6727 +#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046

6728 +#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631

6729 +#, c-format

6730 +msgid "could not write to '%s'"

6731 +msgstr "kunde inte skriva till \"%s\""

6732 +

6733 +#: sequencer.c:427

6734 #, c-format

6735 msgid "could not write eol to '%s'"

6736 msgstr "kunde inte skriva radslut till \"%s\""

6737

6718 -#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941

6719 -#: sequencer.c:3203

6738 +#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048

6739 +#: sequencer.c:3311

6740 #, c-format

6741 msgid "failed to finalize '%s'"

6742 msgstr "misslyckades färdigställa \"%s\""

6743

6724 -#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185

6725 -#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128

6726 -#, c-format

6727 -msgid "could not read '%s'"

6728 -msgstr "kunde inte läsa \"%s\""

6729 -

6730 -#: sequencer.c:457

6744 +#: sequencer.c:471

6745 #, c-format

6746 msgid "your local changes would be overwritten by %s."

6747 msgstr "dina lokala ändringar skulle skrivas över av %s."

6748

6735 -#: sequencer.c:461

6749 +#: sequencer.c:475

6750 msgid "commit your changes or stash them to proceed."

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

6752

6739 -#: sequencer.c:493

6753 +#: sequencer.c:507

6754 #, c-format

6755 msgid "%s: fast-forward"

6756 msgstr "%s: snabbspola"

6757

6744 -#: sequencer.c:532 builtin/tag.c:566

6758 +#: sequencer.c:546 builtin/tag.c:566

6759 #, c-format

6760 msgid "Invalid cleanup mode %s"

6761 msgstr "Felaktigt städningsläge %s"

@@ -6749,65 +6763,65 @@ msgstr "Felaktigt städningsläge %s"

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

6764 #. "rebase".

6765 #.

6752 -#: sequencer.c:626

6766 +#: sequencer.c:640

6767 #, c-format

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

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

6770

6757 -#: sequencer.c:643

6771 +#: sequencer.c:657

6772 msgid "unable to update cache tree"

6773 msgstr "kan inte uppdatera cacheträd"

6774

6761 -#: sequencer.c:657

6775 +#: sequencer.c:671

6776 msgid "could not resolve HEAD commit"

6777 msgstr "kunde inte bestämma HEAD:s incheckning"

6778

6765 -#: sequencer.c:737

6779 +#: sequencer.c:751

6780 #, c-format

6781 msgid "no key present in '%.*s'"

6782 msgstr "ingen nyckel i \"%.*s\""

6783

6770 -#: sequencer.c:748

6784 +#: sequencer.c:762

6785 #, c-format

6786 msgid "unable to dequote value of '%s'"

6787 msgstr "kan inte ta bort citering av värdet \"%s\""

6788

6775 -#: sequencer.c:785 wrapper.c:198 wrapper.c:368 builtin/am.c:710

6776 -#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896

6789 +#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724

l10n: sv.po: Update Swedish translation (5013t0f0u)