cc2f50dafe · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2012-07-03 10:23+0800\n"

11 -"PO-Revision-Date: 2012-07-04 19:33+0100\n"

10 +"POT-Creation-Date: 2012-08-06 23:47+0800\n"

11 +"PO-Revision-Date: 2012-08-09 06:36+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"

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

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

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

50

51 -#: bundle.c:89 builtin/commit.c:696

51 +#: bundle.c:89 builtin/commit.c:699

52 #, c-format

53 msgid "could not open '%s'"

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

@@ -58,7 +58,7 @@ msgid "Repository lacks these prerequisite commits:"

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

59

60 #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290

61 -#: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347

61 +#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347

62 #: builtin/shortlog.c:181

63 msgid "revision walk setup failed"

64 msgstr "misslyckades skapa revisionstraversering"

@@ -85,7 +85,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"

85 msgid "rev-list died"

86 msgstr "rev-list dog"

87

88 -#: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284

88 +#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284

89 #, c-format

90 msgid "unrecognized argument: %s"

91 msgstr "okänt argument: %s"

@@ -231,8 +231,8 @@ msgstr ""

231 "%s"

232

233 #: diff.c:1400

234 -msgid " 0 files changed\n"

235 -msgstr " 0 filer ändrade\n"

234 +msgid " 0 files changed"

235 +msgstr " 0 filer ändrade"

236

237 #: diff.c:1404

238 #, c-format

@@ -255,7 +255,7 @@ msgid_plural ", %d deletions(-)"

255 msgstr[0] ", %d borttagning(-)"

256 msgstr[1] ", %d borttagningar(-)"

257

258 -#: diff.c:3478

258 +#: diff.c:3461

259 #, c-format

260 msgid ""

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

@@ -291,16 +291,16 @@ msgstr "\"%s\": %s"

291 msgid "'%s': short read %s"

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

293

294 -#: help.c:208

294 +#: help.c:212

295 #, c-format

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

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

298

299 -#: help.c:215

299 +#: help.c:219

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

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

302

303 -#: help.c:271

303 +#: help.c:275

304 #, c-format

305 msgid ""

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

@@ -309,11 +309,11 @@ msgstr ""

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

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

311

312 -#: help.c:328

312 +#: help.c:332

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

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

315

316 -#: help.c:350

316 +#: help.c:354

317 #, c-format

318 msgid ""

319 "WARNING: You called a Git command named '%s', which does not exist.\n"

@@ -322,17 +322,17 @@ msgstr ""

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

323 "Fortsätter under förutsättningen att du menade \"%s\""

324

325 -#: help.c:355

325 +#: help.c:359

326 #, c-format

327 msgid "in %0.1f seconds automatically..."

328 msgstr "automatiskt om %0.1f sekunder..."

329

330 -#: help.c:362

330 +#: help.c:366

331 #, c-format

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

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

334

335 -#: help.c:366

335 +#: help.c:370

336 msgid ""

337 "\n"

338 "Did you mean this?"

@@ -346,35 +346,297 @@ msgstr[1] ""

346 "\n"

347 "Menade du ett av dessa?"

348

349 -#: parse-options.c:493

349 +#: merge-recursive.c:190

350 +#, c-format

351 +msgid "(bad commit)\n"

352 +msgstr "(felaktig incheckning)\n"

353 +

354 +#: merge-recursive.c:206

355 +#, c-format

356 +msgid "addinfo_cache failed for path '%s'"

357 +msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

358 +

359 +#: merge-recursive.c:268

360 +msgid "error building trees"

361 +msgstr "fel vid byggande av träd"

362 +

363 +#: merge-recursive.c:497

364 +msgid "diff setup failed"

365 +msgstr "misslyckades sätta upp för diff"

366 +

367 +#: merge-recursive.c:627

368 +msgid "merge-recursive: disk full?"

369 +msgstr "merge-recursive: disk full?"

370 +

371 +#: merge-recursive.c:690

372 +#, c-format

373 +msgid "failed to create path '%s'%s"

374 +msgstr "misslyckades skapa sökvägen \"%s\"%s"

375 +

376 +#: merge-recursive.c:701

377 +#, c-format

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

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

380 +

381 +#. something else exists

382 +#. .. but not some other error (who really cares what?)

383 +#: merge-recursive.c:715 merge-recursive.c:736

384 +msgid ": perhaps a D/F conflict?"

385 +msgstr ": kanske en K/F-konflikt?"

386 +

387 +#: merge-recursive.c:726

388 +#, c-format

389 +msgid "refusing to lose untracked file at '%s'"

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

391 +

392 +#: merge-recursive.c:766

393 +#, c-format

394 +msgid "cannot read object %s '%s'"

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

396 +

397 +#: merge-recursive.c:768

398 +#, c-format

399 +msgid "blob expected for %s '%s'"

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

401 +

402 +#: merge-recursive.c:791 builtin/clone.c:302

403 +#, c-format

404 +msgid "failed to open '%s'"

405 +msgstr "misslyckades öppna \"%s\""

406 +

407 +#: merge-recursive.c:799

408 +#, c-format

409 +msgid "failed to symlink '%s'"

410 +msgstr "misslyckades ta skapa symboliska länken \"%s\""

411 +

412 +#: merge-recursive.c:802

413 +#, c-format

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

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

416 +

417 +#: merge-recursive.c:939

418 +msgid "Failed to execute internal merge"

419 +msgstr "Misslyckades exekvera intern sammanslagning"

420 +

421 +#: merge-recursive.c:943

422 +#, c-format

423 +msgid "Unable to add %s to database"

424 +msgstr "Kunde inte lägga till %s till databasen"

425 +

426 +#: merge-recursive.c:959

427 +msgid "unsupported object type in the tree"

428 +msgstr "objekttyp som ej stöds upptäcktes i trädet"

429 +

430 +#: merge-recursive.c:1038 merge-recursive.c:1052

431 +#, c-format

432 +msgid ""

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

434 +"in tree."

435 +msgstr ""

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

437 +"i trädet."

438 +

439 +#: merge-recursive.c:1044 merge-recursive.c:1057

440 +#, c-format

441 +msgid ""

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

443 +"in tree at %s."

444 +msgstr ""

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

446 +"i trädet vid %s."

447 +

448 +#: merge-recursive.c:1098

449 +msgid "rename"

450 +msgstr "namnbyte"

451 +

452 +#: merge-recursive.c:1098

453 +msgid "renamed"

454 +msgstr "namnbytt"

455 +

456 +#: merge-recursive.c:1154

457 +#, c-format

458 +msgid "%s is a directory in %s adding as %s instead"

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

460 +

461 +#: merge-recursive.c:1176

462 +#, c-format

463 +msgid ""

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

465 +"\"->\"%s\" in \"%s\"%s"

466 +msgstr ""

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

468 +"namnbyte \"%s\"->\"%s\" i \"%s\"%s"

469 +

470 +#: merge-recursive.c:1181

471 +msgid " (left unresolved)"

472 +msgstr " (lämnad olöst)"

473 +

474 +#: merge-recursive.c:1235

475 +#, c-format

476 +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"

477 +msgstr ""

478 +"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"

479 +

480 +#: merge-recursive.c:1265

481 +#, c-format

482 +msgid "Renaming %s to %s and %s to %s instead"

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

484 +

485 +#: merge-recursive.c:1464

486 +#, c-format

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

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

489 +

490 +#: merge-recursive.c:1474

491 +#, c-format

492 +msgid "Adding merged %s"

493 +msgstr "Lägger till sammanslagen %s"

494 +

495 +#: merge-recursive.c:1479 merge-recursive.c:1677

496 +#, c-format

497 +msgid "Adding as %s instead"

498 +msgstr "Lägger till som %s iställer"

499 +

500 +#: merge-recursive.c:1530

501 +#, c-format

502 +msgid "cannot read object %s"

503 +msgstr "kan inte läsa objektet %s"

504 +

505 +#: merge-recursive.c:1533

506 +#, c-format

507 +msgid "object %s is not a blob"

508 +msgstr "objektet %s är inte en blob"

509 +

510 +#: merge-recursive.c:1581

511 +msgid "modify"

512 +msgstr "ändra"

513 +

514 +#: merge-recursive.c:1581

515 +msgid "modified"

516 +msgstr "ändrad"

517 +

518 +#: merge-recursive.c:1591

519 +msgid "content"

520 +msgstr "innehåll"

521 +

522 +#: merge-recursive.c:1598

523 +msgid "add/add"

524 +msgstr "tillägg/tillägg"

525 +

526 +#: merge-recursive.c:1632

527 +#, c-format

528 +msgid "Skipped %s (merged same as existing)"

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

530 +

531 +#: merge-recursive.c:1646

532 +#, c-format

533 +msgid "Auto-merging %s"

534 +msgstr "Slår ihop %s automatiskt"

535 +

536 +#: merge-recursive.c:1650 git-submodule.sh:844

537 +msgid "submodule"

538 +msgstr "undermodul"

539 +

540 +#: merge-recursive.c:1651

541 +#, c-format

542 +msgid "CONFLICT (%s): Merge conflict in %s"

543 +msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"

544 +

545 +#: merge-recursive.c:1741

546 +#, c-format

547 +msgid "Removing %s"

548 +msgstr "Tar bort %s"

549 +

550 +#: merge-recursive.c:1766

551 +msgid "file/directory"

552 +msgstr "fil/katalog"

553 +

554 +#: merge-recursive.c:1772

555 +msgid "directory/file"

556 +msgstr "katalog/fil"

557 +

558 +#: merge-recursive.c:1777

559 +#, c-format

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

561 +msgstr ""

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

563 +

564 +#: merge-recursive.c:1787

565 +#, c-format

566 +msgid "Adding %s"

567 +msgstr "Lägger till %s"

568 +

569 +#: merge-recursive.c:1804

570 +msgid "Fatal merge failure, shouldn't happen."

571 +msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."

572 +

573 +#: merge-recursive.c:1823

574 +msgid "Already up-to-date!"

575 +msgstr "Redan à jour!"

576 +

577 +#: merge-recursive.c:1832

578 +#, c-format

579 +msgid "merging of trees %s and %s failed"

580 +msgstr "sammanslagning av träden %s och %s misslyckades"

581 +

582 +#: merge-recursive.c:1862

583 +#, c-format

584 +msgid "Unprocessed path??? %s"

585 +msgstr "Obehandlad sökväg??? %s"

586 +

587 +#: merge-recursive.c:1907

588 +msgid "Merging:"

589 +msgstr "Slår ihop:"

590 +

591 +#: merge-recursive.c:1920

592 +#, c-format

593 +msgid "found %u common ancestor:"

594 +msgid_plural "found %u common ancestors:"

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

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

597 +

598 +#: merge-recursive.c:1957

599 +msgid "merge returned no commit"

600 +msgstr "sammanslagningen returnerade ingen incheckning"

601 +

602 +#: merge-recursive.c:2014

603 +#, c-format

604 +msgid "Could not parse object '%s'"

605 +msgstr "Kunde inte tolka objektet \"%s\""

606 +

607 +#: merge-recursive.c:2026 builtin/merge.c:697

608 +msgid "Unable to write index."

609 +msgstr "Kunde inte skriva indexet."

610 +

611 +#: parse-options.c:494

612 msgid "..."

613 msgstr "..."

614

353 -#: parse-options.c:511

615 +#: parse-options.c:512

616 #, c-format

617 msgid "usage: %s"

618 msgstr "användning: %s"

619

620 #. TRANSLATORS: the colon here should align with the

621 #. one in "usage: %s" translation

360 -#: parse-options.c:515

622 +#: parse-options.c:516

623 #, c-format

624 msgid " or: %s"

625 msgstr " eller: %s"

626

365 -#: parse-options.c:518

627 +#: parse-options.c:519

628 #, c-format

629 msgid " %s"

630 msgstr " %s"

631

370 -#: remote.c:1629

632 +#: remote.c:1632

633 #, c-format

634 msgid "Your branch is ahead of '%s' by %d commit.\n"

635 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"

636 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"

637 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"

638

377 -#: remote.c:1635

639 +#: remote.c:1638

640 #, c-format

641 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"

642 msgid_plural ""

@@ -384,7 +646,7 @@ msgstr[0] ""

646 msgstr[1] ""

647 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"

648

387 -#: remote.c:1643

649 +#: remote.c:1646

650 #, c-format

651 msgid ""

652 "Your branch and '%s' have diverged,\n"

@@ -608,7 +870,7 @@ msgstr "kan inte bestämma HEAD"

870 msgid "cannot abort from a branch yet to be born"

871 msgstr "kan inte avbryta från en gren som ännu inte är född"

872

611 -#: sequencer.c:805 builtin/apply.c:3697

873 +#: sequencer.c:805 builtin/apply.c:3988

874 #, c-format

875 msgid "cannot open %s: %s"

876 msgstr "kan inte öppna %s: %s"

@@ -640,21 +902,21 @@ msgstr "Kan inte ångra som första incheckning"

902 msgid "Can't cherry-pick into empty head"

903 msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"

904

643 -#: sha1_name.c:864

905 +#: sha1_name.c:1044

906 msgid "HEAD does not point to a branch"

907 msgstr "HEAD pekar inte på en gren"

908

647 -#: sha1_name.c:867

909 +#: sha1_name.c:1047

910 #, c-format

911 msgid "No such branch: '%s'"

912 msgstr "Okänd gren: \"%s\""

913

652 -#: sha1_name.c:869

914 +#: sha1_name.c:1049

915 #, c-format

916 msgid "No upstream configured for branch '%s'"

917 msgstr "Ingen standarduppström angiven för grenen \"%s\""

918

657 -#: sha1_name.c:872

919 +#: sha1_name.c:1052

920 #, c-format

921 msgid "Upstream branch '%s' not stored as a remote-tracking branch"

922 msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"

@@ -668,343 +930,343 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"

930 msgid "no such user"

931 msgstr "okänd användare"

932

671 -#: wt-status.c:141

933 +#: wt-status.c:140

934 msgid "Unmerged paths:"

935 msgstr "Ej sammanslagna sökvägar:"

936

675 -#: wt-status.c:168 wt-status.c:195

937 +#: wt-status.c:167 wt-status.c:194

938 #, c-format

939 msgid " (use \"git reset %s <file>...\" to unstage)"

940 msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"

941

