5ed5b8d87a · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2016-03-16 00:16+0800\n"

11 -"PO-Revision-Date: 2016-03-15 22:35+0100\n"

10 +"POT-Creation-Date: 2016-05-24 23:42+0800\n"

11 +"PO-Revision-Date: 2016-05-27 14:04+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"

@@ -31,7 +31,7 @@ msgstr ""

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

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

33

34 -#: advice.c:101 builtin/merge.c:1226

34 +#: advice.c:101 builtin/merge.c:1238

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

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

37

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

75 msgid "archive format"

76 msgstr "arkivformat"

77

78 -#: archive.c:430 builtin/log.c:1232

78 +#: archive.c:430 builtin/log.c:1395

79 msgid "prefix"

80 msgstr "prefix"

81

@@ -83,9 +83,9 @@ msgstr "prefix"

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

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

85

86 -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2547

87 -#: builtin/blame.c:2548 builtin/config.c:60 builtin/fast-export.c:987

88 -#: builtin/fast-export.c:989 builtin/grep.c:720 builtin/hash-object.c:100

86 +#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2548

87 +#: builtin/blame.c:2549 builtin/config.c:60 builtin/fast-export.c:987

88 +#: builtin/fast-export.c:989 builtin/grep.c:722 builtin/hash-object.c:100

89 #: builtin/ls-files.c:459 builtin/ls-files.c:462 builtin/notes.c:398

90 #: builtin/notes.c:561 builtin/read-tree.c:109 parse-options.h:153

91 msgid "file"

@@ -119,7 +119,8 @@ msgstr "komprimera bättre"

119 msgid "list supported archive formats"

120 msgstr "visa understödda arkivformat"

121

122 -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:78

122 +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82

123 +#: builtin/submodule--helper.c:776

124 msgid "repo"

125 msgstr "arkiv"

126

@@ -271,11 +272,16 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."

272 msgid "Not a valid branch point: '%s'."

273 msgstr "Avgreningspunkten är inte giltig: \"%s\""

274

274 -#: branch.c:344

275 +#: branch.c:345

276 #, c-format

277 msgid "'%s' is already checked out at '%s'"

278 msgstr "\"%s\" är redan utcheckad på \"%s\""

279

280 +#: branch.c:364

281 +#, c-format

282 +msgid "HEAD of working tree %s is not updated"

283 +msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

284 +

285 #: bundle.c:34

286 #, c-format

287 msgid "'%s' does not look like a v2 bundle file"

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

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

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

294

289 -#: bundle.c:87 builtin/commit.c:766

295 +#: bundle.c:87 builtin/commit.c:777

296 #, c-format

297 msgid "could not open '%s'"

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

@@ -295,10 +301,10 @@ msgstr "kunde inte öppna \"%s\""

301 msgid "Repository lacks these prerequisite commits:"

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

303

298 -#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1074

299 -#: builtin/blame.c:2754 builtin/commit.c:1045 builtin/log.c:334

300 -#: builtin/log.c:852 builtin/log.c:1467 builtin/log.c:1700 builtin/merge.c:358

301 -#: builtin/shortlog.c:170

304 +#: bundle.c:163 ref-filter.c:1462 sequencer.c:627 sequencer.c:1073

305 +#: builtin/blame.c:2755 builtin/commit.c:1056 builtin/log.c:340

306 +#: builtin/log.c:863 builtin/log.c:1308 builtin/log.c:1633 builtin/log.c:1875

307 +#: builtin/merge.c:361 builtin/shortlog.c:170

308 msgid "revision walk setup failed"

309 msgstr "misslyckades skapa revisionstraversering"

310

@@ -337,21 +343,21 @@ msgstr "rev-list dog"

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

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

345

340 -#: bundle.c:443 builtin/log.c:157 builtin/log.c:1372 builtin/shortlog.c:273

346 +#: bundle.c:443 builtin/log.c:163 builtin/log.c:1538 builtin/shortlog.c:273

347 #, c-format

348 msgid "unrecognized argument: %s"

349 msgstr "okänt argument: %s"

350

345 -#: bundle.c:449

351 +#: bundle.c:451

352 msgid "Refusing to create empty bundle."

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

354

349 -#: bundle.c:459

355 +#: bundle.c:463

356 #, c-format

357 msgid "cannot create '%s'"

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

359

354 -#: bundle.c:480

360 +#: bundle.c:491

361 msgid "index-pack died"

362 msgstr "index-pack dog"

363

@@ -360,8 +366,8 @@ msgstr "index-pack dog"

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

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

368

363 -#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1505

364 -#: builtin/am.c:2135

369 +#: commit.c:40 builtin/am.c:437 builtin/am.c:473 builtin/am.c:1504

370 +#: builtin/am.c:2134

371 #, c-format

372 msgid "could not parse %s"

373 msgstr "kunde inte tolka %s"

@@ -395,21 +401,21 @@ msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

401 msgid "failed to expand user dir in: '%s'"

402 msgstr "misslyckades expandera användarkatalog i: \"%s\""

403

398 -#: config.c:758 config.c:769

404 +#: config.c:761 config.c:772

405 #, c-format

406 msgid "bad zlib compression level %d"

407 msgstr "felaktigt zlib-komprimeringsgrad %d"

408

403 -#: config.c:891

409 +#: config.c:890

410 #, c-format

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

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

413

408 -#: config.c:1220

414 +#: config.c:1228

415 msgid "unable to parse command-line config"

416 msgstr "kan inte tolka kommandoradskonfiguration"

417

412 -#: config.c:1281

418 +#: config.c:1284

419 msgid "unknown error occured while reading the configuration files"

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

421

@@ -428,24 +434,27 @@ msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"

434 msgid "%s has multiple values"

435 msgstr "%s har flera värden"

436

437 +#: config.c:2224

438 +#, c-format

439 +msgid "could not set '%s' to '%s'"

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

441 +

442 #: config.c:2226

443 #, c-format

433 -msgid "Could not set '%s' to '%s'"

434 -msgstr "Kunde inte ställa in \"%s\" till \"%s\""

444 +msgid "could not unset '%s'"

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

446

447 #: connected.c:69

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

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

450

451 #: connected.c:89

441 -#, c-format

442 -msgid "failed write to rev-list: %s"

443 -msgstr "kunde inte skriva till rev-list: %s"

452 +msgid "failed write to rev-list"

453 +msgstr "kunde inte skriva till rev-list"

454

445 -#: connected.c:97

446 -#, c-format

447 -msgid "failed to close rev-list's stdin: %s"

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

455 +#: connected.c:96

456 +msgid "failed to close rev-list's stdin"

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

458

459 #: date.c:95

460 msgid "in the future"

@@ -520,26 +529,26 @@ msgstr[1] "%lu år sedan"

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

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

531

523 -#: diffcore-rename.c:536

532 +#: diffcore-rename.c:538

533 msgid "Performing inexact rename detection"

534 msgstr "Utför onöjaktig namnbytesdetektering"

535

527 -#: diff.c:115

536 +#: diff.c:116

537 #, c-format

538 msgid " Failed to parse dirstat cut-off percentage '%s'\n"

539 msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"

540

532 -#: diff.c:120

541 +#: diff.c:121

542 #, c-format

543 msgid " Unknown dirstat parameter '%s'\n"

544 msgstr " Okänd dirstat-parameter \"%s\"\n"

545

537 -#: diff.c:215

546 +#: diff.c:225

547 #, c-format

548 msgid "Unknown value for 'diff.submodule' config variable: '%s'"

549 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""

550

542 -#: diff.c:267

551 +#: diff.c:277

552 #, c-format

553 msgid ""

554 "Found errors in 'diff.dirstat' config variable:\n"

@@ -548,16 +557,16 @@ msgstr ""

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

558 "%s"

559

551 -#: diff.c:2997

560 +#: diff.c:3007

561 #, c-format

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

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

564

556 -#: diff.c:3393

565 +#: diff.c:3405

566 msgid "--follow requires exactly one pathspec"

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

568

560 -#: diff.c:3556

569 +#: diff.c:3568

570 #, c-format

571 msgid ""

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

@@ -566,20 +575,20 @@ msgstr ""

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

576 "%s"

577

569 -#: diff.c:3570

578 +#: diff.c:3582

579 #, c-format

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

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

582

574 -#: dir.c:2004

583 +#: dir.c:1823

584 msgid "failed to get kernel name and information"

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

586

578 -#: dir.c:2123

587 +#: dir.c:1942

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

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

590

582 -#: gpg-interface.c:166 gpg-interface.c:237

591 +#: gpg-interface.c:166 gpg-interface.c:235

592 msgid "could not run gpg."

593 msgstr "kunde inte köra gpg."

594

@@ -593,28 +602,28 @@ msgstr "gpg misslyckades signera data"

602

603 #: gpg-interface.c:222

604 #, c-format

596 -msgid "could not create temporary file '%s': %s"

597 -msgstr "kunde inte skapa temporära filen \"%s\": %s"

605 +msgid "could not create temporary file '%s'"

606 +msgstr "kunde inte skapa temporära filen \"%s\""

607

599 -#: gpg-interface.c:225

608 +#: gpg-interface.c:224

609 #, c-format

601 -msgid "failed writing detached signature to '%s': %s"

602 -msgstr "misslyckades skriva fristående signatur till \"%s\": %s"

610 +msgid "failed writing detached signature to '%s'"

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

612

613 #: grep.c:1718

614 #, c-format

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

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

617

609 -#: grep.c:1735

618 +#: grep.c:1735 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155

619 #, c-format

611 -msgid "'%s': %s"

612 -msgstr "\"%s\": %s"

620 +msgid "failed to stat '%s'"

621 +msgstr "misslyckades ta status på \"%s\""

622

623 #: grep.c:1746

624 #, c-format

616 -msgid "'%s': short read %s"

617 -msgstr "\"%s\": kort läsning %s"

625 +msgid "'%s': short read"

626 +msgstr "\"%s\": kort läsning"

627

628 #: help.c:205

629 #, c-format

@@ -680,12 +689,37 @@ msgstr[1] ""

689 msgid "%s: %s - %s"

690 msgstr "%s: %s - %s"

691

692 +#: lockfile.c:152

693 +#, c-format

694 +msgid ""

695 +"Unable to create '%s.lock': %s.\n"

696 +"\n"

697 +"Another git process seems to be running in this repository, e.g.\n"

698 +"an editor opened by 'git commit'. Please make sure all processes\n"

699 +"are terminated then try again. If it still fails, a git process\n"

700 +"may have crashed in this repository earlier:\n"

701 +"remove the file manually to continue."

702 +msgstr ""

703 +"Kunde inte skapa \"%s.lock\": %s.\n"

704 +"\n"

705 +"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"

706 +"ett textredigeringsprogram startat av \"git commit\". Se till att\n"

707 +"alla processer avslutats och försök sedan igen. Om det fortfarande\n"

708 +"misslyckas kanske en git-process har kraschat i det här arkivet\n"

709 +"tidigare:\n"

710 +"ta bort filen manuellt för att fortsätta."

711 +

712 +#: lockfile.c:160

713 +#, c-format

714 +msgid "Unable to create '%s.lock': %s"

715 +msgstr "kunde inte skapa \"%s.lock\": %s"

716 +

717 #: merge.c:41

718 msgid "failed to read the cache"

719 msgstr "misslyckades läsa cachen"

720

687 -#: merge.c:94 builtin/am.c:2008 builtin/am.c:2043 builtin/checkout.c:376

688 -#: builtin/checkout.c:587 builtin/clone.c:730

721 +#: merge.c:94 builtin/am.c:2007 builtin/am.c:2042 builtin/checkout.c:375

722 +#: builtin/checkout.c:586 builtin/clone.c:732

723 msgid "unable to write new index file"

724 msgstr "kunde inte skriva ny indexfil"

725

@@ -732,7 +766,7 @@ msgstr "kan inte läsa objektet %s: \"%s\""

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

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

768

735 -#: merge-recursive.c:790 builtin/clone.c:374

769 +#: merge-recursive.c:790 builtin/clone.c:376

770 #, c-format

771 msgid "failed to open '%s'"

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

@@ -866,7 +900,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)"

900 msgid "Auto-merging %s"

901 msgstr "Slår ihop %s automatiskt"

902

869 -#: merge-recursive.c:1650 git-submodule.sh:1048

903 +#: merge-recursive.c:1650 git-submodule.sh:941

904 msgid "submodule"

905 msgstr "undermodul"

906

@@ -894,50 +928,50 @@ msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"

928 msgstr ""

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

930

897 -#: merge-recursive.c:1783

931 +#: merge-recursive.c:1781

932 #, c-format

933 msgid "Adding %s"

934 msgstr "Lägger till %s"

935

902 -#: merge-recursive.c:1800

936 +#: merge-recursive.c:1798

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

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

939

906 -#: merge-recursive.c:1819

940 +#: merge-recursive.c:1817

941 msgid "Already up-to-date!"

942 msgstr "Redan à jour!"

943

910 -#: merge-recursive.c:1828

944 +#: merge-recursive.c:1826

945 #, c-format

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

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

948

915 -#: merge-recursive.c:1858

949 +#: merge-recursive.c:1856

950 #, c-format

951 msgid "Unprocessed path??? %s"

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

953

920 -#: merge-recursive.c:1906

954 +#: merge-recursive.c:1904

955 msgid "Merging:"

956 msgstr "Slår ihop:"

957

924 -#: merge-recursive.c:1919

958 +#: merge-recursive.c:1917

959 #, c-format

960 msgid "found %u common ancestor:"

961 msgid_plural "found %u common ancestors:"

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

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

964

931 -#: merge-recursive.c:1956

965 +#: merge-recursive.c:1954

966 msgid "merge returned no commit"

967 msgstr "sammanslagningen returnerade ingen incheckning"

968

935 -#: merge-recursive.c:2013

969 +#: merge-recursive.c:2011

970 #, c-format

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

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

973

940 -#: merge-recursive.c:2024 builtin/merge.c:646

974 +#: merge-recursive.c:2022 builtin/merge.c:649 builtin/merge.c:831

975 msgid "Unable to write index."

976 msgstr "Kunde inte skriva indexet."

977

@@ -967,28 +1001,28 @@ msgstr "Felaktigt värde på %s: \"%s\""

1001 msgid "unable to parse object: %s"

1002 msgstr "kunde inte tolka objektet: %s"

1003

970 -#: parse-options.c:570

1004 +#: parse-options.c:572

1005 msgid "..."

1006 msgstr "..."

1007

974 -#: parse-options.c:588

1008 +#: parse-options.c:590

1009 #, c-format

1010 msgid "usage: %s"

1011 msgstr "användning: %s"

1012

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

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

981 -#: parse-options.c:592

1015 +#: parse-options.c:594

1016 #, c-format

1017 msgid " or: %s"

1018 msgstr " eller: %s"

1019

986 -#: parse-options.c:595

1020 +#: parse-options.c:597

1021 #, c-format

1022 msgid " %s"

1023 msgstr " %s"

1024

991 -#: parse-options.c:629

1025 +#: parse-options.c:631

1026 msgid "-NUM"

1027 msgstr "-TAL"

1028

@@ -997,7 +1031,7 @@ msgstr "-TAL"

1031 msgid "malformed object name '%s'"

1032 msgstr "felformat objektnamn \"%s\""

1033

1000 -#: path.c:752

1034 +#: path.c:796

1035 #, c-format

1036 msgid "Could not make %s writable by group"

1037 msgstr "Kunde inte göra %s skrivbar för gruppen"

@@ -1067,7 +1101,7 @@ msgstr ""

1101 "Ingenting att exkludera från med :(exkludera)-mönster.\n"

1102 "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"

1103

1070 -#: pretty.c:969

1104 +#: pretty.c:971

1105 msgid "unable to parse --pretty format"

1106 msgstr "kunde inte tolka format för --pretty"

1107

@@ -1093,23 +1127,23 @@ msgstr ""

1127 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"

1128 "Använder version %i"

1129

1096 -#: refs.c:543 builtin/merge.c:761 builtin/merge.c:872 builtin/merge.c:974

1097 -#: builtin/merge.c:984

1130 +#: refs.c:543 builtin/merge.c:764 builtin/merge.c:883 builtin/merge.c:985

1131 +#: builtin/merge.c:995

1132 #, c-format

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

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

1135

1102 -#: refs/files-backend.c:2374

1136 +#: refs/files-backend.c:2243

1137 #, c-format

1138 msgid "could not delete reference %s: %s"

1139 msgstr "kunde inte ta bort referensen %s: %s"

1140

1107 -#: refs/files-backend.c:2377

1141 +#: refs/files-backend.c:2246

1142 #, c-format

1143 msgid "could not delete references: %s"

1144 msgstr "kunde inte ta bort referenser: %s"

1145

1112 -#: refs/files-backend.c:2386

1146 +#: refs/files-backend.c:2255

1147 #, c-format

1148 msgid "could not remove reference %s"

1149 msgstr "kunde inte ta bort referensen %s"

@@ -1248,93 +1282,93 @@ msgstr "format: atomen %%(end) saknas"

1282 msgid "malformed object name %s"

1283 msgstr "felformat objektnamn %s"

1284

1251 -#: remote.c:745

1285 +#: remote.c:746

1286 #, c-format

1287 msgid "Cannot fetch both %s and %s to %s"

1288 msgstr "Kan inte hämta både %s och %s till %s"

1289

1256 -#: remote.c:749

1290 +#: remote.c:750

1291 #, c-format

1292 msgid "%s usually tracks %s, not %s"

1293 msgstr "%s spårar vanligtvis %s, inte %s"

1294

1261 -#: remote.c:753

1295 +#: remote.c:754

1296 #, c-format

1297 msgid "%s tracks both %s and %s"

1298 msgstr "%s spårar både %s och %s"

1299

1266 -#: remote.c:761

1300 +#: remote.c:762

1301 msgid "Internal error"

1302 msgstr "Internt fel"

1303

1270 -#: remote.c:1677 remote.c:1720

1304 +#: remote.c:1678 remote.c:1721

1305 msgid "HEAD does not point to a branch"

1306 msgstr "HEAD pekar inte på en gren"

1307

1274 -#: remote.c:1686

1308 +#: remote.c:1687

1309 #, c-format

1310 msgid "no such branch: '%s'"

1311 msgstr "okänd gren: \"%s\""

1312

1279 -#: remote.c:1689

1313 +#: remote.c:1690

1314 #, c-format

1315 msgid "no upstream configured for branch '%s'"

1316 msgstr "ingen standarduppström angiven för grenen \"%s\""

1317

1284 -#: remote.c:1695

1318 +#: remote.c:1696

1319 #, c-format

1320 msgid "upstream branch '%s' not stored as a remote-tracking branch"

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

1322

1289 -#: remote.c:1710

1323 +#: remote.c:1711

1324 #, c-format

1325 msgid "push destination '%s' on remote '%s' has no local tracking branch"

1326 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"

1327

1294 -#: remote.c:1725

1328 +#: remote.c:1726

1329 #, c-format

1330 msgid "branch '%s' has no remote for pushing"

1331 msgstr "grenen \"%s\" har ingen fjärr för \"push\""

1332

1299 -#: remote.c:1736

1333 +#: remote.c:1737

1334 #, c-format

1335 msgid "push refspecs for '%s' do not include '%s'"

1336 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""

1337

1304 -#: remote.c:1749

1338 +#: remote.c:1750

1339 msgid "push has no destination (push.default is 'nothing')"

1340 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"

1341

1308 -#: remote.c:1771

1342 +#: remote.c:1772

1343 msgid "cannot resolve 'simple' push to a single destination"

1344 msgstr "\"enkel push\" motsvarar flera olika mål"

1345

1312 -#: remote.c:2073

1346 +#: remote.c:2074

1347 #, c-format

1348 msgid "Your branch is based on '%s', but the upstream is gone.\n"

1349 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"

1350

1317 -#: remote.c:2077

1351 +#: remote.c:2078

1352 msgid " (use \"git branch --unset-upstream\" to fixup)\n"

1353 msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"

1354

1321 -#: remote.c:2080

1355 +#: remote.c:2081

1356 #, c-format

1357 msgid "Your branch is up-to-date with '%s'.\n"

1358 msgstr "Din gren är à jour med \"%s\".\n"

1359

1326 -#: remote.c:2084

1360 +#: remote.c:2085

1361 #, c-format

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

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

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

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

1366

1333 -#: remote.c:2090

1367 +#: remote.c:2091

1368 msgid " (use \"git push\" to publish your local commits)\n"

1369 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"

1370

1337 -#: remote.c:2093

1371 +#: remote.c:2094

1372 #, c-format

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

1374 msgid_plural ""

@@ -1344,11 +1378,11 @@ msgstr[0] ""

1378 msgstr[1] ""

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

1380

1347 -#: remote.c:2101

1381 +#: remote.c:2102

1382 msgid " (use \"git pull\" to update your local branch)\n"

1383 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"

1384

1351 -#: remote.c:2104

1385 +#: remote.c:2105

1386 #, c-format

1387 msgid ""

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

@@ -1363,20 +1397,20 @@ msgstr[1] ""

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

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

1399

1366 -#: remote.c:2114

1400 +#: remote.c:2115

1401 msgid " (use \"git pull\" to merge the remote branch into yours)\n"

1402 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"

1403

1370 -#: revision.c:2131

1404 +#: revision.c:2142

1405 msgid "your current branch appears to be broken"

1406 msgstr "din nuvarande gren verkar vara trasig"

1407

1374 -#: revision.c:2134

1408 +#: revision.c:2145

1409 #, c-format

1410 msgid "your current branch '%s' does not have any commits yet"

1411 msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"

1412

1379 -#: revision.c:2328

1413 +#: revision.c:2339

1414 msgid "--first-parent is incompatible with --bisect"

1415 msgstr "--first-parent är inkompatibelt med --bisect"

1416

@@ -1427,7 +1461,7 @@ msgstr ""

1461 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"

1462 "och checka in resultatet med \"git commit\""

1463

1430 -#: sequencer.c:190 sequencer.c:833 sequencer.c:913

1464 +#: sequencer.c:190 sequencer.c:833 sequencer.c:912

1465 #, c-format

1466 msgid "Could not write to %s"

1467 msgstr "Kunde inte skriva till %s"

@@ -1585,12 +1619,12 @@ msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

1619 msgid "Could not create sequencer directory %s"

