c1d0038746 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2019-08-10 20:12+0800\n"

11 -"PO-Revision-Date: 2019-08-17 17:28+0100\n"

10 +"POT-Creation-Date: 2019-10-28 13:19+0800\n"

11 +"PO-Revision-Date: 2019-10-30 23:18+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"

@@ -70,7 +70,7 @@ msgstr ""

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:193 builtin/merge.c:1327

73 +#: advice.c:193 builtin/merge.c:1332

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

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

76

@@ -208,17 +208,7 @@ msgstr "ogiltigt läge på rad %d: %s"

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

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

210

211 -#: apply.c:1460

212 -#, c-format

213 -msgid "recount: unexpected line: %.*s"

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

215 -

216 -#: apply.c:1529

217 -#, c-format

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

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

220 -

221 -#: apply.c:1551

211 +#: apply.c:1372

212 #, c-format

213 msgid ""

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

@@ -234,82 +224,92 @@ msgstr[1] ""

224 "sökvägskomponenter\n"

225 "tas bort (rad %d)"

226

237 -#: apply.c:1564

227 +#: apply.c:1385

228 #, c-format

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

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

231

242 -#: apply.c:1752

232 +#: apply.c:1481

233 +#, c-format

234 +msgid "recount: unexpected line: %.*s"

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

236 +

237 +#: apply.c:1550

238 +#, c-format

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

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

241 +

242 +#: apply.c:1753

243 msgid "new file depends on old contents"

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

245

246 -#: apply.c:1754

246 +#: apply.c:1755

247 msgid "deleted file still has contents"

248 msgstr "borttagen fil har fortfarande innehåll"

249

250 -#: apply.c:1788

250 +#: apply.c:1789

251 #, c-format

252 msgid "corrupt patch at line %d"

253 msgstr "trasig patch på rad %d"

254

255 -#: apply.c:1825

255 +#: apply.c:1826

256 #, c-format

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

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

259

260 -#: apply.c:1827

260 +#: apply.c:1828

261 #, c-format

262 msgid "deleted file %s still has contents"

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

264

265 -#: apply.c:1830

265 +#: apply.c:1831

266 #, c-format

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

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

269

270 -#: apply.c:1977

270 +#: apply.c:1978

271 #, c-format

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

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

274

275 -#: apply.c:2014

275 +#: apply.c:2015

276 #, c-format

277 msgid "unrecognized binary patch at line %d"

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

279

280 -#: apply.c:2176

280 +#: apply.c:2177

281 #, c-format

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

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

284

285 -#: apply.c:2262

285 +#: apply.c:2263

286 #, c-format

287 msgid "unable to read symlink %s"

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

289

290 -#: apply.c:2266

290 +#: apply.c:2267

291 #, c-format

292 msgid "unable to open or read %s"

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

294

295 -#: apply.c:2925

295 +#: apply.c:2926

296 #, c-format

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

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

299

300 -#: apply.c:3046

300 +#: apply.c:3047

301 #, c-format

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

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

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

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

306

307 -#: apply.c:3058

307 +#: apply.c:3059

308 #, c-format

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

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

311

312 -#: apply.c:3064

312 +#: apply.c:3065

313 #, c-format

314 msgid ""

315 "while searching for:\n"

@@ -318,25 +318,25 @@ msgstr ""

318 "vid sökning efter:\n"

319 "%.*s"

320

321 -#: apply.c:3086

321 +#: apply.c:3087

322 #, c-format

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

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

325

326 -#: apply.c:3094

326 +#: apply.c:3095

327 #, c-format

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

329 msgstr ""

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

331 "\""

332

333 -#: apply.c:3141

333 +#: apply.c:3142

334 #, c-format

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

336 msgstr ""

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

338

339 -#: apply.c:3151

339 +#: apply.c:3152

340 #, c-format

341 msgid ""

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

@@ -344,426 +344,426 @@ msgstr ""

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

345 "innehållet."

346

347 -#: apply.c:3159

347 +#: apply.c:3160

348 #, c-format

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

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

351

352 -#: apply.c:3177

352 +#: apply.c:3178

353 #, c-format

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

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

356

357 -#: apply.c:3190

357 +#: apply.c:3191

358 #, c-format

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

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

361

362 -#: apply.c:3196

362 +#: apply.c:3197

363 #, c-format

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

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

366

367 -#: apply.c:3217

367 +#: apply.c:3218

368 #, c-format

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

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

371

372 -#: apply.c:3340

372 +#: apply.c:3341

373 #, c-format

374 msgid "cannot checkout %s"

375 msgstr "kan inte checka ut %s"

376

377 -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279

377 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280

378 #, c-format

379 msgid "failed to read %s"

380 msgstr "misslyckades läsa %s"

381

382 -#: apply.c:3400

382 +#: apply.c:3401

383 #, c-format

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

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

386

387 -#: apply.c:3429 apply.c:3672

387 +#: apply.c:3430 apply.c:3673

388 #, c-format

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

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

391

392 -#: apply.c:3515 apply.c:3687

392 +#: apply.c:3516 apply.c:3688

393 #, c-format

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

395 msgstr "%s: finns inte i indexet"

396

397 -#: apply.c:3524 apply.c:3695

397 +#: apply.c:3525 apply.c:3696

398 #, c-format

399 msgid "%s: does not match index"

400 msgstr "%s: motsvarar inte indexet"

401

402 -#: apply.c:3559

402 +#: apply.c:3560

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

404 msgstr ""

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

406 "vägssammanslagning."

407

408 -#: apply.c:3562

408 +#: apply.c:3563

409 #, c-format

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

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

412

413 -#: apply.c:3578 apply.c:3582

413 +#: apply.c:3579 apply.c:3583

414 #, c-format

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

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

417

418 -#: apply.c:3594

418 +#: apply.c:3595

419 #, c-format

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

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

422

423 -#: apply.c:3608

423 +#: apply.c:3609

424 #, c-format

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

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

427

428 -#: apply.c:3613

428 +#: apply.c:3614

429 #, c-format

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

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

432

433 -#: apply.c:3639

433 +#: apply.c:3640

434 msgid "removal patch leaves file contents"

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

436

437 -#: apply.c:3712

437 +#: apply.c:3713

438 #, c-format

439 msgid "%s: wrong type"

440 msgstr "%s: fel typ"

441

442 -#: apply.c:3714

442 +#: apply.c:3715

443 #, c-format

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

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

446

447 -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856

447 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856

448 #: read-cache.c:1309

449 #, c-format

450 msgid "invalid path '%s'"

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

452

453 -#: apply.c:3923

453 +#: apply.c:3924

454 #, c-format

455 msgid "%s: already exists in index"

456 msgstr "%s: finns redan i indexet"

457

458 -#: apply.c:3926

458 +#: apply.c:3927

459 #, c-format

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

461 msgstr "%s: finns redan i arbetskatalogen"

462

463 -#: apply.c:3946

463 +#: apply.c:3947

464 #, c-format

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

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

467

468 -#: apply.c:3951

468 +#: apply.c:3952

469 #, c-format

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

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

472

473 -#: apply.c:3971

473 +#: apply.c:3972

474 #, c-format

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

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

477

478 -#: apply.c:3975

478 +#: apply.c:3976

479 #, c-format

480 msgid "%s: patch does not apply"

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

482

483 -#: apply.c:3990

483 +#: apply.c:3991

484 #, c-format

485 msgid "Checking patch %s..."

486 msgstr "Kontrollerar patchen %s..."

487

488 -#: apply.c:4082

488 +#: apply.c:4083

489 #, c-format

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

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

492

493 -#: apply.c:4089

493 +#: apply.c:4090

494 #, c-format

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

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

497

498 -#: apply.c:4092

498 +#: apply.c:4093

499 #, c-format

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

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

502

503 -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143

503 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143

504 #, c-format

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

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

507

508 -#: apply.c:4101

508 +#: apply.c:4102

509 #, c-format

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

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

512

513 -#: apply.c:4111

513 +#: apply.c:4112

514 #, c-format

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

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

517

518 -#: apply.c:4249

518 +#: apply.c:4250

519 #, c-format

520 msgid "unable to remove %s from index"

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

522

523 -#: apply.c:4283

523 +#: apply.c:4284

524 #, c-format

525 msgid "corrupt patch for submodule %s"

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

527

528 -#: apply.c:4289

528 +#: apply.c:4290

529 #, c-format

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

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

532

533 -#: apply.c:4297

533 +#: apply.c:4298

534 #, c-format

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

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

537

538 -#: apply.c:4303 apply.c:4448

538 +#: apply.c:4304 apply.c:4449

539 #, c-format

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

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

542

543 -#: apply.c:4346

543 +#: apply.c:4347

544 #, c-format

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

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

547

548 -#: apply.c:4350

548 +#: apply.c:4351

549 #, c-format

550 msgid "closing file '%s'"

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

552

553 -#: apply.c:4420

553 +#: apply.c:4421

554 #, c-format

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

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

557

558 -#: apply.c:4518

558 +#: apply.c:4519

559 #, c-format

560 msgid "Applied patch %s cleanly."

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

562

563 -#: apply.c:4526

563 +#: apply.c:4527

564 msgid "internal error"

565 msgstr "internt fel"

566

567 -#: apply.c:4529

567 +#: apply.c:4530

568 #, c-format

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

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

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

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

573

574 -#: apply.c:4540

574 +#: apply.c:4541

575 #, c-format

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

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

578

579 -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168

579 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194

580 #, c-format

581 msgid "cannot open %s"

582 msgstr "kan inte öppna %s"

583

584 -#: apply.c:4562

584 +#: apply.c:4563

585 #, c-format

586 msgid "Hunk #%d applied cleanly."

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

588

589 -#: apply.c:4566

589 +#: apply.c:4567

590 #, c-format

591 msgid "Rejected hunk #%d."

592 msgstr "Refuserar stycke %d."

593

594 -#: apply.c:4676

594 +#: apply.c:4686

595 #, c-format

596 msgid "Skipped patch '%s'."

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

598

599 -#: apply.c:4684

599 +#: apply.c:4694

600 msgid "unrecognized input"

601 msgstr "indata känns inte igen"

602

603 -#: apply.c:4704

603 +#: apply.c:4714

604 msgid "unable to read index file"

605 msgstr "kan inte läsa indexfilen"

606

607 -#: apply.c:4859

607 +#: apply.c:4871

608 #, c-format

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

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

611

612 -#: apply.c:4886

612 +#: apply.c:4898

613 #, c-format

614 msgid "squelched %d whitespace error"

615 msgid_plural "squelched %d whitespace errors"

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

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

618

619 -#: apply.c:4892 apply.c:4907

619 +#: apply.c:4904 apply.c:4919

620 #, c-format

621 msgid "%d line adds whitespace errors."

622 msgid_plural "%d lines add whitespace errors."

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

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

625

626 -#: apply.c:4900

626 +#: apply.c:4912

627 #, c-format

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

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

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

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

632

633 -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

633 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390

634 msgid "Unable to write new index file"

635 msgstr "Kunde inte skriva ny indexfil"

636

637 -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211

638 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273

639 -#: builtin/pull.c:208 builtin/submodule--helper.c:407

637 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200

638 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273

639 +#: builtin/pull.c:209 builtin/submodule--helper.c:407

640 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370

641 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853

642 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211

643 msgid "path"

644 msgstr "sökväg"

645

646 -#: apply.c:4944

646 +#: apply.c:4956

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

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

649

650 -#: apply.c:4947

650 +#: apply.c:4959

651 msgid "apply changes matching the given path"

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

653

654 -#: apply.c:4949 builtin/am.c:2217

654 +#: apply.c:4961 builtin/am.c:2206

655 msgid "num"

656 msgstr "antal"

657

658 -#: apply.c:4950

658 +#: apply.c:4962

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

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

661

662 -#: apply.c:4953

662 +#: apply.c:4965

663 msgid "ignore additions made by the patch"

664 msgstr "ignorera tillägg gjorda av patchen"

665

666 -#: apply.c:4955

666 +#: apply.c:4967

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

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

669

670 -#: apply.c:4959

670 +#: apply.c:4971

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

672 msgstr "visa antal tillagda och borttagna rader decimalt"

673

674 -#: apply.c:4961

674 +#: apply.c:4973

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

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

677

678 -#: apply.c:4963

678 +#: apply.c:4975

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

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

681

682 -#: apply.c:4965

682 +#: apply.c:4977

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

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

685

686 -#: apply.c:4967

686 +#: apply.c:4979

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

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

689

690 -#: apply.c:4969

690 +#: apply.c:4981

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

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

693

694 -#: apply.c:4971

694 +#: apply.c:4983

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

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

697

698 -#: apply.c:4974

698 +#: apply.c:4986

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

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

701

702 -#: apply.c:4976

702 +#: apply.c:4988

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

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

705

706 -#: apply.c:4978

706 +#: apply.c:4990

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

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

709

710 -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524

710 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524

711 msgid "paths are separated with NUL character"

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

713

714 -#: apply.c:4983

714 +#: apply.c:4995

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

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

717

718 -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98

718 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98

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

720 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421

720 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445

721 msgid "action"

722 msgstr "åtgärd"

723

724 -#: apply.c:4985

724 +#: apply.c:4997

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

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

727

728 -#: apply.c:4988 apply.c:4991

728 +#: apply.c:5000 apply.c:5003

729 msgid "ignore changes in whitespace when finding context"

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

731

732 -#: apply.c:4994

732 +#: apply.c:5006

733 msgid "apply the patch in reverse"

734 msgstr "tillämpa patchen baklänges"

735

736 -#: apply.c:4996

736 +#: apply.c:5008

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

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

739

740 -#: apply.c:4998

740 +#: apply.c:5010

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

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

743

744 -#: apply.c:5000

744 +#: apply.c:5012

745 msgid "allow overlapping hunks"

746 msgstr "tillåt överlappande stycken"

747

748 -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22

748 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22

749 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786

750 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128

750 +#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128

751 msgid "be verbose"

752 msgstr "var pratsam"

753

754 -#: apply.c:5003

754 +#: apply.c:5015

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

756 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

757

758 -#: apply.c:5006

758 +#: apply.c:5018

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

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

761

762 -#: apply.c:5008 builtin/am.c:2205

762 +#: apply.c:5020 builtin/am.c:2194

763 msgid "root"

764 msgstr "rot"

765

766 -#: apply.c:5009

766 +#: apply.c:5021

767 msgid "prepend <root> to all filenames"

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

769

@@ -818,7 +818,7 @@ msgstr "fmt"

818 msgid "archive format"

819 msgstr "arkivformat"

820

821 -#: archive.c:458 builtin/log.c:1580

821 +#: archive.c:458 builtin/log.c:1581

822 msgid "prefix"

823 msgstr "prefix"

824

@@ -826,11 +826,12 @@ msgstr "prefix"

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

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

828

829 -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875

830 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134

831 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105

832 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412

833 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177

829 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874

830 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162

831 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899

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

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

834 +#: parse-options.h:186

835 msgid "file"

836 msgstr "fil"

837

@@ -862,7 +863,7 @@ msgstr "komprimera bättre"

863 msgid "list supported archive formats"

864 msgstr "visa understödda arkivformat"

865

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

866 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115

867 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859

868 msgid "repo"

869 msgstr "arkiv"

@@ -871,7 +872,7 @@ msgstr "arkiv"

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

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

874

874 -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707

875 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715

876 #: builtin/notes.c:498

877 msgid "command"

878 msgstr "kommando"

@@ -907,26 +908,26 @@ msgstr "Argumentet stöd inte för formatet \"%s\": -%d"

908 msgid "cannot stream blob %s"

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

910

910 -#: archive-tar.c:260 archive-zip.c:363

911 +#: archive-tar.c:266 archive-zip.c:363

912 #, c-format

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

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

915

915 -#: archive-tar.c:287 archive-zip.c:353

916 +#: archive-tar.c:293 archive-zip.c:353

917 #, c-format

918 msgid "cannot read %s"

919 msgstr "kan inte läsa %s"

920

920 -#: archive-tar.c:459

921 +#: archive-tar.c:465

922 #, c-format

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

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

925

925 -#: archive-tar.c:462

926 +#: archive-tar.c:468

927 msgid "unable to redirect descriptor"

928 msgstr "kan inte omdirigera handtag"

929

929 -#: archive-tar.c:469

930 +#: archive-tar.c:475

931 #, c-format

932 msgid "'%s' filter reported error"

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

@@ -951,17 +952,17 @@ msgstr "fel i deflate (%d)"

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

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

954

954 -#: attr.c:211

955 +#: attr.c:213

956 #, c-format

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

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

959

959 -#: attr.c:368

960 +#: attr.c:370

961 #, c-format

962 msgid "%s not allowed: %s:%d"

963 msgstr "%s inte tillåtet: %s:%d"

964

964 -#: attr.c:408

965 +#: attr.c:410

966 msgid ""

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

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

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

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

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

1092

1092 -#: blame.c:2697

1093 +#: blame.c:2700

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

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

1096

1096 -#: blame.c:2711

1097 +#: blame.c:2714

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

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

1100

1100 -#: blame.c:2732

1101 +#: blame.c:2735

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

1103 msgstr ""

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

1105 "incheckningen"

1106

1106 -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033

1107 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963

1108 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411

1109 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163

1107 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971

1108 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964

1109 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411

1110 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143

1111 #: builtin/shortlog.c:192

1112 msgid "revision walk setup failed"

1113 msgstr "misslyckades skapa revisionstraversering"

1114

1114 -#: blame.c:2759

1115 +#: blame.c:2762

1116 msgid ""

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

1118 msgstr ""

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

1120 "kedjan"

1121

1121 -#: blame.c:2770

1122 +#: blame.c:2773

1123 #, c-format

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

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

1126

1126 -#: blame.c:2781

1127 +#: blame.c:2784

1128 #, c-format

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

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

@@ -1281,7 +1282,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1284

1284 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024

1285 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962

1286 #: builtin/commit.c:791

1287 #, c-format

1288 msgid "could not open '%s'"

@@ -1334,7 +1335,7 @@ msgstr "rev-list dog"

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

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

1337

1337 -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306

1338 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306

1339 #, c-format

1340 msgid "unrecognized argument: %s"

1341 msgstr "okänt argument: %s"

@@ -1357,8 +1358,8 @@ msgstr "index-pack dog"

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

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

1360

1360 -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399

1361 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455

1361 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398

1362 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456

1363 #, c-format

1364 msgid "could not parse %s"

1365 msgstr "kunde inte tolka %s"

@@ -1388,29 +1389,29 @@ msgstr ""

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

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

1391

1391 -#: commit.c:1127

1392 +#: commit.c:1128

1393 #, c-format

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

1395 msgstr ""

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

1397

1397 -#: commit.c:1130

