806f2769e4 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2017-02-04 13:02+0800\n"

11 -"PO-Revision-Date: 2017-02-11 20:13+0100\n"

10 +"POT-Creation-Date: 2017-02-18 01:00+0800\n"

11 +"PO-Revision-Date: 2017-02-20 19:38+0100\n"

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

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

14 "Language: sv\n"

@@ -250,34 +250,34 @@ msgstr "binärpatchen på rad %d känns inte igen"

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

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

252

253 -#: apply.c:2274

253 +#: apply.c:2265

254 #, c-format

255 msgid "unable to read symlink %s"

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

257

258 -#: apply.c:2278

258 +#: apply.c:2269

259 #, c-format

260 msgid "unable to open or read %s"

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

262

263 -#: apply.c:2931

263 +#: apply.c:2922

264 #, c-format

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

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

267

268 -#: apply.c:3050

268 +#: apply.c:3041

269 #, c-format

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

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

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

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

274

275 -#: apply.c:3062

275 +#: apply.c:3053

276 #, c-format

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

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

279

280 -#: apply.c:3068

280 +#: apply.c:3059

281 #, c-format

282 msgid ""

283 "while searching for:\n"

@@ -286,25 +286,25 @@ msgstr ""

286 "vid sökning efter:\n"

287 "%.*s"

288

289 -#: apply.c:3090

289 +#: apply.c:3081

290 #, c-format

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

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

293

294 -#: apply.c:3098

294 +#: apply.c:3089

295 #, c-format

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

297 msgstr ""

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

299 "\""

300

301 -#: apply.c:3144

301 +#: apply.c:3135

302 #, c-format

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

304 msgstr ""

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

306

307 -#: apply.c:3154

307 +#: apply.c:3145

308 #, c-format

309 msgid ""

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

@@ -312,296 +312,296 @@ msgstr ""

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

313 "innehållet."

314

315 -#: apply.c:3162

315 +#: apply.c:3153

316 #, c-format

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

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

319

320 -#: apply.c:3180

320 +#: apply.c:3171

321 #, c-format

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

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

324

325 -#: apply.c:3193

325 +#: apply.c:3184

326 #, c-format

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

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

329

330 -#: apply.c:3199

330 +#: apply.c:3190

331 #, c-format

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

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

334

335 -#: apply.c:3220

335 +#: apply.c:3211

336 #, c-format

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

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

339

340 -#: apply.c:3342

340 +#: apply.c:3333

341 #, c-format

342 msgid "cannot checkout %s"

343 msgstr "kan inte checka ut %s"

344

345 -#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248

345 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248

346 #, c-format

347 msgid "failed to read %s"

348 msgstr "misslyckades läsa %s"

349

350 -#: apply.c:3398

350 +#: apply.c:3389

351 #, c-format

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

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

354

355 -#: apply.c:3427 apply.c:3667

355 +#: apply.c:3418 apply.c:3658

356 #, c-format

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

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

359

360 -#: apply.c:3510 apply.c:3681

360 +#: apply.c:3501 apply.c:3672

361 #, c-format

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

363 msgstr "%s: finns inte i indexet"

364

365 -#: apply.c:3519 apply.c:3689

365 +#: apply.c:3510 apply.c:3680

366 #, c-format

367 msgid "%s: does not match index"

368 msgstr "%s: motsvarar inte indexet"

369

370 -#: apply.c:3554

370 +#: apply.c:3545

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

372 msgstr ""

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

374 "vägssammanslagning."

375

376 -#: apply.c:3557

376 +#: apply.c:3548

377 #, c-format

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

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

380

381 -#: apply.c:3573 apply.c:3577

381 +#: apply.c:3564 apply.c:3568

382 #, c-format

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

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

385

386 -#: apply.c:3589

386 +#: apply.c:3580

387 #, c-format

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

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

390

391 -#: apply.c:3603

391 +#: apply.c:3594

392 #, c-format

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

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

395

396 -#: apply.c:3608

396 +#: apply.c:3599

397 #, c-format

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

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

400

401 -#: apply.c:3634

401 +#: apply.c:3625