1620 msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""

1621

1588 -#: sequencer.c:835 sequencer.c:917

1622 +#: sequencer.c:835 sequencer.c:916

1623 #, c-format

1624 msgid "Error wrapping up %s."

1625 msgstr "Fel vid ombrytning av %s."

1626

1593 -#: sequencer.c:854 sequencer.c:987

1627 +#: sequencer.c:854 sequencer.c:986

1628 msgid "no cherry-pick or revert in progress"

1629 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"

1630

@@ -1602,63 +1636,72 @@ msgstr "kan inte bestämma HEAD"

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

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

1638

1605 -#: sequencer.c:878 builtin/apply.c:4287

1639 +#: sequencer.c:878 builtin/fetch.c:610 builtin/fetch.c:851

1640 #, c-format

1607 -msgid "cannot open %s: %s"

1608 -msgstr "kan inte öppna %s: %s"

1641 +msgid "cannot open %s"

1642 +msgstr "kan inte öppna %s"

1643

1610 -#: sequencer.c:881

1644 +#: sequencer.c:880

1645 #, c-format

1646 msgid "cannot read %s: %s"

1647 msgstr "kan inte läsa %s: %s"

1648

1615 -#: sequencer.c:882

1649 +#: sequencer.c:881

1650 msgid "unexpected end of file"

1651 msgstr "oväntat filslut"

1652

1619 -#: sequencer.c:888

1653 +#: sequencer.c:887

1654 #, c-format

1655 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"

1656 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"

1657

1624 -#: sequencer.c:910

1658 +#: sequencer.c:909

1659 #, c-format

1660 msgid "Could not format %s."

1661 msgstr "Kunde inte formatera %s."

1662

1629 -#: sequencer.c:1055

1663 +#: sequencer.c:1054

1664 #, c-format

1665 msgid "%s: can't cherry-pick a %s"

1666 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""

1667

1634 -#: sequencer.c:1058

1668 +#: sequencer.c:1057

1669 #, c-format

1670 msgid "%s: bad revision"

1671 msgstr "%s: felaktig revision"

1672

1639 -#: sequencer.c:1092

1673 +#: sequencer.c:1091

1674 msgid "Can't revert as initial commit"

1675 msgstr "Kan inte ångra som första incheckning"

1676

1643 -#: sequencer.c:1093

1677 +#: sequencer.c:1092

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

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

1680

1647 -#: setup.c:246

1681 +#: setup.c:248

1682 #, c-format

1683 msgid "failed to read %s"

1684 msgstr "misslyckades läsa %s"

1685

1686 +#: setup.c:468

1687 +#, c-format

1688 +msgid "Expected git repo version <= %d, found %d"

1689 +msgstr "Förväntade git-arkivversion <= %d, hittade %d"

1690 +

1691 +#: setup.c:476

1692 +msgid "unknown repository extensions found:"

1693 +msgstr "okända arkivutökningar hittades:"

1694 +

1695 #: sha1_file.c:1080

1696 msgid "offset before end of packfile (broken .idx?)"

1697 msgstr "offset före slutet av packfilen (trasig .idx?)"

1698

1656 -#: sha1_file.c:2459

1699 +#: sha1_file.c:2458

1700 #, c-format

1701 msgid "offset before start of pack index for %s (corrupt index?)"

1702 msgstr "offset före slutet av packindex för %s (trasigt index?)"

1703

1661 -#: sha1_file.c:2463

1704 +#: sha1_file.c:2462

1705 #, c-format

1706 msgid "offset beyond end of pack index for %s (truncated index?)"

1707 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"

@@ -1685,31 +1728,40 @@ msgstr ""

1728 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"

1729 "genom att köra \"git config advice.objectNameWarning false\""

1730

1688 -#: submodule.c:62 submodule.c:96

1731 +#: submodule.c:64 submodule.c:98

1732 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"

1733 msgstr ""

1734 "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "

1735 "sammanslagningskonflikter först"

1736

1694 -#: submodule.c:66 submodule.c:100

1737 +#: submodule.c:68 submodule.c:102

1738 #, c-format

1739 msgid "Could not find section in .gitmodules where path=%s"

1740 msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"

1741

1699 -#: submodule.c:74

1742 +#: submodule.c:76

1743 #, c-format

1744 msgid "Could not update .gitmodules entry %s"

1745 msgstr "Kunde inte uppdatera .gitmodules-posten %s"

1746

1704 -#: submodule.c:107

1747 +#: submodule.c:109

1748 #, c-format

1749 msgid "Could not remove .gitmodules entry for %s"

1750 msgstr "Kunde inte ta bort .gitmodules-posten för %s"

1751

1709 -#: submodule.c:118

1752 +#: submodule.c:120

1753 msgid "staging updated .gitmodules failed"

1754 msgstr "misslyckades köa uppdaterad .gitmodules"

1755

1756 +#: submodule.c:177

1757 +msgid "negative values not allowed for submodule.fetchJobs"

1758 +msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"

1759 +

1760 +#: submodule-config.c:355

1761 +#, c-format

1762 +msgid "invalid value for %s"

1763 +msgstr "ogiltigt värde för %s"

1764 +

1765 #: trailer.c:237

1766 #, c-format

1767 msgid "running trailer command '%s' failed"

@@ -1769,7 +1821,231 @@ msgstr "kunde inte byta nman på temporära file till %s"

1821 msgid "Could not read ref %s"

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

1823

1772 -#: unpack-trees.c:203

1824 +#: unpack-trees.c:64

1825 +#, c-format

1826 +msgid ""

1827 +"Your local changes to the following files would be overwritten by checkout:\n"

1828 +"%%sPlease commit your changes or stash them before you can switch branches."

1829 +msgstr ""

1830 +"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

1831 +"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

1832 +

1833 +#: unpack-trees.c:66

1834 +#, c-format

1835 +msgid ""

1836 +"Your local changes to the following files would be overwritten by checkout:\n"

1837 +"%%s"

1838 +msgstr ""

1839 +"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"

1840 +"%%s"

1841 +

1842 +#: unpack-trees.c:69

1843 +#, c-format

1844 +msgid ""

1845 +"Your local changes to the following files would be overwritten by merge:\n"

1846 +"%%sPlease commit your changes or stash them before you can merge."

1847 +msgstr ""

1848 +"Dina lokala ändringar av följande filer skulle skrivas över av "

1849 +"sammanslagning:\n"

1850 +"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."

1851 +

1852 +#: unpack-trees.c:71

1853 +#, c-format

1854 +msgid ""

1855 +"Your local changes to the following files would be overwritten by merge:\n"

1856 +"%%s"

1857 +msgstr ""

1858 +"Dina lokala ändringar av följande filer skulle skrivas över av "

1859 +"sammanslagning:\n"

1860 +"%%s"

1861 +

1862 +#: unpack-trees.c:74

1863 +#, c-format

1864 +msgid ""

1865 +"Your local changes to the following files would be overwritten by %s:\n"

1866 +"%%sPlease commit your changes or stash them before you can %s."

1867 +msgstr ""

1868 +"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

1869 +"%%sChecka in dina ändringar eller använd \"stash\" innan du kan utföra \"%s"

1870 +"\"."

1871 +

1872 +#: unpack-trees.c:76

1873 +#, c-format

1874 +msgid ""

1875 +"Your local changes to the following files would be overwritten by %s:\n"

1876 +"%%s"

1877 +msgstr ""

1878 +"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"

1879 +"%%s"

1880 +

1881 +#: unpack-trees.c:81

1882 +#, c-format

1883 +msgid ""

1884 +"Updating the following directories would lose untracked files in it:\n"

1885 +"%s"

1886 +msgstr ""

1887 +"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "

1888 +"dem:\n"

1889 +"%s"

1890 +

1891 +#: unpack-trees.c:85

1892 +#, c-format

1893 +msgid ""

1894 +"The following untracked working tree files would be removed by checkout:\n"

1895 +"%%sPlease move or remove them before you can switch branches."

1896 +msgstr ""

1897 +"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

1898 +"%%sFlytta eller ta bort dem innan du byter gren."

1899 +

1900 +#: unpack-trees.c:87

1901 +#, c-format

1902 +msgid ""

1903 +"The following untracked working tree files would be removed by checkout:\n"

1904 +"%%s"

1905 +msgstr ""

1906 +"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"

1907 +"%%s"

1908 +

1909 +#: unpack-trees.c:90

1910 +#, c-format

1911 +msgid ""

1912 +"The following untracked working tree files would be removed by merge:\n"

1913 +"%%sPlease move or remove them before you can merge."

1914 +msgstr ""

1915 +"Följande ospårade filer i arbetskatalogen skulle tas bort av "

1916 +"sammanslagningen:\n"

1917 +"%%sFlytta eller ta bort dem innan du byter gren."

1918 +

1919 +#: unpack-trees.c:92

1920 +#, c-format

1921 +msgid ""

1922 +"The following untracked working tree files would be removed by merge:\n"

1923 +"%%s"

1924 +msgstr ""

1925 +"Följande ospårade filer i arbetskatalogen skulle tas bort av "

1926 +"sammanslagningen:\n"

1927 +"%%s"

1928 +

1929 +#: unpack-trees.c:95

1930 +#, c-format

1931 +msgid ""

1932 +"The following untracked working tree files would be removed by %s:\n"

1933 +"%%sPlease move or remove them before you can %s."

1934 +msgstr ""

1935 +"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

1936 +"%%sFlytta eller ta bort dem innan du kan utföra \"%s\"."

1937 +

1938 +#: unpack-trees.c:97

1939 +#, c-format

1940 +msgid ""

1941 +"The following untracked working tree files would be removed by %s:\n"

1942 +"%%s"

1943 +msgstr ""

1944 +"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"

1945 +"%%s"

1946 +

1947 +#: unpack-trees.c:102

1948 +#, c-format

1949 +msgid ""

1950 +"The following untracked working tree files would be overwritten by "

1951 +"checkout:\n"

1952 +"%%sPlease move or remove them before you can switch branches."

1953 +msgstr ""

1954 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av "

1955 +"utcheckningen:\n"

1956 +"%%sFlytta eller ta bort dem innan du byter gren."

1957 +

1958 +#: unpack-trees.c:104

1959 +#, c-format

1960 +msgid ""

1961 +"The following untracked working tree files would be overwritten by "

1962 +"checkout:\n"

1963 +"%%s"

1964 +msgstr ""

1965 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av "

1966 +"utcheckningen:\n"

1967 +"%%s"

1968 +

1969 +#: unpack-trees.c:107

1970 +#, c-format

1971 +msgid ""

1972 +"The following untracked working tree files would be overwritten by merge:\n"

1973 +"%%sPlease move or remove them before you can merge."

1974 +msgstr ""

1975 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av "

1976 +"sammanslagningen:\n"

1977 +"%%sFlytta eller ta bort dem innan du byter gren."

1978 +

1979 +#: unpack-trees.c:109

1980 +#, c-format

1981 +msgid ""

1982 +"The following untracked working tree files would be overwritten by merge:\n"

1983 +"%%s"

1984 +msgstr ""

1985 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av "

1986 +"sammanslagningen:\n"

1987 +"%%s"

1988 +

1989 +#: unpack-trees.c:112

1990 +#, c-format

1991 +msgid ""

1992 +"The following untracked working tree files would be overwritten by %s:\n"

1993 +"%%sPlease move or remove them before you can %s."

1994 +msgstr ""

1995 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

1996 +"%%sFlytta eller ta bort dem innan du kan \"%s\"."

1997 +

1998 +#: unpack-trees.c:114

1999 +#, c-format

2000 +msgid ""

2001 +"The following untracked working tree files would be overwritten by %s:\n"

2002 +"%%s"

2003 +msgstr ""

2004 +"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"

2005 +"%%s"

2006 +

2007 +#: unpack-trees.c:121

2008 +#, c-format

2009 +msgid "Entry '%s' overlaps with '%s'. Cannot bind."

2010 +msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."

2011 +

2012 +#: unpack-trees.c:124

2013 +#, c-format

2014 +msgid ""

2015 +"Cannot update sparse checkout: the following entries are not up-to-date:\n"

2016 +"%s"

2017 +msgstr ""

2018 +"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"

2019 +"%s"

2020 +

2021 +#: unpack-trees.c:126

2022 +#, c-format

2023 +msgid ""

2024 +"The following Working tree files would be overwritten by sparse checkout "

2025 +"update:\n"

2026 +"%s"

2027 +msgstr ""

2028 +"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles "

2029 +"utcheckning:\n"

2030 +"%s"

2031 +

2032 +#: unpack-trees.c:128

2033 +#, c-format

2034 +msgid ""

2035 +"The following Working tree files would be removed by sparse checkout "

2036 +"update:\n"

2037 +"%s"

2038 +msgstr ""

2039 +"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "

2040 +"utcheckning:\n"

2041 +"%s"

2042 +

2043 +#: unpack-trees.c:205

2044 +#, c-format

2045 +msgid "Aborting\n"

2046 +msgstr "Avbryter\n"

2047 +

2048 +#: unpack-trees.c:237

2049 msgid "Checking out files"

2050 msgstr "Checkar ut filer"

2051

@@ -1807,198 +2083,194 @@ msgstr "felaktigt \"..\"-sökvägssegment"

2083 msgid "could not open '%s' for reading and writing"

2084 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"

2085

1810 -#: wrapper.c:224 wrapper.c:383

2086 +#: wrapper.c:224 wrapper.c:383 builtin/am.c:779

2087 #, c-format

2088 msgid "could not open '%s' for writing"

2089 msgstr "kunde inte öppna \"%s\" för skrivning"

2090

1815 -#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/commit.c:1691

1816 -#: builtin/merge.c:1075 builtin/pull.c:387

2091 +#: wrapper.c:226 wrapper.c:385 builtin/am.c:323 builtin/am.c:772

2092 +#: builtin/am.c:860 builtin/commit.c:1711 builtin/merge.c:1086

2093 +#: builtin/pull.c:407

2094 #, c-format

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

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

2097

1821 -#: wrapper.c:611

1822 -#, c-format

1823 -msgid "unable to access '%s': %s"

1824 -msgstr "kan inte komma åt \"%s\": %s"

1825 -

1826 -#: wrapper.c:632

2098 +#: wrapper.c:594 wrapper.c:615

2099 #, c-format

2100 msgid "unable to access '%s'"

2101 msgstr "kan inte komma åt \"%s\""

2102

1831 -#: wrapper.c:640

2103 +#: wrapper.c:623

2104 msgid "unable to get current working directory"

2105 msgstr "kan inte hämta aktuell arbetskatalog"

2106

1835 -#: wrapper.c:667

2107 +#: wrapper.c:650

2108 #, c-format

2109 msgid "could not open %s for writing"

2110 msgstr "kunde inte öppna %s för skrivning"

2111

1840 -#: wrapper.c:678 builtin/am.c:410

2112 +#: wrapper.c:661 builtin/am.c:410

2113 #, c-format

2114 msgid "could not write to %s"

2115 msgstr "kunde inte skriva till %s"

2116

1845 -#: wrapper.c:684

2117 +#: wrapper.c:667

2118 #, c-format

2119 msgid "could not close %s"

2120 msgstr "kunde inte stänga %s"

2121

1850 -#: wt-status.c:149

2122 +#: wt-status.c:150

2123 msgid "Unmerged paths:"

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

2125

1854 -#: wt-status.c:176 wt-status.c:203

2126 +#: wt-status.c:177 wt-status.c:204

2127 #, c-format

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

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

2130

1859 -#: wt-status.c:178 wt-status.c:205

2131 +#: wt-status.c:179 wt-status.c:206

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

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

2134

1863 -#: wt-status.c:182

2135 +#: wt-status.c:183

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

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

2138

1867 -#: wt-status.c:184 wt-status.c:188

2139 +#: wt-status.c:185 wt-status.c:189

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

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

2142

1871 -#: wt-status.c:186

2143 +#: wt-status.c:187

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

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

2146

1875 -#: wt-status.c:197 wt-status.c:880

2147 +#: wt-status.c:198 wt-status.c:881

2148 msgid "Changes to be committed:"

2149 msgstr "Ändringar att checka in:"

2150

1879 -#: wt-status.c:215 wt-status.c:889

2151 +#: wt-status.c:216 wt-status.c:890

2152 msgid "Changes not staged for commit:"

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

2154

1883 -#: wt-status.c:219

2155 +#: wt-status.c:220

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

2157 msgstr ""

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

2159

1888 -#: wt-status.c:221

2160 +#: wt-status.c:222

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

2162 msgstr ""

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

2164

1893 -#: wt-status.c:222

2165 +#: wt-status.c:223

2166 msgid ""

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

2168 msgstr ""

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

2170 "arbetskatalogen)"

2171

1900 -#: wt-status.c:224

2172 +#: wt-status.c:225

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

2174 msgstr ""

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

2176

1905 -#: wt-status.c:236

2177 +#: wt-status.c:237

2178 #, c-format

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

2180 msgstr ""

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

2182

1911 -#: wt-status.c:251

2183 +#: wt-status.c:252

2184 msgid "both deleted:"

2185 msgstr "borttaget av bägge:"

2186

1915 -#: wt-status.c:253

2187 +#: wt-status.c:254

2188 msgid "added by us:"

2189 msgstr "tillagt av oss:"

2190

1919 -#: wt-status.c:255

2191 +#: wt-status.c:256

2192 msgid "deleted by them:"

2193 msgstr "borttaget av dem:"

2194

1923 -#: wt-status.c:257

2195 +#: wt-status.c:258

2196 msgid "added by them:"

2197 msgstr "tillagt av dem:"

2198

1927 -#: wt-status.c:259

2199 +#: wt-status.c:260

2200 msgid "deleted by us:"

2201 msgstr "borttaget av oss:"

2202

1931 -#: wt-status.c:261

2203 +#: wt-status.c:262

2204 msgid "both added:"

2205 msgstr "tillagt av bägge:"

2206

1935 -#: wt-status.c:263

2207 +#: wt-status.c:264

2208 msgid "both modified:"

2209 msgstr "ändrat av bägge:"

2210

1939 -#: wt-status.c:265

2211 +#: wt-status.c:266

2212 #, c-format

2213 msgid "bug: unhandled unmerged status %x"

2214 msgstr "programfel: ej hanterad \"unmerged\"-status %x"

2215

1944 -#: wt-status.c:273

2216 +#: wt-status.c:274

2217 msgid "new file:"

2218 msgstr "ny fil:"

2219

1948 -#: wt-status.c:275

2220 +#: wt-status.c:276

2221 msgid "copied:"

2222 msgstr "kopierad:"

2223

1952 -#: wt-status.c:277

2224 +#: wt-status.c:278

2225 msgid "deleted:"

2226 msgstr "borttagen:"

2227

1956 -#: wt-status.c:279

2228 +#: wt-status.c:280

2229 msgid "modified:"

2230 msgstr "ändrad:"

2231

1960 -#: wt-status.c:281

2232 +#: wt-status.c:282

2233 msgid "renamed:"

2234 msgstr "namnbytt:"

2235

1964 -#: wt-status.c:283

2236 +#: wt-status.c:284

2237 msgid "typechange:"

2238 msgstr "typbyte:"

2239

1968 -#: wt-status.c:285

2240 +#: wt-status.c:286

2241 msgid "unknown:"

2242 msgstr "okänd:"

2243

1972 -#: wt-status.c:287

2244 +#: wt-status.c:288

2245 msgid "unmerged:"

2246 msgstr "osammanslagen:"

2247

1976 -#: wt-status.c:369

2248 +#: wt-status.c:370

2249 msgid "new commits, "

2250 msgstr "nya incheckningar, "

2251

1980 -#: wt-status.c:371

2252 +#: wt-status.c:372

2253 msgid "modified content, "

2254 msgstr "ändrat innehåll, "

2255

1984 -#: wt-status.c:373

2256 +#: wt-status.c:374

2257 msgid "untracked content, "

2258 msgstr "ospårat innehåll, "

2259

1988 -#: wt-status.c:390

2260 +#: wt-status.c:391

2261 #, c-format

2262 msgid "bug: unhandled diff status %c"

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

2264

1993 -#: wt-status.c:754

2265 +#: wt-status.c:755

2266 msgid "Submodules changed but not updated:"

2267 msgstr "Undermoduler ändrade men inte uppdaterade:"

2268

1997 -#: wt-status.c:756

2269 +#: wt-status.c:757

2270 msgid "Submodule changes to be committed:"

2271 msgstr "Undermodulers ändringar att checka in:"

2272

2001 -#: wt-status.c:837

2273 +#: wt-status.c:838

2274 msgid ""

2275 "Do not touch the line above.\n"

2276 "Everything below will be removed."

@@ -2006,39 +2278,39 @@ msgstr ""

2278 "Rör inte raden ovan.\n"

2279 "Allt nedan kommer tas bort."

2280

2009 -#: wt-status.c:948

2281 +#: wt-status.c:949

2282 msgid "You have unmerged paths."

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

2284

2013 -#: wt-status.c:951

2285 +#: wt-status.c:952

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

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

2288

2017 -#: wt-status.c:954

2289 +#: wt-status.c:956

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

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

2292

2021 -#: wt-status.c:957

2293 +#: wt-status.c:959

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

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

2296

2025 -#: wt-status.c:967

2297 +#: wt-status.c:969

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

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

2300

2029 -#: wt-status.c:970

2301 +#: wt-status.c:972

2302 msgid "The current patch is empty."

2303 msgstr "Aktuell patch är tom."

2304

2033 -#: wt-status.c:974

2305 +#: wt-status.c:976

2306 msgid " (fix conflicts and then run \"git am --continue\")"

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

2308

2037 -#: wt-status.c:976

2309 +#: wt-status.c:978

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

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

2312

2041 -#: wt-status.c:978

2313 +#: wt-status.c:980

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

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

2316

@@ -2185,43 +2457,43 @@ msgid " (use \"git bisect reset\" to get back to the original branch)"

2457 msgstr ""

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

2459

2188 -#: wt-status.c:1438

2460 +#: wt-status.c:1460

2461 msgid "On branch "

2462 msgstr "På grenen "

2463

2192 -#: wt-status.c:1444

2464 +#: wt-status.c:1466

2465 msgid "interactive rebase in progress; onto "

2466 msgstr "interaktiv ombasering pågår; ovanpå"

2467

2196 -#: wt-status.c:1446