1398 +#: commit.c:1131

1399 #, c-format

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

1401 msgstr ""

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

1403

1403 -#: commit.c:1133

1404 +#: commit.c:1134

1405 #, c-format

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

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

1408

1408 -#: commit.c:1136

1409 +#: commit.c:1137

1410 #, c-format

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

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

1413

1413 -#: commit.c:1390

1414 +#: commit.c:1391

1415 msgid ""

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

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

@@ -1472,180 +1473,195 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"

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

1474 msgstr "kan inte hitta alla incheckingsgraffiler"

1475

1475 -#: commit-graph.c:554 commit-graph.c:614

1476 +#: commit-graph.c:561 commit-graph.c:621

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

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

1479

1479 -#: commit-graph.c:575

1480 +#: commit-graph.c:582

1481 #, c-format

1482 msgid "could not find commit %s"

1483 msgstr "kunde inte hitta incheckningen %s"

1484

1484 -#: commit-graph.c:1002 builtin/pack-objects.c:2657

1485 +#: commit-graph.c:855 builtin/am.c:1287

1486 +#, c-format

1487 +msgid "unable to parse commit %s"

1488 +msgstr "kunde inte tolka incheckningen %s"

1489 +

1490 +#: commit-graph.c:859

1491 +#, c-format

1492 +msgid "unable to get tree for %s"

1493 +msgstr "kunde inte hämta trädet på %s"

1494 +

1495 +#: commit-graph.c:1017 builtin/pack-objects.c:2641

1496 #, c-format

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

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

1499

1489 -#: commit-graph.c:1034

1500 +#: commit-graph.c:1049

1501 msgid "Loading known commits in commit graph"

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

1503

1493 -#: commit-graph.c:1051

1504 +#: commit-graph.c:1066

1505 msgid "Expanding reachable commits in commit graph"

1506 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

1507

1497 -#: commit-graph.c:1070

1508 +#: commit-graph.c:1085

1509 msgid "Clearing commit marks in commit graph"

1510 msgstr "Rensar incheckningsmärken i incheckningsgraf"

1511

1501 -#: commit-graph.c:1089

1512 +#: commit-graph.c:1104

1513 msgid "Computing commit graph generation numbers"

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

1515

1505 -#: commit-graph.c:1163

1516 +#: commit-graph.c:1179

1517 #, c-format

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

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

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

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

1522

1512 -#: commit-graph.c:1176

1523 +#: commit-graph.c:1192

1524 #, c-format

1525 msgid "error adding pack %s"

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

1527

1517 -#: commit-graph.c:1180

1528 +#: commit-graph.c:1196

1529 #, c-format

1530 msgid "error opening index for %s"

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

1532

1522 -#: commit-graph.c:1204

1533 +#: commit-graph.c:1220

1534 #, c-format

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

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

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

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

1539

1529 -#: commit-graph.c:1238

1540 +#: commit-graph.c:1240

1541 +#, c-format

1542 +msgid "invalid commit object id: %s"

1543 +msgstr "ogiltigt inchecknings-objekt-id %s"

1544 +

1545 +#: commit-graph.c:1255

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

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

1548

1533 -#: commit-graph.c:1253

1549 +#: commit-graph.c:1270

1550 msgid "Counting distinct commits in commit graph"

1551 msgstr "Räknar olika incheckningar i incheckningsgraf"

1552

1537 -#: commit-graph.c:1284

1553 +#: commit-graph.c:1300

1554 msgid "Finding extra edges in commit graph"

1555 msgstr "Söker ytterligare kanter i incheckingsgraf"

1556

1541 -#: commit-graph.c:1332

1557 +#: commit-graph.c:1346

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

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

1560

1545 -#: commit-graph.c:1365 midx.c:811

1561 +#: commit-graph.c:1379 midx.c:810

1562 #, c-format

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

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

1565

1550 -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240

1566 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241

1567 #, c-format

1568 msgid "unable to create '%s'"

1569 msgstr "kunde inte skapa \"%s\""

1570

1555 -#: commit-graph.c:1437

1571 +#: commit-graph.c:1451

1572 #, c-format

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

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

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

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

1577

1562 -#: commit-graph.c:1478

1578 +#: commit-graph.c:1492

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

1580 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

1581

1566 -#: commit-graph.c:1490

1582 +#: commit-graph.c:1504

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

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

1585

1570 -#: commit-graph.c:1510

1586 +#: commit-graph.c:1524

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

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

1589

1574 -#: commit-graph.c:1621

1590 +#: commit-graph.c:1635

1591 msgid "Scanning merged commits"

1592 msgstr "Söker sammanslagna incheckningar"

1593

1578 -#: commit-graph.c:1632

1594 +#: commit-graph.c:1646

1595 #, c-format

1596 msgid "unexpected duplicate commit id %s"

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

1598

1583 -#: commit-graph.c:1657

1599 +#: commit-graph.c:1670

1600 msgid "Merging commit-graph"

1601 msgstr "Slår ihop incheckningsgraf"

1602

1587 -#: commit-graph.c:1844

1603 +#: commit-graph.c:1860

1604 #, c-format

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

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

1607

1592 -#: commit-graph.c:1855

1608 +#: commit-graph.c:1871

1609 msgid "too many commits to write graph"

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

1611

1596 -#: commit-graph.c:1945

1612 +#: commit-graph.c:1961

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

1614 msgstr ""

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

1616

1601 -#: commit-graph.c:1955

1617 +#: commit-graph.c:1971

1618 #, c-format

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

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

1621

1606 -#: commit-graph.c:1965 commit-graph.c:1980

1622 +#: commit-graph.c:1981 commit-graph.c:1996

1623 #, c-format

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

1625 msgstr ""

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

1627

1612 -#: commit-graph.c:1972

1628 +#: commit-graph.c:1988

1629 #, c-format

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

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

1632

1617 -#: commit-graph.c:1989

1633 +#: commit-graph.c:2006

1634 msgid "Verifying commits in commit graph"

1635 msgstr "Bekräftar incheckningar i incheckningsgrafen"

1636

1621 -#: commit-graph.c:2002

1637 +#: commit-graph.c:2020

1638 #, c-format

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

1640 msgstr ""

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

1642

1627 -#: commit-graph.c:2009

1643 +#: commit-graph.c:2027

1644 #, c-format

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

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

1647

1632 -#: commit-graph.c:2019

1648 +#: commit-graph.c:2037

1649 #, c-format

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

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

1652

1637 -#: commit-graph.c:2028

1653 +#: commit-graph.c:2046

1654 #, c-format

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

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

1657

1642 -#: commit-graph.c:2041

1658 +#: commit-graph.c:2059

1659 #, c-format

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

1661 msgstr ""

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

1663

1648 -#: commit-graph.c:2046

1664 +#: commit-graph.c:2064

1665 #, c-format

1666 msgid ""

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

@@ -1653,7 +1669,7 @@ msgstr ""

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

1670 "noll på annan plats"

1671

1656 -#: commit-graph.c:2050

1672 +#: commit-graph.c:2068

1673 #, c-format

1674 msgid ""

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

@@ -1661,12 +1677,12 @@ msgstr ""

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

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

1679

1664 -#: commit-graph.c:2065

1680 +#: commit-graph.c:2083

1681 #, c-format

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

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

1684

1669 -#: commit-graph.c:2071

1685 +#: commit-graph.c:2089

1686 #, c-format

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

1688 msgstr ""

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

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

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

1733

1718 -#: config.c:406 sequencer.c:2463

1734 +#: config.c:406 sequencer.c:2401

1735 #, c-format

1736 msgid "invalid key: %s"

1737 msgstr "felaktig nyckel: %s"

@@ -1844,150 +1860,144 @@ msgstr "core.commentChar kan bara vara ett tecken"

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

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

1862

1847 -#: config.c:1430

1863 +#: config.c:1425

1864 #, c-format

1865 msgid "malformed value for %s"

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

1867

1852 -#: config.c:1456

1868 +#: config.c:1451

1869 #, c-format

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

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

1872

1857 -#: config.c:1457

1873 +#: config.c:1452

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

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

1876

1861 -#: config.c:1518 builtin/pack-objects.c:3410

1877 +#: config.c:1513 builtin/pack-objects.c:3394

1878 #, c-format

1879 msgid "bad pack compression level %d"

1880 msgstr "felaktig paketkomprimeringsgrad %d"

1881

1866 -#: config.c:1639

1882 +#: config.c:1634

1883 #, c-format

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

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

1886

1871 -#: config.c:1642

1887 +#: config.c:1637

1888 #, c-format

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

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

1891

1876 -#: config.c:1659

1892 +#: config.c:1654

1893 #, c-format

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

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

1896

1881 -#: config.c:1689

1897 +#: config.c:1684

1898 #, c-format

1899 msgid "failed to parse %s"

1900 msgstr "kunde inte tolka %s"

1901

1886 -#: config.c:1745

1902 +#: config.c:1740

1903 msgid "unable to parse command-line config"

1904 msgstr "kan inte tolka kommandoradskonfiguration"

1905

1890 -#: config.c:2094

1906 +#: config.c:2091

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

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

1909

1894 -#: config.c:2264

1910 +#: config.c:2261

1911 #, c-format

1912 msgid "Invalid %s: '%s'"

1913 msgstr "Felaktigt %s: \"%s\""

1914

1899 -#: config.c:2307

1900 -#, c-format

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

1902 -msgstr ""

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

1904 -

1905 -#: config.c:2333

1915 +#: config.c:2306

1916 #, c-format

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

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

1919

1910 -#: config.c:2379

1920 +#: config.c:2352

1921 #, c-format

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

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

1924

1915 -#: config.c:2381

1925 +#: config.c:2354

1926 #, c-format

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

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

1929

1920 -#: config.c:2462

1930 +#: config.c:2435

1931 #, c-format

1932 msgid "invalid section name '%s'"

1933 msgstr "felaktigt sektionsnamn \"%s\""

1934

1925 -#: config.c:2494

1935 +#: config.c:2467

1936 #, c-format

1937 msgid "%s has multiple values"

1938 msgstr "%s har flera värden"

1939

1930 -#: config.c:2523

1940 +#: config.c:2496

1941 #, c-format

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

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

1944

1935 -#: config.c:2775 config.c:3099

1945 +#: config.c:2748 config.c:3072

1946 #, c-format

1947 msgid "could not lock config file %s"

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

1949

1940 -#: config.c:2786

1950 +#: config.c:2759

1951 #, c-format

1952 msgid "opening %s"

1953 msgstr "öppnar %s"

1954

1945 -#: config.c:2821 builtin/config.c:328

1955 +#: config.c:2794 builtin/config.c:328

1956 #, c-format

1957 msgid "invalid pattern: %s"

1958 msgstr "ogiltigt mönster: %s"

1959

1950 -#: config.c:2846

1960 +#: config.c:2819

1961 #, c-format

1962 msgid "invalid config file %s"

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

1964

1955 -#: config.c:2859 config.c:3112

1965 +#: config.c:2832 config.c:3085

1966 #, c-format

1967 msgid "fstat on %s failed"

1968 msgstr "fstat misslyckades på %s"

1969

1960 -#: config.c:2870

1970 +#: config.c:2843

1971 #, c-format

1972 msgid "unable to mmap '%s'"

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

1974

1965 -#: config.c:2879 config.c:3117

1975 +#: config.c:2852 config.c:3090

1976 #, c-format

1977 msgid "chmod on %s failed"

1978 msgstr "chmod misslyckades på %s"

1979

1970 -#: config.c:2964 config.c:3214

1980 +#: config.c:2937 config.c:3187

1981 #, c-format

1982 msgid "could not write config file %s"

1983 msgstr "kunde inte skriva konfigurationsfilen %s"

1984

1975 -#: config.c:2998

1985 +#: config.c:2971

1986 #, c-format

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

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

1989

1980 -#: config.c:3000 builtin/remote.c:782

1990 +#: config.c:2973 builtin/remote.c:782

1991 #, c-format

1992 msgid "could not unset '%s'"

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

1994

1985 -#: config.c:3090

1995 +#: config.c:3063

1996 #, c-format

1997 msgid "invalid section name: %s"

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

1999

1990 -#: config.c:3257

2000 +#: config.c:3230

2001 #, c-format

2002 msgid "missing value for '%s'"

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

@@ -2111,7 +2121,7 @@ msgstr "kunde inte slå upp %s (%s)"

2121 msgid "unknown port %s"

2122 msgstr "okänd port %s"

2123

2114 -#: connect.c:845 connect.c:1171

2124 +#: connect.c:845 connect.c:1175

2125 #, c-format

2126 msgid "strange hostname '%s' blocked"

2127 msgstr "konstigt värdnamn \"%s\" blockerat"

@@ -2126,60 +2136,60 @@ msgstr "konstig port \"%s\" blockerad"

2136 msgid "cannot start proxy %s"

2137 msgstr "kan inte starta mellanserver (proxy) %s"

2138

2129 -#: connect.c:924

2139 +#: connect.c:928

2140 msgid "no path specified; see 'git help pull' for valid url syntax"

2141 msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"

2142

2133 -#: connect.c:1119

2143 +#: connect.c:1123

2144 msgid "ssh variant 'simple' does not support -4"

2145 msgstr "ssh-varianten \"simple\" stöder inte -4"

2146

2137 -#: connect.c:1131

2147 +#: connect.c:1135

2148 msgid "ssh variant 'simple' does not support -6"

2149 msgstr "ssh-varianten \"simple\" stöder inte -6"

2150

2141 -#: connect.c:1148

2151 +#: connect.c:1152

2152 msgid "ssh variant 'simple' does not support setting port"

2153 msgstr "ssh-varianten \"simple\" stöder inte val av port"

2154

2145 -#: connect.c:1260

2155 +#: connect.c:1264

2156 #, c-format

2157 msgid "strange pathname '%s' blocked"

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

2159

2150 -#: connect.c:1307

2160 +#: connect.c:1311

2161 msgid "unable to fork"

2162 msgstr "kunde inte grena (fork)"

2163

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

2165 # objects in the database.

2156 -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43

2166 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43

2167 msgid "Checking connectivity"

2168 msgstr "Kontrollerar konnektivitet"

2169

2160 -#: connected.c:98

2170 +#: connected.c:100

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

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

2173

2164 -#: connected.c:118

2174 +#: connected.c:120

2175 msgid "failed write to rev-list"

2176 msgstr "kunde inte skriva till rev-list"

2177

2168 -#: connected.c:125

2178 +#: connected.c:127

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

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

2181

2172 -#: convert.c:193

2182 +#: convert.c:194

2183 #, c-format

2184 msgid "illegal crlf_action %d"

2185 msgstr "felaktig crlf_action %d"

2186

2177 -#: convert.c:206

2187 +#: convert.c:207

2188 #, c-format

2189 msgid "CRLF would be replaced by LF in %s"

2190 msgstr "CRLF skulle ersättas av LF i %s"

2191

2182 -#: convert.c:208

2192 +#: convert.c:209

2193 #, c-format

2194 msgid ""

2195 "CRLF will be replaced by LF in %s.\n"

@@ -2188,12 +2198,12 @@ msgstr ""

2198 "CRLF kommer att ersättas av LF i %s.\n"

2199 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

2200

2191 -#: convert.c:216

2201 +#: convert.c:217

2202 #, c-format

2203 msgid "LF would be replaced by CRLF in %s"

2204 msgstr "LF skulle ersättas av CRLF i %s"

2205

2196 -#: convert.c:218

2206 +#: convert.c:219

2207 #, c-format

2208 msgid ""

2209 "LF will be replaced by CRLF in %s.\n"

@@ -2202,12 +2212,12 @@ msgstr ""

2212 "LF kommer att ersättas av CRLF i %s.\n"

2213 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"

2214

2205 -#: convert.c:279

2215 +#: convert.c:280

2216 #, c-format

2217 msgid "BOM is prohibited in '%s' if encoded as %s"

2218 msgstr "BOM är förbjudet i \"%s\" om kodat som %s"

2219

2210 -#: convert.c:286

2220 +#: convert.c:287

2221 #, c-format

2222 msgid ""

2223 "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

@@ -2216,12 +2226,12 @@ msgstr ""

2226 "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "

2227 "teckenkodning i arbetskatalogen."

2228

2219 -#: convert.c:304

2229 +#: convert.c:305

2230 #, c-format

2231 msgid "BOM is required in '%s' if encoded as %s"

2232 msgstr "BOM krävs om \"%s\" kodas som %s"

2233

2224 -#: convert.c:306

2234 +#: convert.c:307

2235 #, c-format

2236 msgid ""

2237 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

@@ -2230,51 +2240,51 @@ msgstr ""

2240 "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "

2241 "(beroende på byteordning) som teckenkodning i arbetskatalogen."

2242

2233 -#: convert.c:424 convert.c:495

2243 +#: convert.c:425 convert.c:496

2244 #, c-format

2245 msgid "failed to encode '%s' from %s to %s"

2246 msgstr "misslyckades omkoda \"%s\" från %s till %s"

2247

2238 -#: convert.c:467

2248 +#: convert.c:468

2249 #, c-format

2250 msgid "encoding '%s' from %s to %s and back is not the same"

2251 msgstr ""

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

2253

2244 -#: convert.c:673

2254 +#: convert.c:674

2255 #, c-format

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

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

2258

2249 -#: convert.c:693

2259 +#: convert.c:694

2260 #, c-format

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

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

2263

2254 -#: convert.c:700

2264 +#: convert.c:701

2265 #, c-format

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

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

2268

2259 -#: convert.c:735 convert.c:738

2269 +#: convert.c:736 convert.c:739

2270 #, c-format

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

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

2273

2264 -#: convert.c:741 convert.c:796

2274 +#: convert.c:742 convert.c:797

2275 #, c-format

2276 msgid "external filter '%s' failed"

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

2278

2269 -#: convert.c:844

2279 +#: convert.c:845

2280 msgid "unexpected filter type"

2281 msgstr "oväntad filtertyp"

2282

2273 -#: convert.c:855

2283 +#: convert.c:856

2284 msgid "path name too long for external filter"

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

2286

2277 -#: convert.c:929

2287 +#: convert.c:930

2288 #, c-format

2289 msgid ""

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

@@ -2283,67 +2293,67 @@ msgstr ""

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

2294 "inte har filtrerats"

2295

2286 -#: convert.c:1228

2296 +#: convert.c:1229

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

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

2299

2290 -#: convert.c:1398 convert.c:1432

2300 +#: convert.c:1417 convert.c:1451

2301 #, c-format

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

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

2304

2295 -#: convert.c:1476

2305 +#: convert.c:1495

2306 #, c-format

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

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

2309

2300 -#: date.c:137

2310 +#: date.c:138

2311 msgid "in the future"

2312 msgstr "i framtiden"