402 msgid "removal patch leaves file contents"

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

404

405 -#: apply.c:3706

405 +#: apply.c:3697

406 #, c-format

407 msgid "%s: wrong type"

408 msgstr "%s: fel typ"

409

410 -#: apply.c:3708

410 +#: apply.c:3699

411 #, c-format

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

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

414

415 -#: apply.c:3859 apply.c:3861

415 +#: apply.c:3850 apply.c:3852

416 #, c-format

417 msgid "invalid path '%s'"

418 msgstr "ogiltig sökväg: %s"

419

420 -#: apply.c:3917

420 +#: apply.c:3908

421 #, c-format

422 msgid "%s: already exists in index"

423 msgstr "%s: finns redan i indexet"

424

425 -#: apply.c:3920

425 +#: apply.c:3911

426 #, c-format

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

428 msgstr "%s: finns redan i arbetskatalogen"

429

430 -#: apply.c:3940

430 +#: apply.c:3931

431 #, c-format

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

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

434

435 -#: apply.c:3945

435 +#: apply.c:3936

436 #, c-format

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

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

439

440 -#: apply.c:3965

440 +#: apply.c:3956

441 #, c-format

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

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

444

445 -#: apply.c:3969

445 +#: apply.c:3960

446 #, c-format

447 msgid "%s: patch does not apply"

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

449

450 -#: apply.c:3984

450 +#: apply.c:3975

451 #, c-format

452 msgid "Checking patch %s..."

453 msgstr "Kontrollerar patchen %s..."

454

455 -#: apply.c:4075

455 +#: apply.c:4066

456 #, c-format

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

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

459

460 -#: apply.c:4082

460 +#: apply.c:4073

461 #, c-format

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

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

464

465 -#: apply.c:4085

465 +#: apply.c:4076

466 #, c-format

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

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

469

470 -#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135

470 +#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135

471 #, c-format

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

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

474

475 -#: apply.c:4094

475 +#: apply.c:4085

476 #, c-format

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

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

479

480 -#: apply.c:4104

480 +#: apply.c:4095

481 #, c-format

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

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

484

485 -#: apply.c:4242

485 +#: apply.c:4233

486 #, c-format

487 msgid "unable to remove %s from index"

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

489

490 -#: apply.c:4277

490 +#: apply.c:4268

491 #, c-format

492 msgid "corrupt patch for submodule %s"

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

494

495 -#: apply.c:4283

495 +#: apply.c:4274

496 #, c-format

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

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

499

500 -#: apply.c:4291

500 +#: apply.c:4282

501 #, c-format

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

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

504

505 -#: apply.c:4297 apply.c:4441

505 +#: apply.c:4288 apply.c:4432

506 #, c-format

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

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

509

510 -#: apply.c:4338

510 +#: apply.c:4329

511 #, c-format

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

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

514

515 -#: apply.c:4342

515 +#: apply.c:4333

516 #, c-format

517 msgid "closing file '%s'"

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

519

520 -#: apply.c:4412

520 +#: apply.c:4403

521 #, c-format

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

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

524

525 -#: apply.c:4510

525 +#: apply.c:4501

526 #, c-format

527 msgid "Applied patch %s cleanly."

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

529

530 -#: apply.c:4518

530 +#: apply.c:4509

531 msgid "internal error"

532 msgstr "internt fel"

533

534 -#: apply.c:4521

534 +#: apply.c:4512

535 #, c-format

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

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

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

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

540

541 -#: apply.c:4532

541 +#: apply.c:4523

542 #, c-format

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

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

545

546 -#: apply.c:4540 builtin/fetch.c:737 builtin/fetch.c:986

546 +#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986

547 #, c-format

548 msgid "cannot open %s"

549 msgstr "kan inte öppna %s"

550

551 -#: apply.c:4554

551 +#: apply.c:4545

552 #, c-format

553 msgid "Hunk #%d applied cleanly."

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

555

556 -#: apply.c:4558

556 +#: apply.c:4549

557 #, c-format

558 msgid "Rejected hunk #%d."

559 msgstr "Refuserar stycke %d."

560

561 -#: apply.c:4668