2468 +#: wt-status.c:1468

2469 msgid "rebase in progress; onto "

2470 msgstr "ombasering pågår; ovanpå"

2471

2200 -#: wt-status.c:1451

2472 +#: wt-status.c:1473

2473 msgid "HEAD detached at "

2474 msgstr "HEAD frånkopplad vid "

2475

2204 -#: wt-status.c:1453

2476 +#: wt-status.c:1475

2477 msgid "HEAD detached from "

2478 msgstr "HEAD frånkopplad från "

2479

2208 -#: wt-status.c:1456

2480 +#: wt-status.c:1478

2481 msgid "Not currently on any branch."

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

2483

2212 -#: wt-status.c:1474

2484 +#: wt-status.c:1496

2485 msgid "Initial commit"

2486 msgstr "Första incheckning"

2487

2216 -#: wt-status.c:1488

2488 +#: wt-status.c:1510

2489 msgid "Untracked files"

2490 msgstr "Ospårade filer"

2491

2220 -#: wt-status.c:1490

2492 +#: wt-status.c:1512

2493 msgid "Ignored files"

2494 msgstr "Ignorerade filer"

2495

2224 -#: wt-status.c:1494

2496 +#: wt-status.c:1516

2497 #, c-format

2498 msgid ""

2499 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"

@@ -2233,32 +2505,32 @@ msgstr ""

2505 "lägga till nya filer själv (se \"git help status\")."

2506

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

2236 -#: wt-status.c:1500

2508 +#: wt-status.c:1522

2509 #, c-format

2510 msgid "Untracked files not listed%s"

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

2512

2241 -#: wt-status.c:1502

2513 +#: wt-status.c:1524

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

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

2516

2245 -#: wt-status.c:1508

2517 +#: wt-status.c:1530

2518 msgid "No changes"

2519 msgstr "Inga ändringar"

2520

2249 -#: wt-status.c:1513

2521 +#: wt-status.c:1535

2522 #, c-format

2523 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"

2524 msgstr ""

2525 "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"

2526 "\")\n"

2527

2256 -#: wt-status.c:1516

2528 +#: wt-status.c:1538

2529 #, c-format

2530 msgid "no changes added to commit\n"

2531 msgstr "inga ändringar att checka in\n"

2532

2261 -#: wt-status.c:1519

2533 +#: wt-status.c:1541

2534 #, c-format

2535 msgid ""

2536 "nothing added to commit but untracked files present (use \"git add\" to "

@@ -2267,52 +2539,52 @@ msgstr ""

2539 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"

2540 "\")\n"

2541

2270 -#: wt-status.c:1522

2542 +#: wt-status.c:1544

2543 #, c-format

2544 msgid "nothing added to commit but untracked files present\n"

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

2546

2275 -#: wt-status.c:1525

2547 +#: wt-status.c:1547

2548 #, c-format

2549 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"

2550 msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"

2551

2280 -#: wt-status.c:1528 wt-status.c:1533

2552 +#: wt-status.c:1550 wt-status.c:1555

2553 #, c-format

2554 msgid "nothing to commit\n"

2555 msgstr "inget att checka in\n"

2556

2285 -#: wt-status.c:1531

2557 +#: wt-status.c:1553

2558 #, c-format

2559 msgid "nothing to commit (use -u to show untracked files)\n"

2560 msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"

2561

2290 -#: wt-status.c:1535

2562 +#: wt-status.c:1557

2563 #, c-format

2564 msgid "nothing to commit, working directory clean\n"

2565 msgstr "inget att checka in, arbetskatalogen ren\n"

2566

2295 -#: wt-status.c:1642

2567 +#: wt-status.c:1664

2568 msgid "Initial commit on "

2569 msgstr "Första incheckning på "

2570

2299 -#: wt-status.c:1646

2571 +#: wt-status.c:1668

2572 msgid "HEAD (no branch)"

2573 msgstr "HEAD (ingen gren)"

2574

2303 -#: wt-status.c:1675

2575 +#: wt-status.c:1697

2576 msgid "gone"

2577 msgstr "försvunnen"

2578

2307 -#: wt-status.c:1677 wt-status.c:1685

2579 +#: wt-status.c:1699 wt-status.c:1707

2580 msgid "behind "

2581 msgstr "efter "

2582

2311 -#: wt-status.c:1680 wt-status.c:1683

2583 +#: wt-status.c:1702 wt-status.c:1705

2584 msgid "ahead "

2585 msgstr "före "

2586

2315 -#: compat/precompose_utf8.c:57 builtin/clone.c:413

2587 +#: compat/precompose_utf8.c:57 builtin/clone.c:415

2588 #, c-format

2589 msgid "failed to unlink '%s'"

2590 msgstr "misslyckades ta bort länken \"%s\""

@@ -2326,7 +2598,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."

2598 msgid "unexpected diff status %c"

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

2600

2329 -#: builtin/add.c:70 builtin/commit.c:278

2601 +#: builtin/add.c:70 builtin/commit.c:280

2602 msgid "updating files failed"

2603 msgstr "misslyckades uppdatera filer"

2604

@@ -2339,7 +2611,7 @@ msgstr "ta bort \"%s\"\n"

2611 msgid "Unstaged changes after refreshing the index:"

2612 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"

2613

2342 -#: builtin/add.c:194 builtin/rev-parse.c:797

2614 +#: builtin/add.c:194 builtin/rev-parse.c:811

2615 msgid "Could not read the index"

2616 msgstr "Kunde inte läsa indexet"

2617

@@ -2375,14 +2647,14 @@ msgid "The following paths are ignored by one of your .gitignore files:\n"

2647 msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"

2648

2649 #: builtin/add.c:249 builtin/clean.c:870 builtin/fetch.c:112 builtin/mv.c:111

2378 -#: builtin/prune-packed.c:55 builtin/pull.c:189 builtin/push.c:511

2379 -#: builtin/remote.c:1330 builtin/rm.c:268 builtin/send-pack.c:162

2650 +#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:511

2651 +#: builtin/remote.c:1332 builtin/rm.c:268 builtin/send-pack.c:162

2652 msgid "dry run"

2653 msgstr "testkörning"

2654

2383 -#: builtin/add.c:250 builtin/apply.c:4561 builtin/check-ignore.c:19

2384 -#: builtin/commit.c:1322 builtin/count-objects.c:85 builtin/fsck.c:558

2385 -#: builtin/log.c:1651 builtin/mv.c:110 builtin/read-tree.c:114

2655 +#: builtin/add.c:250 builtin/apply.c:4563 builtin/check-ignore.c:19

2656 +#: builtin/commit.c:1333 builtin/count-objects.c:85 builtin/fsck.c:557

2657 +#: builtin/log.c:1826 builtin/mv.c:110 builtin/read-tree.c:114

2658 msgid "be verbose"

2659 msgstr "var pratsam"

2660

@@ -2390,7 +2662,7 @@ msgstr "var pratsam"

2662 msgid "interactive picking"

2663 msgstr "plocka interaktivt"

2664

2393 -#: builtin/add.c:253 builtin/checkout.c:1155 builtin/reset.c:286

2665 +#: builtin/add.c:253 builtin/checkout.c:1154 builtin/reset.c:286

2666 msgid "select hunks interactively"

2667 msgstr "välj stycken interaktivt"

2668

@@ -2458,16 +2730,16 @@ msgid "Maybe you wanted to say 'git add .'?\n"

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

2731

2732 #: builtin/add.c:358 builtin/check-ignore.c:172 builtin/clean.c:914

2461 -#: builtin/commit.c:337 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2462 -#: builtin/submodule--helper.c:35

2733 +#: builtin/commit.c:339 builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298

2734 +#: builtin/submodule--helper.c:240

2735 msgid "index file corrupt"

2736 msgstr "indexfilen trasig"

2737

2466 -#: builtin/add.c:439 builtin/apply.c:4659 builtin/mv.c:280 builtin/rm.c:430

2738 +#: builtin/add.c:439 builtin/apply.c:4661 builtin/mv.c:283 builtin/rm.c:430

2739 msgid "Unable to write new index file"

2740 msgstr "Kunde inte skriva ny indexfil"

2741

2470 -#: builtin/am.c:256 builtin/commit.c:738 builtin/merge.c:1078

2742 +#: builtin/am.c:256 builtin/commit.c:749 builtin/merge.c:1089

2743 #, c-format

2744 msgid "could not read '%s'"

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

@@ -2495,16 +2767,6 @@ msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""

2767 msgid "fseek failed"

2768 msgstr "\"fseek\" misslyckades"

2769

2498 -#: builtin/am.c:772 builtin/am.c:860

2499 -#, c-format

2500 -msgid "could not open '%s' for reading: %s"

2501 -msgstr "kunde inte öppna \"%s\" för läsning: %s"

2502 -

2503 -#: builtin/am.c:779

2504 -#, c-format

2505 -msgid "could not open '%s' for writing: %s"

2506 -msgstr "Kunde inte öppna \"%s\" för skrivning: %s"

2507 -

2770 #: builtin/am.c:788

2771 #, c-format

2772 msgid "could not parse patch '%s'"

@@ -2514,76 +2776,76 @@ msgstr "kunde inte tolka patchen \"%s\""

2776 msgid "Only one StGIT patch series can be applied at once"

2777 msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"

2778

2517 -#: builtin/am.c:901

2779 +#: builtin/am.c:900

2780 msgid "invalid timestamp"

2781 msgstr "ogiltig tidsstämpel"

2782

2521 -#: builtin/am.c:904 builtin/am.c:912

2783 +#: builtin/am.c:903 builtin/am.c:911

2784 msgid "invalid Date line"

2785 msgstr "ogiltig \"Date\"-rad"

2786

2525 -#: builtin/am.c:909

2787 +#: builtin/am.c:908

2788 msgid "invalid timezone offset"

2789 msgstr "ogiltig tidszons-offset"

2790

2529 -#: builtin/am.c:996

2791 +#: builtin/am.c:995

2792 msgid "Patch format detection failed."

2793 msgstr "Misslyckades detektera patchformat."

2794

2533 -#: builtin/am.c:1001 builtin/clone.c:378

2795 +#: builtin/am.c:1000 builtin/clone.c:380

2796 #, c-format

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

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

2799

2538 -#: builtin/am.c:1005

2800 +#: builtin/am.c:1004

2801 msgid "Failed to split patches."

2802 msgstr "Misslyckades dela patchar."

2803

2542 -#: builtin/am.c:1137 builtin/commit.c:363

2804 +#: builtin/am.c:1136 builtin/commit.c:365

2805 msgid "unable to write index file"

2806 msgstr "kan inte skriva indexfil"

2807

2546 -#: builtin/am.c:1188

2808 +#: builtin/am.c:1187

2809 #, c-format

2810 msgid "When you have resolved this problem, run \"%s --continue\"."

2811 msgstr "När du har löst problemet, kör \"%s --continue\"."

2812

2551 -#: builtin/am.c:1189

2813 +#: builtin/am.c:1188

2814 #, c-format

2815 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."

2816 msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."

2817

2556 -#: builtin/am.c:1190

2818 +#: builtin/am.c:1189

2819 #, c-format

2820 msgid "To restore the original branch and stop patching, run \"%s --abort\"."

2821 msgstr ""

2822 "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."

2823

2562 -#: builtin/am.c:1328

2824 +#: builtin/am.c:1327

2825 msgid "Patch is empty. Was it split wrong?"

2826 msgstr "Patchen är tom. Delades den upp felaktigt?"

2827

2566 -#: builtin/am.c:1402 builtin/log.c:1350

2828 +#: builtin/am.c:1401 builtin/log.c:1516

2829 #, c-format

2830 msgid "invalid ident line: %s"

2831 msgstr "ogiltig ident-rad: %s"

2832

2571 -#: builtin/am.c:1429

2833 +#: builtin/am.c:1428

2834 #, c-format

2835 msgid "unable to parse commit %s"

2836 msgstr "kunde inte tolka incheckningen %s"

2837

2576 -#: builtin/am.c:1631

2838 +#: builtin/am.c:1630

2839 msgid "Repository lacks necessary blobs to fall back on 3-way merge."

2840 msgstr ""

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

2842 "vägssammanslagning."

2843

2582 -#: builtin/am.c:1633

2844 +#: builtin/am.c:1632

2845 msgid "Using index info to reconstruct a base tree..."

2846 msgstr "Använder indexinfo för att återskapa ett basträd..."

2847

2586 -#: builtin/am.c:1652

2848 +#: builtin/am.c:1651

2849 msgid ""

2850 "Did you hand edit your patch?\n"

2851 "It does not apply to blobs recorded in its index."

@@ -2591,39 +2853,39 @@ msgstr ""

2853 "Har du handredigerat din patch?\n"

2854 "Den kan inte tillämpas på blobbar som antecknats i dess index."

2855

2594 -#: builtin/am.c:1658

2856 +#: builtin/am.c:1657

2857 msgid "Falling back to patching base and 3-way merge..."

2858 msgstr ""

2859 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."

2860

2599 -#: builtin/am.c:1673

2861 +#: builtin/am.c:1672

2862 msgid "Failed to merge in the changes."

2863 msgstr "Misslyckades slå ihop ändringarna."

2864

2603 -#: builtin/am.c:1697 builtin/merge.c:633

2865 +#: builtin/am.c:1696 builtin/merge.c:636

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

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

2868

2607 -#: builtin/am.c:1704

2869 +#: builtin/am.c:1703

2870 msgid "applying to an empty history"

2871 msgstr "tillämpar på en tom historik"

2872

2611 -#: builtin/am.c:1717 builtin/commit.c:1755 builtin/merge.c:830

2612 -#: builtin/merge.c:855

2873 +#: builtin/am.c:1716 builtin/commit.c:1775 builtin/merge.c:841

2874 +#: builtin/merge.c:866

2875 msgid "failed to write commit object"

2876 msgstr "kunde inte skriva incheckningsobjekt"

2877

2616 -#: builtin/am.c:1749 builtin/am.c:1753

2878 +#: builtin/am.c:1748 builtin/am.c:1752

2879 #, c-format

2880 msgid "cannot resume: %s does not exist."

2881 msgstr "kan inte återuppta: %s finns inte."

2882

2621 -#: builtin/am.c:1769

2883 +#: builtin/am.c:1768

2884 msgid "cannot be interactive without stdin connected to a terminal."

2885 msgstr ""

2886 "kan inte vara interaktiv om standard in inte är ansluten till en terminal."

2887

2626 -#: builtin/am.c:1774

2888 +#: builtin/am.c:1773

2889 msgid "Commit Body is:"

2890 msgstr "Incheckningskroppen är:"

2891

@@ -2631,35 +2893,35 @@ msgstr "Incheckningskroppen är:"

2893 #. in your translation. The program will only accept English

2894 #. input at this point.

2895 #.

2634 -#: builtin/am.c:1784

2896 +#: builtin/am.c:1783

2897 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "

2898 msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "

2899

2638 -#: builtin/am.c:1834

2900 +#: builtin/am.c:1833

2901 #, c-format

2902 msgid "Dirty index: cannot apply patches (dirty: %s)"

2903 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"

2904

2643 -#: builtin/am.c:1869 builtin/am.c:1941

2905 +#: builtin/am.c:1868 builtin/am.c:1940

2906 #, c-format

2907 msgid "Applying: %.*s"

2908 msgstr "Tillämpar: %.*s"

2909

2648 -#: builtin/am.c:1885

2910 +#: builtin/am.c:1884

2911 msgid "No changes -- Patch already applied."

2912 msgstr "Inga ändringar -- Patchen har redan tillämpats."

2913

2652 -#: builtin/am.c:1893

2914 +#: builtin/am.c:1892

2915 #, c-format

2916 msgid "Patch failed at %s %.*s"

2917 msgstr "Patch misslyckades på %s %.*s"

2918

2657 -#: builtin/am.c:1899

2919 +#: builtin/am.c:1898

2920 #, c-format

2921 msgid "The copy of the patch that failed is found in: %s"

2922 msgstr "En kopia av patchen som misslyckades finns i: %s"

2923

2662 -#: builtin/am.c:1944

2924 +#: builtin/am.c:1943

2925 msgid ""

2926 "No changes - did you forget to use 'git add'?\n"

2927 "If there is nothing left to stage, chances are that something else\n"

@@ -2669,7 +2931,7 @@ msgstr ""

2931 "Om det inte är något kvar att köa kan det hända att något annat redan\n"

2932 "introducerat samma ändringar; kanske du bör hoppa över patchen."

2933

2672 -#: builtin/am.c:1951

2934 +#: builtin/am.c:1950

2935 msgid ""

2936 "You still have unmerged paths in your index.\n"

2937 "Did you forget to use 'git add'?"

@@ -2677,17 +2939,17 @@ msgstr ""

2939 "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"

2940 "Glömde du använda \"git add\"?"

2941

2680 -#: builtin/am.c:2059 builtin/am.c:2063 builtin/am.c:2075 builtin/reset.c:308

2942 +#: builtin/am.c:2058 builtin/am.c:2062 builtin/am.c:2074 builtin/reset.c:308

2943 #: builtin/reset.c:316

2944 #, c-format

2945 msgid "Could not parse object '%s'."

2946 msgstr "Kan inte tolka objektet \"%s\""

2947

2686 -#: builtin/am.c:2111

2948 +#: builtin/am.c:2110

2949 msgid "failed to clean index"

2950 msgstr "misslyckades städa upp indexet"

2951

2690 -#: builtin/am.c:2145

2952 +#: builtin/am.c:2144

2953 msgid ""

2954 "You seem to have moved HEAD since the last 'am' failure.\n"

2955 "Not rewinding to ORIG_HEAD"

@@ -2695,152 +2957,154 @@ msgstr ""

2957 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"

2958 "Återställer inte till ORIG_HEAD"

2959

2698 -#: builtin/am.c:2206

2960 +#: builtin/am.c:2205

2961 #, c-format

2962 msgid "Invalid value for --patch-format: %s"

2963 msgstr "Felaktigt värde för --patch-format: %s"

2964

2703 -#: builtin/am.c:2239

2965 +#: builtin/am.c:2238

2966 msgid "git am [<options>] [(<mbox>|<Maildir>)...]"

2967 msgstr "git am [<flaggor>] [(<mbox>|<Maildir>)...]"

2968

2707 -#: builtin/am.c:2240

2969 +#: builtin/am.c:2239

2970 msgid "git am [<options>] (--continue | --skip | --abort)"

2971 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"

2972

2711 -#: builtin/am.c:2246

2973 +#: builtin/am.c:2245

2974 msgid "run interactively"

2975 msgstr "kör interaktivt"

2976

2715 -#: builtin/am.c:2248

2977 +#: builtin/am.c:2247

2978 msgid "historical option -- no-op"

2979 msgstr "historisk flagga -- no-op"

2980

2719 -#: builtin/am.c:2250

2981 +#: builtin/am.c:2249

2982 msgid "allow fall back on 3way merging if needed"

2983 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"

2984

2723 -#: builtin/am.c:2251 builtin/init-db.c:474 builtin/prune-packed.c:57

2985 +#: builtin/am.c:2250 builtin/init-db.c:478 builtin/prune-packed.c:57

2986 #: builtin/repack.c:171

2987 msgid "be quiet"

2988 msgstr "var tyst"

2989

2728 -#: builtin/am.c:2253

2990 +#: builtin/am.c:2252

2991 msgid "add a Signed-off-by line to the commit message"

2992 msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"

2993

2732 -#: builtin/am.c:2256

2994 +#: builtin/am.c:2255

2995 msgid "recode into utf8 (default)"

2996 msgstr "koda om till utf8 (standard)"

2997

2736 -#: builtin/am.c:2258

2998 +#: builtin/am.c:2257

2999 msgid "pass -k flag to git-mailinfo"

3000 msgstr "sänd flaggan -k till git-mailinfo"

3001

2740 -#: builtin/am.c:2260

3002 +#: builtin/am.c:2259

3003 msgid "pass -b flag to git-mailinfo"

3004 msgstr "sänd flaggan -b till git-mailinfo"

3005

2744 -#: builtin/am.c:2262

3006 +#: builtin/am.c:2261

3007 msgid "pass -m flag to git-mailinfo"

3008 msgstr "sänd flaggan -m till git-mailinfo"

3009

2748 -#: builtin/am.c:2264

3010 +#: builtin/am.c:2263

3011 msgid "pass --keep-cr flag to git-mailsplit for mbox format"

3012 msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"

3013

2752 -#: builtin/am.c:2267

3014 +#: builtin/am.c:2266

3015 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"

3016 msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"

3017

2756 -#: builtin/am.c:2270

3018 +#: builtin/am.c:2269

3019 msgid "strip everything before a scissors line"

3020 msgstr "ta bort allting före en saxlinje"

3021

2760 -#: builtin/am.c:2271 builtin/apply.c:4544

3022 +#: builtin/am.c:2270 builtin/apply.c:4546

3023 msgid "action"

3024 msgstr "åtgärd"

3025

2764 -#: builtin/am.c:2272 builtin/am.c:2275 builtin/am.c:2278 builtin/am.c:2281

2765 -#: builtin/am.c:2284 builtin/am.c:2287 builtin/am.c:2290 builtin/am.c:2293

2766 -#: builtin/am.c:2299

3026 +#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280

3027 +#: builtin/am.c:2283 builtin/am.c:2286 builtin/am.c:2289 builtin/am.c:2292

3028 +#: builtin/am.c:2298

3029 msgid "pass it through git-apply"

3030 msgstr "sänd det genom git-apply"

3031

2770 -#: builtin/am.c:2280 builtin/apply.c:4568

3032 +#: builtin/am.c:2279 builtin/apply.c:4570

3033 msgid "root"

3034 msgstr "rot"

3035

2774 -#: builtin/am.c:2283 builtin/am.c:2286 builtin/apply.c:4506

2775 -#: builtin/apply.c:4509 builtin/clone.c:86 builtin/fetch.c:95

2776 -#: builtin/pull.c:171 builtin/submodule--helper.c:72

2777 -#: builtin/submodule--helper.c:160 builtin/submodule--helper.c:163

3036 +#: builtin/am.c:2282 builtin/am.c:2285 builtin/apply.c:4508

3037 +#: builtin/apply.c:4511 builtin/clone.c:90 builtin/fetch.c:95

3038 +#: builtin/pull.c:179 builtin/submodule--helper.c:277