680 -#: wt-status.c:170 wt-status.c:197

942 +#: wt-status.c:169 wt-status.c:196

943 msgid " (use \"git rm --cached <file>...\" to unstage)"

944 msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"

945

684 -#: wt-status.c:174

946 +#: wt-status.c:173

947 msgid " (use \"git add <file>...\" to mark resolution)"

948 msgstr " (använd \"git add <fil>...\" för att ange lösning)"

949

688 -#: wt-status.c:176 wt-status.c:180

950 +#: wt-status.c:175 wt-status.c:179

951 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"

952 msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"

953

692 -#: wt-status.c:178

954 +#: wt-status.c:177

955 msgid " (use \"git rm <file>...\" to mark resolution)"

956 msgstr " (använd \"git rm <fil>...\" för att ange lösning)"

957

696 -#: wt-status.c:189

958 +#: wt-status.c:188

959 msgid "Changes to be committed:"

960 msgstr "Ändringar att checka in:"

961

700 -#: wt-status.c:207

962 +#: wt-status.c:206

963 msgid "Changes not staged for commit:"

964 msgstr "Ändringar ej i incheckningskön:"

965

704 -#: wt-status.c:211

966 +#: wt-status.c:210

967 msgid " (use \"git add <file>...\" to update what will be committed)"

968 msgstr ""

969 " (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"

970

709 -#: wt-status.c:213

971 +#: wt-status.c:212

972 msgid " (use \"git add/rm <file>...\" to update what will be committed)"

973 msgstr ""

974 " (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"

975

714 -#: wt-status.c:214

976 +#: wt-status.c:213

977 msgid ""

978 " (use \"git checkout -- <file>...\" to discard changes in working directory)"

979 msgstr ""

980 " (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "

981 "arbetskatalogen)"

982

721 -#: wt-status.c:216

983 +#: wt-status.c:215

984 msgid " (commit or discard the untracked or modified content in submodules)"

985 msgstr ""

986 " (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"

987

988 # %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.

727 -#: wt-status.c:225

989 +#: wt-status.c:224

990 #, c-format

991 msgid "%s files:"

992 msgstr "%se filer:"

993

732 -#: wt-status.c:228

994 +#: wt-status.c:227

995 #, c-format

996 msgid " (use \"git %s <file>...\" to include in what will be committed)"

997 msgstr ""

998 " (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"

999

738 -#: wt-status.c:245

1000 +#: wt-status.c:244

1001 msgid "bug"

1002 msgstr "programfel"

1003

742 -#: wt-status.c:250

1004 +#: wt-status.c:249

1005 msgid "both deleted:"

1006 msgstr "borttaget av bägge:"

1007

746 -#: wt-status.c:251

1008 +#: wt-status.c:250

1009 msgid "added by us:"

1010 msgstr "tillagt av oss:"

1011

750 -#: wt-status.c:252

1012 +#: wt-status.c:251

1013 msgid "deleted by them:"

1014 msgstr "borttaget av dem:"

1015

754 -#: wt-status.c:253

1016 +#: wt-status.c:252

1017 msgid "added by them:"

1018 msgstr "tillagt av dem:"

1019

758 -#: wt-status.c:254

1020 +#: wt-status.c:253

1021 msgid "deleted by us:"

1022 msgstr "borttaget av oss:"

1023

762 -#: wt-status.c:255

1024 +#: wt-status.c:254

1025 msgid "both added:"

1026 msgstr "tillagt av bägge:"

1027

766 -#: wt-status.c:256

1028 +#: wt-status.c:255

1029 msgid "both modified:"

1030 msgstr "ändrat av bägge:"

1031

770 -#: wt-status.c:286

1032 +#: wt-status.c:285

1033 msgid "new commits, "

1034 msgstr "nya incheckningar, "

1035

774 -#: wt-status.c:288

1036 +#: wt-status.c:287

1037 msgid "modified content, "

1038 msgstr "ändrat innehåll, "

1039

778 -#: wt-status.c:290

1040 +#: wt-status.c:289

1041 msgid "untracked content, "

1042 msgstr "ospårat innehåll, "

1043

782 -#: wt-status.c:304

1044 +#: wt-status.c:303

1045 #, c-format

1046 msgid "new file: %s"

1047 msgstr "ny fil: %s"

1048

787 -#: wt-status.c:307

1049 +#: wt-status.c:306

1050 #, c-format

1051 msgid "copied: %s -> %s"

1052 msgstr "kopierad: %s -> %s"

1053

792 -#: wt-status.c:310

1054 +#: wt-status.c:309

1055 #, c-format

1056 msgid "deleted: %s"

1057 msgstr "borttagen: %s"

1058

797 -#: wt-status.c:313

1059 +#: wt-status.c:312

1060 #, c-format

1061 msgid "modified: %s"

1062 msgstr "ändrad: %s"

1063

802 -#: wt-status.c:316

1064 +#: wt-status.c:315

1065 #, c-format

1066 msgid "renamed: %s -> %s"

1067 msgstr "namnbyte: %s -> %s"

1068

807 -#: wt-status.c:319

1069 +#: wt-status.c:318

1070 #, c-format

1071 msgid "typechange: %s"

1072 msgstr "typbyte: %s"

1073

812 -#: wt-status.c:322

1074 +#: wt-status.c:321

1075 #, c-format

1076 msgid "unknown: %s"

1077 msgstr "okänd: %s"

1078

817 -#: wt-status.c:325

1079 +#: wt-status.c:324

1080 #, c-format

1081 msgid "unmerged: %s"

1082 msgstr "osammansl.: %s"

1083

822 -#: wt-status.c:328

1084 +#: wt-status.c:327

1085 #, c-format

1086 msgid "bug: unhandled diff status %c"

1087 msgstr "programfel: diff-status %c ej hanterad"

1088

827 -#: wt-status.c:786

1089 +#: wt-status.c:785

1090 msgid "You have unmerged paths."

1091 msgstr "Du har ej sammanslagna sökvägar."

1092

831 -#: wt-status.c:789 wt-status.c:913

1093 +#: wt-status.c:788 wt-status.c:912

1094 msgid " (fix conflicts and run \"git commit\")"

1095 msgstr " (rätta konflikter och kör \"git commit\")"

1096

835 -#: wt-status.c:792

1097 +#: wt-status.c:791

1098 msgid "All conflicts fixed but you are still merging."

1099 msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."

1100

839 -#: wt-status.c:795

1101 +#: wt-status.c:794

1102 msgid " (use \"git commit\" to conclude merge)"

1103 msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"

1104

843 -#: wt-status.c:805

1105 +#: wt-status.c:804

1106 msgid "You are in the middle of an am session."

1107 msgstr "Du är i mitten av en körning av \"git am\"."

1108

847 -#: wt-status.c:808

1109 +#: wt-status.c:807

1110 msgid "The current patch is empty."

1111 msgstr "Aktuell patch är tom."

1112

851 -#: wt-status.c:812

1113 +#: wt-status.c:811

1114 msgid " (fix conflicts and then run \"git am --resolved\")"

1115 msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"

1116

855 -#: wt-status.c:814

1117 +#: wt-status.c:813

1118 msgid " (use \"git am --skip\" to skip this patch)"

1119 msgstr " (använd \"git am --skip\" för att hoppa över patchen)"

1120

859 -#: wt-status.c:816

1121 +#: wt-status.c:815

1122 msgid " (use \"git am --abort\" to restore the original branch)"

1123 msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"

1124

863 -#: wt-status.c:874 wt-status.c:884

1125 +#: wt-status.c:873 wt-status.c:883

1126 msgid "You are currently rebasing."

1127 msgstr "Du håller på med en ombasering."

1128

867 -#: wt-status.c:877

1129 +#: wt-status.c:876

1130 msgid " (fix conflicts and then run \"git rebase --continue\")"

1131 msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"

1132

871 -#: wt-status.c:879

1133 +#: wt-status.c:878

1134 msgid " (use \"git rebase --skip\" to skip this patch)"

1135 msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"

1136

875 -#: wt-status.c:881

1137 +#: wt-status.c:880

1138 msgid " (use \"git rebase --abort\" to check out the original branch)"

1139 msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"

1140

879 -#: wt-status.c:887

1141 +#: wt-status.c:886

1142 msgid " (all conflicts fixed: run \"git rebase --continue\")"

1143 msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"

1144

883 -#: wt-status.c:889

1145 +#: wt-status.c:888

1146 msgid "You are currently splitting a commit during a rebase."

1147 msgstr "Du håller på att dela upp en incheckning i en ombasering."

1148

887 -#: wt-status.c:892

1149 +#: wt-status.c:891

1150 msgid " (Once your working directory is clean, run \"git rebase --continue\")"

1151 msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"

1152

891 -#: wt-status.c:894

1153 +#: wt-status.c:893

1154 msgid "You are currently editing a commit during a rebase."

1155 msgstr "Du håller på att redigera en incheckning under en ombasering."

1156

895 -#: wt-status.c:897

1157 +#: wt-status.c:896

1158 msgid " (use \"git commit --amend\" to amend the current commit)"

1159 msgstr ""

1160 " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"

1161

900 -#: wt-status.c:899

1162 +#: wt-status.c:898

1163 msgid ""

1164 " (use \"git rebase --continue\" once you are satisfied with your changes)"

1165 msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"

1166

905 -#: wt-status.c:909

1167 +#: wt-status.c:908

1168 msgid "You are currently cherry-picking."

1169 msgstr "Du håller på med en \"cherry-pick\"."

1170

909 -#: wt-status.c:916

1171 +#: wt-status.c:915

1172 msgid " (all conflicts fixed: run \"git commit\")"

1173 msgstr " (alla konflikter har rättats: kör \"git commit\")"

1174

913 -#: wt-status.c:925

1175 +#: wt-status.c:924

1176 msgid "You are currently bisecting."

1177 msgstr "Du håller på med en \"bisect\"."

1178

917 -#: wt-status.c:928

1179 +#: wt-status.c:927

1180 msgid " (use \"git bisect reset\" to get back to the original branch)"

1181 msgstr ""

1182 " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"

1183

922 -#: wt-status.c:979

1184 +#: wt-status.c:978

1185 msgid "On branch "

1186 msgstr "På grenen "

1187

926 -#: wt-status.c:986

1188 +#: wt-status.c:985

1189 msgid "Not currently on any branch."

1190 msgstr "Inte på någon gren för närvarande."

1191

930 -#: wt-status.c:998

1192 +#: wt-status.c:997

1193 msgid "Initial commit"

1194 msgstr "Första incheckning"

1195

934 -#: wt-status.c:1012

1196 +#: wt-status.c:1011

1197 msgid "Untracked"

1198 msgstr "Ospårad"

1199

938 -#: wt-status.c:1014

1200 +#: wt-status.c:1013

1201 msgid "Ignored"

1202 msgstr "Ignorerad"

1203

1204 # %s är nästa sträng eller tom.

943 -#: wt-status.c:1016

1205 +#: wt-status.c:1015

1206 #, c-format

1207 msgid "Untracked files not listed%s"

1208 msgstr "Ospårade filer visas ej%s"

1209

948 -#: wt-status.c:1018

1210 +#: wt-status.c:1017

1211 msgid " (use -u option to show untracked files)"

1212 msgstr " (använd flaggan -u för att visa ospårade filer)"

1213

952 -#: wt-status.c:1024

1214 +#: wt-status.c:1023

1215 msgid "No changes"

1216 msgstr "Inga ändringar"

1217

956 -#: wt-status.c:1028

1218 +#: wt-status.c:1027

1219 #, c-format

1220 msgid "no changes added to commit%s\n"

1221 msgstr "inga ändringar att checka in%s\n"

1222

961 -#: wt-status.c:1030

1223 +#: wt-status.c:1029

1224 msgid " (use \"git add\" and/or \"git commit -a\")"

1225 msgstr " (använd \"git add\" och/eller \"git commit -a\")"

1226

965 -#: wt-status.c:1032

1227 +#: wt-status.c:1031

1228 #, c-format

1229 msgid "nothing added to commit but untracked files present%s\n"

1230 msgstr "inget köat för incheckning, men ospårade filer finns%s\n"

1231

970 -#: wt-status.c:1034

1232 +#: wt-status.c:1033

1233 msgid " (use \"git add\" to track)"

1234 msgstr " (använd \"git add\" för att spåra)"

1235

974 -#: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042

1236 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041

1237 #, c-format

1238 msgid "nothing to commit%s\n"

1239 msgstr "inget att checka in%s\n"

1240

979 -#: wt-status.c:1037

1241 +#: wt-status.c:1036

1242 msgid " (create/copy files and use \"git add\" to track)"

1243 msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)"

1244

983 -#: wt-status.c:1040

1245 +#: wt-status.c:1039

1246 msgid " (use -u to show untracked files)"

1247 msgstr " (använd -u för att visa ospårade filer)"

1248

987 -#: wt-status.c:1043

1249 +#: wt-status.c:1042

1250 msgid " (working directory clean)"

1251 msgstr " (arbetskatalogen ren)"

1252

991 -#: wt-status.c:1151

1253 +#: wt-status.c:1150

1254 msgid "HEAD (no branch)"

1255 msgstr "HEAD (ingen gren)"

1256

995 -#: wt-status.c:1157

1257 +#: wt-status.c:1156

1258 msgid "Initial commit on "

1259 msgstr "Första incheckning på "

1260

999 -#: wt-status.c:1172

1261 +#: wt-status.c:1171

1262 msgid "behind "

1263 msgstr "efter "

1264

1003 -#: wt-status.c:1175 wt-status.c:1178

1265 +#: wt-status.c:1174 wt-status.c:1177

1266 msgid "ahead "

1267 msgstr "före "

1268

1007 -#: wt-status.c:1180

1269 +#: wt-status.c:1179

1270 msgid ", behind "

1271 msgstr ", efter "

1272

@@ -1013,7 +1275,7 @@ msgstr ", efter "

1275 msgid "unexpected diff status %c"

1276 msgstr "diff-status %c förväntades inte"

1277

1016 -#: builtin/add.c:67 builtin/commit.c:226

1278 +#: builtin/add.c:67 builtin/commit.c:229

1279 msgid "updating files failed"

1280 msgstr "misslyckades uppdatera filer"

1281

@@ -1103,75 +1365,75 @@ msgstr "Inget angivet, inget tillagt.\n"