2313

2304 -#: date.c:143

2314 +#: date.c:144

2315 #, c-format

2316 msgid "%<PRIuMAX> second ago"

2317 msgid_plural "%<PRIuMAX> seconds ago"

2318 msgstr[0] "%<PRIuMAX> sekund sedan"

2319 msgstr[1] "%<PRIuMAX> sekunder sedan"

2320

2311 -#: date.c:150

2321 +#: date.c:151

2322 #, c-format

2323 msgid "%<PRIuMAX> minute ago"

2324 msgid_plural "%<PRIuMAX> minutes ago"

2325 msgstr[0] "%<PRIuMAX> minut sedan"

2326 msgstr[1] "%<PRIuMAX> minuter sedan"

2327

2318 -#: date.c:157

2328 +#: date.c:158

2329 #, c-format

2330 msgid "%<PRIuMAX> hour ago"

2331 msgid_plural "%<PRIuMAX> hours ago"

2332 msgstr[0] "%<PRIuMAX> timme sedan"

2333 msgstr[1] "%<PRIuMAX> timmar sedan"

2334

2325 -#: date.c:164

2335 +#: date.c:165

2336 #, c-format

2337 msgid "%<PRIuMAX> day ago"

2338 msgid_plural "%<PRIuMAX> days ago"

2339 msgstr[0] "%<PRIuMAX> dag sedan"

2340 msgstr[1] "%<PRIuMAX> dagar sedan"

2341

2332 -#: date.c:170

2342 +#: date.c:171

2343 #, c-format

2344 msgid "%<PRIuMAX> week ago"

2345 msgid_plural "%<PRIuMAX> weeks ago"

2346 msgstr[0] "%<PRIuMAX> vecka sedan"

2347 msgstr[1] "%<PRIuMAX> veckor sedan"

2348

2339 -#: date.c:177

2349 +#: date.c:178

2350 #, c-format

2351 msgid "%<PRIuMAX> month ago"

2352 msgid_plural "%<PRIuMAX> months ago"

2353 msgstr[0] "%<PRIuMAX> månad sedan"

2354 msgstr[1] "%<PRIuMAX> månader sedan"

2355

2346 -#: date.c:188

2356 +#: date.c:189

2357 #, c-format

2358 msgid "%<PRIuMAX> year"

2359 msgid_plural "%<PRIuMAX> years"

@@ -2351,14 +2361,14 @@ msgstr[0] "%<PRIuMAX> år"

2361 msgstr[1] "%<PRIuMAX> år"

2362

2363 #. TRANSLATORS: "%s" is "<n> years"

2354 -#: date.c:191

2364 +#: date.c:192

2365 #, c-format

2366 msgid "%s, %<PRIuMAX> month ago"

2367 msgid_plural "%s, %<PRIuMAX> months ago"

2368 msgstr[0] "%s, %<PRIuMAX> månad sedan"

2369 msgstr[1] "%s, %<PRIuMAX> månader sedan"

2370

2361 -#: date.c:196 date.c:201

2371 +#: date.c:197 date.c:202

2372 #, c-format

2373 msgid "%<PRIuMAX> year ago"

2374 msgid_plural "%<PRIuMAX> years ago"

@@ -2394,7 +2404,7 @@ msgstr "Markerade %d öar, klar.\n"

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

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

2406

2397 -#: diffcore-rename.c:544

2407 +#: diffcore-rename.c:543

2408 msgid "Performing inexact rename detection"

2409 msgstr "Utför onöjaktig namnbytesdetektering"

2410

@@ -2460,35 +2470,35 @@ msgstr ""

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

2471 "%s"

2472

2463 -#: diff.c:4215

2473 +#: diff.c:4218

2474 #, c-format

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

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

2477

2468 -#: diff.c:4560

2478 +#: diff.c:4563

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

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

2481

2472 -#: diff.c:4563

2482 +#: diff.c:4566

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

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

2485

2476 -#: diff.c:4641

2486 +#: diff.c:4644

2487 msgid "--follow requires exactly one pathspec"

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

2489

2480 -#: diff.c:4689

2490 +#: diff.c:4692

2491 #, c-format

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

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

2494

2485 -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222

2495 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225

2496 #: parse-options.c:199 parse-options.c:203

2497 #, c-format

2498 msgid "%s expects a numerical value"

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

2500

2491 -#: diff.c:4726

2501 +#: diff.c:4729

2502 #, c-format

2503 msgid ""

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

@@ -2497,42 +2507,42 @@ msgstr ""

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

2508 "%s"

2509

2500 -#: diff.c:4811

2510 +#: diff.c:4814

2511 #, c-format

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

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

2514

2505 -#: diff.c:4835

2515 +#: diff.c:4838

2516 #, c-format

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

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

2519

2510 -#: diff.c:4849

2520 +#: diff.c:4852

2521 #, c-format

2522 msgid "unable to resolve '%s'"

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

2524

2515 -#: diff.c:4899 diff.c:4905

2525 +#: diff.c:4902 diff.c:4908

2526 #, c-format

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

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

2529

2520 -#: diff.c:4917

2530 +#: diff.c:4920

2531 #, c-format

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

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

2534

2525 -#: diff.c:4938

2535 +#: diff.c:4941

2536 #, c-format

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

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

2539

2530 -#: diff.c:4957

2540 +#: diff.c:4960

2541 #, c-format

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

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

2544

2535 -#: diff.c:4997

2545 +#: diff.c:5000

2546 msgid ""

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

2548 "\"histogram\""

@@ -2540,149 +2550,149 @@ msgstr ""

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

2551 "\"histogram\""

2552

2543 -#: diff.c:5033 diff.c:5053

2553 +#: diff.c:5036 diff.c:5056

2554 #, c-format

2555 msgid "invalid argument to %s"

2556 msgstr "ogiltigt argument för %s"

2557

2548 -#: diff.c:5191

2558 +#: diff.c:5194

2559 #, c-format

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

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

2562

2553 -#: diff.c:5247

2563 +#: diff.c:5250

2564 #, c-format

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

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

2567

2558 -#: diff.c:5270

2568 +#: diff.c:5273

2569 msgid "Diff output format options"

2570 msgstr "Formatflaggor för diff-utdata"

2571

2562 -#: diff.c:5272 diff.c:5278

2572 +#: diff.c:5275 diff.c:5281

2573 msgid "generate patch"

2574 msgstr "skapar patch"

2575

2566 -#: diff.c:5275 builtin/log.c:172

2576 +#: diff.c:5278 builtin/log.c:172

2577 msgid "suppress diff output"

2578 msgstr "undertryck diff-utdata"

2579

2570 -#: diff.c:5280 diff.c:5394 diff.c:5401

2580 +#: diff.c:5283 diff.c:5397 diff.c:5404

2581 msgid "<n>"

2582 msgstr "<n>"

2583

2574 -#: diff.c:5281 diff.c:5284

2584 +#: diff.c:5284 diff.c:5287

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

2586 msgstr "skapa diffar med <n> rader sammanhang"

2587

2578 -#: diff.c:5286

2588 +#: diff.c:5289

2589 msgid "generate the diff in raw format"

2590 msgstr "generera diff i råformat"

2591

2582 -#: diff.c:5289

2592 +#: diff.c:5292

2593 msgid "synonym for '-p --raw'"

2594 msgstr "synonym till \"-p --raw\""

2595

2586 -#: diff.c:5293

2596 +#: diff.c:5296

2597 msgid "synonym for '-p --stat'"

2598 msgstr "synonym till \"-p --stat\""

2599

2590 -#: diff.c:5297

2600 +#: diff.c:5300

2601 msgid "machine friendly --stat"

2602 msgstr "maskinläsbar --stat"

2603

2594 -#: diff.c:5300

2604 +#: diff.c:5303

2605 msgid "output only the last line of --stat"

2606 msgstr "skriv bara ut den sista raden för --stat"

2607

2598 -#: diff.c:5302 diff.c:5310

2608 +#: diff.c:5305 diff.c:5313

2609 msgid "<param1,param2>..."

2610 msgstr "<param1,param2>..."

2611

2602 -#: diff.c:5303

2612 +#: diff.c:5306

2613 msgid ""

2614 "output the distribution of relative amount of changes for each sub-directory"

2615 msgstr ""

2616 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

2617

2608 -#: diff.c:5307

2618 +#: diff.c:5310

2619 msgid "synonym for --dirstat=cumulative"

2620 msgstr "synonym för --dirstat=cumulative"

2621

2612 -#: diff.c:5311

2622 +#: diff.c:5314

2623 msgid "synonym for --dirstat=files,param1,param2..."

2624 msgstr "synonym för --dirstat=filer,param1,param2..."

2625

2616 -#: diff.c:5315

2626 +#: diff.c:5318

2627 msgid "warn if changes introduce conflict markers or whitespace errors"

2628 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

2629

2620 -#: diff.c:5318

2630 +#: diff.c:5321

2631 msgid "condensed summary such as creations, renames and mode changes"

2632 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

2633

2624 -#: diff.c:5321

2634 +#: diff.c:5324

2635 msgid "show only names of changed files"

2636 msgstr "visa endast namnen på ändrade filer"

2637

2628 -#: diff.c:5324

2638 +#: diff.c:5327

2639 msgid "show only names and status of changed files"

2640 msgstr "visa endast namn och status för ändrade filer"

2641

2632 -#: diff.c:5326

2642 +#: diff.c:5329

2643 msgid "<width>[,<name-width>[,<count>]]"

2644 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

2645

2636 -#: diff.c:5327

2646 +#: diff.c:5330

2647 msgid "generate diffstat"

2648 msgstr "skapa diffstat"

2649

2640 -#: diff.c:5329 diff.c:5332 diff.c:5335

2650 +#: diff.c:5332 diff.c:5335 diff.c:5338

2651 msgid "<width>"

2652 msgstr "<bredd>"

2653

2644 -#: diff.c:5330

2654 +#: diff.c:5333

2655 msgid "generate diffstat with a given width"

2656 msgstr "generera en diffstat med given bredd"

2657

2648 -#: diff.c:5333

2658 +#: diff.c:5336

2659 msgid "generate diffstat with a given name width"

2660 msgstr "generera en diffstat med given namnbredd"

2661

2652 -#: diff.c:5336

2662 +#: diff.c:5339

2663 msgid "generate diffstat with a given graph width"

2664 msgstr "generera en diffstat med given grafbredd"

2665

2656 -#: diff.c:5338

2666 +#: diff.c:5341

2667 msgid "<count>"

2668 msgstr "<antal>"

2669

2660 -#: diff.c:5339

2670 +#: diff.c:5342

2671 msgid "generate diffstat with limited lines"

2672 msgstr "generera diffstat med begränsade rader"

2673

2664 -#: diff.c:5342

2674 +#: diff.c:5345

2675 msgid "generate compact summary in diffstat"

2676 msgstr "skapa kompakt översikt i diffstat"

2677

2668 -#: diff.c:5345

2678 +#: diff.c:5348

2679 msgid "output a binary diff that can be applied"

2680 msgstr "skapa en binärdiff som kan appliceras"

2681

2672 -#: diff.c:5348

2682 +#: diff.c:5351

2683 msgid "show full pre- and post-image object names on the \"index\" lines"

2684 msgstr ""

2685 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

2686

2677 -#: diff.c:5350

2687 +#: diff.c:5353

2688 msgid "show colored diff"

2689 msgstr "visa färgad diff"

2690

2681 -#: diff.c:5351

2691 +#: diff.c:5354

2692 msgid "<kind>"

2693 msgstr "<typ>"

2694

2685 -#: diff.c:5352

2695 +#: diff.c:5355

2696 msgid ""

2697 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

2698 "diff"

@@ -2690,7 +2700,7 @@ msgstr ""

2700 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

2701 "\"new\" (nya) rader i diffen"

2702

2693 -#: diff.c:5355

2703 +#: diff.c:5358

2704 msgid ""

2705 "do not munge pathnames and use NULs as output field terminators in --raw or "

2706 "--numstat"

@@ -2698,87 +2708,87 @@ msgstr ""

2708 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

2709 "eller --numstat"

2710

2701 -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470

2711 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473

2712 msgid "<prefix>"

2713 msgstr "<prefix>"

2714

2705 -#: diff.c:5359

2715 +#: diff.c:5362

2716 msgid "show the given source prefix instead of \"a/\""

2717 msgstr "visa givet källprefix istället för \"a/\""

2718

2709 -#: diff.c:5362

2719 +#: diff.c:5365

2720 msgid "show the given destination prefix instead of \"b/\""

2721 msgstr "visa givet målprefix istället för \"b/\""

2722

2713 -#: diff.c:5365

2723 +#: diff.c:5368

2724 msgid "prepend an additional prefix to every line of output"

2725 msgstr "lägg till ytterligare prefix på alla rader i utdata"

2726

2717 -#: diff.c:5368

2727 +#: diff.c:5371

2728 msgid "do not show any source or destination prefix"

2729 msgstr "visa inte käll- eller målprefix"

2730

2721 -#: diff.c:5371

2731 +#: diff.c:5374

2732 msgid "show context between diff hunks up to the specified number of lines"

2733 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

2734

2725 -#: diff.c:5375 diff.c:5380 diff.c:5385

2735 +#: diff.c:5378 diff.c:5383 diff.c:5388

2736 msgid "<char>"

2737 msgstr "<tecken>"

2738

2729 -#: diff.c:5376

2739 +#: diff.c:5379

2740 msgid "specify the character to indicate a new line instead of '+'"

2741 msgstr "ange tecken för att ange ny rad istället för \"+\""

2742

2733 -#: diff.c:5381

2743 +#: diff.c:5384

2744 msgid "specify the character to indicate an old line instead of '-'"

2745 msgstr "ange tecken för att ange gammal rad istället för \"-\""

2746

2737 -#: diff.c:5386

2747 +#: diff.c:5389

2748 msgid "specify the character to indicate a context instead of ' '"

2749 msgstr "ange tecken för att ange sammanhang istället för \" \""

2750

2741 -#: diff.c:5389

2751 +#: diff.c:5392

2752 msgid "Diff rename options"

2753 msgstr "Diff-namnbytesflaggor"

2754

2745 -#: diff.c:5390

2755 +#: diff.c:5393

2756 msgid "<n>[/<m>]"

2757 msgstr "<n>[/<m>]"

2758

2749 -#: diff.c:5391

2759 +#: diff.c:5394

2760 msgid "break complete rewrite changes into pairs of delete and create"

2761 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

2762

2753 -#: diff.c:5395

2763 +#: diff.c:5398

2764 msgid "detect renames"

2765 msgstr "detektera namnändringar"

2766

2757 -#: diff.c:5399

2767 +#: diff.c:5402

2768 msgid "omit the preimage for deletes"

2769 msgstr "ta bort för-version för borttagningar"

2770

2761 -#: diff.c:5402

2771 +#: diff.c:5405

2772 msgid "detect copies"

2773 msgstr "detektera kopior"

2774

2765 -#: diff.c:5406

2775 +#: diff.c:5409

2776 msgid "use unmodified files as source to find copies"

2777 msgstr "använd oförändrade som källa för att hitta kopior"

2778

2769 -#: diff.c:5408

2779 +#: diff.c:5411

2780 msgid "disable rename detection"

2781 msgstr "inaktivera detektering av namnbyten"

2782

2773 -#: diff.c:5411

2783 +#: diff.c:5414

2784 msgid "use empty blobs as rename source"

2785 msgstr "använd tomma blob:ar som namnändringskälla"

2786

2777 -#: diff.c:5413

2787 +#: diff.c:5416

2788 msgid "continue listing the history of a file beyond renames"

2789 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

2790

2781 -#: diff.c:5416

2791 +#: diff.c:5419

2792 msgid ""

2793 "prevent rename/copy detection if the number of rename/copy targets exceeds "

2794 "given limit"

@@ -2786,159 +2796,159 @@ msgstr ""

2796 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

2797 "given gräns"

2798

2789 -#: diff.c:5418

2799 +#: diff.c:5421

2800 msgid "Diff algorithm options"

2801 msgstr "Alternativ för diff-algoritm"

2802

2793 -#: diff.c:5420

2803 +#: diff.c:5423

2804 msgid "produce the smallest possible diff"

2805 msgstr "skapa minsta möjliga diff"

2806

2797 -#: diff.c:5423

2807 +#: diff.c:5426

2808 msgid "ignore whitespace when comparing lines"

2809 msgstr "ignorera blanktecken vid radjämförelse"

2810

2801 -#: diff.c:5426

2811 +#: diff.c:5429

2812 msgid "ignore changes in amount of whitespace"

2813 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

2814

2805 -#: diff.c:5429

2815 +#: diff.c:5432

2816 msgid "ignore changes in whitespace at EOL"

2817 msgstr "ignorera blanktecken vid radslut"

2818

2809 -#: diff.c:5432

2819 +#: diff.c:5435

2820 msgid "ignore carrier-return at the end of line"

2821 msgstr "ignorera CR-tecken vid radslut"

2822

2813 -#: diff.c:5435

2823 +#: diff.c:5438

2824 msgid "ignore changes whose lines are all blank"

2825 msgstr "ignorera ändringar i rader som är helt blanka"

2826

2817 -#: diff.c:5438

2827 +#: diff.c:5441

2828 msgid "heuristic to shift diff hunk boundaries for easy reading"

2829 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

2830

2821 -#: diff.c:5441

2831 +#: diff.c:5444

2832 msgid "generate diff using the \"patience diff\" algorithm"

2833 msgstr "skapa diffar med algoritmen \"patience diff\""

2834

2825 -#: diff.c:5445

2835 +#: diff.c:5448

2836 msgid "generate diff using the \"histogram diff\" algorithm"

2837 msgstr "skapa diffar med algoritmen \"histogram diff\""

2838

2829 -#: diff.c:5447

2839 +#: diff.c:5450

2840 msgid "<algorithm>"

2841 msgstr "<algoritm>"

2842

2833 -#: diff.c:5448

2843 +#: diff.c:5451

2844 msgid "choose a diff algorithm"

2845 msgstr "välj en diff-algoritm"

2846

2837 -#: diff.c:5450

2847 +#: diff.c:5453

2848 msgid "<text>"

2849 msgstr "<text>"

2850

2841 -#: diff.c:5451

2851 +#: diff.c:5454

2852 msgid "generate diff using the \"anchored diff\" algorithm"

2853 msgstr "skapa diffar med algoritmen \"anchored diff\""

2854

2845 -#: diff.c:5453 diff.c:5462 diff.c:5465

2855 +#: diff.c:5456 diff.c:5465 diff.c:5468

2856 msgid "<mode>"

2857 msgstr "<läge>"

2858

2849 -#: diff.c:5454

2859 +#: diff.c:5457

