4a81e9cd6d · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2018-09-04 08:50+0800\n"

11 -"PO-Revision-Date: 2018-09-04 22:32+0100\n"

10 +"POT-Creation-Date: 2018-11-20 10:05+0800\n"

11 +"PO-Revision-Date: 2018-11-29 12:54+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"

@@ -18,47 +18,47 @@ msgstr ""

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

19 "X-Generator: Gtranslator 2.91.7\n"

20

21 -#: advice.c:97

21 +#: advice.c:99

22 #, c-format

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

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

25

26 -#: advice.c:150

26 +#: advice.c:152

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

28 msgstr ""

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

30 "samman."

31

32 -#: advice.c:152

32 +#: advice.c:154

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

34 msgstr ""

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

36 "samman."

37

38 -#: advice.c:154

38 +#: advice.c:156

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

40 msgstr ""

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

42 "samman."

43

44 -#: advice.c:156

44 +#: advice.c:158

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

46 msgstr ""

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

48

49 -#: advice.c:158

49 +#: advice.c:160

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

51 msgstr ""

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

53 "samman."

54

55 -#: advice.c:160

55 +#: advice.c:162

56 #, c-format

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

58 msgstr ""

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

60

61 -#: advice.c:168

61 +#: advice.c:170

62 msgid ""

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

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

@@ -66,23 +66,23 @@ msgstr ""

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

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

68

69 -#: advice.c:176

69 +#: advice.c:178

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:181 builtin/merge.c:1286

73 +#: advice.c:183 builtin/merge.c:1289

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

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

76

77 -#: advice.c:183

77 +#: advice.c:185

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

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

80

81 -#: advice.c:184

81 +#: advice.c:186

82 msgid "Exiting because of unfinished merge."

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

84

85 -#: advice.c:190

85 +#: advice.c:192

86 #, c-format

87 msgid ""

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

@@ -181,22 +181,22 @@ msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"

181 msgid "invalid mode on line %d: %s"

182 msgstr "ogiltigt läge på rad %d: %s"

183

184 -#: apply.c:1306

184 +#: apply.c:1307

185 #, c-format

186 msgid "inconsistent header lines %d and %d"

187 msgstr "huvudet är inkonsekvent mellan rad %d och %d"

188

189 -#: apply.c:1478

189 +#: apply.c:1479

190 #, c-format

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

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

193

194 -#: apply.c:1547

194 +#: apply.c:1548

195 #, c-format

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

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

198

199 -#: apply.c:1567

199 +#: apply.c:1568

200 #, c-format

201 msgid ""

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

@@ -212,82 +212,82 @@ msgstr[1] ""

212 "sökvägskomponenter\n"

213 "tas bort (rad %d)"

214

215 -#: apply.c:1580

215 +#: apply.c:1581

216 #, c-format

217 msgid "git diff header lacks filename information (line %d)"

218 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"

219

220 -#: apply.c:1768

220 +#: apply.c:1769

221 msgid "new file depends on old contents"

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

223

224 -#: apply.c:1770

224 +#: apply.c:1771

225 msgid "deleted file still has contents"

226 msgstr "borttagen fil har fortfarande innehåll"

227

228 -#: apply.c:1804

228 +#: apply.c:1805

229 #, c-format

230 msgid "corrupt patch at line %d"

231 msgstr "trasig patch på rad %d"

232

233 -#: apply.c:1841

233 +#: apply.c:1842

234 #, c-format

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

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

237

238 -#: apply.c:1843

238 +#: apply.c:1844

239 #, c-format

240 msgid "deleted file %s still has contents"

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

242

243 -#: apply.c:1846

243 +#: apply.c:1847

244 #, c-format

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

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

247

248 -#: apply.c:1993

248 +#: apply.c:1994

249 #, c-format

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

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

252

253 -#: apply.c:2030

253 +#: apply.c:2031

254 #, c-format

255 msgid "unrecognized binary patch at line %d"

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

257

258 -#: apply.c:2190

258 +#: apply.c:2193

259 #, c-format

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

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

262

263 -#: apply.c:2276

263 +#: apply.c:2279

264 #, c-format

265 msgid "unable to read symlink %s"

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

267

268 -#: apply.c:2280

268 +#: apply.c:2283

269 #, c-format

270 msgid "unable to open or read %s"

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

272

273 -#: apply.c:2939

273 +#: apply.c:2942

274 #, c-format

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

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

277

278 -#: apply.c:3060

278 +#: apply.c:3063

279 #, c-format

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

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

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

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

284

285 -#: apply.c:3072

285 +#: apply.c:3075

286 #, c-format

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

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

289

290 -#: apply.c:3078

290 +#: apply.c:3081

291 #, c-format

292 msgid ""

293 "while searching for:\n"

@@ -296,25 +296,25 @@ msgstr ""

296 "vid sökning efter:\n"

297 "%.*s"

298

299 -#: apply.c:3100

299 +#: apply.c:3103

300 #, c-format

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

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

303

304 -#: apply.c:3108

304 +#: apply.c:3111

305 #, c-format

306 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

307 msgstr ""

308 "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"

309 "\""

310

311 -#: apply.c:3154

311 +#: apply.c:3158

312 #, c-format

313 msgid "cannot apply binary patch to '%s' without full index line"

314 msgstr ""

315 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"

316

317 -#: apply.c:3164

317 +#: apply.c:3168

318 #, c-format

319 msgid ""

320 "the patch applies to '%s' (%s), which does not match the current contents."

@@ -322,425 +322,426 @@ msgstr ""

322 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "

323 "innehållet."

324

325 -#: apply.c:3172

325 +#: apply.c:3176

326 #, c-format

327 msgid "the patch applies to an empty '%s' but it is not empty"

328 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"

329

330 -#: apply.c:3190

330 +#: apply.c:3194

331 #, c-format

332 msgid "the necessary postimage %s for '%s' cannot be read"

333 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"

334

335 -#: apply.c:3203

335 +#: apply.c:3207

336 #, c-format

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

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

339

340 -#: apply.c:3209

340 +#: apply.c:3213

341 #, c-format

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

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

344

345 -#: apply.c:3230

345 +#: apply.c:3234

346 #, c-format

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

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

349

350 -#: apply.c:3352

350 +#: apply.c:3356

351 #, c-format

352 msgid "cannot checkout %s"

353 msgstr "kan inte checka ut %s"

354

355 -#: apply.c:3404 apply.c:3415 apply.c:3461 setup.c:278

355 +#: apply.c:3408 apply.c:3419 apply.c:3465 midx.c:58 setup.c:278

356 #, c-format

357 msgid "failed to read %s"

358 msgstr "misslyckades läsa %s"

359

360 -#: apply.c:3412

360 +#: apply.c:3416

361 #, c-format

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

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

364

365 -#: apply.c:3441 apply.c:3681

365 +#: apply.c:3445 apply.c:3688

366 #, c-format

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

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

369

370 -#: apply.c:3524 apply.c:3696

370 +#: apply.c:3531 apply.c:3703

371 #, c-format

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

373 msgstr "%s: finns inte i indexet"

374

375 -#: apply.c:3533 apply.c:3704

375 +#: apply.c:3540 apply.c:3711

376 #, c-format

377 msgid "%s: does not match index"

378 msgstr "%s: motsvarar inte indexet"

379

380 -#: apply.c:3568

380 +#: apply.c:3575

381 msgid "repository lacks the necessary blob to fall back on 3-way merge."

382 msgstr ""

383 "arkivet saknar objekt som behövs för att falla tillbaka på 3-"

384 "vägssammanslagning."

385

386 -#: apply.c:3571

386 +#: apply.c:3578

387 #, c-format

388 msgid "Falling back to three-way merge...\n"

389 msgstr "Faller tillbaka på trevägssammanslagning...\n"

390

391 -#: apply.c:3587 apply.c:3591

391 +#: apply.c:3594 apply.c:3598

392 #, c-format

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

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

395

396 -#: apply.c:3603

396 +#: apply.c:3610

397 #, c-format

398 msgid "Failed to fall back on three-way merge...\n"

399 msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"

400

401 -#: apply.c:3617

401 +#: apply.c:3624

402 #, c-format

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

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

405

406 -#: apply.c:3622

406 +#: apply.c:3629

407 #, c-format

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

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

410

411 -#: apply.c:3648

411 +#: apply.c:3655

412 msgid "removal patch leaves file contents"

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

414

415 -#: apply.c:3721

415 +#: apply.c:3728

416 #, c-format

417 msgid "%s: wrong type"

418 msgstr "%s: fel typ"

419

420 -#: apply.c:3723

420 +#: apply.c:3730

421 #, c-format

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

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

424

425 -#: apply.c:3874 apply.c:3876

425 +#: apply.c:3881 apply.c:3883

426 #, c-format

427 msgid "invalid path '%s'"

428 msgstr "ogiltig sökväg ”%s”"

429

430 -#: apply.c:3932

430 +#: apply.c:3939

431 #, c-format

432 msgid "%s: already exists in index"

433 msgstr "%s: finns redan i indexet"

434

435 -#: apply.c:3935

435 +#: apply.c:3942

436 #, c-format

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

438 msgstr "%s: finns redan i arbetskatalogen"

439

440 -#: apply.c:3955

440 +#: apply.c:3962

441 #, c-format

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

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

444

445 -#: apply.c:3960

445 +#: apply.c:3967

446 #, c-format

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

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

449

450 -#: apply.c:3980

450 +#: apply.c:3987

451 #, c-format

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

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

454

455 -#: apply.c:3984

455 +#: apply.c:3991

456 #, c-format

457 msgid "%s: patch does not apply"

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

459

460 -#: apply.c:3999

460 +#: apply.c:4006

461 #, c-format

462 msgid "Checking patch %s..."

463 msgstr "Kontrollerar patchen %s..."

464

465 -#: apply.c:4091

465 +#: apply.c:4098

466 #, c-format

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

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

469

470 -#: apply.c:4098

470 +#: apply.c:4105

471 #, c-format

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

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

474

475 -#: apply.c:4101

475 +#: apply.c:4108

476 #, c-format

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

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

479

480 -#: apply.c:4106 builtin/checkout.c:237 builtin/reset.c:140

480 +#: apply.c:4113 builtin/checkout.c:244 builtin/reset.c:142

481 #, c-format

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

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

484

485 -#: apply.c:4110

485 +#: apply.c:4117

486 #, c-format

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

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

489

490 -#: apply.c:4120

490 +#: apply.c:4127

491 #, c-format

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

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

494

495 -#: apply.c:4258

495 +#: apply.c:4265

496 #, c-format

497 msgid "unable to remove %s from index"

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

499

500 -#: apply.c:4292

500 +#: apply.c:4299

501 #, c-format

502 msgid "corrupt patch for submodule %s"

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

504

505 -#: apply.c:4298

505 +#: apply.c:4305

506 #, c-format

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

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

509

510 -#: apply.c:4306

510 +#: apply.c:4313

511 #, c-format

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

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

514

515 -#: apply.c:4312 apply.c:4457

515 +#: apply.c:4319 apply.c:4464

516 #, c-format

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

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

519

520 -#: apply.c:4355

520 +#: apply.c:4362

521 #, c-format

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

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

524

525 -#: apply.c:4359

525 +#: apply.c:4366

526 #, c-format

527 msgid "closing file '%s'"

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

529

530 -#: apply.c:4429

530 +#: apply.c:4436

531 #, c-format

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

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

534

535 -#: apply.c:4527

535 +#: apply.c:4534

536 #, c-format

537 msgid "Applied patch %s cleanly."

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

539

540 -#: apply.c:4535

540 +#: apply.c:4542

541 msgid "internal error"

542 msgstr "internt fel"

543

544 -#: apply.c:4538

544 +#: apply.c:4545

545 #, c-format

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

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

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

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

550

551 -#: apply.c:4549

551 +#: apply.c:4556

552 #, c-format

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

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

555

556 -#: apply.c:4557 builtin/fetch.c:780 builtin/fetch.c:1048

556 +#: apply.c:4564 builtin/fetch.c:843 builtin/fetch.c:1122

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

560

561 -#: apply.c:4571

561 +#: apply.c:4578

562 #, c-format

563 msgid "Hunk #%d applied cleanly."

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

565

566 -#: apply.c:4575

566 +#: apply.c:4582

567 #, c-format

568 msgid "Rejected hunk #%d."

569 msgstr "Refuserar stycke %d."

570

571 -#: apply.c:4685

571 +#: apply.c:4692

572 #, c-format

573 msgid "Skipped patch '%s'."

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

575

576 -#: apply.c:4693

576 +#: apply.c:4700

577 msgid "unrecognized input"

578 msgstr "indata känns inte igen"

579

580 -#: apply.c:4712

580 +#: apply.c:4719

581 msgid "unable to read index file"

582 msgstr "kan inte läsa indexfilen"

583

584 -#: apply.c:4849

584 +#: apply.c:4874

585 #, c-format

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

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

588

589 -#: apply.c:4876

589 +#: apply.c:4901

590 #, c-format

591 msgid "squelched %d whitespace error"

592 msgid_plural "squelched %d whitespace errors"

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

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

595

596 -#: apply.c:4882 apply.c:4897

596 +#: apply.c:4907 apply.c:4922

597 #, c-format

598 msgid "%d line adds whitespace errors."

599 msgid_plural "%d lines add whitespace errors."

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

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

602

603 -#: apply.c:4890

603 +#: apply.c:4915

604 #, c-format

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

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

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

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

609

610 -#: apply.c:4906 builtin/add.c:539 builtin/mv.c:300 builtin/rm.c:389

610 +#: apply.c:4931 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

611 msgid "Unable to write new index file"

612 msgstr "Kunde inte skriva ny indexfil"

613

614 -#: apply.c:4933 apply.c:4936 builtin/am.c:2254 builtin/am.c:2257

615 -#: builtin/clone.c:121 builtin/fetch.c:115 builtin/merge.c:260

616 -#: builtin/pull.c:198 builtin/submodule--helper.c:406

617 -#: builtin/submodule--helper.c:1355 builtin/submodule--helper.c:1358

618 -#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732

619 -#: builtin/submodule--helper.c:1952 git-add--interactive.perl:197

614 +#: apply.c:4958 apply.c:4961 builtin/am.c:2209 builtin/am.c:2212

615 +#: builtin/clone.c:121 builtin/fetch.c:118 builtin/merge.c:262

616 +#: builtin/pull.c:199 builtin/submodule--helper.c:406

617 +#: builtin/submodule--helper.c:1362 builtin/submodule--helper.c:1365

618 +#: builtin/submodule--helper.c:1846 builtin/submodule--helper.c:1849

619 +#: builtin/submodule--helper.c:2088 git-add--interactive.perl:197

620 msgid "path"

621 msgstr "sökväg"

622

623 -#: apply.c:4934

623 +#: apply.c:4959

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

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

626

627 -#: apply.c:4937

627 +#: apply.c:4962

628 msgid "apply changes matching the given path"

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

630

631 -#: apply.c:4939 builtin/am.c:2263

631 +#: apply.c:4964 builtin/am.c:2218

632 msgid "num"

633 msgstr "antal"

634

635 -#: apply.c:4940

635 +#: apply.c:4965

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

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

638

639 -#: apply.c:4943

639 +#: apply.c:4968

640 msgid "ignore additions made by the patch"

641 msgstr "ignorera tillägg gjorda av patchen"

642

643 -#: apply.c:4945

643 +#: apply.c:4970

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

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

646

647 -#: apply.c:4949

647 +#: apply.c:4974

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

649 msgstr "visa antal tillagda och borttagna rader decimalt"

650

651 -#: apply.c:4951

651 +#: apply.c:4976

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

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

654

655 -#: apply.c:4953

655 +#: apply.c:4978

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

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

658

659 -#: apply.c:4955

659 +#: apply.c:4980

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

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

662

663 -#: apply.c:4957

663 +#: apply.c:4982

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

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

666

667 -#: apply.c:4959

667 +#: apply.c:4984

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

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

670

671 -#: apply.c:4961

671 +#: apply.c:4986

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

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

674

675 -#: apply.c:4964

675 +#: apply.c:4989

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

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

678

679 -#: apply.c:4966

679 +#: apply.c:4991

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

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

682

683 -#: apply.c:4968

683 +#: apply.c:4993

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

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

686

687 -#: apply.c:4971 builtin/checkout-index.c:168 builtin/ls-files.c:516

687 +#: apply.c:4996 builtin/checkout-index.c:170 builtin/ls-files.c:523

688 msgid "paths are separated with NUL character"

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

690

691 -#: apply.c:4973

691 +#: apply.c:4998

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

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

694

695 -#: apply.c:4974 builtin/am.c:2242 builtin/interpret-trailers.c:95

696 -#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

697 -#: builtin/pack-objects.c:3202

695 +#: apply.c:4999 builtin/am.c:2197 builtin/interpret-trailers.c:97

696 +#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101

697 +#: builtin/pack-objects.c:3310 builtin/rebase.c:839

698 msgid "action"

699 msgstr "åtgärd"

700

701 -#: apply.c:4975

701 +#: apply.c:5000

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

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

704

705 -#: apply.c:4978 apply.c:4981

705 +#: apply.c:5003 apply.c:5006

706 msgid "ignore changes in whitespace when finding context"

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

708

709 -#: apply.c:4984

709 +#: apply.c:5009

710 msgid "apply the patch in reverse"

711 msgstr "tillämpa patchen baklänges"

712

713 -#: apply.c:4986

713 +#: apply.c:5011

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

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

716

717 -#: apply.c:4988

717 +#: apply.c:5013

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

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

720

721 -#: apply.c:4990

721 +#: apply.c:5015

722 msgid "allow overlapping hunks"

723 msgstr "tillåt överlappande stycken"

724

725 -#: apply.c:4991 builtin/add.c:290 builtin/check-ignore.c:21

726 -#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:671

727 -#: builtin/log.c:1914 builtin/mv.c:122 builtin/read-tree.c:124

725 +#: apply.c:5016 builtin/add.c:290 builtin/check-ignore.c:21

726 +#: builtin/commit.c:1309 builtin/count-objects.c:98 builtin/fsck.c:698

727 +#: builtin/log.c:2023 builtin/mv.c:122 builtin/read-tree.c:127

728 +#: builtin/rebase--interactive.c:157

729 msgid "be verbose"

730 msgstr "var pratsam"

731

731 -#: apply.c:4993

732 +#: apply.c:5018

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

734 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

735

735 -#: apply.c:4996

736 +#: apply.c:5021

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

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

739

739 -#: apply.c:4998 builtin/am.c:2251

740 +#: apply.c:5023 builtin/am.c:2206

741 msgid "root"

742 msgstr "rot"

743

743 -#: apply.c:4999

744 +#: apply.c:5024

745 msgid "prepend <root> to all filenames"

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

747

@@ -763,114 +764,114 @@ msgstr ""

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

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

766

766 -#: archive.c:363 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:298

767 +#: archive.c:370 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

768 #, c-format

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

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

771

771 -#: archive.c:446

772 +#: archive.c:453

773 msgid "fmt"

774 msgstr "fmt"

775

775 -#: archive.c:446

776 +#: archive.c:453

777 msgid "archive format"

778 msgstr "arkivformat"

779

779 -#: archive.c:447 builtin/log.c:1473

780 +#: archive.c:454 builtin/log.c:1536

781 msgid "prefix"

782 msgstr "prefix"

783

783 -#: archive.c:448

784 +#: archive.c:455

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

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

787

787 -#: archive.c:449 builtin/blame.c:816 builtin/blame.c:817 builtin/config.c:126

788 -#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:873

789 -#: builtin/hash-object.c:104 builtin/ls-files.c:552 builtin/ls-files.c:555

790 -#: builtin/notes.c:407 builtin/notes.c:570 builtin/read-tree.c:119

791 -#: parse-options.h:165

788 +#: archive.c:456 builtin/blame.c:820 builtin/blame.c:821 builtin/config.c:129

789 +#: builtin/fast-export.c:1013 builtin/fast-export.c:1015 builtin/grep.c:884

790 +#: builtin/hash-object.c:104 builtin/ls-files.c:559 builtin/ls-files.c:562

791 +#: builtin/notes.c:412 builtin/notes.c:575 builtin/read-tree.c:122

792 +#: parse-options.h:162