1365 msgid "Maybe you wanted to say 'git add .'?\n"

1366 msgstr "Kanske menade du att skriva \"git add .\"?\n"

1367

1106 -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82

1368 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82

1369 #: builtin/rm.c:162

1370 msgid "index file corrupt"

1371 msgstr "indexfilen trasig"

1372

1111 -#: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260

1373 +#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260

1374 msgid "Unable to write new index file"

1375 msgstr "Kunde inte skriva ny indexfil"

1376

1115 -#: builtin/apply.c:53

1377 +#: builtin/apply.c:57

1378 msgid "git apply [options] [<patch>...]"

1379 msgstr "git apply [flaggor] [<patch>...]"

1380

1119 -#: builtin/apply.c:106

1381 +#: builtin/apply.c:110

1382 #, c-format

1383 msgid "unrecognized whitespace option '%s'"

1384 msgstr "okänt alternativ för whitespace: \"%s\""

1385

1124 -#: builtin/apply.c:121

1386 +#: builtin/apply.c:125

1387 #, c-format

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

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

1390

1129 -#: builtin/apply.c:815

1391 +#: builtin/apply.c:824

1392 #, c-format

1393 msgid "Cannot prepare timestamp regexp %s"

1394 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"

1395

1134 -#: builtin/apply.c:824

1396 +#: builtin/apply.c:833

1397 #, c-format

1398 msgid "regexec returned %d for input: %s"

1399 msgstr "regexec returnerade %d för indata: %s"

1400

1139 -#: builtin/apply.c:905

1401 +#: builtin/apply.c:914

1402 #, c-format

1403 msgid "unable to find filename in patch at line %d"

1404 msgstr "kan inte hitta filnamn i patchen på rad %d"

1405

1144 -#: builtin/apply.c:937

1406 +#: builtin/apply.c:946

1407 #, c-format

1408 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"

1409 msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"

1410

1149 -#: builtin/apply.c:941

1411 +#: builtin/apply.c:950

1412 #, c-format

1413 msgid "git apply: bad git-diff - inconsistent new filename on line %d"

1414 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"

1415

1154 -#: builtin/apply.c:942

1416 +#: builtin/apply.c:951

1417 #, c-format

1418 msgid "git apply: bad git-diff - inconsistent old filename on line %d"

1419 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"

1420

1159 -#: builtin/apply.c:949

1421 +#: builtin/apply.c:958

1422 #, c-format

1423 msgid "git apply: bad git-diff - expected /dev/null on line %d"

1424 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"

1425

1164 -#: builtin/apply.c:1394

1426 +#: builtin/apply.c:1403

1427 #, c-format

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

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

1430

1169 -#: builtin/apply.c:1451

1431 +#: builtin/apply.c:1460

1432 #, c-format

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

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

1435

1174 -#: builtin/apply.c:1468

1436 +#: builtin/apply.c:1477

1437 #, c-format

1438 msgid ""

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

@@ -1187,82 +1449,82 @@ msgstr[1] ""

1449 "sökvägskomponenter\n"

1450 "tas bort (rad %d)"

1451

1190 -#: builtin/apply.c:1628

1452 +#: builtin/apply.c:1637

1453 msgid "new file depends on old contents"

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

1455

1194 -#: builtin/apply.c:1630

1456 +#: builtin/apply.c:1639

1457 msgid "deleted file still has contents"

1458 msgstr "borttagen fil har fortfarande innehåll"

1459

1198 -#: builtin/apply.c:1656

1460 +#: builtin/apply.c:1665

1461 #, c-format

1462 msgid "corrupt patch at line %d"

1463 msgstr "trasig patch på rad %d"

1464

1203 -#: builtin/apply.c:1692

1465 +#: builtin/apply.c:1701

1466 #, c-format

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

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

1469

1208 -#: builtin/apply.c:1694

1470 +#: builtin/apply.c:1703

1471 #, c-format

1472 msgid "deleted file %s still has contents"

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

1474

1213 -#: builtin/apply.c:1697

1475 +#: builtin/apply.c:1706

1476 #, c-format

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

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

1479

1218 -#: builtin/apply.c:1843

1480 +#: builtin/apply.c:1852

1481 #, c-format

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

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

1484

1485 #. there has to be one hunk (forward hunk)

1224 -#: builtin/apply.c:1872

1486 +#: builtin/apply.c:1881

1487 #, c-format

1488 msgid "unrecognized binary patch at line %d"

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

1490

1229 -#: builtin/apply.c:1958

1491 +#: builtin/apply.c:1967

1492 #, c-format

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

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

1495

1234 -#: builtin/apply.c:2048

1496 +#: builtin/apply.c:2057

1497 #, c-format

1498 msgid "unable to read symlink %s"

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

1500

1239 -#: builtin/apply.c:2052

1501 +#: builtin/apply.c:2061

1502 #, c-format

1503 msgid "unable to open or read %s"

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

1505

1244 -#: builtin/apply.c:2123

1506 +#: builtin/apply.c:2132

1507 msgid "oops"

1508 msgstr "hoppsan"

1509

1248 -#: builtin/apply.c:2645

1510 +#: builtin/apply.c:2654

1511 #, c-format

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

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

1514

1253 -#: builtin/apply.c:2763

1515 +#: builtin/apply.c:2772

1516 #, c-format

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

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

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

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

1521

1260 -#: builtin/apply.c:2775

1522 +#: builtin/apply.c:2784

1523 #, c-format

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

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

1526

1265 -#: builtin/apply.c:2781

1527 +#: builtin/apply.c:2790

1528 #, c-format

1529 msgid ""

1530 "while searching for:\n"

@@ -1271,313 +1533,321 @@ msgstr ""

1533 "vid sökning efter:\n"

1534 "%.*s"

1535

1274 -#: builtin/apply.c:2800

1536 +#: builtin/apply.c:2809

1537 #, c-format

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

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

1540

1279 -#: builtin/apply.c:2903

1541 +#: builtin/apply.c:2912

1542 #, c-format

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

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

1545

1284 -#: builtin/apply.c:2909

1546 +#: builtin/apply.c:2918

1547 #, c-format

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

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

1550

1289 -#: builtin/apply.c:2930

1551 +#: builtin/apply.c:2939

1552 #, c-format

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

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

1555

1294 -#: builtin/apply.c:3045

1556 +#: builtin/apply.c:3061

1557 #, c-format

1296 -msgid "patch %s has been renamed/deleted"

1297 -msgstr "patchen %s har ändrat namn/tagits bort"

1558 +msgid "cannot checkout %s"

1559 +msgstr "kan inte checka ut %s"

1560

1299 -#: builtin/apply.c:3052 builtin/apply.c:3069

1561 +#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159

1562 #, c-format

1563 msgid "read of %s failed"

1564 msgstr "misslyckades läsa %s"

1565

1304 -#: builtin/apply.c:3084

1305 -msgid "removal patch leaves file contents"

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

1307 -

1308 -#: builtin/apply.c:3105

1566 +#: builtin/apply.c:3139 builtin/apply.c:3361

1567 #, c-format

1310 -msgid "%s: already exists in working directory"

1311 -msgstr "%s: finns redan i arbetskatalogen"

1568 +msgid "path %s has been renamed/deleted"

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

1570

1313 -#: builtin/apply.c:3143

1571 +#: builtin/apply.c:3220 builtin/apply.c:3375

1572 #, c-format

1315 -msgid "%s: has been deleted/renamed"

1316 -msgstr "%s: har tagits bort/ändrat namn"

1573 +msgid "%s: does not exist in index"

1574 +msgstr "%s: finns inte i indexet"

1575

1318 -#: builtin/apply.c:3148 builtin/apply.c:3179

1576 +#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389

1577 #, c-format

1578 msgid "%s: %s"

1579 msgstr "%s: %s"

1580

1323 -#: builtin/apply.c:3159

1324 -#, c-format

1325 -msgid "%s: does not exist in index"

1326 -msgstr "%s: finns inte i indexet"

1327 -

1328 -#: builtin/apply.c:3173

1581 +#: builtin/apply.c:3229 builtin/apply.c:3383

1582 #, c-format

1583 msgid "%s: does not match index"

1584 msgstr "%s: motsvarar inte indexet"

1585

1333 -#: builtin/apply.c:3190

1586 +#: builtin/apply.c:3331

1587 +msgid "removal patch leaves file contents"

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

1589 +

1590 +#: builtin/apply.c:3400

1591 #, c-format

1592 msgid "%s: wrong type"

1593 msgstr "%s: fel typ"

1594

1338 -#: builtin/apply.c:3192

1595 +#: builtin/apply.c:3402

1596 #, c-format

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

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

1599

1343 -#: builtin/apply.c:3247

1600 +#: builtin/apply.c:3503

1601 #, c-format

1602 msgid "%s: already exists in index"

1603 msgstr "%s: finns redan i indexet"

1604

1348 -#: builtin/apply.c:3267

1605 +#: builtin/apply.c:3506

1606 +#, c-format

1607 +msgid "%s: already exists in working directory"

1608 +msgstr "%s: finns redan i arbetskatalogen"

1609 +

1610 +#: builtin/apply.c:3526

1611 #, c-format

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

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

1614

1353 -#: builtin/apply.c:3272

1615 +#: builtin/apply.c:3531

1616 #, c-format

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

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

1619

1358 -#: builtin/apply.c:3280

1620 +#: builtin/apply.c:3539

1621 #, c-format

1622 msgid "%s: patch does not apply"

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

1624

1363 -#: builtin/apply.c:3293

1625 +#: builtin/apply.c:3552

1626 #, c-format

1627 msgid "Checking patch %s..."

1628 msgstr "Kontrollerar patchen %s..."

1629

1368 -#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158

1630 +#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158

1631 #, c-format

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

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

1634

1373 -#: builtin/apply.c:3491

1635 +#: builtin/apply.c:3750

1636 #, c-format

1637 msgid "unable to remove %s from index"

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

1639

1378 -#: builtin/apply.c:3518

1640 +#: builtin/apply.c:3778

1641 #, c-format

1642 msgid "corrupt patch for subproject %s"

1643 msgstr "trasig patch för underprojektet %s"

1644

1383 -#: builtin/apply.c:3522

1645 +#: builtin/apply.c:3782

1646 #, c-format

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

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

1649

1388 -#: builtin/apply.c:3527

1650 +#: builtin/apply.c:3787

1651 #, c-format

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

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

1654

1393 -#: builtin/apply.c:3530

1655 +#: builtin/apply.c:3790 builtin/apply.c:3898

1656 #, c-format

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

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

1659

1398 -#: builtin/apply.c:3563

1660 +#: builtin/apply.c:3823

1661 #, c-format

1662 msgid "closing file '%s'"

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

1664

1403 -#: builtin/apply.c:3612

1665 +#: builtin/apply.c:3872

1666 #, c-format

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

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

1669

1408 -#: builtin/apply.c:3668

1670 +#: builtin/apply.c:3959

1671 #, c-format

1672 msgid "Applied patch %s cleanly."

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

1674

1413 -#: builtin/apply.c:3676

1675 +#: builtin/apply.c:3967

1676 msgid "internal error"

1677 msgstr "internt fel"

1678

1679 #. Say this even without --verbose

1418 -#: builtin/apply.c:3679

1680 +#: builtin/apply.c:3970

1681 #, c-format

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

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

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

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

1686

1425 -#: builtin/apply.c:3689

1687 +#: builtin/apply.c:3980

1688 #, c-format

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

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

1691

1430 -#: builtin/apply.c:3710

1692 +#: builtin/apply.c:4001

1693 #, c-format

1694 msgid "Hunk #%d applied cleanly."

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

1696

1435 -#: builtin/apply.c:3713

1697 +#: builtin/apply.c:4004

1698 #, c-format

1699 msgid "Rejected hunk #%d."

1700 msgstr "Refuserar stycke %d."

1701

1440 -#: builtin/apply.c:3844

1702 +#: builtin/apply.c:4154

1703 msgid "unrecognized input"

1704 msgstr "indata känns inte igen"

1705

1444 -#: builtin/apply.c:3855

1706 +#: builtin/apply.c:4165

1707 msgid "unable to read index file"

1708 msgstr "kan inte läsa indexfilen"

1709

1448 -#: builtin/apply.c:3970 builtin/apply.c:3973

1710 +#: builtin/apply.c:4284 builtin/apply.c:4287

1711 msgid "path"

1712 msgstr "sökväg"

1713

1452 -#: builtin/apply.c:3971

1714 +#: builtin/apply.c:4285

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

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

1717

1456 -#: builtin/apply.c:3974

1718 +#: builtin/apply.c:4288

1719 msgid "apply changes matching the given path"

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

1721

1460 -#: builtin/apply.c:3976

1722 +#: builtin/apply.c:4290

1723 msgid "num"

1724 msgstr "antal"

1725

1464 -#: builtin/apply.c:3977

1726 +#: builtin/apply.c:4291

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

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

1729

1468 -#: builtin/apply.c:3980

1730 +#: builtin/apply.c:4294

1731 msgid "ignore additions made by the patch"

1732 msgstr "ignorera tillägg gjorda av patchen"

1733

1472 -#: builtin/apply.c:3982

1734 +#: builtin/apply.c:4296

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

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

1737

1476 -#: builtin/apply.c:3986

1738 +#: builtin/apply.c:4300

1739 msgid "shows number of added and deleted lines in decimal notation"

1740 msgstr "visar antal tillagda och borttagna rader decimalt"

1741

1480 -#: builtin/apply.c:3988

1742 +#: builtin/apply.c:4302

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

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

1745

1484 -#: builtin/apply.c:3990

1746 +#: builtin/apply.c:4304

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

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

1749

1488 -#: builtin/apply.c:3992

1750 +#: builtin/apply.c:4306

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

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

1753

1492 -#: builtin/apply.c:3994

1754 +#: builtin/apply.c:4308

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

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

1757

1496 -#: builtin/apply.c:3996

1758 +#: builtin/apply.c:4310

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

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

1761

1500 -#: builtin/apply.c:3998

1762 +#: builtin/apply.c:4312

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

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

1765 +

1766 +#: builtin/apply.c:4314

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

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

1769

1504 -#: builtin/apply.c:4000

1770 +#: builtin/apply.c:4316

1771 msgid "paths are separated with NUL character"

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

1773