3039 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:485

3040 +#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:767

3041 +#: builtin/submodule--helper.c:770

3042 msgid "path"

3043 msgstr "sökväg"

3044

2781 -#: builtin/am.c:2289 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

2782 -#: builtin/grep.c:704 builtin/merge.c:198 builtin/pull.c:131

2783 -#: builtin/pull.c:185 builtin/repack.c:178 builtin/repack.c:182

3045 +#: builtin/am.c:2288 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669

3046 +#: builtin/grep.c:706 builtin/merge.c:199 builtin/pull.c:134

3047 +#: builtin/pull.c:193 builtin/repack.c:178 builtin/repack.c:182

3048 #: builtin/show-branch.c:645 builtin/show-ref.c:175 builtin/tag.c:340

3049 #: parse-options.h:132 parse-options.h:134 parse-options.h:244

3050 msgid "n"

3051 msgstr "n"

3052

2789 -#: builtin/am.c:2292 builtin/apply.c:4512

3053 +#: builtin/am.c:2291 builtin/apply.c:4514

3054 msgid "num"

3055 msgstr "antal"

3056

2793 -#: builtin/am.c:2295 builtin/for-each-ref.c:37 builtin/replace.c:438

3057 +#: builtin/am.c:2294 builtin/for-each-ref.c:37 builtin/replace.c:438

3058 #: builtin/tag.c:372

3059 msgid "format"

3060 msgstr "format"

3061

2798 -#: builtin/am.c:2296

3062 +#: builtin/am.c:2295

3063 msgid "format the patch(es) are in"

3064 msgstr "format för patch(ar)"

3065

2802 -#: builtin/am.c:2302

3066 +#: builtin/am.c:2301

3067 msgid "override error message when patch failure occurs"

3068 msgstr "överstyr felmeddelanden när patchfel uppstår"

3069

2806 -#: builtin/am.c:2304

3070 +#: builtin/am.c:2303

3071 msgid "continue applying patches after resolving a conflict"

3072 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"

3073

2810 -#: builtin/am.c:2307

3074 +#: builtin/am.c:2306

3075 msgid "synonyms for --continue"

3076 msgstr "synonymer till --continue"

3077

2814 -#: builtin/am.c:2310

3078 +#: builtin/am.c:2309

3079 msgid "skip the current patch"

3080 msgstr "hoppa över den aktuella grenen"

3081

2818 -#: builtin/am.c:2313

3082 +#: builtin/am.c:2312

3083 msgid "restore the original branch and abort the patching operation."

3084 msgstr "återställ originalgrenen och avbryt patchningen."

3085

2822 -#: builtin/am.c:2317

3086 +#: builtin/am.c:2316

3087 msgid "lie about committer date"

3088 msgstr "ljug om incheckningsdatum"

3089

2826 -#: builtin/am.c:2319

3090 +#: builtin/am.c:2318

3091 msgid "use current timestamp for author date"

3092 msgstr "använd nuvarande tidsstämpel för författardatum"

3093

2830 -#: builtin/am.c:2321 builtin/commit.c:1593 builtin/merge.c:225

2831 -#: builtin/pull.c:159 builtin/revert.c:92 builtin/tag.c:355

3094 +#: builtin/am.c:2320 builtin/commit.c:1609 builtin/merge.c:228

3095 +#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355

3096 msgid "key-id"

3097 msgstr "nyckel-id"

3098

2835 -#: builtin/am.c:2322

3099 +#: builtin/am.c:2321

3100 msgid "GPG-sign commits"

3101 msgstr "GPG-signera incheckningar"

3102

2839 -#: builtin/am.c:2325

3103 +#: builtin/am.c:2324

3104 msgid "(internal use for git-rebase)"

3105 msgstr "(används internt av git-rebase)"

3106

2843 -#: builtin/am.c:2340

3107 +#: builtin/am.c:2339

3108 msgid ""

3109 "The -b/--binary option has been a no-op for long time, and\n"

3110 "it will be removed. Please do not use it anymore."

@@ -2848,16 +3112,16 @@ msgstr ""

3112 "Flaggan -b/--binary har varit utan funktion länge, och\n"

3113 "kommer tas bort. Vi ber dig att inte använda den längre."

3114

2851 -#: builtin/am.c:2347

3115 +#: builtin/am.c:2346

3116 msgid "failed to read the index"

3117 msgstr "misslyckades läsa indexet"

3118

2855 -#: builtin/am.c:2362

3119 +#: builtin/am.c:2361

3120 #, c-format

3121 msgid "previous rebase directory %s still exists but mbox given."

3122 msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."

3123

2860 -#: builtin/am.c:2386

3124 +#: builtin/am.c:2385

3125 #, c-format

3126 msgid ""

3127 "Stray %s directory found.\n"

@@ -2866,7 +3130,7 @@ msgstr ""

3130 "Kvarbliven katalog %s hittades.\n"

3131 "Använd \"git am --abort\" för att ta bort den."

3132

2869 -#: builtin/am.c:2392

3133 +#: builtin/am.c:2391

3134 msgid "Resolve operation not in progress, we are not resuming."

3135 msgstr "Lösningsoperation pågår inte, vi återupptar inte."

3136

@@ -2899,37 +3163,37 @@ msgstr "regexec returnerade %d för indata: %s"

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

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

3165

2902 -#: builtin/apply.c:940

3166 +#: builtin/apply.c:937

3167 #, c-format

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

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

3170

2907 -#: builtin/apply.c:944

3171 +#: builtin/apply.c:942

3172 #, c-format

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

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

3175

2912 -#: builtin/apply.c:945

3176 +#: builtin/apply.c:943

3177 #, c-format

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

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

3180

2917 -#: builtin/apply.c:952

3181 +#: builtin/apply.c:949

3182 #, c-format

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

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

3185

2922 -#: builtin/apply.c:1415

3186 +#: builtin/apply.c:1406

3187 #, c-format

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

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

3190

2927 -#: builtin/apply.c:1472

3191 +#: builtin/apply.c:1463

3192 #, c-format

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

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

3195

2932 -#: builtin/apply.c:1489

3196 +#: builtin/apply.c:1480

3197 #, c-format

3198 msgid ""

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

@@ -2945,77 +3209,77 @@ msgstr[1] ""

3209 "sökvägskomponenter\n"

3210 "tas bort (rad %d)"

3211

2948 -#: builtin/apply.c:1655

3212 +#: builtin/apply.c:1646

3213 msgid "new file depends on old contents"

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

3215

2952 -#: builtin/apply.c:1657

3216 +#: builtin/apply.c:1648

3217 msgid "deleted file still has contents"

3218 msgstr "borttagen fil har fortfarande innehåll"

3219

2956 -#: builtin/apply.c:1683

3220 +#: builtin/apply.c:1674

3221 #, c-format

3222 msgid "corrupt patch at line %d"

3223 msgstr "trasig patch på rad %d"

3224

2961 -#: builtin/apply.c:1719

3225 +#: builtin/apply.c:1710

3226 #, c-format

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

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

3229

2966 -#: builtin/apply.c:1721

3230 +#: builtin/apply.c:1712

3231 #, c-format

3232 msgid "deleted file %s still has contents"

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

3234

2971 -#: builtin/apply.c:1724

3235 +#: builtin/apply.c:1715

3236 #, c-format

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

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

3239

2976 -#: builtin/apply.c:1870

3240 +#: builtin/apply.c:1861

3241 #, c-format

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

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

3244

2981 -#: builtin/apply.c:1899

3245 +#: builtin/apply.c:1895

3246 #, c-format

3247 msgid "unrecognized binary patch at line %d"

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

3249

2986 -#: builtin/apply.c:2050

3250 +#: builtin/apply.c:2048

3251 #, c-format

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

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

3254

2991 -#: builtin/apply.c:2140

3255 +#: builtin/apply.c:2138

3256 #, c-format

3257 msgid "unable to read symlink %s"

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

3259

2996 -#: builtin/apply.c:2144

3260 +#: builtin/apply.c:2142

3261 #, c-format

3262 msgid "unable to open or read %s"

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

3264

3001 -#: builtin/apply.c:2777

3265 +#: builtin/apply.c:2775

3266 #, c-format

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

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

3269

3006 -#: builtin/apply.c:2896

3270 +#: builtin/apply.c:2894

3271 #, c-format

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

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

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

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

3276

3013 -#: builtin/apply.c:2908

3277 +#: builtin/apply.c:2906

3278 #, c-format

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

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

3281

3018 -#: builtin/apply.c:2914

3282 +#: builtin/apply.c:2912

3283 #, c-format

3284 msgid ""

3285 "while searching for:\n"

@@ -3024,319 +3288,329 @@ msgstr ""

3288 "vid sökning efter:\n"

3289 "%.*s"

3290

3027 -#: builtin/apply.c:2934

3291 +#: builtin/apply.c:2932

3292 #, c-format

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

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

3295

3032 -#: builtin/apply.c:3035

3296 +#: builtin/apply.c:3033

3297 #, c-format

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

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

3300

3037 -#: builtin/apply.c:3041

3301 +#: builtin/apply.c:3039

3302 #, c-format

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

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

3305

3042 -#: builtin/apply.c:3062

3306 +#: builtin/apply.c:3060

3307 #, c-format

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

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

3310

3047 -#: builtin/apply.c:3186

3311 +#: builtin/apply.c:3184

3312 #, c-format

3313 msgid "cannot checkout %s"

3314 msgstr "kan inte checka ut %s"

3315

3052 -#: builtin/apply.c:3231 builtin/apply.c:3242 builtin/apply.c:3287

3316 +#: builtin/apply.c:3229 builtin/apply.c:3240 builtin/apply.c:3285

3317 #, c-format

3318 msgid "read of %s failed"

3319 msgstr "misslyckades läsa %s"

3320

3057 -#: builtin/apply.c:3239

3321 +#: builtin/apply.c:3237

3322 #, c-format

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

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

3325

3062 -#: builtin/apply.c:3267 builtin/apply.c:3489

3326 +#: builtin/apply.c:3265 builtin/apply.c:3487

3327 #, c-format

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

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

3330

3067 -#: builtin/apply.c:3348 builtin/apply.c:3503

3331 +#: builtin/apply.c:3346 builtin/apply.c:3501

3332 #, c-format

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

3334 msgstr "%s: finns inte i indexet"

3335

3072 -#: builtin/apply.c:3352 builtin/apply.c:3495 builtin/apply.c:3517

3336 +#: builtin/apply.c:3350 builtin/apply.c:3493 builtin/apply.c:3515

3337 #, c-format

3338 msgid "%s: %s"

3339 msgstr "%s: %s"

3340

3077 -#: builtin/apply.c:3357 builtin/apply.c:3511

3341 +#: builtin/apply.c:3355 builtin/apply.c:3509

3342 #, c-format

3343 msgid "%s: does not match index"

3344 msgstr "%s: motsvarar inte indexet"

3345

3082 -#: builtin/apply.c:3459

3346 +#: builtin/apply.c:3457

3347 msgid "removal patch leaves file contents"

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

3349

3086 -#: builtin/apply.c:3528

3350 +#: builtin/apply.c:3526

3351 #, c-format

3352 msgid "%s: wrong type"

3353 msgstr "%s: fel typ"

3354

3091 -#: builtin/apply.c:3530

3355 +#: builtin/apply.c:3528

3356 #, c-format

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

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

3359

3096 -#: builtin/apply.c:3689 builtin/apply.c:3691

3360 +#: builtin/apply.c:3687 builtin/apply.c:3689

3361 #, c-format

3362 msgid "invalid path '%s'"

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

3364

3101 -#: builtin/apply.c:3746

3365 +#: builtin/apply.c:3744

3366 #, c-format

3367 msgid "%s: already exists in index"

3368 msgstr "%s: finns redan i indexet"

3369

3106 -#: builtin/apply.c:3749

3370 +#: builtin/apply.c:3747

3371 #, c-format

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

3373 msgstr "%s: finns redan i arbetskatalogen"

3374

3111 -#: builtin/apply.c:3769

3375 +#: builtin/apply.c:3767

3376 #, c-format

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

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

3379

3116 -#: builtin/apply.c:3774

3380 +#: builtin/apply.c:3772

3381 #, c-format

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

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

3384

3121 -#: builtin/apply.c:3794

3385 +#: builtin/apply.c:3792

3386 #, c-format

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

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

3389

3126 -#: builtin/apply.c:3798

3390 +#: builtin/apply.c:3796

3391 #, c-format

3392 msgid "%s: patch does not apply"

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

3394

3131 -#: builtin/apply.c:3812

3395 +#: builtin/apply.c:3810

3396 #, c-format

3397 msgid "Checking patch %s..."

3398 msgstr "Kontrollerar patchen %s..."

3399

3136 -#: builtin/apply.c:3905 builtin/checkout.c:233 builtin/reset.c:135

3400 +#: builtin/apply.c:3903 builtin/checkout.c:233 builtin/reset.c:135

3401 #, c-format

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

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

3404

3141 -#: builtin/apply.c:4048

3405 +#: builtin/apply.c:4046

3406 #, c-format

3407 msgid "unable to remove %s from index"

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

3409

3146 -#: builtin/apply.c:4077

3410 +#: builtin/apply.c:4075

3411 #, c-format

3412 msgid "corrupt patch for submodule %s"

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

3414

3151 -#: builtin/apply.c:4081

3415 +#: builtin/apply.c:4079

3416 #, c-format

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

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

3419

3156 -#: builtin/apply.c:4086

3420 +#: builtin/apply.c:4084

3421 #, c-format

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

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

3424

3161 -#: builtin/apply.c:4089 builtin/apply.c:4197

3425 +#: builtin/apply.c:4087 builtin/apply.c:4195

3426 #, c-format

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

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

3429

3166 -#: builtin/apply.c:4122

3430 +#: builtin/apply.c:4120

3431 #, c-format

3432 msgid "closing file '%s'"

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

3434

3171 -#: builtin/apply.c:4171

3435 +#: builtin/apply.c:4169

3436 #, c-format

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

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

3439

3176 -#: builtin/apply.c:4258

3440 +#: builtin/apply.c:4256

3441 #, c-format

3442 msgid "Applied patch %s cleanly."

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

3444

3181 -#: builtin/apply.c:4266

3445 +#: builtin/apply.c:4264

3446 msgid "internal error"

3447 msgstr "internt fel"

3448

3185 -#: builtin/apply.c:4269

3449 +#: builtin/apply.c:4267

3450 #, c-format

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

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

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

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

3455

3192 -#: builtin/apply.c:4279

3456 +#: builtin/apply.c:4277

3457 #, c-format

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

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

3460

3197 -#: builtin/apply.c:4300

3461 +#: builtin/apply.c:4285

3462 +#, c-format

3463 +msgid "cannot open %s: %s"

3464 +msgstr "kan inte öppna %s: %s"

3465 +

3466 +#: builtin/apply.c:4298

3467 #, c-format

3468 msgid "Hunk #%d applied cleanly."

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

3470

3202 -#: builtin/apply.c:4303

3471 +#: builtin/apply.c:4301

3472 #, c-format

3473 msgid "Rejected hunk #%d."

3474 msgstr "Refuserar stycke %d."

3475

3207 -#: builtin/apply.c:4393

3476 +#: builtin/apply.c:4387

3477 +#, c-format

3478 +msgid "Skipped patch '%s'."

3479 +msgstr "Ignorerar patch \"%s\"."

3480 +

3481 +#: builtin/apply.c:4395

3482 msgid "unrecognized input"

3483 msgstr "indata känns inte igen"

3484

3211 -#: builtin/apply.c:4404

3485 +#: builtin/apply.c:4406

3486 msgid "unable to read index file"

3487 msgstr "kan inte läsa indexfilen"

3488

3215 -#: builtin/apply.c:4507

3489 +#: builtin/apply.c:4509

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

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

3492

3219 -#: builtin/apply.c:4510

3493 +#: builtin/apply.c:4512

3494 msgid "apply changes matching the given path"

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

3496

3223 -#: builtin/apply.c:4513

3497 +#: builtin/apply.c:4515

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

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

3500

3227 -#: builtin/apply.c:4516

3501 +#: builtin/apply.c:4518

3502 msgid "ignore additions made by the patch"

3503 msgstr "ignorera tillägg gjorda av patchen"

3504

3231 -#: builtin/apply.c:4518

3505 +#: builtin/apply.c:4520

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

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

3508

3235 -#: builtin/apply.c:4522

3509 +#: builtin/apply.c:4524

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

3511 msgstr "visa antal tillagda och borttagna rader decimalt"

3512

3239 -#: builtin/apply.c:4524

3513 +#: builtin/apply.c:4526

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

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

3516

3243 -#: builtin/apply.c:4526

3517 +#: builtin/apply.c:4528

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

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

3520

3247 -#: builtin/apply.c:4528

3521 +#: builtin/apply.c:4530

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

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

3524

3251 -#: builtin/apply.c:4530

3525 +#: builtin/apply.c:4532

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

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

3528

3255 -#: builtin/apply.c:4532

3529 +#: builtin/apply.c:4534

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

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

3532

3259 -#: builtin/apply.c:4534

3533 +#: builtin/apply.c:4536

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

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

3536

3263 -#: builtin/apply.c:4536

3537 +#: builtin/apply.c:4538

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

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

3540

3267 -#: builtin/apply.c:4538

3541 +#: builtin/apply.c:4540

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

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

3544

3271 -#: builtin/apply.c:4541 builtin/checkout-index.c:169 builtin/ls-files.c:425

3545 +#: builtin/apply.c:4543 builtin/checkout-index.c:169 builtin/ls-files.c:425

3546 msgid "paths are separated with NUL character"

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

3548

3275 -#: builtin/apply.c:4543

3549 +#: builtin/apply.c:4545

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

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

3552

3279 -#: builtin/apply.c:4545

3553 +#: builtin/apply.c:4547

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

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

3556

3283 -#: builtin/apply.c:4548 builtin/apply.c:4551

3557 +#: builtin/apply.c:4550 builtin/apply.c:4553

3558 msgid "ignore changes in whitespace when finding context"

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

3560

3287 -#: builtin/apply.c:4554

3561 +#: builtin/apply.c:4556

3562 msgid "apply the patch in reverse"

3563 msgstr "tillämpa patchen baklänges"

3564

3291 -#: builtin/apply.c:4556

3565 +#: builtin/apply.c:4558

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

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

3568

3295 -#: builtin/apply.c:4558

3569 +#: builtin/apply.c:4560

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

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

3572

3299 -#: builtin/apply.c:4560

3573 +#: builtin/apply.c:4562

3574 msgid "allow overlapping hunks"

3575 msgstr "tillåt överlappande stycken"

3576

3303 -#: builtin/apply.c:4563

3577 +#: builtin/apply.c:4565

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

3579 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

3580

3307 -#: builtin/apply.c:4566

3581 +#: builtin/apply.c:4568

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

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

3584

3311 -#: builtin/apply.c:4569

3585 +#: builtin/apply.c:4571

3586 msgid "prepend <root> to all filenames"

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

3588

3315 -#: builtin/apply.c:4591

3589 +#: builtin/apply.c:4593

3590 msgid "--3way outside a repository"

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

3592

3319 -#: builtin/apply.c:4599

3593 +#: builtin/apply.c:4601

3594 msgid "--index outside a repository"

3595 msgstr "--index utanför arkiv"

3596

3323 -#: builtin/apply.c:4602

3597 +#: builtin/apply.c:4604

3598 msgid "--cached outside a repository"

3599 msgstr "--cached utanför arkiv"

3600

3327 -#: builtin/apply.c:4621

3601 +#: builtin/apply.c:4623

3602 #, c-format

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

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

3605

3332 -#: builtin/apply.c:4635

3606 +#: builtin/apply.c:4637

3607 #, c-format

3608 msgid "squelched %d whitespace error"

3609 msgid_plural "squelched %d whitespace errors"

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

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

3612

3339 -#: builtin/apply.c:4641 builtin/apply.c:4651

3613 +#: builtin/apply.c:4643 builtin/apply.c:4653

3614 #, c-format

3615 msgid "%d line adds whitespace errors."

3616 msgid_plural "%d lines add whitespace errors."

@@ -3402,99 +3676,99 @@ msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

3676 msgid "Blaming lines"

3677 msgstr "Klandra rader"

3678

3405 -#: builtin/blame.c:2530

3679 +#: builtin/blame.c:2531

3680 msgid "Show blame entries as we find them, incrementally"

3681 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

3682

3409 -#: builtin/blame.c:2531

3683 +#: builtin/blame.c:2532

3684 msgid "Show blank SHA-1 for boundary commits (Default: off)"

3685 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

3686

3413 -#: builtin/blame.c:2532

3687 +#: builtin/blame.c:2533

3688 msgid "Do not treat root commits as boundaries (Default: off)"

3689 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

3690

3417 -#: builtin/blame.c:2533

3691 +#: builtin/blame.c:2534

3692 msgid "Show work cost statistics"

3693 msgstr "Visa statistik över arbetskostnad"

3694

3421 -#: builtin/blame.c:2534

3695 +#: builtin/blame.c:2535

3696 msgid "Force progress reporting"

3697 msgstr "Tvinga förloppsrapportering"

3698

3425 -#: builtin/blame.c:2535

3699 +#: builtin/blame.c:2536

3700 msgid "Show output score for blame entries"

3701 msgstr "Visa utdatapoäng för klandringsposter"

3702

3429 -#: builtin/blame.c:2536

3703 +#: builtin/blame.c:2537

3704 msgid "Show original filename (Default: auto)"

3705 msgstr "Visa originalfilnamn (Standard: auto)"

3706

3433 -#: builtin/blame.c:2537

3707 +#: builtin/blame.c:2538

3708 msgid "Show original linenumber (Default: off)"

3709 msgstr "Visa ursprungligt radnummer (Standard: av)"

3710

3437 -#: builtin/blame.c:2538

3711 +#: builtin/blame.c:2539

3712 msgid "Show in a format designed for machine consumption"

3713 msgstr "Visa i ett format avsett för maskinkonsumtion"

3714

3441 -#: builtin/blame.c:2539

3715 +#: builtin/blame.c:2540

3716 msgid "Show porcelain format with per-line commit information"

3717 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

3718

3445 -#: builtin/blame.c:2540

3719 +#: builtin/blame.c:2541

3720 msgid "Use the same output mode as git-annotate (Default: off)"

3721 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