2860 msgid "show word diff, using <mode> to delimit changed words"

2861 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

2862

2853 -#: diff.c:5456 diff.c:5459 diff.c:5504

2863 +#: diff.c:5459 diff.c:5462 diff.c:5507

2864 msgid "<regex>"

2865 msgstr "<reguttr>"

2866

2857 -#: diff.c:5457

2867 +#: diff.c:5460

2868 msgid "use <regex> to decide what a word is"

2869 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

2870

2861 -#: diff.c:5460

2871 +#: diff.c:5463

2872 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

2873 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

2874

2865 -#: diff.c:5463

2875 +#: diff.c:5466

2876 msgid "moved lines of code are colored differently"

2877 msgstr "flyttade kodrader färgas på annat sätt"

2878

2869 -#: diff.c:5466

2879 +#: diff.c:5469

2880 msgid "how white spaces are ignored in --color-moved"

2881 msgstr "hur blanktecken ignoreras i --color-moved"

2882

2873 -#: diff.c:5469

2883 +#: diff.c:5472

2884 msgid "Other diff options"

2885 msgstr "Andra diff-flaggor"

2886

2877 -#: diff.c:5471

2887 +#: diff.c:5474

2888 msgid "when run from subdir, exclude changes outside and show relative paths"

2889 msgstr ""

2890 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

2891 "sökvägar"

2892

2883 -#: diff.c:5475

2893 +#: diff.c:5478

2894 msgid "treat all files as text"

2895 msgstr "hantera alla filer som text"

2896

2887 -#: diff.c:5477

2897 +#: diff.c:5480

2898 msgid "swap two inputs, reverse the diff"

2899 msgstr "växla två indatafiler, vänd diffen"

2900

2891 -#: diff.c:5479

2901 +#: diff.c:5482

2902 msgid "exit with 1 if there were differences, 0 otherwise"

2903 msgstr "avsluta med 1 vid ändringar, annars 0"

2904

2895 -#: diff.c:5481

2905 +#: diff.c:5484

2906 msgid "disable all output of the program"

2907 msgstr "slå av alla utdata från programmet"

2908

2899 -#: diff.c:5483

2909 +#: diff.c:5486

2910 msgid "allow an external diff helper to be executed"

2911 msgstr "tillåt köra en extern diff-hjälpare"

2912

2903 -#: diff.c:5485

2913 +#: diff.c:5488

2914 msgid "run external text conversion filters when comparing binary files"

2915 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

2916

2907 -#: diff.c:5487

2917 +#: diff.c:5490

2918 msgid "<when>"

2919 msgstr "<när>"

2920

2911 -#: diff.c:5488

2921 +#: diff.c:5491

2922 msgid "ignore changes to submodules in the diff generation"

2923 msgstr "ignorera ändringar i undermoduler när diffen skapas"

2924

2915 -#: diff.c:5491

2925 +#: diff.c:5494

2926 msgid "<format>"

2927 msgstr "<format>"

2928

2919 -#: diff.c:5492

2929 +#: diff.c:5495

2930 msgid "specify how differences in submodules are shown"

2931 msgstr "ange hur ändringar i undermoduler visas"

2932

2923 -#: diff.c:5496

2933 +#: diff.c:5499

2934 msgid "hide 'git add -N' entries from the index"

2935 msgstr "dölj \"git add -N\"-poster från indexet"

2936

2927 -#: diff.c:5499

2937 +#: diff.c:5502

2938 msgid "treat 'git add -N' entries as real in the index"

2939 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

2940

2931 -#: diff.c:5501

2941 +#: diff.c:5504

2942 msgid "<string>"

2943 msgstr "<sträng>"

2944

2935 -#: diff.c:5502

2945 +#: diff.c:5505

2946 msgid ""

2947 "look for differences that change the number of occurrences of the specified "

2948 "string"

2949 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

2950

2941 -#: diff.c:5505

2951 +#: diff.c:5508

2952 msgid ""

2953 "look for differences that change the number of occurrences of the specified "

2954 "regex"

@@ -2946,94 +2956,94 @@ msgstr ""

2956 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

2957 "uttryck"

2958

2949 -#: diff.c:5508

2959 +#: diff.c:5511

2960 msgid "show all changes in the changeset with -S or -G"

2961 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

2962

2953 -#: diff.c:5511

2963 +#: diff.c:5514

2964 msgid "treat <string> in -S as extended POSIX regular expression"

2965 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

2966

2957 -#: diff.c:5514

2967 +#: diff.c:5517

2968 msgid "control the order in which files appear in the output"

2969 msgstr "styr ordningen i vilken filer visas i utdata"

2970

2961 -#: diff.c:5515

2971 +#: diff.c:5518

2972 msgid "<object-id>"

2973 msgstr "<objekt-id>"

2974

2965 -#: diff.c:5516

2975 +#: diff.c:5519

2976 msgid ""

2977 "look for differences that change the number of occurrences of the specified "

2978 "object"

2979 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

2980

2971 -#: diff.c:5518

2981 +#: diff.c:5521

2982 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

2983 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

2984

2975 -#: diff.c:5519

2985 +#: diff.c:5522

2986 msgid "select files by diff type"

2987 msgstr "välj filter efter diff-typ"

2988

2979 -#: diff.c:5521

2989 +#: diff.c:5524

2990 msgid "<file>"

2991 msgstr "<fil>"

2992

2983 -#: diff.c:5522

2993 +#: diff.c:5525

2994 msgid "Output to a specific file"

2995 msgstr "Skriv utdata till en specifik fil"

2996

2987 -#: diff.c:6177

2997 +#: diff.c:6180

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

2999 msgstr ""

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

3001

2992 -#: diff.c:6180

3002 +#: diff.c:6183

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

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

3005

2996 -#: diff.c:6183

3006 +#: diff.c:6186

3007 #, c-format

3008 msgid ""

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

3010 msgstr ""

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

3012

3003 -#: dir.c:537

3013 +#: dir.c:549

3014 #, c-format

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

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

3017

3008 -#: dir.c:926

3018 +#: dir.c:938

3019 #, c-format

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

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

3022

3013 -#: dir.c:1843

3023 +#: dir.c:1877

3024 #, c-format

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

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

3027

3018 -#: dir.c:2085

3028 +#: dir.c:2128

3029 msgid "failed to get kernel name and information"

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

3031

3022 -#: dir.c:2209

3032 +#: dir.c:2252

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

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

3035

3026 -#: dir.c:3013

3036 +#: dir.c:3056

3037 #, c-format

3038 msgid "index file corrupt in repo %s"

3039 msgstr "indexfilen trasig i arkivet %s"

3040

3031 -#: dir.c:3058 dir.c:3063

3041 +#: dir.c:3101 dir.c:3106

3042 #, c-format

3043 msgid "could not create directories for %s"

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

3045

3036 -#: dir.c:3092

3046 +#: dir.c:3135

3047 #, c-format

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

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

@@ -3052,12 +3062,12 @@ msgstr "Filtrerar innehåll"

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

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

3064

3055 -#: environment.c:150

3065 +#: environment.c:148

3066 #, c-format

3067 msgid "bad git namespace path \"%s\""

3068 msgstr "felaktig git-namnrymdssökväg \"%s\""

3069

3060 -#: environment.c:332

3070 +#: environment.c:330

3071 #, c-format

3072 msgid "could not set GIT_DIR to '%s'"

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

@@ -3067,158 +3077,154 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""

3077 msgid "too many args to run %s"

3078 msgstr "för många flaggor för att köra %s"

3079

3070 -#: fetch-object.c:17

3071 -msgid "Remote with no URL"

3072 -msgstr "Fjärr utan URL"

3073 -

3074 -#: fetch-pack.c:151

3080 +#: fetch-pack.c:150

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

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

3083

3078 -#: fetch-pack.c:154

3084 +#: fetch-pack.c:153

3085 msgid "git fetch-pack: expected a flush packet after shallow list"

3086 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

3087

3082 -#: fetch-pack.c:165

3088 +#: fetch-pack.c:164

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

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

3091

3086 -#: fetch-pack.c:185

3092 +#: fetch-pack.c:184

3093 #, c-format

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

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

3096

3091 -#: fetch-pack.c:196

3097 +#: fetch-pack.c:195

3098 msgid "unable to write to remote"

3099 msgstr "kunde inte skriva till fjärren"

3100

3095 -#: fetch-pack.c:258

3101 +#: fetch-pack.c:257

3102 msgid "--stateless-rpc requires multi_ack_detailed"

3103 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

3104

3099 -#: fetch-pack.c:360 fetch-pack.c:1284

3105 +#: fetch-pack.c:356 fetch-pack.c:1280

3106 #, c-format

3107 msgid "invalid shallow line: %s"

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

3109

3104 -#: fetch-pack.c:366 fetch-pack.c:1290

3110 +#: fetch-pack.c:362 fetch-pack.c:1286

3111 #, c-format

3112 msgid "invalid unshallow line: %s"

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

3114

3109 -#: fetch-pack.c:368 fetch-pack.c:1292

3115 +#: fetch-pack.c:364 fetch-pack.c:1288

3116 #, c-format

3117 msgid "object not found: %s"

3118 msgstr "objektet hittades inte: %s"

3119

3114 -#: fetch-pack.c:371 fetch-pack.c:1295

3120 +#: fetch-pack.c:367 fetch-pack.c:1291

3121 #, c-format

3122 msgid "error in object: %s"

3123 msgstr "fel i objekt: %s"

3124

3119 -#: fetch-pack.c:373 fetch-pack.c:1297

3125 +#: fetch-pack.c:369 fetch-pack.c:1293

3126 #, c-format

3127 msgid "no shallow found: %s"

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

3129

3124 -#: fetch-pack.c:376 fetch-pack.c:1301

3130 +#: fetch-pack.c:372 fetch-pack.c:1297

3131 #, c-format

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

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

3134

3129 -#: fetch-pack.c:417

3135 +#: fetch-pack.c:414

3136 #, c-format

3137 msgid "got %s %d %s"

3138 msgstr "fick %s %d %s"

3139

3134 -#: fetch-pack.c:434

3140 +#: fetch-pack.c:431

3141 #, c-format

3142 msgid "invalid commit %s"

3143 msgstr "ogiltig incheckning %s"

3144

3139 -#: fetch-pack.c:465

3145 +#: fetch-pack.c:462

3146 msgid "giving up"

3147 msgstr "ger upp"

3148

3143 -#: fetch-pack.c:477 progress.c:277

3149 +#: fetch-pack.c:475 progress.c:312

3150 msgid "done"

3151 msgstr "klart"

3152

3147 -#: fetch-pack.c:489

3153 +#: fetch-pack.c:487

3154 #, c-format

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

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

3157

3152 -#: fetch-pack.c:535

3158 +#: fetch-pack.c:533

3159 #, c-format

3160 msgid "Marking %s as complete"

3161 msgstr "Markerar %s som komplett"

3162

3157 -#: fetch-pack.c:744

3163 +#: fetch-pack.c:742

3164 #, c-format

3165 msgid "already have %s (%s)"

3166 msgstr "har redan %s (%s)"

3167

3162 -#: fetch-pack.c:783

3168 +#: fetch-pack.c:781

3169 msgid "fetch-pack: unable to fork off sideband demultiplexer"

3170 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

3171

3166 -#: fetch-pack.c:791

3172 +#: fetch-pack.c:789

3173 msgid "protocol error: bad pack header"

3174 msgstr "protokollfel: felaktigt packhuvud"

3175

3170 -#: fetch-pack.c:859

3176 +#: fetch-pack.c:857

3177 #, c-format

3178 msgid "fetch-pack: unable to fork off %s"

3179 msgstr "fetch-patch: kunde inte grena av %s"

3180

3175 -#: fetch-pack.c:875

3181 +#: fetch-pack.c:873

3182 #, c-format

3183 msgid "%s failed"

3184 msgstr "%s misslyckades"

3185

3180 -#: fetch-pack.c:877

3186 +#: fetch-pack.c:875

3187 msgid "error in sideband demultiplexer"

3188 msgstr "fel i sidbands-avmultiplexare"

3189

3184 -#: fetch-pack.c:908

3190 +#: fetch-pack.c:907

3191 #, c-format

3192 msgid "Server version is %.*s"

3193 msgstr "Serverversionen är %.*s"

3194

3189 -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928

3190 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944

3191 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960

3192 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982

3195 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927

3196 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943

3197 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959

3198 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981

3199 #, c-format

3200 msgid "Server supports %s"

3201 msgstr "Servern stöder %s"

3202

3197 -#: fetch-pack.c:915

3203 +#: fetch-pack.c:914

3204 msgid "Server does not support shallow clients"

3205 msgstr "Servern stöder inte klienter med grunda arkiv"

3206

3201 -#: fetch-pack.c:975

3207 +#: fetch-pack.c:974

3208 msgid "Server does not support --shallow-since"

3209 msgstr "Servern stöder inte --shallow-since"

3210

3205 -#: fetch-pack.c:980

3211 +#: fetch-pack.c:979

3212 msgid "Server does not support --shallow-exclude"

3213 msgstr "Servern stöder inte --shallow-exclude"

3214

3209 -#: fetch-pack.c:984

3215 +#: fetch-pack.c:983

3216 msgid "Server does not support --deepen"

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

3218

3213 -#: fetch-pack.c:1001

3219 +#: fetch-pack.c:1000

3220 msgid "no common commits"

3221 msgstr "inga gemensamma incheckningar"

3222

3217 -#: fetch-pack.c:1013 fetch-pack.c:1462

3223 +#: fetch-pack.c:1012 fetch-pack.c:1468

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

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

3226

3221 -#: fetch-pack.c:1151

3227 +#: fetch-pack.c:1150

3228 msgid "Server does not support shallow requests"

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

3230

@@ -3226,73 +3232,73 @@ msgstr "Servern stöder inte grunda förfrågningar"

3232 msgid "Server supports filter"

3233 msgstr "Servern stöder filter"

3234

3229 -#: fetch-pack.c:1184

3235 +#: fetch-pack.c:1180

3236 msgid "unable to write request to remote"

3237 msgstr "kunde inte skriva anrop till fjärren"

3238

3233 -#: fetch-pack.c:1202

3239 +#: fetch-pack.c:1198

3240 #, c-format

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

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

3243

3238 -#: fetch-pack.c:1208

3244 +#: fetch-pack.c:1204

3245 #, c-format

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

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

3248

3243 -#: fetch-pack.c:1247

3249 +#: fetch-pack.c:1243

3250 #, c-format

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

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

3253

3248 -#: fetch-pack.c:1252

3254 +#: fetch-pack.c:1248

3255 #, c-format

3256 msgid "error processing acks: %d"

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

3258

3253 -#: fetch-pack.c:1262

3259 +#: fetch-pack.c:1258

3260 msgid "expected packfile to be sent after 'ready'"

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

3262

3257 -#: fetch-pack.c:1264

3263 +#: fetch-pack.c:1260

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

3265 msgstr ""

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

3267

3262 -#: fetch-pack.c:1306

3268 +#: fetch-pack.c:1302

3269 #, c-format

3270 msgid "error processing shallow info: %d"

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

3272

3267 -#: fetch-pack.c:1353

3273 +#: fetch-pack.c:1349

3274 #, c-format

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

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

3277

3272 -#: fetch-pack.c:1358

3278 +#: fetch-pack.c:1354

3279 #, c-format

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

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

3282

3277 -#: fetch-pack.c:1363

3283 +#: fetch-pack.c:1359

3284 #, c-format

3285 msgid "error processing wanted refs: %d"

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

3287

3282 -#: fetch-pack.c:1689

3288 +#: fetch-pack.c:1693

3289 msgid "no matching remote head"

3290 msgstr "inget motsvarande fjärrhuvud"

3291

3286 -#: fetch-pack.c:1712 builtin/clone.c:686

3292 +#: fetch-pack.c:1716 builtin/clone.c:685

3293 msgid "remote did not send all necessary objects"

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

3295

3290 -#: fetch-pack.c:1739

3296 +#: fetch-pack.c:1743

3297 #, c-format

3298 msgid "no such remote ref %s"

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

3300

3295 -#: fetch-pack.c:1742

3301 +#: fetch-pack.c:1746

3302 #, c-format

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

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

@@ -3315,18 +3321,26 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

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

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

3323

3318 -#: grep.c:2117

3324 +#: grep.c:668

3325 +msgid ""

3326 +"given pattern contains NULL byte (via -f <file>). This is only supported "

3327 +"with -P under PCRE v2"

3328 +msgstr ""

3329 +"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"

3330 +"P under PCRE v2"

3331 +

3332 +#: grep.c:2124

3333 #, c-format

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

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

3336

3323 -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82

3337 +#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82

3338 #: builtin/rm.c:135

3339 #, c-format

3340 msgid "failed to stat '%s'"

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

3342

3329 -#: grep.c:2145

3343 +#: grep.c:2152

3344 #, c-format

3345 msgid "'%s': short read"

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

@@ -3469,12 +3483,12 @@ msgstr[1] ""

3483 msgid "git version [<options>]"

3484 msgstr "git version [<flaggor>]"

3485

3472 -#: help.c:782

3486 +#: help.c:783

3487 #, c-format

3488 msgid "%s: %s - %s"

3489 msgstr "%s: %s - %s"

3490

3477 -#: help.c:786

3491 +#: help.c:787

3492 msgid ""

3493 "\n"

3494 "Did you mean this?"

@@ -3547,41 +3561,56 @@ msgstr "namnet består enbart av ej tillåtna tecken: %s"

3561 msgid "invalid date format: %s"

3562 msgstr "felaktigt datumformat: %s"

3563

3550 -#: list-objects.c:129

3564 +#: list-objects.c:127

3565 #, c-format

3566 msgid "entry '%s' in tree %s has tree mode, but is not a tree"

3567 msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"

3568

3555 -#: list-objects.c:142

3569 +#: list-objects.c:140

3570 #, c-format

3571 msgid "entry '%s' in tree %s has blob mode, but is not a blob"

3572 msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"

3573

3560 -#: list-objects.c:378

3574 +#: list-objects.c:375

3575 #, c-format

3576 msgid "unable to load root tree for commit %s"

3577 msgstr "kunde inte läsa in rot-trädet för incheckningen %s"

3578

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

3566 -msgid "multiple filter-specs cannot be combined"

3567 -msgstr "flera filterspecifikationer kan inte kombineras"

3579 +#: list-objects-filter.c:492

3580 +#, c-format

3581 +msgid "unable to access sparse blob in '%s'"

3582 +msgstr "kunde inte nå gles blob på \"%s\""

3583 +

3584 +#: list-objects-filter.c:495

3585 +#, c-format

3586 +msgid "unable to parse sparse filter data in %s"