561 +#: apply.c:4659

562 #, c-format

563 msgid "Skipped patch '%s'."

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

565

566 -#: apply.c:4676

566 +#: apply.c:4667

567 msgid "unrecognized input"

568 msgstr "indata känns inte igen"

569

570 -#: apply.c:4695

570 +#: apply.c:4686

571 msgid "unable to read index file"

572 msgstr "kan inte läsa indexfilen"

573

574 -#: apply.c:4833

574 +#: apply.c:4824

575 #, c-format

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

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

578

579 -#: apply.c:4858

579 +#: apply.c:4849

580 #, c-format

581 msgid "squelched %d whitespace error"

582 msgid_plural "squelched %d whitespace errors"

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

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

585

586 -#: apply.c:4864 apply.c:4879

586 +#: apply.c:4855 apply.c:4870

587 #, c-format

588 msgid "%d line adds whitespace errors."

589 msgid_plural "%d lines add whitespace errors."

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

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

592

593 -#: apply.c:4872

593 +#: apply.c:4863

594 #, c-format

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

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

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

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

599

600 -#: apply.c:4888 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

600 +#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391

601 msgid "Unable to write new index file"

602 msgstr "Kunde inte skriva ny indexfil"

603

604 -#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280

604 +#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280

605 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180

606 #: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591

607 #: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960

@@ -610,121 +610,121 @@ msgstr "Kunde inte skriva ny indexfil"

610 msgid "path"

611 msgstr "sökväg"

612

613 -#: apply.c:4920

613 +#: apply.c:4911

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

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

616

617 -#: apply.c:4923

617 +#: apply.c:4914

618 msgid "apply changes matching the given path"

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

620

621 -#: apply.c:4925 builtin/am.c:2286

621 +#: apply.c:4916 builtin/am.c:2286

622 msgid "num"

623 msgstr "antal"

624

625 -#: apply.c:4926

625 +#: apply.c:4917

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

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

628

629 -#: apply.c:4929

629 +#: apply.c:4920

630 msgid "ignore additions made by the patch"

631 msgstr "ignorera tillägg gjorda av patchen"

632

633 -#: apply.c:4931

633 +#: apply.c:4922

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

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

636

637 -#: apply.c:4935

637 +#: apply.c:4926

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

639 msgstr "visa antal tillagda och borttagna rader decimalt"

640

641 -#: apply.c:4937

641 +#: apply.c:4928

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

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

644

645 -#: apply.c:4939

645 +#: apply.c:4930

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

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

648

649 -#: apply.c:4941

649 +#: apply.c:4932

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

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

652

653 -#: apply.c:4943

653 +#: apply.c:4934

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

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

656

657 -#: apply.c:4945

657 +#: apply.c:4936

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

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

660

661 -#: apply.c:4947

661 +#: apply.c:4938

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

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

664

665 -#: apply.c:4949

665 +#: apply.c:4940

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

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

668

669 -#: apply.c:4951

669 +#: apply.c:4942

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

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

672

673 -#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505

673 +#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507

674 msgid "paths are separated with NUL character"

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

676

677 -#: apply.c:4956

677 +#: apply.c:4947

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

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

680

681 -#: apply.c:4957 builtin/am.c:2265

681 +#: apply.c:4948 builtin/am.c:2265

682 msgid "action"

683 msgstr "åtgärd"

684

685 -#: apply.c:4958

685 +#: apply.c:4949

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

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

688

689 -#: apply.c:4961 apply.c:4964

689 +#: apply.c:4952 apply.c:4955

690 msgid "ignore changes in whitespace when finding context"

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

692

693 -#: apply.c:4967

693 +#: apply.c:4958

694 msgid "apply the patch in reverse"

695 msgstr "tillämpa patchen baklänges"

696

697 -#: apply.c:4969

697 +#: apply.c:4960

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

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

700

701 -#: apply.c:4971

701 +#: apply.c:4962

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

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

704

705 -#: apply.c:4973

705 +#: apply.c:4964

706 msgid "allow overlapping hunks"

707 msgstr "tillåt överlappande stycken"

708

709 -#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19