793 msgid "file"

794 msgstr "fil"

795

795 -#: archive.c:450 builtin/archive.c:89

796 +#: archive.c:457 builtin/archive.c:89

797 msgid "write the archive to this file"

798 msgstr "skriv arkivet till filen"

799

799 -#: archive.c:452

800 +#: archive.c:459

801 msgid "read .gitattributes in working directory"

802 msgstr "läs .gitattributes i arbetskatalogen"

803

803 -#: archive.c:453

804 +#: archive.c:460

805 msgid "report archived files on stderr"

806 msgstr "rapportera arkiverade filer på standard fel"

807

807 -#: archive.c:454

808 +#: archive.c:461

809 msgid "store only"

810 msgstr "endast spara"

811

811 -#: archive.c:455

812 +#: archive.c:462

813 msgid "compress faster"

814 msgstr "komprimera snabbare"

815

815 -#: archive.c:463

816 +#: archive.c:470

817 msgid "compress better"

818 msgstr "komprimera bättre"

819

819 -#: archive.c:466

820 +#: archive.c:473

821 msgid "list supported archive formats"

822 msgstr "visa understödda arkivformat"

823

823 -#: archive.c:468 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

824 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1738

824 +#: archive.c:475 builtin/archive.c:90 builtin/clone.c:111 builtin/clone.c:114

825 +#: builtin/submodule--helper.c:1374 builtin/submodule--helper.c:1855

826 msgid "repo"

827 msgstr "arkiv"

828

828 -#: archive.c:469 builtin/archive.c:91

829 +#: archive.c:476 builtin/archive.c:91

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

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

832

832 -#: archive.c:470 builtin/archive.c:92 builtin/difftool.c:714

833 -#: builtin/notes.c:491

833 +#: archive.c:477 builtin/archive.c:92 builtin/difftool.c:714

834 +#: builtin/notes.c:496

835 msgid "command"

836 msgstr "kommando"

837

837 -#: archive.c:471 builtin/archive.c:93

838 +#: archive.c:478 builtin/archive.c:93

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

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

841

841 -#: archive.c:478

842 +#: archive.c:485

843 msgid "Unexpected option --remote"

844 msgstr "Oväntad flagga --remote"

845

845 -#: archive.c:480

846 +#: archive.c:487

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

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

849

849 -#: archive.c:482

850 +#: archive.c:489

851 msgid "Unexpected option --output"

852 msgstr "Oväntad flagga --output"

853

853 -#: archive.c:504

854 +#: archive.c:511

855 #, c-format

856 msgid "Unknown archive format '%s'"

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

858

858 -#: archive.c:511

859 +#: archive.c:518

860 #, c-format

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

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

863

863 -#: archive-tar.c:125 archive-zip.c:344

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

865 #, c-format

866 msgid "cannot stream blob %s"

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

868

868 -#: archive-tar.c:260 archive-zip.c:361

869 +#: archive-tar.c:260 archive-zip.c:363

870 #, c-format

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

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

873

873 -#: archive-tar.c:287 archive-zip.c:352

874 +#: archive-tar.c:287 archive-zip.c:353

875 #, c-format

876 msgid "cannot read %s"

877 msgstr "kan inte läsa %s"

@@ -889,32 +890,32 @@ msgstr "kan inte omdirigera handtag"

890 msgid "'%s' filter reported error"

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

892

892 -#: archive-zip.c:313

893 +#: archive-zip.c:314

894 #, c-format

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

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

897

897 -#: archive-zip.c:317

898 +#: archive-zip.c:318

899 #, c-format

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

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

902

902 -#: archive-zip.c:470 builtin/pack-objects.c:216 builtin/pack-objects.c:219

903 +#: archive-zip.c:474 builtin/pack-objects.c:224 builtin/pack-objects.c:227

904 #, c-format

905 msgid "deflate error (%d)"

906 msgstr "fel i deflate (%d)"

907

907 -#: archive-zip.c:605

908 +#: archive-zip.c:609

909 #, c-format

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

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

912

912 -#: attr.c:218

913 +#: attr.c:212

914 #, c-format

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

916 msgstr "%-*s är inte ett giltigt namn på attribut"

917

917 -#: attr.c:415

918 +#: attr.c:409

919 msgid ""

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

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

@@ -922,22 +923,22 @@ msgstr ""

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

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

925

925 -#: bisect.c:467

926 +#: bisect.c:468

927 #, c-format

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

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

930

930 -#: bisect.c:675

931 +#: bisect.c:676

932 #, c-format

933 msgid "We cannot bisect more!\n"

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

935

935 -#: bisect.c:729

936 +#: bisect.c:730

937 #, c-format

938 msgid "Not a valid commit name %s"

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

940

940 -#: bisect.c:753

941 +#: bisect.c:754

942 #, c-format

943 msgid ""

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

@@ -946,7 +947,7 @@ msgstr ""

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

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

949

949 -#: bisect.c:758

950 +#: bisect.c:759

951 #, c-format

952 msgid ""

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

@@ -955,7 +956,7 @@ msgstr ""

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

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

958

958 -#: bisect.c:763

959 +#: bisect.c:764

960 #, c-format

961 msgid ""

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

@@ -964,7 +965,7 @@ msgstr ""

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

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

967

967 -#: bisect.c:771

968 +#: bisect.c:772

969 #, c-format

970 msgid ""

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

@@ -975,7 +976,7 @@ msgstr ""

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

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

978

978 -#: bisect.c:784

979 +#: bisect.c:785

980 #, c-format

981 msgid ""

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

@@ -987,36 +988,36 @@ msgstr ""

988 "%s.\n"

989 "Vi fortsätter ändå."

990

990 -#: bisect.c:817

991 +#: bisect.c:818

992 #, c-format

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

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

995

995 -#: bisect.c:857

996 +#: bisect.c:858

997 #, c-format

998 msgid "a %s revision is needed"

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

1000

1000 -#: bisect.c:876 builtin/notes.c:177 builtin/tag.c:237

1001 +#: bisect.c:877 builtin/notes.c:177 builtin/tag.c:237

1002 #, c-format

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

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

1005

1005 -#: bisect.c:927 builtin/merge.c:137

1006 +#: bisect.c:928 builtin/merge.c:138

1007 #, c-format

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

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

1010

1010 -#: bisect.c:957

1011 +#: bisect.c:958

1012 msgid "reading bisect refs failed"

1013 msgstr "misslyckades läsa bisect-referenser"

1014

1014 -#: bisect.c:976

1015 +#: bisect.c:977

1016 #, c-format

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

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

1019

1019 -#: bisect.c:984

1020 +#: bisect.c:985

1021 #, c-format

1022 msgid ""

1023 "No testable commit found.\n"

@@ -1025,7 +1026,7 @@ msgstr ""

1026 "Ingen testbar incheckning hittades.\n"

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

1028

1028 -#: bisect.c:1003

1029 +#: bisect.c:1004

1030 #, c-format

1031 msgid "(roughly %d step)"

1032 msgid_plural "(roughly %d steps)"

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

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

1037 #. steps)" translation.

1038 #.

1038 -#: bisect.c:1009

1039 +#: bisect.c:1010

1040 #, c-format

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

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

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

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

1045

1045 -#: blame.c:1784

1046 +#: blame.c:1787

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

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

1049

1049 -#: blame.c:1798

1050 +#: blame.c:1801

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

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

1053

1053 -#: blame.c:1819

1054 +#: blame.c:1822

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

1056 msgstr ""

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

1058 "incheckningen"

1059

1059 -#: blame.c:1828 bundle.c:162 ref-filter.c:2154 sequencer.c:1874

1060 -#: sequencer.c:3772 builtin/commit.c:994 builtin/log.c:372 builtin/log.c:926

1061 -#: builtin/log.c:1381 builtin/log.c:1713 builtin/log.c:1963 builtin/merge.c:404

1062 -#: builtin/pack-objects.c:3029 builtin/pack-objects.c:3044

1060 +#: blame.c:1831 bundle.c:162 ref-filter.c:2046 sequencer.c:1963

1061 +#: sequencer.c:4002 builtin/commit.c:1001 builtin/log.c:377 builtin/log.c:932

1062 +#: builtin/log.c:1407 builtin/log.c:1783 builtin/log.c:2072 builtin/merge.c:406

1063 +#: builtin/pack-objects.c:3135 builtin/pack-objects.c:3150

1064 #: builtin/shortlog.c:192

1065 msgid "revision walk setup failed"

1066 msgstr "misslyckades skapa revisionstraversering"

1067

1067 -#: blame.c:1846

1068 +#: blame.c:1849

1069 msgid ""

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

1071 msgstr ""

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

1073 "kedjan"

1074

1074 -#: blame.c:1857

1075 +#: blame.c:1860

1076 #, c-format

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

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

1079

1079 -#: blame.c:1868

1080 +#: blame.c:1871

1081 #, c-format

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

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

@@ -1234,7 +1235,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1237

1237 -#: bundle.c:90 sequencer.c:2092 sequencer.c:2578 builtin/commit.c:768

1238 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2182 sequencer.c:2722

1239 +#: builtin/commit.c:774

1240 #, c-format

1241 msgid "could not open '%s'"

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

@@ -1261,38 +1263,42 @@ msgid_plural "The bundle requires these %d refs:"

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

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

1265

1264 -#: bundle.c:260

1266 +#: bundle.c:267

1267 +msgid "unable to dup bundle descriptor"

1268 +msgstr "kan inte duplicera pakethandtag"

1269 +

1270 +#: bundle.c:274

1271 msgid "Could not spawn pack-objects"

1272 msgstr "Kunde inte starta pack-objects"

1273

1268 -#: bundle.c:271

1274 +#: bundle.c:285

1275 msgid "pack-objects died"

1276 msgstr "pack-objects misslyckades"

1277

1272 -#: bundle.c:313

1278 +#: bundle.c:327

1279 msgid "rev-list died"

1280 msgstr "rev-list dog"

1281

1276 -#: bundle.c:362

1282 +#: bundle.c:376

1283 #, c-format

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

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

1286

1281 -#: bundle.c:453 builtin/log.c:187 builtin/log.c:1618 builtin/shortlog.c:304

1287 +#: bundle.c:456 builtin/log.c:192 builtin/log.c:1688 builtin/shortlog.c:304

1288 #, c-format

1289 msgid "unrecognized argument: %s"

1290 msgstr "okänt argument: %s"

1291

1286 -#: bundle.c:461

1292 +#: bundle.c:464

1293 msgid "Refusing to create empty bundle."

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

1295

1290 -#: bundle.c:473

1296 +#: bundle.c:474

1297 #, c-format

1298 msgid "cannot create '%s'"

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

1300

1295 -#: bundle.c:501

1301 +#: bundle.c:498

1302 msgid "index-pack died"

1303 msgstr "index-pack dog"

1304

@@ -1301,19 +1307,19 @@ msgstr "index-pack dog"

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

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

1309

1304 -#: commit.c:48 sequencer.c:2384 builtin/am.c:422 builtin/am.c:466

1305 -#: builtin/am.c:1438 builtin/am.c:2072 builtin/replace.c:376

1310 +#: commit.c:50 sequencer.c:2528 builtin/am.c:370 builtin/am.c:414

1311 +#: builtin/am.c:1390 builtin/am.c:2025 builtin/replace.c:376

1312 #: builtin/replace.c:448

1313 #, c-format

1314 msgid "could not parse %s"

1315 msgstr "kunde inte tolka %s"

1316

1311 -#: commit.c:50

1317 +#: commit.c:52

1318 #, c-format

1319 msgid "%s %s is not a commit!"

1320 msgstr "%s %s är inte en incheckning!"

1321

1316 -#: commit.c:191

1322 +#: commit.c:193

1323 msgid ""

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

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

@@ -1333,7 +1339,29 @@ msgstr ""

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

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

1341

1336 -#: commit.c:1629

1342 +#: commit.c:1115

1343 +#, c-format

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

1345 +msgstr ""

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

1347 +

1348 +#: commit.c:1118

1349 +#, c-format

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

1351 +msgstr ""

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

1353 +

1354 +#: commit.c:1121

1355 +#, c-format

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

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

1358 +

1359 +#: commit.c:1124

1360 +#, c-format

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

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

1363 +

1364 +#: commit.c:1378

1365 msgid ""

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

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

@@ -1343,75 +1371,91 @@ msgstr ""

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

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

1373

1346 -#: commit-graph.c:83

1374 +#: commit-graph.c:108

1375 #, c-format

1376 msgid "graph file %s is too small"

1377 msgstr "graffilen %s är för liten"

1378

1351 -#: commit-graph.c:90

1379 +#: commit-graph.c:115

1380 #, c-format

1381 msgid "graph signature %X does not match signature %X"

1382 msgstr "grafsignaturen %X stämmer inte med signaturen %X"

1383

1356 -#: commit-graph.c:97

1384 +#: commit-graph.c:122

1385 #, c-format

1386 msgid "graph version %X does not match version %X"

1387 msgstr "grafversionen %X stämmer inte med versionen %X"

1388

1361 -#: commit-graph.c:104

1389 +#: commit-graph.c:129

1390 #, c-format

1391 msgid "hash version %X does not match version %X"

1392 msgstr "hash-versionen %X stämmer inte med versionen %X"

1393

1366 -#: commit-graph.c:128

1394 +#: commit-graph.c:153

1395 #, c-format

1396 msgid "improper chunk offset %08x%08x"

1397 msgstr "felaktigt offset för stycke %08x%08x"

1398

1371 -#: commit-graph.c:164

1399 +#: commit-graph.c:189

1400 #, c-format

1401 msgid "chunk id %08x appears multiple times"

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

1403

1376 -#: commit-graph.c:261

1404 +#: commit-graph.c:308

1405 #, c-format

1406 msgid "could not find commit %s"

1407 msgstr "kunde inte hitta incheckningen %s"

1408

1381 -#: commit-graph.c:565 builtin/pack-objects.c:2568

1409 +#: commit-graph.c:617 builtin/pack-objects.c:2652

1410 #, c-format

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

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

1413

1386 -#: commit-graph.c:730

1414 +#: commit-graph.c:651

1415 +msgid "Annotating commits in commit graph"

1416 +msgstr "Dekorerar incheckningar i incheckningsgraf"

1417 +

1418 +#: commit-graph.c:691

1419 +msgid "Computing commit graph generation numbers"

1420 +msgstr "Beräknar generationsvärden för incheckningsgraf"

1421 +

1422 +#: commit-graph.c:803 commit-graph.c:826 commit-graph.c:852

1423 +msgid "Finding commits for commit graph"

1424 +msgstr "Söker incheckningar för incheckingsgraf"

1425 +

1426 +#: commit-graph.c:812

1427 #, c-format

1428 msgid "error adding pack %s"

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

1430

1391 -#: commit-graph.c:732

1431 +#: commit-graph.c:814

1432 #, c-format

1433 msgid "error opening index for %s"

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

1435

1396 -#: commit-graph.c:773

1436 +#: commit-graph.c:868

1437 #, c-format

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

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

1440

1401 -#: commit-graph.c:800

1441 +#: commit-graph.c:895

1442 msgid "too many commits to write graph"

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

1444

1405 -#: commit-graph.c:806

1445 +#: commit-graph.c:902 midx.c:769

1446 #, c-format

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

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

1449

1410 -#: commit-graph.c:904

1450 +#: commit-graph.c:1002

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

1452 msgstr ""

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

1454

1455 +#: commit-graph.c:1046

1456 +msgid "Verifying commits in commit graph"

1457 +msgstr "Bekräftar incheckningar i incheckningsgraf"

1458 +

1459 #: compat/obstack.c:405 compat/obstack.c:407

1460 msgid "memory exhausted"

1461 msgstr "minnet slut"

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

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

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

1500

1457 -#: config.c:378 sequencer.c:2206

1501 +#: config.c:378 sequencer.c:2296

1502 #, c-format

1503 msgid "invalid key: %s"

1504 msgstr "felaktig nyckel: %s"

@@ -1583,150 +1627,150 @@ msgstr "core.commentChar kan bara vara ett tecken"

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

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

1629

1586 -#: config.c:1403

1630 +#: config.c:1395

1631 #, c-format

1632 msgid "malformed value for %s"

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

1634

1591 -#: config.c:1429

1635 +#: config.c:1421

1636 #, c-format

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

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

1639

1596 -#: config.c:1430

1640 +#: config.c:1422

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

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

1643

1600 -#: config.c:1489 builtin/pack-objects.c:3279

1644 +#: config.c:1481 builtin/pack-objects.c:3389

1645 #, c-format

1646 msgid "bad pack compression level %d"

1647 msgstr "felaktig paketkomprimeringsgrad %d"

1648

1605 -#: config.c:1610

1649 +#: config.c:1602

1650 #, c-format

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

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

1653

1610 -#: config.c:1613

1654 +#: config.c:1605

1655 #, c-format

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

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

1658

1615 -#: config.c:1630

1659 +#: config.c:1622

1660 #, c-format

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

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

1663

1620 -#: config.c:1660

1664 +#: config.c:1652

1665 #, c-format

1666 msgid "failed to parse %s"

1667 msgstr "kunde inte tolka %s"

1668

1625 -#: config.c:1700

1669 +#: config.c:1705

1670 msgid "unable to parse command-line config"

1671 msgstr "kan inte tolka kommandoradskonfiguration"

1672

1629 -#: config.c:2032

1673 +#: config.c:2037

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

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

1676

1633 -#: config.c:2202

1677 +#: config.c:2207

1678 #, c-format

1679 msgid "Invalid %s: '%s'"

1680 msgstr "Felaktigt %s: \"%s\""

1681

1638 -#: config.c:2245

1682 +#: config.c:2250

1683 #, c-format

1684 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"

1685 msgstr ""

1686 "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""

1687

1644 -#: config.c:2271

1688 +#: config.c:2276

1689 #, c-format

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

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

1692

1649 -#: config.c:2296

1693 +#: config.c:2319

1694 #, c-format

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

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

1697

1654 -#: config.c:2298

1698 +#: config.c:2321

1699 #, c-format

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

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

1702

1659 -#: config.c:2379

1703 +#: config.c:2402

1704 #, c-format

1705 msgid "invalid section name '%s'"

1706 msgstr "felaktigt sektionsnamn \"%s\""

1707

1664 -#: config.c:2411

1708 +#: config.c:2434

1709 #, c-format

1710 msgid "%s has multiple values"

1711 msgstr "%s har flera värden"

1712

1669 -#: config.c:2440

1713 +#: config.c:2463

1714 #, c-format

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

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

1717

1674 -#: config.c:2691 config.c:3015

1718 +#: config.c:2714 config.c:3038

1719 #, c-format

1720 msgid "could not lock config file %s"

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

1722

1679 -#: config.c:2702

1723 +#: config.c:2725

1724 #, c-format

1725 msgid "opening %s"

1726 msgstr "öppnar %s"

1727

1684 -#: config.c:2737 builtin/config.c:324

1728 +#: config.c:2760 builtin/config.c:327

1729 #, c-format

1730 msgid "invalid pattern: %s"

1731 msgstr "ogiltigt mönster: %s"

1732

1689 -#: config.c:2762

1733 +#: config.c:2785

1734 #, c-format

1735 msgid "invalid config file %s"

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

1737

1694 -#: config.c:2775 config.c:3028

1738 +#: config.c:2798 config.c:3051

1739 #, c-format

1740 msgid "fstat on %s failed"

1741 msgstr "fstat misslyckades på %s"

1742

1699 -#: config.c:2786

1743 +#: config.c:2809

1744 #, c-format

1745 msgid "unable to mmap '%s'"

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

1747

1704 -#: config.c:2795 config.c:3033

1748 +#: config.c:2818 config.c:3056

1749 #, c-format

1750 msgid "chmod on %s failed"

1751 msgstr "chmod misslyckades på %s"

1752

1709 -#: config.c:2880 config.c:3130

1753 +#: config.c:2903 config.c:3153

1754 #, c-format

1755 msgid "could not write config file %s"

1756 msgstr "kunde inte skriva konfigurationsfilen %s"

1757

1714 -#: config.c:2914

1758 +#: config.c:2937

1759 #, c-format

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

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

1762

1719 -#: config.c:2916 builtin/remote.c:781

1763 +#: config.c:2939 builtin/remote.c:782

