05b345af64 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2021-11-10 08:55+0800\n"

11 -"PO-Revision-Date: 2022-01-08 21:11+0100\n"

10 +"POT-Creation-Date: 2022-01-11 09:38+0800\n"

11 +"PO-Revision-Date: 2022-01-11 16:34+0100\n"

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

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

14 "Language: sv\n"

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

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

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

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

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

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

20

21 #: add-interactive.c:380

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

26 -#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

27 -#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

26 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3509

27 +#: sequencer.c:3974 sequencer.c:4136 builtin/rebase.c:1233

28 #: builtin/rebase.c:1642

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

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

53 msgid "could not stage '%s'"

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

55

56 -#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

56 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3713

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

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

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

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

71

72 -#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

73 -#: builtin/reset.c:151

72 +#: add-interactive.c:733 apply.c:4151 builtin/checkout.c:306

73 +#: builtin/reset.c:167

74 #, c-format

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

76 msgstr "make_cache_entry misslyckades för sökvägen \"%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:941 add-patch.c:1752 git-add--interactive.perl:1369

114 +#: add-interactive.c:941 add-patch.c:1752 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:943 add-patch.c:1750 git-add--interactive.perl:1371

119 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1373

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

123

124 -#: add-interactive.c:947 git-add--interactive.perl:1379

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

125 msgid "Patch update"

126 msgstr "Uppdatera patch"

127

128 -#: add-interactive.c:986 git-add--interactive.perl:1792

128 +#: add-interactive.c:986 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:1095 builtin/clean.c:813 git-add--interactive.perl:1896

196 +#: add-interactive.c:1095 builtin/clean.c:839 git-add--interactive.perl:1898

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

200 -#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

200 +#: add-interactive.c:1096 builtin/clean.c:840 git-add--interactive.perl:1895

201 msgid "What now"

202 msgstr "Vad nu"

203

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

209 msgid "unstaged"

210 msgstr "ej köad"

211

212 -#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

213 -#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

214 -#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:194

215 -#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

216 -#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

217 -#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

218 -#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

212 +#: add-interactive.c:1148 apply.c:5020 apply.c:5023 builtin/am.c:2367

213 +#: builtin/am.c:2370 builtin/bugreport.c:107 builtin/clone.c:128

214 +#: builtin/fetch.c:153 builtin/merge.c:287 builtin/pull.c:194

215 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1858

216 +#: builtin/submodule--helper.c:1861 builtin/submodule--helper.c:2504

217 +#: builtin/submodule--helper.c:2507 builtin/submodule--helper.c:2574

218 +#: builtin/submodule--helper.c:2579 builtin/submodule--helper.c:2812

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

220 msgid "path"

221 msgstr "sökväg"

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

224 msgid "could not refresh index"

225 msgstr "kunde inte uppdatera indexet"

226

227 -#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

227 +#: add-interactive.c:1169 builtin/clean.c:804 git-add--interactive.perl:1805

228 #, c-format

229 msgid "Bye.\n"

230 msgstr "Hej då.\n"

231

232 -#: add-patch.c:34 git-add--interactive.perl:1431

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

233 #, c-format, perl-format

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

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

236

237 -#: add-patch.c:35 git-add--interactive.perl:1432

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

238 #, c-format, perl-format

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

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

241

242 -#: add-patch.c:36 git-add--interactive.perl:1433

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

243 #, c-format, perl-format

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

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

246

247 -#: add-patch.c:37 git-add--interactive.perl:1434

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

248 #, c-format, perl-format

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

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

@@ -271,22 +271,22 @@ msgstr ""

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

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

273

274 -#: add-patch.c:56 git-add--interactive.perl:1437

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

275 #, c-format, perl-format

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

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

278

279 -#: add-patch.c:57 git-add--interactive.perl:1438

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

280 #, c-format, perl-format

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

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

283

284 -#: add-patch.c:58 git-add--interactive.perl:1439

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

285 #, c-format, perl-format

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

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

288

289 -#: add-patch.c:59 git-add--interactive.perl:1440

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

290 #, c-format, perl-format

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

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

@@ -313,22 +313,22 @@ msgstr ""

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

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

315

316 -#: add-patch.c:80 git-add--interactive.perl:1443

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

317 #, c-format, perl-format

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

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

320

321 -#: add-patch.c:81 git-add--interactive.perl:1444

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

322 #, c-format, perl-format

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

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

325

326 -#: add-patch.c:82 git-add--interactive.perl:1445

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

327 #, c-format, perl-format

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

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

330

331 -#: add-patch.c:83 git-add--interactive.perl:1446

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

332 #, c-format, perl-format

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

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

@@ -355,22 +355,22 @@ msgstr ""

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

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

357

358 -#: add-patch.c:103 git-add--interactive.perl:1449

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

359 #, c-format, perl-format

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

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

362

363 -#: add-patch.c:104 git-add--interactive.perl:1450

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

364 #, c-format, perl-format

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

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

367

368 -#: add-patch.c:105 git-add--interactive.perl:1451

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

369 #, c-format, perl-format

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

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

372

373 -#: add-patch.c:106 git-add--interactive.perl:1452

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

374 #, c-format, perl-format

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

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

@@ -397,26 +397,26 @@ msgstr ""

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

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

399

400 -#: add-patch.c:126 git-add--interactive.perl:1455

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

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

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

402 #, c-format, perl-format

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

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

405

406 -#: add-patch.c:127 git-add--interactive.perl:1456

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

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

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

408 #, c-format, perl-format

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

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

411

412 -#: add-patch.c:128 git-add--interactive.perl:1457

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

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

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

414 #, c-format, perl-format

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

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

417

418 -#: add-patch.c:129 git-add--interactive.perl:1458

419 -#: git-add--interactive.perl:1476

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

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

420 #, c-format, perl-format

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

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

@@ -443,22 +443,22 @@ msgstr ""

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

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

445

446 -#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461

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

447 #, c-format, perl-format

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

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

450

451 -#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462

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

452 #, c-format, perl-format

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

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

455

456 -#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463

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

457 #, c-format, perl-format

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

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

460

461 -#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464

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

462 #, c-format, perl-format

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

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

@@ -477,22 +477,22 @@ msgstr ""

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

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

479

480 -#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467

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

481 #, c-format, perl-format

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

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

484

485 -#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468

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

486 #, c-format, perl-format

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

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

489

490 -#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469

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

491 #, c-format, perl-format

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

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

494

495 -#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470

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

496 #, c-format, perl-format

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

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

@@ -630,7 +630,7 @@ msgstr "\"git apply --cached\" misslyckades"

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

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

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

633 -#: add-patch.c:1247 git-add--interactive.perl:1242

633 +#: add-patch.c:1247 git-add--interactive.perl:1244

634 msgid ""

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

636 msgstr ""

@@ -641,11 +641,11 @@ msgstr ""

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

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

643

644 -#: add-patch.c:1291 git-add--interactive.perl:1346

644 +#: add-patch.c:1291 git-add--interactive.perl:1348

645 msgid "Apply them to the worktree anyway? "

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

647

648 -#: add-patch.c:1298 git-add--interactive.perl:1349

648 +#: add-patch.c:1298 git-add--interactive.perl:1351

649 msgid "Nothing was applied.\n"

650 msgstr "Ingenting applicerades.\n"

651

@@ -683,11 +683,11 @@ msgstr "Inget följande stycke"

683 msgid "No other hunks to goto"

684 msgstr "Inga andra stycken att gå till"

685

686 -#: add-patch.c:1549 git-add--interactive.perl:1606

686 +#: add-patch.c:1549 git-add--interactive.perl:1608

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

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

689

690 -#: add-patch.c:1550 git-add--interactive.perl:1608

690 +#: add-patch.c:1550 git-add--interactive.perl:1610

691 msgid "go to which hunk? "

692 msgstr "gå till vilket stycke? "

693

@@ -707,7 +707,7 @@ msgstr[1] "Beklagar, det finns bara %d stycken."

707 msgid "No other hunks to search"

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

709

710 -#: add-patch.c:1581 git-add--interactive.perl:1661

710 +#: add-patch.c:1581 git-add--interactive.perl:1663

711 msgid "search for regex? "

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

713

@@ -798,7 +798,7 @@ msgstr ""

798 msgid "Exiting because of an unresolved conflict."

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

800

801 -#: advice.c:209 builtin/merge.c:1379

801 +#: advice.c:209 builtin/merge.c:1382

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

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

804

@@ -896,21 +896,33 @@ msgstr "okänt alternativ för whitespace: \"%s\""

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

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

898

899 -#: apply.c:136

900 -msgid "--reject and --3way cannot be used together."

901 -msgstr "--reject och --3way kan inte användas samtidigt."

902 -

903 -#: apply.c:139

904 -msgid "--3way outside a repository"

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

906 -

907 -#: apply.c:150

908 -msgid "--index outside a repository"

909 -msgstr "--index utanför arkiv"

910 -

911 -#: apply.c:153

912 -msgid "--cached outside a repository"

913 -msgstr "--cached utanför arkiv"

899 +#: apply.c:136 archive.c:584 range-diff.c:559 revision.c:2303 revision.c:2307

900 +#: revision.c:2316 revision.c:2321 revision.c:2527 revision.c:2870

901 +#: revision.c:2874 revision.c:2880 revision.c:2883 revision.c:2885

902 +#: builtin/add.c:510 builtin/add.c:512 builtin/add.c:529 builtin/add.c:541

903 +#: builtin/branch.c:727 builtin/checkout.c:467 builtin/checkout.c:470

904 +#: builtin/checkout.c:1644 builtin/checkout.c:1754 builtin/checkout.c:1757

905 +#: builtin/clone.c:906 builtin/commit.c:358 builtin/commit.c:361

906 +#: builtin/commit.c:1196 builtin/describe.c:593 builtin/diff-tree.c:155

907 +#: builtin/difftool.c:733 builtin/fast-export.c:1245 builtin/fetch.c:2033

908 +#: builtin/fetch.c:2038 builtin/index-pack.c:1852 builtin/init-db.c:560

909 +#: builtin/log.c:1946 builtin/log.c:1948 builtin/ls-files.c:778

910 +#: builtin/merge.c:1403 builtin/merge.c:1405 builtin/pack-objects.c:4073

911 +#: builtin/push.c:592 builtin/push.c:630 builtin/push.c:636 builtin/push.c:641

912 +#: builtin/rebase.c:1193 builtin/rebase.c:1195 builtin/rebase.c:1199

913 +#: builtin/repack.c:684 builtin/repack.c:715 builtin/reset.c:426

914 +#: builtin/reset.c:462 builtin/rev-list.c:541 builtin/show-branch.c:710

915 +#: builtin/stash.c:1707 builtin/stash.c:1710 builtin/submodule--helper.c:1316

916 +#: builtin/submodule--helper.c:2975 builtin/tag.c:526 builtin/tag.c:572

917 +#: builtin/worktree.c:702

918 +#, c-format

919 +msgid "options '%s' and '%s' cannot be used together"

920 +msgstr "flaggorna \"%s\" och \"%s\" kan inte användas samtidigt"

921 +

922 +#: apply.c:139 apply.c:150 apply.c:153

923 +#, c-format

924 +msgid "'%s' outside a repository"

925 +msgstr "\"%s\" utanför arkiv"

926

927 #: apply.c:800

928 #, c-format

@@ -1123,8 +1135,8 @@ msgstr "patch misslyckades: %s:%ld"

1135 msgid "cannot checkout %s"

1136 msgstr "kan inte checka ut %s"

1137

1126 -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1127 -#: setup.c:308

1138 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:104 pack-revindex.c:214

1139 +#: setup.c:309

1140 #, c-format

1141 msgid "failed to read %s"

1142 msgstr "misslyckades läsa %s"

@@ -1134,382 +1146,380 @@ msgstr "misslyckades läsa %s"

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

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

1148

1137 -#: apply.c:3442 apply.c:3709

1149 +#: apply.c:3442 apply.c:3711

1150 #, c-format

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

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

1153

1142 -#: apply.c:3549 apply.c:3724

1154 +#: apply.c:3549 apply.c:3726

1155 #, c-format

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

1157 msgstr "%s: finns inte i indexet"

1158

1147 -#: apply.c:3558 apply.c:3732 apply.c:3976

1159 +#: apply.c:3558 apply.c:3734 apply.c:3978

1160 #, c-format

1161 msgid "%s: does not match index"

1162 msgstr "%s: motsvarar inte indexet"

1163

1152 -#: apply.c:3593

1164 +#: apply.c:3595

1165 msgid "repository lacks the necessary blob to perform 3-way merge."

1166 msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."

1167

1156 -#: apply.c:3596

1168 +#: apply.c:3598

1169 #, c-format

1170 msgid "Performing three-way merge...\n"

1171 msgstr "Utför trevägssammanslagning...\n"

1172

1161 -#: apply.c:3612 apply.c:3616

1173 +#: apply.c:3614 apply.c:3618

1174 #, c-format

1175 msgid "cannot read the current contents of '%s'"

1176 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""

1177

1166 -#: apply.c:3628

1178 +#: apply.c:3630

1179 #, c-format

1180 msgid "Failed to perform three-way merge...\n"

1181 msgstr "Misslyckades utföra trevägssammanslagning...\n"

1182

1171 -#: apply.c:3642

1183 +#: apply.c:3644

1184 #, c-format

1185 msgid "Applied patch to '%s' with conflicts.\n"

1186 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"

1187

1176 -#: apply.c:3647

1188 +#: apply.c:3649

1189 #, c-format

1190 msgid "Applied patch to '%s' cleanly.\n"

1191 msgstr "Tillämpade patchen på \"%s\" rent.\n"

1192

1181 -#: apply.c:3664

1193 +#: apply.c:3666

1194 #, c-format

1195 msgid "Falling back to direct application...\n"

1196 msgstr "Faller tillbaka på direkt tillämpning...\n"

1197

1186 -#: apply.c:3676

1198 +#: apply.c:3678

1199 msgid "removal patch leaves file contents"

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

1201

1190 -#: apply.c:3749

1202 +#: apply.c:3751

1203 #, c-format

1204 msgid "%s: wrong type"

1205 msgstr "%s: fel typ"

1206

1195 -#: apply.c:3751

1207 +#: apply.c:3753

1208 #, c-format

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

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

1211

1200 -#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1201 -#: read-cache.c:1368

1212 +#: apply.c:3918 apply.c:3920 read-cache.c:889 read-cache.c:918

1213 +#: read-cache.c:1381

1214 #, c-format

1215 msgid "invalid path '%s'"

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

1217

1206 -#: apply.c:3974

1218 +#: apply.c:3976

1219 #, c-format

1220 msgid "%s: already exists in index"

1221 msgstr "%s: finns redan i indexet"

1222

1211 -#: apply.c:3978

1223 +#: apply.c:3980

1224 #, c-format

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

1226 msgstr "%s: finns redan i arbetskatalogen"

1227

1216 -#: apply.c:3998

1228 +#: apply.c:4000

1229 #, c-format

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

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

1232

1221 -#: apply.c:4003

1233 +#: apply.c:4005

1234 #, c-format

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

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

1237

1226 -#: apply.c:4023

1238 +#: apply.c:4025

1239 #, c-format

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

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

1242

1231 -#: apply.c:4027

1243 +#: apply.c:4029

1244 #, c-format

1245 msgid "%s: patch does not apply"

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

1247

1236 -#: apply.c:4042

1248 +#: apply.c:4044

1249 #, c-format

1250 msgid "Checking patch %s..."

1251 msgstr "Kontrollerar patchen %s..."

1252

1241 -#: apply.c:4134

1253 +#: apply.c:4136

1254 #, c-format

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

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

1257

1246 -#: apply.c:4141

1258 +#: apply.c:4143

1259 #, c-format

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

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

1262

1251 -#: apply.c:4144

1263 +#: apply.c:4146

1264 #, c-format

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

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

1267

1256 -#: apply.c:4153

1268 +#: apply.c:4155

1269 #, c-format

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

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

1272

1261 -#: apply.c:4163

1273 +#: apply.c:4165

1274 #, c-format

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

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

1277

1266 -#: apply.c:4301

1278 +#: apply.c:4303

1279 #, c-format

1280 msgid "unable to remove %s from index"

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

1282

1271 -#: apply.c:4335

1283 +#: apply.c:4337

1284 #, c-format

1285 msgid "corrupt patch for submodule %s"

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

1287

1276 -#: apply.c:4341

1288 +#: apply.c:4343

1289 #, c-format

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

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

1292

1281 -#: apply.c:4349

1293 +#: apply.c:4351

1294 #, c-format

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

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

1297

1286 -#: apply.c:4355 apply.c:4500

1298 +#: apply.c:4357 apply.c:4502

1299 #, c-format

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

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

1302

1291 -#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1292 -#: builtin/gc.c:2276

1303 +#: apply.c:4400 builtin/bisect--helper.c:540 builtin/gc.c:2258

1304 +#: builtin/gc.c:2293

1305 #, c-format

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

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

1308

1297 -#: apply.c:4402

1309 +#: apply.c:4404

1310 #, c-format

1311 msgid "closing file '%s'"

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

1313

1302 -#: apply.c:4472

1314 +#: apply.c:4474

1315 #, c-format

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

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

1318

1307 -#: apply.c:4570

1319 +#: apply.c:4572

1320 #, c-format

1321 msgid "Applied patch %s cleanly."

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

1323

1312 -#: apply.c:4578

1324 +#: apply.c:4580

1325 msgid "internal error"

1326 msgstr "internt fel"

1327

1316 -#: apply.c:4581

1328 +#: apply.c:4583

1329 #, c-format

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

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

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

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

1334

1323 -#: apply.c:4592

1335 +#: apply.c:4594

1336 #, c-format

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

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

1339

1328 -#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1340 +#: apply.c:4602

1341 #, c-format

1342 msgid "cannot open %s"

1343 msgstr "kan inte öppna %s"

1344

1333 -#: apply.c:4614

1345 +#: apply.c:4616

1346 #, c-format

1347 msgid "Hunk #%d applied cleanly."

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

1349

1338 -#: apply.c:4618

1350 +#: apply.c:4620

1351 #, c-format

1352 msgid "Rejected hunk #%d."

1353 msgstr "Refuserar stycke %d."

1354

1343 -#: apply.c:4747

1355 +#: apply.c:4749

1356 #, c-format

1357 msgid "Skipped patch '%s'."

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

1359

1348 -#: apply.c:4755

1349 -msgid "unrecognized input"

1350 -msgstr "indata känns inte igen"

1360 +#: apply.c:4758

1361 +msgid "No valid patches in input (allow with \"--allow-empty\")"

1362 +msgstr "Inga giltiga patchar i indata (tillåt med \"--allow-empty\")"

1363

1352 -#: apply.c:4775

1364 +#: apply.c:4779

1365 msgid "unable to read index file"

1366 msgstr "kan inte läsa indexfilen"

1367

1356 -#: apply.c:4932

1368 +#: apply.c:4936

1369 #, c-format

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

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

1372

1361 -#: apply.c:4959

1373 +#: apply.c:4963

1374 #, c-format

1375 msgid "squelched %d whitespace error"

1376 msgid_plural "squelched %d whitespace errors"

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

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

1379

1368 -#: apply.c:4965 apply.c:4980

1380 +#: apply.c:4969 apply.c:4984

1381 #, c-format

1382 msgid "%d line adds whitespace errors."

1383 msgid_plural "%d lines add whitespace errors."

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

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

1386

1375 -#: apply.c:4973

1387 +#: apply.c:4977

1388 #, c-format

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

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

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

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

1393

1382 -#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1394 +#: apply.c:4993 builtin/add.c:704 builtin/mv.c:338 builtin/rm.c:430

1395 msgid "Unable to write new index file"

1396 msgstr "Kunde inte skriva ny indexfil"

1397

1386 -#: apply.c:5017

1398 +#: apply.c:5021

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

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

1401

1390 -#: apply.c:5020

1402 +#: apply.c:5024

1403 msgid "apply changes matching the given path"

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

1405

1394 -#: apply.c:5022 builtin/am.c:2320

1406 +#: apply.c:5026 builtin/am.c:2376

1407 msgid "num"

1408 msgstr "antal"

1409

1398 -#: apply.c:5023

1410 +#: apply.c:5027

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

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

1413

1402 -#: apply.c:5026

1414 +#: apply.c:5030

1415 msgid "ignore additions made by the patch"

1416 msgstr "ignorera tillägg gjorda av patchen"

1417

1406 -#: apply.c:5028

1418 +#: apply.c:5032

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

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

1421

1410 -#: apply.c:5032

1422 +#: apply.c:5036

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