1508 -#: builtin/apply.c:4003

1774 +#: builtin/apply.c:4319

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

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

1777

1512 -#: builtin/apply.c:4004

1778 +#: builtin/apply.c:4320

1779 msgid "action"

1780 msgstr "åtgärd"

1781

1516 -#: builtin/apply.c:4005

1782 +#: builtin/apply.c:4321

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

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

1785

1520 -#: builtin/apply.c:4008 builtin/apply.c:4011

1786 +#: builtin/apply.c:4324 builtin/apply.c:4327

1787 msgid "ignore changes in whitespace when finding context"

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

1789

1524 -#: builtin/apply.c:4014

1790 +#: builtin/apply.c:4330

1791 msgid "apply the patch in reverse"

1792 msgstr "tillämpa patchen baklänges"

1793

1528 -#: builtin/apply.c:4016

1794 +#: builtin/apply.c:4332

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

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

1797

1532 -#: builtin/apply.c:4018

1798 +#: builtin/apply.c:4334

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

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

1801

1536 -#: builtin/apply.c:4020

1802 +#: builtin/apply.c:4336

1803 msgid "allow overlapping hunks"

1804 msgstr "tillåt överlappande stycken"

1805

1540 -#: builtin/apply.c:4021

1806 +#: builtin/apply.c:4337

1807 msgid "be verbose"

1808 msgstr "var pratsam"

1809

1544 -#: builtin/apply.c:4023

1810 +#: builtin/apply.c:4339

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

1812 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1813

1548 -#: builtin/apply.c:4026

1814 +#: builtin/apply.c:4342

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

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

1817

1552 -#: builtin/apply.c:4028

1818 +#: builtin/apply.c:4344

1819 msgid "root"

1820 msgstr "rot"

1821

1556 -#: builtin/apply.c:4029

1822 +#: builtin/apply.c:4345

1823 msgid "prepend <root> to all filenames"

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

1825

1560 -#: builtin/apply.c:4050

1826 +#: builtin/apply.c:4367

1827 +msgid "--3way outside a repository"

1828 +msgstr "--3way utanför arkiv"

1829 +

1830 +#: builtin/apply.c:4375

1831 msgid "--index outside a repository"

1832 msgstr "--index utanför arkiv"

1833

1564 -#: builtin/apply.c:4053

1834 +#: builtin/apply.c:4378

1835 msgid "--cached outside a repository"

1836 msgstr "--cached utanför arkiv"

1837

1568 -#: builtin/apply.c:4069

1838 +#: builtin/apply.c:4394

1839 #, c-format

1840 msgid "can't open patch '%s'"

1841 msgstr "kan inte öppna patchen \"%s\""

1842

1573 -#: builtin/apply.c:4083

1843 +#: builtin/apply.c:4408

1844 #, c-format

1845 msgid "squelched %d whitespace error"

1846 msgid_plural "squelched %d whitespace errors"

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

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

1849

1580 -#: builtin/apply.c:4089 builtin/apply.c:4099

1850 +#: builtin/apply.c:4414 builtin/apply.c:4424

1851 #, c-format

1852 msgid "%d line adds whitespace errors."

1853 msgid_plural "%d lines add whitespace errors."

@@ -1783,7 +2053,7 @@ msgstr "kunde inte skriva grenbeskrivningsmall: %s"

2053 msgid "Failed to resolve HEAD as a valid ref."

2054 msgstr "Misslyckades slå upp HEAD som giltig referens"

2055

1786 -#: builtin/branch.c:788 builtin/clone.c:558

2056 +#: builtin/branch.c:788 builtin/clone.c:561

2057 msgid "HEAD not found below refs/heads!"

2058 msgstr "HEAD hittades inte under refs/heads!"

2059

@@ -1810,99 +2080,99 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

2080 msgid "Need a repository to unbundle."

2081 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."

2082

1813 -#: builtin/checkout.c:113 builtin/checkout.c:146

2083 +#: builtin/checkout.c:114 builtin/checkout.c:147

2084 #, c-format

2085 msgid "path '%s' does not have our version"

2086 msgstr "sökvägen \"%s\" har inte vår version"

2087

1818 -#: builtin/checkout.c:115 builtin/checkout.c:148

2088 +#: builtin/checkout.c:116 builtin/checkout.c:149

2089 #, c-format

2090 msgid "path '%s' does not have their version"

2091 msgstr "sökvägen \"%s\" har inte deras version"

2092

1823 -#: builtin/checkout.c:131

2093 +#: builtin/checkout.c:132

2094 #, c-format

2095 msgid "path '%s' does not have all necessary versions"

2096 msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"

2097

1828 -#: builtin/checkout.c:175

2098 +#: builtin/checkout.c:176

2099 #, c-format

2100 msgid "path '%s' does not have necessary versions"

2101 msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

2102

1833 -#: builtin/checkout.c:192

2103 +#: builtin/checkout.c:193

2104 #, c-format

2105 msgid "path '%s': cannot merge"

2106 msgstr "sökväg \"%s\": kan inte slå ihop"

2107

1838 -#: builtin/checkout.c:209

2108 +#: builtin/checkout.c:210

2109 #, c-format

2110 msgid "Unable to add merge result for '%s'"

2111 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""

2112

1843 -#: builtin/checkout.c:234 builtin/checkout.c:392

2113 +#: builtin/checkout.c:235 builtin/checkout.c:393

2114 msgid "corrupt index file"

2115 msgstr "indexfilen är trasig"

2116

1847 -#: builtin/checkout.c:264 builtin/checkout.c:271

2117 +#: builtin/checkout.c:265 builtin/checkout.c:272

2118 #, c-format

2119 msgid "path '%s' is unmerged"

2120 msgstr "sökvägen \"%s\" har inte slagits ihop"

2121

1852 -#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583

2122 +#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586

2123 #: builtin/merge.c:812

2124 msgid "unable to write new index file"

2125 msgstr "kunde inte skriva ny indexfil"

2126

1857 -#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408

2127 +#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408

2128 msgid "diff_setup_done failed"

2129 msgstr "diff_setup_done misslyckades"

2130

1861 -#: builtin/checkout.c:414

2131 +#: builtin/checkout.c:415

2132 msgid "you need to resolve your current index first"

2133 msgstr "du måste lösa ditt befintliga index först"

2134

1865 -#: builtin/checkout.c:533

2135 +#: builtin/checkout.c:534

2136 #, c-format

2137 msgid "Can not do reflog for '%s'\n"

2138 msgstr "Kan inte skapa referenslog för \"%s\"\n"

2139

1870 -#: builtin/checkout.c:566

2140 +#: builtin/checkout.c:567

2141 msgid "HEAD is now at"

2142 msgstr "HEAD är nu på"

2143

1874 -#: builtin/checkout.c:573

2144 +#: builtin/checkout.c:574

2145 #, c-format

2146 msgid "Reset branch '%s'\n"

2147 msgstr "Återställ gren \"%s\"\n"

2148

1879 -#: builtin/checkout.c:576

2149 +#: builtin/checkout.c:577

2150 #, c-format

2151 msgid "Already on '%s'\n"

2152 msgstr "Redan på \"%s\"\n"

2153

1884 -#: builtin/checkout.c:580

2154 +#: builtin/checkout.c:581

2155 #, c-format

2156 msgid "Switched to and reset branch '%s'\n"

2157 msgstr "Växlade till och nollställde grenen \"%s\"\n"

2158

1889 -#: builtin/checkout.c:582

2159 +#: builtin/checkout.c:583

2160 #, c-format

2161 msgid "Switched to a new branch '%s'\n"

2162 msgstr "Växlade till en ny gren \"%s\"\n"

2163

1894 -#: builtin/checkout.c:584

2164 +#: builtin/checkout.c:585

2165 #, c-format

2166 msgid "Switched to branch '%s'\n"

2167 msgstr "Växlade till grenen \"%s\"\n"

2168

1899 -#: builtin/checkout.c:640

2169 +#: builtin/checkout.c:641

2170 #, c-format

2171 msgid " ... and %d more.\n"

2172 msgstr " ... och %d till.\n"

2173

2174 #. The singular version

1905 -#: builtin/checkout.c:646

2175 +#: builtin/checkout.c:647

2176 #, c-format

2177 msgid ""

2178 "Warning: you are leaving %d commit behind, not connected to\n"

@@ -1925,7 +2195,7 @@ msgstr[1] ""

2195 "\n"

2196 "%s\n"

2197

1928 -#: builtin/checkout.c:664

2198 +#: builtin/checkout.c:665

2199 #, c-format

2200 msgid ""

2201 "If you want to keep them by creating a new branch, this may be a good time\n"

@@ -1940,71 +2210,71 @@ msgstr ""

2210 " git branch nytt_grennamn %s\n"

2211 "\n"

2212

1943 -#: builtin/checkout.c:694

2213 +#: builtin/checkout.c:695

2214 msgid "internal error in revision walk"

2215 msgstr "internt fel vid genomgång av revisioner (revision walk)"

2216

1947 -#: builtin/checkout.c:698

2217 +#: builtin/checkout.c:699

2218 msgid "Previous HEAD position was"

2219 msgstr "Tidigare position för HEAD var"

2220

1951 -#: builtin/checkout.c:724

2221 +#: builtin/checkout.c:725 builtin/checkout.c:920

2222 msgid "You are on a branch yet to be born"

2223 msgstr "Du är på en gren som ännu inte är född"

2224

2225 #. case (1)

1956 -#: builtin/checkout.c:855

2226 +#: builtin/checkout.c:856

2227 #, c-format

2228 msgid "invalid reference: %s"

2229 msgstr "felaktig referens: %s"

2230

2231 #. case (1): want a tree

1962 -#: builtin/checkout.c:894

2232 +#: builtin/checkout.c:895

2233 #, c-format

2234 msgid "reference is not a tree: %s"

2235 msgstr "referensen är inte ett träd: %s"

2236

1967 -#: builtin/checkout.c:974

2237 +#: builtin/checkout.c:977

2238 msgid "-B cannot be used with -b"

2239 msgstr "-B kan inte användas med -b"

2240

1971 -#: builtin/checkout.c:983

2241 +#: builtin/checkout.c:986

2242 msgid "--patch is incompatible with all other options"

2243 msgstr "--patch är inkompatibel med alla andra flaggor"

2244

1975 -#: builtin/checkout.c:986

2245 +#: builtin/checkout.c:989

2246 msgid "--detach cannot be used with -b/-B/--orphan"

2247 msgstr "--detcah kan inte användas med -b/-B/--orphan"

2248

1979 -#: builtin/checkout.c:988

2249 +#: builtin/checkout.c:991

2250 msgid "--detach cannot be used with -t"

2251 msgstr "--detach kan inte användas med -t"

2252

1983 -#: builtin/checkout.c:994

2253 +#: builtin/checkout.c:997

2254 msgid "--track needs a branch name"

2255 msgstr "--track behöver ett namn på en gren"

2256

1987 -#: builtin/checkout.c:1001

2257 +#: builtin/checkout.c:1004

2258 msgid "Missing branch name; try -b"

2259 msgstr "Grennamn saknas; försök med -b"

2260

1991 -#: builtin/checkout.c:1007

2261 +#: builtin/checkout.c:1010

2262 msgid "--orphan and -b|-B are mutually exclusive"

2263 msgstr "--orphan och -b|-B kan inte användas samtidigt"

2264

1995 -#: builtin/checkout.c:1009

2265 +#: builtin/checkout.c:1012

2266 msgid "--orphan cannot be used with -t"

2267 msgstr "--orphan kan inte användas med -t"

2268

1999 -#: builtin/checkout.c:1019

2269 +#: builtin/checkout.c:1022

2270 msgid "git checkout: -f and -m are incompatible"

2271 msgstr "git checkout: -f och -m är inkompatibla"

2272

2003 -#: builtin/checkout.c:1053

2273 +#: builtin/checkout.c:1056

2274 msgid "invalid path specification"

2275 msgstr "felaktig sökvägsangivelse"

2276

2007 -#: builtin/checkout.c:1061

2277 +#: builtin/checkout.c:1064

2278 #, c-format

2279 msgid ""

2280 "git checkout: updating paths is incompatible with switching branches.\n"

@@ -2013,15 +2283,15 @@ msgstr ""

2283 "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"

2284 "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?"

2285

2016 -#: builtin/checkout.c:1063

2286 +#: builtin/checkout.c:1066

2287 msgid "git checkout: updating paths is incompatible with switching branches."

2288 msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."

2289

2020 -#: builtin/checkout.c:1068

2290 +#: builtin/checkout.c:1071

2291 msgid "git checkout: --detach does not take a path argument"

2292 msgstr "git checkout: --detach tar inte en sökväg som argument"

2293

2024 -#: builtin/checkout.c:1071

2294 +#: builtin/checkout.c:1074

2295 msgid ""

2296 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"

2297 "checking out of the index."

@@ -2029,11 +2299,11 @@ msgstr ""

2299 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"

2300 "du checkar ut från indexet."

2301

2032 -#: builtin/checkout.c:1090

2302 +#: builtin/checkout.c:1093

2303 msgid "Cannot switch branch to a non-commit."

2304 msgstr "Kan inte växla gren på en icke-incheckning."

2305

2036 -#: builtin/checkout.c:1093

2306 +#: builtin/checkout.c:1096

2307 msgid "--ours/--theirs is incompatible with switching branches."

2308 msgstr "--ours/--theirs är inkompatibla med att byta gren."

2309

@@ -2086,11 +2356,6 @@ msgstr "Tar inte bort %s\n"

2356 msgid "reference repository '%s' is not a local directory."

2357 msgstr "referensarkivet \"%s\" är inte en lokal katalog."

2358

2089 -#: builtin/clone.c:302

2090 -#, c-format

2091 -msgid "failed to open '%s'"

2092 -msgstr "misslyckades öppna \"%s\""

2093 -

2359 #: builtin/clone.c:306

2360 #, c-format

2361 msgid "failed to create directory '%s'"

@@ -2131,79 +2396,79 @@ msgstr "misslyckades kopiera filen till \"%s\""

2396 msgid "done.\n"

2397 msgstr "klart.\n"

2398

2134 -#: builtin/clone.c:440

2399 +#: builtin/clone.c:443

2400 #, c-format

2401 msgid "Could not find remote branch %s to clone."