3587 +msgstr "kunde inte tolka gles filterdata i %s"

3588

3589 #: list-objects-filter-options.c:58

3590 msgid "expected 'tree:<depth>'"

3591 msgstr "förväntade \"tree:<djup>\""

3592

3573 -#: list-objects-filter-options.c:84

3593 +#: list-objects-filter-options.c:73

3594 msgid "sparse:path filters support has been dropped"

3595 msgstr "sparse:sökväg-filter stöds inte längre"

3596

3577 -#: list-objects-filter-options.c:94

3597 +#: list-objects-filter-options.c:86

3598 #, c-format

3599 msgid "invalid filter-spec '%s'"

3600 msgstr "felaktig filterspecifikation: \"%s\""

3601

3582 -#: list-objects-filter-options.c:158

3583 -msgid "cannot change partial clone promisor remote"

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

3602 +#: list-objects-filter-options.c:102

3603 +#, c-format

3604 +msgid "must escape char in sub-filter-spec: '%c'"

3605 +msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""

3606 +

3607 +#: list-objects-filter-options.c:144

3608 +msgid "expected something after combine:"

3609 +msgstr "förväntade någonting efter combine:"

3610 +

3611 +#: list-objects-filter-options.c:226

3612 +msgid "multiple filter-specs cannot be combined"

3613 +msgstr "flera filterspecifikationer kan inte kombineras"

3614

3615 #: lockfile.c:151

3616 #, c-format

@@ -3612,121 +3641,117 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

3641 msgid "failed to read the cache"

3642 msgstr "misslyckades läsa cachen"

3643

3615 -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919

3616 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786

3644 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908

3645 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785

3646 #: builtin/stash.c:264

3647 msgid "unable to write new index file"

3648 msgstr "kunde inte skriva ny indexfil"

3649

3621 -#: merge-recursive.c:322

3650 +#: merge-recursive.c:367

3651 msgid "(bad commit)\n"

3652 msgstr "(felaktig incheckning)\n"

3653

3625 -#: merge-recursive.c:345

3654 +#: merge-recursive.c:390

3655 #, c-format

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

3657 msgstr ""

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

3659

3631 -#: merge-recursive.c:354

3660 +#: merge-recursive.c:399

3661 #, c-format

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

3663 msgstr ""

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

3665 "sammanslagningen."

3666

3638 -#: merge-recursive.c:437

3639 -msgid "error building trees"

3640 -msgstr "fel vid byggande av träd"

3641 -

3642 -#: merge-recursive.c:863

3667 +#: merge-recursive.c:885

3668 #, c-format

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

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

3671

3647 -#: merge-recursive.c:874

3672 +#: merge-recursive.c:896

3673 #, c-format

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

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

3676

3652 -#: merge-recursive.c:888 merge-recursive.c:907

3677 +#: merge-recursive.c:910 merge-recursive.c:929

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

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

3680

3656 -#: merge-recursive.c:897

3681 +#: merge-recursive.c:919

3682 #, c-format

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

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

3685

3661 -#: merge-recursive.c:938 builtin/cat-file.c:40

3686 +#: merge-recursive.c:960 builtin/cat-file.c:41

3687 #, c-format

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

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

3690

3666 -#: merge-recursive.c:941

3691 +#: merge-recursive.c:965

3692 #, c-format

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

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

3695

3671 -#: merge-recursive.c:965

3696 +#: merge-recursive.c:990

3697 #, c-format

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

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

3700

3676 -#: merge-recursive.c:976

3701 +#: merge-recursive.c:1001

3702 #, c-format

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

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

3705

3681 -#: merge-recursive.c:981

3706 +#: merge-recursive.c:1006

3707 #, c-format

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

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

3710

3686 -#: merge-recursive.c:1177

3711 +#: merge-recursive.c:1199

3712 #, c-format

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

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

3715

3691 -#: merge-recursive.c:1184

3716 +#: merge-recursive.c:1206

3717 #, c-format

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

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

3720

3696 -#: merge-recursive.c:1191

3721 +#: merge-recursive.c:1213

3722 #, c-format

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

3724 msgstr ""

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

3726 "sammanslagningsbasen)"

3727

3703 -#: merge-recursive.c:1199 merge-recursive.c:1211

3728 +#: merge-recursive.c:1221 merge-recursive.c:1233

3729 #, c-format

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

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

3732

3708 -#: merge-recursive.c:1202 merge-recursive.c:1214

3733 +#: merge-recursive.c:1224 merge-recursive.c:1236

3734 #, c-format

3735 msgid "Fast-forwarding submodule %s"

3736 msgstr "Snabbspolar undermodulen %s"

3737

3713 -#: merge-recursive.c:1237

3738 +#: merge-recursive.c:1259

3739 #, c-format

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

3741 msgstr ""

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

3743 "hittades inte)"

3744

3720 -#: merge-recursive.c:1241

3745 +#: merge-recursive.c:1263

3746 #, c-format

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

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

3749

3725 -#: merge-recursive.c:1242

3750 +#: merge-recursive.c:1264

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

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

3753

3729 -#: merge-recursive.c:1245

3754 +#: merge-recursive.c:1267

3755 #, c-format

3756 msgid ""

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

@@ -3743,32 +3768,32 @@ msgstr ""

3768 "\n"

3769 "vilket godtar lösningen.\n"

3770

3746 -#: merge-recursive.c:1254

3771 +#: merge-recursive.c:1276

3772 #, c-format

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

3774 msgstr ""

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

3776

3752 -#: merge-recursive.c:1327

3777 +#: merge-recursive.c:1349

3778 msgid "Failed to execute internal merge"

3779 msgstr "Misslyckades exekvera intern sammanslagning"

3780

3756 -#: merge-recursive.c:1332

3781 +#: merge-recursive.c:1354

3782 #, c-format

3783 msgid "Unable to add %s to database"

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

3785

3761 -#: merge-recursive.c:1364

3786 +#: merge-recursive.c:1386

3787 #, c-format

3788 msgid "Auto-merging %s"

3789 msgstr "Slår ihop %s automatiskt"

3790

3766 -#: merge-recursive.c:1387

3791 +#: merge-recursive.c:1410

3792 #, c-format

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

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

3795

3771 -#: merge-recursive.c:1459

3796 +#: merge-recursive.c:1482

3797 #, c-format

3798 msgid ""

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

@@ -3777,7 +3802,7 @@ msgstr ""

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

3803 "i trädet."

3804

3780 -#: merge-recursive.c:1464

3805 +#: merge-recursive.c:1487

3806 #, c-format

3807 msgid ""

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

@@ -3786,7 +3811,7 @@ msgstr ""

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

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

3813

3789 -#: merge-recursive.c:1471

3814 +#: merge-recursive.c:1494

3815 #, c-format

3816 msgid ""

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

@@ -3795,7 +3820,7 @@ msgstr ""

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

3821 "i trädet vid %s."

3822

3798 -#: merge-recursive.c:1476

3823 +#: merge-recursive.c:1499

3824 #, c-format

3825 msgid ""

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

@@ -3804,40 +3829,40 @@ msgstr ""

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

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

3831

3807 -#: merge-recursive.c:1511

3832 +#: merge-recursive.c:1534

3833 msgid "rename"

3834 msgstr "namnbyte"

3835

3811 -#: merge-recursive.c:1511

3836 +#: merge-recursive.c:1534

3837 msgid "renamed"

3838 msgstr "namnbytt"

3839

3815 -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094

3840 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117

3841 #, c-format

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

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

3844

3820 -#: merge-recursive.c:1601

3845 +#: merge-recursive.c:1624

3846 #, c-format

3847 msgid "Refusing to lose untracked file at %s, even though it's in the way."

3848 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

3849

3825 -#: merge-recursive.c:1659

3850 +#: merge-recursive.c:1682

3851 #, c-format

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

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

3854

3830 -#: merge-recursive.c:1690

3855 +#: merge-recursive.c:1713

3856 #, c-format

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

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

3859

3835 -#: merge-recursive.c:1695

3860 +#: merge-recursive.c:1718

3861 #, c-format

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

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

3864

3840 -#: merge-recursive.c:1714

3865 +#: merge-recursive.c:1737

3866 #, c-format

3867 msgid ""

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

@@ -3846,17 +3871,17 @@ msgstr ""

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

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

3873

3849 -#: merge-recursive.c:1719

3874 +#: merge-recursive.c:1742

3875 msgid " (left unresolved)"

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

3877

3853 -#: merge-recursive.c:1828

3878 +#: merge-recursive.c:1851

3879 #, c-format

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

3881 msgstr ""

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

3883

3859 -#: merge-recursive.c:2035

3884 +#: merge-recursive.c:2056

3885 #, c-format

3886 msgid ""

3887 "CONFLICT (directory rename split): Unclear where to place %s because "

@@ -3867,7 +3892,7 @@ msgstr ""

3892 "katalogen %s bytte namn till flera andra kataloger, utan att någon "

3893 "destination fick en majoritet av filerna."

3894

3870 -#: merge-recursive.c:2067

3895 +#: merge-recursive.c:2088

3896 #, c-format

3897 msgid ""

3898 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

@@ -3876,7 +3901,7 @@ msgstr ""

3901 "KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

3902 "implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

3903

3879 -#: merge-recursive.c:2077

3904 +#: merge-recursive.c:2098

3905 #, c-format

3906 msgid ""

3907 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

@@ -3885,7 +3910,7 @@ msgstr ""

3910 "KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

3911 "%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

3912

3888 -#: merge-recursive.c:2169

3913 +#: merge-recursive.c:2190

3914 #, c-format

3915 msgid ""

3916 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

@@ -3894,7 +3919,7 @@ msgstr ""

3919 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

3920 "%s->%s i %s"

3921

3897 -#: merge-recursive.c:2413

3922 +#: merge-recursive.c:2435

3923 #, c-format

3924 msgid ""

3925 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

@@ -3903,52 +3928,52 @@ msgstr ""

3928 "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

3929 "bytt namn."

3930

3906 -#: merge-recursive.c:2938

3931 +#: merge-recursive.c:2961

3932 #, c-format

3933 msgid "cannot read object %s"

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

3935

3911 -#: merge-recursive.c:2941

3936 +#: merge-recursive.c:2964

3937 #, c-format

3938 msgid "object %s is not a blob"

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

3940

3916 -#: merge-recursive.c:3005

3941 +#: merge-recursive.c:3028

3942 msgid "modify"

3943 msgstr "ändra"

3944

3920 -#: merge-recursive.c:3005

3945 +#: merge-recursive.c:3028

3946 msgid "modified"

3947 msgstr "ändrad"

3948

3924 -#: merge-recursive.c:3017

3949 +#: merge-recursive.c:3040

3950 msgid "content"

3951 msgstr "innehåll"

3952

3928 -#: merge-recursive.c:3021

3953 +#: merge-recursive.c:3044

3954 msgid "add/add"

3955 msgstr "tillägg/tillägg"

3956

3932 -#: merge-recursive.c:3044

3957 +#: merge-recursive.c:3067

3958 #, c-format

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

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

3961

3937 -#: merge-recursive.c:3066 git-submodule.sh:937

3962 +#: merge-recursive.c:3089 git-submodule.sh:937

3963 msgid "submodule"

3964 msgstr "undermodul"

3965

3941 -#: merge-recursive.c:3067

3966 +#: merge-recursive.c:3090

3967 #, c-format

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

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

3970

3946 -#: merge-recursive.c:3097

3971 +#: merge-recursive.c:3120

3972 #, c-format

3973 msgid "Adding as %s instead"

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

3975

3951 -#: merge-recursive.c:3179

3976 +#: merge-recursive.c:3203

3977 #, c-format

3978 msgid ""

3979 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -3957,7 +3982,7 @@ msgstr ""

3982 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

3983 "flyttar den till %s."

3984

3960 -#: merge-recursive.c:3182

3985 +#: merge-recursive.c:3206

3986 #, c-format

3987 msgid ""

3988 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -3966,7 +3991,7 @@ msgstr ""

3991 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

3992 "%s, föreslår att den bör flyttas till%s."

3993

3969 -#: merge-recursive.c:3186

3994 +#: merge-recursive.c:3210

3995 #, c-format

3996 msgid ""

3997 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -3975,7 +4000,7 @@ msgstr ""

4000 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

4001 "namn i %s; flyttar den till %s."

4002

3978 -#: merge-recursive.c:3189

4003 +#: merge-recursive.c:3213

4004 #, c-format

4005 msgid ""

4006 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -3984,227 +4009,227 @@ msgstr ""

4009 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

4010 "bytte namn i %s; flyttar den till %s."

4011

3987 -#: merge-recursive.c:3303

4012 +#: merge-recursive.c:3327

4013 #, c-format

4014 msgid "Removing %s"

4015 msgstr "Tar bort %s"

4016

3992 -#: merge-recursive.c:3326

4017 +#: merge-recursive.c:3350

4018 msgid "file/directory"

4019 msgstr "fil/katalog"

4020

3996 -#: merge-recursive.c:3331

4021 +#: merge-recursive.c:3355

4022 msgid "directory/file"

4023 msgstr "katalog/fil"

4024

4000 -#: merge-recursive.c:3338

4025 +#: merge-recursive.c:3362

4026 #, c-format

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

4028 msgstr ""

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

4030

4006 -#: merge-recursive.c:3347

4031 +#: merge-recursive.c:3371

4032 #, c-format

4033 msgid "Adding %s"

4034 msgstr "Lägger till %s"

4035

4011 -#: merge-recursive.c:3356

4036 +#: merge-recursive.c:3380

4037 #, c-format

4038 msgid "CONFLICT (add/add): Merge conflict in %s"

4039 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

4040

4016 -#: merge-recursive.c:3394

4017 -#, c-format

4018 -msgid ""

4019 -"Your local changes to the following files would be overwritten by merge:\n"

4020 -" %s"

4021 -msgstr ""

4022 -"Dina lokala ändringar av följande filer skulle skrivas över av "

4023 -"sammanslagning:\n"

4024 -" %s"

4025 -

4026 -#: merge-recursive.c:3405

4041 +#: merge-recursive.c:3424

4042 msgid "Already up to date!"

4043 msgstr "Redan à jour!"

4044

4030 -#: merge-recursive.c:3414

4045 +#: merge-recursive.c:3433

4046 #, c-format

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

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

4049

4035 -#: merge-recursive.c:3513

4050 +#: merge-recursive.c:3537

4051 msgid "Merging:"

4052 msgstr "Slår ihop:"

4053

4039 -#: merge-recursive.c:3526

4054 +#: merge-recursive.c:3550

4055 #, c-format

4056 msgid "found %u common ancestor:"

4057 msgid_plural "found %u common ancestors:"

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

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

4060

4046 -#: merge-recursive.c:3565

4061 +#: merge-recursive.c:3600

4062 msgid "merge returned no commit"

4063 msgstr "sammanslagningen returnerade ingen incheckning"

4064

4050 -#: merge-recursive.c:3631

4065 +#: merge-recursive.c:3659

4066 +#, c-format

4067 +msgid ""

4068 +"Your local changes to the following files would be overwritten by merge:\n"

4069 +" %s"

4070 +msgstr ""

4071 +"Dina lokala ändringar av följande filer skulle skrivas över av "

4072 +"sammanslagning:\n"

4073 +" %s"

4074 +

4075 +#: merge-recursive.c:3756

4076 #, c-format

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

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

4079

4055 -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869

4080 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874

4081 msgid "Unable to write index."

4082 msgstr "Kunde inte skriva indexet."

4083

4059 -#: midx.c:69

4084 +#: midx.c:68

4085 #, c-format

4086 msgid "multi-pack-index file %s is too small"

4087 msgstr "multi-pack-indexfilen %s är för liten"

4088

4064 -#: midx.c:85

4089 +#: midx.c:84

4090 #, c-format

4091 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

4092 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

4093

4069 -#: midx.c:90

4094 +#: midx.c:89

4095 #, c-format

4096 msgid "multi-pack-index version %d not recognized"

4097 msgstr "multi-pack-indexversionen %d stöds inte"

4098

4074 -#: midx.c:95

4099 +#: midx.c:94

4100 #, c-format

4101 msgid "hash version %u does not match"

4102 msgstr "hash-versionen %u stämmer inte"

4103

4079 -#: midx.c:109

4104 +#: midx.c:108

4105 msgid "invalid chunk offset (too large)"

4106 msgstr "felaktigt offset för stycke (för stort)"

4107

4083 -#: midx.c:133

4108 +#: midx.c:132

4109 msgid "terminating multi-pack-index chunk id appears earlier than expected"

4085 -msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat"

4110 +msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat"

4111

4087 -#: midx.c:146

4112 +#: midx.c:145

4113 msgid "multi-pack-index missing required pack-name chunk"

4114 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

4115

4091 -#: midx.c:148

4116 +#: midx.c:147

4117 msgid "multi-pack-index missing required OID fanout chunk"

4118 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

4119

4095 -#: midx.c:150

4120 +#: midx.c:149

4121 msgid "multi-pack-index missing required OID lookup chunk"

4122 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

4123

4099 -#: midx.c:152

4124 +#: midx.c:151

4125 msgid "multi-pack-index missing required object offsets chunk"

4126 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

4127

4103 -#: midx.c:166

4128 +#: midx.c:165

4129 #, c-format

4130 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

4131 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

4132

4108 -#: midx.c:211

4133 +#: midx.c:210

4134 #, c-format

4135 msgid "bad pack-int-id: %u (%u total packs)"

4136 msgstr "bad pack-int-id: %u (%u paket totalt)"

4137

4113 -#: midx.c:261

4138 +#: midx.c:260

4139 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

4140 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

4141

4117 -#: midx.c:289

4142 +#: midx.c:288

4143 msgid "error preparing packfile from multi-pack-index"

4144 msgstr "fel när paketfiler från multi-pack-index skulle förberedas"

4145

4121 -#: midx.c:470

4146 +#: midx.c:469

4147 #, c-format

4148 msgid "failed to add packfile '%s'"

4149 msgstr "misslyckades läsa paketfilen \"%s\""

4150

4126 -#: midx.c:476

4151 +#: midx.c:475

4152 #, c-format

4153 msgid "failed to open pack-index '%s'"

4154 msgstr "misslyckades öppna paketindexet \"%s\""

4155

4131 -#: midx.c:536

4156 +#: midx.c:535

4157 #, c-format

4158 msgid "failed to locate object %d in packfile"

4159 msgstr "misslyckades hitta objekt %d i paketfilen"

4160

4136 -#: midx.c:865

4161 +#: midx.c:864

4162 #, c-format

4163 msgid "did not see pack-file %s to drop"

4164 msgstr "såg inte paketfilen %s som skulle kastas"

4165

4141 -#: midx.c:1036

4166 +#: midx.c:1035