1764 #, c-format

1765 msgid "could not unset '%s'"

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

1767

1724 -#: config.c:3006

1768 +#: config.c:3029

1769 #, c-format

1770 msgid "invalid section name: %s"

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

1772

1729 -#: config.c:3173

1773 +#: config.c:3196

1774 #, c-format

1775 msgid "missing value for '%s'"

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

@@ -1779,7 +1823,7 @@ msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""

1823 msgid "repository on the other end cannot be shallow"

1824 msgstr "arkivet på andra sidan kan inte vara grunt"

1825

1782 -#: connect.c:310 fetch-pack.c:183 builtin/archive.c:63

1826 +#: connect.c:310 fetch-pack.c:182 builtin/archive.c:63

1827 #, c-format

1828 msgid "remote error: %s"

1829 msgstr "fjärrfel: %s"

@@ -1897,7 +1941,7 @@ msgstr "kunde inte grena (fork)"

1941

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

1943 # objects in the database.

1900 -#: connected.c:68 builtin/fsck.c:203 builtin/prune.c:146

1944 +#: connected.c:68 builtin/fsck.c:202 builtin/prune.c:147

1945 msgid "Checking connectivity"

1946 msgstr "Kontrollerar konnektivitet"

1947

@@ -2031,12 +2075,12 @@ msgstr ""

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

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

2077

2034 -#: convert.c:1402 convert.c:1436

2078 +#: convert.c:1398 convert.c:1432

2079 #, c-format

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

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

2082

2039 -#: convert.c:1480

2083 +#: convert.c:1476

2084 #, c-format

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

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

@@ -2109,12 +2153,36 @@ msgid_plural "%<PRIuMAX> years ago"

2153 msgstr[0] "%<PRIuMAX> år sedan"

2154 msgstr[1] "%<PRIuMAX> år sedan"

2155

2156 +#: delta-islands.c:268

2157 +msgid "Propagating island marks"

2158 +msgstr "Sprider ö-markeringar"

2159 +

2160 +#: delta-islands.c:286

2161 +#, c-format

2162 +msgid "bad tree object %s"

2163 +msgstr "felaktigt trädobjektet %s"

2164 +

2165 +#: delta-islands.c:330

2166 +#, c-format

2167 +msgid "failed to load island regex for '%s': %s"

2168 +msgstr "kunde inte hämta ö-regex för \"%s\": %s"

2169 +

2170 +#: delta-islands.c:386

2171 +#, c-format

2172 +msgid "island regex from config has too many capture groups (max=%d)"

2173 +msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"

2174 +

2175 +#: delta-islands.c:462

2176 +#, c-format

2177 +msgid "Marked %d islands, done.\n"

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

2179 +

2180 #: diffcore-order.c:24

2181 #, c-format

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

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

2184

2117 -#: diffcore-rename.c:536

2185 +#: diffcore-rename.c:544

2186 msgid "Performing inexact rename detection"

2187 msgstr "Utför onöjaktig namnbytesdetektering"

2188

@@ -2168,24 +2236,24 @@ msgstr ""

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

2237 "%s"

2238

2171 -#: diff.c:4096

2239 +#: diff.c:4140

2240 #, c-format

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

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

2243

2176 -#: diff.c:4427

2244 +#: diff.c:4482

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

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

2247

2180 -#: diff.c:4430

2248 +#: diff.c:4485

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

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

2251

2184 -#: diff.c:4508

2252 +#: diff.c:4563

2253 msgid "--follow requires exactly one pathspec"

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

2255

2188 -#: diff.c:4674

2256 +#: diff.c:4729

2257 #, c-format

2258 msgid ""

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

@@ -2194,66 +2262,66 @@ msgstr ""

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

2263 "%s"

2264

2197 -#: diff.c:4688

2265 +#: diff.c:4743

2266 #, c-format

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

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

2269

2202 -#: diff.c:5766

2270 +#: diff.c:5823

2271 msgid "inexact rename detection was skipped due to too many files."

2272 msgstr ""

2273 "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."

2274

2207 -#: diff.c:5769

2275 +#: diff.c:5826

2276 msgid "only found copies from modified paths due to too many files."

2277 msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."

2278

2211 -#: diff.c:5772

2279 +#: diff.c:5829

2280 #, c-format

2281 msgid ""

2282 "you may want to set your %s variable to at least %d and retry the command."

2283 msgstr ""

2284 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."

2285

2218 -#: dir.c:569

2286 +#: dir.c:576

2287 #, c-format

2288 msgid "pathspec '%s' did not match any file(s) known to git"

2289 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"

2290

2223 -#: dir.c:958

2291 +#: dir.c:965

2292 #, c-format

2293 msgid "cannot use %s as an exclude file"

2294 msgstr "kan inte använda %s som exkluderingsfil"

2295

2228 -#: dir.c:1873

2296 +#: dir.c:1880

2297 #, c-format

2298 msgid "could not open directory '%s'"

2299 msgstr "kunde inte öppna katalogen \"%s\""

2300

2233 -#: dir.c:2115

2301 +#: dir.c:2122

2302 msgid "failed to get kernel name and information"

2303 msgstr "misslyckades hämta kärnans namn och information"

2304

2237 -#: dir.c:2239

2305 +#: dir.c:2246

2306 msgid "untracked cache is disabled on this system or location"

2307 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

2308

2241 -#: dir.c:3037

2309 +#: dir.c:3047

2310 #, c-format

2311 msgid "index file corrupt in repo %s"

2312 msgstr "indexfilen trasig i arkivet %s"

2313

2246 -#: dir.c:3082 dir.c:3087

2314 +#: dir.c:3092 dir.c:3097

2315 #, c-format

2316 msgid "could not create directories for %s"

2317 msgstr "kunde inte skapa kataloger för %s"

2318

2251 -#: dir.c:3116

2319 +#: dir.c:3126

2320 #, c-format

2321 msgid "could not migrate git directory from '%s' to '%s'"

2322 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""

2323

2256 -#: editor.c:61

2324 +#: editor.c:73

2325 #, c-format

2326 msgid "hint: Waiting for your editor to close the file...%c"

2327 msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"

@@ -2262,7 +2330,7 @@ msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c

2330 msgid "Filtering content"

2331 msgstr "Filtrerar innehåll"

2332

2265 -#: entry.c:437

2333 +#: entry.c:465

2334 #, c-format

2335 msgid "could not stat file '%s'"

2336 msgstr "kunde inte ta status på filen \"%s\""

@@ -2286,77 +2354,77 @@ msgstr "för många flaggor för att köra %s"

2354 msgid "Remote with no URL"

2355 msgstr "Fjärr utan URL"

2356

2289 -#: fetch-pack.c:152

2357 +#: fetch-pack.c:151

2358 msgid "git fetch-pack: expected shallow list"

2359 msgstr "git fetch-pack: förväntade grund lista"

2360

2293 -#: fetch-pack.c:164

2361 +#: fetch-pack.c:163

2362 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"

2363 msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"

2364

2297 -#: fetch-pack.c:184

2365 +#: fetch-pack.c:183

2366 #, c-format

2367 msgid "git fetch-pack: expected ACK/NAK, got '%s'"

2368 msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""

2369

2302 -#: fetch-pack.c:254

2370 +#: fetch-pack.c:253

2371 msgid "--stateless-rpc requires multi_ack_detailed"

2372 msgstr "--stateless-rpc kräver ”multi_ack_detailed”"

2373

2306 -#: fetch-pack.c:342 fetch-pack.c:1257

2374 +#: fetch-pack.c:347 fetch-pack.c:1277

2375 #, c-format

2376 msgid "invalid shallow line: %s"

2377 msgstr "ogiltig \"shallow\"-rad: %s"

2378

2311 -#: fetch-pack.c:348 fetch-pack.c:1263

2379 +#: fetch-pack.c:353 fetch-pack.c:1283

2380 #, c-format

2381 msgid "invalid unshallow line: %s"

2382 msgstr "ogiltig \"unshallow\"-rad: %s"

2383

2316 -#: fetch-pack.c:350 fetch-pack.c:1265

2384 +#: fetch-pack.c:355 fetch-pack.c:1285

2385 #, c-format

2386 msgid "object not found: %s"

2387 msgstr "objektet hittades inte: %s"

2388

2321 -#: fetch-pack.c:353 fetch-pack.c:1268

2389 +#: fetch-pack.c:358 fetch-pack.c:1288

2390 #, c-format

2391 msgid "error in object: %s"

2392 msgstr "fel i objekt: %s"

2393

2326 -#: fetch-pack.c:355 fetch-pack.c:1270

2394 +#: fetch-pack.c:360 fetch-pack.c:1290

2395 #, c-format

2396 msgid "no shallow found: %s"

2397 msgstr "ingen \"shallow\" hittades: %s"

2398

2331 -#: fetch-pack.c:358 fetch-pack.c:1273

2399 +#: fetch-pack.c:363 fetch-pack.c:1293

2400 #, c-format

2401 msgid "expected shallow/unshallow, got %s"

2402 msgstr "förväntade shallow/unshallow, fick %s"

2403

2336 -#: fetch-pack.c:399

2404 +#: fetch-pack.c:404

2405 #, c-format

2406 msgid "got %s %d %s"

2407 msgstr "fick %s %d %s"

2408

2341 -#: fetch-pack.c:416

2409 +#: fetch-pack.c:421

2410 #, c-format

2411 msgid "invalid commit %s"

2412 msgstr "ogiltig incheckning %s"

2413

2346 -#: fetch-pack.c:447

2414 +#: fetch-pack.c:452

2415 msgid "giving up"

2416 msgstr "ger upp"

2417

2350 -#: fetch-pack.c:459 progress.c:229

2418 +#: fetch-pack.c:464 progress.c:229

2419 msgid "done"

2420 msgstr "klart"

2421

2354 -#: fetch-pack.c:471

2422 +#: fetch-pack.c:476

2423 #, c-format

2424 msgid "got %s (%d) %s"

2425 msgstr "fick %s (%d) %s"

2426

2359 -#: fetch-pack.c:517

2427 +#: fetch-pack.c:522

2428 #, c-format

2429 msgid "Marking %s as complete"

2430 msgstr "Markerar %s som komplett"

@@ -2424,7 +2492,7 @@ msgstr "Servern stöder \"allow-reachable-sha1-in-want\""

2492 msgid "Server supports ofs-delta"

2493 msgstr "Servern stöder \"ofs-delta\""

2494

2427 -#: fetch-pack.c:971 fetch-pack.c:1150

2495 +#: fetch-pack.c:971 fetch-pack.c:1158

2496 msgid "Server supports filter"

2497 msgstr "Servern stöder filter"

2498

@@ -2445,85 +2513,94 @@ msgstr "Servern stöder inte --shallow-exclude"

2513 msgid "Server does not support --deepen"

2514 msgstr "Servern stöder inte --deepen"

2515

2448 -#: fetch-pack.c:1004

2516 +#: fetch-pack.c:1008

2517 msgid "no common commits"

2518 msgstr "inga gemensamma incheckningar"

2519

2452 -#: fetch-pack.c:1016 fetch-pack.c:1393

2520 +#: fetch-pack.c:1020 fetch-pack.c:1418

2521 msgid "git fetch-pack: fetch failed."

2522 msgstr "git fetch-patch: hämtning misslyckades."

2523

2456 -#: fetch-pack.c:1145

2524 +#: fetch-pack.c:1153

2525 msgid "Server does not support shallow requests"

2526 msgstr "Servern stöder inte grunda förfrågningar"

2527

2460 -#: fetch-pack.c:1191

2528 +#: fetch-pack.c:1199

2529 #, c-format

2530 msgid "error reading section header '%s'"

2531 msgstr "fel vid läsning av styckehuvudet \"%s\""

2532

2465 -#: fetch-pack.c:1197

2533 +#: fetch-pack.c:1205

2534 #, c-format

2535 msgid "expected '%s', received '%s'"

2536 msgstr "förväntade \"%s\", tog emot \"%s\""

2537

2470 -#: fetch-pack.c:1236

2538 +#: fetch-pack.c:1244

2539 #, c-format

2540 msgid "unexpected acknowledgment line: '%s'"

2541 msgstr "förväntade bekräftelserad: \"%s\""

2542

2475 -#: fetch-pack.c:1241

2543 +#: fetch-pack.c:1249

2544 #, c-format

2545 msgid "error processing acks: %d"

2546 msgstr "fel vid hantering av bekräftelser: %d"

2547

2480 -#: fetch-pack.c:1278

2548 +#: fetch-pack.c:1259

2549 +msgid "expected packfile to be sent after 'ready'"

2550 +msgstr "väntade att paketfil skulle sändas efter \"ready\""

2551 +

2552 +#: fetch-pack.c:1261

2553 +msgid "expected no other sections to be sent after no 'ready'"

2554 +msgstr ""

2555 +"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

2556 +

2557 +#: fetch-pack.c:1298

2558 #, c-format

2559 msgid "error processing shallow info: %d"

2560 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

2561

2485 -#: fetch-pack.c:1294

2562 +#: fetch-pack.c:1314

2563 #, c-format

2564 msgid "expected wanted-ref, got '%s'"

2565 msgstr "förväntade wanted-ref, fick %s"

2566

2490 -#: fetch-pack.c:1304

2567 +#: fetch-pack.c:1324

2568 #, c-format

2569 msgid "unexpected wanted-ref: '%s'"

2570 msgstr "oväntad wanted-ref: \"%s\""

2571

2495 -#: fetch-pack.c:1308

2572 +#: fetch-pack.c:1328

2573 #, c-format

2574 msgid "error processing wanted refs: %d"

2575 msgstr "fel vid hantering av önskade referenser: %d"

2576

2500 -#: fetch-pack.c:1603

2577 +#: fetch-pack.c:1642

2578 msgid "no matching remote head"

2579 msgstr "inget motsvarande fjärrhuvud"

2580

2504 -#: fetch-pack.c:1621 builtin/clone.c:664

2581 +#: fetch-pack.c:1660 builtin/clone.c:664

2582 msgid "remote did not send all necessary objects"

2583 msgstr "fjärren sände inte alla nödvändiga objekt"

2584

2508 -#: fetch-pack.c:1647

2585 +#: fetch-pack.c:1686

2586 #, c-format

2587 msgid "no such remote ref %s"

2588 msgstr "ingen sådan fjärreferens: %s"

2589

2513 -#: fetch-pack.c:1650

2590 +#: fetch-pack.c:1689

2591 #, c-format

2592 msgid "Server does not allow request for unadvertised object %s"

2593 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

2594

2518 -#: gpg-interface.c:253

2595 +#: gpg-interface.c:318

2596 msgid "gpg failed to sign the data"

2597 msgstr "gpg misslyckades signera data"

2598

2522 -#: gpg-interface.c:279

2599 +#: gpg-interface.c:344

2600 msgid "could not create temporary file"

2601 msgstr "kunde inte skapa temporära fil"

2602

2526 -#: gpg-interface.c:282

2603 +#: gpg-interface.c:347

2604 #, c-format

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

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

@@ -2533,18 +2610,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

2610 msgid "ignore invalid color '%.*s' in log.graphColors"

2611 msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

2612

2536 -#: grep.c:2115

2613 +#: grep.c:2113

2614 #, c-format

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

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

2617

2541 -#: grep.c:2132 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2618 +#: grep.c:2130 setup.c:164 builtin/clone.c:410 builtin/diff.c:81

2619 #: builtin/rm.c:134

2620 #, c-format

2621 msgid "failed to stat '%s'"

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

2623

2547 -#: grep.c:2143

2624 +#: grep.c:2141

2625 #, c-format

2626 msgid "'%s': short read"

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

@@ -2601,29 +2678,41 @@ msgstr "Lågnivåkommandon / synka arkiv"

2678 msgid "Low-level Commands / Internal Helpers"

2679 msgstr "Lågnivåkommandon / interna hjälpare"

2680

2604 -#: help.c:293

2681 +#: help.c:296

2682 #, c-format

2683 msgid "available git commands in '%s'"

2684 msgstr "git-kommandon tillgängliga i \"%s\""

2685

2609 -#: help.c:300

2686 +#: help.c:303

2687 msgid "git commands available from elsewhere on your $PATH"

2688 msgstr "git-kommandon från andra platser i din $PATH"

2689

2613 -#: help.c:309

2690 +#: help.c:312

2691 msgid "These are common Git commands used in various situations:"

2692 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

2693

2617 -#: help.c:358 git.c:90

2694 +#: help.c:361 git.c:90

2695 #, c-format

2696 msgid "unsupported command listing type '%s'"

2697 msgstr "okänd kommandolisttyp \"%s\""

2698

2622 -#: help.c:405

2699 +#: help.c:408

2700 msgid "The common Git guides are:"

2701 msgstr "De vanliga Git-vägledningarna är:"

2702

2626 -#: help.c:552

2703 +#: help.c:517

2704 +msgid "See 'git help <command>' to read about a specific subcommand"

2705 +msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"

2706 +

2707 +#: help.c:522

2708 +msgid "External commands"

2709 +msgstr "Externa kommandon"

2710 +

2711 +#: help.c:530

2712 +msgid "Command aliases"

2713 +msgstr "Kommadoalias"

2714 +

2715 +#: help.c:594

2716 #, c-format

2717 msgid ""

2718 "'%s' appears to be a git command, but we were not\n"

@@ -2632,32 +2721,32 @@ msgstr ""

2721 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"

2722 "köra det. Kanske git-%s är trasigt?"

2723

2635 -#: help.c:611

2724 +#: help.c:653

2725 msgid "Uh oh. Your system reports no Git commands at all."

2726 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."

2727

2639 -#: help.c:633

2728 +#: help.c:675

2729 #, c-format

2730 msgid "WARNING: You called a Git command named '%s', which does not exist."

2731 msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."

2732

2644 -#: help.c:638

2733 +#: help.c:680

2734 #, c-format

2735 msgid "Continuing under the assumption that you meant '%s'."

2736 msgstr "Fortsätter under förutsättningen att du menade ”%s”."

2737

2649 -#: help.c:643

2738 +#: help.c:685

2739 #, c-format

2740 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

2741 msgstr ""

2742 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade ”%s”."

2743

2655 -#: help.c:651

2744 +#: help.c:693

2745 #, c-format

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

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

2748

2660 -#: help.c:655

2749 +#: help.c:697

2750 msgid ""

2751 "\n"

2752 "The most similar command is"

@@ -2671,16 +2760,16 @@ msgstr[1] ""

2760 "\n"

2761 "Mest lika kommandon är"

2762

2674 -#: help.c:670

2763 +#: help.c:712

2764 msgid "git version [<options>]"

2765 msgstr "git version [<flaggor>]"

2766

2678 -#: help.c:738

2767 +#: help.c:780

2768 #, c-format

2769 msgid "%s: %s - %s"

2770 msgstr "%s: %s - %s"

2771

2683 -#: help.c:742

2772 +#: help.c:784

2773 msgid ""

2774 "\n"

2775 "Did you mean this?"

@@ -2694,7 +2783,7 @@ msgstr[1] ""

2783 "\n"

2784 "Menade du ett av dessa?"

2785

2697 -#: ident.c:342

2786 +#: ident.c:345

2787 msgid ""

2788 "\n"

2789 "*** Please tell me who you are.\n"

@@ -2720,44 +2809,48 @@ msgstr ""

2809 "Kör utan --global för att endast ändra i aktuellt arkiv.\n"

2810 "\n"

2811

2723 -#: ident.c:366

2812 +#: ident.c:369

2813 msgid "no email was given and auto-detection is disabled"

2814 msgstr "ingen e-post angavs och autodetektering är inaktiverad"

2815

2727 -#: ident.c:371

2816 +#: ident.c:374

2817 #, c-format

2818 msgid "unable to auto-detect email address (got '%s')"

2819 msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"

2820

2732 -#: ident.c:381

2821 +#: ident.c:384

2822 msgid "no name was given and auto-detection is disabled"

2823 msgstr "inget namn angavs och autodetektering är inaktiverad"

2824

2736 -#: ident.c:387

2825 +#: ident.c:390

2826 #, c-format

2827 msgid "unable to auto-detect name (got '%s')"

2828 msgstr "kunde inte autodetektera namn (fick \"%s\")"

2829

2741 -#: ident.c:395