2402 msgstr "Kunde inte hitta fjärrgrenen %s för att klona."

2403

2139 -#: builtin/clone.c:549

2404 +#: builtin/clone.c:552

2405 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"

2406 msgstr ""

2407 "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"

2408

2144 -#: builtin/clone.c:639

2409 +#: builtin/clone.c:642

2410 msgid "Too many arguments."

2411 msgstr "För många argument."

2412

2148 -#: builtin/clone.c:643

2413 +#: builtin/clone.c:646

2414 msgid "You must specify a repository to clone."

2415 msgstr "Du måste ange ett arkiv att klona."

2416

2152 -#: builtin/clone.c:654

2417 +#: builtin/clone.c:657

2418 #, c-format

2419 msgid "--bare and --origin %s options are incompatible."

2420 msgstr "flaggorna --bare och --origin %s är inkompatibla."

2421

2157 -#: builtin/clone.c:668

2422 +#: builtin/clone.c:671

2423 #, c-format

2424 msgid "repository '%s' does not exist"

2425 msgstr "arkivet \"%s\" finns inte"

2426

2162 -#: builtin/clone.c:673

2427 +#: builtin/clone.c:676

2428 msgid "--depth is ignored in local clones; use file:// instead."

2429 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"

2430

2166 -#: builtin/clone.c:683

2431 +#: builtin/clone.c:686

2432 #, c-format

2433 msgid "destination path '%s' already exists and is not an empty directory."

2434 msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."

2435

2171 -#: builtin/clone.c:693

2436 +#: builtin/clone.c:696

2437 #, c-format

2438 msgid "working tree '%s' already exists."

2439 msgstr "arbetsträdet \"%s\" finns redan."

2440

2176 -#: builtin/clone.c:706 builtin/clone.c:720

2441 +#: builtin/clone.c:709 builtin/clone.c:723

2442 #, c-format

2443 msgid "could not create leading directories of '%s'"

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

2445

2181 -#: builtin/clone.c:709

2446 +#: builtin/clone.c:712

2447 #, c-format

2448 msgid "could not create work tree dir '%s'."

2449 msgstr "kunde inte skapa arbetskatalogen \"%s\""

2450

2186 -#: builtin/clone.c:728

2451 +#: builtin/clone.c:731

2452 #, c-format

2453 msgid "Cloning into bare repository '%s'...\n"

2454 msgstr "Klonar till ett naket arkiv \"%s\"...\n"

2455

2191 -#: builtin/clone.c:730

2456 +#: builtin/clone.c:733

2457 #, c-format

2458 msgid "Cloning into '%s'...\n"

2459 msgstr "Klonar till \"%s\"...\n"

2460

2196 -#: builtin/clone.c:786

2461 +#: builtin/clone.c:789

2462 #, c-format

2463 msgid "Don't know how to clone %s"

2464 msgstr "Vet inte hur man klonar %s"

2465

2201 -#: builtin/clone.c:835

2466 +#: builtin/clone.c:838

2467 #, c-format

2468 msgid "Remote branch %s not found in upstream %s"

2469 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"

2470

2206 -#: builtin/clone.c:842

2471 +#: builtin/clone.c:845

2472 msgid "You appear to have cloned an empty repository."

2473 msgstr "Du verkar ha klonat ett tomt arkiv."

2474

@@ -2262,93 +2527,93 @@ msgstr ""

2527 "\n"

2528 "Annars använder du \"git reset\"\n"

2529

2265 -#: builtin/commit.c:253

2530 +#: builtin/commit.c:256

2531 msgid "failed to unpack HEAD tree object"

2532 msgstr "misslyckades packa upp HEAD:s trädobjekt"

2533

2269 -#: builtin/commit.c:295

2534 +#: builtin/commit.c:298

2535 msgid "unable to create temporary index"

2536 msgstr "kunde inte skapa temporär indexfil"

2537

2273 -#: builtin/commit.c:301

2538 +#: builtin/commit.c:304

2539 msgid "interactive add failed"

2540 msgstr "interaktiv tilläggning misslyckades"

2541

2277 -#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405

2542 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408

2543 msgid "unable to write new_index file"

2544 msgstr "kunde inte skriva filen new_index"

2545

2281 -#: builtin/commit.c:386

2546 +#: builtin/commit.c:389

2547 msgid "cannot do a partial commit during a merge."

2548 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."

2549

2285 -#: builtin/commit.c:388

2550 +#: builtin/commit.c:391

2551 msgid "cannot do a partial commit during a cherry-pick."

2552 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."

2553

2289 -#: builtin/commit.c:398

2554 +#: builtin/commit.c:401

2555 msgid "cannot read the index"

2556 msgstr "kan inte läsa indexet"

2557

2293 -#: builtin/commit.c:418

2558 +#: builtin/commit.c:421

2559 msgid "unable to write temporary index file"

2560 msgstr "kunde inte skriva temporär indexfil"

2561

2297 -#: builtin/commit.c:493 builtin/commit.c:499

2562 +#: builtin/commit.c:496 builtin/commit.c:502

2563 #, c-format

2564 msgid "invalid commit: %s"

2565 msgstr "felaktig incheckning: %s"

2566

2302 -#: builtin/commit.c:522

2567 +#: builtin/commit.c:525

2568 msgid "malformed --author parameter"

2569 msgstr "felformad \"--author\"-flagga"

2570

2306 -#: builtin/commit.c:582

2571 +#: builtin/commit.c:585

2572 #, c-format

2573 msgid "Malformed ident string: '%s'"

2574 msgstr "Felaktig indragningssträng: \"%s\""

2575

2311 -#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967

2576 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970

2577 #, c-format

2578 msgid "could not lookup commit %s"

2579 msgstr "kunde inte slå upp incheckningen %s"

2580

2316 -#: builtin/commit.c:632 builtin/shortlog.c:296

2581 +#: builtin/commit.c:635 builtin/shortlog.c:296

2582 #, c-format

2583 msgid "(reading log message from standard input)\n"

2584 msgstr "(läser loggmeddelande från standard in)\n"

2585

2321 -#: builtin/commit.c:634

2586 +#: builtin/commit.c:637

2587 msgid "could not read log from standard input"

2588 msgstr "kunde inte läsa logg från standard in"

2589

2325 -#: builtin/commit.c:638

2590 +#: builtin/commit.c:641

2591 #, c-format

2592 msgid "could not read log file '%s'"

2593 msgstr "kunde inte läsa loggfilen \"%s\""

2594

2330 -#: builtin/commit.c:644

2595 +#: builtin/commit.c:647

2596 msgid "commit has empty message"

2597 msgstr "incheckningen har ett tomt meddelande"

2598

2334 -#: builtin/commit.c:660

2599 +#: builtin/commit.c:663

2600 msgid "could not read MERGE_MSG"

2601 msgstr "kunde inte läsa MERGE_MSG"

2602

2338 -#: builtin/commit.c:664

2603 +#: builtin/commit.c:667

2604 msgid "could not read SQUASH_MSG"

2605 msgstr "kunde inte läsa SQUASH_MSG"

2606

2342 -#: builtin/commit.c:668

2607 +#: builtin/commit.c:671

2608 #, c-format

2609 msgid "could not read '%s'"

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

2611

2347 -#: builtin/commit.c:720

2612 +#: builtin/commit.c:723

2613 msgid "could not write commit template"

2614 msgstr "kunde inte skriva incheckningsmall"

2615

2351 -#: builtin/commit.c:731

2616 +#: builtin/commit.c:734

2617 #, c-format

2618 msgid ""

2619 "\n"

@@ -2363,7 +2628,7 @@ msgstr ""

2628 "\t%s\n"

2629 "och försöker igen.\n"

2630

2366 -#: builtin/commit.c:736

2631 +#: builtin/commit.c:739

2632 #, c-format

2633 msgid ""

2634 "\n"

@@ -2378,7 +2643,7 @@ msgstr ""

2643 "\t%s\n"

2644 "och försöker igen.\n"

2645

2381 -#: builtin/commit.c:748

2646 +#: builtin/commit.c:751

2647 msgid ""

2648 "Please enter the commit message for your changes. Lines starting\n"

2649 "with '#' will be ignored, and an empty message aborts the commit.\n"

@@ -2386,7 +2651,7 @@ msgstr ""

2651 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"

2652 "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"

2653

2389 -#: builtin/commit.c:753

2654 +#: builtin/commit.c:756

2655 msgid ""

2656 "Please enter the commit message for your changes. Lines starting\n"

2657 "with '#' will be kept; you may remove them yourself if you want to.\n"

@@ -2396,159 +2661,159 @@ msgstr ""

2661 "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"

2662 "Ett tomt meddelande avbryter incheckningen.\n"

2663

2399 -#: builtin/commit.c:766

2664 +#: builtin/commit.c:769

2665 #, c-format

2666 msgid "%sAuthor: %s"

2667 msgstr "%sFörfattare: %s"

2668

2404 -#: builtin/commit.c:773

2669 +#: builtin/commit.c:776

2670 #, c-format

2671 msgid "%sCommitter: %s"

2672 msgstr "%sIncheckare: %s"

2673

2409 -#: builtin/commit.c:793

2674 +#: builtin/commit.c:796

2675 msgid "Cannot read index"

2676 msgstr "Kan inte läsa indexet"

2677

2413 -#: builtin/commit.c:830

2678 +#: builtin/commit.c:833

2679 msgid "Error building trees"

2680 msgstr "Fel vid byggande av träd"

2681

2417 -#: builtin/commit.c:845 builtin/tag.c:361

2682 +#: builtin/commit.c:848 builtin/tag.c:361

2683 #, c-format

2684 msgid "Please supply the message using either -m or -F option.\n"

2685 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"

2686

2422 -#: builtin/commit.c:942

2687 +#: builtin/commit.c:945

2688 #, c-format

2689 msgid "No existing author found with '%s'"

2690 msgstr "Hittade ingen befintlig författare med \"%s\""

2691

2427 -#: builtin/commit.c:957 builtin/commit.c:1157

2692 +#: builtin/commit.c:960 builtin/commit.c:1160

2693 #, c-format

2694 msgid "Invalid untracked files mode '%s'"

2695 msgstr "Ogiltigt läge för ospårade filer: \"%s\""

2696

2432 -#: builtin/commit.c:997

2697 +#: builtin/commit.c:1000

2698 msgid "Using both --reset-author and --author does not make sense"

2699 msgstr "Kan inte använda både --reset-author och --author"

2700

2436 -#: builtin/commit.c:1008

2701 +#: builtin/commit.c:1011

2702 msgid "You have nothing to amend."

2703 msgstr "Du har inget att utöka."

2704

2440 -#: builtin/commit.c:1011

2705 +#: builtin/commit.c:1014

2706 msgid "You are in the middle of a merge -- cannot amend."

2707 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."

2708

2444 -#: builtin/commit.c:1013

2709 +#: builtin/commit.c:1016

2710 msgid "You are in the middle of a cherry-pick -- cannot amend."

2711 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."

2712

2448 -#: builtin/commit.c:1016

2713 +#: builtin/commit.c:1019

2714 msgid "Options --squash and --fixup cannot be used together"

2715 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"

2716

2452 -#: builtin/commit.c:1026

2717 +#: builtin/commit.c:1029

2718 msgid "Only one of -c/-C/-F/--fixup can be used."

2719 msgstr "Endast en av -c/-C/-F/--fixup kan användas."

2720

2456 -#: builtin/commit.c:1028

2721 +#: builtin/commit.c:1031

2722 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."

2723 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."

2724

2460 -#: builtin/commit.c:1036

2725 +#: builtin/commit.c:1039

2726 msgid "--reset-author can be used only with -C, -c or --amend."

2727 msgstr "--reset-author kan endast användas med -C, -c eller --amend."

2728

2464 -#: builtin/commit.c:1053

2729 +#: builtin/commit.c:1056

2730 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."

2731 msgstr ""

2732 "Endast en av --include/--only/--all/--interactive/--patch kan användas."

2733

2469 -#: builtin/commit.c:1055

2734 +#: builtin/commit.c:1058

2735 msgid "No paths with --include/--only does not make sense."

2736 msgstr "Du måste ange sökvägar tillsammans med --include/--only."

2737

2473 -#: builtin/commit.c:1057

2738 +#: builtin/commit.c:1060

2739 msgid "Clever... amending the last one with dirty index."

2740 msgstr "Smart... utöka den senaste med smutsigt index."

2741

2477 -#: builtin/commit.c:1059

2742 +#: builtin/commit.c:1062

2743 msgid "Explicit paths specified without -i nor -o; assuming --only paths..."

2744 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."

2745

2481 -#: builtin/commit.c:1069 builtin/tag.c:577

2746 +#: builtin/commit.c:1072 builtin/tag.c:577

2747 #, c-format

2748 msgid "Invalid cleanup mode %s"

2749 msgstr "Felaktigt städningsläge %s"

2750

2486 -#: builtin/commit.c:1074

2751 +#: builtin/commit.c:1077

2752 msgid "Paths with -a does not make sense."

2753 msgstr "Kan inte ange sökvägar med -a."

2754

2490 -#: builtin/commit.c:1257

2755 +#: builtin/commit.c:1260

2756 msgid "couldn't look up newly created commit"

2757 msgstr "kunde inte slå upp en precis skapad incheckning"

2758

2494 -#: builtin/commit.c:1259

2759 +#: builtin/commit.c:1262

2760 msgid "could not parse newly created commit"

2761 msgstr "kunde inte tolka en precis skapad incheckning"

2762

2498 -#: builtin/commit.c:1300

2763 +#: builtin/commit.c:1303

2764 msgid "detached HEAD"

2765 msgstr "frånkopplad HEAD"

2766

2502 -#: builtin/commit.c:1302

2767 +#: builtin/commit.c:1305

2768 msgid " (root-commit)"

2769 msgstr " (rotincheckning)"

2770

2506 -#: builtin/commit.c:1446

2771 +#: builtin/commit.c:1449

2772 msgid "could not parse HEAD commit"

2773 msgstr "kunde inte tolka HEAD:s incheckning"

2774

2510 -#: builtin/commit.c:1484 builtin/merge.c:509

2775 +#: builtin/commit.c:1487 builtin/merge.c:509

2776 #, c-format

2777 msgid "could not open '%s' for reading"

2778 msgstr "kunde inte öppna \"%s\" för läsning"

2779