709 +#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19

710 #: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651

711 #: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114

712 msgid "be verbose"

713 msgstr "var pratsam"

714

715 -#: apply.c:4976

715 +#: apply.c:4967

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

717 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

718

719 -#: apply.c:4979

719 +#: apply.c:4970

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

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

722

723 -#: apply.c:4981 builtin/am.c:2274

723 +#: apply.c:4972 builtin/am.c:2274

724 msgid "root"

725 msgstr "rot"

726

727 -#: apply.c:4982

727 +#: apply.c:4973

728 msgid "prepend <root> to all filenames"

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

730

@@ -770,7 +770,7 @@ msgstr "lägg till prefix till varje sökväg i arkivet"

770

771 #: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59

772 #: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054

773 -#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542

773 +#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544

774 #: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109

775 #: parse-options.h:153

776 msgid "file"

@@ -1555,31 +1555,31 @@ msgstr ""

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

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

1557

1558 -#: diff.c:4695

1558 +#: diff.c:4696

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

1560 msgstr ""

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

1562

1563 -#: diff.c:4698

1563 +#: diff.c:4699

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

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

1566

1567 -#: diff.c:4701

1567 +#: diff.c:4702

1568 #, c-format

1569 msgid ""

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

1571 msgstr ""

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

1573

1574 -#: dir.c:1863

1574 +#: dir.c:1862

1575 msgid "failed to get kernel name and information"

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

1577

1578 -#: dir.c:1982

1578 +#: dir.c:1981

1579 msgid "Untracked cache is disabled on this system or location."

1580 msgstr "Ospårad cache är inaktiverad på systemet eller platsen."

1581

1582 -#: dir.c:2760

1582 +#: dir.c:2759

1583 #, c-format

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

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

@@ -1774,7 +1774,7 @@ msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

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

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

1776

1777 -#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:133

1777 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133

1778 #, c-format

1779 msgid "failed to stat '%s'"

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

@@ -2029,120 +2029,120 @@ msgstr ""

2029 msgid "Renaming %s to %s and %s to %s instead"

2030 msgstr "Byter namn på %s till %s och %s till %s istället"

2031

2032 -#: merge-recursive.c:1538

2032 +#: merge-recursive.c:1535

2033 #, c-format

2034 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"

2035 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"

2036

2037 -#: merge-recursive.c:1553

2037 +#: merge-recursive.c:1550

2038 #, c-format

2039 msgid "Adding merged %s"

2040 msgstr "Lägger till sammanslagen %s"

2041

2042 -#: merge-recursive.c:1560 merge-recursive.c:1774

2042 +#: merge-recursive.c:1557 merge-recursive.c:1771

2043 #, c-format

2044 msgid "Adding as %s instead"

2045 msgstr "Lägger till som %s istället"

2046

2047 -#: merge-recursive.c:1617

2047 +#: merge-recursive.c:1614

2048 #, c-format

2049 msgid "cannot read object %s"

2050 msgstr "kan inte läsa objektet %s"

2051

2052 -#: merge-recursive.c:1620

2052 +#: merge-recursive.c:1617

2053 #, c-format

2054 msgid "object %s is not a blob"

2055 msgstr "objektet %s är inte en blob"

2056

2057 -#: merge-recursive.c:1673

2057 +#: merge-recursive.c:1670

2058 msgid "modify"

2059 msgstr "ändra"

2060

2061 -#: merge-recursive.c:1673

2061 +#: merge-recursive.c:1670

2062 msgid "modified"

2063 msgstr "ändrad"

2064

2065 -#: merge-recursive.c:1683

2065 +#: merge-recursive.c:1680

2066 msgid "content"

2067 msgstr "innehåll"

2068

2069 -#: merge-recursive.c:1690

2069 +#: merge-recursive.c:1687

2070 msgid "add/add"

2071 msgstr "tillägg/tillägg"

2072

2073 -#: merge-recursive.c:1726

2073 +#: merge-recursive.c:1723

2074 #, c-format

2075 msgid "Skipped %s (merged same as existing)"

2076 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

2077

2078 -#: merge-recursive.c:1740