2830 +#: ident.c:398

2831 #, c-format

2832 msgid "empty ident name (for <%s>) not allowed"

2833 msgstr "tomt ident-namn (för <%s>) ej tillåtet"

2834

2746 -#: ident.c:401

2835 +#: ident.c:404

2836 #, c-format

2837 msgid "name consists only of disallowed characters: %s"

2838 msgstr "namnet består enbart av ej tillåtna tecken: %s"

2839

2751 -#: ident.c:416 builtin/commit.c:600

2840 +#: ident.c:419 builtin/commit.c:606

2841 #, c-format

2842 msgid "invalid date format: %s"

2843 msgstr "felaktigt datumformat: %s"

2844

2756 -#: list-objects-filter-options.c:36

2845 +#: list-objects-filter-options.c:35

2846 msgid "multiple filter-specs cannot be combined"

2847 msgstr "flera filterspecifikationer kan inte kombineras"

2848

2760 -#: list-objects-filter-options.c:126

2849 +#: list-objects-filter-options.c:58

2850 +msgid "only 'tree:0' is supported"

2851 +msgstr "endast \"tree:0\" stöds"

2852 +

2853 +#: list-objects-filter-options.c:137

2854 msgid "cannot change partial clone promisor remote"

2855 msgstr "kan inte ändra kontraktsfjärr för delvis kloning"

2856

@@ -2786,124 +2879,124 @@ msgstr ""

2879 msgid "Unable to create '%s.lock': %s"

2880 msgstr "Kunde inte skapa \"%s.lock\": %s"

2881

2789 -#: merge.c:40

2882 +#: merge.c:41

2883 msgid "failed to read the cache"

2884 msgstr "misslyckades läsa cachen"

2885

2793 -#: merge.c:105 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:380

2794 -#: builtin/checkout.c:608 builtin/clone.c:763

2886 +#: merge.c:107 rerere.c:720 builtin/am.c:1899 builtin/am.c:1933

2887 +#: builtin/checkout.c:387 builtin/checkout.c:708 builtin/clone.c:764

2888 msgid "unable to write new index file"

2889 msgstr "kunde inte skriva ny indexfil"

2890

2798 -#: merge-recursive.c:303

2891 +#: merge-recursive.c:323

2892 msgid "(bad commit)\n"

2893 msgstr "(felaktig incheckning)\n"

2894

2802 -#: merge-recursive.c:325

2895 +#: merge-recursive.c:345

2896 #, c-format

2897 msgid "add_cacheinfo failed for path '%s'; merge aborting."

2898 msgstr ""

2899 "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

2900

2808 -#: merge-recursive.c:333

2901 +#: merge-recursive.c:353

2902 #, c-format

2903 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2904 msgstr ""

2905 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "

2906 "sammanslagningen."

2907

2815 -#: merge-recursive.c:415

2908 +#: merge-recursive.c:435

2909 msgid "error building trees"

2910 msgstr "fel vid byggande av träd"

2911

2819 -#: merge-recursive.c:886

2912 +#: merge-recursive.c:906

2913 #, c-format

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

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

2916

2824 -#: merge-recursive.c:897

2917 +#: merge-recursive.c:917

2918 #, c-format

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

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

2921

2829 -#: merge-recursive.c:911 merge-recursive.c:930

2922 +#: merge-recursive.c:931 merge-recursive.c:950

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

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

2925

2833 -#: merge-recursive.c:920

2926 +#: merge-recursive.c:940

2927 #, c-format

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

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

2930

2838 -#: merge-recursive.c:962 builtin/cat-file.c:39

2931 +#: merge-recursive.c:982 builtin/cat-file.c:39

2932 #, c-format

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

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

2935

2843 -#: merge-recursive.c:964

2936 +#: merge-recursive.c:984

2937 #, c-format

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

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

2940

2848 -#: merge-recursive.c:988

2941 +#: merge-recursive.c:1008

2942 #, c-format

2943 msgid "failed to open '%s': %s"

2944 msgstr "misslyckades öppna \"%s\": %s"

2945

2853 -#: merge-recursive.c:999

2946 +#: merge-recursive.c:1019

2947 #, c-format

2948 msgid "failed to symlink '%s': %s"

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

2950

2858 -#: merge-recursive.c:1004

2951 +#: merge-recursive.c:1024

2952 #, c-format

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

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

2955

2863 -#: merge-recursive.c:1191

2956 +#: merge-recursive.c:1212

2957 #, c-format

2958 msgid "Failed to merge submodule %s (not checked out)"

2959 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

2960

2868 -#: merge-recursive.c:1198

2961 +#: merge-recursive.c:1219

2962 #, c-format

2963 msgid "Failed to merge submodule %s (commits not present)"

2964 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

2965

2873 -#: merge-recursive.c:1205

2966 +#: merge-recursive.c:1226

2967 #, c-format

2968 msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2969 msgstr ""

2970 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

2971 "sammanslagningsbasen)"

2972

2880 -#: merge-recursive.c:1213 merge-recursive.c:1225

2973 +#: merge-recursive.c:1234 merge-recursive.c:1246

2974 #, c-format

2975 msgid "Fast-forwarding submodule %s to the following commit:"

2976 msgstr "Snabbspolar undermodulen %s till följande incheckning:"

2977

2885 -#: merge-recursive.c:1216 merge-recursive.c:1228

2978 +#: merge-recursive.c:1237 merge-recursive.c:1249

2979 #, c-format

2980 msgid "Fast-forwarding submodule %s"

2981 msgstr "Snabbspolar undermodulen %s"

2982

2890 -#: merge-recursive.c:1250

2983 +#: merge-recursive.c:1271

2984 #, c-format

2985 msgid "Failed to merge submodule %s (merge following commits not found)"

2986 msgstr ""

2987 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "

2988 "hittades inte)"

2989

2897 -#: merge-recursive.c:1254

2990 +#: merge-recursive.c:1275

2991 #, c-format

2992 msgid "Failed to merge submodule %s (not fast-forward)"

2993 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"

2994

2902 -#: merge-recursive.c:1255

2995 +#: merge-recursive.c:1276

2996 msgid "Found a possible merge resolution for the submodule:\n"

2997 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"

2998

2906 -#: merge-recursive.c:1258

2999 +#: merge-recursive.c:1279

3000 #, c-format

3001 msgid ""

3002 "If this is correct simply add it to the index for example\n"

@@ -2920,32 +3013,32 @@ msgstr ""

3013 "\n"

3014 "vilket godtar lösningen.\n"

3015

2923 -#: merge-recursive.c:1267

3016 +#: merge-recursive.c:1288

3017 #, c-format

3018 msgid "Failed to merge submodule %s (multiple merges found)"

3019 msgstr ""

3020 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

3021

2929 -#: merge-recursive.c:1326

3022 +#: merge-recursive.c:1358

3023 msgid "Failed to execute internal merge"

3024 msgstr "Misslyckades exekvera intern sammanslagning"

3025

2933 -#: merge-recursive.c:1331

3026 +#: merge-recursive.c:1363

3027 #, c-format

3028 msgid "Unable to add %s to database"

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

3030

2938 -#: merge-recursive.c:1363

3031 +#: merge-recursive.c:1395

3032 #, c-format

3033 msgid "Auto-merging %s"

3034 msgstr "Slår ihop %s automatiskt"

3035

2943 -#: merge-recursive.c:1434

3036 +#: merge-recursive.c:1416

3037 #, c-format

3038 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

3039 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

3040

2948 -#: merge-recursive.c:1501

3041 +#: merge-recursive.c:1483

3042 #, c-format

3043 msgid ""

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

@@ -2954,7 +3047,7 @@ msgstr ""

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

3048 "i trädet."

3049

2957 -#: merge-recursive.c:1506

3050 +#: merge-recursive.c:1488

3051 #, c-format

3052 msgid ""

3053 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2963,7 +3056,7 @@ msgstr ""

3056 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

3057 "%s lämnad i trädet."

3058

2966 -#: merge-recursive.c:1513

3059 +#: merge-recursive.c:1495

3060 #, c-format

3061 msgid ""

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

@@ -2972,7 +3065,7 @@ msgstr ""

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

3066 "i trädet vid %s."

3067

2975 -#: merge-recursive.c:1518

3068 +#: merge-recursive.c:1500

3069 #, c-format

3070 msgid ""

3071 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2981,31 +3074,31 @@ msgstr ""

3074 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

3075 "%s lämnad i trädet vid %s."

3076

2984 -#: merge-recursive.c:1552

3077 +#: merge-recursive.c:1534

3078 msgid "rename"

3079 msgstr "namnbyte"

3080

2988 -#: merge-recursive.c:1552

3081 +#: merge-recursive.c:1534

3082 msgid "renamed"

3083 msgstr "namnbytt"

3084

2992 -#: merge-recursive.c:1606 merge-recursive.c:1762 merge-recursive.c:2394

2993 -#: merge-recursive.c:3129

3085 +#: merge-recursive.c:1588 merge-recursive.c:1737 merge-recursive.c:2369

3086 +#: merge-recursive.c:3124

3087 #, c-format

3088 msgid "Refusing to lose dirty file at %s"

3089 msgstr "Vägrar förlora lortig fil vid \"%s\""

3090

2998 -#: merge-recursive.c:1620

3091 +#: merge-recursive.c:1602

3092 #, c-format

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

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

3095

3003 -#: merge-recursive.c:1625

3096 +#: merge-recursive.c:1607

3097 #, c-format

3098 msgid "Refusing to lose untracked file at %s; adding as %s instead"

3099 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

3100

3008 -#: merge-recursive.c:1651

3101 +#: merge-recursive.c:1633

3102 #, c-format

3103 msgid ""

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

@@ -3014,27 +3107,27 @@ msgstr ""

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

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

3109

3017 -#: merge-recursive.c:1656

3110 +#: merge-recursive.c:1638

3111 msgid " (left unresolved)"

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

3113

3021 -#: merge-recursive.c:1720

3114 +#: merge-recursive.c:1699

3115 #, c-format

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

3117 msgstr ""

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

3119

3027 -#: merge-recursive.c:1759

3120 +#: merge-recursive.c:1734

3121 #, c-format

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

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

3124

3032 -#: merge-recursive.c:1771

3125 +#: merge-recursive.c:1746

3126 #, c-format

3127 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3128 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3129

3037 -#: merge-recursive.c:1977

3130 +#: merge-recursive.c:1952

3131 #, c-format

3132 msgid ""

3133 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3045,7 +3138,7 @@ msgstr ""

3138 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

3139 "destination fick en majoritet av filerna."

3140

3048 -#: merge-recursive.c:2009

3141 +#: merge-recursive.c:1984

3142 #, c-format

3143 msgid ""

3144 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3054,7 +3147,7 @@ msgstr ""

3147 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

3148 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

3149

3057 -#: merge-recursive.c:2019

3150 +#: merge-recursive.c:1994

3151 #, c-format

3152 msgid ""

3153 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3063,7 +3156,7 @@ msgstr ""

3156 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

3157 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

3158

3066 -#: merge-recursive.c:2111

3159 +#: merge-recursive.c:2086

3160 #, c-format

3161 msgid ""

3162 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3072,7 +3165,7 @@ msgstr ""

3165 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

3166 "%s->%s i %s"

3167

3075 -#: merge-recursive.c:2356

3168 +#: merge-recursive.c:2331

3169 #, c-format

3170 msgid ""

3171 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3081,86 +3174,86 @@ msgstr ""

3174 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

3175 "bytt namn."

3176

3084 -#: merge-recursive.c:2762

3177 +#: merge-recursive.c:2737

3178 #, c-format

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

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

3181

3089 -#: merge-recursive.c:2777

3182 +#: merge-recursive.c:2763

3183 #, c-format

3184 msgid "Adding merged %s"

3185 msgstr "Lägger till sammanslagen %s"

3186

3094 -#: merge-recursive.c:2784 merge-recursive.c:3132

3187 +#: merge-recursive.c:2770 merge-recursive.c:3127

3188 #, c-format

3189 msgid "Adding as %s instead"

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

3191

3099 -#: merge-recursive.c:2941

3192 +#: merge-recursive.c:2934

3193 #, c-format

3194 msgid "cannot read object %s"

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

3196

3104 -#: merge-recursive.c:2944

3197 +#: merge-recursive.c:2937

3198 #, c-format

3199 msgid "object %s is not a blob"

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

3201

3109 -#: merge-recursive.c:3013

3202 +#: merge-recursive.c:3006

3203 msgid "modify"

3204 msgstr "ändra"

3205

3113 -#: merge-recursive.c:3013

3206 +#: merge-recursive.c:3006

3207 msgid "modified"

3208 msgstr "ändrad"

3209

3117 -#: merge-recursive.c:3024

3210 +#: merge-recursive.c:3017

3211 msgid "content"

3212 msgstr "innehåll"

3213

3121 -#: merge-recursive.c:3031

3214 +#: merge-recursive.c:3024

3215 msgid "add/add"

3216 msgstr "tillägg/tillägg"

3217

3125 -#: merge-recursive.c:3076

3218 +#: merge-recursive.c:3071

3219 #, c-format

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

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

3222

3130 -#: merge-recursive.c:3098 git-submodule.sh:865

3223 +#: merge-recursive.c:3093 git-submodule.sh:858

3224 msgid "submodule"

3225 msgstr "undermodul"

3226

3134 -#: merge-recursive.c:3099

3227 +#: merge-recursive.c:3094

3228 #, c-format

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

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

3231

3139 -#: merge-recursive.c:3221

3232 +#: merge-recursive.c:3216

3233 #, c-format

3234 msgid "Removing %s"

3235 msgstr "Tar bort %s"

3236

3144 -#: merge-recursive.c:3247

3237 +#: merge-recursive.c:3242

3238 msgid "file/directory"

3239 msgstr "fil/katalog"

3240

3148 -#: merge-recursive.c:3253

3241 +#: merge-recursive.c:3248

3242 msgid "directory/file"

3243 msgstr "katalog/fil"

3244

3152 -#: merge-recursive.c:3260

3245 +#: merge-recursive.c:3255

3246 #, c-format

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

3248 msgstr ""

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

3250

3158 -#: merge-recursive.c:3269

3251 +#: merge-recursive.c:3264

3252 #, c-format

3253 msgid "Adding %s"

3254 msgstr "Lägger till %s"

3255

3163 -#: merge-recursive.c:3303

3256 +#: merge-recursive.c:3300

3257 #, c-format

3258 msgid ""

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

@@ -3170,40 +3263,168 @@ msgstr ""

3263 "sammanslagning:\n"

3264 " %s"

3265

3173 -#: merge-recursive.c:3314

3266 +#: merge-recursive.c:3311

3267 msgid "Already up to date!"

3268 msgstr "Redan à jour!"

3269

3177 -#: merge-recursive.c:3323

3270 +#: merge-recursive.c:3320

3271 #, c-format

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

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

3274

3182 -#: merge-recursive.c:3422

3275 +#: merge-recursive.c:3419

3276 msgid "Merging:"

3277 msgstr "Slår ihop:"

3278

3186 -#: merge-recursive.c:3435

3279 +#: merge-recursive.c:3432

3280 #, c-format

3281 msgid "found %u common ancestor:"

3282 msgid_plural "found %u common ancestors:"

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

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

3285

3193 -#: merge-recursive.c:3474

3286 +#: merge-recursive.c:3471

3287 msgid "merge returned no commit"

3288 msgstr "sammanslagningen returnerade ingen incheckning"

3289

3197 -#: merge-recursive.c:3540

3290 +#: merge-recursive.c:3537

3291 #, c-format

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

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

3294

3202 -#: merge-recursive.c:3556 builtin/merge.c:689 builtin/merge.c:846

3295 +#: merge-recursive.c:3553 builtin/merge.c:691 builtin/merge.c:849

3296 msgid "Unable to write index."

3297 msgstr "Kunde inte skriva indexet."

3298

3206 -#: notes-merge.c:274

3299 +#: midx.c:65

3300 +#, c-format

3301 +msgid "multi-pack-index file %s is too small"

3302 +msgstr "multi-pack-indexfilen %s är för liten"

3303 +

3304 +#: midx.c:81

3305 +#, c-format

3306 +msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

3307 +msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

3308 +

3309 +#: midx.c:86

3310 +#, c-format

3311 +msgid "multi-pack-index version %d not recognized"

3312 +msgstr "multi-pack-indexversionen %d stöds inte"

3313 +

3314 +#: midx.c:91

3315 +#, c-format

3316 +msgid "hash version %u does not match"

3317 +msgstr "hash-versionen %u stämmer inte"

3318 +

3319 +#: midx.c:105

3320 +msgid "invalid chunk offset (too large)"

3321 +msgstr "felaktigt offset för stycke (för stort)"

3322 +

3323 +#: midx.c:129

3324 +msgid "terminating multi-pack-index chunk id appears earlier than expected"

3325 +msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat"

3326 +

3327 +#: midx.c:142

3328 +msgid "multi-pack-index missing required pack-name chunk"

3329 +msgstr "multi-pack-index saknar krävd paketnamn-stycke"

3330 +

3331 +#: midx.c:144

3332 +msgid "multi-pack-index missing required OID fanout chunk"

3333 +msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

3334 +

3335 +#: midx.c:146

3336 +msgid "multi-pack-index missing required OID lookup chunk"

3337 +msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

3338 +

3339 +#: midx.c:148

3340 +msgid "multi-pack-index missing required object offsets chunk"

3341 +msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

3342 +

3343 +#: midx.c:162

3344 +#, c-format

3345 +msgid "multi-pack-index pack names out of order: '%s' before '%s'"

3346 +msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

3347 +

3348 +#: midx.c:205

3349 +#, c-format

3350 +msgid "bad pack-int-id: %u (%u total packs"

3351 +msgstr "bad pack-int-id: %u (%u paket totalt"

3352 +

3353 +#: midx.c:246

3354 +msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

3355 +msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

3356 +

3357 +#: midx.c:271

3358 +msgid "error preparing packfile from multi-pack-index"

3359 +msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

3360 +

3361 +#: midx.c:407

3362 +#, c-format

3363 +msgid "failed to add packfile '%s'"

3364 +msgstr "misslyckades läsa paketfilen \"%s\""

3365 +

3366 +#: midx.c:413

3367 +#, c-format

3368 +msgid "failed to open pack-index '%s'"

3369 +msgstr "misslyckades öppna paketindexet \"%s\""

3370 +

3371 +#: midx.c:507

3372 +#, c-format

3373 +msgid "failed to locate object %d in packfile"

3374 +msgstr "misslyckades hitta objekt %d i paketfilen"

3375 +

3376 +#: midx.c:943

3377 +#, c-format

3378 +msgid "failed to clear multi-pack-index at %s"

3379 +msgstr "misslyckades städa multi-pack-index på %s"

3380 +

3381 +#: midx.c:981

3382 +#, c-format

3383 +msgid ""

3384 +"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3385 +msgstr ""

3386 +"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

3387 +

3388 +#: midx.c:992

3389 +#, c-format

3390 +msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

3391 +msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

3392 +

3393 +#: midx.c:996

3394 +msgid "Verifying object offsets"

3395 +msgstr "Bekräftar offset för objekt"

3396 +

3397 +#: midx.c:1004

3398 +#, c-format

3399 +msgid "failed to load pack entry for oid[%d] = %s"

3400 +msgstr "misslyckades läsa paketpost för oid[%d] = %s"

3401 +

3402 +#: midx.c:1010

3403 +#, c-format

3404 +msgid "failed to load pack-index for packfile %s"

3405 +msgstr "misslyckades läsa paketindex för paketfil %s"

3406 +

3407 +#: midx.c:1019

3408 +#, c-format

3409 +msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3410 +msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

3411 +

3412 +#: name-hash.c:532

3413 +#, c-format

3414 +msgid "unable to create lazy_dir thread: %s"

3415 +msgstr "misslyckades skapa lazy_dir-tråd: %s"

3416 +

3417 +#: name-hash.c:554

3418 +#, c-format

3419 +msgid "unable to create lazy_name thread: %s"

3420 +msgstr "misslyckades skapa lazy_name-tråd: %s"

3421 +

3422 +#: name-hash.c:560

3423 +#, c-format

3424 +msgid "unable to join lazy_name thread: %s"

