9a4f34bb6d · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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-08-06 23:47+0800\n"

11 -"PO-Revision-Date: 2012-08-14 09:58+0100\n"

10 +"POT-Creation-Date: 2012-09-05 06:20+0800\n"

11 +"PO-Revision-Date: 2012-09-07 10:09+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"

@@ -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:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347

61 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 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:1212 builtin/shortlog.c:284

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

89 #, c-format

90 msgid "unrecognized argument: %s"

91 msgstr "okänt argument: %s"

@@ -230,32 +230,32 @@ msgstr ""

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

231 "%s"

232

233 -#: diff.c:1400

233 +#: diff.c:1401

234 msgid " 0 files changed"

235 msgstr " 0 filer ändrade"

236

237 -#: diff.c:1404

237 +#: diff.c:1405

238 #, c-format

239 msgid " %d file changed"

240 msgid_plural " %d files changed"

241 msgstr[0] " %d fil ändrad"

242 msgstr[1] " %d filer ändrade"

243

244 -#: diff.c:1421

244 +#: diff.c:1422

245 #, c-format

246 msgid ", %d insertion(+)"

247 msgid_plural ", %d insertions(+)"

248 msgstr[0] ", %d tillägg(+)"

249 msgstr[1] ", %d tillägg(+)"

250

251 -#: diff.c:1432

251 +#: diff.c:1433

252 #, c-format

253 msgid ", %d deletion(-)"

254 msgid_plural ", %d deletions(-)"

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

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

257

258 -#: diff.c:3461

258 +#: diff.c:3460

259 #, c-format

260 msgid ""

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

@@ -360,74 +360,66 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

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

363 +#: merge-recursive.c:672

364 #, c-format

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

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

367

376 -#: merge-recursive.c:701

368 +#: merge-recursive.c:683

369 #, c-format

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

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

372

373 #. something else exists

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

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

375 +#: merge-recursive.c:697 merge-recursive.c:718

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

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

378

387 -#: merge-recursive.c:726

379 +#: merge-recursive.c:708

380 #, c-format

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

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

383

392 -#: merge-recursive.c:766

384 +#: merge-recursive.c:748

385 #, c-format

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

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

388

397 -#: merge-recursive.c:768

389 +#: merge-recursive.c:750

390 #, c-format

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

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

393

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

394 +#: merge-recursive.c:773 builtin/clone.c:302

395 #, c-format

396 msgid "failed to open '%s'"

397 msgstr "misslyckades öppna \"%s\""

398

407 -#: merge-recursive.c:799

399 +#: merge-recursive.c:781

400 #, c-format

401 msgid "failed to symlink '%s'"

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

403

412 -#: merge-recursive.c:802

404 +#: merge-recursive.c:784

405 #, c-format

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

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

408

417 -#: merge-recursive.c:939

409 +#: merge-recursive.c:921

410 msgid "Failed to execute internal merge"

411 msgstr "Misslyckades exekvera intern sammanslagning"

412

421 -#: merge-recursive.c:943

413 +#: merge-recursive.c:925

414 #, c-format

415 msgid "Unable to add %s to database"

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

417

426 -#: merge-recursive.c:959

418 +#: merge-recursive.c:941

419 msgid "unsupported object type in the tree"

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

421

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

422 +#: merge-recursive.c:1020 merge-recursive.c:1034

423 #, c-format

424 msgid ""

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

@@ -436,7 +428,7 @@ msgstr ""

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

429 "i trädet."

430

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

431 +#: merge-recursive.c:1026 merge-recursive.c:1039

432 #, c-format

433 msgid ""

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

@@ -445,20 +437,20 @@ msgstr ""

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

438 "i trädet vid %s."

439

448 -#: merge-recursive.c:1098

440 +#: merge-recursive.c:1080

441 msgid "rename"

442 msgstr "namnbyte"

443

452 -#: merge-recursive.c:1098

444 +#: merge-recursive.c:1080

445 msgid "renamed"

446 msgstr "namnbytt"

447

456 -#: merge-recursive.c:1154

448 +#: merge-recursive.c:1136

449 #, c-format

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

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

452

461 -#: merge-recursive.c:1176

453 +#: merge-recursive.c:1158

454 #, c-format

455 msgid ""

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

@@ -467,144 +459,144 @@ msgstr ""

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

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

461

470 -#: merge-recursive.c:1181

462 +#: merge-recursive.c:1163

463 msgid " (left unresolved)"

464 msgstr " (lämnad olöst)"

465

474 -#: merge-recursive.c:1235

466 +#: merge-recursive.c:1217

467 #, c-format

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

469 msgstr ""

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

471

480 -#: merge-recursive.c:1265

472 +#: merge-recursive.c:1247

473 #, c-format

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

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

476

485 -#: merge-recursive.c:1464

477 +#: merge-recursive.c:1446

478 #, c-format

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

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

481

490 -#: merge-recursive.c:1474

482 +#: merge-recursive.c:1456

483 #, c-format

484 msgid "Adding merged %s"

485 msgstr "Lägger till sammanslagen %s"

486

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

487 +#: merge-recursive.c:1461 merge-recursive.c:1659

488 #, c-format

489 msgid "Adding as %s instead"

490 msgstr "Lägger till som %s iställer"

491

500 -#: merge-recursive.c:1530

492 +#: merge-recursive.c:1512

493 #, c-format

494 msgid "cannot read object %s"

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

496

505 -#: merge-recursive.c:1533

497 +#: merge-recursive.c:1515

498 #, c-format

499 msgid "object %s is not a blob"

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

501

510 -#: merge-recursive.c:1581

502 +#: merge-recursive.c:1563

503 msgid "modify"

504 msgstr "ändra"

505

514 -#: merge-recursive.c:1581

506 +#: merge-recursive.c:1563

507 msgid "modified"

508 msgstr "ändrad"

509

518 -#: merge-recursive.c:1591

510 +#: merge-recursive.c:1573

511 msgid "content"

512 msgstr "innehåll"

513

522 -#: merge-recursive.c:1598

514 +#: merge-recursive.c:1580

515 msgid "add/add"

516 msgstr "tillägg/tillägg"

517

526 -#: merge-recursive.c:1632

518 +#: merge-recursive.c:1614

519 #, c-format

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

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

522

531 -#: merge-recursive.c:1646

523 +#: merge-recursive.c:1628

524 #, c-format

525 msgid "Auto-merging %s"

526 msgstr "Slår ihop %s automatiskt"

527

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

528 +#: merge-recursive.c:1632 git-submodule.sh:869

529 msgid "submodule"

530 msgstr "undermodul"

531

540 -#: merge-recursive.c:1651

532 +#: merge-recursive.c:1633

533 #, c-format

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

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

536

545 -#: merge-recursive.c:1741

537 +#: merge-recursive.c:1723

538 #, c-format

539 msgid "Removing %s"

540 msgstr "Tar bort %s"

541

550 -#: merge-recursive.c:1766

542 +#: merge-recursive.c:1748

543 msgid "file/directory"

544 msgstr "fil/katalog"

545

554 -#: merge-recursive.c:1772

546 +#: merge-recursive.c:1754

547 msgid "directory/file"

548 msgstr "katalog/fil"

549

558 -#: merge-recursive.c:1777

550 +#: merge-recursive.c:1759

551 #, c-format

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

553 msgstr ""

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

555

564 -#: merge-recursive.c:1787

556 +#: merge-recursive.c:1769

557 #, c-format

558 msgid "Adding %s"

559 msgstr "Lägger till %s"

560

569 -#: merge-recursive.c:1804

561 +#: merge-recursive.c:1786

562 msgid "Fatal merge failure, shouldn't happen."

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

564

573 -#: merge-recursive.c:1823

565 +#: merge-recursive.c:1805

566 msgid "Already up-to-date!"

567 msgstr "Redan à jour!"

568

577 -#: merge-recursive.c:1832