2078 +#: merge-recursive.c:1737

2079 #, c-format

2080 msgid "Auto-merging %s"

2081 msgstr "Slår ihop %s automatiskt"

2082

2083 -#: merge-recursive.c:1744 git-submodule.sh:930

2083 +#: merge-recursive.c:1741 git-submodule.sh:930

2084 msgid "submodule"

2085 msgstr "undermodul"

2086

2087 -#: merge-recursive.c:1745

2087 +#: merge-recursive.c:1742

2088 #, c-format

2089 msgid "CONFLICT (%s): Merge conflict in %s"

2090 msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

2091

2092 -#: merge-recursive.c:1839

2092 +#: merge-recursive.c:1836

2093 #, c-format

2094 msgid "Removing %s"

2095 msgstr "Tar bort %s"

2096

2097 -#: merge-recursive.c:1865

2097 +#: merge-recursive.c:1862

2098 msgid "file/directory"

2099 msgstr "fil/katalog"

2100

2101 -#: merge-recursive.c:1871

2101 +#: merge-recursive.c:1868

2102 msgid "directory/file"

2103 msgstr "katalog/fil"

2104

2105 -#: merge-recursive.c:1877

2105 +#: merge-recursive.c:1874

2106 #, c-format

2107 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

2108 msgstr ""

2109 "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"

2110

2111 -#: merge-recursive.c:1886

2111 +#: merge-recursive.c:1883

2112 #, c-format

2113 msgid "Adding %s"

2114 msgstr "Lägger till %s"

2115

2116 -#: merge-recursive.c:1923

2116 +#: merge-recursive.c:1920

2117 msgid "Already up-to-date!"

2118 msgstr "Redan à jour!"

2119

2120 -#: merge-recursive.c:1932

2120 +#: merge-recursive.c:1929

2121 #, c-format

2122 msgid "merging of trees %s and %s failed"

2123 msgstr "sammanslagning av träden %s och %s misslyckades"

2124

2125 -#: merge-recursive.c:2015

2125 +#: merge-recursive.c:2012

2126 msgid "Merging:"

2127 msgstr "Slår ihop:"

2128

2129 -#: merge-recursive.c:2028

2129 +#: merge-recursive.c:2025

2130 #, c-format

2131 msgid "found %u common ancestor:"

2132 msgid_plural "found %u common ancestors:"

2133 msgstr[0] "hittade %u gemensam förfader:"

2134 msgstr[1] "hittade %u gemensamma förfäder:"

2135

2136 -#: merge-recursive.c:2067

2136 +#: merge-recursive.c:2064

2137 msgid "merge returned no commit"

2138 msgstr "sammanslagningen returnerade ingen incheckning"

2139

2140 -#: merge-recursive.c:2130

2140 +#: merge-recursive.c:2127

2141 #, c-format

2142 msgid "Could not parse object '%s'"

2143 msgstr "Kunde inte tolka objektet \"%s\""

2144

2145 -#: merge-recursive.c:2144 builtin/merge.c:645 builtin/merge.c:792

2145 +#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792

2146 msgid "Unable to write index."

2147 msgstr "Kunde inte skriva indexet."

2148

@@ -2184,7 +2184,7 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

2184 msgid "Bad %s value: '%s'"

2185 msgstr "Felaktigt värde på %s: \"%s\""

2186

2187 -#: object.c:242

2187 +#: object.c:240

2188 #, c-format

2189 msgid "unable to parse object: %s"

2190 msgstr "kunde inte tolka objektet: %s"

@@ -3491,7 +3491,7 @@ msgstr ""

3491 msgid "Aborting."

3492 msgstr "Avbryter."

3493

3494 -#: transport-helper.c:1075

3494 +#: transport-helper.c:1082

3495 #, c-format

3496 msgid "Could not read ref %s"

3497 msgstr "Kunde inte läsa referensen %s"

@@ -6161,7 +6161,7 @@ msgid "remove whole directories"

6161 msgstr "ta bort hela kataloger"

6162

6163 #: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056

6164 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:176

6164 +#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176

6165 msgid "pattern"

6166 msgstr "mönster"