3425 +msgstr "misslyckades utföra join på lazy_name-tråd: %s"

3426 +

3427 +#: notes-merge.c:275

3428 #, c-format

3429 msgid ""

3430 "You have not concluded your previous notes merge (%s exists).\n"

@@ -3215,7 +3436,7 @@ msgstr ""

3436 "att checka in eller avbryta föregående sammanslagning innan du påbörjar en "

3437 "ny antecknings-sammanslagning."

3438

3218 -#: notes-merge.c:281

3439 +#: notes-merge.c:282

3440 #, c-format

3441 msgid "You have not concluded your notes merge (%s exists)."

3442 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."

@@ -3268,16 +3489,16 @@ msgstr "kunde inte tolka objektet: %s"

3489 msgid "sha1 mismatch %s"

3490 msgstr "sha1 stämmer inte överens %s"

3491

3271 -#: packfile.c:563

3492 +#: packfile.c:607

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

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

3495

3275 -#: packfile.c:1745

3496 +#: packfile.c:1864

3497 #, c-format

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

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

3500

3280 -#: packfile.c:1749

3501 +#: packfile.c:1868

3502 #, c-format

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

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

@@ -3308,17 +3529,17 @@ msgstr " %s"

3529 msgid "-NUM"

3530 msgstr "-TAL"

3531

3311 -#: parse-options-cb.c:44

3532 +#: parse-options-cb.c:37

3533 #, c-format

3534 msgid "malformed expiration date '%s'"

3535 msgstr "trasigt utlöpsdatum: ”%s”"

3536

3316 -#: parse-options-cb.c:112

3537 +#: parse-options-cb.c:109

3538 #, c-format

3539 msgid "malformed object name '%s'"

3540 msgstr "felformat objektnamn \"%s\""

3541

3321 -#: path.c:892

3542 +#: path.c:894

3543 #, c-format

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

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

@@ -3435,33 +3656,46 @@ msgstr "protokollfel: felaktig radlängdstecken: %.4s"

3656 msgid "protocol error: bad line length %d"

3657 msgstr "protokollfel: felaktig radlängd: %d"

3658

3659 +#: preload-index.c:118

3660 +msgid "Refreshing index"

3661 +msgstr "Uppdaterar indexet"

3662 +

3663 +#: preload-index.c:137

3664 +#, c-format

3665 +msgid "unable to create threaded lstat: %s"

3666 +msgstr "kunde inte skapa trådad lstat: %s"

3667 +

3668 #: pretty.c:962

3669 msgid "unable to parse --pretty format"

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

3671

3442 -#: range-diff.c:48

3672 +#: range-diff.c:56

3673 msgid "could not start `log`"

3674 msgstr "kunde inte starta \"log\""

3675

3446 -#: range-diff.c:51

3676 +#: range-diff.c:59

3677 msgid "could not read `log` output"

3678 msgstr "kunde inte läsa utdata från \"log\""

3679

3450 -#: range-diff.c:66 sequencer.c:4540

3680 +#: range-diff.c:74 sequencer.c:4764

3681 #, c-format

3682 msgid "could not parse commit '%s'"

3453 -msgstr "kunde inte tolka incheckningen\" %s\""

3683 +msgstr "kunde inte tolka incheckningen \"%s\""

3684

3455 -#: range-diff.c:196

3685 +#: range-diff.c:224

3686 msgid "failed to generate diff"

3687 msgstr "misslyckades skapa diff"

3688

3459 -#: range-diff.c:421 range-diff.c:423

3689 +#: range-diff.c:455 range-diff.c:457

3690 #, c-format

3691 msgid "could not parse log for '%s'"

3692 msgstr "kunde inte tolka loggen för \"%s\""

3693

3464 -#: read-cache.c:1579

3694 +#: read-cache.c:1490

3695 +msgid "Refresh index"

3696 +msgstr "Uppdatera indexet"

3697 +

3698 +#: read-cache.c:1604

3699 #, c-format

3700 msgid ""

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

@@ -3470,7 +3704,7 @@ msgstr ""

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

3705 "Använder version %i"

3706

3473 -#: read-cache.c:1589

3707 +#: read-cache.c:1614

3708 #, c-format

3709 msgid ""

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

@@ -3479,135 +3713,263 @@ msgstr ""

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

3714 "Använder version %i"

3715

3482 -#: read-cache.c:2580 sequencer.c:4503 wrapper.c:658 builtin/merge.c:1083

3716 +#: read-cache.c:1792

3717 +#, c-format

3718 +msgid "malformed name field in the index, near path '%s'"

3719 +msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

3720 +

3721 +#: read-cache.c:1960 rerere.c:565 rerere.c:599 rerere.c:1111 builtin/add.c:458

3722 +#: builtin/check-ignore.c:177 builtin/checkout.c:289 builtin/checkout.c:585

3723 +#: builtin/checkout.c:953 builtin/clean.c:954 builtin/commit.c:343

3724 +#: builtin/diff-tree.c:115 builtin/grep.c:489 builtin/mv.c:144

3725 +#: builtin/reset.c:244 builtin/rm.c:270 builtin/submodule--helper.c:329

3726 +msgid "index file corrupt"

3727 +msgstr "indexfilen trasig"

3728 +

3729 +#: read-cache.c:2101

3730 +#, c-format

3731 +msgid "unable to create load_cache_entries thread: %s"

3732 +msgstr "kunde inte läsa in cache_entries-tråden: %s"

3733 +

3734 +#: read-cache.c:2114

3735 +#, c-format

3736 +msgid "unable to join load_cache_entries thread: %s"

3737 +msgstr "kunde inte utföra join på cache_entries-tråden: %s"

3738 +

3739 +#: read-cache.c:2200

3740 +#, c-format

3741 +msgid "unable to create load_index_extensions thread: %s"

3742 +msgstr "kunde inte skapa load_index_extensions-tråden: %s"

3743 +

3744 +#: read-cache.c:2227

3745 +#, c-format

3746 +msgid "unable to join load_index_extensions thread: %s"

3747 +msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

3748 +

3749 +#: read-cache.c:2953 sequencer.c:4727 wrapper.c:658 builtin/merge.c:1086

3750 #, c-format

3751 msgid "could not close '%s'"

3752 msgstr "kunde inte stänga \"%s\""

3753

3487 -#: read-cache.c:2653 sequencer.c:2113 sequencer.c:3374

3754 +#: read-cache.c:3026 sequencer.c:2203 sequencer.c:3592

3755 #, c-format

3756 msgid "could not stat '%s'"

3757 msgstr "kunde inte ta status på \"%s\""

3758

3492 -#: read-cache.c:2666

3759 +#: read-cache.c:3039

3760 #, c-format

3761 msgid "unable to open git dir: %s"

3762 msgstr "kunde inte öppna git-katalog: %s"

3763

3497 -#: read-cache.c:2678

3764 +#: read-cache.c:3051

3765 #, c-format

3766 msgid "unable to unlink: %s"

3767 msgstr "misslyckades ta bort länken: %s"

3768

3769 +#: rebase-interactive.c:10

3770 +msgid ""

3771 +"\n"

3772 +"Commands:\n"

3773 +"p, pick <commit> = use commit\n"

3774 +"r, reword <commit> = use commit, but edit the commit message\n"

3775 +"e, edit <commit> = use commit, but stop for amending\n"

3776 +"s, squash <commit> = use commit, but meld into previous commit\n"

3777 +"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"

3778 +"x, exec <command> = run command (the rest of the line) using shell\n"

3779 +"b, break = stop here (continue rebase later with 'git rebase --continue')\n"

3780 +"d, drop <commit> = remove commit\n"

3781 +"l, label <label> = label current HEAD with a name\n"

3782 +"t, reset <label> = reset HEAD to a label\n"

3783 +"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"

3784 +". create a merge commit using the original merge commit's\n"

3785 +". message (or the oneline, if no original merge commit was\n"

3786 +". specified). Use -c <commit> to reword the commit message.\n"

3787 +"\n"

3788 +"These lines can be re-ordered; they are executed from top to bottom.\n"

3789 +msgstr ""

3790 +"\n"

3791 +"Kommandon:\n"

3792 +"p, pick <incheckning> = använd incheckning\n"

3793 +"r, reword <incheckning> = använd incheckning, men redigera "

3794 +"incheckningsmeddelandet\n"

3795 +"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"

3796 +"s, squash <incheckning> = använd incheckning, men infoga i föregående "

3797 +"incheckning\n"

3798 +"f, fixup <incheckning> = som \"squash\", men förkasta "

3799 +"incheckningsmeddelandet\n"

3800 +"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"

3801 +"b, break = stoppa här (fortsätt ombaseringen senare med \"git rebase --"

3802 +"continue\")\n"

3803 +"d, drop <incheckning> = ta bort incheckning\n"

3804 +"l, label <etikett> = ge aktuellt HEAD ett namn\n"

3805 +"t, reset <etikett> = återställ HEAD till en etikett\n"

3806 +"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"

3807 +". skapa en sammanslagning med ursprungligt meddelande (eller\n"

3808 +". enrads, om inget incheckningsmeddelande angavs). Använd\n"

3809 +". -v <incheckning> för att skriva om meddelandet.\n"

3810 +"\n"

3811 +"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"

3812 +

3813 +#: rebase-interactive.c:31 git-rebase--preserve-merges.sh:173

3814 +msgid ""

3815 +"\n"

3816 +"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"

3817 +msgstr ""

3818 +"\n"

3819 +"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "

3820 +"incheckning.\n"

3821 +

3822 +#: rebase-interactive.c:34 git-rebase--preserve-merges.sh:177

3823 +msgid ""

3824 +"\n"

3825 +"If you remove a line here THAT COMMIT WILL BE LOST.\n"

3826 +msgstr ""

3827 +"\n"

3828 +"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"

3829 +

3830 +#: rebase-interactive.c:40 git-rebase--preserve-merges.sh:816

3831 +msgid ""

3832 +"\n"

3833 +"You are editing the todo file of an ongoing interactive rebase.\n"

3834 +"To continue rebase after editing, run:\n"

3835 +" git rebase --continue\n"

3836 +"\n"

3837 +msgstr ""

3838 +"\n"

3839 +"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n"

3840 +"För att forsätta ombasera efter redigeringen, kör:\n"

3841 +" git rebase --continue\n"

3842 +"\n"

3843 +

3844 +#: rebase-interactive.c:45 git-rebase--preserve-merges.sh:893

3845 +msgid ""

3846 +"\n"

3847 +"However, if you remove everything, the rebase will be aborted.\n"

3848 +"\n"

3849 +msgstr ""

3850 +"\n"

3851 +"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"

3852 +"\n"

3853 +

3854 +#: rebase-interactive.c:51 git-rebase--preserve-merges.sh:900

3855 +msgid "Note that empty commits are commented out"

3856 +msgstr "Observera att tomma incheckningar är utkommenterade"

3857 +

3858 +#: rebase-interactive.c:62 rebase-interactive.c:75 sequencer.c:2186

3859 +#: sequencer.c:4505 sequencer.c:4561 sequencer.c:4836

3860 +#, c-format

3861 +msgid "could not read '%s'."

3862 +msgstr "kunde inte läsa \"%s\"."

3863 +

3864 #: refs.c:192

3865 #, c-format

3866 msgid "%s does not point to a valid object!"

3867 msgstr "\"%s\" pekar inte på ett giltigt objekt!"

3868

3507 -#: refs.c:579

3869 +#: refs.c:583

3870 #, c-format

3871 msgid "ignoring dangling symref %s"

3872 msgstr "ignorerar dinglande symbolisk referens %s"

3873

3512 -#: refs.c:581 ref-filter.c:2067

3874 +#: refs.c:585 ref-filter.c:1951

3875 #, c-format

3876 msgid "ignoring broken ref %s"

3877 msgstr "ignorerar trasig referens %s"

3878

3517 -#: refs.c:685

3879 +#: refs.c:711

3880 #, c-format

3881 msgid "could not open '%s' for writing: %s"

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

3883

3522 -#: refs.c:695 refs.c:746

3884 +#: refs.c:721 refs.c:772

3885 #, c-format

3886 msgid "could not read ref '%s'"

3887 msgstr "Kunde inte läsa referensen \"%s\""

3888

3527 -#: refs.c:701

3889 +#: refs.c:727

3890 #, c-format

3891 msgid "ref '%s' already exists"

3892 msgstr "referensen \"%s\" finns redan"

3893

3532 -#: refs.c:706

3894 +#: refs.c:732

3895 #, c-format

3896 msgid "unexpected object ID when writing '%s'"

3897 msgstr "oväntat objekt-id vid skrivning \"%s\""

3898

3537 -#: refs.c:714 sequencer.c:385 sequencer.c:2366 sequencer.c:2492

3538 -#: sequencer.c:2506 sequencer.c:2733 sequencer.c:4501 sequencer.c:4564

3899 +#: refs.c:740 sequencer.c:394 sequencer.c:2510 sequencer.c:2636

3900 +#: sequencer.c:2650 sequencer.c:2877 sequencer.c:4725 sequencer.c:4788

3901 #: wrapper.c:656

3902 #, c-format

3903 msgid "could not write to '%s'"

3904 msgstr "kunde inte skriva till \"%s\""

3905

3544 -#: refs.c:741 sequencer.c:4499 sequencer.c:4558 wrapper.c:225 wrapper.c:395

3545 -#: builtin/am.c:780

3906 +#: refs.c:767 sequencer.c:4723 sequencer.c:4782 wrapper.c:225 wrapper.c:395

3907 +#: builtin/am.c:728

3908 #, c-format

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

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

3911

3550 -#: refs.c:748

3912 +#: refs.c:774

3913 #, c-format

3914 msgid "unexpected object ID when deleting '%s'"

3915 msgstr "oväntat objekt-id vid borttagning \"%s\""

3916

3555 -#: refs.c:879

3917 +#: refs.c:905

3918 #, c-format

3919 msgid "log for ref %s has gap after %s"

3920 msgstr "loggen för referensen %s har lucka efter %s"

3921

3560 -#: refs.c:885

3922 +#: refs.c:911

3923 #, c-format

3924 msgid "log for ref %s unexpectedly ended on %s"

3925 msgstr "loggen för referensen %s slutade oväntat på %s"

3926

3565 -#: refs.c:943

3927 +#: refs.c:969

3928 #, c-format

3929 msgid "log for %s is empty"

3930 msgstr "loggen för %s är tom"

3931

3570 -#: refs.c:1035

3932 +#: refs.c:1061

3933 #, c-format

3934 msgid "refusing to update ref with bad name '%s'"

3935 msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

3936

3575 -#: refs.c:1111

3937 +#: refs.c:1137

3938 #, c-format

3939 msgid "update_ref failed for ref '%s': %s"

3940 msgstr "update_ref misslyckades för referensen \"%s\": %s"

3941

3580 -#: refs.c:1853

3942 +#: refs.c:1911

3943 #, c-format

3944 msgid "multiple updates for ref '%s' not allowed"

3945 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

3946

3585 -#: refs.c:1885

3947 +#: refs.c:1943

3948 msgid "ref updates forbidden inside quarantine environment"

3949 msgstr "referensuppdateringar förbjudna i karantänmiljö"

3950

3589 -#: refs.c:1981 refs.c:2011

3951 +#: refs.c:2039 refs.c:2069

3952 #, c-format

3953 msgid "'%s' exists; cannot create '%s'"

3954 msgstr "\"%s\" finns; kan inte skapa \"%s\""

3955

3594 -#: refs.c:1987 refs.c:2022

3956 +#: refs.c:2045 refs.c:2080

3957 #, c-format

3958 msgid "cannot process '%s' and '%s' at the same time"

3959 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

3960

3599 -#: refs/files-backend.c:1191

3961 +#: refs/files-backend.c:1227

3962 #, c-format

3963 msgid "could not remove reference %s"

3964 msgstr "kunde inte ta bort referensen %s"

3965

3604 -#: refs/files-backend.c:1205 refs/packed-backend.c:1532

3966 +#: refs/files-backend.c:1241 refs/packed-backend.c:1532

3967 #: refs/packed-backend.c:1542

3968 #, c-format

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

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

3971

3610 -#: refs/files-backend.c:1208 refs/packed-backend.c:1545

3972 +#: refs/files-backend.c:1244 refs/packed-backend.c:1545

3973 #, c-format

3974 msgid "could not delete references: %s"

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

@@ -3617,191 +3979,198 @@ msgstr "kunde inte ta bort referenser: %s"

3979 msgid "invalid refspec '%s'"

3980 msgstr "felaktig referensspecifikation: \"%s\""

3981

3620 -#: ref-filter.c:38 wt-status.c:1850

3982 +#: ref-filter.c:39 wt-status.c:1855

3983 msgid "gone"

3984 msgstr "försvunnen"

3985

3624 -#: ref-filter.c:39

3986 +#: ref-filter.c:40

3987 #, c-format

3988 msgid "ahead %d"

3989 msgstr "före %d"

3990

3629 -#: ref-filter.c:40

3991 +#: ref-filter.c:41

3992 #, c-format

3993 msgid "behind %d"

3994 msgstr "bakom %d"

3995

3634 -#: ref-filter.c:41

3996 +#: ref-filter.c:42

3997 #, c-format

3998 msgid "ahead %d, behind %d"

3999 msgstr "före %d, bakom %d"

4000

3639 -#: ref-filter.c:137

4001 +#: ref-filter.c:138

4002 #, c-format

4003 msgid "expected format: %%(color:<color>)"

4004 msgstr "förväntat format: %%(color:<color>)"

4005

3644 -#: ref-filter.c:139

4006 +#: ref-filter.c:140

4007 #, c-format

4008 msgid "unrecognized color: %%(color:%s)"

4009 msgstr "okänd färg: %%(color:%s)"

4010

3649 -#: ref-filter.c:161

4011 +#: ref-filter.c:162

4012 #, c-format

4013 msgid "Integer value expected refname:lstrip=%s"

4014 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

4015

3654 -#: ref-filter.c:165

4016 +#: ref-filter.c:166

4017 #, c-format

4018 msgid "Integer value expected refname:rstrip=%s"

4019 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

4020

3659 -#: ref-filter.c:167

4021 +#: ref-filter.c:168

4022 #, c-format

4023 msgid "unrecognized %%(%s) argument: %s"

4024 msgstr "okänt %%(%s)-argument: %s"

4025

3664 -#: ref-filter.c:222

4026 +#: ref-filter.c:223

4027 #, c-format

4028 msgid "%%(objecttype) does not take arguments"

4029 msgstr "%%(objecttype) tar inte argument"

4030

3669 -#: ref-filter.c:234

4031 +#: ref-filter.c:235

4032 #, c-format

4033 msgid "%%(objectsize) does not take arguments"

4034 msgstr "%%(objectsize) tar inte argument"

4035

3674 -#: ref-filter.c:246

4036 +#: ref-filter.c:247

4037 #, c-format

4038 msgid "%%(body) does not take arguments"

4039 msgstr "%%(body) tar inte argument"

4040

3679 -#: ref-filter.c:255

4041 +#: ref-filter.c:256

4042 #, c-format

4043 msgid "%%(subject) does not take arguments"

4044 msgstr "%%(subject) tar inte argument"

4045

3684 -#: ref-filter.c:275

4046 +#: ref-filter.c:278

4047 #, c-format

4048 msgid "unknown %%(trailers) argument: %s"

4049 msgstr "okänt %%(trailers)-argument: %s"

4050

3689 -#: ref-filter.c:304

4051 +#: ref-filter.c:307

4052 #, c-format

4053 msgid "positive value expected contents:lines=%s"

4054 msgstr "positivt värde förväntat contents:lines=%s"

4055

3694 -#: ref-filter.c:306

4056 +#: ref-filter.c:309

4057 #, c-format

4058 msgid "unrecognized %%(contents) argument: %s"

4059 msgstr "okänt %%(contents)-argument: %s"

4060

3699 -#: ref-filter.c:321

4061 +#: ref-filter.c:324

4062 #, c-format

4063 msgid "positive value expected objectname:short=%s"

4064 msgstr "positivt värde förväntat objectname:short=%s"

4065

3704 -#: ref-filter.c:325

4066 +#: ref-filter.c:328

4067 #, c-format

4068 msgid "unrecognized %%(objectname) argument: %s"