1424 msgstr "visa antal tillagda och borttagna rader decimalt"

1425

1414 -#: apply.c:5034

1426 +#: apply.c:5038

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

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

1429

1418 -#: apply.c:5036

1430 +#: apply.c:5040

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

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

1433

1422 -#: apply.c:5038

1434 +#: apply.c:5042

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

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

1437

1426 -#: apply.c:5040

1438 +#: apply.c:5044

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

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

1441

1430 -#: apply.c:5042

1442 +#: apply.c:5046

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

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

1445

1434 -#: apply.c:5044

1446 +#: apply.c:5048

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

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

1449

1438 -#: apply.c:5047

1450 +#: apply.c:5051

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

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

1453

1442 -#: apply.c:5049

1454 +#: apply.c:5053

1455 msgid "attempt three-way merge, fall back on normal patch if that fails"

1456 msgstr ""

1457 "försök en trevägssammanslagning, fall tillbaka på normal patch om det "

1458 "misslyckas"

1459

1448 -#: apply.c:5051

1460 +#: apply.c:5055

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

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

1463

1452 -#: apply.c:5054 builtin/checkout-index.c:196

1464 +#: apply.c:5058 builtin/checkout-index.c:196

1465 msgid "paths are separated with NUL character"

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

1467

1456 -#: apply.c:5056

1468 +#: apply.c:5060

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

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

1471

1460 -#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1472 +#: apply.c:5061 builtin/am.c:2352 builtin/am.c:2355

1473 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1474 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1475 #: builtin/rebase.c:1051

1476 msgid "action"

1477 msgstr "åtgärd"

1478

1467 -#: apply.c:5058

1479 +#: apply.c:5062

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

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

1482

1471 -#: apply.c:5061 apply.c:5064

1483 +#: apply.c:5065 apply.c:5068

1484 msgid "ignore changes in whitespace when finding context"

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

1486

1475 -#: apply.c:5067

1487 +#: apply.c:5071

1488 msgid "apply the patch in reverse"

1489 msgstr "tillämpa patchen baklänges"

1490

1479 -#: apply.c:5069

1491 +#: apply.c:5073

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

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

1494

1483 -#: apply.c:5071

1495 +#: apply.c:5075

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

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

1498

1487 -#: apply.c:5073

1499 +#: apply.c:5077

1500 msgid "allow overlapping hunks"

1501 msgstr "tillåt överlappande stycken"

1502

1491 -#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1492 -#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1493 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1494 -msgid "be verbose"

1495 -msgstr "var pratsam"

1496 -

1497 -#: apply.c:5076

1503 +#: apply.c:5080

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

1505 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1506

1501 -#: apply.c:5079

1507 +#: apply.c:5083

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

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

1510

1505 -#: apply.c:5081 builtin/am.c:2308

1511 +#: apply.c:5085 builtin/am.c:2364

1512 msgid "root"

1513 msgstr "rot"

1514

1509 -#: apply.c:5082

1515 +#: apply.c:5086

1516 msgid "prepend <root> to all filenames"

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

1518

1519 +#: apply.c:5089

1520 +msgid "don't return error for empty patches"

1521 +msgstr "ge inte någon felkod för tomma patchar"

1522 +

1523 #: archive-tar.c:125 archive-zip.c:345

1524 #, c-format

1525 msgid "cannot stream blob %s"

@@ -1520,16 +1530,16 @@ msgstr "kan inte strömma blob:en %s"

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

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

1532

1523 -#: archive-tar.c:450

1533 +#: archive-tar.c:447

1534 #, c-format

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

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

1537

1528 -#: archive-tar.c:453

1538 +#: archive-tar.c:450

1539 msgid "unable to redirect descriptor"

1540 msgstr "kan inte omdirigera handtag"

1541

1532 -#: archive-tar.c:460

1542 +#: archive-tar.c:457

1543 #, c-format

1544 msgid "'%s' filter reported error"

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

@@ -1573,19 +1583,13 @@ msgstr ""

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

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

1585

1576 -#: archive.c:188

1577 -#, c-format

1578 -msgid "cannot read %s"

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

1580 -

1581 -#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1582 -#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1583 -#: builtin/merge.c:1145

1586 +#: archive.c:188 archive.c:341 builtin/gc.c:497 builtin/notes.c:238

1587 +#: builtin/tag.c:578

1588 #, c-format

1585 -msgid "could not read '%s'"

1589 +msgid "cannot read '%s'"

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

1591

1588 -#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1592 +#: archive.c:426 builtin/add.c:215 builtin/add.c:671 builtin/rm.c:334

1593 #, c-format

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

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

@@ -1627,7 +1631,7 @@ msgstr "fmt"

1631 msgid "archive format"

1632 msgstr "arkivformat"

1633

1630 -#: archive.c:552 builtin/log.c:1775

1634 +#: archive.c:552 builtin/log.c:1790

1635 msgid "prefix"

1636 msgstr "prefix"

1637

@@ -1637,9 +1641,9 @@ msgstr "lägg till prefix till varje sökväg i arkivet"

1641

1642 #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1643 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1640 -#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1641 -#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1642 -#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1644 +#: builtin/fast-export.c:1181 builtin/fast-export.c:1183

1645 +#: builtin/fast-export.c:1187 builtin/grep.c:935 builtin/hash-object.c:103

1646 +#: builtin/ls-files.c:654 builtin/ls-files.c:657 builtin/notes.c:410

1647 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1648 msgid "file"

1649 msgstr "fil"

@@ -1669,7 +1673,7 @@ msgid "list supported archive formats"

1673 msgstr "visa understödda arkivformat"

1674

1675 #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1672 -#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1676 +#: builtin/submodule--helper.c:1870 builtin/submodule--helper.c:2513

1677 msgid "repo"

1678 msgstr "arkiv"

1679

@@ -1677,7 +1681,7 @@ msgstr "arkiv"

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

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

1683

1680 -#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1684 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:708

1685 #: builtin/notes.c:496

1686 msgid "command"

1687 msgstr "kommando"

@@ -1690,18 +1694,20 @@ msgstr "sökväg till kommandot git-upload-archive på fjärren"

1694 msgid "Unexpected option --remote"

1695 msgstr "Oväntad flagga --remote"

1696

1693 -#: archive.c:580

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

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

1697 +#: archive.c:580 fetch-pack.c:300 revision.c:2887 builtin/add.c:544

1698 +#: builtin/add.c:576 builtin/checkout.c:1763 builtin/commit.c:370

1699 +#: builtin/fast-export.c:1230 builtin/index-pack.c:1848 builtin/log.c:2115

1700 +#: builtin/reset.c:435 builtin/reset.c:493 builtin/rm.c:281

1701 +#: builtin/stash.c:1719 builtin/worktree.c:508 http-fetch.c:144

1702 +#: http-fetch.c:153

1703 +#, c-format

1704 +msgid "the option '%s' requires '%s'"

1705 +msgstr "flaggan \"%s\" kräver \"%s\""

1706

1707 #: archive.c:582

1708 msgid "Unexpected option --output"

1709 msgstr "Oväntad flagga --output"

1710

1701 -#: archive.c:584

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

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

1704 -

1711 #: archive.c:606

1712 #, c-format

1713 msgid "Unknown archive format '%s'"

@@ -1810,7 +1816,7 @@ msgstr "en %s-revision behövs"

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

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

1818

1813 -#: bisect.c:985 builtin/merge.c:154

1819 +#: bisect.c:985 builtin/merge.c:155

1820 #, c-format

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

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

@@ -1864,10 +1870,10 @@ msgstr ""

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

1871 "incheckningen"

1872

1867 -#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1868 -#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

1869 -#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1870 -#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1873 +#: blame.c:2820 bundle.c:224 midx.c:1042 ref-filter.c:2370 remote.c:2158

1874 +#: sequencer.c:2352 sequencer.c:4899 submodule.c:883 builtin/commit.c:1114

1875 +#: builtin/log.c:429 builtin/log.c:1036 builtin/log.c:1644 builtin/log.c:2071

1876 +#: builtin/log.c:2362 builtin/merge.c:431 builtin/pack-objects.c:3373

1877 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1878 #: builtin/shortlog.c:255

1879 msgid "revision walk setup failed"

@@ -1890,105 +1896,99 @@ msgstr "sökvägen %s i %s finns inte"

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

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

1898

1893 -#: branch.c:53

1894 -#, c-format

1899 +#: branch.c:77

1900 msgid ""

1896 -"\n"

1897 -"After fixing the error cause you may try to fix up\n"

1898 -"the remote tracking information by invoking\n"

1899 -"\"git branch --set-upstream-to=%s%s%s\"."

1901 +"cannot inherit upstream tracking configuration of multiple refs when "

1902 +"rebasing is requested"

1903 msgstr ""

1901 -"\n"

1902 -"När du har rättat felorsaken kan du försöka rätta\n"

1903 -"fjärrspårningsinformationen genom att utföra\n"

1904 -"\"git branch --set-upstream-to=%s%s%s\"."

1904 +"kan inte ärva uppströmsspårningsinformation från flera referenser när "

1905 +"ombasering är vald"

1906

1906 -#: branch.c:67

1907 +#: branch.c:88

1908 #, c-format

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

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

1909 +msgid "not setting branch '%s' as its own upstream"

1910 +msgstr "ställer inte in grenen %s som sin egen uppströmsgren"

1911

1911 -#: branch.c:93

1912 +#: branch.c:144

1913 #, c-format

1913 -msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1914 -msgstr ""

1915 -"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "

1916 -"ombasering."

1914 +msgid "branch '%s' set up to track '%s' by rebasing."

1915 +msgstr "grenen \"%s\" inställd på att spåra \"%s\" genom ombasering."

1916

1918 -#: branch.c:94

1917 +#: branch.c:145

1918 #, c-format

1920 -msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

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

1919 +msgid "branch '%s' set up to track '%s'."

1920 +msgstr "grenen \"%s\" inställd på att spåra \"%s\"."

1921

1923 -#: branch.c:98

1922 +#: branch.c:148

1923 #, c-format

1925 -msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1926 -msgstr ""

1927 -"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "

1928 -"ombasering."

1924 +msgid "branch '%s' set up to track:"

1925 +msgstr "grenen \"%s\" inställd på att spåra:"

1926

1930 -#: branch.c:99

1931 -#, c-format

1932 -msgid "Branch '%s' set up to track local branch '%s'."

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

1927 +#: branch.c:160

1928 +msgid "unable to write upstream branch configuration"

1929 +msgstr "kan inte skriva inställningar för uppströmsgren"

1930

1935 -#: branch.c:104

1936 -#, c-format

1937 -msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1931 +#: branch.c:162

1932 +msgid ""

1933 +"\n"

1934 +"After fixing the error cause you may try to fix up\n"

1935 +"the remote tracking information by invoking:"

1936 msgstr ""

1939 -"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."

1937 +"\n"

1938 +"När du har rättat felorsaken kan du försöka rätta\n"

1939 +"fjärrspårningsinformationen genom att utföra:"

1940

1941 -#: branch.c:105

1941 +#: branch.c:203

1942 #, c-format

1943 -msgid "Branch '%s' set up to track remote ref '%s'."

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

1943 +msgid "asked to inherit tracking from '%s', but no remote is set"

1944 +msgstr "bad om att ärva spårning från \"%s\", men ingen fjärr är vald"

1945

1946 -#: branch.c:109

1946 +#: branch.c:209

1947 #, c-format

1948 -msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1948 +msgid "asked to inherit tracking from '%s', but no merge configuration is set"

1949 msgstr ""

1950 -"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "

1951 -"ombasering."

1950 +"bad om att ärva spårning från \"%s\", men ingen sammanslagningsinställning "

1951 +"är vald"

1952

1953 -#: branch.c:110

1953 +#: branch.c:252

1954 #, c-format

1955 -msgid "Branch '%s' set up to track local ref '%s'."

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

1957 -

1958 -#: branch.c:119

1959 -msgid "Unable to write upstream branch configuration"

1960 -msgstr "Kan inte skriva inställningar för uppströmsgren"

1955 +msgid "not tracking: ambiguous information for ref %s"

1956 +msgstr "spårar inte: tvetydig information för referensen %s"

1957

1962 -#: branch.c:156

1958 +#: branch.c:287

1959 #, c-format

1964 -msgid "Not tracking: ambiguous information for ref %s"

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

1960 +msgid "'%s' is not a valid branch name"

1961 +msgstr "\"%s\" är inte ett giltigt grennamn"

1962

1967 -#: branch.c:189

1963 +#: branch.c:307

1964 #, c-format

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

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

1965 +msgid "a branch named '%s' already exists"

1966 +msgstr "det finns redan en gren som heter \"%s\""

1967

1972 -#: branch.c:208

1968 +#: branch.c:313

1969 #, c-format

1974 -msgid "A branch named '%s' already exists."

1975 -msgstr "Det finns redan en gren som heter \"%s\"."

1970 +msgid "cannot force update the branch '%s'checked out at '%s'"

1971 +msgstr ""

1972 +"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""

1973

1977 -#: branch.c:213

1978 -msgid "Cannot force update the current branch."

1979 -msgstr "Kan inte tvinga uppdatering av aktuell gren."

1974 +#: branch.c:313

1975 +#, c-format

1976 +msgid "cannot force update the branch '%s' checked out at '%s'"

1977 +msgstr ""

1978 +"kan inte tvinga uppdatering av grenen \"%s\" som är utcheckad på \"%s\""

1979

1981 -#: branch.c:233

1980 +#: branch.c:336

1981 #, c-format

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

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

1982 +msgid "cannot set up tracking information; starting point '%s' is not a branch"

1983 +msgstr ""

1984 +"kan inte ställa in spårningsinformation; startpunkten \"%s\" är inte en gren"

1985

1986 -#: branch.c:235

1986 +#: branch.c:338

1987 #, c-format

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

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

1990

1991 -#: branch.c:237

1991 +#: branch.c:340

1992 msgid ""

1993 "\n"

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

@@ -2008,27 +2008,28 @@ msgstr ""

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

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

2010

2011 -#: branch.c:281

2011 +#: branch.c:384 builtin/replace.c:321 builtin/replace.c:377

2012 +#: builtin/replace.c:423 builtin/replace.c:453

2013 #, c-format

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

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

2014 +msgid "not a valid object name: '%s'"

2015 +msgstr "objektnamnet är inte giltigt: \"%s\""

2016

2016 -#: branch.c:301

2017 +#: branch.c:404

2018 #, c-format

2018 -msgid "Ambiguous object name: '%s'."

2019 -msgstr "Objektnamnet är tvetydigt: \"%s\"."

2019 +msgid "ambiguous object name: '%s'"

2020 +msgstr "objektnamnet är tvetydigt: \"%s\""

2021

2021 -#: branch.c:306

2022 +#: branch.c:409

2023 #, c-format

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

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

2024 +msgid "not a valid branch point: '%s'"

2025 +msgstr "avgreningspunkten är inte giltig: \"%s\""

2026

2026 -#: branch.c:366

2027 +#: branch.c:469

2028 #, c-format

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

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

2031

2031 -#: branch.c:389

2032 +#: branch.c:494

2033 #, c-format

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

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

@@ -2053,7 +2054,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"

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

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

2056

2056 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2057 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2620 sequencer.c:3406

2058 #: builtin/commit.c:862

2059 #, c-format

2060 msgid "could not open '%s'"

@@ -2112,7 +2113,7 @@ msgstr "version %d för bunt stöds ej"

2113 msgid "cannot write bundle version %d with algorithm %s"

2114 msgstr "kan inte skriva bunt med version %d med algoritmen %s"

2115

2115 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2116 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1953 builtin/shortlog.c:399

2117 #, c-format

2118 msgid "unrecognized argument: %s"

2119 msgstr "okänt argument: %s"

@@ -2149,7 +2150,7 @@ msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"

2150 msgid "final chunk has non-zero id %<PRIx32>"

2151 msgstr "avslutande stycke har id %<PRIx32> som inte är noll"

2152

2152 -#: color.c:329

2153 +#: color.c:354

2154 #, c-format

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

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

@@ -2199,190 +2200,190 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"

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

2201 msgstr "kan inte hitta alla incheckingsgraffiler"

2202

2202 -#: commit-graph.c:746 commit-graph.c:783

2203 +#: commit-graph.c:749 commit-graph.c:786

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

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

2206

2206 -#: commit-graph.c:767

2207 +#: commit-graph.c:770

2208 #, c-format

2209 msgid "could not find commit %s"

2210 msgstr "kunde inte hitta incheckningen %s"

2211

2211 -#: commit-graph.c:800

2212 +#: commit-graph.c:803

2213 msgid "commit-graph requires overflow generation data but has none"

2214 msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"

2215

2215 -#: commit-graph.c:1105 builtin/am.c:1342

2216 +#: commit-graph.c:1108 builtin/am.c:1369

2217 #, c-format

2218 msgid "unable to parse commit %s"

2219 msgstr "kunde inte tolka incheckningen %s"

2220

2220 -#: commit-graph.c:1367 builtin/pack-objects.c:3070

2221 +#: commit-graph.c:1370 builtin/pack-objects.c:3070

2222 #, c-format

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

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

2225

2225 -#: commit-graph.c:1398

2226 +#: commit-graph.c:1401

2227 msgid "Loading known commits in commit graph"

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

2229

2229 -#: commit-graph.c:1415

2230 +#: commit-graph.c:1418

2231 msgid "Expanding reachable commits in commit graph"

2232 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

2233

2233 -#: commit-graph.c:1435

2234 +#: commit-graph.c:1438

2235 msgid "Clearing commit marks in commit graph"

2236 msgstr "Rensar incheckningsmärken i incheckningsgraf"

2237

2237 -#: commit-graph.c:1454

2238 +#: commit-graph.c:1457

2239 msgid "Computing commit graph topological levels"

2240 msgstr "Beräknar topografiska nivåer för incheckningsgraf"

2241

2241 -#: commit-graph.c:1507

2242 +#: commit-graph.c:1510

2243 msgid "Computing commit graph generation numbers"

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

2245

2245 -#: commit-graph.c:1588

2246 +#: commit-graph.c:1591

2247 msgid "Computing commit changed paths Bloom filters"

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

2249

2249 -#: commit-graph.c:1665

2250 +#: commit-graph.c:1668

2251 msgid "Collecting referenced commits"

2252 msgstr "Samlar refererade incheckningar"

2253

2253 -#: commit-graph.c:1690

2254 +#: commit-graph.c:1693

2255 #, c-format

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

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

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

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

2260

2260 -#: commit-graph.c:1703

2261 +#: commit-graph.c:1706

2262 #, c-format

2263 msgid "error adding pack %s"

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

2265

2265 -#: commit-graph.c:1707

2266 +#: commit-graph.c:1710

2267 #, c-format

2268 msgid "error opening index for %s"

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

2270

2270 -#: commit-graph.c:1744

2271 +#: commit-graph.c:1747

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

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

2274

2274 -#: commit-graph.c:1762

2275 +#: commit-graph.c:1765

2276 msgid "Finding extra edges in commit graph"

2277 msgstr "Söker ytterligare kanter i incheckingsgraf"

2278

2278 -#: commit-graph.c:1811

2279 +#: commit-graph.c:1814

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

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

2282

2282 -#: commit-graph.c:1842 midx.c:1146

2283 +#: commit-graph.c:1845 midx.c:1149

2284 #, c-format

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

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

2287

2287 -#: commit-graph.c:1855

2288 +#: commit-graph.c:1858

2289 msgid "unable to create temporary graph layer"

2290 msgstr "kan inte skapa temporärt graflager"

2291

2291 -#: commit-graph.c:1860

2292 +#: commit-graph.c:1863

2293 #, c-format

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

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

2296

2296 -#: commit-graph.c:1917

2297 +#: commit-graph.c:1920

2298 #, c-format

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

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

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

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

2303

2303 -#: commit-graph.c:1953

2304 +#: commit-graph.c:1956

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

2306 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

2307

2307 -#: commit-graph.c:1969

2308 +#: commit-graph.c:1972

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

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

2311

2311 -#: commit-graph.c:1989

2312 +#: commit-graph.c:1992

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

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

2315

2315 -#: commit-graph.c:2122

2316 +#: commit-graph.c:2125

2317 msgid "Scanning merged commits"

2318 msgstr "Söker sammanslagna incheckningar"

2319

2319 -#: commit-graph.c:2166

2320 +#: commit-graph.c:2169

2321 msgid "Merging commit-graph"

2322 msgstr "Slår ihop incheckningsgraf"

2323

2323 -#: commit-graph.c:2274