3722

3449 -#: builtin/blame.c:2541

3723 +#: builtin/blame.c:2542

3724 msgid "Show raw timestamp (Default: off)"

3725 msgstr "Visa rå tidsstämpel (Standard: av)"

3726

3453 -#: builtin/blame.c:2542

3727 +#: builtin/blame.c:2543

3728 msgid "Show long commit SHA1 (Default: off)"

3729 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

3730

3457 -#: builtin/blame.c:2543

3731 +#: builtin/blame.c:2544

3732 msgid "Suppress author name and timestamp (Default: off)"

3733 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

3734

3461 -#: builtin/blame.c:2544

3735 +#: builtin/blame.c:2545

3736 msgid "Show author email instead of name (Default: off)"

3737 msgstr "Visa författarens e-post istället för namn (Standard: av)"

3738

3465 -#: builtin/blame.c:2545

3739 +#: builtin/blame.c:2546

3740 msgid "Ignore whitespace differences"

3741 msgstr "Ignorera ändringar i blanksteg"

3742

3469 -#: builtin/blame.c:2546

3743 +#: builtin/blame.c:2547

3744 msgid "Spend extra cycles to find better match"

3745 msgstr "Slösa extra cykler med att hitta bättre träff"

3746

3473 -#: builtin/blame.c:2547

3747 +#: builtin/blame.c:2548

3748 msgid "Use revisions from <file> instead of calling git-rev-list"

3749 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

3750

3477 -#: builtin/blame.c:2548

3751 +#: builtin/blame.c:2549

3752 msgid "Use <file>'s contents as the final image"

3753 msgstr "Använd <fil>s innehåll som slutgiltig bild"

3754

3481 -#: builtin/blame.c:2549 builtin/blame.c:2550

3755 +#: builtin/blame.c:2550 builtin/blame.c:2551

3756 msgid "score"

3757 msgstr "poäng"

3758

3485 -#: builtin/blame.c:2549

3759 +#: builtin/blame.c:2550

3760 msgid "Find line copies within and across files"

3761 msgstr "Hitta kopierade rader inuti och mellan filer"

3762

3489 -#: builtin/blame.c:2550

3763 +#: builtin/blame.c:2551

3764 msgid "Find line movements within and across files"

3765 msgstr "Hitta flyttade rader inuti och mellan filer"

3766

3493 -#: builtin/blame.c:2551

3767 +#: builtin/blame.c:2552

3768 msgid "n,m"

3769 msgstr "n,m"

3770

3497 -#: builtin/blame.c:2551

3771 +#: builtin/blame.c:2552

3772 msgid "Process only line range n,m, counting from 1"

3773 msgstr "Behandla endast radintervallet n,m, med början på 1"

3774

@@ -3504,31 +3778,31 @@ msgstr "Behandla endast radintervallet n,m, med början på 1"

3778 #. takes 22 places, is the longest among various forms of

3779 #. relative timestamps, but your language may need more or

3780 #. fewer display columns.

3507 -#: builtin/blame.c:2640

3781 +#: builtin/blame.c:2641

3782 msgid "4 years, 11 months ago"

3783 msgstr "4 år, 11 månader sedan"

3784

3511 -#: builtin/branch.c:25

3785 +#: builtin/branch.c:26

3786 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"

3787 msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"

3788

3515 -#: builtin/branch.c:26

3789 +#: builtin/branch.c:27

3790 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"

3791 msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"

3792

3519 -#: builtin/branch.c:27

3793 +#: builtin/branch.c:28

3794 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."

3795 msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."

3796

3523 -#: builtin/branch.c:28

3797 +#: builtin/branch.c:29

3798 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"

3799 msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"

3800

3527 -#: builtin/branch.c:29

3801 +#: builtin/branch.c:30

3802 msgid "git branch [<options>] [-r | -a] [--points-at]"

3803 msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"

3804

3531 -#: builtin/branch.c:142

3805 +#: builtin/branch.c:143

3806 #, c-format

3807 msgid ""

3808 "deleting branch '%s' that has been merged to\n"

@@ -3537,7 +3811,7 @@ msgstr ""

3811 "tar bort grenen \"%s\" som har slagits ihop med\n"

3812 " \"%s\", men ännu inte slagits ihop med HEAD."

3813

3540 -#: builtin/branch.c:146

3814 +#: builtin/branch.c:147

3815 #, c-format

3816 msgid ""

3817 "not deleting branch '%s' that is not yet merged to\n"

@@ -3546,12 +3820,12 @@ msgstr ""

3820 "tar inte bort grenen \"%s\" som inte har slagits ihop med\n"

3821 " \"%s\", trots att den har slagits ihop med HEAD."

3822

3549 -#: builtin/branch.c:160

3823 +#: builtin/branch.c:161

3824 #, c-format

3825 msgid "Couldn't look up commit object for '%s'"

3826 msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""

3827

3554 -#: builtin/branch.c:164

3828 +#: builtin/branch.c:165

3829 #, c-format

3830 msgid ""

3831 "The branch '%s' is not fully merged.\n"

@@ -3560,340 +3834,361 @@ msgstr ""

3834 "Grenen \"%s\" har inte slagits samman i sin helhet.\n"

3835 "Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."

3836

3563 -#: builtin/branch.c:177

3837 +#: builtin/branch.c:178

3838 msgid "Update of config-file failed"

3839 msgstr "Misslyckades uppdatera konfigurationsfil"

3840

3567 -#: builtin/branch.c:205

3841 +#: builtin/branch.c:206

3842 msgid "cannot use -a with -d"

3843 msgstr "kan inte ange -a med -d"

3844

3571 -#: builtin/branch.c:211

3845 +#: builtin/branch.c:212

3846 msgid "Couldn't look up commit object for HEAD"

3847 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"

3848

3575 -#: builtin/branch.c:219

3849 +#: builtin/branch.c:226

3850 #, c-format

3577 -msgid "Cannot delete the branch '%s' which you are currently on."

3578 -msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."

3851 +msgid "Cannot delete branch '%s' checked out at '%s'"

3852 +msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""

3853

3580 -#: builtin/branch.c:235

3854 +#: builtin/branch.c:241

3855 #, c-format

3856 msgid "remote-tracking branch '%s' not found."

3857 msgstr "fjärrspårande grenen \"%s\" hittades inte."

3858

3585 -#: builtin/branch.c:236

3859 +#: builtin/branch.c:242

3860 #, c-format

3861 msgid "branch '%s' not found."

3862 msgstr "grenen \"%s\" hittades inte."

3863

3590 -#: builtin/branch.c:251

3864 +#: builtin/branch.c:257

3865 #, c-format

3866 msgid "Error deleting remote-tracking branch '%s'"

3867 msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""

3868

3595 -#: builtin/branch.c:252

3869 +#: builtin/branch.c:258

3870 #, c-format

3871 msgid "Error deleting branch '%s'"

3872 msgstr "Fel vid borttagning av grenen \"%s\""

3873

3600 -#: builtin/branch.c:259

3874 +#: builtin/branch.c:265

3875 #, c-format

3876 msgid "Deleted remote-tracking branch %s (was %s).\n"

3877 msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

3878

3605 -#: builtin/branch.c:260

3879 +#: builtin/branch.c:266

3880 #, c-format

3881 msgid "Deleted branch %s (was %s).\n"

3882 msgstr "Tog bort grenen %s (var %s).\n"

3883

3610 -#: builtin/branch.c:303

3884 +#: builtin/branch.c:309

3885 #, c-format

3886 msgid "[%s: gone]"

3887 msgstr "[%s: försvunnen]"

3888

3615 -#: builtin/branch.c:308

3889 +#: builtin/branch.c:314

3890 #, c-format

3891 msgid "[%s]"

3892 msgstr "[%s]"

3893

3620 -#: builtin/branch.c:313

3894 +#: builtin/branch.c:319

3895 #, c-format

3896 msgid "[%s: behind %d]"

3897 msgstr "[%s: bakom %d] "

3898

3625 -#: builtin/branch.c:315

3899 +#: builtin/branch.c:321

3900 #, c-format

3901 msgid "[behind %d]"

3902 msgstr "[bakom %d] "

3903

3630 -#: builtin/branch.c:319

3904 +#: builtin/branch.c:325

3905 #, c-format

3906 msgid "[%s: ahead %d]"

3907 msgstr "[%s: före %d] "

3908

3635 -#: builtin/branch.c:321

3909 +#: builtin/branch.c:327

3910 #, c-format

3911 msgid "[ahead %d]"

3912 msgstr "[före %d] "

3913

3640 -#: builtin/branch.c:324

3914 +#: builtin/branch.c:330

3915 #, c-format

3916 msgid "[%s: ahead %d, behind %d]"

3917 msgstr "[%s: före %d, bakom %d] "

3918

3645 -#: builtin/branch.c:327

3919 +#: builtin/branch.c:333

3920 #, c-format

3921 msgid "[ahead %d, behind %d]"

3922 msgstr "[före %d, bakom %d] "

3923

3650 -#: builtin/branch.c:340

3924 +#: builtin/branch.c:346

3925 msgid " **** invalid ref ****"

3926 msgstr " **** ogiltig ref ****"

3927

3654 -#: builtin/branch.c:366

3928 +#: builtin/branch.c:372

3929 #, c-format

3930 msgid "(no branch, rebasing %s)"

3931 msgstr "(ingen gren, ombaserar %s)"

3932

3659 -#: builtin/branch.c:369

3933 +#: builtin/branch.c:375

3934 #, c-format

3935 msgid "(no branch, bisect started on %s)"

3936 msgstr "(ingen gren, \"bisect\" startad på %s)"

3937

3664 -#: builtin/branch.c:375

3938 +#. TRANSLATORS: make sure this matches

3939 +#. "HEAD detached at " in wt-status.c

3940 +#: builtin/branch.c:381

3941 #, c-format

3942 msgid "(HEAD detached at %s)"

3943 msgstr "(HEAD frånkopplat vid %s)"

3944

3669 -#: builtin/branch.c:378

3945 +#. TRANSLATORS: make sure this matches

3946 +#. "HEAD detached from " in wt-status.c

3947 +#: builtin/branch.c:386

3948 #, c-format

3949 msgid "(HEAD detached from %s)"

3950 msgstr "(HEAD frånkopplat från %s)"

3951

3674 -#: builtin/branch.c:382

3952 +#: builtin/branch.c:390

3953 msgid "(no branch)"

3954 msgstr "(ingen gren)"

3955

3678 -#: builtin/branch.c:524

3956 +#: builtin/branch.c:541

3957 +#, c-format

3958 +msgid "Branch %s is being rebased at %s"

3959 +msgstr "Grenen %s ombaseras på %s"

3960 +

3961 +#: builtin/branch.c:545

3962 +#, c-format

3963 +msgid "Branch %s is being bisected at %s"

3964 +msgstr "Grenen %s är i en \"bisect\" på %s"

3965 +

3966 +#: builtin/branch.c:560

3967 msgid "cannot rename the current branch while not on any."

3968 msgstr ""

3969 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

3970

3683 -#: builtin/branch.c:534

3971 +#: builtin/branch.c:570

3972 #, c-format

3973 msgid "Invalid branch name: '%s'"

3974 msgstr "Felaktigt namn på gren: \"%s\""

3975

3688 -#: builtin/branch.c:549

3976 +#: builtin/branch.c:587

3977 msgid "Branch rename failed"

3978 msgstr "Misslyckades byta namn på gren"

3979

3692 -#: builtin/branch.c:553

3980 +#: builtin/branch.c:591

3981 #, c-format

3982 msgid "Renamed a misnamed branch '%s' away"

3983 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

3984

3697 -#: builtin/branch.c:557

3985 +#: builtin/branch.c:594

3986 #, c-format

3987 msgid "Branch renamed to %s, but HEAD is not updated!"

3988 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

3989

3702 -#: builtin/branch.c:564

3990 +#: builtin/branch.c:601

3991 msgid "Branch is renamed, but update of config-file failed"

3992 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

3993

3706 -#: builtin/branch.c:586

3707 -#, c-format

3708 -msgid "could not write branch description template: %s"

3709 -msgstr "kunde inte skriva grenbeskrivningsmall: %s"

3994 +#: builtin/branch.c:623

3995 +msgid "could not write branch description template"

3996 +msgstr "kunde inte skriva grenbeskrivningsmall"

3997

3711 -#: builtin/branch.c:615

3998 +#: builtin/branch.c:651

3999 msgid "Generic options"

4000 msgstr "Allmänna flaggor"

4001

3715 -#: builtin/branch.c:617

4002 +#: builtin/branch.c:653

4003 msgid "show hash and subject, give twice for upstream branch"

4004 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

4005

3719 -#: builtin/branch.c:618

4006 +#: builtin/branch.c:654

4007 msgid "suppress informational messages"

4008 msgstr "undertryck informationsmeddelanden"

4009

3723 -#: builtin/branch.c:619

4010 +#: builtin/branch.c:655

4011 msgid "set up tracking mode (see git-pull(1))"

4012 msgstr "ställ in spårningsläge (se git-pull(1))"

4013

3727 -#: builtin/branch.c:621

4014 +#: builtin/branch.c:657

4015 msgid "change upstream info"

4016 msgstr "ändra uppströmsinformation"

4017

3731 -#: builtin/branch.c:625

4018 +#: builtin/branch.c:659

4019 +msgid "upstream"

4020 +msgstr "uppströms"

4021 +

4022 +#: builtin/branch.c:659

4023 +msgid "change the upstream info"

4024 +msgstr "ändra uppströmsinformationen"

4025 +

4026 +#: builtin/branch.c:661

4027 msgid "use colored output"

4028 msgstr "använd färgad utdata"

4029

3735 -#: builtin/branch.c:626

4030 +#: builtin/branch.c:662

4031 msgid "act on remote-tracking branches"

4032 msgstr "arbeta på fjärrspårande grenar"

4033

3739 -#: builtin/branch.c:628 builtin/branch.c:629

4034 +#: builtin/branch.c:664 builtin/branch.c:665

4035 msgid "print only branches that contain the commit"

4036 msgstr "visa endast grenar som innehåller incheckningen"

4037

3743 -#: builtin/branch.c:632

4038 +#: builtin/branch.c:668

4039 msgid "Specific git-branch actions:"

4040 msgstr "Specifika git-branch-åtgärder:"

4041

3747 -#: builtin/branch.c:633

4042 +#: builtin/branch.c:669

4043 msgid "list both remote-tracking and local branches"

4044 msgstr "visa både fjärrspårande och lokala grenar"

4045

3751 -#: builtin/branch.c:635

4046 +#: builtin/branch.c:671

4047 msgid "delete fully merged branch"

4048 msgstr "ta bort helt sammanslagen gren"

4049

3755 -#: builtin/branch.c:636

4050 +#: builtin/branch.c:672

4051 msgid "delete branch (even if not merged)"

4052 msgstr "ta bort gren (även om inte helt sammanslagen)"

4053

3759 -#: builtin/branch.c:637

4054 +#: builtin/branch.c:673

4055 msgid "move/rename a branch and its reflog"

4056 msgstr "flytta/ta bort en gren och dess reflogg"

4057

3763 -#: builtin/branch.c:638

4058 +#: builtin/branch.c:674

4059 msgid "move/rename a branch, even if target exists"

4060 msgstr "flytta/ta bort en gren, även om målet finns"

4061

3767 -#: builtin/branch.c:639

4062 +#: builtin/branch.c:675

4063 msgid "list branch names"

4064 msgstr "lista namn på grenar"

4065

3771 -#: builtin/branch.c:640

4066 +#: builtin/branch.c:676

4067 msgid "create the branch's reflog"

4068 msgstr "skapa grenens reflogg"

4069

3775 -#: builtin/branch.c:642

4070 +#: builtin/branch.c:678

4071 msgid "edit the description for the branch"

4072 msgstr "redigera beskrivning för grenen"

4073

3779 -#: builtin/branch.c:643

4074 +#: builtin/branch.c:679

4075 msgid "force creation, move/rename, deletion"

4076 msgstr "tvinga skapande, flytt/namnändring, borttagande"

4077

3783 -#: builtin/branch.c:644

4078 +#: builtin/branch.c:680

4079 msgid "print only branches that are merged"

4080 msgstr "visa endast sammanslagna grenar"

4081

3787 -#: builtin/branch.c:645

4082 +#: builtin/branch.c:681

4083 msgid "print only branches that are not merged"

4084 msgstr "visa endast ej sammanslagna grenar"

4085

3791 -#: builtin/branch.c:646

4086 +#: builtin/branch.c:682

4087 msgid "list branches in columns"

4088 msgstr "visa grenar i spalter"

4089

3795 -#: builtin/branch.c:647 builtin/for-each-ref.c:38 builtin/tag.c:366

4090 +#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366

4091 msgid "key"

4092 msgstr "nyckel"

4093

3799 -#: builtin/branch.c:648 builtin/for-each-ref.c:39 builtin/tag.c:367

4094 +#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367

4095 msgid "field name to sort on"

4096 msgstr "fältnamn att sortera på"

4097

3803 -#: builtin/branch.c:650 builtin/for-each-ref.c:41 builtin/notes.c:401

4098 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:401

4099 #: builtin/notes.c:404 builtin/notes.c:564 builtin/notes.c:567

4100 #: builtin/tag.c:369

4101 msgid "object"

4102 msgstr "objekt"

4103

3809 -#: builtin/branch.c:651

4104 +#: builtin/branch.c:687

4105 msgid "print only branches of the object"

4106 msgstr "visa endast grenar för objektet"

4107

3813 -#: builtin/branch.c:669

4108 +#: builtin/branch.c:705

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

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

4111

3817 -#: builtin/branch.c:673 builtin/clone.c:705

4112 +#: builtin/branch.c:709 builtin/clone.c:707

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

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

4115

3821 -#: builtin/branch.c:693

4116 +#: builtin/branch.c:729

4117 msgid "--column and --verbose are incompatible"

4118 msgstr "--column och --verbose är inkompatibla"

4119

3825 -#: builtin/branch.c:704 builtin/branch.c:746

4120 +#: builtin/branch.c:740 builtin/branch.c:782

4121 msgid "branch name required"

4122 msgstr "grennamn krävs"

4123

3829 -#: builtin/branch.c:722

4124 +#: builtin/branch.c:758

4125 msgid "Cannot give description to detached HEAD"

4126 msgstr "Kan inte beskriva frånkopplad HEAD"

4127

3833 -#: builtin/branch.c:727

4128 +#: builtin/branch.c:763

4129 msgid "cannot edit description of more than one branch"

4130 msgstr "kan inte redigera beskrivning för mer än en gren"

4131

3837 -#: builtin/branch.c:734

4132 +#: builtin/branch.c:770

4133 #, c-format

4134 msgid "No commit on branch '%s' yet."

4135 msgstr "Inga incheckningar på grenen \"%s\" ännu"

4136

3842 -#: builtin/branch.c:737

4137 +#: builtin/branch.c:773

4138 #, c-format

4139 msgid "No branch named '%s'."

4140 msgstr "Ingen gren vid namnet \"%s\"."

4141

3847 -#: builtin/branch.c:752

4142 +#: builtin/branch.c:788

4143 msgid "too many branches for a rename operation"

4144 msgstr "för många grenar för namnbyte"

4145

3851 -#: builtin/branch.c:757

4146 +#: builtin/branch.c:793

4147 msgid "too many branches to set new upstream"

4148 msgstr "för många grenar för att byta uppström"

4149

3855 -#: builtin/branch.c:761

4150 +#: builtin/branch.c:797

4151 #, c-format

4152 msgid ""

4153 "could not set upstream of HEAD to %s when it does not point to any branch."

4154 msgstr ""

4155 "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."

4156

3862 -#: builtin/branch.c:764 builtin/branch.c:786 builtin/branch.c:807

4157 +#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843

4158 #, c-format

4159 msgid "no such branch '%s'"

4160 msgstr "okänd gren \"%s\""

4161

3867 -#: builtin/branch.c:768

4162 +#: builtin/branch.c:804

4163 #, c-format

4164 msgid "branch '%s' does not exist"

4165 msgstr "grenen \"%s\" finns inte"

4166

3872 -#: builtin/branch.c:780

4167 +#: builtin/branch.c:816

4168 msgid "too many branches to unset upstream"

4169 msgstr "för många grenar för att ta bort uppström"

4170

3876 -#: builtin/branch.c:784

4171 +#: builtin/branch.c:820

4172 msgid "could not unset upstream of HEAD when it does not point to any branch."

4173 msgstr ""

4174 "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."

4175

3881 -#: builtin/branch.c:790

4176 +#: builtin/branch.c:826

4177 #, c-format

4178 msgid "Branch '%s' has no upstream information"

4179 msgstr "Grenen \"%s\" har ingen uppströmsinformation"

4180

3886 -#: builtin/branch.c:804

4181 +#: builtin/branch.c:840

4182 msgid "it does not make sense to create 'HEAD' manually"

4183 msgstr "kan inte skapa \"HEAD\" manuellt"

4184

3890 -#: builtin/branch.c:810

4185 +#: builtin/branch.c:846

4186 msgid "-a and -r options to 'git branch' do not make sense with a branch name"

4187 msgstr ""

4188 "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "

4189 "grennamn"

4190

3896 -#: builtin/branch.c:813

4191 +#: builtin/branch.c:849

4192 #, c-format

4193 msgid ""

4194 "The --set-upstream flag is deprecated and will be removed. Consider using --"

@@ -3902,7 +4197,7 @@ msgstr ""

4197 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "

4198 "eller --set-upstream-to\n"

4199

3905 -#: builtin/branch.c:830

4200 +#: builtin/branch.c:866

4201 #, c-format

4202 msgid ""

4203 "\n"

@@ -3913,16 +4208,6 @@ msgstr ""

4208 "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"

4209 "\n"

4210

3916 -#: builtin/branch.c:831

3917 -#, c-format

3918 -msgid " git branch -d %s\n"

3919 -msgstr " git branch -d %s\n"

3920 -

3921 -#: builtin/branch.c:832

3922 -#, c-format

3923 -msgid " git branch --set-upstream-to %s\n"

3924 -msgstr " git branch --set-upstream-to %s\n"

3925 -

4211 #: builtin/bundle.c:51

4212 #, c-format

4213 msgid "%s is okay\n"

@@ -4021,7 +4306,7 @@ msgstr "läs filnamn från standard in"