4069 msgstr "okänt %%(objectname)-argument: %s"

4070

3709 -#: ref-filter.c:355

4071 +#: ref-filter.c:358

4072 #, c-format

4073 msgid "expected format: %%(align:<width>,<position>)"

4074 msgstr "förväntat format: %%(align:<bredd>,<position>)"

4075

3714 -#: ref-filter.c:367

4076 +#: ref-filter.c:370

4077 #, c-format

4078 msgid "unrecognized position:%s"

4079 msgstr "okänd position:%s"

4080

3719 -#: ref-filter.c:374

4081 +#: ref-filter.c:377

4082 #, c-format

4083 msgid "unrecognized width:%s"

4084 msgstr "okänd bredd:%s"

4085

3724 -#: ref-filter.c:383

4086 +#: ref-filter.c:386

4087 #, c-format

4088 msgid "unrecognized %%(align) argument: %s"

4089 msgstr "okänt %%(align)-argument: %s"

4090

3729 -#: ref-filter.c:391

4091 +#: ref-filter.c:394

4092 #, c-format

4093 msgid "positive width expected with the %%(align) atom"

4094 msgstr "positiv bredd förväntad med atomen %%(align)"

4095

3734 -#: ref-filter.c:409

4096 +#: ref-filter.c:412

4097 #, c-format

4098 msgid "unrecognized %%(if) argument: %s"

4099 msgstr "okänt %%(if)-argument: %s"

4100

3739 -#: ref-filter.c:505

4101 +#: ref-filter.c:508

4102 #, c-format

4103 msgid "malformed field name: %.*s"

4104 msgstr "felformat fältnamn: %.*s"

4105

3744 -#: ref-filter.c:532

4106 +#: ref-filter.c:535

4107 #, c-format

4108 msgid "unknown field name: %.*s"

4109 msgstr "okänt fältnamn: %.*s"

4110

3749 -#: ref-filter.c:656

4111 +#: ref-filter.c:539

4112 +#, c-format

4113 +msgid ""

4114 +"not a git repository, but the field '%.*s' requires access to object data"

4115 +msgstr ""

4116 +"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

4117 +

4118 +#: ref-filter.c:663

4119 #, c-format

4120 msgid "format: %%(if) atom used without a %%(then) atom"

4121 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

4122

3754 -#: ref-filter.c:719

4123 +#: ref-filter.c:726

4124 #, c-format

4125 msgid "format: %%(then) atom used without an %%(if) atom"

4126 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

4127

3759 -#: ref-filter.c:721

4128 +#: ref-filter.c:728

4129 #, c-format

4130 msgid "format: %%(then) atom used more than once"

4131 msgstr "format: atomen %%(then) använd mer än en gång"

4132

3764 -#: ref-filter.c:723

4133 +#: ref-filter.c:730

4134 #, c-format

4135 msgid "format: %%(then) atom used after %%(else)"

4136 msgstr "format: atomen %%(then) använd efter %%(else)"

4137

3769 -#: ref-filter.c:751

4138 +#: ref-filter.c:758

4139 #, c-format

4140 msgid "format: %%(else) atom used without an %%(if) atom"

4141 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

4142

3774 -#: ref-filter.c:753

4143 +#: ref-filter.c:760

4144 #, c-format

4145 msgid "format: %%(else) atom used without a %%(then) atom"

4146 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

4147

3779 -#: ref-filter.c:755

4148 +#: ref-filter.c:762

4149 #, c-format

4150 msgid "format: %%(else) atom used more than once"

4151 msgstr "format: atomen %%(else) använd mer än en gång"

4152

3784 -#: ref-filter.c:770

4153 +#: ref-filter.c:777

4154 #, c-format

4155 msgid "format: %%(end) atom used without corresponding atom"

4156 msgstr "format: atomen %%(end) använd utan motsvarande atom"

4157

3789 -#: ref-filter.c:827

4158 +#: ref-filter.c:834

4159 #, c-format

4160 msgid "malformed format string %s"

4161 msgstr "felformad formatsträng %s"

4162

3794 -#: ref-filter.c:1416

4163 +#: ref-filter.c:1424

4164 #, c-format

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

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

4167

3799 -#: ref-filter.c:1419

4168 +#: ref-filter.c:1427

4169 #, c-format

4170 msgid "(no branch, rebasing detached HEAD %s)"

4171 msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

4172

3804 -#: ref-filter.c:1422

4173 +#: ref-filter.c:1430

4174 #, c-format

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

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

@@ -3809,7 +4178,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"

4178 #. TRANSLATORS: make sure this matches "HEAD

4179 #. detached at " in wt-status.c

4180 #.

3812 -#: ref-filter.c:1430

4181 +#: ref-filter.c:1438

4182 #, c-format

4183 msgid "(HEAD detached at %s)"

4184 msgstr "(HEAD frånkopplat vid %s)"

@@ -3817,142 +4186,142 @@ msgstr "(HEAD frånkopplat vid %s)"

4186 #. TRANSLATORS: make sure this matches "HEAD

4187 #. detached from " in wt-status.c

4188 #.

3820 -#: ref-filter.c:1437

4189 +#: ref-filter.c:1445

4190 #, c-format

4191 msgid "(HEAD detached from %s)"

4192 msgstr "(HEAD frånkopplat från %s)"

4193

3825 -#: ref-filter.c:1441

4194 +#: ref-filter.c:1449

4195 msgid "(no branch)"

4196 msgstr "(ingen gren)"

4197

3829 -#: ref-filter.c:1475 ref-filter.c:1623

4198 +#: ref-filter.c:1483 ref-filter.c:1638

4199 #, c-format

4200 msgid "missing object %s for %s"

4201 msgstr "objektet %s saknas för %s"

4202

3834 -#: ref-filter.c:1483

4203 +#: ref-filter.c:1491

4204 #, c-format

4205 msgid "parse_object_buffer failed on %s for %s"

4206 msgstr "parse_object_buffer misslyckades på %s för %s"

4207

3839 -#: ref-filter.c:1980

4208 +#: ref-filter.c:1857

4209 #, c-format

4210 msgid "malformed object at '%s'"

4211 msgstr "felformat objekt vid \"%s\""

4212

3844 -#: ref-filter.c:2062

4213 +#: ref-filter.c:1946

4214 #, c-format

4215 msgid "ignoring ref with broken name %s"

4216 msgstr "ignorerar referens med trasigt namn %s"

4217

3849 -#: ref-filter.c:2340

4218 +#: ref-filter.c:2232

4219 #, c-format

4220 msgid "format: %%(end) atom missing"

4221 msgstr "format: atomen %%(end) saknas"

4222

3854 -#: ref-filter.c:2444

4223 +#: ref-filter.c:2338

4224 #, c-format

4225 msgid "malformed object name %s"

4226 msgstr "felformat objektnamn %s"

4227

3859 -#: remote.c:606

4228 +#: remote.c:607

4229 #, c-format

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

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

4232

3864 -#: remote.c:610

4233 +#: remote.c:611

4234 #, c-format

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

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

4237

3869 -#: remote.c:614

4238 +#: remote.c:615

4239 #, c-format

4240 msgid "%s tracks both %s and %s"

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

4242

3874 -#: remote.c:622

4243 +#: remote.c:623

4244 msgid "Internal error"

4245 msgstr "Internt fel"

4246

3878 -#: remote.c:1536 remote.c:1637

4247 +#: remote.c:1569 remote.c:1670

4248 msgid "HEAD does not point to a branch"

4249 msgstr "HEAD pekar inte på en gren"

4250

3882 -#: remote.c:1545

4251 +#: remote.c:1578

4252 #, c-format

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

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

4255

3887 -#: remote.c:1548

4256 +#: remote.c:1581

4257 #, c-format

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

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

4260

3892 -#: remote.c:1554

4261 +#: remote.c:1587

4262 #, c-format

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

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

4265

3897 -#: remote.c:1569

4266 +#: remote.c:1602

4267 #, c-format

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

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

4270

3902 -#: remote.c:1581

4271 +#: remote.c:1614

4272 #, c-format

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

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

4275

3907 -#: remote.c:1591

4276 +#: remote.c:1624

4277 #, c-format

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

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

4280

3912 -#: remote.c:1604

4281 +#: remote.c:1637

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

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

4284

3916 -#: remote.c:1626

4285 +#: remote.c:1659

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

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

4288

3920 -#: remote.c:1951

4289 +#: remote.c:1935

4290 #, c-format

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

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

4293

3925 -#: remote.c:1955

4294 +#: remote.c:1939

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

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

4297

3929 -#: remote.c:1958

4298 +#: remote.c:1942

4299 #, c-format

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

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

4302

3934 -#: remote.c:1962

4303 +#: remote.c:1946

4304 #, c-format

4305 msgid "Your branch and '%s' refer to different commits.\n"

4306 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

4307

3939 -#: remote.c:1965

4308 +#: remote.c:1949

4309 #, c-format

4310 msgid " (use \"%s\" for details)\n"

4311 msgstr " (använd \"%s\" för detaljer)\n"

4312

3944 -#: remote.c:1969

4313 +#: remote.c:1953

4314 #, c-format

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

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

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

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

4319

3951 -#: remote.c:1975

4320 +#: remote.c:1959

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

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

4323

3955 -#: remote.c:1978

4324 +#: remote.c:1962

4325 #, c-format

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

4327 msgid_plural ""

@@ -3962,11 +4331,11 @@ msgstr[0] ""

4331 msgstr[1] ""

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

4333

3965 -#: remote.c:1986

4334 +#: remote.c:1970

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

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

4337

3969 -#: remote.c:1989

4338 +#: remote.c:1973

4339 #, c-format

4340 msgid ""

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

@@ -3981,54 +4350,157 @@ msgstr[1] ""

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

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

4352

3984 -#: remote.c:1999

4353 +#: remote.c:1983

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

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

4356

3988 -#: replace-object.c:20

4357 +#: replace-object.c:21

4358 #, c-format

4359 msgid "bad replace ref name: %s"

4360 msgstr "felaktig ersättningsreferensnamn: %s"

4361

3993 -#: replace-object.c:29

4362 +#: replace-object.c:30

4363 #, c-format

4364 msgid "duplicate replace ref: %s"

4365 msgstr "duplicerat ersättningsreferensnamn: %s"

4366

3998 -#: replace-object.c:72

4367 +#: replace-object.c:73

4368 #, c-format

4369 msgid "replace depth too high for object %s"

4370 msgstr "ersättningsdjupet för högt för objektet %s"

4371

4003 -#: revision.c:2305

4004 -msgid "your current branch appears to be broken"

4005 -msgstr "din nuvarande gren verkar vara trasig"

4372 +#: rerere.c:217 rerere.c:226 rerere.c:229

4373 +msgid "corrupt MERGE_RR"

4374 +msgstr "trasig MERGE_RR"

4375

4007 -#: revision.c:2308

4376 +#: rerere.c:264 rerere.c:269

4377 +msgid "unable to write rerere record"

4378 +msgstr "kunde inte skriva rerere-post"

4379 +

4380 +#: rerere.c:485 rerere.c:692 sequencer.c:3136 sequencer.c:3162

4381 #, c-format

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

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

4382 +msgid "could not write '%s'"

4383 +msgstr "kunde inte skriva \"%s\""

4384

4012 -#: revision.c:2505

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

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

4385 +#: rerere.c:495

4386 +#, c-format

4387 +msgid "there were errors while writing '%s' (%s)"

4388 +msgstr "fel vid skrivning av \"%s\" (%s)"

4389

4016 -#: run-command.c:728

4017 -msgid "open /dev/null failed"

4018 -msgstr "misslyckades öppna /dev/null"

4390 +#: rerere.c:498

4391 +#, c-format

4392 +msgid "failed to flush '%s'"

4393 +msgstr "misslyckades spola \"%s\""

4394

4020 -#: run-command.c:1271

4395 +#: rerere.c:503 rerere.c:1039

4396 #, c-format

4022 -msgid ""

4023 -"The '%s' hook was ignored because it's not set as executable.\n"

4024 -"You can disable this warning with `git config advice.ignoredHook false`."

4025 -msgstr ""

4026 -"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

4027 -"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

4397 +msgid "could not parse conflict hunks in '%s'"

4398 +msgstr "kunde inte tolka konflikt-stycket i \"%s\""

4399

4029 -#: send-pack.c:142

4030 -msgid "unexpected flush packet while reading remote unpack status"

4031 -msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

4400 +#: rerere.c:684

4401 +#, c-format

4402 +msgid "failed utime() on '%s'"

4403 +msgstr "\"utime()\" misslyckades på \"%s\""

4404 +

4405 +#: rerere.c:694

4406 +#, c-format

4407 +msgid "writing '%s' failed"

4408 +msgstr "misslyckades skriva \"%s\""

4409 +

4410 +#: rerere.c:714

4411 +#, c-format

4412 +msgid "Staged '%s' using previous resolution."

4413 +msgstr "Köade \"%s\" med sparad lösning."

4414 +

4415 +#: rerere.c:753

4416 +#, c-format

4417 +msgid "Recorded resolution for '%s'."

4418 +msgstr "Sparade lösning för \"%s\"."

4419 +

4420 +#: rerere.c:788

4421 +#, c-format

4422 +msgid "Resolved '%s' using previous resolution."

4423 +msgstr "Löste \"%s\" med tidigare lösning."

4424 +

4425 +#: rerere.c:803

4426 +#, c-format

4427 +msgid "cannot unlink stray '%s'"

4428 +msgstr "kan inte ta bort lös länk \"%s\""

4429 +

4430 +#: rerere.c:807

4431 +#, c-format

4432 +msgid "Recorded preimage for '%s'"

4433 +msgstr "Sparade förhandsbild för \"%s\""

4434 +

4435 +#: rerere.c:881 submodule.c:1763 builtin/submodule--helper.c:1413

4436 +#: builtin/submodule--helper.c:1423

4437 +#, c-format

4438 +msgid "could not create directory '%s'"

4439 +msgstr "kunde inte skapa katalogen \"%s\""

4440 +

4441 +#: rerere.c:1057

4442 +#, c-format

4443 +msgid "failed to update conflicted state in '%s'"

4444 +msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""

4445 +

4446 +#: rerere.c:1068 rerere.c:1075

4447 +#, c-format

4448 +msgid "no remembered resolution for '%s'"

4449 +msgstr "inget sparat sammanslagningsresultat för \"%s\""

4450 +

4451 +#: rerere.c:1077

4452 +#, c-format

4453 +msgid "cannot unlink '%s'"

4454 +msgstr "kan inte ta bort länken \"%s\""

4455 +

4456 +#: rerere.c:1087

4457 +#, c-format

4458 +msgid "Updated preimage for '%s'"

4459 +msgstr "Uppdaterade förhandsbild för \"%s\""

4460 +

4461 +#: rerere.c:1096

4462 +#, c-format

4463 +msgid "Forgot resolution for '%s'\n"

4464 +msgstr "Glömde lösning för \"%s\"\n"

4465 +

4466 +#: rerere.c:1199

4467 +msgid "unable to open rr-cache directory"

4468 +msgstr "kan inte uppdatera katalogen rr-cache"

4469 +

4470 +#: revision.c:2324

4471 +msgid "your current branch appears to be broken"

4472 +msgstr "din nuvarande gren verkar vara trasig"

4473 +

4474 +#: revision.c:2327

4475 +#, c-format

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

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

4478 +

4479 +#: revision.c:2523

4480 +msgid "--first-parent is incompatible with --bisect"

4481 +msgstr "--first-parent är inkompatibelt med --bisect"

4482 +

4483 +#: run-command.c:740

4484 +msgid "open /dev/null failed"

4485 +msgstr "misslyckades öppna /dev/null"

4486 +

4487 +#: run-command.c:1229

4488 +#, c-format

4489 +msgid "cannot create async thread: %s"

4490 +msgstr "kan inte skapa asynkron tråd: %s"

4491 +

4492 +#: run-command.c:1293

4493 +#, c-format

4494 +msgid ""

4495 +"The '%s' hook was ignored because it's not set as executable.\n"

4496 +"You can disable this warning with `git config advice.ignoredHook false`."

4497 +msgstr ""

4498 +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

4499 +"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

4500 +

4501 +#: send-pack.c:142

4502 +msgid "unexpected flush packet while reading remote unpack status"

4503 +msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

4504

4505 #: send-pack.c:144

4506 #, c-format

@@ -4040,15 +4512,15 @@ msgstr "kunde inte tolka fjärruppackningsstatus: %s"

4512 msgid "remote unpack failed: %s"

4513 msgstr "fjärruppackning misslyckades: %s"

4514

4043 -#: send-pack.c:309

4515 +#: send-pack.c:308

4516 msgid "failed to sign the push certificate"

4517 msgstr "misslyckades underteckna push-certifikatet"

4518

4047 -#: send-pack.c:422

4519 +#: send-pack.c:421

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

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

4522

4051 -#: send-pack.c:424

4523 +#: send-pack.c:423

4524 msgid ""

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

4526 "signed push"

@@ -4056,42 +4528,42 @@ msgstr ""

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

4529 "signed"

4530

4059 -#: send-pack.c:436

4531 +#: send-pack.c:435

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

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

4534

4063 -#: send-pack.c:441

4535 +#: send-pack.c:440

4536 msgid "the receiving end does not support push options"

4537 msgstr "mottagarsidan stöder inte push-flaggor"

4538

4067 -#: sequencer.c:177

4539 +#: sequencer.c:183

4540 #, c-format

4541 msgid "invalid commit message cleanup mode '%s'"

4542 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

4543

4072 -#: sequencer.c:278

4544 +#: sequencer.c:287

4545 #, c-format

4546 msgid "could not delete '%s'"

4547 msgstr "kunde inte ta bort \"%s\""

4548

4077 -#: sequencer.c:304

4549 +#: sequencer.c:313

4550 msgid "revert"

4551 msgstr "revert"

4552

4081 -#: sequencer.c:306

4553 +#: sequencer.c:315

4554 msgid "cherry-pick"

4555 msgstr "cherry-pick"

4556

4085 -#: sequencer.c:308

4557 +#: sequencer.c:317

4558 msgid "rebase -i"

4559 msgstr "rebase -i"

4560

4089 -#: sequencer.c:310

4561 +#: sequencer.c:319

4562 #, c-format

4563 msgid "unknown action: %d"

4564 msgstr "okänd funktion: %d"

4565

4094 -#: sequencer.c:367

4566 +#: sequencer.c:376

4567 msgid ""

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

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

@@ -4099,7 +4571,7 @@ msgstr ""

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

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

4573

4102 -#: sequencer.c:370

4574 +#: sequencer.c:379

4575 msgid ""

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

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

@@ -4109,39 +4581,39 @@ msgstr ""

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

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

4583

4112 -#: sequencer.c:383 sequencer.c:2488

4584 +#: sequencer.c:392 sequencer.c:2632

4585 #, c-format

4586 msgid "could not lock '%s'"

4587 msgstr "kunde inte låsa \"%s\""

4588

4117 -#: sequencer.c:390

4589 +#: sequencer.c:399

4590 #, c-format

4591 msgid "could not write eol to '%s'"

4592 msgstr "kunde inte skriva radslut till \"%s\""

4593

4122 -#: sequencer.c:395 sequencer.c:2371 sequencer.c:2494 sequencer.c:2508

4123 -#: sequencer.c:2741

4594 +#: sequencer.c:404 sequencer.c:2515 sequencer.c:2638 sequencer.c:2652

4595 +#: sequencer.c:2885

4596 #, c-format

4597 msgid "failed to finalize '%s'"

4598 msgstr "misslyckades färdigställa \"%s\""

4599

4128 -#: sequencer.c:418 sequencer.c:816 sequencer.c:1505 sequencer.c:2391

4129 -#: sequencer.c:2723 sequencer.c:2827 builtin/am.c:260 builtin/commit.c:740

4130 -#: builtin/merge.c:1081

4600 +#: sequencer.c:427 sequencer.c:921 sequencer.c:1594 sequencer.c:2535

4601 +#: sequencer.c:2867 sequencer.c:2974 builtin/am.c:260 builtin/commit.c:746

4602 +#: builtin/merge.c:1084 builtin/rebase.c:152

4603 #, c-format

4604 msgid "could not read '%s'"

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

4606