2324 +#: commit-graph.c:2277

2325 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2326 msgstr ""

2327 "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"

2328

2328 -#: commit-graph.c:2381

2329 +#: commit-graph.c:2384

2330 msgid "too many commits to write graph"

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

2332

2332 -#: commit-graph.c:2479

2333 +#: commit-graph.c:2482

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

2335 msgstr ""

2336 "filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "

2337 "trasig"

2338

2338 -#: commit-graph.c:2489

2339 +#: commit-graph.c:2492

2340 #, c-format

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

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

2343

2343 -#: commit-graph.c:2499 commit-graph.c:2514

2344 +#: commit-graph.c:2502 commit-graph.c:2517

2345 #, c-format

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

2347 msgstr ""

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

2349

2349 -#: commit-graph.c:2506

2350 +#: commit-graph.c:2509

2351 #, c-format

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

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

2354

2354 -#: commit-graph.c:2524

2355 +#: commit-graph.c:2527

2356 msgid "Verifying commits in commit graph"

2357 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2358

2358 -#: commit-graph.c:2539

2359 +#: commit-graph.c:2542

2360 #, c-format

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

2362 msgstr ""

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

2364

2364 -#: commit-graph.c:2546

2365 +#: commit-graph.c:2549

2366 #, c-format

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

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

2369

2369 -#: commit-graph.c:2556

2370 +#: commit-graph.c:2559

2371 #, c-format

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

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

2374

2374 -#: commit-graph.c:2565

2375 +#: commit-graph.c:2568

2376 #, c-format

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

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

2379

2379 -#: commit-graph.c:2579

2380 +#: commit-graph.c:2582

2381 #, c-format

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

2383 msgstr ""

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

2385

2385 -#: commit-graph.c:2584

2386 +#: commit-graph.c:2587

2387 #, c-format

2388 msgid ""

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

@@ -2390,7 +2391,7 @@ msgstr ""

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

2392 "noll på annan plats"

2393

2393 -#: commit-graph.c:2588

2394 +#: commit-graph.c:2591

2395 #, c-format

2396 msgid ""

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

@@ -2398,22 +2399,22 @@ msgstr ""

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

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

2401

2401 -#: commit-graph.c:2605

2402 +#: commit-graph.c:2608

2403 #, c-format

2404 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2405 msgstr ""

2406 "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "

2407 "%<PRIuMAX>"

2408

2408 -#: commit-graph.c:2611

2409 +#: commit-graph.c:2614

2410 #, c-format

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

2412 msgstr ""

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

2414 "= %<PRIuMAX>"

2415

2415 -#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2416 -#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2416 +#: commit.c:53 sequencer.c:3109 builtin/am.c:399 builtin/am.c:444

2417 +#: builtin/am.c:449 builtin/am.c:1448 builtin/am.c:2123 builtin/replace.c:456

2418 #, c-format

2419 msgid "could not parse %s"

2420 msgstr "kunde inte tolka %s"

@@ -2443,29 +2444,29 @@ msgstr ""

2444 "Slå av detta meddelande genom att skriva\n"

2445 "\"git config advice.graftFileDeprecated false\""

2446

2446 -#: commit.c:1239

2447 +#: commit.c:1241

2448 #, c-format

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

2450 msgstr ""

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

2452

2452 -#: commit.c:1243

2453 +#: commit.c:1245

2454 #, c-format

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

2456 msgstr ""

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

2458

2458 -#: commit.c:1246

2459 +#: commit.c:1248

2460 #, c-format

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

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

2463

2463 -#: commit.c:1249

2464 +#: commit.c:1251

2465 #, c-format

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

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

2468

2468 -#: commit.c:1503

2469 +#: commit.c:1505

2470 msgid ""

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

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

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

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

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

2535

2535 -#: config.c:470 sequencer.c:2804

2536 +#: config.c:470 sequencer.c:2806

2537 #, c-format

2538 msgid "invalid key: %s"

2539 msgstr "felaktig nyckel: %s"

@@ -2690,145 +2691,145 @@ msgstr "core.commentChar kan bara vara ett tecken"

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

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

2693

2693 -#: config.c:1581

2694 +#: config.c:1584

2695 #, c-format

2696 msgid "malformed value for %s"

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

2698

2698 -#: config.c:1607

2699 +#: config.c:1610

2700 #, c-format

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

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

2703

2703 -#: config.c:1608

2704 +#: config.c:1611

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

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

2707

2707 -#: config.c:1669 builtin/pack-objects.c:4053

2708 +#: config.c:1672 builtin/pack-objects.c:4053

2709 #, c-format

2710 msgid "bad pack compression level %d"

2711 msgstr "felaktig paketkomprimeringsgrad %d"

2712

2712 -#: config.c:1792

2713 +#: config.c:1795

2714 #, c-format

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

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

2717

2717 -#: config.c:1795

2718 +#: config.c:1798

2719 #, c-format

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

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

2722

2722 -#: config.c:1813

2723 +#: config.c:1816

2724 #, c-format

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

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

2727

2727 -#: config.c:1858

2728 +#: config.c:1861

2729 #, c-format

2730 msgid "failed to parse %s"

2731 msgstr "kunde inte tolka %s"

2732

2732 -#: config.c:1914

2733 +#: config.c:1917

2734 msgid "unable to parse command-line config"

2735 msgstr "kan inte tolka kommandoradskonfiguration"

2736

2736 -#: config.c:2282

2737 +#: config.c:2285

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

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

2740

2740 -#: config.c:2456

2741 +#: config.c:2459

2742 #, c-format

2743 msgid "Invalid %s: '%s'"

2744 msgstr "Felaktigt %s: \"%s\""

2745

2745 -#: config.c:2501

2746 +#: config.c:2504

2747 #, c-format

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

2749 msgstr ""

2750 "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"

2751

2751 -#: config.c:2547

2752 +#: config.c:2550

2753 #, c-format

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

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

2756

2756 -#: config.c:2549

2757 +#: config.c:2552

2758 #, c-format

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

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

2761

2761 -#: config.c:2633

2762 +#: config.c:2637

2763 #, c-format

2764 msgid "invalid section name '%s'"

2765 msgstr "felaktigt sektionsnamn \"%s\""

2766

2766 -#: config.c:2665

2767 +#: config.c:2669

2768 #, c-format

2769 msgid "%s has multiple values"

2770 msgstr "%s har flera värden"

2771

2771 -#: config.c:2694

2772 +#: config.c:2698

2773 #, c-format

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

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

2776

2776 -#: config.c:2946 config.c:3273

2777 +#: config.c:2950 config.c:3277

2778 #, c-format

2779 msgid "could not lock config file %s"

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

2781

2781 -#: config.c:2957

2782 +#: config.c:2961

2783 #, c-format

2784 msgid "opening %s"

2785 msgstr "öppnar %s"

2786

2786 -#: config.c:2994 builtin/config.c:361

2787 +#: config.c:2998 builtin/config.c:361

2788 #, c-format

2789 msgid "invalid pattern: %s"

2790 msgstr "ogiltigt mönster: %s"

2791

2791 -#: config.c:3019

2792 +#: config.c:3023

2793 #, c-format

2794 msgid "invalid config file %s"

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

2796

2796 -#: config.c:3032 config.c:3286

2797 +#: config.c:3036 config.c:3290

2798 #, c-format

2799 msgid "fstat on %s failed"

2800 msgstr "fstat misslyckades på %s"

2801

2801 -#: config.c:3043

2802 +#: config.c:3047

2803 #, c-format

2804 msgid "unable to mmap '%s'%s"

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

2806

2806 -#: config.c:3053 config.c:3291

2807 +#: config.c:3057 config.c:3295

2808 #, c-format

2809 msgid "chmod on %s failed"

2810 msgstr "chmod misslyckades på %s"

2811

2811 -#: config.c:3138 config.c:3388

2812 +#: config.c:3142 config.c:3392

2813 #, c-format

2814 msgid "could not write config file %s"

2815 msgstr "kunde inte skriva konfigurationsfilen %s"

2816

2816 -#: config.c:3172

2817 +#: config.c:3176

2818 #, c-format

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

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

2821

2821 -#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2822 +#: config.c:3178 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2823 #, c-format

2824 msgid "could not unset '%s'"

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

2826

2826 -#: config.c:3264

2827 +#: config.c:3268

2828 #, c-format

2829 msgid "invalid section name: %s"

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

2831

2831 -#: config.c:3431

2832 +#: config.c:3435

2833 #, c-format

2834 msgid "missing value for '%s'"

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

@@ -3007,7 +3008,7 @@ msgstr "kunde inte grena (fork)"

3008

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

3010 # objects in the database.

3010 -#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

3011 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:57

3012 msgid "Checking connectivity"

3013 msgstr "Kontrollerar konnektivitet"

3014

@@ -3308,17 +3309,17 @@ msgstr ""

3309 "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "

3310 "en arbetskatalog."

3311

3311 -#: diff.c:157

3312 +#: diff.c:158

3313 #, c-format

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

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

3316

3316 -#: diff.c:162

3317 +#: diff.c:163

3318 #, c-format

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

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

3321

3321 -#: diff.c:298

3322 +#: diff.c:299

3323 msgid ""

3324 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3325 "'dimmed-zebra', 'plain'"

@@ -3326,7 +3327,7 @@ msgstr ""

3327 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "

3328 "\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""

3329

3329 -#: diff.c:326

3330 +#: diff.c:327

3331 #, c-format

3332 msgid ""

3333 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3336,7 +3337,7 @@ msgstr ""

3337 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"

3338 "\""

3339

3339 -#: diff.c:334

3340 +#: diff.c:335

3341 msgid ""

3342 "color-moved-ws: allow-indentation-change cannot be combined with other "

3343 "whitespace modes"

@@ -3344,12 +3345,12 @@ msgstr ""

3345 "color-moved-ws: allow-indentation-change kan inte kombineras med andra "

3346 "blankstegslägen"

3347

3347 -#: diff.c:411

3348 +#: diff.c:412

3349 #, c-format

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

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

3352

3352 -#: diff.c:471

3353 +#: diff.c:472

3354 #, c-format

3355 msgid ""

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

@@ -3358,50 +3359,53 @@ msgstr ""

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

3360 "%s"

3361

3361 -#: diff.c:4290

3362 +#: diff.c:4237

3363 #, c-format

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

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

3366

3366 -#: diff.c:4642

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

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

3367 +#: diff.c:4589

3368 +#, c-format

3369 +msgid "options '%s', '%s', '%s', and '%s' cannot be used together"

3370 +msgstr ""

3371 +"flaggorna \"%s\", \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"

3372

3370 -#: diff.c:4645

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

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

3373 +#: diff.c:4593 builtin/difftool.c:736 builtin/log.c:1982 builtin/worktree.c:506

3374 +#, c-format

3375 +msgid "options '%s', '%s', and '%s' cannot be used together"

3376 +msgstr "flaggorna \"%s\", \"%s\" och \"%s\" kan inte användas samtidigt"

3377

3374 -#: diff.c:4648

3375 -msgid ""

3376 -"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3378 +#: diff.c:4597

3379 +#, c-format

3380 +msgid "options '%s' and '%s' cannot be used together, use '%s' with '%s'"

3381 msgstr ""

3378 -"-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "

3379 -"-S"

3382 +"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "

3383 +"\"%s\""

3384

3381 -#: diff.c:4651

3385 +#: diff.c:4601

3386 +#, c-format

3387 msgid ""

3383 -"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3384 -"with -G and -S"

3388 +"options '%s' and '%s' cannot be used together, use '%s' with '%s' and '%s'"

3389 msgstr ""

3386 -"--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"

3387 -"all med -G och -S"

3390 +"flaggorna \"%s\" och \"%s\" kan inte användas samtidigt, använd \"%s\" med "

3391 +"\"%s\" och \"%s\""

3392

3389 -#: diff.c:4730

3393 +#: diff.c:4681

3394 msgid "--follow requires exactly one pathspec"

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

3396

3393 -#: diff.c:4778

3397 +#: diff.c:4729

3398 #, c-format

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

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

3401

3398 -#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3402 +#: diff.c:4734 diff.c:4739 diff.c:4744 diff.c:4749 diff.c:5277

3403 #: parse-options.c:217 parse-options.c:221

3404 #, c-format

3405 msgid "%s expects a numerical value"

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

3407

3404 -#: diff.c:4815

3408 +#: diff.c:4766

3409 #, c-format

3410 msgid ""

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

@@ -3410,42 +3414,42 @@ msgstr ""

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

3415 "%s"

3416

3413 -#: diff.c:4900

3417 +#: diff.c:4851

3418 #, c-format

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

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

3421

3418 -#: diff.c:4924

3422 +#: diff.c:4875

3423 #, c-format

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

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

3426

3423 -#: diff.c:4938

3427 +#: diff.c:4889

3428 #, c-format

3429 msgid "unable to resolve '%s'"

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

3431

3428 -#: diff.c:4988 diff.c:4994

3432 +#: diff.c:4939 diff.c:4945

3433 #, c-format

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

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

3436

3433 -#: diff.c:5006

3437 +#: diff.c:4957

3438 #, c-format

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

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

3441

3438 -#: diff.c:5027

3442 +#: diff.c:4978

3443 #, c-format

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

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

3446

3443 -#: diff.c:5046

3447 +#: diff.c:4997

3448 #, c-format

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

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

3451

3448 -#: diff.c:5086

3452 +#: diff.c:5037

3453 msgid ""

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

3455 "\"histogram\""

@@ -3453,154 +3457,154 @@ msgstr ""

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

3458 "\"histogram\""

3459

3456 -#: diff.c:5122 diff.c:5142

3460 +#: diff.c:5073 diff.c:5093

3461 #, c-format

3462 msgid "invalid argument to %s"

3463 msgstr "ogiltigt argument för %s"

3464

3461 -#: diff.c:5246

3465 +#: diff.c:5197

3466 #, c-format

3467 msgid "invalid regex given to -I: '%s'"

3468 msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""

3469

3466 -#: diff.c:5295

3470 +#: diff.c:5246

3471 #, c-format

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

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

3474

3471 -#: diff.c:5351

3475 +#: diff.c:5302

3476 #, c-format

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

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

3479

3476 -#: diff.c:5387

3480 +#: diff.c:5338

3481 msgid "Diff output format options"

3482 msgstr "Formatflaggor för diff-utdata"

3483

3480 -#: diff.c:5389 diff.c:5395

3484 +#: diff.c:5340 diff.c:5346

3485 msgid "generate patch"

3486 msgstr "skapar patch"

3487

3484 -#: diff.c:5392 builtin/log.c:179

3488 +#: diff.c:5343 builtin/log.c:179

3489 msgid "suppress diff output"

3490 msgstr "undertryck diff-utdata"

3491

3488 -#: diff.c:5397 diff.c:5511 diff.c:5518

3492 +#: diff.c:5348 diff.c:5462 diff.c:5469

3493 msgid "<n>"

3494 msgstr "<n>"

3495

3492 -#: diff.c:5398 diff.c:5401

3496 +#: diff.c:5349 diff.c:5352

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

3498 msgstr "skapa diffar med <n> rader sammanhang"

3499

3496 -#: diff.c:5403

3500 +#: diff.c:5354

3501 msgid "generate the diff in raw format"

3502 msgstr "generera diff i råformat"

3503

3500 -#: diff.c:5406

3504 +#: diff.c:5357

3505 msgid "synonym for '-p --raw'"

3506 msgstr "synonym till \"-p --raw\""

3507

3504 -#: diff.c:5410

3508 +#: diff.c:5361

3509 msgid "synonym for '-p --stat'"

3510 msgstr "synonym till \"-p --stat\""

3511

3508 -#: diff.c:5414

3512 +#: diff.c:5365

3513 msgid "machine friendly --stat"

3514 msgstr "maskinläsbar --stat"

3515

3512 -#: diff.c:5417

3516 +#: diff.c:5368

3517 msgid "output only the last line of --stat"

3518 msgstr "skriv bara ut den sista raden för --stat"

3519

3516 -#: diff.c:5419 diff.c:5427

3520 +#: diff.c:5370 diff.c:5378

3521 msgid "<param1,param2>..."

3522 msgstr "<param1,param2>..."

3523

3520 -#: diff.c:5420

3524 +#: diff.c:5371

3525 msgid ""

3526 "output the distribution of relative amount of changes for each sub-directory"

3527 msgstr ""

3528 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3529

3526 -#: diff.c:5424

3530 +#: diff.c:5375

3531 msgid "synonym for --dirstat=cumulative"

3532 msgstr "synonym för --dirstat=cumulative"

3533

3530 -#: diff.c:5428

3534 +#: diff.c:5379

3535 msgid "synonym for --dirstat=files,param1,param2..."

3536 msgstr "synonym för --dirstat=filer,param1,param2..."

3537

3534 -#: diff.c:5432

3538 +#: diff.c:5383

3539 msgid "warn if changes introduce conflict markers or whitespace errors"

3540 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3541

3538 -#: diff.c:5435

3542 +#: diff.c:5386

3543 msgid "condensed summary such as creations, renames and mode changes"

3544 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3545

3542 -#: diff.c:5438

3546 +#: diff.c:5389

3547 msgid "show only names of changed files"

3548 msgstr "visa endast namnen på ändrade filer"

3549

3546 -#: diff.c:5441

3550 +#: diff.c:5392

3551 msgid "show only names and status of changed files"

3552 msgstr "visa endast namn och status för ändrade filer"

3553

3550 -#: diff.c:5443

3554 +#: diff.c:5394

3555 msgid "<width>[,<name-width>[,<count>]]"

3556 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3557

3554 -#: diff.c:5444

3558 +#: diff.c:5395

3559 msgid "generate diffstat"

3560 msgstr "skapa diffstat"

3561

3558 -#: diff.c:5446 diff.c:5449 diff.c:5452

3562 +#: diff.c:5397 diff.c:5400 diff.c:5403

3563 msgid "<width>"

3564 msgstr "<bredd>"

3565

3562 -#: diff.c:5447

3566 +#: diff.c:5398

3567 msgid "generate diffstat with a given width"

3568 msgstr "generera en diffstat med given bredd"

3569

3566 -#: diff.c:5450

3570 +#: diff.c:5401

3571 msgid "generate diffstat with a given name width"

3572 msgstr "generera en diffstat med given namnbredd"

3573

3570 -#: diff.c:5453

3574 +#: diff.c:5404

3575 msgid "generate diffstat with a given graph width"

3576 msgstr "generera en diffstat med given grafbredd"

3577

3574 -#: diff.c:5455

3578 +#: diff.c:5406

3579 msgid "<count>"

3580 msgstr "<antal>"

3581

3578 -#: diff.c:5456

3582 +#: diff.c:5407

3583 msgid "generate diffstat with limited lines"

3584 msgstr "generera diffstat med begränsade rader"

3585

3582 -#: diff.c:5459

3586 +#: diff.c:5410

3587 msgid "generate compact summary in diffstat"

3588 msgstr "skapa kompakt översikt i diffstat"

3589

3586 -#: diff.c:5462

3590 +#: diff.c:5413

3591 msgid "output a binary diff that can be applied"

3592 msgstr "skapa en binärdiff som kan appliceras"

3593

3590 -#: diff.c:5465

3594 +#: diff.c:5416

3595 msgid "show full pre- and post-image object names on the \"index\" lines"

3596 msgstr ""

3597 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3598

3595 -#: diff.c:5467

3599 +#: diff.c:5418

3600 msgid "show colored diff"

3601 msgstr "visa färgad diff"

3602

3599 -#: diff.c:5468

3603 +#: diff.c:5419

3604 msgid "<kind>"

3605 msgstr "<typ>"

3606

3603 -#: diff.c:5469

3607 +#: diff.c:5420

3608 msgid ""

3609 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3610 "diff"

@@ -3608,7 +3612,7 @@ msgstr ""

3612 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3613 "\"new\" (nya) rader i diffen"

3614

3611 -#: diff.c:5472

3615 +#: diff.c:5423

3616 msgid ""

3617 "do not munge pathnames and use NULs as output field terminators in --raw or "

3618 "--numstat"

@@ -3616,87 +3620,87 @@ msgstr ""

3620 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3621 "eller --numstat"

3622

3619 -#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3623 +#: diff.c:5426 diff.c:5429 diff.c:5432 diff.c:5541

3624 msgid "<prefix>"

3625 msgstr "<prefix>"

3626

3623 -#: diff.c:5476

3627 +#: diff.c:5427

3628 msgid "show the given source prefix instead of \"a/\""

3629 msgstr "visa givet källprefix istället för \"a/\""

3630

3627 -#: diff.c:5479