4306 msgid "terminate input and output records by a NUL character"

4307 msgstr "avsluta in- och utdataposter med NUL-tecken"

4308

4024 -#: builtin/check-ignore.c:18 builtin/checkout.c:1136 builtin/gc.c:325

4309 +#: builtin/check-ignore.c:18 builtin/checkout.c:1135 builtin/gc.c:325

4310 msgid "suppress progress reporting"

4311 msgstr "undertryck förloppsrapportering"

4312

@@ -4111,8 +4396,9 @@ msgid "write the content to temporary files"

4396 msgstr "skriv innehåll till temporära filer"

4397

4398 #: builtin/checkout-index.c:174 builtin/column.c:30

4114 -#: builtin/submodule--helper.c:166 builtin/submodule--helper.c:169

4115 -#: builtin/submodule--helper.c:172 builtin/submodule--helper.c:175

4399 +#: builtin/submodule--helper.c:491 builtin/submodule--helper.c:494

4400 +#: builtin/submodule--helper.c:497 builtin/submodule--helper.c:500

4401 +#: builtin/submodule--helper.c:774

4402 msgid "string"

4403 msgstr "sträng"

4404

@@ -4162,79 +4448,79 @@ msgstr "sökväg \"%s\": kan inte slå ihop"

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

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

4450

4165 -#: builtin/checkout.c:251 builtin/checkout.c:254 builtin/checkout.c:257

4166 -#: builtin/checkout.c:260

4451 +#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256

4452 +#: builtin/checkout.c:259

4453 #, c-format

4454 msgid "'%s' cannot be used with updating paths"

4455 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

4456

4171 -#: builtin/checkout.c:263 builtin/checkout.c:266

4457 +#: builtin/checkout.c:262 builtin/checkout.c:265

4458 #, c-format

4459 msgid "'%s' cannot be used with %s"

4460 msgstr "\"%s\" kan inte användas med %s"

4461

4176 -#: builtin/checkout.c:269

4462 +#: builtin/checkout.c:268

4463 #, c-format

4464 msgid "Cannot update paths and switch to branch '%s' at the same time."

4465 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

4466

4181 -#: builtin/checkout.c:280 builtin/checkout.c:474

4467 +#: builtin/checkout.c:279 builtin/checkout.c:473

4468 msgid "corrupt index file"

4469 msgstr "indexfilen är trasig"

4470

4185 -#: builtin/checkout.c:340 builtin/checkout.c:347

4471 +#: builtin/checkout.c:339 builtin/checkout.c:346

4472 #, c-format

4473 msgid "path '%s' is unmerged"

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

4475

4190 -#: builtin/checkout.c:496

4476 +#: builtin/checkout.c:495

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

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

4479

4194 -#: builtin/checkout.c:623

4480 +#: builtin/checkout.c:622

4481 #, c-format

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

4483 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

4484

4199 -#: builtin/checkout.c:661

4485 +#: builtin/checkout.c:660

4486 msgid "HEAD is now at"

4487 msgstr "HEAD är nu på"

4488

4203 -#: builtin/checkout.c:665 builtin/clone.c:659

4489 +#: builtin/checkout.c:664 builtin/clone.c:661

4490 msgid "unable to update HEAD"

4491 msgstr "kan inte uppdatera HEAD"

4492

4207 -#: builtin/checkout.c:669

4493 +#: builtin/checkout.c:668

4494 #, c-format

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

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

4497

4212 -#: builtin/checkout.c:672

4498 +#: builtin/checkout.c:671

4499 #, c-format

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

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

4502

4217 -#: builtin/checkout.c:676

4503 +#: builtin/checkout.c:675

4504 #, c-format

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

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

4507

4222 -#: builtin/checkout.c:678 builtin/checkout.c:1068

4508 +#: builtin/checkout.c:677 builtin/checkout.c:1067

4509 #, c-format

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

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

4512

4227 -#: builtin/checkout.c:680

4513 +#: builtin/checkout.c:679

4514 #, c-format

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

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

4517

4232 -#: builtin/checkout.c:732

4518 +#: builtin/checkout.c:731

4519 #, c-format

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

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

4522

4237 -#: builtin/checkout.c:738

4523 +#: builtin/checkout.c:737

4524 #, c-format

4525 msgid ""

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

@@ -4257,7 +4543,7 @@ msgstr[1] ""

4543 "\n"

4544 "%s\n"

4545

4260 -#: builtin/checkout.c:757

4546 +#: builtin/checkout.c:756

4547 #, c-format

4548 msgid ""

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

@@ -4284,151 +4570,151 @@ msgstr[1] ""

4570 " git branch <nytt_grennamn> %s\n"

4571 "\n"

4572

4287 -#: builtin/checkout.c:793

4573 +#: builtin/checkout.c:792

4574 msgid "internal error in revision walk"

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

4576

4291 -#: builtin/checkout.c:797

4577 +#: builtin/checkout.c:796

4578 msgid "Previous HEAD position was"

4579 msgstr "Tidigare position för HEAD var"

4580

4295 -#: builtin/checkout.c:824 builtin/checkout.c:1063

4581 +#: builtin/checkout.c:823 builtin/checkout.c:1062

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

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

4584

4299 -#: builtin/checkout.c:969

4585 +#: builtin/checkout.c:968

4586 #, c-format

4587 msgid "only one reference expected, %d given."

4588 msgstr "endast en referens förväntades, %d gavs."

4589

4304 -#: builtin/checkout.c:1009 builtin/worktree.c:211

4590 +#: builtin/checkout.c:1008 builtin/worktree.c:212

4591 #, c-format

4592 msgid "invalid reference: %s"

4593 msgstr "felaktig referens: %s"

4594

4309 -#: builtin/checkout.c:1038

4595 +#: builtin/checkout.c:1037

4596 #, c-format

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

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

4599

4314 -#: builtin/checkout.c:1077

4600 +#: builtin/checkout.c:1076

4601 msgid "paths cannot be used with switching branches"

4602 msgstr "sökvägar kan inte användas vid byte av gren"

4603

4318 -#: builtin/checkout.c:1080 builtin/checkout.c:1084

4604 +#: builtin/checkout.c:1079 builtin/checkout.c:1083

4605 #, c-format

4606 msgid "'%s' cannot be used with switching branches"

4607 msgstr "\"%s\" kan inte användas vid byte av gren"

4608

4323 -#: builtin/checkout.c:1088 builtin/checkout.c:1091 builtin/checkout.c:1096

4324 -#: builtin/checkout.c:1099

4609 +#: builtin/checkout.c:1087 builtin/checkout.c:1090 builtin/checkout.c:1095

4610 +#: builtin/checkout.c:1098

4611 #, c-format

4612 msgid "'%s' cannot be used with '%s'"

4613 msgstr "\"%s\" kan inte användas med \"%s\""

4614

4329 -#: builtin/checkout.c:1104

4615 +#: builtin/checkout.c:1103

4616 #, c-format

4617 msgid "Cannot switch branch to a non-commit '%s'"

4618 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

4619

4334 -#: builtin/checkout.c:1137 builtin/checkout.c:1139 builtin/clone.c:84

4335 -#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:318

4336 -#: builtin/worktree.c:320

4620 +#: builtin/checkout.c:1136 builtin/checkout.c:1138 builtin/clone.c:88

4621 +#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:323

4622 +#: builtin/worktree.c:325

4623 msgid "branch"

4624 msgstr "gren"

4625

4340 -#: builtin/checkout.c:1138

4626 +#: builtin/checkout.c:1137

4627 msgid "create and checkout a new branch"

4628 msgstr "skapa och checka ut en ny gren"

4629

4344 -#: builtin/checkout.c:1140

4630 +#: builtin/checkout.c:1139

4631 msgid "create/reset and checkout a branch"

4632 msgstr "skapa/nollställ och checka ut en gren"

4633

4348 -#: builtin/checkout.c:1141

4634 +#: builtin/checkout.c:1140

4635 msgid "create reflog for new branch"

4636 msgstr "skapa reflogg för ny gren"

4637

4352 -#: builtin/checkout.c:1142

4638 +#: builtin/checkout.c:1141

4639 msgid "detach the HEAD at named commit"

4640 msgstr "koppla från HEAD vid namngiven incheckning"

4641

4356 -#: builtin/checkout.c:1143

4642 +#: builtin/checkout.c:1142

4643 msgid "set upstream info for new branch"

4644 msgstr "sätt uppströmsinformation för ny gren"

4645

4360 -#: builtin/checkout.c:1145

4646 +#: builtin/checkout.c:1144

4647 msgid "new-branch"

4648 msgstr "ny-gren"

4649

4364 -#: builtin/checkout.c:1145

4650 +#: builtin/checkout.c:1144

4651 msgid "new unparented branch"

4652 msgstr "ny gren utan förälder"

4653

4368 -#: builtin/checkout.c:1146

4654 +#: builtin/checkout.c:1145

4655 msgid "checkout our version for unmerged files"

4656 msgstr "checka ut vår version för ej sammanslagna filer"

4657

4372 -#: builtin/checkout.c:1148

4658 +#: builtin/checkout.c:1147

4659 msgid "checkout their version for unmerged files"

4660 msgstr "checka ut deras version för ej sammanslagna filer"

4661

4376 -#: builtin/checkout.c:1150

4662 +#: builtin/checkout.c:1149

4663 msgid "force checkout (throw away local modifications)"

4664 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

4665

4380 -#: builtin/checkout.c:1151

4666 +#: builtin/checkout.c:1150

4667 msgid "perform a 3-way merge with the new branch"

4668 msgstr "utför en 3-vägssammanslagning för den nya grenen"

4669

4384 -#: builtin/checkout.c:1152 builtin/merge.c:227

4670 +#: builtin/checkout.c:1151 builtin/merge.c:230

4671 msgid "update ignored files (default)"

4672 msgstr "uppdatera ignorerade filer (standard)"

4673

4388 -#: builtin/checkout.c:1153 builtin/log.c:1269 parse-options.h:250

4674 +#: builtin/checkout.c:1152 builtin/log.c:1432 parse-options.h:250

4675 msgid "style"

4676 msgstr "stil"

4677

4392 -#: builtin/checkout.c:1154

4678 +#: builtin/checkout.c:1153

4679 msgid "conflict style (merge or diff3)"

4680 msgstr "konfliktstil (merge eller diff3)"

4681

4396 -#: builtin/checkout.c:1157

4682 +#: builtin/checkout.c:1156

4683 msgid "do not limit pathspecs to sparse entries only"

4684 msgstr "begränsa inte sökvägar till endast glesa poster"

4685

4400 -#: builtin/checkout.c:1159

4686 +#: builtin/checkout.c:1158

4687 msgid "second guess 'git checkout <no-such-branch>'"

4688 msgstr "förutspå \"git checkout <gren-saknas>\""

4689

4404 -#: builtin/checkout.c:1161

4690 +#: builtin/checkout.c:1160

4691 msgid "do not check if another worktree is holding the given ref"

4692 msgstr ""

4693 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

4694

4409 -#: builtin/checkout.c:1162 builtin/clone.c:58 builtin/fetch.c:116

4410 -#: builtin/merge.c:224 builtin/pull.c:113 builtin/push.c:526

4695 +#: builtin/checkout.c:1161 builtin/clone.c:60 builtin/fetch.c:116

4696 +#: builtin/merge.c:227 builtin/pull.c:116 builtin/push.c:526

4697 #: builtin/send-pack.c:168

4698 msgid "force progress reporting"

4699 msgstr "tvinga förloppsrapportering"

4700

4415 -#: builtin/checkout.c:1193

4701 +#: builtin/checkout.c:1192

4702 msgid "-b, -B and --orphan are mutually exclusive"

4703 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

4704

4419 -#: builtin/checkout.c:1210

4705 +#: builtin/checkout.c:1209

4706 msgid "--track needs a branch name"

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

4708

4423 -#: builtin/checkout.c:1215

4709 +#: builtin/checkout.c:1214

4710 msgid "Missing branch name; try -b"

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

4712

4427 -#: builtin/checkout.c:1251

4713 +#: builtin/checkout.c:1250

4714 msgid "invalid path specification"

4715 msgstr "felaktig sökvägsangivelse"

4716

4431 -#: builtin/checkout.c:1258

4717 +#: builtin/checkout.c:1257

4718 #, c-format

4719 msgid ""

4720 "Cannot update paths and switch to branch '%s' at the same time.\n"

@@ -4437,12 +4723,12 @@ msgstr ""

4723 "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"

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

4725

4440 -#: builtin/checkout.c:1263

4726 +#: builtin/checkout.c:1262

4727 #, c-format

4728 msgid "git checkout: --detach does not take a path argument '%s'"

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

4730

4445 -#: builtin/checkout.c:1267

4731 +#: builtin/checkout.c:1266

4732 msgid ""

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

4734 "checking out of the index."

@@ -4595,8 +4881,8 @@ msgstr "städa interaktivt"

4881 msgid "remove whole directories"

4882 msgstr "ta bort hela kataloger"

4883

4598 -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:722

4599 -#: builtin/ls-files.c:456 builtin/name-rev.c:307 builtin/show-ref.c:182

4884 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724

4885 +#: builtin/ls-files.c:456 builtin/name-rev.c:314 builtin/show-ref.c:182

4886 msgid "pattern"

4887 msgstr "mönster"

4888

@@ -4636,104 +4922,113 @@ msgstr ""

4922 msgid "git clone [<options>] [--] <repo> [<dir>]"

4923 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

4924

4639 -#: builtin/clone.c:60

4925 +#: builtin/clone.c:62

4926 msgid "don't create a checkout"

4927 msgstr "skapa inte någon utcheckning"

4928

4643 -#: builtin/clone.c:61 builtin/clone.c:63 builtin/init-db.c:469

4929 +#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:473

4930 msgid "create a bare repository"

4931 msgstr "skapa ett naket (\"bare\") arkiv"

4932

4647 -#: builtin/clone.c:65

4933 +#: builtin/clone.c:67

4934 msgid "create a mirror repository (implies bare)"

4935 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

4936

4651 -#: builtin/clone.c:67

4937 +#: builtin/clone.c:69

4938 msgid "to clone from a local repository"

4939 msgstr "för att klona från ett lokalt arkiv"

4940

4655 -#: builtin/clone.c:69

4941 +#: builtin/clone.c:71

4942 msgid "don't use local hardlinks, always copy"

4943 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

4944

4659 -#: builtin/clone.c:71

4945 +#: builtin/clone.c:73

4946 msgid "setup as shared repository"

4947 msgstr "skapa som ett delat arkiv"

4948

4663 -#: builtin/clone.c:73 builtin/clone.c:75

4949 +#: builtin/clone.c:75 builtin/clone.c:77

4950 msgid "initialize submodules in the clone"

4951 msgstr "initiera undermoduler i klonen"

4952

4667 -#: builtin/clone.c:76 builtin/init-db.c:466

4953 +#: builtin/clone.c:79

4954 +msgid "number of submodules cloned in parallel"

4955 +msgstr "antal undermoduler som klonas parallellt"

4956 +

4957 +#: builtin/clone.c:80 builtin/init-db.c:470

4958 msgid "template-directory"

4959 msgstr "mallkatalog"

4960

4671 -#: builtin/clone.c:77 builtin/init-db.c:467

4961 +#: builtin/clone.c:81 builtin/init-db.c:471

4962 msgid "directory from which templates will be used"

4963 msgstr "katalog att använda mallar från"

4964

4675 -#: builtin/clone.c:79 builtin/submodule--helper.c:173

4965 +#: builtin/clone.c:83 builtin/submodule--helper.c:498

4966 +#: builtin/submodule--helper.c:777

4967 msgid "reference repository"

4968 msgstr "referensarkiv"

4969

4679 -#: builtin/clone.c:81

4970 +#: builtin/clone.c:85

4971 msgid "use --reference only while cloning"

4972 msgstr "använd --reference endast under kloningen"

4973

4683 -#: builtin/clone.c:82 builtin/column.c:26 builtin/merge-file.c:44

4974 +#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44

4975 msgid "name"

4976 msgstr "namn"

4977

4687 -#: builtin/clone.c:83

4978 +#: builtin/clone.c:87

4979 msgid "use <name> instead of 'origin' to track upstream"

4980 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

4981

4691 -#: builtin/clone.c:85

4982 +#: builtin/clone.c:89

4983 msgid "checkout <branch> instead of the remote's HEAD"

4984 msgstr "checka ut <gren> istället för fjärrens HEAD"

4985

4695 -#: builtin/clone.c:87

4986 +#: builtin/clone.c:91

4987 msgid "path to git-upload-pack on the remote"

4988 msgstr "sökväg till git-upload-pack på fjärren"

4989

4699 -#: builtin/clone.c:88 builtin/fetch.c:117 builtin/grep.c:665

4700 -#: builtin/pull.c:193

4990 +#: builtin/clone.c:92 builtin/fetch.c:117 builtin/grep.c:667

4991 +#: builtin/pull.c:201

4992 msgid "depth"

4993 msgstr "djup"

4994

4704 -#: builtin/clone.c:89

4995 +#: builtin/clone.c:93

4996 msgid "create a shallow clone of that depth"

4997 msgstr "skapa en grund klon på detta djup"

4998

4708 -#: builtin/clone.c:91

4999 +#: builtin/clone.c:95

5000 msgid "clone only one branch, HEAD or --branch"

5001 msgstr "klona endast en gren, HEAD eller --branch"

5002

4712 -#: builtin/clone.c:92 builtin/init-db.c:475

5003 +#: builtin/clone.c:97

5004 +msgid "any cloned submodules will be shallow"

5005 +msgstr "klonade undermoduler kommer vara grunda"

5006 +

5007 +#: builtin/clone.c:98 builtin/init-db.c:479

5008 msgid "gitdir"

5009 msgstr "gitkat"

5010

4716 -#: builtin/clone.c:93 builtin/init-db.c:476

5011 +#: builtin/clone.c:99 builtin/init-db.c:480

5012 msgid "separate git dir from working tree"

5013 msgstr "separera gitkatalogen från arbetskatalogen"

5014

4720 -#: builtin/clone.c:94

5015 +#: builtin/clone.c:100

5016 msgid "key=value"

5017 msgstr "nyckel=värde"

5018

4724 -#: builtin/clone.c:95

5019 +#: builtin/clone.c:101

5020 msgid "set config inside the new repository"

5021 msgstr "ställ in konfiguration i det nya arkivet"

5022

4728 -#: builtin/clone.c:96 builtin/fetch.c:131 builtin/push.c:536

5023 +#: builtin/clone.c:102 builtin/fetch.c:131 builtin/push.c:536

5024 msgid "use IPv4 addresses only"

5025 msgstr "använd endast IPv4-adresser"

5026

4732 -#: builtin/clone.c:98 builtin/fetch.c:133 builtin/push.c:538

5027 +#: builtin/clone.c:104 builtin/fetch.c:133 builtin/push.c:538

5028 msgid "use IPv6 addresses only"

5029 msgstr "använd endast IPv6-adresser"

5030

4736 -#: builtin/clone.c:239

5031 +#: builtin/clone.c:241

5032 msgid ""

5033 "No directory name could be guessed.\n"

5034 "Please specify a directory on the command line"

@@ -4741,57 +5036,52 @@ msgstr ""

5036 "Kunde inte gissa katalognamn.\n"

5037 "Ange en katalog på kommandoraden"

5038

4744 -#: builtin/clone.c:305

5039 +#: builtin/clone.c:307

5040 #, c-format

5041 msgid "reference repository '%s' as a linked checkout is not supported yet."

5042 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

5043

4749 -#: builtin/clone.c:307

5044 +#: builtin/clone.c:309

5045 #, c-format

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

5047 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

5048

4754 -#: builtin/clone.c:312

5049 +#: builtin/clone.c:314

5050 #, c-format

5051 msgid "reference repository '%s' is shallow"

5052 msgstr "referensarkivet \"%s\" är grunt"

5053

4759 -#: builtin/clone.c:315

5054 +#: builtin/clone.c:317

5055 #, c-format

5056 msgid "reference repository '%s' is grafted"

5057 msgstr "referensarkivet \"%s\" är ympat"

5058

4764 -#: builtin/clone.c:380 builtin/diff.c:84

4765 -#, c-format

4766 -msgid "failed to stat '%s'"

4767 -msgstr "misslyckades ta status på \"%s\""

4768 -

4769 -#: builtin/clone.c:382

5059 +#: builtin/clone.c:384

5060 #, c-format

5061 msgid "%s exists and is not a directory"

5062 msgstr "%s finns och är ingen katalog"

5063

4774 -#: builtin/clone.c:396

5064 +#: builtin/clone.c:398

5065 #, c-format

5066 msgid "failed to stat %s\n"

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

5068

4779 -#: builtin/clone.c:418

5069 +#: builtin/clone.c:420

5070 #, c-format

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

5072 msgstr "misslyckades skapa länken \"%s\""

5073

4784 -#: builtin/clone.c:422

5074 +#: builtin/clone.c:424

5075 #, c-format

5076 msgid "failed to copy file to '%s'"

5077 msgstr "misslyckades kopiera filen till \"%s\""

5078

4789 -#: builtin/clone.c:447 builtin/clone.c:631

5079 +#: builtin/clone.c:449 builtin/clone.c:633

5080 #, c-format

5081 msgid "done.\n"

5082 msgstr "klart.\n"

5083

4794 -#: builtin/clone.c:459

5084 +#: builtin/clone.c:461

5085 msgid ""

5086 "Clone succeeded, but checkout failed.\n"

5087 "You can inspect what was checked out with 'git status'\n"

@@ -4801,129 +5091,129 @@ msgstr ""

5091 "Du kan inspektera det som checkades ut med \"git status\"\n"

5092 "och försöka checka ut igen med \"git checkout -f HEAD\"\n"

5093

4804 -#: builtin/clone.c:536

5094 +#: builtin/clone.c:538

5095 #, c-format

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

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

5098

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

5100 # objects downloaded.

4811 -#: builtin/clone.c:626

5101 +#: builtin/clone.c:628

5102 #, c-format

5103 msgid "Checking connectivity... "

5104 msgstr "Kontrollerar om vi fick alla objekt..."

5105

4816 -#: builtin/clone.c:629

5106 +#: builtin/clone.c:631

5107 msgid "remote did not send all necessary objects"

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

5109

4820 -#: builtin/clone.c:647