4135 -#: sequencer.c:444

4607 +#: sequencer.c:453

4608 #, c-format

4609 msgid "your local changes would be overwritten by %s."

4610 msgstr "dina lokala ändringar skulle skrivas över av %s."

4611

4140 -#: sequencer.c:448

4612 +#: sequencer.c:457

4613 msgid "commit your changes or stash them to proceed."

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

4615

4144 -#: sequencer.c:477

4616 +#: sequencer.c:486

4617 #, c-format

4618 msgid "%s: fast-forward"

4619 msgstr "%s: snabbspola"

@@ -4149,35 +4621,70 @@ msgstr "%s: snabbspola"

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

4622 #. "rebase -i".

4623 #.

4152 -#: sequencer.c:566

4624 +#: sequencer.c:575

4625 #, c-format

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

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

4628

4157 -#: sequencer.c:582

4629 +#: sequencer.c:591

4630 msgid "unable to update cache tree"

4631 msgstr "kan inte uppdatera cacheträd"

4632

4161 -#: sequencer.c:595

4633 +#: sequencer.c:604

4634 msgid "could not resolve HEAD commit"

4635 msgstr "kunde inte bestämma HEAD:s incheckning"

4636

4165 -#: sequencer.c:723 sequencer.c:740

4637 +#: sequencer.c:684

4638 +#, c-format

4639 +msgid "no key present in '%.*s'"

4640 +msgstr "ingen nyckel i \"%.*s\""

4641 +

4642 +#: sequencer.c:695

4643 #, c-format

4167 -msgid "could not parse '%s' (looking for '%s')"

4168 -msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")"

4644 +msgid "unable to dequote value of '%s'"

4645 +msgstr "kan inte ta bort citering av värdet \"%s\""

4646

4170 -#: sequencer.c:731

4647 +#: sequencer.c:732 wrapper.c:227 wrapper.c:397 builtin/am.c:719

4648 +#: builtin/am.c:811 builtin/merge.c:1081

4649 #, c-format

4172 -msgid "bad quoting on %s value in '%s'"

4173 -msgstr "felaktig citering på %s-värde i \"%s\""

4650 +msgid "could not open '%s' for reading"

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

4652 +

4653 +#: sequencer.c:742

4654 +msgid "'GIT_AUTHOR_NAME' already given"

4655 +msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

4656

4657 #: sequencer.c:747

4658 +msgid "'GIT_AUTHOR_EMAIL' already given"

4659 +msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

4660 +

4661 +#: sequencer.c:752

4662 +msgid "'GIT_AUTHOR_DATE' already given"

4663 +msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

4664 +

4665 +#: sequencer.c:756

4666 +#, c-format

4667 +msgid "unknown variable '%s'"

4668 +msgstr "okänd variabel \"%s\""

4669 +

4670 +#: sequencer.c:761

4671 +msgid "missing 'GIT_AUTHOR_NAME'"

4672 +msgstr "\"GIT_AUTHOR_NAME\" saknas"

4673 +

4674 +#: sequencer.c:763

4675 +msgid "missing 'GIT_AUTHOR_EMAIL'"

4676 +msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

4677 +

4678 +#: sequencer.c:765

4679 +msgid "missing 'GIT_AUTHOR_DATE'"

4680 +msgstr "\"GIT_AUTHOR_DATE\" saknas"

4681 +

4682 +#: sequencer.c:825

4683 #, c-format

4684 msgid "invalid date format '%s' in '%s'"

4685 msgstr "ogiltigt datumformat \"%s\" i \"%s\""

4686

4180 -#: sequencer.c:761

4687 +#: sequencer.c:842

4688 #, c-format

4689 msgid ""

4690 "you have staged changes in your working tree\n"

@@ -4206,15 +4713,15 @@ msgstr ""

4713 "\n"

4714 " git rebase --continue\n"

4715

4209 -#: sequencer.c:830

4716 +#: sequencer.c:935

4717 msgid "writing root commit"

4718 msgstr "skriver rotincheckning"

4719

4213 -#: sequencer.c:1055

4720 +#: sequencer.c:1142

4721 msgid "'prepare-commit-msg' hook failed"

4722 msgstr "kroken \"prepare-commit-msg\" misslyckades"

4723

4217 -#: sequencer.c:1062

4724 +#: sequencer.c:1149

4725 msgid ""

4726 "Your name and email address were configured automatically based\n"

4727 "on your username and hostname. Please check that they are accurate.\n"

@@ -4241,7 +4748,7 @@ msgstr ""

4748 "\n"

4749 " git commit --amend --reset-author\n"

4750

4244 -#: sequencer.c:1075

4751 +#: sequencer.c:1162

4752 msgid ""

4753 "Your name and email address were configured automatically based\n"

4754 "on your username and hostname. Please check that they are accurate.\n"

@@ -4266,306 +4773,301 @@ msgstr ""

4773 "\n"

4774 " git commit --amend --reset-author\n"

4775

4269 -#: sequencer.c:1115

4776 +#: sequencer.c:1202

4777 msgid "couldn't look up newly created commit"

4778 msgstr "kunde inte slå upp en precis skapad incheckning"

4779

4273 -#: sequencer.c:1117

4780 +#: sequencer.c:1204

4781 msgid "could not parse newly created commit"

4782 msgstr "kunde inte tolka en precis skapad incheckning"

4783

4277 -#: sequencer.c:1163

4784 +#: sequencer.c:1250

4785 msgid "unable to resolve HEAD after creating commit"

4786 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

4787

4281 -#: sequencer.c:1165

4788 +#: sequencer.c:1252

4789 msgid "detached HEAD"

4790 msgstr "frånkopplad HEAD"

4791

4285 -#: sequencer.c:1169

4792 +#: sequencer.c:1256

4793 msgid " (root-commit)"

4794 msgstr " (rotincheckning)"

4795

4289 -#: sequencer.c:1190

4796 +#: sequencer.c:1277

4797 msgid "could not parse HEAD"

4798 msgstr "kunde inte tolka HEAD"

4799

4293 -#: sequencer.c:1192

4800 +#: sequencer.c:1279

4801 #, c-format

4802 msgid "HEAD %s is not a commit!"

4803 msgstr "HEAD %s är inte en incheckning!"

4804

4298 -#: sequencer.c:1196 builtin/commit.c:1528

4805 +#: sequencer.c:1283 builtin/commit.c:1543

4806 msgid "could not parse HEAD commit"

4807 msgstr "kunde inte tolka HEAD:s incheckning"

4808

4302 -#: sequencer.c:1247 sequencer.c:1845

4809 +#: sequencer.c:1334 sequencer.c:1934

4810 msgid "unable to parse commit author"

4811 msgstr "kunde inte tolka incheckningens författare"

4812

4306 -#: sequencer.c:1257 builtin/am.c:1632 builtin/merge.c:675

4813 +#: sequencer.c:1344 builtin/am.c:1585 builtin/merge.c:677

4814 msgid "git write-tree failed to write a tree"

4815 msgstr "git write-tree misslyckades skriva ett träd"

4816

4310 -#: sequencer.c:1274 sequencer.c:1329

4817 +#: sequencer.c:1361 sequencer.c:1416

4818 #, c-format

4819 msgid "unable to read commit message from '%s'"

4820 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

4821

4315 -#: sequencer.c:1296 builtin/am.c:1653 builtin/commit.c:1631 builtin/merge.c:855

4316 -#: builtin/merge.c:880

4822 +#: sequencer.c:1383 builtin/am.c:1606 builtin/commit.c:1646 builtin/merge.c:858

4823 +#: builtin/merge.c:883

4824 msgid "failed to write commit object"

4825 msgstr "kunde inte skriva incheckningsobjekt"

4826

4320 -#: sequencer.c:1356

4827 +#: sequencer.c:1443

4828 #, c-format

4829 msgid "could not parse commit %s"

4830 msgstr "kunde inte tolka incheckningen %s"

4831

4325 -#: sequencer.c:1361

4832 +#: sequencer.c:1448

4833 #, c-format

4834 msgid "could not parse parent commit %s"

4835 msgstr "kunde inte tolka föräldraincheckningen %s"

4836

4330 -#: sequencer.c:1457 sequencer.c:1565

4837 +#: sequencer.c:1546 sequencer.c:1654

4838 #, c-format

4839 msgid "unknown command: %d"

4840 msgstr "okänt kommando: %d"

4841

4335 -#: sequencer.c:1512 sequencer.c:1537

4842 +#: sequencer.c:1601 sequencer.c:1626

4843 #, c-format

4844 msgid "This is a combination of %d commits."

4845 msgstr "Det här är en kombination av %d incheckningar."

4846

4340 -#: sequencer.c:1522 sequencer.c:4520

4847 +#: sequencer.c:1611 sequencer.c:4744

4848 msgid "need a HEAD to fixup"

4849 msgstr "behöver en HEAD-incheckning att rätta"

4850

4344 -#: sequencer.c:1524 sequencer.c:2768

4851 +#: sequencer.c:1613 sequencer.c:2912

4852 msgid "could not read HEAD"

4853 msgstr "kunde inte läsa HEAD"

4854

4348 -#: sequencer.c:1526

4855 +#: sequencer.c:1615

4856 msgid "could not read HEAD's commit message"

4857 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

4858

4352 -#: sequencer.c:1532

4859 +#: sequencer.c:1621

4860 #, c-format

4861 msgid "cannot write '%s'"

4862 msgstr "kan inte skriva \"%s\""

4863

4357 -#: sequencer.c:1539 git-rebase--preserve-merges.sh:441

4864 +#: sequencer.c:1628 git-rebase--preserve-merges.sh:441

4865 msgid "This is the 1st commit message:"

4866 msgstr "Det här är 1:a incheckningsmeddelandet:"

4867

4361 -#: sequencer.c:1547

4868 +#: sequencer.c:1636

4869 #, c-format

4870 msgid "could not read commit message of %s"

4871 msgstr "kunde inte läsa incheckningsmeddelande för %s"

4872

4366 -#: sequencer.c:1554

4873 +#: sequencer.c:1643

4874 #, c-format

4875 msgid "This is the commit message #%d:"

4876 msgstr "Det här är incheckningsmeddelande %d:"

4877

4371 -#: sequencer.c:1560

4878 +#: sequencer.c:1649

4879 #, c-format

4880 msgid "The commit message #%d will be skipped:"

4881 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

4882

4376 -#: sequencer.c:1643

4883 +#: sequencer.c:1732

4884 msgid "your index file is unmerged."

4885 msgstr "din indexfil har inte slagits ihop."

4886

4380 -#: sequencer.c:1650

4887 +#: sequencer.c:1739

4888 msgid "cannot fixup root commit"

4889 msgstr "kan inte göra \"fixup\" på rotincheckning"

4890

4384 -#: sequencer.c:1669

4891 +#: sequencer.c:1758

4892 #, c-format

4893 msgid "commit %s is a merge but no -m option was given."

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

4895

4389 -#: sequencer.c:1677

4896 +#: sequencer.c:1766

4897 #, c-format

4898 msgid "commit %s does not have parent %d"

4899 msgstr "incheckning %s har inte förälder %d"

4900

4394 -#: sequencer.c:1681

4901 +#: sequencer.c:1770

4902 #, c-format

4903 msgid "mainline was specified but commit %s is not a merge."

4904 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."

4905

4399 -#: sequencer.c:1687

4906 +#: sequencer.c:1776

4907 #, c-format

4908 msgid "cannot get commit message for %s"

4909 msgstr "kan inte hämta incheckningsmeddelande för %s"

4910

4911 #. TRANSLATORS: The first %s will be a "todo" command like

4912 #. "revert" or "pick", the second %s a SHA1.

4406 -#: sequencer.c:1706

4913 +#: sequencer.c:1795

4914 #, c-format

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

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

4917

4411 -#: sequencer.c:1771

4918 +#: sequencer.c:1860

4919 #, c-format

4920 msgid "could not rename '%s' to '%s'"

4921 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

4922

4416 -#: sequencer.c:1826

4923 +#: sequencer.c:1915

4924 #, c-format

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

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

4927

4421 -#: sequencer.c:1827

4928 +#: sequencer.c:1916

4929 #, c-format

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

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

4932

4426 -#: sequencer.c:1885

4933 +#: sequencer.c:1974

4934 #, c-format

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

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

4937

4431 -#: sequencer.c:1892

4938 +#: sequencer.c:1981

4939 #, c-format

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

4941 msgstr "git %s: misslyckades uppdatera indexet"

4942

4436 -#: sequencer.c:1972

4943 +#: sequencer.c:2062

4944 #, c-format

4945 msgid "%s does not accept arguments: '%s'"

4946 msgstr "%s tar inte argument: \"%s\""

4947

4441 -#: sequencer.c:1981

4948 +#: sequencer.c:2071

4949 #, c-format

4950 msgid "missing arguments for %s"

4951 msgstr "argument saknas för %s"

4952

4446 -#: sequencer.c:2040

4953 +#: sequencer.c:2130

4954 #, c-format

4955 msgid "invalid line %d: %.*s"

4956 msgstr "ogiltig rad %d: %.*s"

4957

4451 -#: sequencer.c:2048

4958 +#: sequencer.c:2138

4959 #, c-format

4960 msgid "cannot '%s' without a previous commit"

4961 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

4962

4456 -#: sequencer.c:2096 sequencer.c:4277 sequencer.c:4333

4457 -#, c-format

4458 -msgid "could not read '%s'."

4459 -msgstr "kunde inte läsa \"%s\"."

4460 -

4461 -#: sequencer.c:2119

4963 +#: sequencer.c:2209

4964 msgid "please fix this using 'git rebase --edit-todo'."

4965 msgstr "rätta det med \"git rebase --edit-todo\"."

4966

4465 -#: sequencer.c:2121

4967 +#: sequencer.c:2211

4968 #, c-format

4969 msgid "unusable instruction sheet: '%s'"

4970 msgstr "oanvändbart manus: ”%s”"

4971

4470 -#: sequencer.c:2126

4972 +#: sequencer.c:2216

4973 msgid "no commits parsed."

4974 msgstr "inga incheckningar lästes."

4975

4474 -#: sequencer.c:2137

4976 +#: sequencer.c:2227

4977 msgid "cannot cherry-pick during a revert."

4978 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

4979

4478 -#: sequencer.c:2139

4980 +#: sequencer.c:2229

4981 msgid "cannot revert during a cherry-pick."

4982 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

4983

4482 -#: sequencer.c:2209

4984 +#: sequencer.c:2299

4985 #, c-format

4986 msgid "invalid value for %s: %s"

4987 msgstr "felaktigt värde för %s: %s"

4988

4487 -#: sequencer.c:2285

4989 +#: sequencer.c:2380

4990 msgid "unusable squash-onto"

4991 msgstr "oanvändbar squash-onto"

4992

4491 -#: sequencer.c:2301

4993 +#: sequencer.c:2396

4994 #, c-format

4995 msgid "malformed options sheet: '%s'"

4996 msgstr "trasigt manus: ”%s”"

4997

4496 -#: sequencer.c:2335 sequencer.c:3775

4998 +#: sequencer.c:2479 sequencer.c:4005

4999 msgid "empty commit set passed"

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

5001

4500 -#: sequencer.c:2343

5002 +#: sequencer.c:2487

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

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

5005

4504 -#: sequencer.c:2344

5006 +#: sequencer.c:2488

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

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

5009

4508 -#: sequencer.c:2347

5010 +#: sequencer.c:2491

5011 #, c-format

5012 msgid "could not create sequencer directory '%s'"

5013 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

5014

4513 -#: sequencer.c:2361

5015 +#: sequencer.c:2505

5016 msgid "could not lock HEAD"

5017 msgstr "kunde inte låsa HEAD"

5018

4517 -#: sequencer.c:2416 sequencer.c:3543

5019 +#: sequencer.c:2560 sequencer.c:3761

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

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

5022

4521 -#: sequencer.c:2418

5023 +#: sequencer.c:2562

5024 msgid "cannot resolve HEAD"

5025 msgstr "kan inte bestämma HEAD"

5026

4525 -#: sequencer.c:2420 sequencer.c:2455

5027 +#: sequencer.c:2564 sequencer.c:2599

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

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

5030

4529 -#: sequencer.c:2441 builtin/grep.c:721

5031 +#: sequencer.c:2585 builtin/grep.c:721

5032 #, c-format

5033 msgid "cannot open '%s'"

5034 msgstr "kan inte öppna \"%s\""

5035

4534 -#: sequencer.c:2443

5036 +#: sequencer.c:2587

5037 #, c-format

5038 msgid "cannot read '%s': %s"

5039 msgstr "kan inte läsa \"%s\": %s"

5040

4539 -#: sequencer.c:2444

5041 +#: sequencer.c:2588

5042 msgid "unexpected end of file"

5043 msgstr "oväntat filslut"

5044

4543 -#: sequencer.c:2450

5045 +#: sequencer.c:2594

5046 #, c-format

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

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

5049

4548 -#: sequencer.c:2461

5050 +#: sequencer.c:2605

5051 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

5052 msgstr ""

5053 "Du verkar ha flyttat HEAD.\n"

5054 "Spolar inte tillbaka, kontrollera HEAD!"

5055

4554 -#: sequencer.c:2565 sequencer.c:3461

5056 +#: sequencer.c:2709 sequencer.c:3679

5057 #, c-format

5058 msgid "could not update %s"

5059 msgstr "kunde inte uppdatera %s"

5060

4559 -#: sequencer.c:2603 sequencer.c:3441

5061 +#: sequencer.c:2747 sequencer.c:3659

5062 msgid "cannot read HEAD"

5063 msgstr "kan inte läsa HEAD"

5064

4563 -#: sequencer.c:2618

5065 +#: sequencer.c:2762

5066 #, c-format

5067 msgid "unable to copy '%s' to '%s'"

5068 msgstr "kan inte kopiera in \"%s\" till \"%s\""

5069

4568 -#: sequencer.c:2626

5070 +#: sequencer.c:2770

5071 #, c-format

5072 msgid ""

5073 "You can amend the commit now, with\n"

@@ -4584,26 +5086,27 @@ msgstr ""

5086 "\n"

5087 "\tgit rebase --continue\n"

5088

4587 -#: sequencer.c:2636

5089 +#: sequencer.c:2780

5090 #, c-format

5091 msgid "Could not apply %s... %.*s"

5092 msgstr "Kunde inte tillämpa %s... %.*s"

5093

4592 -#: sequencer.c:2643

5094 +#: sequencer.c:2787

5095 #, c-format

5096 msgid "Could not merge %.*s"

5097 msgstr "Kunde inte slå ihop %.*s"

5098

4597 -#: sequencer.c:2654 sequencer.c:2658 builtin/difftool.c:640

5099 +#: sequencer.c:2798 sequencer.c:2802 builtin/difftool.c:640

5100 #, c-format

5101 msgid "could not copy '%s' to '%s'"

5102 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

5103

4602 -#: sequencer.c:2680 sequencer.c:3095

5104 +#: sequencer.c:2824 sequencer.c:3242 builtin/rebase.c:580 builtin/rebase.c:999

5105 +#: builtin/rebase.c:1350 builtin/rebase.c:1404

5106 msgid "could not read index"

5107 msgstr "kunde inte läsa indexet"

5108

4606 -#: sequencer.c:2685

5109 +#: sequencer.c:2829

5110 #, c-format

5111 msgid ""

5112 "execution failed: %s\n"

@@ -4618,11 +5121,11 @@ msgstr ""

5121 "\tgit rebase --continue\n"

5122 "\n"

5123

4621 -#: sequencer.c:2691

5124 +#: sequencer.c:2835

5125 msgid "and made changes to the index and/or the working tree\n"

5126 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

5127

4625 -#: sequencer.c:2697

5128 +#: sequencer.c:2841

5129 #, c-format

5130 msgid ""

5131 "execution succeeded: %s\n"

@@ -4639,81 +5142,76 @@ msgstr ""

5142 "\tgit rebase --continue\n"

5143 "\n"

5144

4642 -#: sequencer.c:2758

5145 +#: sequencer.c:2902

5146 #, c-format

5147 msgid "illegal label name: '%.*s'"

5148 msgstr "ogiltigt etikettnamn: \"%.*s\""

5149

4647 -#: sequencer.c:2810

5150 +#: sequencer.c:2954