3631 +#: diff.c:5430

3632 msgid "show the given destination prefix instead of \"b/\""

3633 msgstr "visa givet målprefix istället för \"b/\""

3634

3631 -#: diff.c:5482

3635 +#: diff.c:5433

3636 msgid "prepend an additional prefix to every line of output"

3637 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3638

3635 -#: diff.c:5485

3639 +#: diff.c:5436

3640 msgid "do not show any source or destination prefix"

3641 msgstr "visa inte käll- eller målprefix"

3642

3639 -#: diff.c:5488

3643 +#: diff.c:5439

3644 msgid "show context between diff hunks up to the specified number of lines"

3645 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3646

3643 -#: diff.c:5492 diff.c:5497 diff.c:5502

3647 +#: diff.c:5443 diff.c:5448 diff.c:5453

3648 msgid "<char>"

3649 msgstr "<tecken>"

3650

3647 -#: diff.c:5493

3651 +#: diff.c:5444

3652 msgid "specify the character to indicate a new line instead of '+'"

3653 msgstr "ange tecken för att ange ny rad istället för \"+\""

3654

3651 -#: diff.c:5498

3655 +#: diff.c:5449

3656 msgid "specify the character to indicate an old line instead of '-'"

3657 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3658

3655 -#: diff.c:5503

3659 +#: diff.c:5454

3660 msgid "specify the character to indicate a context instead of ' '"

3661 msgstr "ange tecken för att ange sammanhang istället för \" \""

3662

3659 -#: diff.c:5506

3663 +#: diff.c:5457

3664 msgid "Diff rename options"

3665 msgstr "Diff-namnbytesflaggor"

3666

3663 -#: diff.c:5507

3667 +#: diff.c:5458

3668 msgid "<n>[/<m>]"

3669 msgstr "<n>[/<m>]"

3670

3667 -#: diff.c:5508

3671 +#: diff.c:5459

3672 msgid "break complete rewrite changes into pairs of delete and create"

3673 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3674

3671 -#: diff.c:5512

3675 +#: diff.c:5463

3676 msgid "detect renames"

3677 msgstr "detektera namnändringar"

3678

3675 -#: diff.c:5516

3679 +#: diff.c:5467

3680 msgid "omit the preimage for deletes"

3681 msgstr "ta bort för-version för borttagningar"

3682

3679 -#: diff.c:5519

3683 +#: diff.c:5470

3684 msgid "detect copies"

3685 msgstr "detektera kopior"

3686

3683 -#: diff.c:5523

3687 +#: diff.c:5474

3688 msgid "use unmodified files as source to find copies"

3689 msgstr "använd oförändrade som källa för att hitta kopior"

3690

3687 -#: diff.c:5525

3691 +#: diff.c:5476

3692 msgid "disable rename detection"

3693 msgstr "inaktivera detektering av namnbyten"

3694

3691 -#: diff.c:5528

3695 +#: diff.c:5479

3696 msgid "use empty blobs as rename source"

3697 msgstr "använd tomma blob:ar som namnändringskälla"

3698

3695 -#: diff.c:5530

3699 +#: diff.c:5481

3700 msgid "continue listing the history of a file beyond renames"

3701 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3702

3699 -#: diff.c:5533

3703 +#: diff.c:5484

3704 msgid ""

3705 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3706 "given limit"

@@ -3704,163 +3708,163 @@ msgstr ""

3708 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3709 "given gräns"

3710

3707 -#: diff.c:5535

3711 +#: diff.c:5486

3712 msgid "Diff algorithm options"

3713 msgstr "Alternativ för diff-algoritm"

3714

3711 -#: diff.c:5537

3715 +#: diff.c:5488

3716 msgid "produce the smallest possible diff"

3717 msgstr "skapa minsta möjliga diff"

3718

3715 -#: diff.c:5540

3719 +#: diff.c:5491

3720 msgid "ignore whitespace when comparing lines"

3721 msgstr "ignorera blanktecken vid radjämförelse"

3722

3719 -#: diff.c:5543

3723 +#: diff.c:5494

3724 msgid "ignore changes in amount of whitespace"

3725 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3726

3723 -#: diff.c:5546

3727 +#: diff.c:5497

3728 msgid "ignore changes in whitespace at EOL"

3729 msgstr "ignorera blanktecken vid radslut"

3730

3727 -#: diff.c:5549

3731 +#: diff.c:5500

3732 msgid "ignore carrier-return at the end of line"

3733 msgstr "ignorera CR-tecken vid radslut"

3734

3731 -#: diff.c:5552

3735 +#: diff.c:5503

3736 msgid "ignore changes whose lines are all blank"

3737 msgstr "ignorera ändringar i rader som är helt blanka"

3738

3735 -#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3739 +#: diff.c:5505 diff.c:5527 diff.c:5530 diff.c:5575

3740 msgid "<regex>"

3741 msgstr "<reguttr>"

3742

3739 -#: diff.c:5555

3743 +#: diff.c:5506

3744 msgid "ignore changes whose all lines match <regex>"

3745 msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"

3746

3743 -#: diff.c:5558

3747 +#: diff.c:5509

3748 msgid "heuristic to shift diff hunk boundaries for easy reading"

3749 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3750

3747 -#: diff.c:5561

3751 +#: diff.c:5512

3752 msgid "generate diff using the \"patience diff\" algorithm"

3753 msgstr "skapa diffar med algoritmen \"patience diff\""

3754

3751 -#: diff.c:5565

3755 +#: diff.c:5516

3756 msgid "generate diff using the \"histogram diff\" algorithm"

3757 msgstr "skapa diffar med algoritmen \"histogram diff\""

3758

3755 -#: diff.c:5567

3759 +#: diff.c:5518

3760 msgid "<algorithm>"

3761 msgstr "<algoritm>"

3762

3759 -#: diff.c:5568

3763 +#: diff.c:5519

3764 msgid "choose a diff algorithm"

3765 msgstr "välj en diff-algoritm"

3766

3763 -#: diff.c:5570

3767 +#: diff.c:5521

3768 msgid "<text>"

3769 msgstr "<text>"

3770

3767 -#: diff.c:5571

3771 +#: diff.c:5522

3772 msgid "generate diff using the \"anchored diff\" algorithm"

3773 msgstr "skapa diffar med algoritmen \"anchored diff\""

3774

3771 -#: diff.c:5573 diff.c:5582 diff.c:5585

3775 +#: diff.c:5524 diff.c:5533 diff.c:5536

3776 msgid "<mode>"

3777 msgstr "<läge>"

3778

3775 -#: diff.c:5574

3779 +#: diff.c:5525

3780 msgid "show word diff, using <mode> to delimit changed words"

3781 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3782

3779 -#: diff.c:5577

3783 +#: diff.c:5528

3784 msgid "use <regex> to decide what a word is"

3785 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3786

3783 -#: diff.c:5580

3787 +#: diff.c:5531

3788 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3789 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3790

3787 -#: diff.c:5583

3791 +#: diff.c:5534

3792 msgid "moved lines of code are colored differently"

3793 msgstr "flyttade kodrader färgas på annat sätt"

3794

3791 -#: diff.c:5586

3795 +#: diff.c:5537

3796 msgid "how white spaces are ignored in --color-moved"

3797 msgstr "hur blanktecken ignoreras i --color-moved"

3798

3795 -#: diff.c:5589

3799 +#: diff.c:5540

3800 msgid "Other diff options"

3801 msgstr "Andra diff-flaggor"

3802

3799 -#: diff.c:5591

3803 +#: diff.c:5542

3804 msgid "when run from subdir, exclude changes outside and show relative paths"

3805 msgstr ""

3806 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3807 "sökvägar"

3808

3805 -#: diff.c:5595

3809 +#: diff.c:5546

3810 msgid "treat all files as text"

3811 msgstr "hantera alla filer som text"

3812

3809 -#: diff.c:5597

3813 +#: diff.c:5548

3814 msgid "swap two inputs, reverse the diff"

3815 msgstr "växla två indatafiler, vänd diffen"

3816

3813 -#: diff.c:5599

3817 +#: diff.c:5550

3818 msgid "exit with 1 if there were differences, 0 otherwise"

3819 msgstr "avsluta med 1 vid ändringar, annars 0"

3820

3817 -#: diff.c:5601

3821 +#: diff.c:5552

3822 msgid "disable all output of the program"

3823 msgstr "slå av alla utdata från programmet"

3824

3821 -#: diff.c:5603

3825 +#: diff.c:5554

3826 msgid "allow an external diff helper to be executed"

3827 msgstr "tillåt köra en extern diff-hjälpare"

3828

3825 -#: diff.c:5605

3829 +#: diff.c:5556

3830 msgid "run external text conversion filters when comparing binary files"

3831 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3832

3829 -#: diff.c:5607

3833 +#: diff.c:5558

3834 msgid "<when>"

3835 msgstr "<när>"

3836

3833 -#: diff.c:5608

3837 +#: diff.c:5559

3838 msgid "ignore changes to submodules in the diff generation"

3839 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3840

3837 -#: diff.c:5611

3841 +#: diff.c:5562

3842 msgid "<format>"

3843 msgstr "<format>"

3844

3841 -#: diff.c:5612

3845 +#: diff.c:5563

3846 msgid "specify how differences in submodules are shown"

3847 msgstr "ange hur ändringar i undermoduler visas"

3848

3845 -#: diff.c:5616

3849 +#: diff.c:5567

3850 msgid "hide 'git add -N' entries from the index"

3851 msgstr "dölj \"git add -N\"-poster från indexet"

3852

3849 -#: diff.c:5619

3853 +#: diff.c:5570

3854 msgid "treat 'git add -N' entries as real in the index"

3855 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3856

3853 -#: diff.c:5621

3857 +#: diff.c:5572

3858 msgid "<string>"

3859 msgstr "<sträng>"

3860

3857 -#: diff.c:5622

3861 +#: diff.c:5573

3862 msgid ""

3863 "look for differences that change the number of occurrences of the specified "

3864 "string"

3865 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3866

3863 -#: diff.c:5625

3867 +#: diff.c:5576

3868 msgid ""

3869 "look for differences that change the number of occurrences of the specified "

3870 "regex"

@@ -3868,66 +3872,66 @@ msgstr ""

3872 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3873 "uttryck"

3874

3871 -#: diff.c:5628

3875 +#: diff.c:5579

3876 msgid "show all changes in the changeset with -S or -G"

3877 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3878

3875 -#: diff.c:5631

3879 +#: diff.c:5582

3880 msgid "treat <string> in -S as extended POSIX regular expression"

3881 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3882

3879 -#: diff.c:5634

3883 +#: diff.c:5585

3884 msgid "control the order in which files appear in the output"

3885 msgstr "styr ordningen i vilken filer visas i utdata"

3886

3883 -#: diff.c:5635 diff.c:5638

3887 +#: diff.c:5586 diff.c:5589

3888 msgid "<path>"

3889 msgstr "<sökväg>"

3890

3887 -#: diff.c:5636

3891 +#: diff.c:5587

3892 msgid "show the change in the specified path first"

3893 msgstr "visa ändringen i angiven sökväg först"

3894

3891 -#: diff.c:5639

3895 +#: diff.c:5590

3896 msgid "skip the output to the specified path"

3897 msgstr "hoppa över utdata fram till angiven sökväg"

3898

3895 -#: diff.c:5641

3899 +#: diff.c:5592

3900 msgid "<object-id>"

3901 msgstr "<objekt-id>"

3902

3899 -#: diff.c:5642

3903 +#: diff.c:5593

3904 msgid ""

3905 "look for differences that change the number of occurrences of the specified "

3906 "object"

3907 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3908

3905 -#: diff.c:5644

3909 +#: diff.c:5595

3910 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3911 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3912

3909 -#: diff.c:5645

3913 +#: diff.c:5596

3914 msgid "select files by diff type"

3915 msgstr "välj filter efter diff-typ"

3916

3913 -#: diff.c:5647

3917 +#: diff.c:5598

3918 msgid "<file>"

3919 msgstr "<fil>"

3920

3917 -#: diff.c:5648

3921 +#: diff.c:5599

3922 msgid "Output to a specific file"

3923 msgstr "Skriv utdata till en specifik fil"

3924

3921 -#: diff.c:6306

3925 +#: diff.c:6257

3926 msgid "exhaustive rename detection was skipped due to too many files."

3927 msgstr ""

3928 "uttömmande namnbytesdetektering hoppades över på grund av för många filer."

3929

3926 -#: diff.c:6309

3930 +#: diff.c:6260

3931 msgid "only found copies from modified paths due to too many files."

3932 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

3933

3930 -#: diff.c:6312

3934 +#: diff.c:6263

3935 #, c-format

3936 msgid ""

3937 "you may want to set your %s variable to at least %d and retry the command."

@@ -3970,29 +3974,29 @@ msgstr ""

3974 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "

3975 "gånger"

3976

3973 -#: dir.c:830

3977 +#: dir.c:828

3978 msgid "disabling cone pattern matching"

3979 msgstr "inaktiverar konmönstermatchning"

3980

3977 -#: dir.c:1214

3981 +#: dir.c:1212

3982 #, c-format

3983 msgid "cannot use %s as an exclude file"

3984 msgstr "kan inte använda %s som exkluderingsfil"

3985

3982 -#: dir.c:2464

3986 +#: dir.c:2418

3987 #, c-format

3988 msgid "could not open directory '%s'"

3989 msgstr "kunde inte öppna katalogen \"%s\""

3990

3987 -#: dir.c:2766

3991 +#: dir.c:2720

3992 msgid "failed to get kernel name and information"

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

3994

3991 -#: dir.c:2890

3995 +#: dir.c:2844

3996 msgid "untracked cache is disabled on this system or location"

3997 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3998

3995 -#: dir.c:3158

3999 +#: dir.c:3112

4000 msgid ""

4001 "No directory name could be guessed.\n"

4002 "Please specify a directory on the command line"

@@ -4000,36 +4004,36 @@ msgstr ""

4004 "Kunde inte gissa katalognamn.\n"

4005 "Ange en katalog på kommandoraden"

4006

4003 -#: dir.c:3837

4007 +#: dir.c:3800

4008 #, c-format

4009 msgid "index file corrupt in repo %s"

4010 msgstr "indexfilen trasig i arkivet %s"

4011

4008 -#: dir.c:3884 dir.c:3889

4012 +#: dir.c:3847 dir.c:3852

4013 #, c-format

4014 msgid "could not create directories for %s"

4015 msgstr "kunde inte skapa kataloger för %s"

4016

4013 -#: dir.c:3918

4017 +#: dir.c:3881

4018 #, c-format

4019 msgid "could not migrate git directory from '%s' to '%s'"

4020 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

4021

4018 -#: editor.c:77

4022 +#: editor.c:74

4023 #, c-format

4024 msgid "hint: Waiting for your editor to close the file...%c"

4025 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

4026

4023 -#: entry.c:177

4027 +#: entry.c:179

4028 msgid "Filtering content"

4029 msgstr "Filtrerar innehåll"

4030

4027 -#: entry.c:498

4031 +#: entry.c:500

4032 #, c-format

4033 msgid "could not stat file '%s'"

4034 msgstr "kunde inte ta status på filen \"%s\""

4035

4032 -#: environment.c:143

4036 +#: environment.c:145

4037 #, c-format

4038 msgid "bad git namespace path \"%s\""

4039 msgstr "felaktig git-namnrymdssökväg \"%s\""

@@ -4039,273 +4043,269 @@ msgstr "felaktig git-namnrymdssökväg \"%s\""

4043 msgid "too many args to run %s"

4044 msgstr "för många flaggor för att köra %s"

4045

4042 -#: fetch-pack.c:193

4046 +#: fetch-pack.c:194

4047 msgid "git fetch-pack: expected shallow list"

4048 msgstr "git fetch-pack: förväntade grund lista"

4049

4046 -#: fetch-pack.c:196

4050 +#: fetch-pack.c:197

4051 msgid "git fetch-pack: expected a flush packet after shallow list"

4052 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

4053

4050 -#: fetch-pack.c:207

4054 +#: fetch-pack.c:208

4055 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

4056 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

4057

4054 -#: fetch-pack.c:227

4058 +#: fetch-pack.c:228

4059 #, c-format

4060 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

4061 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

4062

4059 -#: fetch-pack.c:238

4063 +#: fetch-pack.c:239

4064 msgid "unable to write to remote"

4065 msgstr "kunde inte skriva till fjärren"

4066

4063 -#: fetch-pack.c:299

4064 -msgid "--stateless-rpc requires multi_ack_detailed"

4065 -msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

4066 -

4067 -#: fetch-pack.c:394 fetch-pack.c:1434

4067 +#: fetch-pack.c:395 fetch-pack.c:1439

4068 #, c-format

4069 msgid "invalid shallow line: %s"

4070 msgstr "ogiltig \"shallow\"-rad: %s"

4071

4072 -#: fetch-pack.c:400 fetch-pack.c:1440

4072 +#: fetch-pack.c:401 fetch-pack.c:1445

4073 #, c-format

4074 msgid "invalid unshallow line: %s"

4075 msgstr "ogiltig \"unshallow\"-rad: %s"

4076

4077 -#: fetch-pack.c:402 fetch-pack.c:1442

4077 +#: fetch-pack.c:403 fetch-pack.c:1447

4078 #, c-format

4079 msgid "object not found: %s"

4080 msgstr "objektet hittades inte: %s"

4081

4082 -#: fetch-pack.c:405 fetch-pack.c:1445

4082 +#: fetch-pack.c:406 fetch-pack.c:1450

4083 #, c-format

4084 msgid "error in object: %s"

4085 msgstr "fel i objekt: %s"

4086

4087 -#: fetch-pack.c:407 fetch-pack.c:1447

4087 +#: fetch-pack.c:408 fetch-pack.c:1452

4088 #, c-format

4089 msgid "no shallow found: %s"

4090 msgstr "ingen \"shallow\" hittades: %s"

4091

4092 -#: fetch-pack.c:410 fetch-pack.c:1451

4092 +#: fetch-pack.c:411 fetch-pack.c:1456

4093 #, c-format

4094 msgid "expected shallow/unshallow, got %s"

4095 msgstr "förväntade shallow/unshallow, fick %s"

4096

4097 -#: fetch-pack.c:450

4097 +#: fetch-pack.c:451

4098 #, c-format

4099 msgid "got %s %d %s"

4100 msgstr "fick %s %d %s"

4101

4102 -#: fetch-pack.c:467

4102 +#: fetch-pack.c:468

4103 #, c-format

4104 msgid "invalid commit %s"

4105 msgstr "ogiltig incheckning %s"

4106

4107 -#: fetch-pack.c:498

4107 +#: fetch-pack.c:499

4108 msgid "giving up"

4109 msgstr "ger upp"

4110

4111 -#: fetch-pack.c:511 progress.c:339

4111 +#: fetch-pack.c:512 progress.c:339

4112 msgid "done"

4113 msgstr "klart"

4114

4115 -#: fetch-pack.c:523

4115 +#: fetch-pack.c:524

4116 #, c-format

4117 msgid "got %s (%d) %s"

4118 msgstr "fick %s (%d) %s"

4119

4120 -#: fetch-pack.c:559

4120 +#: fetch-pack.c:560

4121 #, c-format

4122 msgid "Marking %s as complete"

4123 msgstr "Markerar %s som komplett"

4124

4125 -#: fetch-pack.c:774

4125 +#: fetch-pack.c:775

4126 #, c-format

4127 msgid "already have %s (%s)"

4128 msgstr "har redan %s (%s)"

4129

4130 -#: fetch-pack.c:860

4130 +#: fetch-pack.c:861

4131 msgid "fetch-pack: unable to fork off sideband demultiplexer"

4132 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

4133

4134 -#: fetch-pack.c:868

4134 +#: fetch-pack.c:869

4135 msgid "protocol error: bad pack header"

4136 msgstr "protokollfel: felaktigt packhuvud"

4137

4138 -#: fetch-pack.c:962

4138 +#: fetch-pack.c:965

4139 #, c-format

4140 msgid "fetch-pack: unable to fork off %s"

4141 msgstr "fetch-patch: kunde inte grena av %s"

4142

4143 -#: fetch-pack.c:968

4143 +#: fetch-pack.c:971

4144 msgid "fetch-pack: invalid index-pack output"

4145 msgstr "fetch-patch: ogiltig utdata från index-pack"

4146

4147 -#: fetch-pack.c:985

4147 +#: fetch-pack.c:988

4148 #, c-format

4149 msgid "%s failed"

4150 msgstr "%s misslyckades"

4151

4152 -#: fetch-pack.c:987

4152 +#: fetch-pack.c:990