2515 -#: builtin/commit.c:1491

2780 +#: builtin/commit.c:1494

2781 #, c-format

2782 msgid "Corrupt MERGE_HEAD file (%s)"

2783 msgstr "Trasig MERGE_HEAD-fil (%s)"

2784

2520 -#: builtin/commit.c:1498

2785 +#: builtin/commit.c:1501

2786 msgid "could not read MERGE_MODE"

2787 msgstr "kunde inte läsa MERGE_MODE"

2788

2524 -#: builtin/commit.c:1517

2789 +#: builtin/commit.c:1520

2790 #, c-format

2791 msgid "could not read commit message: %s"

2792 msgstr "kunde inte läsa incheckningsmeddelande: %s"

2793

2529 -#: builtin/commit.c:1531

2794 +#: builtin/commit.c:1534

2795 #, c-format

2796 msgid "Aborting commit; you did not edit the message.\n"

2797 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

2798

2534 -#: builtin/commit.c:1536

2799 +#: builtin/commit.c:1539

2800 #, c-format

2801 msgid "Aborting commit due to empty commit message.\n"

2802 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"

2803

2539 -#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961

2804 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961

2805 msgid "failed to write commit object"

2806 msgstr "kunde inte skriva incheckningsobjekt"

2807

2543 -#: builtin/commit.c:1572

2808 +#: builtin/commit.c:1575

2809 msgid "cannot lock HEAD ref"

2810 msgstr "kunde inte låsa HEAD-referens"

2811

2547 -#: builtin/commit.c:1576

2812 +#: builtin/commit.c:1579

2813 msgid "cannot update HEAD ref"

2814 msgstr "kunde inte uppdatera HEAD-referens"

2815

2551 -#: builtin/commit.c:1587

2816 +#: builtin/commit.c:1590

2817 msgid ""

2818 "Repository has been updated, but unable to write\n"

2819 "new_index file. Check that disk is not full or quota is\n"

@@ -2922,30 +3187,30 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

3187 msgid "both --cached and trees are given."

3188 msgstr "både --cached och träd angavs."

3189

2925 -#: builtin/help.c:63

3190 +#: builtin/help.c:65

3191 #, c-format

3192 msgid "unrecognized help format '%s'"

3193 msgstr "okänt hjälpformat: %s"

3194

2930 -#: builtin/help.c:91

3195 +#: builtin/help.c:93

3196 msgid "Failed to start emacsclient."

3197 msgstr "Misslyckades starta emacsclient."

3198

2934 -#: builtin/help.c:104

3199 +#: builtin/help.c:106

3200 msgid "Failed to parse emacsclient version."

3201 msgstr "Kunde inte tolka emacsclient-version."

3202

2938 -#: builtin/help.c:112

3203 +#: builtin/help.c:114

3204 #, c-format

3205 msgid "emacsclient version '%d' too old (< 22)."

3206 msgstr "emacsclient version \"%d\" för gammal (< 22)."

3207

2943 -#: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175

3208 +#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177

3209 #, c-format

3210 msgid "failed to exec '%s': %s"

3211 msgstr "exec misslyckades för \"%s\": %s"

3212

2948 -#: builtin/help.c:215

3213 +#: builtin/help.c:217

3214 #, c-format

3215 msgid ""

3216 "'%s': path for unsupported man viewer.\n"

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

3219 "\"%s\": sökväg för man-visare som ej stöds.\n"

3220 "Använd \"man.<verktyg>.cmd\" istället."

3221

2957 -#: builtin/help.c:227

3222 +#: builtin/help.c:229

3223 #, c-format

3224 msgid ""

3225 "'%s': cmd for supported man viewer.\n"

@@ -2963,34 +3228,29 @@ msgstr ""

3228 "\"%s\": kommando för man-visare som stöds.\n"

3229 "Använd \"man.<verktyg>.path\" istället."

3230

2966 -#: builtin/help.c:291

3231 +#: builtin/help.c:299

3232 msgid "The most commonly used git commands are:"

3233 msgstr "De mest använda git-kommandona är:"

3234

2970 -#: builtin/help.c:359

3235 +#: builtin/help.c:367

3236 #, c-format

3237 msgid "'%s': unknown man viewer."

3238 msgstr "\"%s\": okänd man-visare."

3239

2975 -#: builtin/help.c:376

3240 +#: builtin/help.c:384

3241 msgid "no man viewer handled the request"

3242 msgstr "ingen man-visare hanterade förfrågan"

3243

2979 -#: builtin/help.c:384

3244 +#: builtin/help.c:392

3245 msgid "no info viewer handled the request"

3246 msgstr "ingen info-visare hanterade förfrågan"

3247

2983 -#: builtin/help.c:395

2984 -#, c-format

2985 -msgid "'%s': not a documentation directory."

2986 -msgstr "\"%s\": inte en dokumentationskatalog."

2987 -

2988 -#: builtin/help.c:436 builtin/help.c:443

3248 +#: builtin/help.c:447 builtin/help.c:454

3249 #, c-format

3250 msgid "usage: %s%s"

3251 msgstr "användning: %s%s"

3252

2993 -#: builtin/help.c:459

3253 +#: builtin/help.c:470

3254 #, c-format

3255 msgid "`git %s' is aliased to `%s'"

3256 msgstr "\"git %s\" är ett alias för \"%s\""

@@ -3064,176 +3324,176 @@ msgstr "deltabasindex utanför gränsen"

3324 msgid "unknown object type %d"

3325 msgstr "okänd objekttyp %d"

3326

3067 -#: builtin/index-pack.c:531

3327 +#: builtin/index-pack.c:530

3328 msgid "cannot pread pack file"

3329 msgstr "kan inte utföra \"pread\" på paketfil"

3330

3071 -#: builtin/index-pack.c:533

3331 +#: builtin/index-pack.c:532

3332 #, c-format

3333 msgid "premature end of pack file, %lu byte missing"

3334 msgid_plural "premature end of pack file, %lu bytes missing"

3335 msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"

3336 msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"

3337

3078 -#: builtin/index-pack.c:555

3338 +#: builtin/index-pack.c:558

3339 msgid "serious inflate inconsistency"

3340 msgstr "allvarlig inflate-inkonsekvens"

3341

3082 -#: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675

3083 -#: builtin/index-pack.c:709 builtin/index-pack.c:718

3342 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678

3343 +#: builtin/index-pack.c:712 builtin/index-pack.c:721

3344 #, c-format

3345 msgid "SHA1 COLLISION FOUND WITH %s !"

3346 msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"

3347

3088 -#: builtin/index-pack.c:649 builtin/pack-objects.c:170

3348 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170

3349 #: builtin/pack-objects.c:262

3350 #, c-format

3351 msgid "unable to read %s"

3352 msgstr "kunde inte läsa %s"

3353

3094 -#: builtin/index-pack.c:715

3354 +#: builtin/index-pack.c:718

3355 #, c-format

3356 msgid "cannot read existing object %s"

3357 msgstr "kan inte läsa befintligt objekt %s"

3358

3099 -#: builtin/index-pack.c:729

3359 +#: builtin/index-pack.c:732

3360 #, c-format

3361 msgid "invalid blob object %s"

3362 msgstr "ogiltigt blob-objekt %s"

3363

3104 -#: builtin/index-pack.c:744

3364 +#: builtin/index-pack.c:747

3365 #, c-format

3366 msgid "invalid %s"

3367 msgstr "ogiltigt %s"

3368

3109 -#: builtin/index-pack.c:746

3369 +#: builtin/index-pack.c:749

3370 msgid "Error in object"

3371 msgstr "Fel i objekt"

3372

3113 -#: builtin/index-pack.c:748

3373 +#: builtin/index-pack.c:751

3374 #, c-format

3375 msgid "Not all child objects of %s are reachable"

3376 msgstr "Inte alla barnobjekt för %s kan nås"

3377

3118 -#: builtin/index-pack.c:818 builtin/index-pack.c:844

3378 +#: builtin/index-pack.c:821 builtin/index-pack.c:847

3379 msgid "failed to apply delta"

3380 msgstr "misslyckades tillämpa delta"

3381

3122 -#: builtin/index-pack.c:983

3382 +#: builtin/index-pack.c:986

3383 msgid "Receiving objects"

3384 msgstr "Tar bort objeckt"

3385

3126 -#: builtin/index-pack.c:983

3386 +#: builtin/index-pack.c:986

3387 msgid "Indexing objects"

3388 msgstr "Skapar index för objekt"

3389

3130 -#: builtin/index-pack.c:1009

3390 +#: builtin/index-pack.c:1012

3391 msgid "pack is corrupted (SHA1 mismatch)"

3392 msgstr "paketet är trasigt (SHA1 stämmer inte)"

3393

3134 -#: builtin/index-pack.c:1014

3394 +#: builtin/index-pack.c:1017

3395 msgid "cannot fstat packfile"

3396 msgstr "kan inte utföra \"fstat\" på paketfil"

3397

3138 -#: builtin/index-pack.c:1017

3398 +#: builtin/index-pack.c:1020

3399 msgid "pack has junk at the end"

3400 msgstr "paket har skräp i slutet"

3401

3142 -#: builtin/index-pack.c:1028

3402 +#: builtin/index-pack.c:1031

3403 msgid "confusion beyond insanity in parse_pack_objects()"

3404 msgstr "förvirrad bortom vanvett i parse_pack_objects()"

3405

3146 -#: builtin/index-pack.c:1051

3406 +#: builtin/index-pack.c:1054

3407 msgid "Resolving deltas"

3408 msgstr "Analyserar delta"

3409

3150 -#: builtin/index-pack.c:1102

3410 +#: builtin/index-pack.c:1105

3411 msgid "confusion beyond insanity"

3412 msgstr "förvirrad bortom vanvett"

3413

3154 -#: builtin/index-pack.c:1121

3414 +#: builtin/index-pack.c:1124

3415 #, c-format

3416 msgid "pack has %d unresolved delta"

3417 msgid_plural "pack has %d unresolved deltas"

3418 msgstr[0] "paketet har %d oanalyserat delta"

3419 msgstr[1] "paketet har %d oanalyserade delta"

3420

3161 -#: builtin/index-pack.c:1146

3421 +#: builtin/index-pack.c:1149

3422 #, c-format

3423 msgid "unable to deflate appended object (%d)"

3424 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"

3425

3166 -#: builtin/index-pack.c:1225

3426 +#: builtin/index-pack.c:1228

3427 #, c-format

3428 msgid "local object %s is corrupt"

3429 msgstr "lokalt objekt %s är trasigt"

3430

3171 -#: builtin/index-pack.c:1249

3431 +#: builtin/index-pack.c:1252

3432 msgid "error while closing pack file"

3433 msgstr "fel vid stängning av paketfil"

3434

3175 -#: builtin/index-pack.c:1262

3435 +#: builtin/index-pack.c:1265

3436 #, c-format

3437 msgid "cannot write keep file '%s'"

3438 msgstr "kan inte ta skriva \"keep\"-fil \"%s\""

3439

3180 -#: builtin/index-pack.c:1270

3440 +#: builtin/index-pack.c:1273

3441 #, c-format

3442 msgid "cannot close written keep file '%s'"

3443 msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""

3444

3185 -#: builtin/index-pack.c:1283

3445 +#: builtin/index-pack.c:1286

3446 msgid "cannot store pack file"

3447 msgstr "kan inte spara paketfil"

3448

3189 -#: builtin/index-pack.c:1294

3449 +#: builtin/index-pack.c:1297

3450 msgid "cannot store index file"

3451 msgstr "kan inte spara indexfil"

3452

3193 -#: builtin/index-pack.c:1395

3453 +#: builtin/index-pack.c:1398

3454 #, c-format

3455 msgid "Cannot open existing pack file '%s'"

3456 msgstr "Kan inte öppna befintlig paketfil \"%s\""

3457

3198 -#: builtin/index-pack.c:1397

3458 +#: builtin/index-pack.c:1400

3459 #, c-format

3460 msgid "Cannot open existing pack idx file for '%s'"

3461 msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""

3462

3203 -#: builtin/index-pack.c:1444

3463 +#: builtin/index-pack.c:1447

3464 #, c-format

3465 msgid "non delta: %d object"

3466 msgid_plural "non delta: %d objects"

3467 msgstr[0] "icke-delta: %d objekt"

3468 msgstr[1] "icke-delta: %d objekt"

3469

3210 -#: builtin/index-pack.c:1451

3470 +#: builtin/index-pack.c:1454

3471 #, c-format

3472 msgid "chain length = %d: %lu object"

3473 msgid_plural "chain length = %d: %lu objects"

3474 msgstr[0] "kedjelängd = %d: %lu objekt"

3475 msgstr[1] "kedjelängd = %d: %lu objekt"

3476

3217 -#: builtin/index-pack.c:1478

3477 +#: builtin/index-pack.c:1481

3478 msgid "Cannot come back to cwd"

3479 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"

3480

3221 -#: builtin/index-pack.c:1522 builtin/index-pack.c:1525

3222 -#: builtin/index-pack.c:1537 builtin/index-pack.c:1541

3481 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528

3482 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544

3483 #, c-format

3484 msgid "bad %s"

3485 msgstr "felaktig %s"

3486

3227 -#: builtin/index-pack.c:1555

3487 +#: builtin/index-pack.c:1558

3488 msgid "--fix-thin cannot be used without --stdin"

3489 msgstr "--fix-thin kan inte användas med --stdin"

3490

3231 -#: builtin/index-pack.c:1559 builtin/index-pack.c:1569

3491 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572

3492 #, c-format

3493 msgid "packfile name '%s' does not end with '.pack'"

3494 msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""

3495

3236 -#: builtin/index-pack.c:1578

3496 +#: builtin/index-pack.c:1581

3497 msgid "--verify with no packfile name given"

3498 msgstr "--verify angavs utan paketfilnamn"

3499

@@ -3307,22 +3567,22 @@ msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""

3567 msgid "insane git directory %s"

3568 msgstr "tokig git-katalog %s"

3569

3310 -#: builtin/init-db.c:322 builtin/init-db.c:325

3570 +#: builtin/init-db.c:323 builtin/init-db.c:326

3571 #, c-format

3572 msgid "%s already exists"

3573 msgstr "%s finns redan"

3574

3315 -#: builtin/init-db.c:354

3575 +#: builtin/init-db.c:355