5151 msgid "writing fake root commit"

5152 msgstr "skriver fejkad rotincheckning"

5153

4651 -#: sequencer.c:2815

5154 +#: sequencer.c:2959

5155 msgid "writing squash-onto"

5156 msgstr "skriver squash-onto"

5157

4655 -#: sequencer.c:2850

5158 +#: sequencer.c:2997 builtin/rebase.c:585 builtin/rebase.c:590

5159 #, c-format

5160 msgid "failed to find tree of %s"

5161 msgstr "kunde inte hitta trädet för %s."

5162

4660 -#: sequencer.c:2868

5163 +#: sequencer.c:3015 builtin/rebase.c:603

5164 msgid "could not write index"

5165 msgstr "kunde inte skriva indexet"

5166

4664 -#: sequencer.c:2895

5167 +#: sequencer.c:3042

5168 #, c-format

5169 msgid "could not resolve '%s'"

5170 msgstr "kunde inte upplösa \"%s\""

5171

4669 -#: sequencer.c:2921

5172 +#: sequencer.c:3068

5173 msgid "cannot merge without a current revision"

5174 msgstr "kan inte slå ihop utan en aktuell incheckning"

5175

4673 -#: sequencer.c:2943

5176 +#: sequencer.c:3090

5177 #, c-format

5178 msgid "unable to parse '%.*s'"

5179 msgstr "kan inte tolka \"%.*s\""

5180

4678 -#: sequencer.c:2952

5181 +#: sequencer.c:3099

5182 #, c-format

5183 msgid "nothing to merge: '%.*s'"

5184 msgstr "inget att slå samman: \"%.*s\""

5185

4683 -#: sequencer.c:2964

5186 +#: sequencer.c:3111

5187 msgid "octopus merge cannot be executed on top of a [new root]"

5188 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"

5189

4687 -#: sequencer.c:2979

5190 +#: sequencer.c:3126

5191 #, c-format

5192 msgid "could not get commit message of '%s'"

5193 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

5194

4692 -#: sequencer.c:2989 sequencer.c:3015

4693 -#, c-format

4694 -msgid "could not write '%s'"

4695 -msgstr "kunde inte skriva \"%s\""

4696 -

4697 -#: sequencer.c:3127

5195 +#: sequencer.c:3274

5196 #, c-format

5197 msgid "could not even attempt to merge '%.*s'"

5198 msgstr "kunde inte ens försöka slå ihop \"%.*s\""

5199

4702 -#: sequencer.c:3143

5200 +#: sequencer.c:3290

5201 msgid "merge: Unable to write new index file"

5202 msgstr "sammanslagning: Kunde inte skriva ny indexfil"

5203

4706 -#: sequencer.c:3211

5204 +#: sequencer.c:3358 builtin/rebase.c:268

5205 #, c-format

5206 msgid "Applied autostash.\n"

5207 msgstr "Tillämpade autostash.\n"

5208

4711 -#: sequencer.c:3223

5209 +#: sequencer.c:3370

5210 #, c-format

5211 msgid "cannot store %s"

5212 msgstr "kan inte spara %s"

5213

4716 -#: sequencer.c:3226 git-rebase.sh:188

5214 +#: sequencer.c:3373 builtin/rebase.c:284

5215 #, c-format

5216 msgid ""

5217 "Applying autostash resulted in conflicts.\n"

@@ -4724,7 +5222,31 @@ msgstr ""

5222 "Dina ändringar är säkra i stashen.\n"

5223 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

5224

4727 -#: sequencer.c:3257

5225 +#: sequencer.c:3427

5226 +#, c-format

5227 +msgid "could not checkout %s"

5228 +msgstr "kunde inte checka ut %s"

5229 +

5230 +#: sequencer.c:3441

5231 +#, c-format

5232 +msgid "%s: not a valid OID"

5233 +msgstr "%s: inte ett giltigt OID"

5234 +

5235 +#: sequencer.c:3446 git-rebase--preserve-merges.sh:724

5236 +msgid "could not detach HEAD"

5237 +msgstr "kunde inte koppla från HEAD"

5238 +

5239 +#: sequencer.c:3461

5240 +#, c-format

5241 +msgid "Stopped at HEAD\n"

5242 +msgstr "Stoppade på HEAD\n"

5243 +

5244 +#: sequencer.c:3463

5245 +#, c-format

5246 +msgid "Stopped at %s\n"

5247 +msgstr "Stoppade på %s\n"

5248 +

5249 +#: sequencer.c:3471

5250 #, c-format

5251 msgid ""

5252 "Could not execute the todo command\n"

@@ -4745,48 +5267,48 @@ msgstr ""

5267 " git rebase --edit-todo\n"

5268 " git rebase --continue\n"

5269

4748 -#: sequencer.c:3325

5270 +#: sequencer.c:3543

5271 #, c-format

5272 msgid "Stopped at %s... %.*s\n"

5273 msgstr "Stoppade på %s... %.*s\n"

5274

4753 -#: sequencer.c:3404

5275 +#: sequencer.c:3622

5276 #, c-format

5277 msgid "unknown command %d"

5278 msgstr "okänt kommando %d"

5279

4758 -#: sequencer.c:3449

5280 +#: sequencer.c:3667

5281 msgid "could not read orig-head"

5282 msgstr "kunde inte läsa orig-head"

5283

4762 -#: sequencer.c:3454 sequencer.c:4517

5284 +#: sequencer.c:3672 sequencer.c:4741

5285 msgid "could not read 'onto'"

5286 msgstr "kunde inte läsa \"onto\""

5287

4766 -#: sequencer.c:3468

5288 +#: sequencer.c:3686

5289 #, c-format

5290 msgid "could not update HEAD to %s"

5291 msgstr "kunde inte uppdatera HEAD till %s"

5292

4771 -#: sequencer.c:3554

5293 +#: sequencer.c:3772

5294 msgid "cannot rebase: You have unstaged changes."

5295 msgstr "kan inte ombasera: Du har oköade ändringar."

5296

4775 -#: sequencer.c:3563

5297 +#: sequencer.c:3781

5298 msgid "cannot amend non-existing commit"

5299 msgstr "kan inte lägga till incheckning som inte finns"

5300

4779 -#: sequencer.c:3565

5301 +#: sequencer.c:3783

5302 #, c-format

5303 msgid "invalid file: '%s'"

5304 msgstr "ogiltig fil: \"%s\""

5305

4784 -#: sequencer.c:3567

5306 +#: sequencer.c:3785

5307 #, c-format

5308 msgid "invalid contents: '%s'"

5309 msgstr "ogiltigt innehåll: \"%s\""

5310

4789 -#: sequencer.c:3570

5311 +#: sequencer.c:3788

5312 msgid ""

5313 "\n"

5314 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -4796,54 +5318,54 @@ msgstr ""

5318 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

5319 "först och kör sedan \"git rebase --continute\" igen."

5320

4799 -#: sequencer.c:3595 sequencer.c:3633

5321 +#: sequencer.c:3824 sequencer.c:3862

5322 #, c-format

5323 msgid "could not write file: '%s'"

5324 msgstr "kunde inte skriva fil: \"%s\""

5325

4804 -#: sequencer.c:3648

5326 +#: sequencer.c:3877

5327 msgid "could not remove CHERRY_PICK_HEAD"

5328 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

5329

4808 -#: sequencer.c:3655

5330 +#: sequencer.c:3884

5331 msgid "could not commit staged changes."

5332 msgstr "kunde inte checka in köade ändringar."

5333

4812 -#: sequencer.c:3752

5334 +#: sequencer.c:3982

5335 #, c-format

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

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

5338

4817 -#: sequencer.c:3756

5339 +#: sequencer.c:3986

5340 #, c-format

5341 msgid "%s: bad revision"

5342 msgstr "%s: felaktig revision"

5343

4822 -#: sequencer.c:3791

5344 +#: sequencer.c:4021

5345 msgid "can't revert as initial commit"

5346 msgstr "kan inte ångra som första incheckning"

5347

4826 -#: sequencer.c:4238

5348 +#: sequencer.c:4466

5349 msgid "make_script: unhandled options"

5350 msgstr "make_script: flaggor som inte stöds"

5351

4830 -#: sequencer.c:4241

5352 +#: sequencer.c:4469

5353 msgid "make_script: error preparing revisions"

5354 msgstr "make_script: fel när revisioner skulle förberedas"

5355

4834 -#: sequencer.c:4281 sequencer.c:4337

5356 +#: sequencer.c:4509 sequencer.c:4565 sequencer.c:4840

5357 #, c-format

5358 msgid "unusable todo list: '%s'"

5359 msgstr "oanvändbar todo-lista: %s"

5360

4839 -#: sequencer.c:4396

5361 +#: sequencer.c:4620

5362 #, c-format

5363 msgid ""

5364 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

5365 msgstr ""

5366 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

5367

4846 -#: sequencer.c:4466

5368 +#: sequencer.c:4690

5369 #, c-format

5370 msgid ""

5371 "Warning: some commits may have been dropped accidentally.\n"

@@ -4852,7 +5374,7 @@ msgstr ""

5374 "Varning: vissa incheckningar kan av misstag ha tappats.\n"

5375 "Tappade incheckningar (nyaste först):\n"

5376

4855 -#: sequencer.c:4473

5377 +#: sequencer.c:4697

5378 #, c-format

5379 msgid ""

5380 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -4872,7 +5394,7 @@ msgstr ""

5394 "\" (fel).\n"

5395 "\n"

5396

4875 -#: sequencer.c:4486

5397 +#: sequencer.c:4710

5398 #, c-format

5399 msgid ""

5400 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -4883,7 +5405,31 @@ msgstr ""

5405 "continue\".\n"

5406 "Avbryt ombaseringen med \"git rebase --abort\".\n"

5407

4886 -#: sequencer.c:4660

5408 +#: sequencer.c:4848 sequencer.c:4886

5409 +msgid "nothing to do"

5410 +msgstr "inget att göra"

5411 +

5412 +#: sequencer.c:4852

5413 +#, c-format

5414 +msgid "Rebase %s onto %s (%d command)"

5415 +msgid_plural "Rebase %s onto %s (%d commands)"

5416 +msgstr[0] "Ombasera %s på %s (%d kommando)"

5417 +msgstr[1] "Ombasera %s på %s (%d kommandon)"

5418 +

5419 +#: sequencer.c:4864

5420 +#, c-format

5421 +msgid "could not copy '%s' to '%s'."

5422 +msgstr "kunde inte kopiera \"%s\" till \"%s\"."

5423 +

5424 +#: sequencer.c:4868 sequencer.c:4897

5425 +msgid "could not transform the todo list"

5426 +msgstr "kunde inte transformera att göra-listan"

5427 +

5428 +#: sequencer.c:4900

5429 +msgid "could not skip unnecessary pick commands"

5430 +msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"

5431 +

5432 +#: sequencer.c:4983

5433 msgid "the script was already rearranged."

5434 msgstr "skriptet har redan omordnats."

5435

@@ -4938,84 +5484,84 @@ msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"

5484 msgid "this operation must be run in a work tree"

5485 msgstr "funktionen måste köras i en arbetskatalog"

5486

4941 -#: setup.c:503

5487 +#: setup.c:527

5488 #, c-format

5489 msgid "Expected git repo version <= %d, found %d"

5490 msgstr "Förväntade git-arkivversion <= %d, hittade %d"

5491

4946 -#: setup.c:511

5492 +#: setup.c:535

5493 msgid "unknown repository extensions found:"

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

5495

4950 -#: setup.c:530

5496 +#: setup.c:554

5497 #, c-format

5498 msgid "error opening '%s'"

5499 msgstr "fel vid öppning av \"%s\""

5500

4955 -#: setup.c:532

5501 +#: setup.c:556

5502 #, c-format

5503 msgid "too large to be a .git file: '%s'"

5504 msgstr "för stor för att vara en .git-fil: \"%s\""

5505

4960 -#: setup.c:534

5506 +#: setup.c:558

5507 #, c-format

5508 msgid "error reading %s"

5509 msgstr "fel vid läsning av %s"

5510

4965 -#: setup.c:536

5511 +#: setup.c:560

5512 #, c-format

5513 msgid "invalid gitfile format: %s"

5514 msgstr "ogiltigt gitfilformat: %s"

5515

4970 -#: setup.c:538

5516 +#: setup.c:562

5517 #, c-format

5518 msgid "no path in gitfile: %s"

5519 msgstr "ingen sökväg i gitfil: %s"

5520

4975 -#: setup.c:540

5521 +#: setup.c:564

5522 #, c-format

5523 msgid "not a git repository: %s"

5524 msgstr "inte ett git-arkiv: %s"

5525

4980 -#: setup.c:639

5526 +#: setup.c:663

5527 #, c-format

5528 msgid "'$%s' too big"

5529 msgstr "\"$%s\" för stor"

5530

4985 -#: setup.c:653

5531 +#: setup.c:677

5532 #, c-format

5533 msgid "not a git repository: '%s'"

5534 msgstr "inte ett git-arkiv: \"%s\""

5535

4990 -#: setup.c:682 setup.c:684 setup.c:715

5536 +#: setup.c:706 setup.c:708 setup.c:739

5537 #, c-format

5538 msgid "cannot chdir to '%s'"

5539 msgstr "kan inte byta katalog (chdir) till \"%s\""

5540

4995 -#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

5541 +#: setup.c:711 setup.c:767 setup.c:777 setup.c:816 setup.c:824 setup.c:839

5542 msgid "cannot come back to cwd"

5543 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"

5544

4999 -#: setup.c:813

5545 +#: setup.c:837

5546 #, c-format

5547 msgid "not a git repository (or any of the parent directories): %s"

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

5549

5004 -#: setup.c:824

5550 +#: setup.c:848

5551 #, c-format

5552 msgid "failed to stat '%*s%s%s'"

5553 msgstr "misslyckades ta status på \"%*ss%s%s\""

5554

5009 -#: setup.c:1054

5555 +#: setup.c:1078

5556 msgid "Unable to read current working directory"

5557 msgstr "Kan inte läsa aktuell arbetskatalog"

5558

5013 -#: setup.c:1066 setup.c:1072

5559 +#: setup.c:1090 setup.c:1096

5560 #, c-format

5561 msgid "cannot change to '%s'"

5562 msgstr "kan inte byta till \"%s\""

5563

5018 -#: setup.c:1085

5564 +#: setup.c:1109

5565 #, c-format

5566 msgid ""

5567 "not a git repository (or any parent up to mount point %s)\n"

@@ -5025,7 +5571,7 @@ msgstr ""

5571 "monteringspunkten %s)\n"

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

5573

5028 -#: setup.c:1168

5574 +#: setup.c:1192

5575 #, c-format

5576 msgid ""

5577 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -5034,15 +5580,15 @@ msgstr ""

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

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

5582

5037 -#: setup.c:1211

5583 +#: setup.c:1235

5584 msgid "open /dev/null or dup failed"

5585 msgstr "misslyckades öppna /dev/null eller \"dup\""

5586

5041 -#: setup.c:1226

5587 +#: setup.c:1250

5588 msgid "fork failed"

5589 msgstr "\"fork\" misslyckades"

5590

5045 -#: setup.c:1231

5591 +#: setup.c:1255

5592 msgid "setsid failed"

5593 msgstr "\"setsid\" misslyckades"

5594

@@ -5117,12 +5663,12 @@ msgstr "mmap misslyckades"

5663 msgid "object file %s is empty"

5664 msgstr "objektfilen %s är tom"

5665

5120 -#: sha1-file.c:1093 sha1-file.c:2206

5666 +#: sha1-file.c:1093 sha1-file.c:2215

5667 #, c-format

5668 msgid "corrupt loose object '%s'"

5669 msgstr "trasigt löst objekt \"%s\""

5670

5125 -#: sha1-file.c:1095 sha1-file.c:2210

5671 +#: sha1-file.c:1095 sha1-file.c:2219

5672 #, c-format

5673 msgid "garbage at end of loose object '%s'"

5674 msgstr "skräp i slutet av löst objekt \"%s\""

@@ -5218,7 +5764,7 @@ msgstr "\"deflateend\" på objektet %s misslyckades (%d)"

5764 msgid "confused by unstable object source data for %s"

5765 msgstr "förvirrad av instabil objektkälldata för %s"

5766

5221 -#: sha1-file.c:1685 builtin/pack-objects.c:899

5767 +#: sha1-file.c:1685 builtin/pack-objects.c:918

5768 #, c-format

5769 msgid "failed utime() on %s"

5770 msgstr "\"utime()\" misslyckades på %s"

@@ -5236,76 +5782,76 @@ msgstr "trasik incheckning"

5782 msgid "corrupt tag"

5783 msgstr "trasig tagg"

5784

5239 -#: sha1-file.c:1906

5785 +#: sha1-file.c:1912

5786 #, c-format

5787 msgid "read error while indexing %s"

5788 msgstr "läsfel vid indexering av %s"

5789

5244 -#: sha1-file.c:1909

5790 +#: sha1-file.c:1915

5791 #, c-format

5792 msgid "short read while indexing %s"

5793 msgstr "för lite lästes vid indexering av %s"

5794

5249 -#: sha1-file.c:1980 sha1-file.c:1989

5795 +#: sha1-file.c:1988 sha1-file.c:1997

5796 #, c-format

5797 msgid "%s: failed to insert into database"

5798 msgstr "%s: misslyckades lägga in i databasen"

5799

5254 -#: sha1-file.c:1995

5800 +#: sha1-file.c:2003

5801 #, c-format

5802 msgid "%s: unsupported file type"

5803 msgstr "%s: filtypen stöds ej"

5804

5259 -#: sha1-file.c:2019

5805 +#: sha1-file.c:2027

5806 #, c-format

5807 msgid "%s is not a valid object"

5808 msgstr "%s är inte ett giltigt objekt"

5809

5264 -#: sha1-file.c:2021

5810 +#: sha1-file.c:2029

5811 #, c-format

5812 msgid "%s is not a valid '%s' object"

5813 msgstr "%s är inte ett giltigt \"%s\"-objekt"

5814

5269 -#: sha1-file.c:2048 builtin/index-pack.c:158

5815 +#: sha1-file.c:2056 builtin/index-pack.c:154

5816 #, c-format

5817 msgid "unable to open %s"

5818 msgstr "kan inte öppna %s"

5819

5274 -#: sha1-file.c:2217 sha1-file.c:2269

5820 +#: sha1-file.c:2226 sha1-file.c:2278

5821 #, c-format

5822 msgid "sha1 mismatch for %s (expected %s)"

5823 msgstr "sha1 stämmer inte för %s (förväntade %s)"

5824

5279 -#: sha1-file.c:2241

5825 +#: sha1-file.c:2250

5826 #, c-format

5827 msgid "unable to mmap %s"

5828 msgstr "kan inte utföra \"mmap\" för %s"

5829

5284 -#: sha1-file.c:2246

5830 +#: sha1-file.c:2255

5831 #, c-format

5832 msgid "unable to unpack header of %s"

5833 msgstr "kan inte packa upp huvud för %s"

5834

5289 -#: sha1-file.c:2252

5835 +#: sha1-file.c:2261

5836 #, c-format

5837 msgid "unable to parse header of %s"

5838 msgstr "kan inte tolka huvud för %s"

5839

5294 -#: sha1-file.c:2263

5840 +#: sha1-file.c:2272

5841 #, c-format

5842 msgid "unable to unpack contents of %s"

5843 msgstr "kan inte tolka innehåll i %s"

5844

5299 -#: sha1-name.c:444

5845 +#: sha1-name.c:476

5846 #, c-format

5847 msgid "short SHA1 %s is ambiguous"

5848 msgstr "kort SHA1 %s är tvetydig"

5849

5304 -#: sha1-name.c:455

5850 +#: sha1-name.c:487

5851 msgid "The candidates are:"

5852 msgstr "Kandidaterna är:"

5853

5308 -#: sha1-name.c:699

5854 +#: sha1-name.c:770

5855 msgid ""

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

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

@@ -5327,81 +5873,71 @@ msgstr ""

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

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

5875

5330 -#: submodule.c:97 submodule.c:131

5876 +#: submodule.c:116 submodule.c:145

5877 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

5878 msgstr ""

l10n: sv.po: Update Swedish translation (4185t0f0u)