6167

@@ -7463,31 +7463,31 @@ msgstr "Inga namn hittades, kan inte beskriva något."

7463 msgid "--dirty is incompatible with commit-ishes"

7464 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"

7465

7466 -#: builtin/diff.c:86

7466 +#: builtin/diff.c:83

7467 #, c-format

7468 msgid "'%s': not a regular file or symlink"

7469 msgstr "\"%s\": inte en normal fil eller symbolisk länk"

7470

7471 -#: builtin/diff.c:237

7471 +#: builtin/diff.c:234

7472 #, c-format

7473 msgid "invalid option: %s"

7474 msgstr "ogiltig flagga: %s"

7475

7476 -#: builtin/diff.c:361

7476 +#: builtin/diff.c:358

7477 msgid "Not a git repository"

7478 msgstr "Inte ett git-arkiv"

7479

7480 -#: builtin/diff.c:404

7480 +#: builtin/diff.c:401

7481 #, c-format

7482 msgid "invalid object '%s' given."

7483 msgstr "objektet \"%s\" som angavs är felaktigt."

7484

7485 -#: builtin/diff.c:413

7485 +#: builtin/diff.c:410

7486 #, c-format

7487 msgid "more than two blobs given: '%s'"

7488 msgstr "mer än två blobbar angavs: \"%s\""

7489

7490 -#: builtin/diff.c:420

7490 +#: builtin/diff.c:417

7491 #, c-format

7492 msgid "unhandled object '%s' given."

7493 msgstr "ej hanterat objekt \"%s\" angavs."

@@ -9308,103 +9308,103 @@ msgid ""

9308 "Could not find a tracked remote branch, please specify <upstream> manually.\n"

9309 msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"

9310

9311 -#: builtin/ls-files.c:458

9311 +#: builtin/ls-files.c:460

9312 msgid "git ls-files [<options>] [<file>...]"

9313 msgstr "git ls-files [<flaggor>] [<fil>...]"

9314

9315 -#: builtin/ls-files.c:507

9315 +#: builtin/ls-files.c:509

9316 msgid "identify the file status with tags"

9317 msgstr "identifiera filstatus med taggar"

9318

9319 -#: builtin/ls-files.c:509

9319 +#: builtin/ls-files.c:511

9320 msgid "use lowercase letters for 'assume unchanged' files"

9321 msgstr "använd små bokstäver för \"anta oförändrade\"-filer"

9322

9323 -#: builtin/ls-files.c:511

9323 +#: builtin/ls-files.c:513

9324 msgid "show cached files in the output (default)"

9325 msgstr "visa cachade filer i utdata (standard)"

9326

9327 -#: builtin/ls-files.c:513

9327 +#: builtin/ls-files.c:515

9328 msgid "show deleted files in the output"

9329 msgstr "visa borttagna filer i utdata"

9330

9331 -#: builtin/ls-files.c:515

9331 +#: builtin/ls-files.c:517

9332 msgid "show modified files in the output"

9333 msgstr "visa modifierade filer i utdata"

9334

9335 -#: builtin/ls-files.c:517

9335 +#: builtin/ls-files.c:519

9336 msgid "show other files in the output"

9337 msgstr "visa andra filer i utdata"

9338

9339 -#: builtin/ls-files.c:519

9339 +#: builtin/ls-files.c:521

9340 msgid "show ignored files in the output"

9341 msgstr "visa ignorerade filer i utdata"

9342

9343 -#: builtin/ls-files.c:522

9343 +#: builtin/ls-files.c:524

9344 msgid "show staged contents' object name in the output"

9345 msgstr "visa köat innehålls objektnamn i utdata"

9346

9347 -#: builtin/ls-files.c:524

9347 +#: builtin/ls-files.c:526

9348 msgid "show files on the filesystem that need to be removed"

9349 msgstr "visa filer i filsystemet som behöver tas bort"

9350

9351 -#: builtin/ls-files.c:526

9351 +#: builtin/ls-files.c:528

9352 msgid "show 'other' directories' names only"

9353 msgstr "visa endast namn för \"andra\" kataloger"