3576 #, c-format

3577 msgid "unable to handle file type %d"

3578 msgstr "kan inte hantera filtyp %d"

3579

3320 -#: builtin/init-db.c:357

3580 +#: builtin/init-db.c:358

3581 #, c-format

3582 msgid "unable to move %s to %s"

3583 msgstr "kan inte flytta %s till %s"

3584

3325 -#: builtin/init-db.c:362

3585 +#: builtin/init-db.c:363

3586 #, c-format

3587 msgid "Could not create git link %s"

3588 msgstr "Kunde inte skapa gitlänk %s"

@@ -3332,38 +3592,38 @@ msgstr "Kunde inte skapa gitlänk %s"

3592 #. * existing" or "Initialized empty", the second " shared" or

3593 #. * "", and the last '%s%s' is the verbatim directory name.

3594 #.

3335 -#: builtin/init-db.c:419

3595 +#: builtin/init-db.c:420

3596 #, c-format

3597 msgid "%s%s Git repository in %s%s\n"

3598 msgstr "%s%s Git-arkiv i %s%s\n"

3599

3340 -#: builtin/init-db.c:420

3600 +#: builtin/init-db.c:421

3601 msgid "Reinitialized existing"

3602 msgstr "Ominitierade befintligt"

3603

3344 -#: builtin/init-db.c:420

3604 +#: builtin/init-db.c:421

3605 msgid "Initialized empty"

3606 msgstr "Initierade tomt"

3607

3348 -#: builtin/init-db.c:421

3608 +#: builtin/init-db.c:422

3609 msgid " shared"

3610 msgstr " delat"

3611

3352 -#: builtin/init-db.c:440

3612 +#: builtin/init-db.c:441

3613 msgid "cannot tell cwd"

3614 msgstr "kan inte läsa aktuell katalog (cwd)"

3615

3356 -#: builtin/init-db.c:521 builtin/init-db.c:528

3616 +#: builtin/init-db.c:522 builtin/init-db.c:529

3617 #, c-format

3618 msgid "cannot mkdir %s"

3619 msgstr "kan inte skapa katalogen (mkdir) %s"

3620

3361 -#: builtin/init-db.c:532

3621 +#: builtin/init-db.c:533

3622 #, c-format

3623 msgid "cannot chdir to %s"

3624 msgstr "kan inte byta katalog (chdir) till %s"

3625

3366 -#: builtin/init-db.c:554

3626 +#: builtin/init-db.c:555

3627 #, c-format

3628 msgid ""

3629 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"

@@ -3372,11 +3632,11 @@ msgstr ""

3632 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"

3633 "dir=<katalog>)"

3634

3375 -#: builtin/init-db.c:578

3635 +#: builtin/init-db.c:579

3636 msgid "Cannot access current working directory"

3637 msgstr "Kan inte komma åt aktuell arbetskatalog"

3638

3379 -#: builtin/init-db.c:585

3639 +#: builtin/init-db.c:586

3640 #, c-format

3641 msgid "Cannot access work tree '%s'"

3642 msgstr "Kan inte komma åt arbetskatalogen \"%s\""

@@ -3386,95 +3646,95 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\""

3646 msgid "Final output: %d %s\n"

3647 msgstr "Slututdata: %d %s\n"

3648

3389 -#: builtin/log.c:402 builtin/log.c:490

3649 +#: builtin/log.c:403 builtin/log.c:494

3650 #, c-format

3651 msgid "Could not read object %s"

3652 msgstr "Kunde inte läsa objektet %s"

3653

3394 -#: builtin/log.c:514

3654 +#: builtin/log.c:518

3655 #, c-format

3656 msgid "Unknown type: %d"

3657 msgstr "Okänd typ: %d"

3658

3399 -#: builtin/log.c:603

3659 +#: builtin/log.c:608

3660 msgid "format.headers without value"

3661 msgstr "format.headers utan värde"

3662

3403 -#: builtin/log.c:677

3663 +#: builtin/log.c:682

3664 msgid "name of output directory is too long"

3665 msgstr "namnet på utdatakatalogen är för långt"

3666

3407 -#: builtin/log.c:688

3667 +#: builtin/log.c:693

3668 #, c-format

3669 msgid "Cannot open patch file %s"

3670 msgstr "Kan inte öppna patchfilen %s"

3671

3412 -#: builtin/log.c:702

3672 +#: builtin/log.c:707

3673 msgid "Need exactly one range."

3674 msgstr "Behöver precis ett intervall."

3675

3416 -#: builtin/log.c:710

3676 +#: builtin/log.c:715

3677 msgid "Not a range."

3678 msgstr "Inte ett intervall."

3679

3420 -#: builtin/log.c:787

3680 +#: builtin/log.c:792

3681 msgid "Cover letter needs email format"

3682 msgstr "Omslagsbrevet behöver e-postformat"

3683

3424 -#: builtin/log.c:860

3684 +#: builtin/log.c:865

3685 #, c-format

3686 msgid "insane in-reply-to: %s"

3687 msgstr "tokigt in-reply-to: %s"

3688

3429 -#: builtin/log.c:933

3689 +#: builtin/log.c:938

3690 msgid "Two output directories?"

3691 msgstr "Två utdatakataloger?"

3692

3433 -#: builtin/log.c:1154

3693 +#: builtin/log.c:1160

3694 #, c-format

3695 msgid "bogus committer info %s"

3696 msgstr "felaktig incheckarinformation %s"

3697

3438 -#: builtin/log.c:1199

3698 +#: builtin/log.c:1205

3699 msgid "-n and -k are mutually exclusive."

3700 msgstr "-n och -k kan inte användas samtidigt."

3701

3442 -#: builtin/log.c:1201

3702 +#: builtin/log.c:1207

3703 msgid "--subject-prefix and -k are mutually exclusive."

3704 msgstr "--subject-prefix och -k kan inte användas samtidigt."

3705

3446 -#: builtin/log.c:1209

3706 +#: builtin/log.c:1215

3707 msgid "--name-only does not make sense"

3708 msgstr "kan inte använda --name-only"

3709

3450 -#: builtin/log.c:1211

3710 +#: builtin/log.c:1217

3711 msgid "--name-status does not make sense"

3712 msgstr "kan inte använda --name-status"

3713

3454 -#: builtin/log.c:1213

3714 +#: builtin/log.c:1219

3715 msgid "--check does not make sense"

3716 msgstr "kan inte använda --check"

3717

3458 -#: builtin/log.c:1236

3718 +#: builtin/log.c:1242

3719 msgid "standard output, or directory, which one?"

3720 msgstr "standard ut, eller katalog, vilken skall det vara?"

3721

3462 -#: builtin/log.c:1238

3722 +#: builtin/log.c:1244

3723 #, c-format

3724 msgid "Could not create directory '%s'"

3725 msgstr "Kunde inte skapa katalogen \"%s\""

3726

3467 -#: builtin/log.c:1391

3727 +#: builtin/log.c:1397

3728 msgid "Failed to create output files"

3729 msgstr "Misslyckades skapa utdatafiler"

3730

3471 -#: builtin/log.c:1495

3731 +#: builtin/log.c:1501

3732 #, c-format

3733 msgid ""

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

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

3736

3477 -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525

3737 +#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531

3738 #, c-format

3739 msgid "Unknown commit %s"

3740 msgstr "Okänd incheckning %s"

@@ -3555,10 +3815,6 @@ msgstr "git write-tree misslyckades skriva ett träd"

3815 msgid "failed to read the cache"

3816 msgstr "misslyckads läsa cachen"

3817

3558 -#: builtin/merge.c:697

3559 -msgid "Unable to write index."

3560 -msgstr "Kunde inte skriva indexet."

3561 -

3818 #: builtin/merge.c:710

3819 msgid "Not handling anything other than two heads merge."

3820 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

@@ -4590,31 +4846,31 @@ msgstr "Oköade ändringar efter återställning:"

4846 msgid "Cannot do a %s reset in the middle of a merge."

4847 msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."

4848

4593 -#: builtin/reset.c:297

4849 +#: builtin/reset.c:303

4850 #, c-format

4851 msgid "Could not parse object '%s'."

4852 msgstr "Kan inte tolka objektet \"%s\""

4853

4598 -#: builtin/reset.c:302

4854 +#: builtin/reset.c:308

4855 msgid "--patch is incompatible with --{hard,mixed,soft}"

4856 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"

4857

4602 -#: builtin/reset.c:311

4858 +#: builtin/reset.c:317

4859 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."

4860 msgstr ""

4861 "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."

4862

4607 -#: builtin/reset.c:313

4863 +#: builtin/reset.c:319

4864 #, c-format

4865 msgid "Cannot do %s reset with paths."

4866 msgstr "Kan inte göra %s återställning med sökvägar."

4867

4612 -#: builtin/reset.c:325

4868 +#: builtin/reset.c:331

4869 #, c-format

4870 msgid "%s reset is not allowed in a bare repository"

4871 msgstr "%s återställning tillåts inte i ett naket arkiv"

4872

4617 -#: builtin/reset.c:341

4873 +#: builtin/reset.c:347

4874 #, c-format

4875 msgid "Could not reset index file to revision '%s'."

4876 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."

@@ -4953,9 +5209,9 @@ msgstr ""

5209 #: git-am.sh:105

5210 #, sh-format

5211 msgid ""

4956 -"When you have resolved this problem run \"$cmdline --resolved\".\n"

4957 -"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"

4958 -"To restore the original branch and stop patching run \"$cmdline --abort\"."

5212 +"When you have resolved this problem, run \"$cmdline --resolved\".\n"

5213 +"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"

5214 +"To restore the original branch and stop patching, run \"$cmdline --abort\"."

5215 msgstr ""

5216 "När du har löst problemet kör du \"$cmdline --resolved\".\n"

5217 "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

@@ -4971,6 +5227,10 @@ msgstr ""

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

5228 "vägssammanslagning."

5229

5230 +#: git-am.sh:139

5231 +msgid "Using index info to reconstruct a base tree..."

5232 +msgstr "Använder indexinfo för att åteskapa ett basträd..."

5233 +

5234 #: git-am.sh:154

5235 msgid ""

5236 "Did you hand edit your patch?\n"

@@ -4984,42 +5244,50 @@ msgid "Falling back to patching base and 3-way merge..."

5244 msgstr ""

5245 "Faller tillbaka på att pacha grundversionen och trevägssammanslagning..."

5246

4987 -#: git-am.sh:275

5247 +#: git-am.sh:179

5248 +msgid "Failed to merge in the changes."

5249 +msgstr "Misslyckads slå ihop ändringarna."

5250 +

5251 +#: git-am.sh:274

5252 msgid "Only one StGIT patch series can be applied at once"

5253 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

5254

4991 -#: git-am.sh:362

5255 +#: git-am.sh:361

5256 #, sh-format

5257 msgid "Patch format $patch_format is not supported."

5258 msgstr "Patchformatet $patch_format stöds inte."

5259

4996 -#: git-am.sh:364

5260 +#: git-am.sh:363

5261 msgid "Patch format detection failed."

5262 msgstr "Misslyckades detektera patchformat."

5263

5000 -#: git-am.sh:418

5001 -msgid "-d option is no longer supported. Do not use."

5002 -msgstr "Flaggan -d stöds inte lägre. Använd inte."

5264 +#: git-am.sh:389

5265 +msgid ""

5266 +"The -b/--binary option has been a no-op for long time, and\n"

5267 +"it will be removed. Please do not use it anymore."

5268 +msgstr ""

5269 +"Flaggan -b/--binary har varit utan funktion länge, och\n"

5270 +"kommer tas bort. Vi ber dig att inte använda den längre."

5271

5004 -#: git-am.sh:481

5272 +#: git-am.sh:477

5273 #, sh-format

5274 msgid "previous rebase directory $dotest still exists but mbox given."

5275 msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."

5276

5009 -#: git-am.sh:486

5277 +#: git-am.sh:482

5278 msgid "Please make up your mind. --skip or --abort?"

5279 msgstr "Bestäm dig. --skip eller --abort?"

5280

5013 -#: git-am.sh:513

5281 +#: git-am.sh:509

5282 msgid "Resolve operation not in progress, we are not resuming."

5283 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

5284

5017 -#: git-am.sh:579

5285 +#: git-am.sh:575

5286 #, sh-format

5287 msgid "Dirty index: cannot apply patches (dirty: $files)"

5288 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)"

5289

5022 -#: git-am.sh:671

5290 +#: git-am.sh:679

5291 #, sh-format

5292 msgid ""

5293 "Patch is empty. Was it split wrong?\n"

@@ -5030,32 +5298,32 @@ msgstr ""

5298 "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"

5299 "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."

5300

5033 -#: git-am.sh:708

5301 +#: git-am.sh:706

5302 msgid "Patch does not have a valid e-mail address."

5303 msgstr "Patchen har inte någon giltig e-postadress."

5304

5037 -#: git-am.sh:755

5305 +#: git-am.sh:753

5306 msgid "cannot be interactive without stdin connected to a terminal."

5307 msgstr ""

5308 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

5309

5042 -#: git-am.sh:759

5310 +#: git-am.sh:757

5311 msgid "Commit Body is:"

5312 msgstr "Incheckningskroppen är:"

5313

5314 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]

5315 #. in your translation. The program will only accept English

5316 #. input at this point.

5049 -#: git-am.sh:766

5317 +#: git-am.sh:764

5318 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "

5319 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "

5320

5053 -#: git-am.sh:802

5321 +#: git-am.sh:800

5322 #, sh-format

5323 msgid "Applying: $FIRSTLINE"

5324 msgstr "Tillämpar: $FIRSTLINE"

5325

5058 -#: git-am.sh:823

5326 +#: git-am.sh:821

5327 msgid ""

5328 "No changes - did you forget to use 'git add'?\n"

5329 "If there is nothing left to stage, chances are that something else\n"

@@ -5065,7 +5333,7 @@ msgstr ""

5333 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

5334 "introducerat samma ändringar; kanske du bör hoppa över patchen."

5335

5068 -#: git-am.sh:831

5336 +#: git-am.sh:829

5337 msgid ""

5338 "You still have unmerged paths in your index\n"

5339 "did you forget to use 'git add'?"

@@ -5073,16 +5341,16 @@ msgstr ""

5341 "Du har fortfarande sökvägar som inte slagits samman i ditt index\n"