569 +#: merge-recursive.c:1814

570 #, c-format

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

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

573

582 -#: merge-recursive.c:1862

574 +#: merge-recursive.c:1844

575 #, c-format

576 msgid "Unprocessed path??? %s"

577 msgstr "Obehandlad sökväg??? %s"

578

587 -#: merge-recursive.c:1907

579 +#: merge-recursive.c:1889

580 msgid "Merging:"

581 msgstr "Slår ihop:"

582

591 -#: merge-recursive.c:1920

583 +#: merge-recursive.c:1902

584 #, c-format

585 msgid "found %u common ancestor:"

586 msgid_plural "found %u common ancestors:"

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

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

589

598 -#: merge-recursive.c:1957

590 +#: merge-recursive.c:1939

591 msgid "merge returned no commit"

592 msgstr "sammanslagningen returnerade ingen incheckning"

593

602 -#: merge-recursive.c:2014

594 +#: merge-recursive.c:1996

595 #, c-format

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

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

598

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

599 +#: merge-recursive.c:2008 builtin/merge.c:696

600 msgid "Unable to write index."

601 msgstr "Kunde inte skriva indexet."

602

@@ -661,14 +653,14 @@ msgstr[1] ""

653 "Din gren och \"%s\" har divergerat,\n"

654 "och har %d respektive %d olika incheckningar.\n"

655

664 -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978

665 -#: builtin/merge.c:1088 builtin/merge.c:1098

656 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977

657 +#: builtin/merge.c:1087 builtin/merge.c:1097

658 #, c-format

659 msgid "Could not open '%s' for writing"

660 msgstr "Kunde inte öppna \"%s\" för skrivning"

661

670 -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868

671 -#: builtin/merge.c:1090 builtin/merge.c:1103

662 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867

663 +#: builtin/merge.c:1089 builtin/merge.c:1102

664 #, c-format

665 msgid "Could not write to '%s'"

666 msgstr "Kunde inte skriva till \"%s\""

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

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

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

864

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

865 +#: sequencer.c:805 builtin/apply.c:3987

866 #, c-format

867 msgid "cannot open %s: %s"

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

@@ -1270,6 +1262,11 @@ msgstr "före "

1262 msgid ", behind "

1263 msgstr ", efter "

1264

1265 +#: compat/precompose_utf8.c:58 builtin/clone.c:341

1266 +#, c-format

1267 +msgid "failed to unlink '%s'"

1268 +msgstr "misslyckades ta bort länken \"%s\""

1269 +

1270 #: builtin/add.c:62

1271 #, c-format

1272 msgid "unexpected diff status %c"

@@ -1370,7 +1367,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n"

1367 msgid "index file corrupt"

1368 msgstr "indexfilen trasig"

1369

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

1370 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260

1371 msgid "Unable to write new index file"

1372 msgstr "Kunde inte skriva ny indexfil"

1373

@@ -1388,52 +1385,52 @@ msgstr "okänt alternativ för whitespace: \"%s\""

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

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

1387

1391 -#: builtin/apply.c:824

1388 +#: builtin/apply.c:823

1389 #, c-format

1390 msgid "Cannot prepare timestamp regexp %s"

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

1392

1396 -#: builtin/apply.c:833

1393 +#: builtin/apply.c:832

1394 #, c-format

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

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

1397

1401 -#: builtin/apply.c:914

1398 +#: builtin/apply.c:913

1399 #, c-format

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

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

1402

1406 -#: builtin/apply.c:946

1403 +#: builtin/apply.c:945

1404 #, c-format

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

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

1407

1411 -#: builtin/apply.c:950

1408 +#: builtin/apply.c:949

1409 #, c-format

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

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

1412

1416 -#: builtin/apply.c:951

1413 +#: builtin/apply.c:950

1414 #, c-format

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

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

1417

1421 -#: builtin/apply.c:958

1418 +#: builtin/apply.c:957

1419 #, c-format

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

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

1422

1426 -#: builtin/apply.c:1403

1423 +#: builtin/apply.c:1402

1424 #, c-format

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

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

1427

1431 -#: builtin/apply.c:1460

1428 +#: builtin/apply.c:1459

1429 #, c-format

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

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

1432

1436 -#: builtin/apply.c:1477

1433 +#: builtin/apply.c:1476

1434 #, c-format

1435 msgid ""

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

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

1446 "sökvägskomponenter\n"

1447 "tas bort (rad %d)"

1448

1452 -#: builtin/apply.c:1637

1449 +#: builtin/apply.c:1636

1450 msgid "new file depends on old contents"

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

1452

1456 -#: builtin/apply.c:1639

1453 +#: builtin/apply.c:1638

1454 msgid "deleted file still has contents"

1455 msgstr "borttagen fil har fortfarande innehåll"

1456

1460 -#: builtin/apply.c:1665

1457 +#: builtin/apply.c:1664

1458 #, c-format

1459 msgid "corrupt patch at line %d"

1460 msgstr "trasig patch på rad %d"

1461

1465 -#: builtin/apply.c:1701

1462 +#: builtin/apply.c:1700

1463 #, c-format

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

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

1466

1470 -#: builtin/apply.c:1703

1467 +#: builtin/apply.c:1702

1468 #, c-format

1469 msgid "deleted file %s still has contents"

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

1471

1475 -#: builtin/apply.c:1706

1472 +#: builtin/apply.c:1705

1473 #, c-format

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

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

1476

1480 -#: builtin/apply.c:1852

1477 +#: builtin/apply.c:1851

1478 #, c-format

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

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

1481

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

1486 -#: builtin/apply.c:1881

1483 +#: builtin/apply.c:1880

1484 #, c-format

1485 msgid "unrecognized binary patch at line %d"

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

1487

1491 -#: builtin/apply.c:1967

1488 +#: builtin/apply.c:1966

1489 #, c-format

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

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

1492

1496 -#: builtin/apply.c:2057

1493 +#: builtin/apply.c:2056

1494 #, c-format

1495 msgid "unable to read symlink %s"

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

1497

1501 -#: builtin/apply.c:2061

1498 +#: builtin/apply.c:2060

1499 #, c-format

1500 msgid "unable to open or read %s"

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

1502

1506 -#: builtin/apply.c:2132

1503 +#: builtin/apply.c:2131

1504 msgid "oops"

1505 msgstr "hoppsan"

1506

1510 -#: builtin/apply.c:2654

1507 +#: builtin/apply.c:2653

1508 #, c-format

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

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

1511

1515 -#: builtin/apply.c:2772

1512 +#: builtin/apply.c:2771

1513 #, c-format

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

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

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

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

1518

1522 -#: builtin/apply.c:2784

1519 +#: builtin/apply.c:2783

1520 #, c-format

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

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

1523

1527 -#: builtin/apply.c:2790

1524 +#: builtin/apply.c:2789

1525 #, c-format

1526 msgid ""

1527 "while searching for:\n"

@@ -1533,321 +1530,321 @@ msgstr ""

1530 "vid sökning efter:\n"

1531 "%.*s"

1532

1536 -#: builtin/apply.c:2809

1533 +#: builtin/apply.c:2808

1534 #, c-format

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

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

1537

1541 -#: builtin/apply.c:2912

1538 +#: builtin/apply.c:2911

1539 #, c-format

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

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

1542

1546 -#: builtin/apply.c:2918

1543 +#: builtin/apply.c:2917

1544 #, c-format

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

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

1547

1551 -#: builtin/apply.c:2939

1548 +#: builtin/apply.c:2938

1549 #, c-format

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

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

1552

1556 -#: builtin/apply.c:3061

1553 +#: builtin/apply.c:3060

1554 #, c-format

1555 msgid "cannot checkout %s"

1556 msgstr "kan inte checka ut %s"

1557

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

1558 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158

1559 #, c-format

1560 msgid "read of %s failed"

1561 msgstr "misslyckades läsa %s"