4167 #, c-format

4168 msgid "failed to clear multi-pack-index at %s"

4169 msgstr "misslyckades städa multi-pack-index på %s"

4170

4146 -#: midx.c:1091

4171 +#: midx.c:1090

4172 msgid "Looking for referenced packfiles"

4173 msgstr "Ser efter refererade packfiler"

4174

4150 -#: midx.c:1106

4175 +#: midx.c:1105

4176 #, c-format

4177 msgid ""

4178 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4179 msgstr ""

4180 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

4181

4157 -#: midx.c:1110

4182 +#: midx.c:1109

4183 msgid "Verifying OID order in MIDX"

4184 msgstr "Bekräftar OID-ordning i MIDX"

4185

4161 -#: midx.c:1119

4186 +#: midx.c:1118

4187 #, c-format

4188 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

4189 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

4190

4166 -#: midx.c:1138

4191 +#: midx.c:1137

4192 msgid "Sorting objects by packfile"

4193 msgstr "Sorterar objekt efter packfil"

4194

4170 -#: midx.c:1144

4195 +#: midx.c:1143

4196 msgid "Verifying object offsets"

4197 msgstr "Bekräftar offset för objekt"

4198

4174 -#: midx.c:1160

4199 +#: midx.c:1159

4200 #, c-format

4201 msgid "failed to load pack entry for oid[%d] = %s"

4202 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

4203

4179 -#: midx.c:1166

4204 +#: midx.c:1165

4205 #, c-format

4206 msgid "failed to load pack-index for packfile %s"

4207 msgstr "misslyckades läsa paketindex för paketfil %s"

4208

4184 -#: midx.c:1175

4209 +#: midx.c:1174

4210 #, c-format

4211 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4212 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

4213

4189 -#: midx.c:1350

4214 +#: midx.c:1349

4215 msgid "could not start pack-objects"

4216 msgstr "kunde inte starta pack-objects"

4217

4193 -#: midx.c:1369

4218 +#: midx.c:1368

4219 msgid "could not finish pack-objects"

4220 msgstr "kunde inte avsluta pack-objects"

4221

4197 -#: name-hash.c:532

4222 +#: name-hash.c:537

4223 #, c-format

4224 msgid "unable to create lazy_dir thread: %s"

4225 msgstr "misslyckades skapa lazy_dir-tråd: %s"

4226

4202 -#: name-hash.c:554

4227 +#: name-hash.c:559

4228 #, c-format

4229 msgid "unable to create lazy_name thread: %s"

4230 msgstr "misslyckades skapa lazy_name-tråd: %s"

4231

4207 -#: name-hash.c:560

4232 +#: name-hash.c:565

4233 #, c-format

4234 msgid "unable to join lazy_name thread: %s"

4235 msgstr "misslyckades utföra join på lazy_name-tråd: %s"

@@ -4249,41 +4274,41 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

4276

4252 -#: object.c:54

4277 +#: object.c:53

4278 #, c-format

4279 msgid "invalid object type \"%s\""

4280 msgstr "ogiltig objekttyp \"%s\""

4281

4257 -#: object.c:174

4282 +#: object.c:173

4283 #, c-format

4284 msgid "object %s is a %s, not a %s"

4285 msgstr "objektet %s är en %s, inte en %s"

4286

4262 -#: object.c:234

4287 +#: object.c:233

4288 #, c-format

4289 msgid "object %s has unknown type id %d"

4290 msgstr "objektet %s har okänd typ-id %d"

4291

4267 -#: object.c:247

4292 +#: object.c:246

4293 #, c-format

4294 msgid "unable to parse object: %s"

4295 msgstr "kunde inte tolka objektet: %s"

4296

4272 -#: object.c:267 object.c:278

4297 +#: object.c:266 object.c:277

4298 #, c-format

4299 msgid "hash mismatch %s"

4300 msgstr "hashvärde stämmer inte överens %s"

4301

4277 -#: packfile.c:648

4302 +#: packfile.c:641

4303 msgid "offset before end of packfile (broken .idx?)"

4304 msgstr "offset före slutet av packfilen (trasig .idx?)"

4305

4281 -#: packfile.c:1899

4306 +#: packfile.c:1887

4307 #, c-format

4308 msgid "offset before start of pack index for %s (corrupt index?)"

4309 msgstr "offset före slutet av packindex för %s (trasigt index?)"

4310

4286 -#: packfile.c:1903

4311 +#: packfile.c:1891

4312 #, c-format

4313 msgid "offset beyond end of pack index for %s (truncated index?)"

4314 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -4328,26 +4353,26 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"

4353 msgid "did you mean `--%s` (with two dashes ?)"

4354 msgstr "menade du \"--%s\" (med två bindestreck?)"

4355

4331 -#: parse-options.c:859

4356 +#: parse-options.c:860

4357 #, c-format

4358 msgid "unknown option `%s'"

4359 msgstr "okänd flagga \"%s\""

4360

4336 -#: parse-options.c:861

4361 +#: parse-options.c:862

4362 #, c-format

4363 msgid "unknown switch `%c'"

4364 msgstr "okänd flagga \"%c\""

4365

4341 -#: parse-options.c:863

4366 +#: parse-options.c:864

4367 #, c-format

4368 msgid "unknown non-ascii option in string: `%s'"

4369 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""

4370

4346 -#: parse-options.c:887

4371 +#: parse-options.c:888

4372 msgid "..."

4373 msgstr "..."

4374

4350 -#: parse-options.c:906

4375 +#: parse-options.c:907

4376 #, c-format

4377 msgid "usage: %s"

4378 msgstr "användning: %s"

@@ -4355,21 +4380,21 @@ msgstr "användning: %s"

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

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

4382 #.

4358 -#: parse-options.c:912

4383 +#: parse-options.c:913

4384 #, c-format

4385 msgid " or: %s"

4386 msgstr " eller: %s"

4387

4363 -#: parse-options.c:915

4388 +#: parse-options.c:916

4389 #, c-format

4390 msgid " %s"

4391 msgstr " %s"

4392

4368 -#: parse-options.c:954

4393 +#: parse-options.c:955

4394 msgid "-NUM"

4395 msgstr "-TAL"

4396

4372 -#: parse-options.c:968

4397 +#: parse-options.c:969

4398 #, c-format

4399 msgid "alias of --%s"

4400 msgstr "alias för --%s"

@@ -4538,29 +4563,38 @@ msgstr "kunde inte skapa trådad lstat: %s"

4563 msgid "unable to parse --pretty format"

4564 msgstr "kunde inte tolka format för --pretty"

4565

4541 -#: range-diff.c:70

4566 +#: promisor-remote.c:25

4567 +msgid "Remote with no URL"

4568 +msgstr "Fjärr utan URL"

4569 +

4570 +#: promisor-remote.c:61

4571 +#, c-format

4572 +msgid "promisor remote name cannot begin with '/': %s"

4573 +msgstr "kontraktsfjärr kan inte börja med \"/\": %s"

4574 +

4575 +#: range-diff.c:71

4576 msgid "could not start `log`"

4577 msgstr "kunde inte starta \"log\""

4578

4545 -#: range-diff.c:72

4579 +#: range-diff.c:73

4580 msgid "could not read `log` output"

4581 msgstr "kunde inte läsa utdata från \"log\""

4582

4549 -#: range-diff.c:91 sequencer.c:5021

4583 +#: range-diff.c:92 sequencer.c:4985

4584 #, c-format

4585 msgid "could not parse commit '%s'"

4586 msgstr "kunde inte tolka incheckningen \"%s\""

4587

4554 -#: range-diff.c:117

4588 +#: range-diff.c:118

4589 #, c-format

4590 msgid "could not parse git header '%.*s'"

4591 msgstr "kunde inte tolka git-huvudet \"%.*s\""

4592

4559 -#: range-diff.c:274

4593 +#: range-diff.c:275

4594 msgid "failed to generate diff"

4595 msgstr "misslyckades skapa diff"

4596

4563 -#: range-diff.c:506 range-diff.c:508

4597 +#: range-diff.c:507 range-diff.c:509

4598 #, c-format

4599 msgid "could not parse log for '%s'"

4600 msgstr "kunde inte tolka loggen för \"%s\""

@@ -4605,11 +4639,11 @@ msgstr "kan inte ta status på \"%s\""

4639 msgid "'%s' appears as both a file and as a directory"

4640 msgstr "\"%s\" finns både som en fil och en katalog"

4641

4608 -#: read-cache.c:1499

4642 +#: read-cache.c:1520

4643 msgid "Refresh index"

4644 msgstr "Uppdatera indexet"

4645

4612 -#: read-cache.c:1613

4646 +#: read-cache.c:1635

4647 #, c-format

4648 msgid ""

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

@@ -4618,7 +4652,7 @@ msgstr ""

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

4653 "Använder version %i"

4654

4621 -#: read-cache.c:1623

4655 +#: read-cache.c:1645

4656 #, c-format

4657 msgid ""

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

@@ -4627,138 +4661,138 @@ msgstr ""

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

4662 "Använder version %i"

4663

4630 -#: read-cache.c:1679

4664 +#: read-cache.c:1701

4665 #, c-format

4666 msgid "bad signature 0x%08x"

4667 msgstr "felaktig signatur 0x%08x"

4668

4635 -#: read-cache.c:1682

4669 +#: read-cache.c:1704

4670 #, c-format

4671 msgid "bad index version %d"

4672 msgstr "felaktig indexversion %d"

4673

4640 -#: read-cache.c:1691

4674 +#: read-cache.c:1713

4675 msgid "bad index file sha1 signature"

4676 msgstr "felaktig sha1-signatur för indexfil"

4677

4644 -#: read-cache.c:1721

4678 +#: read-cache.c:1743

4679 #, c-format

4680 msgid "index uses %.4s extension, which we do not understand"

4681 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"

4682

4649 -#: read-cache.c:1723

4683 +#: read-cache.c:1745

4684 #, c-format

4685 msgid "ignoring %.4s extension"

4686 msgstr "ignorerar filtillägget %.4s"

4687

4654 -#: read-cache.c:1760

4688 +#: read-cache.c:1782

4689 #, c-format

4690 msgid "unknown index entry format 0x%08x"

4691 msgstr "okänt format 0x%08x på indexpost"

4692

4659 -#: read-cache.c:1776

4693 +#: read-cache.c:1798

4694 #, c-format

4695 msgid "malformed name field in the index, near path '%s'"

4696 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""

4697

4664 -#: read-cache.c:1833

4698 +#: read-cache.c:1855

4699 msgid "unordered stage entries in index"

4700 msgstr "osorterade köposter i index"

4701

4668 -#: read-cache.c:1836

4702 +#: read-cache.c:1858

4703 #, c-format

4704 msgid "multiple stage entries for merged file '%s'"

4705 msgstr "flera köposter för den sammanslagna filen \"%s\""

4706

4673 -#: read-cache.c:1839

4707 +#: read-cache.c:1861

4708 #, c-format

4709 msgid "unordered stage entries for '%s'"

4710 msgstr "osorterade köposter för \"%s\""

4711

4678 -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111

4679 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467

4680 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347

4712 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111

4713 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468

4714 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347

4715 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145

4716 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330

4717 msgid "index file corrupt"

4718 msgstr "indexfilen trasig"

4719

4686 -#: read-cache.c:2087

4720 +#: read-cache.c:2108

4721 #, c-format

4722 msgid "unable to create load_cache_entries thread: %s"

4723 msgstr "kunde inte läsa in cache_entries-tråden: %s"

4724

4691 -#: read-cache.c:2100

4725 +#: read-cache.c:2121

4726 #, c-format

4727 msgid "unable to join load_cache_entries thread: %s"

4728 msgstr "kunde inte utföra join på cache_entries-tråden: %s"

4729

4696 -#: read-cache.c:2133

4730 +#: read-cache.c:2154

4731 #, c-format

4732 msgid "%s: index file open failed"

4733 msgstr "%s: öppning av indexfilen misslyckades"

4734

4701 -#: read-cache.c:2137

4735 +#: read-cache.c:2158

4736 #, c-format

4737 msgid "%s: cannot stat the open index"

4738 msgstr "%s: kan inte ta startus på det öppna indexet"

4739

4706 -#: read-cache.c:2141

4740 +#: read-cache.c:2162

4741 #, c-format

4742 msgid "%s: index file smaller than expected"

4743 msgstr "%s: indexfilen mindre än förväntat"

4744

4711 -#: read-cache.c:2145

4745 +#: read-cache.c:2166

4746 #, c-format

4747 msgid "%s: unable to map index file"

4748 msgstr "%s: kan inte koppla indexfilen"

4749

4716 -#: read-cache.c:2187

4750 +#: read-cache.c:2208

4751 #, c-format

4752 msgid "unable to create load_index_extensions thread: %s"

4753 msgstr "kunde inte skapa load_index_extensions-tråden: %s"

4754

4721 -#: read-cache.c:2214

4755 +#: read-cache.c:2235

4756 #, c-format

4757 msgid "unable to join load_index_extensions thread: %s"

4758 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"

4759

4726 -#: read-cache.c:2246

4760 +#: read-cache.c:2267

4761 #, c-format

4762 msgid "could not freshen shared index '%s'"

4763 msgstr "kunde inte uppdatera delat index \"%s\""

4764

4731 -#: read-cache.c:2293

4765 +#: read-cache.c:2314

4766 #, c-format

4767 msgid "broken index, expect %s in %s, got %s"

4768 msgstr "trasigt index, förväntade %s i %s, fick %s"

4769

4736 -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114

4770 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119

4771 #, c-format

4772 msgid "could not close '%s'"

4773 msgstr "kunde inte stänga \"%s\""

4774

4741 -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928

4775 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917

4776 #, c-format

4777 msgid "could not stat '%s'"

4778 msgstr "kunde inte ta status på \"%s\""

4779

4746 -#: read-cache.c:3105

4780 +#: read-cache.c:3126

4781 #, c-format

4782 msgid "unable to open git dir: %s"

4783 msgstr "kunde inte öppna git-katalog: %s"

4784

4751 -#: read-cache.c:3117

4785 +#: read-cache.c:3138

4786 #, c-format

4787 msgid "unable to unlink: %s"

4788 msgstr "misslyckades ta bort länken: %s"

4789

4756 -#: read-cache.c:3142

4790 +#: read-cache.c:3163

4791 #, c-format

4792 msgid "cannot fix permission bits on '%s'"

4793 msgstr "kan inte rätta behörighetsbitar på \"%s\""

4794

4761 -#: read-cache.c:3291

4795 +#: read-cache.c:3312

4796 #, c-format

4797 msgid "%s: cannot drop to stage #0"

4798 msgstr "%s: kan inte återgå till kö 0"

@@ -4866,8 +4900,8 @@ msgstr ""

4900 msgid "Note that empty commits are commented out"

4901 msgstr "Observera att tomma incheckningar är utkommenterade"

4902

4869 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447

4870 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235

4903 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388

4904 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235

4905 #, c-format

4906 msgid "could not write '%s'"

4907 msgstr "kunde inte skriva \"%s\""

@@ -4916,7 +4950,7 @@ msgstr "\"%s\" pekar inte på ett giltigt objekt!"

4950 msgid "ignoring dangling symref %s"

4951 msgstr "ignorerar dinglande symbolisk referens %s"

4952

4919 -#: refs.c:669 ref-filter.c:2092

4953 +#: refs.c:669 ref-filter.c:2098

4954 #, c-format

4955 msgid "ignoring broken ref %s"

4956 msgstr "ignorerar trasig referens %s"

@@ -4941,14 +4975,14 @@ msgstr "referensen \"%s\" finns redan"

4975 msgid "unexpected object ID when writing '%s'"

4976 msgstr "oväntat objekt-id vid skrivning \"%s\""

4977

4944 -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913

4945 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656

4978 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851

4979 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620

4980 #, c-format

4981 msgid "could not write to '%s'"

4982 msgstr "kunde inte skriva till \"%s\""

4983

4950 -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715

4951 -#: builtin/rebase.c:1003

4984 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714

4985 +#: builtin/rebase.c:1004

4986 #, c-format

4987 msgid "could not open '%s' for writing"

4988 msgstr "kunde inte öppna \"%s\" för skrivning"

@@ -4983,21 +5017,21 @@ msgstr "vägrar uppdatera referens med trasigt namn \"%s\""

5017 msgid "update_ref failed for ref '%s': %s"

5018 msgstr "update_ref misslyckades för referensen \"%s\": %s"

5019

4986 -#: refs.c:2012

5020 +#: refs.c:2023

5021 #, c-format

5022 msgid "multiple updates for ref '%s' not allowed"

5023 msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"

5024

4991 -#: refs.c:2044

5025 +#: refs.c:2055

5026 msgid "ref updates forbidden inside quarantine environment"

5027 msgstr "referensuppdateringar förbjudna i karantänmiljö"

5028

4995 -#: refs.c:2140 refs.c:2170

5029 +#: refs.c:2151 refs.c:2181

5030 #, c-format

5031 msgid "'%s' exists; cannot create '%s'"

5032 msgstr "\"%s\" finns; kan inte skapa \"%s\""

5033

5000 -#: refs.c:2146 refs.c:2181

5034 +#: refs.c:2157 refs.c:2192

5035 #, c-format

5036 msgid "cannot process '%s' and '%s' at the same time"

5037 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

@@ -5007,13 +5041,13 @@ msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"

5041 msgid "could not remove reference %s"

5042 msgstr "kunde inte ta bort referensen %s"

5043

5010 -#: refs/files-backend.c:1248 refs/packed-backend.c:1532

5011 -#: refs/packed-backend.c:1542

5044 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541

5045 +#: refs/packed-backend.c:1551

5046 #, c-format

5047 msgid "could not delete reference %s: %s"

5048 msgstr "kunde inte ta bort referensen %s: %s"

5049

5016 -#: refs/files-backend.c:1251 refs/packed-backend.c:1545

5050 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554

5051 #, c-format

5052 msgid "could not delete references: %s"

5053 msgstr "kunde inte ta bort referenser: %s"

@@ -5023,7 +5057,7 @@ msgstr "kunde inte ta bort referenser: %s"

5057 msgid "invalid refspec '%s'"

5058 msgstr "felaktig referensspecifikation: \"%s\""

5059

5026 -#: ref-filter.c:42 wt-status.c:1934

5060 +#: ref-filter.c:42 wt-status.c:1938

5061 msgid "gone"

5062 msgstr "försvunnen"

5063

@@ -5042,281 +5076,281 @@ msgstr "bakom %d"

5076 msgid "ahead %d, behind %d"

5077 msgstr "före %d, bakom %d"

5078

5045 -#: ref-filter.c:162

5079 +#: ref-filter.c:165

5080 #, c-format