5342 "glömde du använda \"git add\"?"

5343

5076 -#: git-am.sh:847

5344 +#: git-am.sh:845

5345 msgid "No changes -- Patch already applied."

5346 msgstr "Inga ändringar -- Patchen har redan tillämpats."

5347

5080 -#: git-am.sh:857

5348 +#: git-am.sh:855

5349 #, sh-format

5350 msgid "Patch failed at $msgnum $FIRSTLINE"

5351 msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"

5352

5085 -#: git-am.sh:873

5353 +#: git-am.sh:876

5354 msgid "applying to an empty history"

5355 msgstr "tillämpar på en tom historik"

5356

@@ -5285,6 +5553,126 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."

5553 msgid "Cannot rebase onto multiple branches"

5554 msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"

5555

5556 +#: git-rebase.sh:52

5557 +msgid ""

5558 +"When you have resolved this problem, run \"git rebase --continue\".\n"

5559 +"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"

5560 +"To check out the original branch and stop rebasing, run \"git rebase --abort"

5561 +"\"."

5562 +msgstr ""

5563 +"När du har löst problemet kör du \"git rebase --continue\".\n"

5564 +"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"

5565 +"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."

5566 +

5567 +#: git-rebase.sh:159

5568 +msgid "The pre-rebase hook refused to rebase."

5569 +msgstr "Kroken pre-rebase vägrade ombaseringen."

5570 +

5571 +#: git-rebase.sh:164

5572 +msgid "It looks like git-am is in progress. Cannot rebase."

5573 +msgstr "Det verkar som en git-am körs. Kan inte ombasera."

5574 +

5575 +#: git-rebase.sh:295

5576 +msgid "The --exec option must be used with the --interactive option"

5577 +msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"

5578 +

5579 +#: git-rebase.sh:300

5580 +msgid "No rebase in progress?"

5581 +msgstr "Ingen ombasering pågår?"

5582 +

5583 +#: git-rebase.sh:313

5584 +msgid "Cannot read HEAD"

5585 +msgstr "Kan inte läsa HEAD"

5586 +

5587 +#: git-rebase.sh:316

5588 +msgid ""

5589 +"You must edit all merge conflicts and then\n"

5590 +"mark them as resolved using git add"

5591 +msgstr ""

5592 +"Du måste redigera alla sammanslagningskonflikter och\n"

5593 +"därefter markera dem som lösta med git add"

5594 +

5595 +#: git-rebase.sh:334

5596 +#, sh-format

5597 +msgid "Could not move back to $head_name"

5598 +msgstr "Kunde inte flytta tillbaka till $head_name"

5599 +

5600 +#: git-rebase.sh:350

5601 +#, sh-format

5602 +msgid ""

5603 +"It seems that there is already a $state_dir_base directory, and\n"

5604 +"I wonder if you are in the middle of another rebase. If that is the\n"

5605 +"case, please try\n"

5606 +"\t$cmd_live_rebase\n"

5607 +"If that is not the case, please\n"

5608 +"\t$cmd_clear_stale_rebase\n"

5609 +"and run me again. I am stopping in case you still have something\n"

5610 +"valuable there."

5611 +msgstr ""

5612 +"Det verkar som katalogen $state_dir_base redan existerar, och\n"

5613 +"jag undrar om du redan är mitt i en annan ombasering. Om så är\n"

5614 +"fallet, försök\n"

5615 +"\t$cmd_live_rebase\n"

5616 +"Om så inte är fallet, kör\n"

5617 +"\t$cmd_clear_stale_rebase\n"

5618 +"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"

5619 +"något av värde där."

5620 +

5621 +#: git-rebase.sh:395

5622 +#, sh-format

5623 +msgid "invalid upstream $upstream_name"

5624 +msgstr "ogiltig uppström $upstream_name"

5625 +

5626 +#: git-rebase.sh:419

5627 +#, sh-format

5628 +msgid "$onto_name: there are more than one merge bases"

5629 +msgstr "$onto_name: mer än en sammanslagningsbas finns"

5630 +

5631 +#: git-rebase.sh:422 git-rebase.sh:426

5632 +#, sh-format

5633 +msgid "$onto_name: there is no merge base"

5634 +msgstr "$onto_name: ingen sammanslagningsbas finns"

5635 +

5636 +#: git-rebase.sh:431

5637 +#, sh-format

5638 +msgid "Does not point to a valid commit: $onto_name"

5639 +msgstr "Peka på en giltig incheckning: $onto_name"

5640 +

5641 +#: git-rebase.sh:454

5642 +#, sh-format

5643 +msgid "fatal: no such branch: $branch_name"

5644 +msgstr "ödesdigert: ingen sådan gren: $branch_name"

5645 +

5646 +#: git-rebase.sh:474

5647 +msgid "Please commit or stash them."

5648 +msgstr "Checka in eller använd \"stash\" på dem."

5649 +

5650 +#: git-rebase.sh:492

5651 +#, sh-format

5652 +msgid "Current branch $branch_name is up to date."

5653 +msgstr "Aktuell gren $branch_name är à jour."

5654 +

5655 +#: git-rebase.sh:495

5656 +#, sh-format

5657 +msgid "Current branch $branch_name is up to date, rebase forced."

5658 +msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."

5659 +

5660 +#: git-rebase.sh:506

5661 +#, sh-format

5662 +msgid "Changes from $mb to $onto:"

5663 +msgstr "Ändringar från $mb till $onto:"

5664 +

5665 +#. Detach HEAD and reset the tree

5666 +#: git-rebase.sh:515

5667 +msgid "First, rewinding head to replay your work on top of it..."

5668 +msgstr ""

5669 +"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."

5670 +

5671 +#: git-rebase.sh:523

5672 +#, sh-format

5673 +msgid "Fast-forwarded $branch_name to $onto_name."

5674 +msgstr "Snabbspolade $branch_name till $onto_name."

5675 +

5676 #: git-stash.sh:51

5677 msgid "git stash clear with parameters is unimplemented"

5678 msgstr "\"git stash clear\" med parametrar har inte implementerats"

@@ -5425,27 +5813,27 @@ msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

5813 msgstr ""

5814 "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""

5815

5428 -#: git-submodule.sh:186

5816 +#: git-submodule.sh:189

5817 #, sh-format

5818 msgid "Clone of '$url' into submodule path '$sm_path' failed"

5819 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""

5820

5433 -#: git-submodule.sh:196

5821 +#: git-submodule.sh:201

5822 #, sh-format

5823 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

5824 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"

5825

5438 -#: git-submodule.sh:285

5826 +#: git-submodule.sh:290

5827 #, sh-format

5828 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

5829 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

5830

5443 -#: git-submodule.sh:302

5831 +#: git-submodule.sh:307

5832 #, sh-format

5833 msgid "'$sm_path' already exists in the index"

5834 msgstr "\"$sm_path\" finns redan i indexet"

5835

5448 -#: git-submodule.sh:306

5836 +#: git-submodule.sh:311

5837 #, sh-format

5838 msgid ""

5839 "The following path is ignored by one of your .gitignore files:\n"

@@ -5456,64 +5844,64 @@ msgstr ""

5844 "$sm_path\n"

5845 "Använd -f om du verkligen vill lägga till den"

5846

5459 -#: git-submodule.sh:317

5847 +#: git-submodule.sh:322

5848 #, sh-format

5849 msgid "Adding existing repo at '$sm_path' to the index"

5850 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"

5851

5464 -#: git-submodule.sh:319

5852 +#: git-submodule.sh:324

5853 #, sh-format

5854 msgid "'$sm_path' already exists and is not a valid git repo"

5855 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"

5856

5469 -#: git-submodule.sh:333

5857 +#: git-submodule.sh:338

5858 #, sh-format

5859 msgid "Unable to checkout submodule '$sm_path'"

5860 msgstr "Kan inte checka ut undermodulen \"$sm_path\""

5861

5474 -#: git-submodule.sh:338

5862 +#: git-submodule.sh:343

5863 #, sh-format

5864 msgid "Failed to add submodule '$sm_path'"

5865 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""

5866

5479 -#: git-submodule.sh:343

5867 +#: git-submodule.sh:348

5868 #, sh-format

5869 msgid "Failed to register submodule '$sm_path'"

5870 msgstr "Misslyckades registrera undermodulen \"$sm_path\""

5871

5484 -#: git-submodule.sh:385

5872 +#: git-submodule.sh:390

5873 #, sh-format

5874 msgid "Entering '$prefix$sm_path'"

5875 msgstr "Går in i \"$prefix$sm_path\""

5876

5489 -#: git-submodule.sh:399

5877 +#: git-submodule.sh:404

5878 #, sh-format

5879 msgid "Stopping at '$sm_path'; script returned non-zero status."

5880 msgstr ""

5881 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."

5882

5495 -#: git-submodule.sh:442

5883 +#: git-submodule.sh:447

5884 #, sh-format

5885 msgid "No url found for submodule path '$sm_path' in .gitmodules"

5886 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"

5887

5500 -#: git-submodule.sh:451

5888 +#: git-submodule.sh:456

5889 #, sh-format

5890 msgid "Failed to register url for submodule path '$sm_path'"

5891 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""

5892

5505 -#: git-submodule.sh:453

5893 +#: git-submodule.sh:458

5894 #, sh-format

5895 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

5896 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""

5897

5510 -#: git-submodule.sh:461

5898 +#: git-submodule.sh:466

5899 #, sh-format

5900 msgid "Failed to register update mode for submodule path '$sm_path'"

5901 msgstr ""

5902 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""

5903

5516 -#: git-submodule.sh:560

5904 +#: git-submodule.sh:565

5905 #, sh-format

5906 msgid ""

5907 "Submodule path '$sm_path' not initialized\n"

@@ -5522,97 +5910,102 @@ msgstr ""

5910 "Undermodulen \"$sm_path\" har inte initierats\n"

5911 "Kanske du vill köra \"update --init\"?"

5912

5525 -#: git-submodule.sh:573

5913 +#: git-submodule.sh:578

5914 #, sh-format

5915 msgid "Unable to find current revision in submodule path '$sm_path'"

5916 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""

5917

5530 -#: git-submodule.sh:592

5918 +#: git-submodule.sh:597

5919 #, sh-format

5920 msgid "Unable to fetch in submodule path '$sm_path'"

5921 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""

5922

5535 -#: git-submodule.sh:606

5923 +#: git-submodule.sh:611

5924 #, sh-format

5925 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

5926 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""

5927

5540 -#: git-submodule.sh:607

5928 +#: git-submodule.sh:612

5929 #, sh-format

5930 msgid "Submodule path '$sm_path': rebased into '$sha1'"

5931 msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""

5932

5545 -#: git-submodule.sh:612

5933 +#: git-submodule.sh:617

5934 #, sh-format

5935 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

5936 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""

5937

5550 -#: git-submodule.sh:613

5938 +#: git-submodule.sh:618

5939 #, sh-format

5940 msgid "Submodule path '$sm_path': merged in '$sha1'"

5941 msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""

5942

5555 -#: git-submodule.sh:618

5943 +#: git-submodule.sh:623

5944 #, sh-format

5945 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

5946 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""

5947

5560 -#: git-submodule.sh:619

5948 +#: git-submodule.sh:624

5949 #, sh-format

5950 msgid "Submodule path '$sm_path': checked out '$sha1'"

5951 msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""

5952

5565 -#: git-submodule.sh:641 git-submodule.sh:964

5953 +#: git-submodule.sh:646 git-submodule.sh:969

5954 #, sh-format

5955 msgid "Failed to recurse into submodule path '$sm_path'"

5956 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

5957

5570 -#: git-submodule.sh:749

5571 -msgid "--cached cannot be used with --files"

5572 -msgstr "--cached kan inte användas med --files"

5958 +#: git-submodule.sh:754

5959 +msgid "The --cached option cannot be used with the --files option"

5960 +msgstr "Flaggan --cached kan inte användas med flaggan --files"

5961

5962 #. unexpected type

5575 -#: git-submodule.sh:789

5963 +#: git-submodule.sh:794

5964 #, sh-format

5965 msgid "unexpected mode $mod_dst"

5966 msgstr "oväntat läge $mod_dst"

5967

5580 -#: git-submodule.sh:807

5968 +#: git-submodule.sh:812

5969 #, sh-format

5970 msgid " Warn: $name doesn't contain commit $sha1_src"

5971 msgstr " Varning: $name innehåller inte incheckning $sha1_src"

5972

5585 -#: git-submodule.sh:810

5973 +#: git-submodule.sh:815

5974 #, sh-format

5975 msgid " Warn: $name doesn't contain commit $sha1_dst"

5976 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"

5977

5590 -#: git-submodule.sh:813

5978 +#: git-submodule.sh:818

5979 #, sh-format

5980 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

5981 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"

5982

5595 -#: git-submodule.sh:838

5983 +#: git-submodule.sh:843

5984 msgid "blob"

5985 msgstr "blob"

5986

5599 -#: git-submodule.sh:839

5600 -msgid "submodule"

5601 -msgstr "undermodul"

5602 -

5603 -#: git-submodule.sh:876

5987 +#: git-submodule.sh:881

5988 msgid "# Submodules changed but not updated:"

5989 msgstr "# Undermoduler ändrade men inte uppdaterade:"

5990

5607 -#: git-submodule.sh:878

5991 +#: git-submodule.sh:883

5992 msgid "# Submodule changes to be committed:"

5993 msgstr "# Undermodulers ändringar att checka in:"

5994

5611 -#: git-submodule.sh:1022

5995 +#: git-submodule.sh:1027

5996 #, sh-format

5997 msgid "Synchronizing submodule url for '$name'"

5998 msgstr "Synkroniserar undermodul-url för \"$name\""

5999

6000 +#~ msgid "%s: has been deleted/renamed"

6001 +#~ msgstr "%s: har tagits bort/ändrat namn"

6002 +

6003 +#~ msgid "'%s': not a documentation directory."

6004 +#~ msgstr "\"%s\": inte en dokumentationskatalog."

6005 +

6006 +#~ msgid "-d option is no longer supported. Do not use."

6007 +#~ msgstr "Flaggan -d stöds inte lägre. Använd inte."

6008 +

6009 #~ msgid "cherry-pick"

6010 #~ msgstr "cherry-pick"

6011

l10n: Update Swedish translation (1168t0f0u)