1562

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

1563 +#: builtin/apply.c:3138 builtin/apply.c:3360

1564 #, c-format

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

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

1567

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

1568 +#: builtin/apply.c:3219 builtin/apply.c:3374

1569 #, c-format

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

1571 msgstr "%s: finns inte i indexet"

1572

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

1573 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388

1574 #, c-format

1575 msgid "%s: %s"

1576 msgstr "%s: %s"

1577

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

1578 +#: builtin/apply.c:3228 builtin/apply.c:3382

1579 #, c-format

1580 msgid "%s: does not match index"

1581 msgstr "%s: motsvarar inte indexet"

1582

1586 -#: builtin/apply.c:3331

1583 +#: builtin/apply.c:3330

1584 msgid "removal patch leaves file contents"

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

1586

1590 -#: builtin/apply.c:3400

1587 +#: builtin/apply.c:3399

1588 #, c-format

1589 msgid "%s: wrong type"

1590 msgstr "%s: fel typ"

1591

1595 -#: builtin/apply.c:3402

1592 +#: builtin/apply.c:3401

1593 #, c-format

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

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

1596

1600 -#: builtin/apply.c:3503

1597 +#: builtin/apply.c:3502

1598 #, c-format

1599 msgid "%s: already exists in index"

1600 msgstr "%s: finns redan i indexet"

1601

1605 -#: builtin/apply.c:3506

1602 +#: builtin/apply.c:3505

1603 #, c-format

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

1605 msgstr "%s: finns redan i arbetskatalogen"

1606

1610 -#: builtin/apply.c:3526

1607 +#: builtin/apply.c:3525

1608 #, c-format

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

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

1611

1615 -#: builtin/apply.c:3531

1612 +#: builtin/apply.c:3530

1613 #, c-format

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

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

1616

1620 -#: builtin/apply.c:3539

1617 +#: builtin/apply.c:3538

1618 #, c-format

1619 msgid "%s: patch does not apply"

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

1621

1625 -#: builtin/apply.c:3552

1622 +#: builtin/apply.c:3551

1623 #, c-format

1624 msgid "Checking patch %s..."

1625 msgstr "Kontrollerar patchen %s..."

1626

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

1627 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158

1628 #, c-format

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

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

1631

1635 -#: builtin/apply.c:3750

1632 +#: builtin/apply.c:3749

1633 #, c-format

1634 msgid "unable to remove %s from index"

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

1636

1640 -#: builtin/apply.c:3778

1637 +#: builtin/apply.c:3777

1638 #, c-format

1639 msgid "corrupt patch for subproject %s"

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

1641

1645 -#: builtin/apply.c:3782

1642 +#: builtin/apply.c:3781

1643 #, c-format

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

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

1646

1650 -#: builtin/apply.c:3787

1647 +#: builtin/apply.c:3786

1648 #, c-format

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

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

1651

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

1652 +#: builtin/apply.c:3789 builtin/apply.c:3897

1653 #, c-format

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

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

1656

1660 -#: builtin/apply.c:3823

1657 +#: builtin/apply.c:3822

1658 #, c-format

1659 msgid "closing file '%s'"

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

1661

1665 -#: builtin/apply.c:3872

1662 +#: builtin/apply.c:3871

1663 #, c-format

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

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

1666

1670 -#: builtin/apply.c:3959

1667 +#: builtin/apply.c:3958

1668 #, c-format

1669 msgid "Applied patch %s cleanly."

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

1671

1675 -#: builtin/apply.c:3967

1672 +#: builtin/apply.c:3966

1673 msgid "internal error"

1674 msgstr "internt fel"

1675

1676 #. Say this even without --verbose

1680 -#: builtin/apply.c:3970

1677 +#: builtin/apply.c:3969

1678 #, c-format

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

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

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

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

1683

1687 -#: builtin/apply.c:3980

1684 +#: builtin/apply.c:3979

1685 #, c-format

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

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

1688

1692 -#: builtin/apply.c:4001

1689 +#: builtin/apply.c:4000

1690 #, c-format

1691 msgid "Hunk #%d applied cleanly."

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

1693

1697 -#: builtin/apply.c:4004

1694 +#: builtin/apply.c:4003

1695 #, c-format

1696 msgid "Rejected hunk #%d."

1697 msgstr "Refuserar stycke %d."

1698

1702 -#: builtin/apply.c:4154

1699 +#: builtin/apply.c:4153

1700 msgid "unrecognized input"

1701 msgstr "indata känns inte igen"

1702

1706 -#: builtin/apply.c:4165

1703 +#: builtin/apply.c:4164

1704 msgid "unable to read index file"

1705 msgstr "kan inte läsa indexfilen"

1706

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

1707 +#: builtin/apply.c:4283 builtin/apply.c:4286

1708 msgid "path"

1709 msgstr "sökväg"

1710

1714 -#: builtin/apply.c:4285

1711 +#: builtin/apply.c:4284

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

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

1714

1718 -#: builtin/apply.c:4288

1715 +#: builtin/apply.c:4287

1716 msgid "apply changes matching the given path"

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

1718

1722 -#: builtin/apply.c:4290

1719 +#: builtin/apply.c:4289

1720 msgid "num"

1721 msgstr "antal"

1722

1726 -#: builtin/apply.c:4291

1723 +#: builtin/apply.c:4290

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

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

1726

1730 -#: builtin/apply.c:4294

1727 +#: builtin/apply.c:4293

1728 msgid "ignore additions made by the patch"

1729 msgstr "ignorera tillägg gjorda av patchen"

1730

1734 -#: builtin/apply.c:4296

1731 +#: builtin/apply.c:4295

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

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

1734

1738 -#: builtin/apply.c:4300

1735 +#: builtin/apply.c:4299

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

1737 msgstr "visar antal tillagda och borttagna rader decimalt"

1738

1742 -#: builtin/apply.c:4302

1739 +#: builtin/apply.c:4301

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

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

1742

1746 -#: builtin/apply.c:4304

1743 +#: builtin/apply.c:4303

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

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

1746

1750 -#: builtin/apply.c:4306

1747 +#: builtin/apply.c:4305

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

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

1750

1754 -#: builtin/apply.c:4308

1751 +#: builtin/apply.c:4307

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

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

1754

1758 -#: builtin/apply.c:4310

1755 +#: builtin/apply.c:4309

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

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

1758

1762 -#: builtin/apply.c:4312

1759 +#: builtin/apply.c:4311

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

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

1762

1766 -#: builtin/apply.c:4314

1763 +#: builtin/apply.c:4313

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

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

1766

1770 -#: builtin/apply.c:4316

1767 +#: builtin/apply.c:4315

1768 msgid "paths are separated with NUL character"

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

1770

1774 -#: builtin/apply.c:4319

1771 +#: builtin/apply.c:4318

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

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

1774

1778 -#: builtin/apply.c:4320

1775 +#: builtin/apply.c:4319

1776 msgid "action"

1777 msgstr "åtgärd"

1778

1782 -#: builtin/apply.c:4321

1779 +#: builtin/apply.c:4320

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

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

1782

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

1783 +#: builtin/apply.c:4323 builtin/apply.c:4326

1784 msgid "ignore changes in whitespace when finding context"

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

1786

1790 -#: builtin/apply.c:4330

1787 +#: builtin/apply.c:4329

1788 msgid "apply the patch in reverse"

1789 msgstr "tillämpa patchen baklänges"

1790

1794 -#: builtin/apply.c:4332

1791 +#: builtin/apply.c:4331

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

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

1794

1798 -#: builtin/apply.c:4334

1795 +#: builtin/apply.c:4333

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

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

1798

1802 -#: builtin/apply.c:4336

1799 +#: builtin/apply.c:4335

1800 msgid "allow overlapping hunks"

1801 msgstr "tillåt överlappande stycken"

1802

1806 -#: builtin/apply.c:4337

1803 +#: builtin/apply.c:4336