4153 msgid "error in sideband demultiplexer"

4154 msgstr "fel i sidbands-avmultiplexare"

4155

4156 -#: fetch-pack.c:1030

4156 +#: fetch-pack.c:1035

4157 #, c-format

4158 msgid "Server version is %.*s"

4159 msgstr "Serverversionen är %.*s"

4160

4161 -#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4162 -#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4163 -#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4164 -#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4161 +#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1052 fetch-pack.c:1058

4162 +#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4163 +#: fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086 fetch-pack.c:1090

4164 +#: fetch-pack.c:1096 fetch-pack.c:1102 fetch-pack.c:1107 fetch-pack.c:1112

4165 #, c-format

4166 msgid "Server supports %s"

4167 msgstr "Servern stöder %s"

4168

4169 -#: fetch-pack.c:1040

4169 +#: fetch-pack.c:1045

4170 msgid "Server does not support shallow clients"

4171 msgstr "Servern stöder inte klienter med grunda arkiv"

4172

4173 -#: fetch-pack.c:1100

4173 +#: fetch-pack.c:1105

4174 msgid "Server does not support --shallow-since"

4175 msgstr "Servern stöder inte --shallow-since"

4176

4177 -#: fetch-pack.c:1105

4177 +#: fetch-pack.c:1110

4178 msgid "Server does not support --shallow-exclude"

4179 msgstr "Servern stöder inte --shallow-exclude"

4180

4181 -#: fetch-pack.c:1109

4181 +#: fetch-pack.c:1114

4182 msgid "Server does not support --deepen"

4183 msgstr "Servern stöder inte --deepen"

4184

4185 -#: fetch-pack.c:1111

4185 +#: fetch-pack.c:1116

4186 msgid "Server does not support this repository's object format"

4187 msgstr "Servern stöder inte det här arkivets objektformat"

4188

4189 -#: fetch-pack.c:1124

4189 +#: fetch-pack.c:1129

4190 msgid "no common commits"

4191 msgstr "inga gemensamma incheckningar"

4192

4193 -#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4193 +#: fetch-pack.c:1138 fetch-pack.c:1485 builtin/clone.c:1130

4194 msgid "source repository is shallow, reject to clone."

4195 msgstr "källarkivet är grunt, tillåter inte kloning."

4196

4197 -#: fetch-pack.c:1139 fetch-pack.c:1671

4197 +#: fetch-pack.c:1144 fetch-pack.c:1681

4198 msgid "git fetch-pack: fetch failed."

4199 msgstr "git fetch-pack: hämtning misslyckades."

4200

4201 -#: fetch-pack.c:1253

4201 +#: fetch-pack.c:1258

4202 #, c-format

4203 msgid "mismatched algorithms: client %s; server %s"

4204 msgstr "omaka algoritmer: klient %s; server %s"

4205

4206 -#: fetch-pack.c:1257

4206 +#: fetch-pack.c:1262

4207 #, c-format

4208 msgid "the server does not support algorithm '%s'"

4209 msgstr "servern stöder inte algoritmen \"%s\""

4210

4211 -#: fetch-pack.c:1290

4211 +#: fetch-pack.c:1295

4212 msgid "Server does not support shallow requests"

4213 msgstr "Servern stöder inte grunda förfrågningar"

4214

4215 -#: fetch-pack.c:1297

4215 +#: fetch-pack.c:1302

4216 msgid "Server supports filter"

4217 msgstr "Servern stöder filter"

4218

4219 -#: fetch-pack.c:1340 fetch-pack.c:2053

4219 +#: fetch-pack.c:1345 fetch-pack.c:2063

4220 msgid "unable to write request to remote"

4221 msgstr "kunde inte skriva anrop till fjärren"

4222

4223 -#: fetch-pack.c:1358

4223 +#: fetch-pack.c:1363

4224 #, c-format

4225 msgid "error reading section header '%s'"

4226 msgstr "fel vid läsning av styckehuvudet \"%s\""

4227

4228 -#: fetch-pack.c:1364

4228 +#: fetch-pack.c:1369

4229 #, c-format

4230 msgid "expected '%s', received '%s'"

4231 msgstr "förväntade \"%s\", tog emot \"%s\""

4232

4233 -#: fetch-pack.c:1398

4233 +#: fetch-pack.c:1403

4234 #, c-format

4235 msgid "unexpected acknowledgment line: '%s'"

4236 msgstr "oväntad bekräftelserad: \"%s\""

4237

4238 -#: fetch-pack.c:1403

4238 +#: fetch-pack.c:1408

4239 #, c-format

4240 msgid "error processing acks: %d"

4241 msgstr "fel vid hantering av bekräftelser: %d"

4242

4243 -#: fetch-pack.c:1413

4243 +#: fetch-pack.c:1418

4244 msgid "expected packfile to be sent after 'ready'"

4245 msgstr "väntade att paketfil skulle sändas efter \"ready\""

4246

4247 -#: fetch-pack.c:1415

4247 +#: fetch-pack.c:1420

4248 msgid "expected no other sections to be sent after no 'ready'"

4249 msgstr ""

4250 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4251

4252 -#: fetch-pack.c:1456

4252 +#: fetch-pack.c:1461

4253 #, c-format

4254 msgid "error processing shallow info: %d"

4255 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4256

4257 -#: fetch-pack.c:1505

4257 +#: fetch-pack.c:1510

4258 #, c-format

4259 msgid "expected wanted-ref, got '%s'"

4260 msgstr "förväntade wanted-ref, fick %s"

4261

4262 -#: fetch-pack.c:1510

4262 +#: fetch-pack.c:1515

4263 #, c-format

4264 msgid "unexpected wanted-ref: '%s'"

4265 msgstr "oväntad wanted-ref: \"%s\""

4266

4267 -#: fetch-pack.c:1515

4267 +#: fetch-pack.c:1520

4268 #, c-format

4269 msgid "error processing wanted refs: %d"

4270 msgstr "fel vid hantering av önskade referenser: %d"

4271

4272 -#: fetch-pack.c:1545

4272 +#: fetch-pack.c:1550

4273 msgid "git fetch-pack: expected response end packet"

4274 msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4275

4276 -#: fetch-pack.c:1949

4276 +#: fetch-pack.c:1959

4277 msgid "no matching remote head"

4278 msgstr "inget motsvarande fjärrhuvud"

4279

4280 -#: fetch-pack.c:1972 builtin/clone.c:581

4280 +#: fetch-pack.c:1982 builtin/clone.c:581

4281 msgid "remote did not send all necessary objects"

4282 msgstr "fjärren sände inte alla nödvändiga objekt"

4283

4284 -#: fetch-pack.c:2075

4284 +#: fetch-pack.c:2085

4285 msgid "unexpected 'ready' from remote"

4286 msgstr "oväntat \"ready\" från fjärr"

4287

4288 -#: fetch-pack.c:2098

4288 +#: fetch-pack.c:2108

4289 #, c-format

4290 msgid "no such remote ref %s"

4291 msgstr "ingen sådan fjärreferens: %s"

4292

4293 -#: fetch-pack.c:2101

4293 +#: fetch-pack.c:2111

4294 #, c-format

4295 msgid "Server does not allow request for unadvertised object %s"

4296 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

4297

4298 -#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4299 -#: gpg-interface.c:918

4298 +#: gpg-interface.c:329 gpg-interface.c:457 gpg-interface.c:974

4299 +#: gpg-interface.c:990

4300 msgid "could not create temporary file"

4301 msgstr "kunde inte skapa temporära fil"

4302

4303 -#: gpg-interface.c:332 gpg-interface.c:454

4303 +#: gpg-interface.c:332 gpg-interface.c:460

4304 #, c-format

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

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

4307

4308 -#: gpg-interface.c:445

4308 +#: gpg-interface.c:451

4309 msgid ""

4310 "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4311 "signature verification"

@@ -4313,7 +4313,7 @@ msgstr ""

4313 "gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"

4314 "signaturer"

4315

4316 -#: gpg-interface.c:469

4316 +#: gpg-interface.c:480

4317 msgid ""

4318 "ssh-keygen -Y find-principals/verify is needed for ssh signature "

4319 "verification (available in openssh version 8.2p1+)"

@@ -4321,56 +4321,56 @@ msgstr ""

4321 "\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"

4322 "signaturer (tillgängligt i openssh version 8.2p1+)"

4323

4324 -#: gpg-interface.c:523

4324 +#: gpg-interface.c:536

4325 #, c-format

4326 msgid "ssh signing revocation file configured but not found: %s"

4327 msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"

4328

4329 -#: gpg-interface.c:576

4329 +#: gpg-interface.c:624

4330 #, c-format

4331 msgid "bad/incompatible signature '%s'"

4332 msgstr "felaktig/inkompatibel signatur \"%s\""

4333

4334 -#: gpg-interface.c:735 gpg-interface.c:740

4334 +#: gpg-interface.c:801 gpg-interface.c:806

4335 #, c-format

4336 msgid "failed to get the ssh fingerprint for key '%s'"

4337 msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""

4338

4339 -#: gpg-interface.c:762

4339 +#: gpg-interface.c:829

4340 msgid ""

4341 "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4342 msgstr ""

4343 "måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"

4344

4345 -#: gpg-interface.c:780

4345 +#: gpg-interface.c:851

4346 #, c-format

4347 msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4348 msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"

4349

4350 -#: gpg-interface.c:786

4350 +#: gpg-interface.c:857

4351 #, c-format

4352 msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4353 msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"

4354

4355 -#: gpg-interface.c:874

4355 +#: gpg-interface.c:945

4356 msgid "gpg failed to sign the data"

4357 msgstr "gpg misslyckades signera data"

4358

4359 -#: gpg-interface.c:895

4359 +#: gpg-interface.c:967

4360 msgid "user.signingkey needs to be set for ssh signing"

4361 msgstr "user.signingkey måste anges för ssh-signering"

4362

4363 -#: gpg-interface.c:906

4363 +#: gpg-interface.c:978

4364 #, c-format

4365 msgid "failed writing ssh signing key to '%s'"

4366 msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""

4367

4368 -#: gpg-interface.c:924

4368 +#: gpg-interface.c:996

4369 #, c-format

4370 msgid "failed writing ssh signing key buffer to '%s'"

4371 msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""

4372

4373 -#: gpg-interface.c:942

4373 +#: gpg-interface.c:1014

4374 msgid ""

4375 "ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4376 "8.2p1+)"

@@ -4378,7 +4378,7 @@ msgstr ""

4378 "\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "

4379 "version 8.2p1+)"

4380

4381 -#: gpg-interface.c:954

4381 +#: gpg-interface.c:1026

4382 #, c-format

4383 msgid "failed reading ssh signing data buffer from '%s'"

4384 msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""

@@ -4388,7 +4388,7 @@ msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""

4388 msgid "ignored invalid color '%.*s' in log.graphColors"

4389 msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"

4390

4391 -#: grep.c:533

4391 +#: grep.c:531

4392 msgid ""

4393 "given pattern contains NULL byte (via -f <file>). This is only supported "

4394 "with -P under PCRE v2"

@@ -4396,18 +4396,18 @@ msgstr ""

4396 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"

4397 "P under PCRE v2"

4398

4399 -#: grep.c:1928

4399 +#: grep.c:1942

4400 #, c-format

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

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

4403

4404 -#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4404 +#: grep.c:1959 setup.c:177 builtin/clone.c:302 builtin/diff.c:90

4405 #: builtin/rm.c:136

4406 #, c-format

4407 msgid "failed to stat '%s'"

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

4409

4410 -#: grep.c:1956

4410 +#: grep.c:1970

4411 #, c-format

4412 msgid "'%s': short read"

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

@@ -4528,8 +4528,8 @@ msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

4528

4529 #: help.c:646

4530 #, c-format

4531 -msgid "Run '%s' instead? (y/N)"

4532 -msgstr "Köra \"%s\" istället? (j/N)"

4531 +msgid "Run '%s' instead [y/N]? "

4532 +msgstr "Köra \"%s\" istället (j/N)?"

4533

4534 #: help.c:654

4535 #, c-format

@@ -4753,7 +4753,7 @@ msgstr "förväntade \"flush\" efter ls-refs-argument"

4753 msgid "quoted CRLF detected"

4754 msgstr "citerad CRLF upptäcktes"

4755

4756 -#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4756 +#: mailinfo.c:1254 builtin/am.c:184 builtin/mailinfo.c:46

4757 #, c-format

4758 msgid "bad action '%s' for '%s'"

4759 msgstr "felaktig funktion \"%s\" för \"%s\""

@@ -4986,7 +4986,7 @@ msgstr "undermodul"

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

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

4988

4989 -#: merge-ort.c:3856

4989 +#: merge-ort.c:3869

4990 #, c-format

4991 msgid ""

4992 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4995,7 +4995,7 @@ msgstr ""

4995 "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "

4996 "lämnad i trädet."

4997

4998 -#: merge-ort.c:4152

4998 +#: merge-ort.c:4165

4999 #, c-format

5000 msgid ""

5001 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -5007,7 +5007,7 @@ msgstr ""

5007 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5008 #. base, and 2-3) the trees for the two trees we're merging.

5009 #.

5010 -#: merge-ort.c:4521

5010 +#: merge-ort.c:4534

5011 #, c-format

5012 msgid "collecting merge info failed for trees %s, %s, %s"

5013 msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"

@@ -5022,7 +5022,7 @@ msgstr ""

5022 "sammanslagning:\n"

5023 " %s"

5024

5025 -#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

5025 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:405

5026 msgid "Already up to date."

5027 msgstr "Redan à jour."

5028

@@ -5304,7 +5304,7 @@ msgstr "sammanslagningen returnerade ingen incheckning"

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

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

5306

5307 -#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5307 +#: merge-recursive.c:3834 builtin/merge.c:720 builtin/merge.c:906

5308 #: builtin/stash.c:489

5309 msgid "Unable to write index."

5310 msgstr "Kunde inte skriva indexet."

@@ -5313,8 +5313,8 @@ msgstr "Kunde inte skriva indexet."

5313 msgid "failed to read the cache"

5314 msgstr "misslyckades läsa cachen"

5315

5316 -#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5317 -#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5316 +#: merge.c:102 rerere.c:704 builtin/am.c:1988 builtin/am.c:2022

5317 +#: builtin/checkout.c:598 builtin/checkout.c:853 builtin/clone.c:706

5318 #: builtin/stash.c:269

5319 msgid "unable to write new index file"

5320 msgstr "kunde inte skriva ny indexfil"

@@ -5323,212 +5323,212 @@ msgstr "kunde inte skriva ny indexfil"

5323 msgid "multi-pack-index OID fanout is of the wrong size"

5324 msgstr "multi-pack-indexets OID-utbredning har fel storlek"

5325

5326 -#: midx.c:109

5326 +#: midx.c:111

5327 #, c-format

5328 msgid "multi-pack-index file %s is too small"

5329 msgstr "multi-pack-indexfilen %s är för liten"

5330

5331 -#: midx.c:125

5331 +#: midx.c:127

5332 #, c-format

5333 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5334 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

5335

5336 -#: midx.c:130

5336 +#: midx.c:132

5337 #, c-format

5338 msgid "multi-pack-index version %d not recognized"

5339 msgstr "multi-pack-indexversionen %d stöds inte"

5340

5341 -#: midx.c:135

5341 +#: midx.c:137

5342 #, c-format

5343 msgid "multi-pack-index hash version %u does not match version %u"

5344 msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"

5345

5346 -#: midx.c:152

5346 +#: midx.c:154

5347 msgid "multi-pack-index missing required pack-name chunk"

5348 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

5349

5350 -#: midx.c:154

5350 +#: midx.c:156

5351 msgid "multi-pack-index missing required OID fanout chunk"

5352 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

5353

5354 -#: midx.c:156

5354 +#: midx.c:158

5355 msgid "multi-pack-index missing required OID lookup chunk"

5356 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

5357

5358 -#: midx.c:158

5358 +#: midx.c:160

5359 msgid "multi-pack-index missing required object offsets chunk"

5360 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

5361

5362 -#: midx.c:174

5362 +#: midx.c:176

5363 #, c-format

5364 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5365 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

5366

5367 -#: midx.c:221

5367 +#: midx.c:224

5368 #, c-format

5369 msgid "bad pack-int-id: %u (%u total packs)"

5370 msgstr "bad pack-int-id: %u (%u paket totalt)"

5371

5372 -#: midx.c:271

5372 +#: midx.c:274

5373 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5374 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

5375

5376 -#: midx.c:502

5376 +#: midx.c:505

5377 #, c-format

5378 msgid "failed to add packfile '%s'"

5379 msgstr "misslyckades läsa paketfilen \"%s\""

5380

5381 -#: midx.c:508

5381 +#: midx.c:511

5382 #, c-format

5383 msgid "failed to open pack-index '%s'"

5384 msgstr "misslyckades öppna paketindexet \"%s\""

5385

5386 -#: midx.c:576

5386 +#: midx.c:579

5387 #, c-format

5388 msgid "failed to locate object %d in packfile"

5389 msgstr "misslyckades hitta objekt %d i paketfilen"

5390

5391 -#: midx.c:892

5391 +#: midx.c:895

5392 msgid "cannot store reverse index file"

5393 msgstr "kan inte spara reverse-index-fil"

5394

5395 -#: midx.c:990

5395 +#: midx.c:993

5396 #, c-format

5397 msgid "could not parse line: %s"

5398 msgstr "kunde inte tolka rad: %s"

5399

5400 -#: midx.c:992

5400 +#: midx.c:995

5401 #, c-format

5402 msgid "malformed line: %s"

5403 msgstr "felaktig rad: %s"

5404

5405 -#: midx.c:1159

5405 +#: midx.c:1162

5406 msgid "ignoring existing multi-pack-index; checksum mismatch"

5407 msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"

5408

5409 -#: midx.c:1184

5409 +#: midx.c:1187

5410 msgid "could not load pack"

5411 msgstr "kunde inte läsa paket{"

5412

5413 -#: midx.c:1190

5413 +#: midx.c:1193

5414 #, c-format

5415 msgid "could not open index for %s"

5416 msgstr "kunde inte öppna indexet för %s"

5417

5418 -#: midx.c:1201

5418 +#: midx.c:1204

5419 msgid "Adding packfiles to multi-pack-index"

5420 msgstr "Lägger till paketfiler till multi-pack-index"

5421

5422 -#: midx.c:1244

5422 +#: midx.c:1247

5423 #, c-format

5424 msgid "unknown preferred pack: '%s'"

5425 msgstr "okänt föredraget paket: %s"

5426

5427 -#: midx.c:1289

5427 +#: midx.c:1292

5428 #, c-format

5429 msgid "cannot select preferred pack %s with no objects"

5430 msgstr "kan inte välja föredraget paket %s som inte har några objekt"

5431

5432 -#: midx.c:1321

5432 +#: midx.c:1324

5433 #, c-format

5434 msgid "did not see pack-file %s to drop"

5435 msgstr "såg inte paketfilen %s som skulle kastas"

5436

5437 -#: midx.c:1367

5437 +#: midx.c:1370

5438 #, c-format

5439 msgid "preferred pack '%s' is expired"

5440 msgstr "föredraget paket \"%s\" har löpt ut"

5441

5442 -#: midx.c:1380

5442 +#: midx.c:1383

5443 msgid "no pack files to index."

5444 msgstr "inga paketfiler att indexera."

5445

5446 -#: midx.c:1417

5446 +#: midx.c:1420

5447 msgid "could not write multi-pack bitmap"

5448 msgstr "kunde inte skriva fler-paketsbitkarta"

5449

5450 -#: midx.c:1427

5450 +#: midx.c:1430

5451 msgid "could not write multi-pack-index"

5452 msgstr "kunde inte skriva flerpakets-index"

5453

5454 -#: midx.c:1486 builtin/clean.c:37

5454 +#: midx.c:1489 builtin/clean.c:37

5455 #, c-format

5456 msgid "failed to remove %s"

5457 msgstr "misslyckades ta bort %s"

5458

5459 -#: midx.c:1517

5459 +#: midx.c:1522

5460 #, c-format

5461 msgid "failed to clear multi-pack-index at %s"

5462 msgstr "misslyckades städa multi-pack-index på %s"

5463

5464 -#: midx.c:1577

5464 +#: midx.c:1585

5465 msgid "multi-pack-index file exists, but failed to parse"

5466 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"

5467

5468 -#: midx.c:1585

5468 +#: midx.c:1593

5469 msgid "incorrect checksum"

5470 msgstr "felaktig kontrollsumma"

5471