5110 +#: builtin/clone.c:649

5111 #, c-format

5112 msgid "unable to update %s"

5113 msgstr "kan inte uppdatera %s"

5114

4825 -#: builtin/clone.c:696

5115 +#: builtin/clone.c:698

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

5117 msgstr ""

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

5119

4830 -#: builtin/clone.c:727

5120 +#: builtin/clone.c:729

5121 msgid "unable to checkout working tree"

5122 msgstr "kunde inte checka ut arbetskatalogen"

5123

4834 -#: builtin/clone.c:753

5124 +#: builtin/clone.c:767

5125 msgid "unable to write parameters to config file"

5126 msgstr "kunde inte skriva parametrar till konfigurationsfilen"

5127

4838 -#: builtin/clone.c:816

5128 +#: builtin/clone.c:830

5129 msgid "cannot repack to clean up"

5130 msgstr "kan inte packa om för att städa upp"

5131

4842 -#: builtin/clone.c:818

5132 +#: builtin/clone.c:832

5133 msgid "cannot unlink temporary alternates file"

5134 msgstr "kunde inte ta bort temporär \"alternates\"-fil"

5135

4846 -#: builtin/clone.c:850

5136 +#: builtin/clone.c:864 builtin/receive-pack.c:1731

5137 msgid "Too many arguments."

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

5139

4850 -#: builtin/clone.c:854

5140 +#: builtin/clone.c:868

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

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

5143

4854 -#: builtin/clone.c:865

5144 +#: builtin/clone.c:879

5145 #, c-format

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

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

5148

4859 -#: builtin/clone.c:868

5149 +#: builtin/clone.c:882

5150 msgid "--bare and --separate-git-dir are incompatible."

5151 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."

5152

4863 -#: builtin/clone.c:881

5153 +#: builtin/clone.c:895

5154 #, c-format

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

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

5157

4868 -#: builtin/clone.c:887 builtin/fetch.c:1174

5158 +#: builtin/clone.c:901 builtin/fetch.c:1174

5159 #, c-format

5160 msgid "depth %s is not a positive number"

5161 msgstr "djupet %s är inte ett positivt tal"

5162

4873 -#: builtin/clone.c:897

5163 +#: builtin/clone.c:911

5164 #, c-format

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

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

5167

4878 -#: builtin/clone.c:907

5168 +#: builtin/clone.c:921

5169 #, c-format

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

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

5172

4883 -#: builtin/clone.c:922 builtin/clone.c:933 builtin/submodule--helper.c:218

4884 -#: builtin/worktree.c:219 builtin/worktree.c:246

5173 +#: builtin/clone.c:936 builtin/clone.c:947 builtin/submodule--helper.c:547

5174 +#: builtin/worktree.c:220 builtin/worktree.c:247

5175 #, c-format

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

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

5178

4889 -#: builtin/clone.c:925

5179 +#: builtin/clone.c:939

5180 #, c-format

5181 msgid "could not create work tree dir '%s'"

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

5183

4894 -#: builtin/clone.c:943

5184 +#: builtin/clone.c:957

5185 #, c-format

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

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

5188

4899 -#: builtin/clone.c:945

5189 +#: builtin/clone.c:959

5190 #, c-format

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

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

5193

4904 -#: builtin/clone.c:984

5194 +#: builtin/clone.c:998

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

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

5197

4908 -#: builtin/clone.c:987

5198 +#: builtin/clone.c:1001

5199 msgid "source repository is shallow, ignoring --local"

5200 msgstr "källarkivet är grunt, ignorerar --local"

5201

4912 -#: builtin/clone.c:992

5202 +#: builtin/clone.c:1006

5203 msgid "--local is ignored"

5204 msgstr "--local ignoreras"

5205

4916 -#: builtin/clone.c:996

5206 +#: builtin/clone.c:1010

5207 #, c-format

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

5209 msgstr "Vet inte hur man klonar %s"

5210

4921 -#: builtin/clone.c:1045 builtin/clone.c:1053

5211 +#: builtin/clone.c:1059 builtin/clone.c:1067

5212 #, c-format

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

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

5215

4926 -#: builtin/clone.c:1056

5216 +#: builtin/clone.c:1070

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

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

5219

@@ -5063,66 +5353,66 @@ msgstr ""

5353 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"

5354 "cherry-pick för återstående incheckningar.\n"

5355

5066 -#: builtin/commit.c:305

5356 +#: builtin/commit.c:307

5357 msgid "failed to unpack HEAD tree object"

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

5359

5070 -#: builtin/commit.c:346

5360 +#: builtin/commit.c:348

5361 msgid "unable to create temporary index"

5362 msgstr "kunde inte skapa temporär indexfil"

5363

5074 -#: builtin/commit.c:352

5364 +#: builtin/commit.c:354

5365 msgid "interactive add failed"

5366 msgstr "interaktiv tilläggning misslyckades"

5367

5078 -#: builtin/commit.c:365

5368 +#: builtin/commit.c:367

5369 msgid "unable to update temporary index"

5370 msgstr "kan inte uppdatera temporärt index"

5371

5082 -#: builtin/commit.c:367

5372 +#: builtin/commit.c:369

5373 msgid "Failed to update main cache tree"

5374 msgstr "Misslyckades uppdatera huvud-cacheträdet"

5375

5086 -#: builtin/commit.c:391 builtin/commit.c:414 builtin/commit.c:463

5376 +#: builtin/commit.c:393 builtin/commit.c:416 builtin/commit.c:465

5377 msgid "unable to write new_index file"

5378 msgstr "kunde inte skriva filen new_index"

5379

5090 -#: builtin/commit.c:445

5380 +#: builtin/commit.c:447

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

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

5383

5094 -#: builtin/commit.c:447

5384 +#: builtin/commit.c:449

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

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

5387

5098 -#: builtin/commit.c:456

5388 +#: builtin/commit.c:458

5389 msgid "cannot read the index"

5390 msgstr "kan inte läsa indexet"

5391

5102 -#: builtin/commit.c:475

5392 +#: builtin/commit.c:477

5393 msgid "unable to write temporary index file"

5394 msgstr "kunde inte skriva temporär indexfil"

5395

5106 -#: builtin/commit.c:580

5396 +#: builtin/commit.c:582

5397 #, c-format

5398 msgid "commit '%s' lacks author header"

5399 msgstr "incheckningen \"%s\" saknar författarhuvud"

5400

5111 -#: builtin/commit.c:582

5401 +#: builtin/commit.c:584

5402 #, c-format

5403 msgid "commit '%s' has malformed author line"

5404 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"

5405

5116 -#: builtin/commit.c:601

5406 +#: builtin/commit.c:603

5407 msgid "malformed --author parameter"

5408 msgstr "felformad \"--author\"-flagga"

5409

5120 -#: builtin/commit.c:609

5410 +#: builtin/commit.c:611

5411 #, c-format

5412 msgid "invalid date format: %s"

5413 msgstr "felaktigt datumformat: %s"

5414

5125 -#: builtin/commit.c:653

5415 +#: builtin/commit.c:655

5416 msgid ""

5417 "unable to select a comment character that is not used\n"

5418 "in the current commit message"

@@ -5130,38 +5420,38 @@ msgstr ""

5420 "kunde inte välja ett kommentarstecken som inte använts\n"

5421 "i det befintliga incheckningsmeddelandet"

5422

5133 -#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080

5423 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1091

5424 #, c-format

5425 msgid "could not lookup commit %s"

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

5427

5138 -#: builtin/commit.c:702 builtin/shortlog.c:285

5428 +#: builtin/commit.c:704 builtin/shortlog.c:285

5429 #, c-format

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

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

5432

5143 -#: builtin/commit.c:704

5433 +#: builtin/commit.c:706

5434 msgid "could not read log from standard input"

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

5436

5147 -#: builtin/commit.c:708

5437 +#: builtin/commit.c:710

5438 #, c-format

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

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

5441

5152 -#: builtin/commit.c:730

5153 -msgid "could not read MERGE_MSG"

5154 -msgstr "kunde inte läsa MERGE_MSG"

5155 -

5156 -#: builtin/commit.c:734

5442 +#: builtin/commit.c:737 builtin/commit.c:745

5443 msgid "could not read SQUASH_MSG"

5444 msgstr "kunde inte läsa SQUASH_MSG"

5445

5160 -#: builtin/commit.c:785

5446 +#: builtin/commit.c:742

5447 +msgid "could not read MERGE_MSG"

5448 +msgstr "kunde inte läsa MERGE_MSG"

5449 +

5450 +#: builtin/commit.c:796

5451 msgid "could not write commit template"

5452 msgstr "kunde inte skriva incheckningsmall"

5453

5164 -#: builtin/commit.c:803

5454 +#: builtin/commit.c:814

5455 #, c-format

5456 msgid ""

5457 "\n"

@@ -5176,7 +5466,7 @@ msgstr ""

5466 "\t%s\n"

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

5468

5179 -#: builtin/commit.c:808

5469 +#: builtin/commit.c:819

5470 #, c-format

5471 msgid ""

5472 "\n"

@@ -5191,7 +5481,7 @@ msgstr ""

5481 "\t%s\n"

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

5483

5194 -#: builtin/commit.c:821

5484 +#: builtin/commit.c:832

5485 #, c-format

5486 msgid ""

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

@@ -5201,7 +5491,7 @@ msgstr ""

5491 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "

5492 "incheckningen.\n"

5493

5204 -#: builtin/commit.c:828

5494 +#: builtin/commit.c:839

5495 #, c-format

5496 msgid ""

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

@@ -5212,146 +5502,146 @@ msgstr ""

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

5503 "Ett tomt meddelande avbryter incheckningen.\n"

5504

5215 -#: builtin/commit.c:848

5505 +#: builtin/commit.c:859

5506 #, c-format

5507 msgid "%sAuthor: %.*s <%.*s>"

5508 msgstr "%sFörfattare: %.*s <%.*s>"

5509

5220 -#: builtin/commit.c:856

5510 +#: builtin/commit.c:867

5511 #, c-format

5512 msgid "%sDate: %s"

5513 msgstr "%sDatum: %s"

5514

5225 -#: builtin/commit.c:863

5515 +#: builtin/commit.c:874

5516 #, c-format

5517 msgid "%sCommitter: %.*s <%.*s>"

5518 msgstr "%sIncheckare: %.*s <%.*s>"

5519

5230 -#: builtin/commit.c:881

5520 +#: builtin/commit.c:892

5521 msgid "Cannot read index"

5522 msgstr "Kan inte läsa indexet"

5523

5234 -#: builtin/commit.c:938

5524 +#: builtin/commit.c:949

5525 msgid "Error building trees"

5526 msgstr "Fel vid byggande av träd"

5527

5238 -#: builtin/commit.c:953 builtin/tag.c:266

5528 +#: builtin/commit.c:964 builtin/tag.c:266

5529 #, c-format

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

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

5532

5243 -#: builtin/commit.c:1055

5533 +#: builtin/commit.c:1066

5534 #, c-format

5535 msgid "--author '%s' is not 'Name <email>' and matches no existing author"

5536 msgstr ""

5537 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"

5538

5249 -#: builtin/commit.c:1070 builtin/commit.c:1310

5539 +#: builtin/commit.c:1081 builtin/commit.c:1321

5540 #, c-format

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

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

5543

5254 -#: builtin/commit.c:1107

5544 +#: builtin/commit.c:1118

5545 msgid "--long and -z are incompatible"

5546 msgstr "--long och -z är inkompatibla"

5547

5258 -#: builtin/commit.c:1137

5548 +#: builtin/commit.c:1148

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

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

5551

5262 -#: builtin/commit.c:1146

5552 +#: builtin/commit.c:1157

5553 msgid "You have nothing to amend."

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

5555

5266 -#: builtin/commit.c:1149

5556 +#: builtin/commit.c:1160

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

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

5559

5270 -#: builtin/commit.c:1151

5560 +#: builtin/commit.c:1162

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

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

5563

5274 -#: builtin/commit.c:1154

5564 +#: builtin/commit.c:1165

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

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

5567

5278 -#: builtin/commit.c:1164

5568 +#: builtin/commit.c:1175

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

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

5571

5282 -#: builtin/commit.c:1166

5572 +#: builtin/commit.c:1177

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

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

5575

5286 -#: builtin/commit.c:1174

5576 +#: builtin/commit.c:1185

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

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

5579

5290 -#: builtin/commit.c:1191

5580 +#: builtin/commit.c:1202

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

5582 msgstr ""

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

5584

5295 -#: builtin/commit.c:1193

5585 +#: builtin/commit.c:1204

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

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

5588

5299 -#: builtin/commit.c:1195

5589 +#: builtin/commit.c:1206

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

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

5592

5303 -#: builtin/commit.c:1197

5593 +#: builtin/commit.c:1208

5594 msgid "Explicit paths specified without -i or -o; assuming --only paths..."

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

5596

5307 -#: builtin/commit.c:1209 builtin/tag.c:475

5597 +#: builtin/commit.c:1220 builtin/tag.c:474

5598 #, c-format

5599 msgid "Invalid cleanup mode %s"

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

5601

5312 -#: builtin/commit.c:1214

5602 +#: builtin/commit.c:1225

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

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

5605

5316 -#: builtin/commit.c:1324 builtin/commit.c:1605

5606 +#: builtin/commit.c:1335 builtin/commit.c:1621

5607 msgid "show status concisely"

5608 msgstr "visa koncis status"

5609

5320 -#: builtin/commit.c:1326 builtin/commit.c:1607

5610 +#: builtin/commit.c:1337 builtin/commit.c:1623

5611 msgid "show branch information"

5612 msgstr "visa information om gren"

5613

5324 -#: builtin/commit.c:1328 builtin/commit.c:1609 builtin/push.c:512

5325 -#: builtin/worktree.c:430

5614 +#: builtin/commit.c:1339 builtin/commit.c:1625 builtin/push.c:512

5615 +#: builtin/worktree.c:437

5616 msgid "machine-readable output"

5617 msgstr "maskinläsbar utdata"

5618

5329 -#: builtin/commit.c:1331 builtin/commit.c:1611

5619 +#: builtin/commit.c:1342 builtin/commit.c:1627

5620 msgid "show status in long format (default)"

5621 msgstr "visa status i långt format (standard)"

5622

5333 -#: builtin/commit.c:1334 builtin/commit.c:1614

5623 +#: builtin/commit.c:1345 builtin/commit.c:1630

5624 msgid "terminate entries with NUL"

5625 msgstr "terminera poster med NUL"

5626

5337 -#: builtin/commit.c:1336 builtin/commit.c:1617 builtin/fast-export.c:981

5627 +#: builtin/commit.c:1347 builtin/commit.c:1633 builtin/fast-export.c:981

5628 #: builtin/fast-export.c:984 builtin/tag.c:353

5629 msgid "mode"

5630 msgstr "läge"

5631

5342 -#: builtin/commit.c:1337 builtin/commit.c:1617

5632 +#: builtin/commit.c:1348 builtin/commit.c:1633

5633 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"

5634 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"

5635

5346 -#: builtin/commit.c:1340

5636 +#: builtin/commit.c:1351

5637 msgid "show ignored files"

5638 msgstr "visa ignorerade filer"

5639

5350 -#: builtin/commit.c:1341 parse-options.h:155

5640 +#: builtin/commit.c:1352 parse-options.h:155

5641 msgid "when"

5642 msgstr "när"

5643

5354 -#: builtin/commit.c:1342

5644 +#: builtin/commit.c:1353

5645 msgid ""

5646 "ignore changes to submodules, optional when: all, dirty, untracked. "

5647 "(Default: all)"

@@ -5359,201 +5649,201 @@ msgstr ""

5649 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "

5650 "(Default: all)"

5651

5362 -#: builtin/commit.c:1344

5652 +#: builtin/commit.c:1355

5653 msgid "list untracked files in columns"

5654 msgstr "visa ospårade filer i spalter"

5655

5366 -#: builtin/commit.c:1430

5656 +#: builtin/commit.c:1441

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

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

5659

5370 -#: builtin/commit.c:1432

5660 +#: builtin/commit.c:1443

5661 msgid "could not parse newly created commit"

5662 msgstr "kunde inte tolka en precis skapad incheckning"

5663

5374 -#: builtin/commit.c:1477

5664 +#: builtin/commit.c:1488

5665 msgid "detached HEAD"

5666 msgstr "frånkopplad HEAD"

5667

5378 -#: builtin/commit.c:1480

5668 +#: builtin/commit.c:1491

5669 msgid " (root-commit)"

5670 msgstr " (rotincheckning)"

5671

5382 -#: builtin/commit.c:1575

5672 +#: builtin/commit.c:1591

5673 msgid "suppress summary after successful commit"

5674 msgstr "undertryck sammanfattning efter framgångsrik incheckning"

5675

5386 -#: builtin/commit.c:1576

5676 +#: builtin/commit.c:1592

5677 msgid "show diff in commit message template"

5678 msgstr "visa diff i mallen för incheckningsmeddelandet"

5679

5390 -#: builtin/commit.c:1578

5680 +#: builtin/commit.c:1594

5681 msgid "Commit message options"

5682 msgstr "Alternativ för incheckningsmeddelande"

5683

5394 -#: builtin/commit.c:1579 builtin/tag.c:351

5684 +#: builtin/commit.c:1595 builtin/tag.c:351

5685 msgid "read message from file"

5686 msgstr "läs meddelande från fil"

5687

5398 -#: builtin/commit.c:1580

5688 +#: builtin/commit.c:1596

5689 msgid "author"

5690 msgstr "författare"

5691

5402 -#: builtin/commit.c:1580

5692 +#: builtin/commit.c:1596

5693 msgid "override author for commit"

5694 msgstr "överstyr författare för incheckningen"

5695

5406 -#: builtin/commit.c:1581 builtin/gc.c:326

5696 +#: builtin/commit.c:1597 builtin/gc.c:326

5697 msgid "date"

5698 msgstr "datum"

5699

5410 -#: builtin/commit.c:1581

5700 +#: builtin/commit.c:1597

5701 msgid "override date for commit"

5702 msgstr "överstyr datum för incheckningen"

5703

5414 -#: builtin/commit.c:1582 builtin/merge.c:218 builtin/notes.c:395

5704 +#: builtin/commit.c:1598 builtin/merge.c:219 builtin/notes.c:395

5705 #: builtin/notes.c:558 builtin/tag.c:349

5706 msgid "message"

5707 msgstr "meddelande"

5708

5419 -#: builtin/commit.c:1582

5709 +#: builtin/commit.c:1598

5710 msgid "commit message"

5711 msgstr "incheckningsmeddelande"

5712

5423 -#: builtin/commit.c:1583 builtin/commit.c:1584 builtin/commit.c:1585

5424 -#: builtin/commit.c:1586 parse-options.h:256 ref-filter.h:79

5713 +#: builtin/commit.c:1599 builtin/commit.c:1600 builtin/commit.c:1601

5714 +#: builtin/commit.c:1602 parse-options.h:256 ref-filter.h:79

5715 msgid "commit"

5716 msgstr "incheckning"

5717

5428 -#: builtin/commit.c:1583

5718 +#: builtin/commit.c:1599

5719 msgid "reuse and edit message from specified commit"

5720 msgstr "återanvänd och redigera meddelande från angiven incheckning"

5721

5432 -#: builtin/commit.c:1584

5722 +#: builtin/commit.c:1600

5723 msgid "reuse message from specified commit"

5724 msgstr "återanvänd meddelande från angiven incheckning"

5725

5436 -#: builtin/commit.c:1585

5726 +#: builtin/commit.c:1601

5727 msgid "use autosquash formatted message to fixup specified commit"

5728 msgstr ""

5729 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"

5730

5441 -#: builtin/commit.c:1586

5731 +#: builtin/commit.c:1602

5732 msgid "use autosquash formatted message to squash specified commit"

5733 msgstr ""

5734 "använd autosquash-formaterat meddelande för att slå ihop med angiven "

5735 "incheckning"

5736

5447 -#: builtin/commit.c:1587

5737 +#: builtin/commit.c:1603

5738 msgid "the commit is authored by me now (used with -C/-c/--amend)"

5739 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"

5740

5451 -#: builtin/commit.c:1588 builtin/log.c:1219 builtin/revert.c:86

5741 +#: builtin/commit.c:1604 builtin/log.c:1382 builtin/revert.c:86

5742 msgid "add Signed-off-by:"

5743 msgstr "lägg till Signed-off-by:"

5744

5455 -#: builtin/commit.c:1589

5745 +#: builtin/commit.c:1605

5746 msgid "use specified template file"

5747 msgstr "använd angiven mallfil"

5748

5459 -#: builtin/commit.c:1590

5749 +#: builtin/commit.c:1606

5750 msgid "force edit of commit"

5751 msgstr "tvinga redigering av incheckning"

5752

5463 -#: builtin/commit.c:1591

5753 +#: builtin/commit.c:1607

5754 msgid "default"

5755 msgstr "standard"

5756

5467 -#: builtin/commit.c:1591 builtin/tag.c:354

5757 +#: builtin/commit.c:1607 builtin/tag.c:354

5758 msgid "how to strip spaces and #comments from message"

5759 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"

5760

5471 -#: builtin/commit.c:1592

5761 +#: builtin/commit.c:1608

5762 msgid "include status in commit message template"

5763 msgstr "inkludera status i mallen för incheckningsmeddelandet"

5764

5475 -#: builtin/commit.c:1594 builtin/merge.c:226 builtin/pull.c:160

5765 +#: builtin/commit.c:1610 builtin/merge.c:229 builtin/pull.c:165

5766 #: builtin/revert.c:93

5767 msgid "GPG sign commit"

5768 msgstr "GPG-signera incheckning"

5769

5480 -#: builtin/commit.c:1597

5770 +#: builtin/commit.c:1613

5771 msgid "Commit contents options"

5772 msgstr "Alternativ för incheckningens innehåll"

5773

5484 -#: builtin/commit.c:1598

5774 +#: builtin/commit.c:1614

5775 msgid "commit all changed files"

5776 msgstr "checka in alla ändrade filer"

5777

5488 -#: builtin/commit.c:1599

5778 +#: builtin/commit.c:1615

5779 msgid "add specified files to index for commit"

5780 msgstr "lägg till angivna filer till indexet för incheckning"

5781

5492 -#: builtin/commit.c:1600

5782 +#: builtin/commit.c:1616