1804 msgid "be verbose"

1805 msgstr "var pratsam"

1806

1810 -#: builtin/apply.c:4339

1807 +#: builtin/apply.c:4338

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

1809 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1810

1814 -#: builtin/apply.c:4342

1811 +#: builtin/apply.c:4341

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

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

1814

1818 -#: builtin/apply.c:4344

1815 +#: builtin/apply.c:4343

1816 msgid "root"

1817 msgstr "rot"

1818

1822 -#: builtin/apply.c:4345

1819 +#: builtin/apply.c:4344

1820 msgid "prepend <root> to all filenames"

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

1822

1826 -#: builtin/apply.c:4367

1823 +#: builtin/apply.c:4366

1824 msgid "--3way outside a repository"

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

1826

1830 -#: builtin/apply.c:4375

1827 +#: builtin/apply.c:4374

1828 msgid "--index outside a repository"

1829 msgstr "--index utanför arkiv"

1830

1834 -#: builtin/apply.c:4378

1831 +#: builtin/apply.c:4377

1832 msgid "--cached outside a repository"

1833 msgstr "--cached utanför arkiv"

1834

1838 -#: builtin/apply.c:4394

1835 +#: builtin/apply.c:4393

1836 #, c-format

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

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

1839

1843 -#: builtin/apply.c:4408

1840 +#: builtin/apply.c:4407

1841 #, c-format

1842 msgid "squelched %d whitespace error"

1843 msgid_plural "squelched %d whitespace errors"

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

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

1846

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

1847 +#: builtin/apply.c:4413 builtin/apply.c:4423

1848 #, c-format

1849 msgid "%d line adds whitespace errors."

1850 msgid_plural "%d lines add whitespace errors."

@@ -2110,7 +2107,7 @@ msgstr "sökväg \"%s\": kan inte slå ihop"

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

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

2109

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

2110 +#: builtin/checkout.c:235 builtin/checkout.c:392

2111 msgid "corrupt index file"

2112 msgstr "indexfilen är trasig"

2113

@@ -2119,60 +2116,56 @@ msgstr "indexfilen är trasig"

2116 msgid "path '%s' is unmerged"

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

2118

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

2123 -#: builtin/merge.c:812

2119 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586

2120 +#: builtin/merge.c:811

2121 msgid "unable to write new index file"

2122 msgstr "kunde inte skriva ny indexfil"

2123

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 -

2131 -#: builtin/checkout.c:415

2124 +#: builtin/checkout.c:414

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

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

2127

2135 -#: builtin/checkout.c:534

2128 +#: builtin/checkout.c:533

2129 #, c-format

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

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

2132

2140 -#: builtin/checkout.c:567

2133 +#: builtin/checkout.c:566

2134 msgid "HEAD is now at"

2135 msgstr "HEAD är nu på"

2136

2144 -#: builtin/checkout.c:574

2137 +#: builtin/checkout.c:573

2138 #, c-format

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

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

2141

2149 -#: builtin/checkout.c:577

2142 +#: builtin/checkout.c:576

2143 #, c-format

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

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

2146

2154 -#: builtin/checkout.c:581

2147 +#: builtin/checkout.c:580

2148 #, c-format

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

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

2151

2159 -#: builtin/checkout.c:583

2152 +#: builtin/checkout.c:582

2153 #, c-format

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

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

2156

2164 -#: builtin/checkout.c:585

2157 +#: builtin/checkout.c:584

2158 #, c-format

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

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

2161

2169 -#: builtin/checkout.c:641

2162 +#: builtin/checkout.c:640

2163 #, c-format

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

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

2166

2167 #. The singular version

2175 -#: builtin/checkout.c:647

2168 +#: builtin/checkout.c:646

2169 #, c-format

2170 msgid ""

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

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

2188 "\n"

2189 "%s\n"

2190

2198 -#: builtin/checkout.c:665

2191 +#: builtin/checkout.c:664

2192 #, c-format

2193 msgid ""

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

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

2203 " git branch nytt_grennamn %s\n"

2204 "\n"

2205

2213 -#: builtin/checkout.c:695

2206 +#: builtin/checkout.c:694

2207 msgid "internal error in revision walk"

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

2209

2217 -#: builtin/checkout.c:699

2210 +#: builtin/checkout.c:698

2211 msgid "Previous HEAD position was"

2212 msgstr "Tidigare position för HEAD var"

2213

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

2214 +#: builtin/checkout.c:724 builtin/checkout.c:919

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

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

2217

2218 #. case (1)

2226 -#: builtin/checkout.c:856

2219 +#: builtin/checkout.c:855

2220 #, c-format

2221 msgid "invalid reference: %s"

2222 msgstr "felaktig referens: %s"

2223

2224 #. case (1): want a tree

2232 -#: builtin/checkout.c:895

2225 +#: builtin/checkout.c:894

2226 #, c-format

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

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

2229

2237 -#: builtin/checkout.c:977

2230 +#: builtin/checkout.c:976

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

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

2233

2241 -#: builtin/checkout.c:986

2234 +#: builtin/checkout.c:985

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

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

2237

2245 -#: builtin/checkout.c:989

2238 +#: builtin/checkout.c:988

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

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

2241

2249 -#: builtin/checkout.c:991

2242 +#: builtin/checkout.c:990

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

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

2245

2253 -#: builtin/checkout.c:997

2246 +#: builtin/checkout.c:996

2247 msgid "--track needs a branch name"

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

2249

2257 -#: builtin/checkout.c:1004

2250 +#: builtin/checkout.c:1003

2251 msgid "Missing branch name; try -b"

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

2253

2261 -#: builtin/checkout.c:1010

2254 +#: builtin/checkout.c:1009

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

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

2257

2265 -#: builtin/checkout.c:1012

2258 +#: builtin/checkout.c:1011

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

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

2261

2269 -#: builtin/checkout.c:1022

2262 +#: builtin/checkout.c:1021

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

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

2265

2273 -#: builtin/checkout.c:1056

2266 +#: builtin/checkout.c:1055

2267 msgid "invalid path specification"

2268 msgstr "felaktig sökvägsangivelse"

2269

2277 -#: builtin/checkout.c:1064

2270 +#: builtin/checkout.c:1063

2271 #, c-format

2272 msgid ""

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

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

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

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

2278

2286 -#: builtin/checkout.c:1066

2279 +#: builtin/checkout.c:1065

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

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

2282

2290 -#: builtin/checkout.c:1071

2283 +#: builtin/checkout.c:1070

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

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

2286

2294 -#: builtin/checkout.c:1074

2287 +#: builtin/checkout.c:1073

2288 msgid ""

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

2290 "checking out of the index."

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

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

2293 "du checkar ut från indexet."

2294

2302 -#: builtin/checkout.c:1093

2295 +#: builtin/checkout.c:1092

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

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

2298

2306 -#: builtin/checkout.c:1096

2299 +#: builtin/checkout.c:1095

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

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

2302

@@ -2361,7 +2354,7 @@ msgstr "referensarkivet \"%s\" är inte en lokal katalog."

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

2355 msgstr "misslyckades skapa katalogen \"%s\""

2356

2364 -#: builtin/clone.c:308 builtin/diff.c:75

2357 +#: builtin/clone.c:308 builtin/diff.c:77

2358 #, c-format

2359 msgid "failed to stat '%s'"

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

@@ -2376,11 +2369,6 @@ msgstr "%s finns och är ingen katalog"

2369 msgid "failed to stat %s\n"

2370 msgstr "misslyckades ta status på %s\n"

2371

2379 -#: builtin/clone.c:341

2380 -#, c-format

2381 -msgid "failed to unlink '%s'"

2382 -msgstr "misslyckades ta bort länken \"%s\""

2383 -

2372 #: builtin/clone.c:346

2373 #, c-format

2374 msgid "failed to create link '%s'"