5472 -#: midx.c:1588

5472 +#: midx.c:1596

5473 msgid "Looking for referenced packfiles"

5474 msgstr "Ser efter refererade packfiler"

5475

5476 -#: midx.c:1603

5476 +#: midx.c:1611

5477 #, c-format

5478 msgid ""

5479 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5480 msgstr ""

5481 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5482

5483 -#: midx.c:1608

5483 +#: midx.c:1616

5484 msgid "the midx contains no oid"

5485 msgstr "midx saknar oid"

5486

5487 -#: midx.c:1617

5487 +#: midx.c:1625

5488 msgid "Verifying OID order in multi-pack-index"

5489 msgstr "Bekräftar OID-ordning i multi-pack-index"

5490

5491 -#: midx.c:1626

5491 +#: midx.c:1634

5492 #, c-format

5493 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5494 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

5495

5496 -#: midx.c:1646

5496 +#: midx.c:1654

5497 msgid "Sorting objects by packfile"

5498 msgstr "Sorterar objekt efter packfil"

5499

5500 -#: midx.c:1653

5500 +#: midx.c:1661

5501 msgid "Verifying object offsets"

5502 msgstr "Bekräftar offset för objekt"

5503

5504 -#: midx.c:1669

5504 +#: midx.c:1677

5505 #, c-format

5506 msgid "failed to load pack entry for oid[%d] = %s"

5507 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

5508

5509 -#: midx.c:1675

5509 +#: midx.c:1683

5510 #, c-format

5511 msgid "failed to load pack-index for packfile %s"

5512 msgstr "misslyckades läsa paketindex för paketfil %s"

5513

5514 -#: midx.c:1684

5514 +#: midx.c:1692

5515 #, c-format

5516 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5517 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5518

5519 -#: midx.c:1709

5519 +#: midx.c:1719

5520 msgid "Counting referenced objects"

5521 msgstr "Räknar refererade objekt"

5522

5523 -#: midx.c:1719

5523 +#: midx.c:1729

5524 msgid "Finding and deleting unreferenced packfiles"

5525 msgstr "Ser efter och tar bort orefererade packfiler"

5526

5527 -#: midx.c:1911

5527 +#: midx.c:1921

5528 msgid "could not start pack-objects"

5529 msgstr "kunde inte starta pack-objects"

5530

5531 -#: midx.c:1931

5531 +#: midx.c:1941

5532 msgid "could not finish pack-objects"

5533 msgstr "kunde inte avsluta pack-objects"

5534

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

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

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

5589

5590 -#: object-file.c:459

5590 +#: object-file.c:456

5591 #, c-format

5592 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5593 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"

5594

5595 -#: object-file.c:517

5595 +#: object-file.c:514

5596 #, c-format

5597 msgid "unable to normalize alternate object path: %s"

5598 msgstr "kunde inte normalisera supplerande objektsökväg: %s"

5599

5600 -#: object-file.c:591

5600 +#: object-file.c:588

5601 #, c-format

5602 msgid "%s: ignoring alternate object stores, nesting too deep"

5603 msgstr "%s: ignorerar supplerande objektlager, för djup nästling"

5604

5605 -#: object-file.c:598

5605 +#: object-file.c:595

5606 #, c-format

5607 msgid "unable to normalize object directory: %s"

5608 msgstr "kan inte normalisera objektkatalogen: %s"

5609

5610 -#: object-file.c:641

5610 +#: object-file.c:638

5611 msgid "unable to fdopen alternates lockfile"

5612 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"

5613

5614 -#: object-file.c:659

5614 +#: object-file.c:656

5615 msgid "unable to read alternates file"

5616 msgstr "kan inte läsa \"alternates\"-filen"

5617

5618 -#: object-file.c:666

5618 +#: object-file.c:663

5619 msgid "unable to move new alternates file into place"

5620 msgstr "kan inte flytta ny \"alternates\"-fil på plats"

5621

5622 -#: object-file.c:701

5622 +#: object-file.c:741

5623 #, c-format

5624 msgid "path '%s' does not exist"

5625 msgstr "sökvägen \"%s\" finns inte"

5626

5627 -#: object-file.c:722

5627 +#: object-file.c:762

5628 #, c-format

5629 msgid "reference repository '%s' as a linked checkout is not supported yet."

5630 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

5631

5632 -#: object-file.c:728

5632 +#: object-file.c:768

5633 #, c-format

5634 msgid "reference repository '%s' is not a local repository."

5635 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

5636

5637 -#: object-file.c:734

5637 +#: object-file.c:774

5638 #, c-format

5639 msgid "reference repository '%s' is shallow"

5640 msgstr "referensarkivet \"%s\" är grunt"

5641

5642 -#: object-file.c:742

5642 +#: object-file.c:782

5643 #, c-format

5644 msgid "reference repository '%s' is grafted"

5645 msgstr "referensarkivet \"%s\" är ympat"

5646

5647 -#: object-file.c:773

5647 +#: object-file.c:813

5648 #, c-format

5649 msgid "could not find object directory matching %s"

5650 msgstr "kunde inte hitta objektkatalog för %s"

5651

5652 -#: object-file.c:823

5652 +#: object-file.c:863

5653 #, c-format

5654 msgid "invalid line while parsing alternate refs: %s"

5655 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"

5656

5657 -#: object-file.c:973

5657 +#: object-file.c:1013

5658 #, c-format

5659 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5660 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"

5661

5662 -#: object-file.c:1008

5662 +#: object-file.c:1048

5663 #, c-format

5664 msgid "mmap failed%s"

5665 msgstr "mmap misslyckades%s"

5666

5667 -#: object-file.c:1174

5667 +#: object-file.c:1214

5668 #, c-format

5669 msgid "object file %s is empty"

5670 msgstr "objektfilen %s är tom"

5671

5672 -#: object-file.c:1293 object-file.c:2499

5672 +#: object-file.c:1333 object-file.c:2542

5673 #, c-format

5674 msgid "corrupt loose object '%s'"

5675 msgstr "trasigt löst objekt \"%s\""

5676

5677 -#: object-file.c:1295 object-file.c:2503

5677 +#: object-file.c:1335 object-file.c:2546

5678 #, c-format

5679 msgid "garbage at end of loose object '%s'"

5680 msgstr "skräp i slutet av löst objekt \"%s\""

5681

5682 -#: object-file.c:1417

5682 +#: object-file.c:1457

5683 #, c-format

5684 msgid "unable to parse %s header"

5685 msgstr "kan inte tolka %s-huvud"

5686

5687 -#: object-file.c:1419

5687 +#: object-file.c:1459

5688 msgid "invalid object type"

5689 msgstr "felaktig objekttyp"

5690

5691 -#: object-file.c:1430

5691 +#: object-file.c:1470

5692 #, c-format

5693 msgid "unable to unpack %s header"

5694 msgstr "kan inte packa upp %s-huvudet"

5695

5696 -#: object-file.c:1434

5696 +#: object-file.c:1474

5697 #, c-format

5698 msgid "header for %s too long, exceeds %d bytes"

5699 msgstr "huvudet för %s är för långt, mer än %d byte"

5700

5701 -#: object-file.c:1664

5701 +#: object-file.c:1704

5702 #, c-format

5703 msgid "failed to read object %s"

5704 msgstr "misslyckades läsa objektet %s"

5705

5706 -#: object-file.c:1668

5706 +#: object-file.c:1708

5707 #, c-format

5708 msgid "replacement %s not found for %s"

5709 msgstr "ersättningen %s hittades inte för %s"

5710

5711 -#: object-file.c:1672

5711 +#: object-file.c:1712

5712 #, c-format

5713 msgid "loose object %s (stored in %s) is corrupt"

5714 msgstr "löst objekt %s (lagrat i %s) är trasigt"

5715

5716 -#: object-file.c:1676

5716 +#: object-file.c:1716

5717 #, c-format

5718 msgid "packed object %s (stored in %s) is corrupt"

5719 msgstr "packat objekt %s (lagrat i %s) är trasigt"

5720

5721 -#: object-file.c:1781

5721 +#: object-file.c:1821

5722 #, c-format

5723 msgid "unable to write file %s"

5724 msgstr "kunde inte skriva filen %s"

5725

5726 -#: object-file.c:1788

5726 +#: object-file.c:1828

5727 #, c-format

5728 msgid "unable to set permission to '%s'"

5729 msgstr "kan inte sätta behörigheten till \"%s\""

5730

5731 -#: object-file.c:1795

5731 +#: object-file.c:1835

5732 msgid "file write error"

5733 msgstr "fel vid skrivning av fil"

5734

5735 -#: object-file.c:1815

5735 +#: object-file.c:1858

5736 msgid "error when closing loose object file"

5737 msgstr "fel vid stängning av fil för löst objekt"

5738

5739 -#: object-file.c:1882

5739 +#: object-file.c:1925

5740 #, c-format

5741 msgid "insufficient permission for adding an object to repository database %s"

5742 msgstr ""

5743 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"

5744

5745 -#: object-file.c:1884

5745 +#: object-file.c:1927

5746 msgid "unable to create temporary file"

5747 msgstr "kan inte skapa temporär fil"

5748

5749 -#: object-file.c:1908

5749 +#: object-file.c:1951

5750 msgid "unable to write loose object file"

5751 msgstr "kunde inte skriva fil för löst objekt"

5752

5753 -#: object-file.c:1914

5753 +#: object-file.c:1957

5754 #, c-format

5755 msgid "unable to deflate new object %s (%d)"

5756 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"

5757

5758 -#: object-file.c:1918

5758 +#: object-file.c:1961

5759 #, c-format

5760 msgid "deflateEnd on object %s failed (%d)"

5761 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"

5762

5763 -#: object-file.c:1922

5763 +#: object-file.c:1965

5764 #, c-format

5765 msgid "confused by unstable object source data for %s"

5766 msgstr "förvirrad av instabil objektkälldata för %s"

5767

5768 -#: object-file.c:1933 builtin/pack-objects.c:1243

5768 +#: object-file.c:1976 builtin/pack-objects.c:1243

5769 #, c-format

5770 msgid "failed utime() on %s"

5771 msgstr "\"utime()\" misslyckades på %s"

5772

5773 -#: object-file.c:2011

5773 +#: object-file.c:2054

5774 #, c-format

5775 msgid "cannot read object for %s"

5776 msgstr "kan inte läsa objekt för %s"

5777

5778 -#: object-file.c:2062

5778 +#: object-file.c:2105

5779 msgid "corrupt commit"

5780 msgstr "trasik incheckning"

5781

5782 -#: object-file.c:2070

5782 +#: object-file.c:2113

5783 msgid "corrupt tag"

5784 msgstr "trasig tagg"

5785

5786 -#: object-file.c:2170

5786 +#: object-file.c:2213

5787 #, c-format

5788 msgid "read error while indexing %s"

5789 msgstr "läsfel vid indexering av %s"

5790

5791 -#: object-file.c:2173

5791 +#: object-file.c:2216

5792 #, c-format

5793 msgid "short read while indexing %s"

5794 msgstr "för lite lästes vid indexering av %s"

5795

5796 -#: object-file.c:2246 object-file.c:2256

5796 +#: object-file.c:2289 object-file.c:2299

5797 #, c-format

5798 msgid "%s: failed to insert into database"

5799 msgstr "%s: misslyckades lägga in i databasen"

5800

5801 -#: object-file.c:2262

5801 +#: object-file.c:2305

5802 #, c-format

5803 msgid "%s: unsupported file type"

5804 msgstr "%s: filtypen stöds ej"

5805

5806 -#: object-file.c:2286 builtin/fetch.c:1445

5806 +#: object-file.c:2329 builtin/fetch.c:1448

5807 #, c-format

5808 msgid "%s is not a valid object"

5809 msgstr "%s är inte ett giltigt objekt"

5810

5811 -#: object-file.c:2288

5811 +#: object-file.c:2331

5812 #, c-format

5813 msgid "%s is not a valid '%s' object"

5814 msgstr "%s är inte ett giltigt \"%s\"-objekt"

5815

5816 -#: object-file.c:2315

5816 +#: object-file.c:2358

5817 #, c-format

5818 msgid "unable to open %s"

5819 msgstr "kan inte öppna %s"

5820

5821 -#: object-file.c:2510

5821 +#: object-file.c:2553

5822 #, c-format

5823 msgid "hash mismatch for %s (expected %s)"

5824 msgstr "hash stämmer inte för %s (förväntade %s)"

5825

5826 -#: object-file.c:2533

5826 +#: object-file.c:2576

5827 #, c-format

5828 msgid "unable to mmap %s"

5829 msgstr "kan inte utföra \"mmap\" för %s"

5830

5831 -#: object-file.c:2539

5831 +#: object-file.c:2582

5832 #, c-format

5833 msgid "unable to unpack header of %s"

5834 msgstr "kan inte packa upp huvud för %s"

5835

5836 -#: object-file.c:2544

5836 +#: object-file.c:2587

5837 #, c-format

5838 msgid "unable to parse header of %s"

5839 msgstr "kan inte tolka huvud för %s"

5840

5841 -#: object-file.c:2555

5841 +#: object-file.c:2598

5842 #, c-format

5843 msgid "unable to unpack contents of %s"

5844 msgstr "kan inte tolka innehåll i %s"

@@ -5965,25 +5965,25 @@ msgstr "kunde inte tolka objektet: %s"

5965 msgid "hash mismatch %s"

5966 msgstr "hashvärde stämmer inte överens %s"

5967

5968 -#: pack-bitmap.c:348

5968 +#: pack-bitmap.c:353

5969 msgid "multi-pack bitmap is missing required reverse index"

5970 msgstr "flerpaketsbitkarta saknar nödvändigt omvänt index"

5971

5972 -#: pack-bitmap.c:424

5972 +#: pack-bitmap.c:429

5973 msgid "load_reverse_index: could not open pack"

5974 msgstr "load_reverse_index: kunde inte öppna paket"

5975

5976 -#: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424

5976 +#: pack-bitmap.c:1069 pack-bitmap.c:1075 builtin/pack-objects.c:2424

5977 #, c-format

5978 msgid "unable to get size of %s"

5979 msgstr "kan inte hämta storlek på %s"

5980

5981 -#: pack-bitmap.c:1916

5981 +#: pack-bitmap.c:1935

5982 #, c-format

5983 msgid "could not find %s in pack %s at offset %<PRIuMAX>"

5984 msgstr "kunde inte hitta %s i paketet %s på offset %<PRIuMAX>"

5985

5986 -#: pack-bitmap.c:1952 builtin/rev-list.c:92

5986 +#: pack-bitmap.c:1971 builtin/rev-list.c:92

5987 #, c-format

5988 msgid "unable to get disk usage of %s"

5989 msgstr "kan inte hämta diskanvändning för %s"

@@ -6032,46 +6032,51 @@ msgstr "kunde inte göra %s läsbar"

6032 msgid "could not write '%s' promisor file"

6033 msgstr "kunde inte skriva kontraktsfilen \"%s\""

6034

6035 -#: packfile.c:626

6035 +#: packfile.c:627

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

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

6038

6039 -#: packfile.c:656

6039 +#: packfile.c:657

6040 #, c-format

6041 msgid "packfile %s cannot be mapped%s"

6042 msgstr "paketfilen %s kunde inte kopplas%s"

6043

6044 -#: packfile.c:1923

6044 +#: packfile.c:1924

6045 #, c-format

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

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

6048

6049 -#: packfile.c:1927

6049 +#: packfile.c:1928

6050 #, c-format

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

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

6053

6054 -#: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175

6054 +#: parse-options-cb.c:21 parse-options-cb.c:25 builtin/commit-graph.c:175

6055 #, c-format

6056 msgid "option `%s' expects a numerical value"

6057 msgstr "flaggan \"%s\" antar ett numeriskt värde"

6058

6059 -#: parse-options-cb.c:41

6059 +#: parse-options-cb.c:42

6060 #, c-format

6061 msgid "malformed expiration date '%s'"

6062 msgstr "trasigt utlöpsdatum: \"%s\""

6063

6064 -#: parse-options-cb.c:54

6064 +#: parse-options-cb.c:55

6065 #, c-format

6066 msgid "option `%s' expects \"always\", \"auto\", or \"never\""

6067 msgstr ""

6068 "flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"

6069

6070 -#: parse-options-cb.c:132 parse-options-cb.c:149

6070 +#: parse-options-cb.c:133 parse-options-cb.c:150

6071 #, c-format

6072 msgid "malformed object name '%s'"

6073 msgstr "felformat objektnamn \"%s\""

6074

6075 +#: parse-options-cb.c:307

6076 +#, c-format

6077 +msgid "option `%s' expects \"%s\" or \"%s\""

6078 +msgstr "flaggan \"%s\" kräver \"%s\" eller \"%s\""

6079 +

6080 #: parse-options.c:58

6081 #, c-format

6082 msgid "%s requires a value"

@@ -6107,36 +6112,36 @@ msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffi

6112 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"

6113 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

6114

6110 -#: parse-options.c:427 parse-options.c:435

6115 +#: parse-options.c:428 parse-options.c:436

6116 #, c-format

6117 msgid "did you mean `--%s` (with two dashes)?"

6118 msgstr "menade du \"--%s\" (med två bindestreck)?"

6119

6115 -#: parse-options.c:677 parse-options.c:1053

6120 +#: parse-options.c:678 parse-options.c:1054

6121 #, c-format

6122 msgid "alias of --%s"

6123 msgstr "alias för --%s"

6124

6120 -#: parse-options.c:891

6125 +#: parse-options.c:892

6126 #, c-format

6127 msgid "unknown option `%s'"

6128 msgstr "okänd flagga \"%s\""

6129

6125 -#: parse-options.c:893

6130 +#: parse-options.c:894

6131 #, c-format

6132 msgid "unknown switch `%c'"

6133 msgstr "okänd flagga \"%c\""

6134

6130 -#: parse-options.c:895

6135 +#: parse-options.c:896

6136 #, c-format

6137 msgid "unknown non-ascii option in string: `%s'"

6138 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

6139

6135 -#: parse-options.c:919

6140 +#: parse-options.c:920

6141 msgid "..."

6142 msgstr "..."

6143

6139 -#: parse-options.c:933

6144 +#: parse-options.c:934

6145 #, c-format

6146 msgid "usage: %s"

6147 msgstr "användning: %s"

@@ -6144,7 +6149,7 @@ msgstr "användning: %s"

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

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

6151 #.

6147 -#: parse-options.c:948

6152 +#: parse-options.c:949

6153 #, c-format

6154 msgid " or: %s"

6155 msgstr " eller: %s"

@@ -6168,17 +6173,17 @@ msgstr " eller: %s"

6173 #. translated) N_() usage string, which contained embedded

6174 #. newlines before we split it up.

6175 #.

6171 -#: parse-options.c:969

6176 +#: parse-options.c:970

6177 #, c-format

6178 msgid "%*s%s"

6179 msgstr "%*s%s"

6180

6176 -#: parse-options.c:992

6181 +#: parse-options.c:993

6182 #, c-format

6183 msgid " %s"

6184 msgstr " %s"

6185

6181 -#: parse-options.c:1039

6186 +#: parse-options.c:1040

6187 msgid "-NUM"

6188 msgstr "-TAL"

6189

@@ -6307,17 +6312,17 @@ msgstr "läsfel"

6312 msgid "the remote end hung up unexpectedly"

6313 msgstr "fjärren lade på oväntat"

6314

6310 -#: pkt-line.c:390 pkt-line.c:392

6315 +#: pkt-line.c:417 pkt-line.c:419

6316 #, c-format

6317 msgid "protocol error: bad line length character: %.4s"

6318 msgstr "protokollfel: felaktig radlängdstecken: %.4s"

6319

6315 -#: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417

6320 +#: pkt-line.c:434 pkt-line.c:436 pkt-line.c:442 pkt-line.c:444

6321 #, c-format

6322 msgid "protocol error: bad line length %d"

6323 msgstr "protokollfel: felaktig radlängd: %d"

6324

6320 -#: pkt-line.c:434 sideband.c:165

6325 +#: pkt-line.c:472 sideband.c:165

6326 #, c-format

6327 msgid "remote error: %s"

6328 msgstr "fjärrfel: %s"

@@ -6369,7 +6374,7 @@ msgstr "kunde inte starta \"log\""

6374 msgid "could not read `log` output"

6375 msgstr "kunde inte läsa utdata från \"log\""

6376

6372 -#: range-diff.c:97 sequencer.c:5605

6377 +#: range-diff.c:97 sequencer.c:5602

6378 #, c-format

6379 msgid "could not parse commit '%s'"

6380 msgstr "kunde inte tolka incheckningen \"%s\""