5081 msgid "expected format: %%(color:<color>)"

5082 msgstr "förväntat format: %%(color:<color>)"

5083

5050 -#: ref-filter.c:164

5084 +#: ref-filter.c:167

5085 #, c-format

5086 msgid "unrecognized color: %%(color:%s)"

5087 msgstr "okänd färg: %%(color:%s)"

5088

5055 -#: ref-filter.c:186

5089 +#: ref-filter.c:189

5090 #, c-format

5091 msgid "Integer value expected refname:lstrip=%s"

5092 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

5093

5060 -#: ref-filter.c:190

5094 +#: ref-filter.c:193

5095 #, c-format

5096 msgid "Integer value expected refname:rstrip=%s"

5097 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

5098

5065 -#: ref-filter.c:192

5099 +#: ref-filter.c:195

5100 #, c-format

5101 msgid "unrecognized %%(%s) argument: %s"

5102 msgstr "okänt %%(%s)-argument: %s"

5103

5070 -#: ref-filter.c:247

5104 +#: ref-filter.c:250

5105 #, c-format

5106 msgid "%%(objecttype) does not take arguments"

5107 msgstr "%%(objecttype) tar inte argument"

5108

5075 -#: ref-filter.c:269

5109 +#: ref-filter.c:272

5110 #, c-format

5111 msgid "unrecognized %%(objectsize) argument: %s"

5112 msgstr "okänt %%(objectsize)-argument: %s"

5113

5080 -#: ref-filter.c:277

5114 +#: ref-filter.c:280

5115 #, c-format

5116 msgid "%%(deltabase) does not take arguments"

5117 msgstr "%%(deltabase) tar inte argument"

5118

5085 -#: ref-filter.c:289

5119 +#: ref-filter.c:292

5120 #, c-format

5121 msgid "%%(body) does not take arguments"

5122 msgstr "%%(body) tar inte argument"

5123

5090 -#: ref-filter.c:298

5124 +#: ref-filter.c:301

5125 #, c-format

5126 msgid "%%(subject) does not take arguments"

5127 msgstr "%%(subject) tar inte argument"

5128

5095 -#: ref-filter.c:320

5129 +#: ref-filter.c:323

5130 #, c-format

5131 msgid "unknown %%(trailers) argument: %s"

5132 msgstr "okänt %%(trailers)-argument: %s"

5133

5100 -#: ref-filter.c:349

5134 +#: ref-filter.c:352

5135 #, c-format

5136 msgid "positive value expected contents:lines=%s"

5137 msgstr "positivt värde förväntat contents:lines=%s"

5138

5105 -#: ref-filter.c:351

5139 +#: ref-filter.c:354

5140 #, c-format

5141 msgid "unrecognized %%(contents) argument: %s"

5142 msgstr "okänt %%(contents)-argument: %s"

5143

5110 -#: ref-filter.c:366

5144 +#: ref-filter.c:369

5145 #, c-format

5146 msgid "positive value expected objectname:short=%s"

5147 msgstr "positivt värde förväntat objectname:short=%s"

5148

5115 -#: ref-filter.c:370

5149 +#: ref-filter.c:373

5150 #, c-format

5151 msgid "unrecognized %%(objectname) argument: %s"

5152 msgstr "okänt %%(objectname)-argument: %s"

5153

5120 -#: ref-filter.c:400

5154 +#: ref-filter.c:403

5155 #, c-format

5156 msgid "expected format: %%(align:<width>,<position>)"

5157 msgstr "förväntat format: %%(align:<bredd>,<position>)"

5158

5125 -#: ref-filter.c:412

5159 +#: ref-filter.c:415

5160 #, c-format

5161 msgid "unrecognized position:%s"

5162 msgstr "okänd position:%s"

5163

5130 -#: ref-filter.c:419

5164 +#: ref-filter.c:422

5165 #, c-format

5166 msgid "unrecognized width:%s"

5167 msgstr "okänd bredd:%s"

5168

5135 -#: ref-filter.c:428

5169 +#: ref-filter.c:431

5170 #, c-format

5171 msgid "unrecognized %%(align) argument: %s"

5172 msgstr "okänt %%(align)-argument: %s"

5173

5140 -#: ref-filter.c:436

5174 +#: ref-filter.c:439

5175 #, c-format

5176 msgid "positive width expected with the %%(align) atom"

5177 msgstr "positiv bredd förväntad med atomen %%(align)"

5178

5145 -#: ref-filter.c:454

5179 +#: ref-filter.c:457

5180 #, c-format

5181 msgid "unrecognized %%(if) argument: %s"

5182 msgstr "okänt %%(if)-argument: %s"

5183

5150 -#: ref-filter.c:556

5184 +#: ref-filter.c:559

5185 #, c-format

5186 msgid "malformed field name: %.*s"

5187 msgstr "felformat fältnamn: %.*s"

5188

5155 -#: ref-filter.c:583

5189 +#: ref-filter.c:586

5190 #, c-format

5191 msgid "unknown field name: %.*s"

5192 msgstr "okänt fältnamn: %.*s"

5193

5160 -#: ref-filter.c:587

5194 +#: ref-filter.c:590

5195 #, c-format

5196 msgid ""

5197 "not a git repository, but the field '%.*s' requires access to object data"

5198 msgstr ""

5199 "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"

5200

5167 -#: ref-filter.c:711

5201 +#: ref-filter.c:714

5202 #, c-format

5203 msgid "format: %%(if) atom used without a %%(then) atom"

5204 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

5205

5172 -#: ref-filter.c:774

5206 +#: ref-filter.c:777

5207 #, c-format

5208 msgid "format: %%(then) atom used without an %%(if) atom"

5209 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

5210

5177 -#: ref-filter.c:776

5211 +#: ref-filter.c:779

5212 #, c-format

5213 msgid "format: %%(then) atom used more than once"

5214 msgstr "format: atomen %%(then) använd mer än en gång"

5215

5182 -#: ref-filter.c:778

5216 +#: ref-filter.c:781

5217 #, c-format

5218 msgid "format: %%(then) atom used after %%(else)"

5219 msgstr "format: atomen %%(then) använd efter %%(else)"

5220

5187 -#: ref-filter.c:806

5221 +#: ref-filter.c:809

5222 #, c-format

5223 msgid "format: %%(else) atom used without an %%(if) atom"

5224 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

5225

5192 -#: ref-filter.c:808

5226 +#: ref-filter.c:811

5227 #, c-format

5228 msgid "format: %%(else) atom used without a %%(then) atom"

5229 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

5230

5197 -#: ref-filter.c:810

5231 +#: ref-filter.c:813

5232 #, c-format

5233 msgid "format: %%(else) atom used more than once"

5234 msgstr "format: atomen %%(else) använd mer än en gång"

5235

5202 -#: ref-filter.c:825

5236 +#: ref-filter.c:828

5237 #, c-format

5238 msgid "format: %%(end) atom used without corresponding atom"

5239 msgstr "format: atomen %%(end) använd utan motsvarande atom"

5240

5207 -#: ref-filter.c:882

5241 +#: ref-filter.c:885

5242 #, c-format

5243 msgid "malformed format string %s"

5244 msgstr "felformad formatsträng %s"

5245

5212 -#: ref-filter.c:1485

5246 +#: ref-filter.c:1488

5247 #, c-format

5248 msgid "no branch, rebasing %s"

5249 msgstr "ingen gren, ombaserar %s"

5250

5217 -#: ref-filter.c:1488

5251 +#: ref-filter.c:1491

5252 #, c-format

5253 msgid "no branch, rebasing detached HEAD %s"

5254 msgstr "ingen gren, ombaserar frånkopplat HEAD %s"

5255

5222 -#: ref-filter.c:1491

5256 +#: ref-filter.c:1494

5257 #, c-format

5258 msgid "no branch, bisect started on %s"

5259 msgstr "ingen gren, \"bisect\" startad på %s"

5260

5227 -#: ref-filter.c:1501

5261 +#: ref-filter.c:1504

5262 msgid "no branch"

5263 msgstr "ingen gren"

5264

5231 -#: ref-filter.c:1537 ref-filter.c:1743

5265 +#: ref-filter.c:1540 ref-filter.c:1749

5266 #, c-format

5267 msgid "missing object %s for %s"

5268 msgstr "objektet %s saknas för %s"

5269

5236 -#: ref-filter.c:1547

5270 +#: ref-filter.c:1550

5271 #, c-format

5272 msgid "parse_object_buffer failed on %s for %s"

5273 msgstr "parse_object_buffer misslyckades på %s för %s"

5274

5241 -#: ref-filter.c:1998

5275 +#: ref-filter.c:2004

5276 #, c-format

5277 msgid "malformed object at '%s'"

5278 msgstr "felformat objekt vid \"%s\""

5279

5246 -#: ref-filter.c:2087

5280 +#: ref-filter.c:2093

5281 #, c-format

5282 msgid "ignoring ref with broken name %s"

5283 msgstr "ignorerar referens med trasigt namn %s"

5284

5251 -#: ref-filter.c:2382

5285 +#: ref-filter.c:2389

5286 #, c-format

5287 msgid "format: %%(end) atom missing"

5288 msgstr "format: atomen %%(end) saknas"

5289

5256 -#: ref-filter.c:2482

5290 +#: ref-filter.c:2489

5291 #, c-format

5292 msgid "option `%s' is incompatible with --merged"

5293 msgstr "flaggan \"%s\" är inkompatibel med --merged"

5294

5261 -#: ref-filter.c:2485

5295 +#: ref-filter.c:2492

5296 #, c-format

5297 msgid "option `%s' is incompatible with --no-merged"

5298 msgstr "flaggan \"%s\" är inkompatibel med --no-merged"

5299

5266 -#: ref-filter.c:2495

5300 +#: ref-filter.c:2502

5301 #, c-format

5302 msgid "malformed object name %s"

5303 msgstr "felformat objektnamn %s"

5304

5271 -#: ref-filter.c:2500

5305 +#: ref-filter.c:2507

5306 #, c-format

5307 msgid "option `%s' must point to a commit"

5308 msgstr "flaggan \"%s\" måste peka på en incheckning"

5309

5276 -#: remote.c:363

5310 +#: remote.c:366

5311 #, c-format

5312 msgid "config remote shorthand cannot begin with '/': %s"

5313 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"

5314

5281 -#: remote.c:410

5315 +#: remote.c:413

5316 msgid "more than one receivepack given, using the first"

5317 msgstr "mer än en receivepack angavs, använder den första"

5318

5285 -#: remote.c:418

5319 +#: remote.c:421

5320 msgid "more than one uploadpack given, using the first"

5321 msgstr "mer än en uploadpack angavs, använder den första"

5322

5289 -#: remote.c:608

5323 +#: remote.c:611

5324 #, c-format

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

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

5327

5294 -#: remote.c:612

5328 +#: remote.c:615

5329 #, c-format

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

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

5332

5299 -#: remote.c:616

5333 +#: remote.c:619

5334 #, c-format

5335 msgid "%s tracks both %s and %s"

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

5337

5304 -#: remote.c:684

5338 +#: remote.c:687

5339 #, c-format

5340 msgid "key '%s' of pattern had no '*'"

5341 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""

5342

5309 -#: remote.c:694

5343 +#: remote.c:697

5344 #, c-format

5345 msgid "value '%s' of pattern has no '*'"

5346 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""

5347

5314 -#: remote.c:1000

5348 +#: remote.c:1003

5349 #, c-format

5350 msgid "src refspec %s does not match any"

5351 msgstr "käll-referensspecifikationen %s motsvarar ingen"

5352

5319 -#: remote.c:1005

5353 +#: remote.c:1008

5354 #, c-format

5355 msgid "src refspec %s matches more than one"

5356 msgstr "käll-referensspecifikationen %s motsvarar mer än en"

@@ -5325,7 +5359,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"

5359 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is

5360 #. the <src>.

5361 #.

5328 -#: remote.c:1020

5362 +#: remote.c:1023

5363 #, c-format

5364 msgid ""

5365 "The destination you provided is not a full refname (i.e.,\n"

@@ -5348,7 +5382,7 @@ msgstr ""

5382 "\n"

5383 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."

5384

5351 -#: remote.c:1040

5385 +#: remote.c:1043

5386 #, c-format

5387 msgid ""

5388 "The <src> part of the refspec is a commit object.\n"

@@ -5359,7 +5393,7 @@ msgstr ""

5393 "Var det meningen att skapa en ny gren genom att sända\n"

5394 "till \"%s:refs/heads/%s\"?"

5395

5362 -#: remote.c:1045

5396 +#: remote.c:1048

5397 #, c-format

5398 msgid ""

5399 "The <src> part of the refspec is a tag object.\n"

@@ -5370,7 +5404,7 @@ msgstr ""

5404 "Var det meningen att skapa en ny tagg genom att sända\n"

5405 "till \"%s:refs/tags/%s\"?"

5406

5373 -#: remote.c:1050

5407 +#: remote.c:1053

5408 #, c-format

5409 msgid ""

5410 "The <src> part of the refspec is a tree object.\n"

@@ -5381,7 +5415,7 @@ msgstr ""

5415 "Var det meningen att tagga ett nytt träd genom att sända\n"

5416 "till \"%s:refs/tags/%s\"?"

5417

5384 -#: remote.c:1055

5418 +#: remote.c:1058

5419 #, c-format

5420 msgid ""

5421 "The <src> part of the refspec is a blob object.\n"

@@ -5392,114 +5426,114 @@ msgstr ""

5426 "Var det meningen att tagga en ny blob genom att sända\n"

5427 "till \"%s:refs/tags/%s\"?"

5428

5395 -#: remote.c:1091

5429 +#: remote.c:1094

5430 #, c-format

5431 msgid "%s cannot be resolved to branch"

5432 msgstr "%s kan inte slås upp till en gren"

5433

5400 -#: remote.c:1102

5434 +#: remote.c:1105

5435 #, c-format

5436 msgid "unable to delete '%s': remote ref does not exist"

5437 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"

5438

5405 -#: remote.c:1114

5439 +#: remote.c:1117

5440 #, c-format

5441 msgid "dst refspec %s matches more than one"

5442 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"

5443

5410 -#: remote.c:1121

5444 +#: remote.c:1124

5445 #, c-format

5446 msgid "dst ref %s receives from more than one src"

5447 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"

5448

5415 -#: remote.c:1624 remote.c:1725

5449 +#: remote.c:1627 remote.c:1728

5450 msgid "HEAD does not point to a branch"

5451 msgstr "HEAD pekar inte på en gren"

5452

5419 -#: remote.c:1633

5453 +#: remote.c:1636

5454 #, c-format

5455 msgid "no such branch: '%s'"

5456 msgstr "okänd gren: \"%s\""

5457

5424 -#: remote.c:1636

5458 +#: remote.c:1639

5459 #, c-format

5460 msgid "no upstream configured for branch '%s'"

5461 msgstr "ingen standarduppström angiven för grenen \"%s\""

5462

5429 -#: remote.c:1642

5463 +#: remote.c:1645

5464 #, c-format

5465 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

5467

5434 -#: remote.c:1657

5468 +#: remote.c:1660

5469 #, c-format

5470 msgid "push destination '%s' on remote '%s' has no local tracking branch"

5471 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"

5472

5439 -#: remote.c:1669

5473 +#: remote.c:1672

5474 #, c-format

5475 msgid "branch '%s' has no remote for pushing"

5476 msgstr "grenen \"%s\" har ingen fjärr för \"push\""

5477

5444 -#: remote.c:1679

5478 +#: remote.c:1682

5479 #, c-format

5480 msgid "push refspecs for '%s' do not include '%s'"

5481 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""

5482

5449 -#: remote.c:1692

5483 +#: remote.c:1695

5484 msgid "push has no destination (push.default is 'nothing')"

5485 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"

5486

5453 -#: remote.c:1714

5487 +#: remote.c:1717

5488 msgid "cannot resolve 'simple' push to a single destination"

5489 msgstr "\"enkel push\" motsvarar flera olika mål"

5490

5457 -#: remote.c:1840

5491 +#: remote.c:1843

5492 #, c-format

5493 msgid "couldn't find remote ref %s"

5494 msgstr "Kunde inte hitta fjärr-referensen %s"

5495

5462 -#: remote.c:1853

5496 +#: remote.c:1856

5497 #, c-format

5498 msgid "* Ignoring funny ref '%s' locally"

5499 msgstr "* Ignorerar märklig referens \"%s\" lokalt"

5500

5467 -#: remote.c:2016

5501 +#: remote.c:2019

5502 #, c-format

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

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

5505

5472 -#: remote.c:2020

5506 +#: remote.c:2023

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

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

5509

5476 -#: remote.c:2023

5510 +#: remote.c:2026

5511 #, c-format

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

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

5514

5481 -#: remote.c:2027

5515 +#: remote.c:2030

5516 #, c-format

5517 msgid "Your branch and '%s' refer to different commits.\n"

5518 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

5519

5486 -#: remote.c:2030

5520 +#: remote.c:2033

5521 #, c-format

5522 msgid " (use \"%s\" for details)\n"

5523 msgstr " (använd \"%s\" för detaljer)\n"

5524

5491 -#: remote.c:2034

5525 +#: remote.c:2037

5526 #, c-format

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

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

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

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

5531

5498 -#: remote.c:2040

5532 +#: remote.c:2043

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

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

5535

5502 -#: remote.c:2043

5536 +#: remote.c:2046

5537 #, c-format

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

5539 msgid_plural ""

@@ -5509,11 +5543,11 @@ msgstr[0] ""

5543 msgstr[1] ""

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

5545

5512 -#: remote.c:2051

5546 +#: remote.c:2054

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

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

5549

5516 -#: remote.c:2054

5550 +#: remote.c:2057

5551 #, c-format

5552 msgid ""

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

@@ -5528,11 +5562,11 @@ msgstr[1] ""

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

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

5564

5531 -#: remote.c:2064

5565 +#: remote.c:2067

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

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

5568

5535 -#: remote.c:2247

5569 +#: remote.c:2250

5570 #, c-format

5571 msgid "cannot parse expected object name '%s'"

5572 msgstr "kan inte tolka förväntat objektnamn \"%s\""

@@ -5610,7 +5644,7 @@ msgstr "kan inte ta bort lös länk \"%s\""

5644 msgid "Recorded preimage for '%s'"

5645 msgstr "Sparade förhandsbild för \"%s\""

5646

5613 -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773

5647 +#: rerere.c:881 submodule.c:2023 builtin/log.c:1790

5648 #: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428

5649 #, c-format

5650 msgid "could not create directory '%s'"

@@ -5645,20 +5679,20 @@ msgstr "Glömde lösning för \"%s\"\n"

5679 msgid "unable to open rr-cache directory"

5680 msgstr "kan inte uppdatera katalogen rr-cache"