@@ -2772,7 +2760,7 @@ msgstr " (rotincheckning)"

2760 msgid "could not parse HEAD commit"

2761 msgstr "kunde inte tolka HEAD:s incheckning"

2762

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

2763 +#: builtin/commit.c:1487 builtin/merge.c:508

2764 #, c-format

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

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

@@ -2801,7 +2789,7 @@ msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"

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

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

2791

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

2792 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960

2793 msgid "failed to write commit object"

2794 msgstr "kunde inte skriva incheckningsobjekt"

2795

@@ -2908,36 +2896,36 @@ msgstr "Inga namn hittades, kan inte beskriva något."

2896 msgid "--dirty is incompatible with committishes"

2897 msgstr "--dirty är inkompatibelt med \"committish\"-värden"

2898

2911 -#: builtin/diff.c:77

2899 +#: builtin/diff.c:79

2900 #, c-format

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

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

2903

2916 -#: builtin/diff.c:220

2904 +#: builtin/diff.c:224

2905 #, c-format

2906 msgid "invalid option: %s"

2907 msgstr "ogiltig flagga: %s"

2908

2921 -#: builtin/diff.c:297

2909 +#: builtin/diff.c:301

2910 msgid "Not a git repository"

2911 msgstr "Inte ett git-arkiv"

2912

2925 -#: builtin/diff.c:341

2913 +#: builtin/diff.c:344

2914 #, c-format

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

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

2917

2930 -#: builtin/diff.c:346

2918 +#: builtin/diff.c:349

2919 #, c-format

2920 msgid "more than %d trees given: '%s'"

2921 msgstr "mer än %d träd angavs: \"%s\""

2922

2935 -#: builtin/diff.c:356

2923 +#: builtin/diff.c:359

2924 #, c-format

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

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

2927

2940 -#: builtin/diff.c:364

2928 +#: builtin/diff.c:367

2929 #, c-format

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

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

@@ -3133,57 +3121,57 @@ msgstr ""

3121 msgid "grep: failed to create thread: %s"

3122 msgstr "grep: misslyckades skapa tråd. %s"

3123

3136 -#: builtin/grep.c:402

3124 +#: builtin/grep.c:454

3125 #, c-format

3126 msgid "Failed to chdir: %s"

3127 msgstr "Kunde inte byta katalog (chdir): %s"

3128

3141 -#: builtin/grep.c:478 builtin/grep.c:512

3129 +#: builtin/grep.c:530 builtin/grep.c:564

3130 #, c-format

3131 msgid "unable to read tree (%s)"

3132 msgstr "kunde inte läsa träd (%s)"

3133

3146 -#: builtin/grep.c:526

3134 +#: builtin/grep.c:578

3135 #, c-format

3136 msgid "unable to grep from object of type %s"

3137 msgstr "Kunde inte \"grep\" från objekt av typen %s"

3138

3151 -#: builtin/grep.c:584

3139 +#: builtin/grep.c:636

3140 #, c-format

3141 msgid "switch `%c' expects a numerical value"

3142 msgstr "flaggan \"%c\" antar ett numeriskt värde"

3143

3156 -#: builtin/grep.c:601

3144 +#: builtin/grep.c:653

3145 #, c-format

3146 msgid "cannot open '%s'"

3147 msgstr "kan inte öppna \"%s\""

3148

3161 -#: builtin/grep.c:885

3149 +#: builtin/grep.c:917

3150 msgid "no pattern given."

3151 msgstr "inget mönster angavs."

3152

3165 -#: builtin/grep.c:899

3153 +#: builtin/grep.c:931

3154 #, c-format

3155 msgid "bad object %s"

3156 msgstr "felaktigt objekt %s"

3157

3170 -#: builtin/grep.c:940

3158 +#: builtin/grep.c:972

3159 msgid "--open-files-in-pager only works on the worktree"

3160 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"

3161

3174 -#: builtin/grep.c:963

3162 +#: builtin/grep.c:995

3163 msgid "--cached or --untracked cannot be used with --no-index."

3164 msgstr "--cached och --untracked kan inte användas med --no-index."

3165

3178 -#: builtin/grep.c:968

3166 +#: builtin/grep.c:1000

3167 msgid "--no-index or --untracked cannot be used with revs."

3168 msgstr "--no-index och --untracked kan inte användas med revisioner."

3169

3182 -#: builtin/grep.c:971

3170 +#: builtin/grep.c:1003

3171 msgid "--[no-]exclude-standard cannot be used for tracked contents."

3172 msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."

3173

3186 -#: builtin/grep.c:979

3174 +#: builtin/grep.c:1011

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

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

3177

@@ -3677,64 +3665,64 @@ msgstr "Behöver precis ett intervall."

3665 msgid "Not a range."

3666 msgstr "Inte ett intervall."

3667

3680 -#: builtin/log.c:792

3668 +#: builtin/log.c:789

3669 msgid "Cover letter needs email format"

3670 msgstr "Omslagsbrevet behöver e-postformat"

3671

3684 -#: builtin/log.c:865

3672 +#: builtin/log.c:862

3673 #, c-format

3674 msgid "insane in-reply-to: %s"

3675 msgstr "tokigt in-reply-to: %s"

3676

3689 -#: builtin/log.c:938

3677 +#: builtin/log.c:935

3678 msgid "Two output directories?"

3679 msgstr "Två utdatakataloger?"

3680

3693 -#: builtin/log.c:1160

3681 +#: builtin/log.c:1157

3682 #, c-format

3683 msgid "bogus committer info %s"

3684 msgstr "felaktig incheckarinformation %s"

3685

3698 -#: builtin/log.c:1205

3686 +#: builtin/log.c:1202

3687 msgid "-n and -k are mutually exclusive."

3688 msgstr "-n och -k kan inte användas samtidigt."

3689

3702 -#: builtin/log.c:1207

3690 +#: builtin/log.c:1204

3691 msgid "--subject-prefix and -k are mutually exclusive."

3692 msgstr "--subject-prefix och -k kan inte användas samtidigt."

3693

3706 -#: builtin/log.c:1215

3694 +#: builtin/log.c:1212

3695 msgid "--name-only does not make sense"

3696 msgstr "kan inte använda --name-only"

3697

3710 -#: builtin/log.c:1217

3698 +#: builtin/log.c:1214

3699 msgid "--name-status does not make sense"

3700 msgstr "kan inte använda --name-status"

3701

3714 -#: builtin/log.c:1219

3702 +#: builtin/log.c:1216

3703 msgid "--check does not make sense"

3704 msgstr "kan inte använda --check"

3705

3718 -#: builtin/log.c:1242

3706 +#: builtin/log.c:1239

3707 msgid "standard output, or directory, which one?"

3708 msgstr "standard ut, eller katalog, vilken skall det vara?"

3709

3722 -#: builtin/log.c:1244

3710 +#: builtin/log.c:1241

3711 #, c-format

3712 msgid "Could not create directory '%s'"

3713 msgstr "Kunde inte skapa katalogen \"%s\""

3714

3727 -#: builtin/log.c:1397

3715 +#: builtin/log.c:1394

3716 msgid "Failed to create output files"

3717 msgstr "Misslyckades skapa utdatafiler"

3718

3731 -#: builtin/log.c:1501

3719 +#: builtin/log.c:1498

3720 #, c-format

3721 msgid ""

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

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

3724

3737 -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531

3725 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525

3726 #, c-format

3727 msgid "Unknown commit %s"

3728 msgstr "Okänd incheckning %s"

@@ -3797,51 +3785,51 @@ msgstr "Avslutar SQUASH_MSG"

3785 msgid "No merge message -- not updating HEAD\n"

3786 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"

3787

3800 -#: builtin/merge.c:437

3788 +#: builtin/merge.c:436

3789 #, c-format

3790 msgid "'%s' does not point to a commit"

3791 msgstr "\"%s\" verkar inte peka på en incheckning"

3792