9354

9355 -#: builtin/ls-files.c:528

9355 +#: builtin/ls-files.c:530

9356 msgid "show line endings of files"

9357 msgstr "visa radslut i filer"

9358

9359 -#: builtin/ls-files.c:530

9359 +#: builtin/ls-files.c:532

9360 msgid "don't show empty directories"

9361 msgstr "visa inte tomma kataloger"

9362

9363 -#: builtin/ls-files.c:533

9363 +#: builtin/ls-files.c:535

9364 msgid "show unmerged files in the output"

9365 msgstr "visa ej sammanslagna filer i utdata"

9366

9367 -#: builtin/ls-files.c:535

9367 +#: builtin/ls-files.c:537

9368 msgid "show resolve-undo information"

9369 msgstr "visa \"resolve-undo\"-information"

9370

9371 -#: builtin/ls-files.c:537

9371 +#: builtin/ls-files.c:539

9372 msgid "skip files matching pattern"

9373 msgstr "hoppa över filer som motsvarar mönster"

9374

9375 -#: builtin/ls-files.c:540

9375 +#: builtin/ls-files.c:542

9376 msgid "exclude patterns are read from <file>"

9377 msgstr "exkludera mönster som läses från <fil>"

9378

9379 -#: builtin/ls-files.c:543

9379 +#: builtin/ls-files.c:545

9380 msgid "read additional per-directory exclude patterns in <file>"

9381 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"

9382

9383 -#: builtin/ls-files.c:545

9383 +#: builtin/ls-files.c:547

9384 msgid "add the standard git exclusions"

9385 msgstr "lägg till git:s standardexkluderingar"

9386

9387 -#: builtin/ls-files.c:548

9387 +#: builtin/ls-files.c:550

9388 msgid "make the output relative to the project top directory"

9389 msgstr "gör utdata relativ till projektets toppkatalog"

9390

9391 -#: builtin/ls-files.c:551

9391 +#: builtin/ls-files.c:553

9392 msgid "recurse through submodules"

9393 msgstr "rekursera ner i undermoduler"

9394

9395 -#: builtin/ls-files.c:553

9395 +#: builtin/ls-files.c:555

9396 msgid "if any <file> is not in the index, treat this as an error"

9397 msgstr "om en <fil> inte är indexet, betrakta det som ett fel"

9398

9399 -#: builtin/ls-files.c:554

9399 +#: builtin/ls-files.c:556

9400 msgid "tree-ish"

9401 msgstr "träd-igt"

9402

9403 -#: builtin/ls-files.c:555

9403 +#: builtin/ls-files.c:557

9404 msgid "pretend that paths removed since <tree-ish> are still present"

9405 msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"

9406

9407 -#: builtin/ls-files.c:557

9407 +#: builtin/ls-files.c:559

9408 msgid "show debugging data"

9409 msgstr "visa felsökningsutdata"

9410

@@ -10766,11 +10766,11 @@ msgstr "Tar bort duplicerade objekt"

10766 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"

10767 msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"

10768

10769 -#: builtin/prune.c:106 builtin/worktree.c:128

10769 +#: builtin/prune.c:106

10770 msgid "report pruned objects"

10771 msgstr "rapportera borttagna objekt"

10772

10773 -#: builtin/prune.c:109 builtin/worktree.c:130

10773 +#: builtin/prune.c:109

10774 msgid "expire objects older than <time>"

10775 msgstr "låt tid gå ut för objekt äldre än <tid>"

10776

@@ -13438,6 +13438,14 @@ msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"

13438 msgid "Removing worktrees/%s: gitdir file points to non-existent location"

13439 msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"

13440

13441 +#: builtin/worktree.c:128

13442 +msgid "report pruned working trees"

13443 +msgstr "rapportera borttagna arbetskataloger"

13444 +

13445 +#: builtin/worktree.c:130

13446 +msgid "expire working trees older than <time>"

13447 +msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"

13448 +

13449 #: builtin/worktree.c:204

13450 #, c-format

13451 msgid "'%s' already exists"

l10n: sv.po: Update Swedish translation (3139t0f0u)