@@ -6392,60 +6397,56 @@ msgstr "kunde inte tolka git-huvudet \"%.*s\""

6397 msgid "failed to generate diff"

6398 msgstr "misslyckades skapa diff"

6399

6395 -#: range-diff.c:559

6396 -msgid "--left-only and --right-only are mutually exclusive"

6397 -msgstr "--left-only och --right-only är ömsesidigt uteslutande"

6398 -

6400 #: range-diff.c:562 range-diff.c:564

6401 #, c-format

6402 msgid "could not parse log for '%s'"

6403 msgstr "kunde inte tolka loggen för \"%s\""

6404

6404 -#: read-cache.c:710

6405 +#: read-cache.c:723

6406 #, c-format

6407 msgid "will not add file alias '%s' ('%s' already exists in index)"

6408 msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"

6409

6409 -#: read-cache.c:726

6410 +#: read-cache.c:739

6411 msgid "cannot create an empty blob in the object database"

6412 msgstr "kan inte skapa tom blob i objektdatabasen"

6413

6413 -#: read-cache.c:748

6414 +#: read-cache.c:761

6415 #, c-format

6416 msgid "%s: can only add regular files, symbolic links or git-directories"

6417 msgstr ""

6418 "%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"

6419

6419 -#: read-cache.c:753 builtin/submodule--helper.c:3241

6420 +#: read-cache.c:766 builtin/submodule--helper.c:3242

6421 #, c-format

6422 msgid "'%s' does not have a commit checked out"

6423 msgstr "\"%s\" har inte någon utcheckad incheckning"

6424

6424 -#: read-cache.c:805

6425 +#: read-cache.c:818

6426 #, c-format

6427 msgid "unable to index file '%s'"

6428 msgstr "kan inte indexera filen \"%s\""

6429

6429 -#: read-cache.c:824

6430 +#: read-cache.c:837

6431 #, c-format

6432 msgid "unable to add '%s' to index"

6433 msgstr "kan inte lägga till \"%s\" till indexet"

6434

6434 -#: read-cache.c:835

6435 +#: read-cache.c:848

6436 #, c-format

6437 msgid "unable to stat '%s'"

6438 msgstr "kan inte ta status på \"%s\""

6439

6439 -#: read-cache.c:1373

6440 +#: read-cache.c:1386

6441 #, c-format

6442 msgid "'%s' appears as both a file and as a directory"

6443 msgstr "\"%s\" finns både som en fil och en katalog"

6444

6444 -#: read-cache.c:1588

6445 +#: read-cache.c:1601

6446 msgid "Refresh index"

6447 msgstr "Uppdatera indexet"

6448

6448 -#: read-cache.c:1720

6449 +#: read-cache.c:1733

6450 #, c-format

6451 msgid ""

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

@@ -6454,7 +6455,7 @@ msgstr ""

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

6456 "Använder version %i"

6457

6457 -#: read-cache.c:1730

6458 +#: read-cache.c:1743

6459 #, c-format

6460 msgid ""

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

@@ -6463,143 +6464,143 @@ msgstr ""

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

6465 "Använder version %i"

6466

6466 -#: read-cache.c:1786

6467 +#: read-cache.c:1799

6468 #, c-format

6469 msgid "bad signature 0x%08x"

6470 msgstr "felaktig signatur 0x%08x"

6471

6471 -#: read-cache.c:1789

6472 +#: read-cache.c:1802

6473 #, c-format

6474 msgid "bad index version %d"

6475 msgstr "felaktig indexversion %d"

6476

6476 -#: read-cache.c:1798

6477 +#: read-cache.c:1811

6478 msgid "bad index file sha1 signature"

6479 msgstr "felaktig sha1-signatur för indexfil"

6480

6480 -#: read-cache.c:1832

6481 +#: read-cache.c:1845

6482 #, c-format

6483 msgid "index uses %.4s extension, which we do not understand"

6484 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

6485

6485 -#: read-cache.c:1834

6486 +#: read-cache.c:1847

6487 #, c-format

6488 msgid "ignoring %.4s extension"

6489 msgstr "ignorerar filtillägget %.4s"

6490

6490 -#: read-cache.c:1871

6491 +#: read-cache.c:1884

6492 #, c-format

6493 msgid "unknown index entry format 0x%08x"

6494 msgstr "okänt format 0x%08x på indexpost"

6495

6495 -#: read-cache.c:1887

6496 +#: read-cache.c:1900

6497 #, c-format

6498 msgid "malformed name field in the index, near path '%s'"

6499 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

6500

6500 -#: read-cache.c:1944

6501 +#: read-cache.c:1957

6502 msgid "unordered stage entries in index"

6503 msgstr "osorterade köposter i index"

6504

6504 -#: read-cache.c:1947

6505 +#: read-cache.c:1960

6506 #, c-format

6507 msgid "multiple stage entries for merged file '%s'"

6508 msgstr "flera köposter för den sammanslagna filen \"%s\""

6509

6509 -#: read-cache.c:1950

6510 +#: read-cache.c:1963

6511 #, c-format

6512 msgid "unordered stage entries for '%s'"

6513 msgstr "osorterade köposter för \"%s\""

6514

6514 -#: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095

6515 -#: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183

6516 -#: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987

6515 +#: read-cache.c:2078 read-cache.c:2384 rerere.c:549 rerere.c:583 rerere.c:1095

6516 +#: submodule.c:1662 builtin/add.c:600 builtin/check-ignore.c:183

6517 +#: builtin/checkout.c:527 builtin/checkout.c:719 builtin/clean.c:1013

6518 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519

6518 -#: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293

6519 -#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201

6519 +#: builtin/mv.c:148 builtin/reset.c:499 builtin/rm.c:293

6520 +#: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3202

6521 msgid "index file corrupt"

6522 msgstr "indexfilen trasig"

6523

6523 -#: read-cache.c:2209

6524 +#: read-cache.c:2222

6525 #, c-format

6526 msgid "unable to create load_cache_entries thread: %s"

6527 msgstr "kunde inte skapa tråd för load_cache_entries: %s"

6528

6528 -#: read-cache.c:2222

6529 +#: read-cache.c:2235

6530 #, c-format

6531 msgid "unable to join load_cache_entries thread: %s"

6532 msgstr "kunde inte ansluta till tråden för load_cache_entries: %s"

6533

6533 -#: read-cache.c:2255

6534 +#: read-cache.c:2268

6535 #, c-format

6536 msgid "%s: index file open failed"

6537 msgstr "%s: öppning av indexfilen misslyckades"

6538

6538 -#: read-cache.c:2259

6539 +#: read-cache.c:2272

6540 #, c-format

6541 msgid "%s: cannot stat the open index"

6542 msgstr "%s: kan inte ta startus på det öppna indexet"

6543

6543 -#: read-cache.c:2263

6544 +#: read-cache.c:2276

6545 #, c-format

6546 msgid "%s: index file smaller than expected"

6547 msgstr "%s: indexfilen mindre än förväntat"

6548

6548 -#: read-cache.c:2267

6549 +#: read-cache.c:2280

6550 #, c-format

6551 msgid "%s: unable to map index file%s"

6552 msgstr "%s: kan inte koppla indexfilen%s"

6553

6553 -#: read-cache.c:2310

6554 +#: read-cache.c:2323

6555 #, c-format

6556 msgid "unable to create load_index_extensions thread: %s"

6557 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

6558

6558 -#: read-cache.c:2337

6559 +#: read-cache.c:2350

6560 #, c-format

6561 msgid "unable to join load_index_extensions thread: %s"

6562 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

6563

6563 -#: read-cache.c:2375

6564 +#: read-cache.c:2396

6565 #, c-format

6566 msgid "could not freshen shared index '%s'"

6567 msgstr "kunde inte uppdatera delat index \"%s\""

6568

6568 -#: read-cache.c:2434

6569 +#: read-cache.c:2455

6570 #, c-format

6571 msgid "broken index, expect %s in %s, got %s"

6572 msgstr "trasigt index, förväntade %s i %s, fick %s"

6573

6573 -#: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147

6574 +#: read-cache.c:3086 strbuf.c:1191 wrapper.c:641 builtin/merge.c:1150

6575 #, c-format

6576 msgid "could not close '%s'"

6577 msgstr "kunde inte stänga \"%s\""

6578

6578 -#: read-cache.c:3108

6579 +#: read-cache.c:3129

6580 msgid "failed to convert to a sparse-index"

6581 msgstr "misslyckades omvandla till glest index"

6582

6582 -#: read-cache.c:3179

6583 +#: read-cache.c:3200

6584 #, c-format

6585 msgid "could not stat '%s'"

6586 msgstr "kunde inte ta status på \"%s\""

6587

6587 -#: read-cache.c:3192

6588 +#: read-cache.c:3213

6589 #, c-format

6590 msgid "unable to open git dir: %s"

6591 msgstr "kunde inte öppna git-katalog: %s"

6592

6592 -#: read-cache.c:3204

6593 +#: read-cache.c:3225

6594 #, c-format

6595 msgid "unable to unlink: %s"

6596 msgstr "misslyckades ta bort länken: %s"

6597

6597 -#: read-cache.c:3233

6598 +#: read-cache.c:3254

6599 #, c-format

6600 msgid "cannot fix permission bits on '%s'"

6601 msgstr "kan inte rätta behörighetsbitar på \"%s\""

6602

6602 -#: read-cache.c:3390

6603 +#: read-cache.c:3411

6604 #, c-format

6605 msgid "%s: cannot drop to stage #0"

6606 msgstr "%s: kan inte återgå till kö 0"

@@ -6723,8 +6724,8 @@ msgstr ""

6724 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

6725 "\n"

6726

6726 -#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3888

6727 -#: sequencer.c:3914 sequencer.c:5711 builtin/fsck.c:328 builtin/gc.c:1789

6727 +#: rebase-interactive.c:113 rerere.c:469 rerere.c:676 sequencer.c:3883

6728 +#: sequencer.c:3909 sequencer.c:5708 builtin/fsck.c:328 builtin/gc.c:1791

6729 #: builtin/rebase.c:190

6730 #, c-format

6731 msgid "could not write '%s'"

@@ -6769,7 +6770,7 @@ msgstr ""

6770 msgid "%s: 'preserve' superseded by 'merges'"

6771 msgstr "%s: \"preserve\" har ersatts av \"merges\""

6772

6772 -#: ref-filter.c:42 wt-status.c:2036

6773 +#: ref-filter.c:42 wt-status.c:2048

6774 msgid "gone"

6775 msgstr "försvunnen"

6776

@@ -6808,7 +6809,8 @@ msgstr "Heltalsvärde förväntades refname:lstrip=%s"

6809 msgid "Integer value expected refname:rstrip=%s"

6810 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

6811

6811 -#: ref-filter.c:265

6812 +#: ref-filter.c:265 ref-filter.c:344 ref-filter.c:377 ref-filter.c:431

6813 +#: ref-filter.c:443 ref-filter.c:462 ref-filter.c:534 ref-filter.c:560

6814 #, c-format

6815 msgid "unrecognized %%(%s) argument: %s"

6816 msgstr "okänt %%(%s)-argument: %s"

@@ -6818,11 +6820,6 @@ msgstr "okänt %%(%s)-argument: %s"

6820 msgid "%%(objecttype) does not take arguments"

6821 msgstr "%%(objecttype) tar inte argument"

6822

6821 -#: ref-filter.c:344

6822 -#, c-format

6823 -msgid "unrecognized %%(objectsize) argument: %s"

6824 -msgstr "okänt %%(objectsize)-argument: %s"

6825 -

6823 #: ref-filter.c:352

6824 #, c-format

6825 msgid "%%(deltabase) does not take arguments"

@@ -6833,11 +6830,6 @@ msgstr "%%(deltabase) tar inte argument"

6830 msgid "%%(body) does not take arguments"

6831 msgstr "%%(body) tar inte argument"

6832

6836 -#: ref-filter.c:377

6837 -#, c-format

6838 -msgid "unrecognized %%(subject) argument: %s"

6839 -msgstr "okänt %%(subject)-argument: %s"

6840 -

6833 #: ref-filter.c:396

6834 #, c-format

6835 msgid "expected %%(trailers:key=<value>)"

@@ -6853,26 +6845,11 @@ msgstr "okänt %%(trailers)-argument: %s"

6845 msgid "positive value expected contents:lines=%s"

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

6847

6856 -#: ref-filter.c:431

6857 -#, c-format

6858 -msgid "unrecognized %%(contents) argument: %s"

6859 -msgstr "okänt %%(contents)-argument: %s"

6860 -

6861 -#: ref-filter.c:443

6862 -#, c-format

6863 -msgid "unrecognized %%(raw) argument: %s"

6864 -msgstr "okänt %%(raw)-argument: %s"

6865 -

6848 #: ref-filter.c:458

6849 #, c-format

6850 msgid "positive value expected '%s' in %%(%s)"

6851 msgstr "positivt värde förväntat \"%s\" i %%(%s)"

6852

6871 -#: ref-filter.c:462

6872 -#, c-format

6873 -msgid "unrecognized argument '%s' in %%(%s)"

6874 -msgstr "okänt argument \"%s\" i %%(%s)"

6875 -

6853 #: ref-filter.c:476

6854 #, c-format

6855 msgid "unrecognized email option: %s"

@@ -6893,21 +6870,11 @@ msgstr "okänd position:%s"

6870 msgid "unrecognized width:%s"

6871 msgstr "okänd bredd:%s"

6872

6896 -#: ref-filter.c:534

6897 -#, c-format

6898 -msgid "unrecognized %%(align) argument: %s"

6899 -msgstr "okänt %%(align)-argument: %s"

6900 -

6873 #: ref-filter.c:542

6874 #, c-format

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

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

6877

6906 -#: ref-filter.c:560

6907 -#, c-format

6908 -msgid "unrecognized %%(if) argument: %s"

6909 -msgstr "okänt %%(if)-argument: %s"

6910 -

6878 #: ref-filter.c:568

6879 #, c-format

6880 msgid "%%(rest) does not take arguments"

@@ -6930,15 +6897,10 @@ msgid ""

6897 msgstr ""

6898 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

6899

6933 -#: ref-filter.c:844

6934 -#, c-format

6935 -msgid "format: %%(if) atom used without a %%(then) atom"

6936 -msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

6937 -

6938 -#: ref-filter.c:910

6900 +#: ref-filter.c:844 ref-filter.c:910 ref-filter.c:946 ref-filter.c:948

6901 #, c-format

6940 -msgid "format: %%(then) atom used without an %%(if) atom"

6941 -msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

6902 +msgid "format: %%(%s) atom used without a %%(%s) atom"

6903 +msgstr "format: atomen %%(%s) använd utan en %%(%s)-atom"

6904

6905 #: ref-filter.c:912

6906 #, c-format

@@ -6950,16 +6912,6 @@ msgstr "format: atomen %%(then) använd mer än en gång"

6912 msgid "format: %%(then) atom used after %%(else)"

6913 msgstr "format: atomen %%(then) använd efter %%(else)"

6914

6953 -#: ref-filter.c:946

6954 -#, c-format

6955 -msgid "format: %%(else) atom used without an %%(if) atom"

6956 -msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

6957 -

6958 -#: ref-filter.c:948

6959 -#, c-format

6960 -msgid "format: %%(else) atom used without a %%(then) atom"

6961 -msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

6962 -

6915 #: ref-filter.c:950

6916 #, c-format

6917 msgid "format: %%(else) atom used more than once"

@@ -7034,22 +6986,22 @@ msgstr "felformat objekt vid \"%s\""

6986 msgid "ignoring ref with broken name %s"

6987 msgstr "ignorerar referens med trasigt namn %s"

6988

7037 -#: ref-filter.c:2250 refs.c:673

6989 +#: ref-filter.c:2250 refs.c:676

6990 #, c-format

6991 msgid "ignoring broken ref %s"

6992 msgstr "ignorerar trasig referens %s"

6993

7042 -#: ref-filter.c:2623

6994 +#: ref-filter.c:2629

6995 #, c-format

6996 msgid "format: %%(end) atom missing"

6997 msgstr "format: atomen %%(end) saknas"

6998

7047 -#: ref-filter.c:2726

6999 +#: ref-filter.c:2740

7000 #, c-format

7001 msgid "malformed object name %s"

7002 msgstr "felformat objektnamn %s"

7003

7052 -#: ref-filter.c:2731

7004 +#: ref-filter.c:2745

7005 #, c-format

7006 msgid "option `%s' must point to a commit"

7007 msgstr "flaggan \"%s\" måste peka på en incheckning"

@@ -7094,71 +7046,71 @@ msgstr "kunde inte hämta \"%s\""

7046 msgid "invalid branch name: %s = %s"

7047 msgstr "felaktigt namn på gren: %s = %s"

7048

7097 -#: refs.c:671

7049 +#: refs.c:674

7050 #, c-format

7051 msgid "ignoring dangling symref %s"

7052 msgstr "ignorerar dinglande symbolisk referens %s"

7053

7102 -#: refs.c:920

7054 +#: refs.c:925

7055 #, c-format

7056 msgid "log for ref %s has gap after %s"

7057 msgstr "loggen för referensen %s har lucka efter %s"

7058

7107 -#: refs.c:927

7059 +#: refs.c:932

7060 #, c-format

7061 msgid "log for ref %s unexpectedly ended on %s"

7062 msgstr "loggen för referensen %s slutade oväntat på %s"

7063

7112 -#: refs.c:992

7064 +#: refs.c:997

7065 #, c-format

7066 msgid "log for %s is empty"

7067 msgstr "loggen för %s är tom"

7068

7117 -#: refs.c:1084

7069 +#: refs.c:1090

7070 #, c-format

7071 msgid "refusing to update ref with bad name '%s'"

7072 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

7073

7122 -#: refs.c:1155

7074 +#: refs.c:1168

7075 #, c-format

7076 msgid "update_ref failed for ref '%s': %s"

7077 msgstr "update_ref misslyckades för referensen \"%s\": %s"

7078

7127 -#: refs.c:2062

7079 +#: refs.c:2069

7080 #, c-format

7081 msgid "multiple updates for ref '%s' not allowed"

7082 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

7083

7132 -#: refs.c:2142

7084 +#: refs.c:2152

7085 msgid "ref updates forbidden inside quarantine environment"

7086 msgstr "referensuppdateringar förbjudna i karantänmiljö"

7087

7136 -#: refs.c:2153

7088 +#: refs.c:2163

7089 msgid "ref updates aborted by hook"

7090 msgstr "referensuppdateringar avbrutna av krok"

7091

7140 -#: refs.c:2253 refs.c:2283

7092 +#: refs.c:2271 refs.c:2301

7093 #, c-format

7094 msgid "'%s' exists; cannot create '%s'"

7095 msgstr "\"%s\" finns; kan inte skapa \"%s\""

7096

7145 -#: refs.c:2259 refs.c:2294

7097 +#: refs.c:2277 refs.c:2312

7098 #, c-format

7099 msgid "cannot process '%s' and '%s' at the same time"

7100 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

7101

7150 -#: refs/files-backend.c:1271

7102 +#: refs/files-backend.c:1268

7103 #, c-format

7104 msgid "could not remove reference %s"

7105 msgstr "kunde inte ta bort referensen %s"

7106

7155 -#: refs/files-backend.c:1285 refs/packed-backend.c:1549

7107 +#: refs/files-backend.c:1282 refs/packed-backend.c:1549

7108 #: refs/packed-backend.c:1559

7109 #, c-format

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

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

7112

7161 -#: refs/files-backend.c:1288 refs/packed-backend.c:1562

7113 +#: refs/files-backend.c:1285 refs/packed-backend.c:1562

7114 #, c-format

7115 msgid "could not delete references: %s"

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

@@ -7168,50 +7120,50 @@ msgstr "kunde inte ta bort referenser: %s"

7120 msgid "invalid refspec '%s'"

7121 msgstr "felaktig referensspecifikation: \"%s\""

7122

7171 -#: remote.c:351

7123 +#: remote.c:402

7124 #, c-format

7125 msgid "config remote shorthand cannot begin with '/': %s"

7126 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"

7127

7176 -#: remote.c:399

7128 +#: remote.c:450

7129 msgid "more than one receivepack given, using the first"

7130 msgstr "mer än en receivepack angavs, använder den första"

7131

7180 -#: remote.c:407

7132 +#: remote.c:458

7133 msgid "more than one uploadpack given, using the first"

7134 msgstr "mer än en uploadpack angavs, använder den första"

7135

7184 -#: remote.c:590

7136 +#: remote.c:699

7137 #, c-format

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

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