3805 -#: builtin/merge.c:536

3793 +#: builtin/merge.c:535

3794 #, c-format

3795 msgid "Bad branch.%s.mergeoptions string: %s"

3796 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"

3797

3810 -#: builtin/merge.c:629

3798 +#: builtin/merge.c:628

3799 msgid "git write-tree failed to write a tree"

3800 msgstr "git write-tree misslyckades skriva ett träd"

3801

3814 -#: builtin/merge.c:679

3802 +#: builtin/merge.c:678

3803 msgid "failed to read the cache"

3804 msgstr "misslyckads läsa cachen"

3805

3818 -#: builtin/merge.c:710

3806 +#: builtin/merge.c:709

3807 msgid "Not handling anything other than two heads merge."

3808 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."

3809

3822 -#: builtin/merge.c:724

3810 +#: builtin/merge.c:723

3811 #, c-format

3812 msgid "Unknown option for merge-recursive: -X%s"

3813 msgstr "Felaktig flagga för merge-recursive: -X%s"

3814

3827 -#: builtin/merge.c:738

3815 +#: builtin/merge.c:737

3816 #, c-format

3817 msgid "unable to write %s"

3818 msgstr "kunde inte skriva %s"

3819

3832 -#: builtin/merge.c:877

3820 +#: builtin/merge.c:876

3821 #, c-format

3822 msgid "Could not read from '%s'"

3823 msgstr "Kunde inte läsa från \"%s\""

3824

3837 -#: builtin/merge.c:886

3825 +#: builtin/merge.c:885

3826 #, c-format

3827 msgid "Not committing merge; use 'git commit' to complete the merge.\n"

3828 msgstr ""

3829 "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "

3830 "den.\n"

3831

3844 -#: builtin/merge.c:892

3832 +#: builtin/merge.c:891

3833 msgid ""

3834 "Please enter a commit message to explain why this merge is necessary,\n"

3835 "especially if it merges an updated upstream into a topic branch.\n"

@@ -3856,53 +3844,53 @@ msgstr ""

3844 "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"

3845 "avbryter incheckningen.\n"

3846

3859 -#: builtin/merge.c:916

3847 +#: builtin/merge.c:915

3848 msgid "Empty commit message."

3849 msgstr "Tomt incheckningsmeddelande."

3850

3863 -#: builtin/merge.c:928

3851 +#: builtin/merge.c:927

3852 #, c-format

3853 msgid "Wonderful.\n"

3854 msgstr "Underbart.\n"

3855

3868 -#: builtin/merge.c:993

3856 +#: builtin/merge.c:992

3857 #, c-format

3858 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"

3859 msgstr ""

3860 "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"

3861

3874 -#: builtin/merge.c:1009

3862 +#: builtin/merge.c:1008

3863 #, c-format

3864 msgid "'%s' is not a commit"

3865 msgstr "\"%s\" är inte en incheckning"

3866

3879 -#: builtin/merge.c:1050

3867 +#: builtin/merge.c:1049

3868 msgid "No current branch."

3869 msgstr "Inte på någon gren."

3870

3883 -#: builtin/merge.c:1052

3871 +#: builtin/merge.c:1051

3872 msgid "No remote for the current branch."

3873 msgstr "Ingen fjärr för aktuell gren."

3874

3887 -#: builtin/merge.c:1054

3875 +#: builtin/merge.c:1053

3876 msgid "No default upstream defined for the current branch."

3877 msgstr "Ingen standarduppström angiven för aktuell gren."

3878

3891 -#: builtin/merge.c:1059

3879 +#: builtin/merge.c:1058

3880 #, c-format

3881 msgid "No remote tracking branch for %s from %s"

3882 msgstr "Ingen fjärrspårande gren för %s från %s"

3883

3896 -#: builtin/merge.c:1146 builtin/merge.c:1303

3884 +#: builtin/merge.c:1145 builtin/merge.c:1302

3885 #, c-format

3886 msgid "%s - not something we can merge"

3887 msgstr "%s - inte något vi kan slå ihop"

3888

3901 -#: builtin/merge.c:1214

3889 +#: builtin/merge.c:1213

3890 msgid "There is no merge to abort (MERGE_HEAD missing)."

3891 msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."

3892

3905 -#: builtin/merge.c:1230 git-pull.sh:31

3893 +#: builtin/merge.c:1229 git-pull.sh:31

3894 msgid ""

3895 "You have not concluded your merge (MERGE_HEAD exists).\n"

3896 "Please, commit your changes before you can merge."

@@ -3910,11 +3898,11 @@ msgstr ""

3898 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"

3899 "Checka in dina ändringar innan du kan slå ihop."

3900

3913 -#: builtin/merge.c:1233 git-pull.sh:34

3901 +#: builtin/merge.c:1232 git-pull.sh:34

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

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

3904

3917 -#: builtin/merge.c:1237

3905 +#: builtin/merge.c:1236

3906 msgid ""

3907 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"

3908 "Please, commit your changes before you can merge."

@@ -3922,79 +3910,79 @@ msgstr ""

3910 "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"

3911 "Checka in dina ändringar innan du kan slå ihop."

3912

3925 -#: builtin/merge.c:1240

3913 +#: builtin/merge.c:1239

3914 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."

3915 msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."

3916

3929 -#: builtin/merge.c:1249

3917 +#: builtin/merge.c:1248

3918 msgid "You cannot combine --squash with --no-ff."

3919 msgstr "Du kan inte kombinera --squash med --no-ff."

3920

3933 -#: builtin/merge.c:1254

3921 +#: builtin/merge.c:1253

3922 msgid "You cannot combine --no-ff with --ff-only."

3923 msgstr "Du kan inte kombinera --no-ff med --ff-only."

3924

3937 -#: builtin/merge.c:1261

3925 +#: builtin/merge.c:1260

3926 msgid "No commit specified and merge.defaultToUpstream not set."

3927 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."

3928

3941 -#: builtin/merge.c:1293

3929 +#: builtin/merge.c:1292

3930 msgid "Can merge only exactly one commit into empty head"

3931 msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."

3932

3945 -#: builtin/merge.c:1296

3933 +#: builtin/merge.c:1295

3934 msgid "Squash commit into empty head not supported yet"

3935 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"

3936

3949 -#: builtin/merge.c:1298

3937 +#: builtin/merge.c:1297

3938 msgid "Non-fast-forward commit does not make sense into an empty head"

3939 msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"

3940

3953 -#: builtin/merge.c:1413

3941 +#: builtin/merge.c:1412

3942 #, c-format

3943 msgid "Updating %s..%s\n"

3944 msgstr "Uppdaterar %s..%s\n"

3945

3958 -#: builtin/merge.c:1451

3946 +#: builtin/merge.c:1450

3947 #, c-format

3948 msgid "Trying really trivial in-index merge...\n"

3949 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"

3950

3963 -#: builtin/merge.c:1458

3951 +#: builtin/merge.c:1457

3952 #, c-format

3953 msgid "Nope.\n"

3954 msgstr "Nej.\n"

3955

3968 -#: builtin/merge.c:1490

3956 +#: builtin/merge.c:1489

3957 msgid "Not possible to fast-forward, aborting."

3958 msgstr "Kan inte snabbspola, avbryter."

3959

3972 -#: builtin/merge.c:1513 builtin/merge.c:1592

3960 +#: builtin/merge.c:1512 builtin/merge.c:1591

3961 #, c-format

3962 msgid "Rewinding the tree to pristine...\n"

3963 msgstr "Återspolar trädet till orört...\n"

3964

3977 -#: builtin/merge.c:1517

3965 +#: builtin/merge.c:1516

3966 #, c-format

3967 msgid "Trying merge strategy %s...\n"

3968 msgstr "Försöker sammanslagninsstrategin %s...\n"

3969

3982 -#: builtin/merge.c:1583

3970 +#: builtin/merge.c:1582