5783 msgid "interactively add files"

5784 msgstr "lägg till filer interaktivt"

5785

5496 -#: builtin/commit.c:1601

5786 +#: builtin/commit.c:1617

5787 msgid "interactively add changes"

5788 msgstr "lägg till ändringar interaktivt"

5789

5500 -#: builtin/commit.c:1602

5790 +#: builtin/commit.c:1618

5791 msgid "commit only specified files"

5792 msgstr "checka endast in angivna filer"

5793

5504 -#: builtin/commit.c:1603

5794 +#: builtin/commit.c:1619

5795 msgid "bypass pre-commit hook"

5796 msgstr "förbigå pre-commit-krok"

5797

5508 -#: builtin/commit.c:1604

5798 +#: builtin/commit.c:1620

5799 msgid "show what would be committed"

5800 msgstr "visa vad som skulle checkas in"

5801

5512 -#: builtin/commit.c:1615

5802 +#: builtin/commit.c:1631

5803 msgid "amend previous commit"

5804 msgstr "lägg till föregående incheckning"

5805

5516 -#: builtin/commit.c:1616

5806 +#: builtin/commit.c:1632

5807 msgid "bypass post-rewrite hook"

5808 msgstr "förbigå post-rewrite-krok"

5809

5520 -#: builtin/commit.c:1621

5810 +#: builtin/commit.c:1637

5811 msgid "ok to record an empty change"

5812 msgstr "ok att registrera en tom ändring"

5813

5524 -#: builtin/commit.c:1623

5814 +#: builtin/commit.c:1639

5815 msgid "ok to record a change with an empty message"

5816 msgstr "ok att registrera en ändring med tomt meddelande"

5817

5528 -#: builtin/commit.c:1652

5818 +#: builtin/commit.c:1668

5819 msgid "could not parse HEAD commit"

5820 msgstr "kunde inte tolka HEAD:s incheckning"

5821

5532 -#: builtin/commit.c:1698

5822 +#: builtin/commit.c:1718

5823 #, c-format

5824 msgid "Corrupt MERGE_HEAD file (%s)"

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

5826

5537 -#: builtin/commit.c:1705

5827 +#: builtin/commit.c:1725

5828 msgid "could not read MERGE_MODE"

5829 msgstr "kunde inte läsa MERGE_MODE"

5830

5541 -#: builtin/commit.c:1724

5831 +#: builtin/commit.c:1744

5832 #, c-format

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

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

5835

5546 -#: builtin/commit.c:1735

5836 +#: builtin/commit.c:1755

5837 #, c-format

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

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

5840

5551 -#: builtin/commit.c:1740

5841 +#: builtin/commit.c:1760

5842 #, c-format

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

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

5845

5556 -#: builtin/commit.c:1788

5846 +#: builtin/commit.c:1808

5847 msgid ""

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

5849 "new_index file. Check that disk is not full and quota is\n"

@@ -5700,7 +5990,7 @@ msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"

5990 msgid "unable to parse default color value"

5991 msgstr "kan inte tolka standardfärgvärde"

5992

5703 -#: builtin/config.c:469

5993 +#: builtin/config.c:472

5994 #, c-format

5995 msgid ""

5996 "# This is Git's per-user configuration file.\n"

@@ -5715,7 +6005,7 @@ msgstr ""

6005 "#\tname = %s\n"

6006 "#\temail = %s\n"

6007

5718 -#: builtin/config.c:611

6008 +#: builtin/config.c:614

6009 #, c-format

6010 msgid "cannot create configuration file %s"

6011 msgstr "kan inte skapa konfigurationsfilen \"%s\""

@@ -5751,7 +6041,7 @@ msgstr "den annoterade taggen %s har inget inbäddat namn"

6041 msgid "tag '%s' is really '%s' here"

6042 msgstr "taggen \"%s\" är i verkligheten \"%s\" här"

6043

5754 -#: builtin/describe.c:250 builtin/log.c:459

6044 +#: builtin/describe.c:250 builtin/log.c:465

6045 #, c-format

6046 msgid "Not a valid object name %s"

6047 msgstr "Objektnamnet är inte giltigt: %s"

@@ -5844,7 +6134,7 @@ msgstr "överväg de <n> nyaste taggarna (standard: 10)"

6134 msgid "only consider tags matching <pattern>"

6135 msgstr "överväg endast taggar som motsvarar <mönster>"

6136

5847 -#: builtin/describe.c:410 builtin/name-rev.c:314

6137 +#: builtin/describe.c:410 builtin/name-rev.c:321

6138 msgid "show abbreviated commit object as fallback"

6139 msgstr "visa förkortade incheckningsobjekt som standard"

6140

@@ -5878,21 +6168,21 @@ msgstr "\"%s\": inte en normal fil eller symbolisk länk"

6168 msgid "invalid option: %s"

6169 msgstr "ogiltig flagga: %s"

6170

5881 -#: builtin/diff.c:358

6171 +#: builtin/diff.c:360

6172 msgid "Not a git repository"

6173 msgstr "Inte ett git-arkiv"

6174

5885 -#: builtin/diff.c:401

6175 +#: builtin/diff.c:403

6176 #, c-format

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

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

6179

5890 -#: builtin/diff.c:410

6180 +#: builtin/diff.c:412

6181 #, c-format

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

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

6184

5895 -#: builtin/diff.c:417

6185 +#: builtin/diff.c:419

6186 #, c-format

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

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

@@ -5965,19 +6255,19 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"

6255 msgid "git fetch --all [<options>]"

6256 msgstr "git fetch --all [<flaggor>]"

6257

5968 -#: builtin/fetch.c:92 builtin/pull.c:166

6258 +#: builtin/fetch.c:92 builtin/pull.c:174

6259 msgid "fetch from all remotes"

6260 msgstr "hämta från alla fjärrar"

6261

5972 -#: builtin/fetch.c:94 builtin/pull.c:169

6262 +#: builtin/fetch.c:94 builtin/pull.c:177

6263 msgid "append to .git/FETCH_HEAD instead of overwriting"

6264 msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"

6265

5976 -#: builtin/fetch.c:96 builtin/pull.c:172

6266 +#: builtin/fetch.c:96 builtin/pull.c:180

6267 msgid "path to upload pack on remote end"

6268 msgstr "sökväg till upload pack på fjärren"

6269

5980 -#: builtin/fetch.c:97 builtin/pull.c:174

6270 +#: builtin/fetch.c:97 builtin/pull.c:182

6271 msgid "force overwrite of local branch"

6272 msgstr "tvinga överskrivning av lokal gren"

6273

@@ -5985,7 +6275,7 @@ msgstr "tvinga överskrivning av lokal gren"

6275 msgid "fetch from multiple remotes"

6276 msgstr "hämta från flera fjärrar"

6277

5988 -#: builtin/fetch.c:101 builtin/pull.c:176

6278 +#: builtin/fetch.c:101 builtin/pull.c:184

6279 msgid "fetch all tags and associated objects"

6280 msgstr "hämta alla taggar och associerade objekt"

6281

@@ -5997,19 +6287,19 @@ msgstr "hämta inte alla taggar (--no-tags)"

6287 msgid "number of submodules fetched in parallel"

6288 msgstr "antal undermoduler som hämtas parallellt"

6289

6000 -#: builtin/fetch.c:107 builtin/pull.c:179

6290 +#: builtin/fetch.c:107 builtin/pull.c:187

6291 msgid "prune remote-tracking branches no longer on remote"

6292 msgstr "rensa fjärrspårande grenar ej längre på fjärren"

6293

6004 -#: builtin/fetch.c:108 builtin/pull.c:182

6294 +#: builtin/fetch.c:108 builtin/pull.c:190

6295 msgid "on-demand"

6296 msgstr "on-demand"

6297

6008 -#: builtin/fetch.c:109 builtin/pull.c:183

6298 +#: builtin/fetch.c:109 builtin/pull.c:191

6299 msgid "control recursive fetching of submodules"

6300 msgstr "styr rekursiv hämtning av undermoduler"

6301

6012 -#: builtin/fetch.c:113 builtin/pull.c:191

6302 +#: builtin/fetch.c:113 builtin/pull.c:199

6303 msgid "keep downloaded pack"

6304 msgstr "behåll hämtade paket"

6305

@@ -6017,15 +6307,15 @@ msgstr "behåll hämtade paket"

6307 msgid "allow updating of HEAD ref"

6308 msgstr "tillåt uppdatering av HEAD-referens"

6309

6020 -#: builtin/fetch.c:118 builtin/pull.c:194

6310 +#: builtin/fetch.c:118 builtin/pull.c:202

6311 msgid "deepen history of shallow clone"

6312 msgstr "fördjupa historik för grund klon"

6313

6024 -#: builtin/fetch.c:120 builtin/pull.c:197

6314 +#: builtin/fetch.c:120 builtin/pull.c:205

6315 msgid "convert to a complete repository"

6316 msgstr "konvertera till komplett arkiv"

6317

6028 -#: builtin/fetch.c:122 builtin/log.c:1236

6318 +#: builtin/fetch.c:122 builtin/log.c:1399

6319 msgid "dir"

6320 msgstr "kat"

6321

@@ -6037,15 +6327,15 @@ msgstr "lägg till i början av undermodulens sökvägsutdata"

6327 msgid "default mode for recursion"

6328 msgstr "standardläge för rekursion"

6329

6040 -#: builtin/fetch.c:128 builtin/pull.c:200

6330 +#: builtin/fetch.c:128 builtin/pull.c:208

6331 msgid "accept refs that update .git/shallow"

6332 msgstr "tar emot referenser som uppdaterar .git/shallow"

6333

6044 -#: builtin/fetch.c:129 builtin/pull.c:202

6334 +#: builtin/fetch.c:129 builtin/pull.c:210

6335 msgid "refmap"

6336 msgstr "referenskarta"

6337

6048 -#: builtin/fetch.c:130 builtin/pull.c:203

6338 +#: builtin/fetch.c:130 builtin/pull.c:211

6339 msgid "specify fetch refmap"

6340 msgstr "ange referenskarta för \"fetch\""

6341

@@ -6103,11 +6393,6 @@ msgstr "tvingad uppdatering"

6393 msgid "(non-fast-forward)"

6394 msgstr "(ej snabbspolad)"

6395

6106 -#: builtin/fetch.c:610 builtin/fetch.c:851

6107 -#, c-format

6108 -msgid "cannot open %s: %s\n"

6109 -msgstr "kan inte öppna %s: %s\n"

6110 -

6396 #: builtin/fetch.c:619

6397 #, c-format

6398 msgid "%s did not send all necessary objects\n"

@@ -6309,57 +6594,57 @@ msgstr "Kontrollerar konnektivitet"

6594 msgid "Checking object directories"

6595 msgstr "Kontrollerar objektkataloger"

6596

6312 -#: builtin/fsck.c:553

6597 +#: builtin/fsck.c:552

6598 msgid "git fsck [<options>] [<object>...]"

6599 msgstr "git fsck [<flaggor>] [<objekt>...]"

6600

6316 -#: builtin/fsck.c:559

6601 +#: builtin/fsck.c:558

6602 msgid "show unreachable objects"

6603 msgstr "visa onåbara objekt"

6604

6320 -#: builtin/fsck.c:560

6605 +#: builtin/fsck.c:559

6606 msgid "show dangling objects"

6607 msgstr "visa dinglande objekt"

6608

6324 -#: builtin/fsck.c:561

6609 +#: builtin/fsck.c:560

6610 msgid "report tags"

6611 msgstr "rapportera taggar"

6612

6328 -#: builtin/fsck.c:562

6613 +#: builtin/fsck.c:561

6614 msgid "report root nodes"

6615 msgstr "rapportera rotnoder"

6616

6332 -#: builtin/fsck.c:563

6617 +#: builtin/fsck.c:562

6618 msgid "make index objects head nodes"

6619 msgstr "gör indexojekt till huvudnoder"

6620

6336 -#: builtin/fsck.c:564

6621 +#: builtin/fsck.c:563

6622 msgid "make reflogs head nodes (default)"

6623 msgstr "gör refloggar till huvudnoder (standard)"

6624

6340 -#: builtin/fsck.c:565

6625 +#: builtin/fsck.c:564

6626 msgid "also consider packs and alternate objects"

6627 msgstr "ta även hänsyn till paket och alternativa objekt"

6628

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

6630 # objects in the database.

6346 -#: builtin/fsck.c:566

6631 +#: builtin/fsck.c:565

6632 msgid "check only connectivity"

6633 msgstr "kontrollera endast konnektivitet"

6634

6350 -#: builtin/fsck.c:567

6635 +#: builtin/fsck.c:566

6636 msgid "enable more strict checking"

6637 msgstr "aktivera striktare kontroll"

6638

6354 -#: builtin/fsck.c:569

6639 +#: builtin/fsck.c:568

6640 msgid "write dangling objects in .git/lost-found"

6641 msgstr "skriv dinglande objekt i .git/lost-found"

6642

6358 -#: builtin/fsck.c:570 builtin/prune.c:107

6643 +#: builtin/fsck.c:569 builtin/prune.c:107

6644 msgid "show progress"

6645 msgstr "visa förlopp"

6646

6362 -#: builtin/fsck.c:631

6647 +#: builtin/fsck.c:630

6648 msgid "Checking objects"

6649 msgstr "Kontrollerar objekt"

6650

@@ -6462,214 +6747,214 @@ msgstr "kunde inte läsa träd (%s)"

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

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

6749

6465 -#: builtin/grep.c:558

6750 +#: builtin/grep.c:560

6751 #, c-format

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

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

6754

6470 -#: builtin/grep.c:575

6755 +#: builtin/grep.c:577

6756 #, c-format

6757 msgid "cannot open '%s'"

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

6759

6475 -#: builtin/grep.c:644

6760 +#: builtin/grep.c:646

6761 msgid "search in index instead of in the work tree"

6762 msgstr "sök i indexet istället för i arbetskatalogen"

6763

6479 -#: builtin/grep.c:646

6764 +#: builtin/grep.c:648

6765 msgid "find in contents not managed by git"

6766 msgstr "sök i innehåll som inte hanteras av git"

6767

6483 -#: builtin/grep.c:648

6768 +#: builtin/grep.c:650

6769 msgid "search in both tracked and untracked files"

6770 msgstr "sök i både spårade och ospårade filer"

6771

6487 -#: builtin/grep.c:650

6772 +#: builtin/grep.c:652

6773 msgid "ignore files specified via '.gitignore'"

6774 msgstr "ignorera filer angivna i \".gitignore\""

6775

6491 -#: builtin/grep.c:653

6776 +#: builtin/grep.c:655

6777 msgid "show non-matching lines"

6778 msgstr "visa rader som inte träffas"

6779

6495 -#: builtin/grep.c:655

6780 +#: builtin/grep.c:657

6781 msgid "case insensitive matching"

6782 msgstr "skiftlägesokänslig sökning"

6783

6499 -#: builtin/grep.c:657

6784 +#: builtin/grep.c:659

6785 msgid "match patterns only at word boundaries"

6786 msgstr "matcha endast mönster vid ordgränser"

6787

6503 -#: builtin/grep.c:659

6788 +#: builtin/grep.c:661

6789 msgid "process binary files as text"

6790 msgstr "hantera binärfiler som text"

6791

6507 -#: builtin/grep.c:661

6792 +#: builtin/grep.c:663

6793 msgid "don't match patterns in binary files"

6794 msgstr "träffa inte mönster i binärfiler"

6795

6511 -#: builtin/grep.c:664

6796 +#: builtin/grep.c:666

6797 msgid "process binary files with textconv filters"

6798 msgstr "hantera binärfiler med textconv-filter"

6799

6515 -#: builtin/grep.c:666

6800 +#: builtin/grep.c:668

6801 msgid "descend at most <depth> levels"

6802 msgstr "gå som mest ned <djup> nivåer"

6803

6519 -#: builtin/grep.c:670

6804 +#: builtin/grep.c:672

6805 msgid "use extended POSIX regular expressions"

6806 msgstr "använd utökade POSIX-reguljära uttryck"

6807

6523 -#: builtin/grep.c:673

6808 +#: builtin/grep.c:675

6809 msgid "use basic POSIX regular expressions (default)"

6810 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"

6811

6527 -#: builtin/grep.c:676

6812 +#: builtin/grep.c:678

6813 msgid "interpret patterns as fixed strings"

6814 msgstr "tolka mönster som fixerade strängar"

6815

6531 -#: builtin/grep.c:679

6816 +#: builtin/grep.c:681

6817 msgid "use Perl-compatible regular expressions"

6818 msgstr "använd Perlkompatibla reguljära uttryck"

6819

6535 -#: builtin/grep.c:682

6820 +#: builtin/grep.c:684

6821 msgid "show line numbers"

6822 msgstr "visa radnummer"

6823

6539 -#: builtin/grep.c:683

6824 +#: builtin/grep.c:685

6825 msgid "don't show filenames"

6826 msgstr "visa inte filnamn"

6827

6543 -#: builtin/grep.c:684

6828 +#: builtin/grep.c:686

6829 msgid "show filenames"

6830 msgstr "visa filnamn"

6831

6547 -#: builtin/grep.c:686

6832 +#: builtin/grep.c:688

6833 msgid "show filenames relative to top directory"

6834 msgstr "visa filnamn relativa till toppkatalogen"

6835

6551 -#: builtin/grep.c:688

6836 +#: builtin/grep.c:690

6837 msgid "show only filenames instead of matching lines"

6838 msgstr "visa endast filnamn istället för träffade rader"

6839

6555 -#: builtin/grep.c:690

6840 +#: builtin/grep.c:692

6841 msgid "synonym for --files-with-matches"

6842 msgstr "synonym för --files-with-matches"

6843

6559 -#: builtin/grep.c:693

6844 +#: builtin/grep.c:695

6845 msgid "show only the names of files without match"

6846 msgstr "visa endast namn på filer utan träffar"

6847

6563 -#: builtin/grep.c:695

6848 +#: builtin/grep.c:697

6849 msgid "print NUL after filenames"

6850 msgstr "skriv NUL efter filnamn"

6851

6567 -#: builtin/grep.c:697

6852 +#: builtin/grep.c:699

6853 msgid "show the number of matches instead of matching lines"

6854 msgstr "visa antal träffar istället för träffade rader"

6855

6571 -#: builtin/grep.c:698

6856 +#: builtin/grep.c:700

6857 msgid "highlight matches"

6858 msgstr "ljusmarkera träffar"

6859

6575 -#: builtin/grep.c:700

6860 +#: builtin/grep.c:702

6861 msgid "print empty line between matches from different files"

6862 msgstr "skriv tomma rader mellan träffar från olika filer"

6863

6579 -#: builtin/grep.c:702

6864 +#: builtin/grep.c:704

6865 msgid "show filename only once above matches from same file"

6866 msgstr "visa filnamn endast en gång ovanför träffar från samma fil"

6867

6583 -#: builtin/grep.c:705

6868 +#: builtin/grep.c:707

6869 msgid "show <n> context lines before and after matches"

6870 msgstr "visa <n> rader sammanhang före och efter träffar"

6871

6587 -#: builtin/grep.c:708

6872 +#: builtin/grep.c:710

6873 msgid "show <n> context lines before matches"

6874 msgstr "visa <n> rader sammanhang före träffar"

6875

6591 -#: builtin/grep.c:710

6876 +#: builtin/grep.c:712

6877 msgid "show <n> context lines after matches"

6878 msgstr "visa <n> rader sammanhang efter träffar"

6879

6595 -#: builtin/grep.c:712

6880 +#: builtin/grep.c:714

6881 msgid "use <n> worker threads"

6882 msgstr "använd <n> jobbtrådar"

6883

6599 -#: builtin/grep.c:713

6884 +#: builtin/grep.c:715

6885 msgid "shortcut for -C NUM"

6886 msgstr "genväg för -C NUM"

6887

6603 -#: builtin/grep.c:716

6888 +#: builtin/grep.c:718

6889 msgid "show a line with the function name before matches"

6890 msgstr "visa en rad med funktionsnamnet före träffen"

6891

6607 -#: builtin/grep.c:718

6892 +#: builtin/grep.c:720

6893 msgid "show the surrounding function"

6894 msgstr "visa den omkringliggande funktionen"

6895

6611 -#: builtin/grep.c:721

6896 +#: builtin/grep.c:723

6897 msgid "read patterns from file"

6898 msgstr "läs mönster från fil"

6899

6615 -#: builtin/grep.c:723

6900 +#: builtin/grep.c:725

6901 msgid "match <pattern>"

6902 msgstr "träffa <mönster>"

6903

6619 -#: builtin/grep.c:725

6904 +#: builtin/grep.c:727

6905 msgid "combine patterns specified with -e"

6906 msgstr "kombinera mönster som anges med -e"

6907

6623 -#: builtin/grep.c:737

6908 +#: builtin/grep.c:739

6909 msgid "indicate hit with exit status without output"

6910 msgstr "ange träff med slutstatuskod utan utdata"

6911

6627 -#: builtin/grep.c:739

6912 +#: builtin/grep.c:741

6913 msgid "show only matches from files that match all patterns"

6914 msgstr "visa endast träffar från filer som träffar alla mönster"

6915

6631 -#: builtin/grep.c:741

6916 +#: builtin/grep.c:743

6917 msgid "show parse tree for grep expression"

6918 msgstr "visa analysträd för grep-uttryck"

6919

6635 -#: builtin/grep.c:745

6920 +#: builtin/grep.c:747

6921 msgid "pager"

6922 msgstr "bläddrare"

6923

6639 -#: builtin/grep.c:745

6924 +#: builtin/grep.c:747

6925 msgid "show matching files in the pager"

6926 msgstr "visa träffade filer i filbläddraren"

6927

6643 -#: builtin/grep.c:748

6928 +#: builtin/grep.c:750

6929 msgid "allow calling of grep(1) (ignored by this build)"

6930 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"

6931

6647 -#: builtin/grep.c:811

6932 +#: builtin/grep.c:813

6933 msgid "no pattern given."

6934 msgstr "inget mönster angavs."

6935

6651 -#: builtin/grep.c:843 builtin/index-pack.c:1475

6936 +#: builtin/grep.c:845 builtin/index-pack.c:1477

6937 #, c-format

6938 msgid "invalid number of threads specified (%d)"

6939 msgstr "felaktigt antal trådar angivet (%d)"

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