7140

7189 -#: remote.c:594

7141 +#: remote.c:703

7142 #, c-format

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

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

7145

7194 -#: remote.c:598

7146 +#: remote.c:707

7147 #, c-format

7148 msgid "%s tracks both %s and %s"

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

7150

7199 -#: remote.c:666

7151 +#: remote.c:775

7152 #, c-format

7153 msgid "key '%s' of pattern had no '*'"

7154 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""

7155

7204 -#: remote.c:676

7156 +#: remote.c:785

7157 #, c-format

7158 msgid "value '%s' of pattern has no '*'"

7159 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""

7160

7209 -#: remote.c:1083

7161 +#: remote.c:1192

7162 #, c-format

7163 msgid "src refspec %s does not match any"

7164 msgstr "käll-referensspecifikationen %s motsvarar ingen"

7165

7214 -#: remote.c:1088

7166 +#: remote.c:1197

7167 #, c-format

7168 msgid "src refspec %s matches more than one"

7169 msgstr "käll-referensspecifikationen %s motsvarar mer än en"

@@ -7220,7 +7172,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"

7172 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

7173 #. the <src>.

7174 #.

7223 -#: remote.c:1103

7175 +#: remote.c:1212

7176 #, c-format

7177 msgid ""

7178 "The destination you provided is not a full refname (i.e.,\n"

@@ -7243,7 +7195,7 @@ msgstr ""

7195 "\n"

7196 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."

7197

7246 -#: remote.c:1123

7198 +#: remote.c:1232

7199 #, c-format

7200 msgid ""

7201 "The <src> part of the refspec is a commit object.\n"

@@ -7254,7 +7206,7 @@ msgstr ""

7206 "Var det meningen att skapa en ny gren genom att sända\n"

7207 "till \"%s:refs/heads/%s\"?"

7208

7257 -#: remote.c:1128

7209 +#: remote.c:1237

7210 #, c-format

7211 msgid ""

7212 "The <src> part of the refspec is a tag object.\n"

@@ -7265,7 +7217,7 @@ msgstr ""

7217 "Var det meningen att skapa en ny tagg genom att sända\n"

7218 "till \"%s:refs/tags/%s\"?"

7219

7268 -#: remote.c:1133

7220 +#: remote.c:1242

7221 #, c-format

7222 msgid ""

7223 "The <src> part of the refspec is a tree object.\n"

@@ -7276,7 +7228,7 @@ msgstr ""

7228 "Var det meningen att tagga ett nytt träd genom att sända\n"

7229 "till \"%s:refs/tags/%s\"?"

7230

7279 -#: remote.c:1138

7231 +#: remote.c:1247

7232 #, c-format

7233 msgid ""

7234 "The <src> part of the refspec is a blob object.\n"

@@ -7287,114 +7239,114 @@ msgstr ""

7239 "Var det meningen att tagga en ny blob genom att sända\n"

7240 "till \"%s:refs/tags/%s\"?"

7241

7290 -#: remote.c:1174

7242 +#: remote.c:1283

7243 #, c-format

7244 msgid "%s cannot be resolved to branch"

7245 msgstr "%s kan inte slås upp till en gren"

7246

7295 -#: remote.c:1185

7247 +#: remote.c:1294

7248 #, c-format

7249 msgid "unable to delete '%s': remote ref does not exist"

7250 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"

7251

7300 -#: remote.c:1197

7252 +#: remote.c:1306

7253 #, c-format

7254 msgid "dst refspec %s matches more than one"

7255 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

7256

7305 -#: remote.c:1204

7257 +#: remote.c:1313

7258 #, c-format

7259 msgid "dst ref %s receives from more than one src"

7260 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

7261

7310 -#: remote.c:1724 remote.c:1825

7262 +#: remote.c:1834 remote.c:1941

7263 msgid "HEAD does not point to a branch"

7264 msgstr "HEAD pekar inte på en gren"

7265

7314 -#: remote.c:1733

7266 +#: remote.c:1843

7267 #, c-format

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

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

7270

7319 -#: remote.c:1736

7271 +#: remote.c:1846

7272 #, c-format

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

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

7275

7324 -#: remote.c:1742

7276 +#: remote.c:1852

7277 #, c-format

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

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

7280

7329 -#: remote.c:1757

7281 +#: remote.c:1867

7282 #, c-format

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

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

7285

7334 -#: remote.c:1769

7286 +#: remote.c:1882

7287 #, c-format

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

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

7290

7339 -#: remote.c:1779

7291 +#: remote.c:1892

7292 #, c-format

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

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

7295

7344 -#: remote.c:1792

7296 +#: remote.c:1905

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

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

7299

7348 -#: remote.c:1814

7300 +#: remote.c:1927

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

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

7303

7352 -#: remote.c:1943

7304 +#: remote.c:2060

7305 #, c-format

7306 msgid "couldn't find remote ref %s"

7307 msgstr "Kunde inte hitta fjärr-referensen %s"

7308

7357 -#: remote.c:1956

7309 +#: remote.c:2073

7310 #, c-format

7311 msgid "* Ignoring funny ref '%s' locally"

7312 msgstr "* Ignorerar märklig referens \"%s\" lokalt"

7313

7362 -#: remote.c:2119

7314 +#: remote.c:2236

7315 #, c-format

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

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

7318

7367 -#: remote.c:2123

7319 +#: remote.c:2240

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

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

7322

7371 -#: remote.c:2126

7323 +#: remote.c:2243

7324 #, c-format

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

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

7327

7376 -#: remote.c:2130

7328 +#: remote.c:2247

7329 #, c-format

7330 msgid "Your branch and '%s' refer to different commits.\n"

7331 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

7332

7381 -#: remote.c:2133

7333 +#: remote.c:2250

7334 #, c-format

7335 msgid " (use \"%s\" for details)\n"

7336 msgstr " (använd \"%s\" för detaljer)\n"

7337

7386 -#: remote.c:2137

7338 +#: remote.c:2254

7339 #, c-format

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

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

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

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

7344

7393 -#: remote.c:2143

7345 +#: remote.c:2260

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

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

7348

7397 -#: remote.c:2146

7349 +#: remote.c:2263

7350 #, c-format

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

7352 msgid_plural ""

@@ -7404,11 +7356,11 @@ msgstr[0] ""

7356 msgstr[1] ""

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

7358

7407 -#: remote.c:2154

7359 +#: remote.c:2271

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

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

7362

7411 -#: remote.c:2157

7363 +#: remote.c:2274

7364 #, c-format

7365 msgid ""

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

@@ -7423,11 +7375,11 @@ msgstr[1] ""

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

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

7377

7426 -#: remote.c:2167

7378 +#: remote.c:2284

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

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

7381

7430 -#: remote.c:2359

7382 +#: remote.c:2476

7383 #, c-format

7384 msgid "cannot parse expected object name '%s'"

7385 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -7460,7 +7412,7 @@ msgstr "kunde inte skriva rerere-post"

7412 msgid "there were errors while writing '%s' (%s)"

7413 msgstr "fel vid skrivning av \"%s\" (%s)"

7414

7463 -#: rerere.c:482 builtin/gc.c:2246 builtin/gc.c:2281

7415 +#: rerere.c:482 builtin/gc.c:2263 builtin/gc.c:2298

7416 #, c-format

7417 msgid "failed to flush '%s'"

7418 msgstr "misslyckades spola \"%s\""

@@ -7505,8 +7457,8 @@ msgstr "kan inte ta bort lös länk \"%s\""

7457 msgid "Recorded preimage for '%s'"

7458 msgstr "Sparade förhandsbild för \"%s\""

7459

7508 -#: rerere.c:865 submodule.c:2121 builtin/log.c:2002

7509 -#: builtin/submodule--helper.c:1776 builtin/submodule--helper.c:1819

7460 +#: rerere.c:865 submodule.c:2121 builtin/log.c:2017

7461 +#: builtin/submodule--helper.c:1777 builtin/submodule--helper.c:1820

7462 #, c-format

7463 msgid "could not create directory '%s'"

7464 msgstr "kunde inte skapa katalogen \"%s\""

@@ -7544,37 +7496,29 @@ msgstr "kan inte uppdatera katalogen rr-cache"

7496 msgid "could not determine HEAD revision"

7497 msgstr "kunde inte bestämma HEAD-revision"

7498

7547 -#: reset.c:70 reset.c:76 sequencer.c:3705

7499 +#: reset.c:70 reset.c:76 sequencer.c:3700

7500 #, c-format

7501 msgid "failed to find tree of %s"

7502 msgstr "kunde inte hitta trädet för %s."

7503

7552 -#: revision.c:2259

7553 -msgid "--unsorted-input is incompatible with --no-walk"

7554 -msgstr "--unsorted-input är inkompatibelt med --no-walk"

7555 -

7556 -#: revision.c:2346

7504 +#: revision.c:2347

7505 msgid "--unpacked=<packfile> no longer supported"

7506 msgstr "--unpacked=<paketfil> stöds inte längre"

7507

7560 -#: revision.c:2655 revision.c:2659

7561 -msgid "--no-walk is incompatible with --unsorted-input"

7562 -msgstr "--no-walk är inkompatibelt med --unsorted-input"

7563 -

7564 -#: revision.c:2690

7508 +#: revision.c:2686

7509 msgid "your current branch appears to be broken"

7510 msgstr "din nuvarande gren verkar vara trasig"

7511

7568 -#: revision.c:2693

7512 +#: revision.c:2689

7513 #, c-format

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

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

7516

7573 -#: revision.c:2895

7517 +#: revision.c:2891

7518 msgid "-L does not yet support diff formats besides -p and -s"

7519 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

7520

7577 -#: run-command.c:1278

7521 +#: run-command.c:1262

7522 #, c-format

7523 msgid "cannot create async thread: %s"

7524 msgstr "kan inte skapa asynkron tråd: %s"

@@ -7639,8 +7583,8 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

7583 msgid "could not delete '%s'"

7584 msgstr "kunde inte ta bort \"%s\""

7585

7642 -#: sequencer.c:345 sequencer.c:4754 builtin/rebase.c:563 builtin/rebase.c:1297

7643 -#: builtin/rm.c:408

7586 +#: sequencer.c:345 sequencer.c:4751 builtin/rebase.c:563 builtin/rebase.c:1297

7587 +#: builtin/rm.c:409

7588 #, c-format

7589 msgid "could not remove '%s'"

7590 msgstr "kunde inte ta bort \"%s\""

@@ -7702,13 +7646,13 @@ msgstr ""

7646 "För att avbryta och återgå till där du var före \"git revert\",\n"

7647 "kör \"git revert --abort\"."

7648

7705 -#: sequencer.c:448 sequencer.c:3290

7649 +#: sequencer.c:448 sequencer.c:3292

7650 #, c-format

7651 msgid "could not lock '%s'"

7652 msgstr "kunde inte låsa \"%s\""

7653

7710 -#: sequencer.c:450 sequencer.c:3089 sequencer.c:3294 sequencer.c:3308

7711 -#: sequencer.c:3566 sequencer.c:5621 strbuf.c:1176 wrapper.c:639

7654 +#: sequencer.c:450 sequencer.c:3091 sequencer.c:3296 sequencer.c:3310

7655 +#: sequencer.c:3561 sequencer.c:5618 strbuf.c:1188 wrapper.c:639

7656 #, c-format

7657 msgid "could not write to '%s'"

7658 msgstr "kunde inte skriva till \"%s\""

@@ -7718,12 +7662,18 @@ msgstr "kunde inte skriva till \"%s\""

7662 msgid "could not write eol to '%s'"

7663 msgstr "kunde inte skriva radslut till \"%s\""

7664

7721 -#: sequencer.c:460 sequencer.c:3094 sequencer.c:3296 sequencer.c:3310

7722 -#: sequencer.c:3574

7665 +#: sequencer.c:460 sequencer.c:3096 sequencer.c:3298 sequencer.c:3312

7666 +#: sequencer.c:3569

7667 #, c-format

7668 msgid "failed to finalize '%s'"

7669 msgstr "misslyckades färdigställa \"%s\""

7670

7671 +#: sequencer.c:473 sequencer.c:1934 sequencer.c:3116 sequencer.c:3551

7672 +#: sequencer.c:3679 builtin/am.c:289 builtin/commit.c:834 builtin/merge.c:1148

7673 +#, c-format

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

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

7676 +

7677 #: sequencer.c:499

7678 #, c-format

7679 msgid "your local changes would be overwritten by %s."

@@ -7738,7 +7688,7 @@ msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."

7688 msgid "%s: fast-forward"

7689 msgstr "%s: snabbspola"

7690

7741 -#: sequencer.c:574 builtin/tag.c:610

7691 +#: sequencer.c:574 builtin/tag.c:614

7692 #, c-format

7693 msgid "Invalid cleanup mode %s"

7694 msgstr "Felaktigt städningsläge %s"

@@ -7769,8 +7719,8 @@ msgstr "ingen nyckel i \"%.*s\""

7719 msgid "unable to dequote value of '%s'"

7720 msgstr "kan inte ta bort citering av värdet \"%s\""

7721

7772 -#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:730

7773 -#: builtin/am.c:822 builtin/rebase.c:694

7722 +#: sequencer.c:841 wrapper.c:209 wrapper.c:379 builtin/am.c:756

7723 +#: builtin/am.c:848 builtin/rebase.c:694

7724 #, c-format

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

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

@@ -7833,11 +7783,11 @@ msgstr ""

7783 "\n"

7784 " git rebase --continue\n"

7785

7836 -#: sequencer.c:1229

7786 +#: sequencer.c:1225

7787 msgid "'prepare-commit-msg' hook failed"

7788 msgstr "kroken \"prepare-commit-msg\" misslyckades"

7789

7840 -#: sequencer.c:1235

7790 +#: sequencer.c:1231

7791 msgid ""

7792 "Your name and email address were configured automatically based\n"

7793 "on your username and hostname. Please check that they are accurate.\n"

@@ -7864,7 +7814,7 @@ msgstr ""

7814 "\n"

7815 " git commit --amend --reset-author\n"

7816

7867 -#: sequencer.c:1248

7817 +#: sequencer.c:1244

7818 msgid ""

7819 "Your name and email address were configured automatically based\n"

7820 "on your username and hostname. Please check that they are accurate.\n"

@@ -7889,350 +7839,350 @@ msgstr ""

7839 "\n"

7840 " git commit --amend --reset-author\n"

7841

7892 -#: sequencer.c:1290

7842 +#: sequencer.c:1288

7843 msgid "couldn't look up newly created commit"

7844 msgstr "kunde inte slå upp en precis skapad incheckning"

7845

7896 -#: sequencer.c:1292

7846 +#: sequencer.c:1290

7847 msgid "could not parse newly created commit"

7848 msgstr "kunde inte tolka en precis skapad incheckning"

7849

7900 -#: sequencer.c:1338

7850 +#: sequencer.c:1339

7851 msgid "unable to resolve HEAD after creating commit"

7852 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

7853

7904 -#: sequencer.c:1340

7854 +#: sequencer.c:1342

7855 msgid "detached HEAD"

7856 msgstr "frånkopplad HEAD"

7857

7908 -#: sequencer.c:1344

7858 +#: sequencer.c:1346

7859 msgid " (root-commit)"

7860 msgstr " (rotincheckning)"

7861

7912 -#: sequencer.c:1365

7862 +#: sequencer.c:1367

7863 msgid "could not parse HEAD"

7864 msgstr "kunde inte tolka HEAD"

7865

7916 -#: sequencer.c:1367

7866 +#: sequencer.c:1369

7867 #, c-format

7868 msgid "HEAD %s is not a commit!"

7869 msgstr "HEAD %s är inte en incheckning!"

7870

7921 -#: sequencer.c:1371 sequencer.c:1449 builtin/commit.c:1707

7871 +#: sequencer.c:1373 sequencer.c:1451 builtin/commit.c:1708

7872 msgid "could not parse HEAD commit"

7873 msgstr "kunde inte tolka HEAD:s incheckning"

7874

7925 -#: sequencer.c:1427 sequencer.c:2312

7875 +#: sequencer.c:1429 sequencer.c:2314

7876 msgid "unable to parse commit author"

7877 msgstr "kunde inte tolka incheckningens författare"

7878

7929 -#: sequencer.c:1438 builtin/am.c:1616 builtin/merge.c:708

7879 +#: sequencer.c:1440 builtin/am.c:1643 builtin/merge.c:710

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

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

7882

7933 -#: sequencer.c:1471 sequencer.c:1591

7883 +#: sequencer.c:1473 sequencer.c:1593

7884 #, c-format

7885 msgid "unable to read commit message from '%s'"

7886 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

7887

7938 -#: sequencer.c:1502 sequencer.c:1534

7888 +#: sequencer.c:1504 sequencer.c:1536

7889 #, c-format

7890 msgid "invalid author identity '%s'"

7891 msgstr "ogiltig författar-identitet \"%s\""

7892

7943 -#: sequencer.c:1508

7893 +#: sequencer.c:1510

7894 msgid "corrupt author: missing date information"

7895 msgstr "trasig författare: saknar datuminformation"

7896

7947 -#: sequencer.c:1547 builtin/am.c:1643 builtin/commit.c:1821 builtin/merge.c:913

7948 -#: builtin/merge.c:938 t/helper/test-fast-rebase.c:78

7897 +#: sequencer.c:1549 builtin/am.c:1670 builtin/commit.c:1822 builtin/merge.c:915

7898 +#: builtin/merge.c:940 t/helper/test-fast-rebase.c:78

7899 msgid "failed to write commit object"

7900 msgstr "kunde inte skriva incheckningsobjekt"

7901

7952 -#: sequencer.c:1574 sequencer.c:4526 t/helper/test-fast-rebase.c:199

7902 +#: sequencer.c:1576 sequencer.c:4523 t/helper/test-fast-rebase.c:199

7903 #: t/helper/test-fast-rebase.c:217

7904 #, c-format

7905 msgid "could not update %s"

7906 msgstr "kunde inte uppdatera %s"

7907

7958 -#: sequencer.c:1623

7908 +#: sequencer.c:1625

7909 #, c-format

7910 msgid "could not parse commit %s"

7911 msgstr "kunde inte tolka incheckningen %s"

7912

7963 -#: sequencer.c:1628

7913 +#: sequencer.c:1630

7914 #, c-format

7915 msgid "could not parse parent commit %s"

7916 msgstr "kunde inte tolka föräldraincheckningen %s"

7917

7968 -#: sequencer.c:1711 sequencer.c:1992

7918 +#: sequencer.c:1713 sequencer.c:1994

7919 #, c-format

7920 msgid "unknown command: %d"

7921 msgstr "okänt kommando: %d"

7922

7973 -#: sequencer.c:1753

7923 +#: sequencer.c:1755

7924 msgid "This is the 1st commit message:"

7925 msgstr "Det här är 1:a incheckningsmeddelandet:"

7926

7977 -#: sequencer.c:1754

7927 +#: sequencer.c:1756

7928 #, c-format

7929 msgid "This is the commit message #%d:"

7930 msgstr "Det här är incheckningsmeddelande %d:"

7931

7982 -#: sequencer.c:1755

7932 +#: sequencer.c:1757

7933 msgid "The 1st commit message will be skipped:"

7934 msgstr "1:a incheckningsmeddelandet kommer hoppas över:"

7935

7986 -#: sequencer.c:1756

7936 +#: sequencer.c:1758

7937 #, c-format

7938 msgid "The commit message #%d will be skipped:"

7939 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

7940

7991 -#: sequencer.c:1757

7941 +#: sequencer.c:1759

7942 #, c-format

7943 msgid "This is a combination of %d commits."

7944 msgstr "Det här är en kombination av %d incheckningar."

7945

7996 -#: sequencer.c:1904 sequencer.c:1961

7946 +#: sequencer.c:1906 sequencer.c:1963

7947 #, c-format

7948 msgid "cannot write '%s'"

7949 msgstr "kan inte skriva \"%s\""

7950

8001 -#: sequencer.c:1951

7951 +#: sequencer.c:1953

7952 msgid "need a HEAD to fixup"

7953 msgstr "behöver en HEAD-incheckning att rätta"

7954

8005 -#: sequencer.c:1953 sequencer.c:3601

7955 +#: sequencer.c:1955 sequencer.c:3596

7956 msgid "could not read HEAD"

7957 msgstr "kunde inte läsa HEAD"

7958

8009 -#: sequencer.c:1955

7959 +#: sequencer.c:1957

7960 msgid "could not read HEAD's commit message"

7961 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

7962

8013 -#: sequencer.c:1979

l10n: sv.po: Update Swedish translation (5196t0f0u)