3971 #, c-format

3972 msgid "No merge strategy handled the merge.\n"

3973 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"

3974

3987 -#: builtin/merge.c:1585

3975 +#: builtin/merge.c:1584

3976 #, c-format

3977 msgid "Merge with strategy %s failed.\n"

3978 msgstr "Sammanslaning med strategin %s misslyckades.\n"

3979

3992 -#: builtin/merge.c:1594

3980 +#: builtin/merge.c:1593

3981 #, c-format

3982 msgid "Using the %s to prepare resolving by hand.\n"

3983 msgstr "Använder %s för att förbereda lösning för hand.\n"

3984

3997 -#: builtin/merge.c:1606

3985 +#: builtin/merge.c:1605

3986 #, c-format

3987 msgid "Automatic merge went well; stopped before committing as requested\n"

3988 msgstr ""

@@ -4331,14 +4319,47 @@ msgstr ""

4319 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"

4320 "skall sändas för att uppdatera fjärrgrenen."

4321

4334 -#: builtin/push.c:174

4322 +#: builtin/push.c:151

4323 +msgid ""

4324 +"push.default is unset; its implicit value is changing in\n"

4325 +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n"

4326 +"and maintain the current behavior after the default changes, use:\n"

4327 +"\n"

4328 +" git config --global push.default matching\n"

4329 +"\n"

4330 +"To squelch this message and adopt the new behavior now, use:\n"

4331 +"\n"

4332 +" git config --global push.default simple\n"

4333 +"\n"

4334 +"See 'git help config' and search for 'push.default' for further "

4335 +"information.\n"

4336 +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"

4337 +"'current' instead of 'simple' if you sometimes use older versions of Git)"

4338 +msgstr ""

4339 +"push.default har inte ställts in; dess underförstådda värde ändras i\n"

4340 +"Git 2.0 från \"matching\" till \"simple\". För att undertrycka det här\n"

4341 +"meddelandet och behålla nuvarande beteende efter att förvalet ändras,\n"

4342 +"skriver du:\n"

4343 +"\n"

4344 +" git config --global push.default matching\n"

4345 +"\n"

4346 +"För att undertrycka meddelandet och välja det nya beteendet nu skriver du:\n"

4347 +"\n"

4348 +" git config --global push.default simple\n"

4349 +"\n"

4350 +"Se \"git help config\" och sök efter \"push.default\" för ytterligare \n"

4351 +"information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n"

4352 +"liknande läget \"current\" istället för \"simple\" om du ibland använder\n"

4353 +"äldre versioner av Git.)"

4354 +

4355 +#: builtin/push.c:199

4356 msgid ""

4357 "You didn't specify any refspecs to push, and push.default is \"nothing\"."

4358 msgstr ""

4359 "Du angav inga referensspecifikationer att sända, och push.default är "

4360 "\"nothing\"."

4361

4341 -#: builtin/push.c:181

4362 +#: builtin/push.c:206

4363 msgid ""

4364 "Updates were rejected because the tip of your current branch is behind\n"

4365 "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"

@@ -4350,20 +4371,21 @@ msgstr ""

4371 "innan du sänder igen.\n"

4372 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

4373

4353 -#: builtin/push.c:187

4374 +#: builtin/push.c:212

4375 msgid ""

4376 "Updates were rejected because a pushed branch tip is behind its remote\n"

4377 "counterpart. If you did not intend to push that branch, you may want to\n"

4357 -"specify branches to push or set the 'push.default' configuration\n"

4358 -"variable to 'current' or 'upstream' to push only the current branch."

4378 +"specify branches to push or set the 'push.default' configuration variable\n"

4379 +"to 'simple', 'current' or 'upstream' to push only the current branch."

4380 msgstr ""

4381 "Uppdateringar avvisades då änden på en insänd gren är bakom dess\n"

4382 "fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n"

4383 "du specificera grenar att sända, eller ändra inställningsvariabeln\n"

4363 -"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n"

4364 -"aktuell gren."

4384 +"\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att "

4385 +"endast\n"

4386 +"sända aktuell gren."

4387

4366 -#: builtin/push.c:193

4388 +#: builtin/push.c:218

4389 msgid ""

4390 "Updates were rejected because a pushed branch tip is behind its remote\n"

4391 "counterpart. Check out this branch and merge the remote changes\n"

@@ -4375,22 +4397,22 @@ msgstr ""

4397 "\"git pull\") innan du sänder igen.\n"

4398 "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."

4399

4378 -#: builtin/push.c:233

4400 +#: builtin/push.c:258

4401 #, c-format

4402 msgid "Pushing to %s\n"

4403 msgstr "Sänder till %s\n"

4404

4383 -#: builtin/push.c:237

4405 +#: builtin/push.c:262

4406 #, c-format

4407 msgid "failed to push some refs to '%s'"

4408 msgstr "misslyckades sända vissa referenser till \"%s\""

4409

4388 -#: builtin/push.c:269

4410 +#: builtin/push.c:294

4411 #, c-format

4412 msgid "bad repository '%s'"

4413 msgstr "felaktigt arkiv \"%s\""

4414

4393 -#: builtin/push.c:270

4415 +#: builtin/push.c:295

4416 msgid ""

4417 "No configured push destination.\n"

4418 "Either specify the URL from the command-line or configure a remote "

@@ -4411,31 +4433,31 @@ msgstr ""

4433 "\n"

4434 " git push <namn>\n"

4435

4414 -#: builtin/push.c:285

4436 +#: builtin/push.c:310

4437 msgid "--all and --tags are incompatible"

4438 msgstr "--all och --tags är inkompatibla"

4439

4418 -#: builtin/push.c:286

4440 +#: builtin/push.c:311

4441 msgid "--all can't be combined with refspecs"

4442 msgstr "--all kan inte kombineras med referensspecifikationer"

4443

4422 -#: builtin/push.c:291

4444 +#: builtin/push.c:316

4445 msgid "--mirror and --tags are incompatible"

4446 msgstr "--mirror och --tags är inkompatibla"

4447

4426 -#: builtin/push.c:292

4448 +#: builtin/push.c:317

4449 msgid "--mirror can't be combined with refspecs"

4450 msgstr "--mirror kan inte kombineras med referensspecifikationer"

4451

4430 -#: builtin/push.c:297

4452 +#: builtin/push.c:322

4453 msgid "--all and --mirror are incompatible"

4454 msgstr "--all och --mirror är inkompatibla"

4455

4434 -#: builtin/push.c:385

4456 +#: builtin/push.c:410

4457 msgid "--delete is incompatible with --all, --mirror and --tags"

4458 msgstr "--delete är imkompatibel med --all, --mirror och --tags"

4459

4438 -#: builtin/push.c:387

4460 +#: builtin/push.c:412

4461 msgid "--delete doesn't make sense without any refs"

4462 msgstr "--delete kan inte användas utan referenser"

4463

@@ -5807,33 +5829,33 @@ msgstr "(För att återställa dem, skriv \"git stash apply\")"

5829 msgid "cannot strip one component off url '$remoteurl'"

5830 msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""

5831

5810 -#: git-submodule.sh:145

5832 +#: git-submodule.sh:167

5833 #, sh-format

5834 msgid "No submodule mapping found in .gitmodules for path '$sm_path'"

5835 msgstr ""

5836 "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""

5837

5816 -#: git-submodule.sh:189

5838 +#: git-submodule.sh:211

5839 #, sh-format

5840 msgid "Clone of '$url' into submodule path '$sm_path' failed"

5841 msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""

5842

5821 -#: git-submodule.sh:201

5843 +#: git-submodule.sh:223

5844 #, sh-format

5845 msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"

5846 msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"

5847

5826 -#: git-submodule.sh:290

5848 +#: git-submodule.sh:312

5849 #, sh-format

5850 msgid "repo URL: '$repo' must be absolute or begin with ./|../"

5851 msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"

5852