5681

5648 -#: revision.c:2507

5682 +#: revision.c:2509

5683 msgid "your current branch appears to be broken"

5684 msgstr "din nuvarande gren verkar vara trasig"

5685

5652 -#: revision.c:2510

5686 +#: revision.c:2512

5687 #, c-format

5688 msgid "your current branch '%s' does not have any commits yet"

5689 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

5690

5657 -#: revision.c:2710

5691 +#: revision.c:2720

5692 msgid "--first-parent is incompatible with --bisect"

5693 msgstr "--first-parent är inkompatibelt med --bisect"

5694

5661 -#: revision.c:2714

5695 +#: revision.c:2724

5696 msgid "-L does not yet support diff formats besides -p and -s"

5697 msgstr "-L stöder ännu inte andra diff-format än -p och -s"

5698

@@ -5680,29 +5714,29 @@ msgstr ""

5714 "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

5715 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

5716

5683 -#: send-pack.c:141

5717 +#: send-pack.c:142

5718 msgid "unexpected flush packet while reading remote unpack status"

5719 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

5720

5687 -#: send-pack.c:143

5721 +#: send-pack.c:144

5722 #, c-format

5723 msgid "unable to parse remote unpack status: %s"

5724 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

5725

5692 -#: send-pack.c:145

5726 +#: send-pack.c:146

5727 #, c-format

5728 msgid "remote unpack failed: %s"

5729 msgstr "fjärruppackning misslyckades: %s"

5730

5697 -#: send-pack.c:306

5731 +#: send-pack.c:307

5732 msgid "failed to sign the push certificate"

5733 msgstr "misslyckades underteckna push-certifikatet"

5734

5701 -#: send-pack.c:420

5735 +#: send-pack.c:421

5736 msgid "the receiving end does not support --signed push"

5737 msgstr "mottagarsidan stöder inte push med --signed"

5738

5705 -#: send-pack.c:422

5739 +#: send-pack.c:423

5740 msgid ""

5741 "not sending a push certificate since the receiving end does not support --"

5742 "signed push"

@@ -5710,11 +5744,11 @@ msgstr ""

5744 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

5745 "signed"

5746

5713 -#: send-pack.c:434

5747 +#: send-pack.c:435

5748 msgid "the receiving end does not support --atomic push"

5749 msgstr "mottagarsidan stöder inte push med --atomic"

5750

5717 -#: send-pack.c:439

5751 +#: send-pack.c:440

5752 msgid "the receiving end does not support push options"

5753 msgstr "mottagarsidan stöder inte push-flaggor"

5754

@@ -5728,7 +5762,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

5762 msgid "could not delete '%s'"

5763 msgstr "kunde inte ta bort \"%s\""

5764

5731 -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369

5765 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369

5766 #, c-format

5767 msgid "could not remove '%s'"

5768 msgstr "kunde inte ta bort \"%s\""

@@ -5768,7 +5802,7 @@ msgstr ""

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

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

5804

5771 -#: sequencer.c:401 sequencer.c:2909

5805 +#: sequencer.c:401 sequencer.c:2847

5806 #, c-format

5807 msgid "could not lock '%s'"

5808 msgstr "kunde inte låsa \"%s\""

@@ -5778,15 +5812,15 @@ msgstr "kunde inte låsa \"%s\""

5812 msgid "could not write eol to '%s'"

5813 msgstr "kunde inte skriva radslut till \"%s\""

5814

5781 -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929

5782 -#: sequencer.c:3192

5815 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867

5816 +#: sequencer.c:3130

5817 #, c-format

5818 msgid "failed to finalize '%s'"

5819 msgstr "misslyckades färdigställa \"%s\""

5820

5787 -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734

5788 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763

5789 -#: builtin/merge.c:1112 builtin/rebase.c:567

5821 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112

5822 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117

5823 +#: builtin/rebase.c:568

5824 #, c-format

5825 msgid "could not read '%s'"

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

@@ -5813,70 +5847,65 @@ msgstr "Felaktigt städningsläge %s"

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

5848 #. "rebase -i".

5849 #.

5816 -#: sequencer.c:632

5850 +#: sequencer.c:631

5851 #, c-format

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

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

5854

5821 -#: sequencer.c:649

5855 +#: sequencer.c:648

5856 msgid "unable to update cache tree"

5857 msgstr "kan inte uppdatera cacheträd"

5858

5825 -#: sequencer.c:663

5859 +#: sequencer.c:662

5860 msgid "could not resolve HEAD commit"

5861 msgstr "kunde inte bestämma HEAD:s incheckning"

5862

5829 -#: sequencer.c:743

5863 +#: sequencer.c:742

5864 #, c-format

5865 msgid "no key present in '%.*s'"

5866 msgstr "ingen nyckel i \"%.*s\""

5867

5834 -#: sequencer.c:754

5868 +#: sequencer.c:753

5869 #, c-format

5870 msgid "unable to dequote value of '%s'"

5871 msgstr "kan inte ta bort citering av värdet \"%s\""

5872

5839 -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706

5840 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045

5873 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705

5874 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046

5875 #, c-format

5876 msgid "could not open '%s' for reading"

5877 msgstr "kunde inte öppna \"%s\" för läsning"

5878

5845 -#: sequencer.c:801

5879 +#: sequencer.c:800

5880 msgid "'GIT_AUTHOR_NAME' already given"

5881 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"

5882

5849 -#: sequencer.c:806

5883 +#: sequencer.c:805

5884 msgid "'GIT_AUTHOR_EMAIL' already given"

5885 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"

5886

5853 -#: sequencer.c:811

5887 +#: sequencer.c:810

5888 msgid "'GIT_AUTHOR_DATE' already given"

5889 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"

5890

5857 -#: sequencer.c:815

5891 +#: sequencer.c:814

5892 #, c-format

5893 msgid "unknown variable '%s'"

5894 msgstr "okänd variabel \"%s\""

5895

5862 -#: sequencer.c:820

5896 +#: sequencer.c:819

5897 msgid "missing 'GIT_AUTHOR_NAME'"

5898 msgstr "\"GIT_AUTHOR_NAME\" saknas"

5899

5866 -#: sequencer.c:822

5900 +#: sequencer.c:821

5901 msgid "missing 'GIT_AUTHOR_EMAIL'"

5902 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"

5903

5870 -#: sequencer.c:824

5904 +#: sequencer.c:823

5905 msgid "missing 'GIT_AUTHOR_DATE'"

5906 msgstr "\"GIT_AUTHOR_DATE\" saknas"

5907

5874 -#: sequencer.c:884

5875 -#, c-format

5876 -msgid "invalid date format '%s' in '%s'"

5877 -msgstr "ogiltigt datumformat \"%s\" i \"%s\""

5878 -

5879 -#: sequencer.c:901

5908 +#: sequencer.c:872

5909 #, c-format

5910 msgid ""

5911 "you have staged changes in your working tree\n"

@@ -5905,15 +5934,11 @@ msgstr ""

5934 "\n"

5935 " git rebase --continue\n"

5936

5908 -#: sequencer.c:995

5909 -msgid "writing root commit"

5910 -msgstr "skriver rotincheckning"

5911 -

5912 -#: sequencer.c:1216

5937 +#: sequencer.c:1146

5938 msgid "'prepare-commit-msg' hook failed"

5939 msgstr "kroken \"prepare-commit-msg\" misslyckades"

5940

5916 -#: sequencer.c:1223

5941 +#: sequencer.c:1153

5942 msgid ""

5943 "Your name and email address were configured automatically based\n"

5944 "on your username and hostname. Please check that they are accurate.\n"

@@ -5940,7 +5965,7 @@ msgstr ""

5965 "\n"

5966 " git commit --amend --reset-author\n"

5967

5943 -#: sequencer.c:1236

5968 +#: sequencer.c:1166

5969 msgid ""

5970 "Your name and email address were configured automatically based\n"

5971 "on your username and hostname. Please check that they are accurate.\n"

@@ -5965,327 +5990,327 @@ msgstr ""

5990 "\n"

5991 " git commit --amend --reset-author\n"

5992

5968 -#: sequencer.c:1278

5993 +#: sequencer.c:1208

5994 msgid "couldn't look up newly created commit"

5995 msgstr "kunde inte slå upp en precis skapad incheckning"

5996

5972 -#: sequencer.c:1280

5997 +#: sequencer.c:1210

5998 msgid "could not parse newly created commit"

5999 msgstr "kunde inte tolka en precis skapad incheckning"

6000

5976 -#: sequencer.c:1326

6001 +#: sequencer.c:1256

6002 msgid "unable to resolve HEAD after creating commit"

6003 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

6004

5980 -#: sequencer.c:1328

6005 +#: sequencer.c:1258

6006 msgid "detached HEAD"

6007 msgstr "frånkopplad HEAD"

6008

5984 -#: sequencer.c:1332

6009 +#: sequencer.c:1262

6010 msgid " (root-commit)"

6011 msgstr " (rotincheckning)"

6012

5988 -#: sequencer.c:1353

6013 +#: sequencer.c:1283

6014 msgid "could not parse HEAD"

6015 msgstr "kunde inte tolka HEAD"

6016

5992 -#: sequencer.c:1355

6017 +#: sequencer.c:1285

6018 #, c-format

6019 msgid "HEAD %s is not a commit!"

6020 msgstr "HEAD %s är inte en incheckning!"

6021

5997 -#: sequencer.c:1359 builtin/commit.c:1571

6022 +#: sequencer.c:1289 builtin/commit.c:1571

6023 msgid "could not parse HEAD commit"

6024 msgstr "kunde inte tolka HEAD:s incheckning"

6025

6001 -#: sequencer.c:1411 sequencer.c:2004

6026 +#: sequencer.c:1341 sequencer.c:1933

6027 msgid "unable to parse commit author"

6028 msgstr "kunde inte tolka incheckningens författare"

6029

6005 -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684

6030 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684

6031 msgid "git write-tree failed to write a tree"

6032 msgstr "git write-tree misslyckades skriva ett träd"

6033

6009 -#: sequencer.c:1438 sequencer.c:1499

6034 +#: sequencer.c:1369 sequencer.c:1429

6035 #, c-format

6036 msgid "unable to read commit message from '%s'"

6037 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

6038

6014 -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878

6015 -#: builtin/merge.c:903

6039 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883

6040 +#: builtin/merge.c:908

6041 msgid "failed to write commit object"

6042 msgstr "kunde inte skriva incheckningsobjekt"

6043

6019 -#: sequencer.c:1526

6044 +#: sequencer.c:1456

6045 #, c-format

6046 msgid "could not parse commit %s"

6047 msgstr "kunde inte tolka incheckningen %s"

6048

6024 -#: sequencer.c:1531

6049 +#: sequencer.c:1461

6050 #, c-format

6051 msgid "could not parse parent commit %s"

6052 msgstr "kunde inte tolka föräldraincheckningen %s"

6053

6029 -#: sequencer.c:1605 sequencer.c:1715

6054 +#: sequencer.c:1535 sequencer.c:1645

6055 #, c-format

6056 msgid "unknown command: %d"

6057 msgstr "okänt kommando: %d"

6058

6034 -#: sequencer.c:1662 sequencer.c:1687

6059 +#: sequencer.c:1592 sequencer.c:1617

6060 #, c-format

6061 msgid "This is a combination of %d commits."

6062 msgstr "Det här är en kombination av %d incheckningar."

6063

6039 -#: sequencer.c:1672

6064 +#: sequencer.c:1602

6065 msgid "need a HEAD to fixup"

6066 msgstr "behöver en HEAD-incheckning att rätta"

6067

6043 -#: sequencer.c:1674 sequencer.c:3219

6068 +#: sequencer.c:1604 sequencer.c:3157

6069 msgid "could not read HEAD"

6070 msgstr "kunde inte läsa HEAD"

6071

6047 -#: sequencer.c:1676

6072 +#: sequencer.c:1606

6073 msgid "could not read HEAD's commit message"

6074 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

6075

6051 -#: sequencer.c:1682

6076 +#: sequencer.c:1612

6077 #, c-format

6078 msgid "cannot write '%s'"

6079 msgstr "kan inte skriva \"%s\""

6080

6056 -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496

6081 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496

6082 msgid "This is the 1st commit message:"

6083 msgstr "Det här är 1:a incheckningsmeddelandet:"

6084

6060 -#: sequencer.c:1697

6085 +#: sequencer.c:1627

6086 #, c-format

6087 msgid "could not read commit message of %s"

6088 msgstr "kunde inte läsa incheckningsmeddelande för %s"

6089

6065 -#: sequencer.c:1704

6090 +#: sequencer.c:1634

6091 #, c-format

6092 msgid "This is the commit message #%d:"

6093 msgstr "Det här är incheckningsmeddelande %d:"

6094

6070 -#: sequencer.c:1710

6095 +#: sequencer.c:1640

6096 #, c-format

6097 msgid "The commit message #%d will be skipped:"

6098 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

6099

6075 -#: sequencer.c:1798

6100 +#: sequencer.c:1728

6101 msgid "your index file is unmerged."

6102 msgstr "din indexfil har inte slagits ihop."

6103

6079 -#: sequencer.c:1805

6104 +#: sequencer.c:1735

6105 msgid "cannot fixup root commit"

6106 msgstr "kan inte göra \"fixup\" på rotincheckning"

6107

6083 -#: sequencer.c:1824

6108 +#: sequencer.c:1754

6109 #, c-format

6110 msgid "commit %s is a merge but no -m option was given."

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

6112

6088 -#: sequencer.c:1832 sequencer.c:1840

6113 +#: sequencer.c:1762 sequencer.c:1770

6114 #, c-format

6115 msgid "commit %s does not have parent %d"

6116 msgstr "incheckning %s har inte förälder %d"

6117

6093 -#: sequencer.c:1846

6118 +#: sequencer.c:1776

6119 #, c-format

6120 msgid "cannot get commit message for %s"

6121 msgstr "kan inte hämta incheckningsmeddelande för %s"

6122

6123 #. TRANSLATORS: The first %s will be a "todo" command like

6124 #. "revert" or "pick", the second %s a SHA1.

6100 -#: sequencer.c:1865

6125 +#: sequencer.c:1795

6126 #, c-format

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

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

6129

6105 -#: sequencer.c:1930

6130 +#: sequencer.c:1860

6131 #, c-format

6132 msgid "could not rename '%s' to '%s'"

6133 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

6134

6110 -#: sequencer.c:1985

6135 +#: sequencer.c:1915

6136 #, c-format

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

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

6139

6115 -#: sequencer.c:1986

6140 +#: sequencer.c:1916

6141 #, c-format

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

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

6144

6120 -#: sequencer.c:2045

6145 +#: sequencer.c:1983

6146 #, c-format

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

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

6149

6125 -#: sequencer.c:2052

6150 +#: sequencer.c:1990

6151 #, c-format

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

6153 msgstr "git %s: misslyckades uppdatera indexet"

6154

6130 -#: sequencer.c:2128

6155 +#: sequencer.c:2066

6156 #, c-format

6157 msgid "%s does not accept arguments: '%s'"

6158 msgstr "%s tar inte argument: \"%s\""

6159

6135 -#: sequencer.c:2137

6160 +#: sequencer.c:2075

6161 #, c-format

6162 msgid "missing arguments for %s"

6163 msgstr "argument saknas för %s"

6164

6140 -#: sequencer.c:2174

6165 +#: sequencer.c:2112

6166 #, c-format

6167 msgid "could not parse '%.*s'"

6168 msgstr "kunde inte tolka \"%.*s\""

6169

6145 -#: sequencer.c:2228

6170 +#: sequencer.c:2166

6171 #, c-format

6172 msgid "invalid line %d: %.*s"

6173 msgstr "ogiltig rad %d: %.*s"

6174

6150 -#: sequencer.c:2239

6175 +#: sequencer.c:2177

6176 #, c-format

6177 msgid "cannot '%s' without a previous commit"

6178 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

6179

6155 -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178

6180 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178

6181 #: builtin/rebase.c:204 builtin/rebase.c:229

6182 #, c-format

6183 msgid "could not read '%s'."

6184 msgstr "kunde inte läsa \"%s\"."

6185

6161 -#: sequencer.c:2323

6186 +#: sequencer.c:2261

6187 msgid "cancelling a cherry picking in progress"

6188 msgstr "avbryter pågående \"cherry-pick\""

6189

6165 -#: sequencer.c:2330

6190 +#: sequencer.c:2268

6191 msgid "cancelling a revert in progress"

6192 msgstr "avbryter pågående \"revert\""

6193

6169 -#: sequencer.c:2364

6194 +#: sequencer.c:2302

6195 msgid "please fix this using 'git rebase --edit-todo'."

6196 msgstr "rätta det med \"git rebase --edit-todo\"."

6197

6173 -#: sequencer.c:2366

6198 +#: sequencer.c:2304

6199 #, c-format

6200 msgid "unusable instruction sheet: '%s'"

6201 msgstr "oanvändbart manus: \"%s\""

6202

6178 -#: sequencer.c:2371

6203 +#: sequencer.c:2309

6204 msgid "no commits parsed."

6205 msgstr "inga incheckningar lästes."

6206

6182 -#: sequencer.c:2382

6207 +#: sequencer.c:2320

6208 msgid "cannot cherry-pick during a revert."

6209 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

6210

6186 -#: sequencer.c:2384

6211 +#: sequencer.c:2322

6212 msgid "cannot revert during a cherry-pick."

6213 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

6214

6190 -#: sequencer.c:2466

6215 +#: sequencer.c:2404

6216 #, c-format

6217 msgid "invalid value for %s: %s"

6218 msgstr "felaktigt värde för %s: %s"

6219

6195 -#: sequencer.c:2553

6220 +#: sequencer.c:2491

6221 msgid "unusable squash-onto"

6222 msgstr "oanvändbar squash-onto"

6223

6199 -#: sequencer.c:2569

6224 +#: sequencer.c:2507

6225 #, c-format

6226 msgid "malformed options sheet: '%s'"

6227 msgstr "trasigt manus: \"%s\""

6228

6204 -#: sequencer.c:2652 sequencer.c:4351

6229 +#: sequencer.c:2590 sequencer.c:4308

6230 msgid "empty commit set passed"

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

6232

6208 -#: sequencer.c:2668

6233 +#: sequencer.c:2606

6234 msgid "revert is already in progress"

6235 msgstr "en \"revert\" pågår redan"

6236

6212 -#: sequencer.c:2670

6237 +#: sequencer.c:2608

6238 #, c-format

6239 msgid "try \"git revert (--continue | %s--abort | --quit)\""

6240 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""

6241

6217 -#: sequencer.c:2673

6242 +#: sequencer.c:2611

l10n: sv.po: Update Swedish translation (4695t0f0u)