5831 -#: git-submodule.sh:307

5853 +#: git-submodule.sh:329

5854 #, sh-format

5855 msgid "'$sm_path' already exists in the index"

5856 msgstr "\"$sm_path\" finns redan i indexet"

5857

5836 -#: git-submodule.sh:311

5858 +#: git-submodule.sh:333

5859 #, sh-format

5860 msgid ""

5861 "The following path is ignored by one of your .gitignore files:\n"

@@ -5844,64 +5866,64 @@ msgstr ""

5866 "$sm_path\n"

5867 "Använd -f om du verkligen vill lägga till den"

5868

5847 -#: git-submodule.sh:322

5869 +#: git-submodule.sh:344

5870 #, sh-format

5871 msgid "Adding existing repo at '$sm_path' to the index"

5872 msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"

5873

5852 -#: git-submodule.sh:324

5874 +#: git-submodule.sh:346

5875 #, sh-format

5876 msgid "'$sm_path' already exists and is not a valid git repo"

5877 msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"

5878

5857 -#: git-submodule.sh:338

5879 +#: git-submodule.sh:360

5880 #, sh-format

5881 msgid "Unable to checkout submodule '$sm_path'"

5882 msgstr "Kan inte checka ut undermodulen \"$sm_path\""

5883

5862 -#: git-submodule.sh:343

5884 +#: git-submodule.sh:365

5885 #, sh-format

5886 msgid "Failed to add submodule '$sm_path'"

5887 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""

5888

5867 -#: git-submodule.sh:348

5889 +#: git-submodule.sh:370

5890 #, sh-format

5891 msgid "Failed to register submodule '$sm_path'"

5892 msgstr "Misslyckades registrera undermodulen \"$sm_path\""

5893

5872 -#: git-submodule.sh:390

5894 +#: git-submodule.sh:413

5895 #, sh-format

5896 msgid "Entering '$prefix$sm_path'"

5897 msgstr "Går in i \"$prefix$sm_path\""

5898

5877 -#: git-submodule.sh:404

5899 +#: git-submodule.sh:427

5900 #, sh-format

5901 msgid "Stopping at '$sm_path'; script returned non-zero status."

5902 msgstr ""

5903 "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."

5904

5883 -#: git-submodule.sh:447

5905 +#: git-submodule.sh:471

5906 #, sh-format

5907 msgid "No url found for submodule path '$sm_path' in .gitmodules"

5908 msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"

5909

5888 -#: git-submodule.sh:456

5910 +#: git-submodule.sh:480

5911 #, sh-format

5912 msgid "Failed to register url for submodule path '$sm_path'"

5913 msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""

5914

5893 -#: git-submodule.sh:458

5915 +#: git-submodule.sh:482

5916 #, sh-format

5917 msgid "Submodule '$name' ($url) registered for path '$sm_path'"

5918 msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""

5919

5898 -#: git-submodule.sh:466

5920 +#: git-submodule.sh:490

5921 #, sh-format

5922 msgid "Failed to register update mode for submodule path '$sm_path'"

5923 msgstr ""

5924 "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""

5925

5904 -#: git-submodule.sh:565

5926 +#: git-submodule.sh:590

5927 #, sh-format

5928 msgid ""

5929 "Submodule path '$sm_path' not initialized\n"

@@ -5910,93 +5932,102 @@ msgstr ""

5932 "Undermodulen \"$sm_path\" har inte initierats\n"

5933 "Kanske du vill köra \"update --init\"?"

5934

5913 -#: git-submodule.sh:578

5935 +#: git-submodule.sh:603

5936 #, sh-format

5937 msgid "Unable to find current revision in submodule path '$sm_path'"

5938 msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""

5939

5918 -#: git-submodule.sh:597

5940 +#: git-submodule.sh:622

5941 #, sh-format

5942 msgid "Unable to fetch in submodule path '$sm_path'"

5943 msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""

5944

5923 -#: git-submodule.sh:611

5945 +#: git-submodule.sh:636

5946 #, sh-format

5947 msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"

5948 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""

5949

5928 -#: git-submodule.sh:612

5950 +#: git-submodule.sh:637

5951 #, sh-format

5952 msgid "Submodule path '$sm_path': rebased into '$sha1'"

5953 msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""

5954

5933 -#: git-submodule.sh:617

5955 +#: git-submodule.sh:642

5956 #, sh-format

5957 msgid "Unable to merge '$sha1' in submodule path '$sm_path'"

5958 msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""

5959

5938 -#: git-submodule.sh:618

5960 +#: git-submodule.sh:643

5961 #, sh-format

5962 msgid "Submodule path '$sm_path': merged in '$sha1'"

5963 msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""

5964

5943 -#: git-submodule.sh:623

5965 +#: git-submodule.sh:648

5966 #, sh-format

5967 msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"

5968 msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""

5969

5948 -#: git-submodule.sh:624

5970 +#: git-submodule.sh:649

5971 #, sh-format

5972 msgid "Submodule path '$sm_path': checked out '$sha1'"

5973 msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""

5974

5953 -#: git-submodule.sh:646 git-submodule.sh:969

5975 +#: git-submodule.sh:671 git-submodule.sh:995

5976 #, sh-format

5977 msgid "Failed to recurse into submodule path '$sm_path'"

5978 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""

5979

5958 -#: git-submodule.sh:754

5980 +#: git-submodule.sh:779

5981 msgid "The --cached option cannot be used with the --files option"

5982 msgstr "Flaggan --cached kan inte användas med flaggan --files"

5983

5984 #. unexpected type

5963 -#: git-submodule.sh:794

5985 +#: git-submodule.sh:819

5986 #, sh-format

5987 msgid "unexpected mode $mod_dst"

5988 msgstr "oväntat läge $mod_dst"

5989

5968 -#: git-submodule.sh:812

5990 +#: git-submodule.sh:837

5991 #, sh-format

5992 msgid " Warn: $name doesn't contain commit $sha1_src"

5993 msgstr " Varning: $name innehåller inte incheckning $sha1_src"

5994

5973 -#: git-submodule.sh:815

5995 +#: git-submodule.sh:840

5996 #, sh-format

5997 msgid " Warn: $name doesn't contain commit $sha1_dst"

5998 msgstr " Varning: $name innehåller inte incheckning $sha1_dst"

5999

5978 -#: git-submodule.sh:818

6000 +#: git-submodule.sh:843

6001 #, sh-format

6002 msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"

6003 msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"

6004

5983 -#: git-submodule.sh:843

6005 +#: git-submodule.sh:868

6006 msgid "blob"

6007 msgstr "blob"

6008

5987 -#: git-submodule.sh:881

6009 +#: git-submodule.sh:906

6010 msgid "# Submodules changed but not updated:"

6011 msgstr "# Undermoduler ändrade men inte uppdaterade:"

6012

5991 -#: git-submodule.sh:883

6013 +#: git-submodule.sh:908

6014 msgid "# Submodule changes to be committed:"

6015 msgstr "# Undermodulers ändringar att checka in:"

6016

5995 -#: git-submodule.sh:1027

6017 +#: git-submodule.sh:1054

6018 #, sh-format

6019 msgid "Synchronizing submodule url for '$name'"

6020 msgstr "Synkroniserar undermodul-url för \"$name\""

6021

6022 +#~ msgid "diff setup failed"

6023 +#~ msgstr "misslyckades sätta upp för diff"

6024 +

6025 +#~ msgid "merge-recursive: disk full?"

6026 +#~ msgstr "merge-recursive: disk full?"

6027 +

6028 +#~ msgid "diff_setup_done failed"

6029 +#~ msgstr "diff_setup_done misslyckades"

6030 +

6031 #~ msgid "%s: has been deleted/renamed"

6032 #~ msgstr "%s: har tagits bort/ändrat namn"

6033

l10n: Update Swedish translation (1166t0f0u)