1439a72e17 · matheusbsbs/matheus-bagliano

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

7 msgstr ""

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

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

10 -"POT-Creation-Date: 2018-01-07 07:50+0800\n"

11 -"PO-Revision-Date: 2018-01-09 20:07+0100\n"

10 +"POT-Creation-Date: 2018-03-16 07:29+0800\n"

11 +"PO-Revision-Date: 2018-03-18 20:55+0100\n"

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

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

14 "Language: sv\n"

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

70 msgid "Exiting because of an unresolved conflict."

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

72

73 -#: advice.c:121 builtin/merge.c:1213

73 +#: advice.c:121 builtin/merge.c:1251

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

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

76

@@ -477,7 +477,7 @@ msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

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

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

479

480 -#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148

480 +#: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140

481 #, c-format

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

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

@@ -553,7 +553,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..."

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

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

555

556 -#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011

556 +#: apply.c:4545 builtin/fetch.c:775 builtin/fetch.c:1025

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

@@ -611,11 +611,11 @@ msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."

611 msgid "Unable to write new index file"

612 msgstr "Kunde inte skriva ny indexfil"

613

614 -#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223

615 -#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193

616 -#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860

617 -#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230

618 -#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450

614 +#: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257

615 +#: builtin/clone.c:118 builtin/fetch.c:127 builtin/pull.c:193

616 +#: builtin/submodule--helper.c:403 builtin/submodule--helper.c:1197

617 +#: builtin/submodule--helper.c:1200 builtin/submodule--helper.c:1567

618 +#: builtin/submodule--helper.c:1570 builtin/submodule--helper.c:1787

619 #: git-add--interactive.perl:197

620 msgid "path"

621 msgstr "sökväg"

@@ -628,7 +628,7 @@ msgstr "tillämpa inte ändringar som motsvarar given sökväg"

628 msgid "apply changes matching the given path"

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

630

631 -#: apply.c:4927 builtin/am.c:2229

631 +#: apply.c:4927 builtin/am.c:2263

632 msgid "num"

633 msgstr "antal"

634

@@ -668,75 +668,75 @@ msgstr "tillämpa en patch utan att röra arbetskatalogen"

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

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

670

671 -#: apply.c:4949

671 +#: apply.c:4950

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

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

674

675 -#: apply.c:4951

675 +#: apply.c:4952

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

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

678

679 -#: apply.c:4953

679 +#: apply.c:4954

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

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

682

683 -#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515

683 +#: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515

684 msgid "paths are separated with NUL character"

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

686

687 -#: apply.c:4958

687 +#: apply.c:4959

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

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

690

691 -#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95

691 +#: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95

692 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99

693 -#: builtin/pack-objects.c:3009

693 +#: builtin/pack-objects.c:3035

694 msgid "action"

695 msgstr "åtgärd"

696

697 -#: apply.c:4960

697 +#: apply.c:4961

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

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

700

701 -#: apply.c:4963 apply.c:4966

701 +#: apply.c:4964 apply.c:4967

702 msgid "ignore changes in whitespace when finding context"

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

704

705 -#: apply.c:4969

705 +#: apply.c:4970

706 msgid "apply the patch in reverse"

707 msgstr "tillämpa patchen baklänges"

708

709 -#: apply.c:4971

709 +#: apply.c:4972

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

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

712

713 -#: apply.c:4973

713 +#: apply.c:4974

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

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

716

717 -#: apply.c:4975

717 +#: apply.c:4976

718 msgid "allow overlapping hunks"

719 msgstr "tillåt överlappande stycken"

720

721 -#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21

722 -#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640

723 -#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125

721 +#: apply.c:4977 builtin/add.c:292 builtin/check-ignore.c:21

722 +#: builtin/commit.c:1276 builtin/count-objects.c:96 builtin/fsck.c:665

723 +#: builtin/log.c:1901 builtin/mv.c:123 builtin/read-tree.c:125

724 msgid "be verbose"

725 msgstr "var pratsam"

726

727 -#: apply.c:4978

727 +#: apply.c:4979

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

729 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

730

731 -#: apply.c:4981

731 +#: apply.c:4982

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

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

734

735 -#: apply.c:4983 builtin/am.c:2217

735 +#: apply.c:4984 builtin/am.c:2251

736 msgid "root"

737 msgstr "rot"

738

739 -#: apply.c:4984

739 +#: apply.c:4985

740 msgid "prepend <root> to all filenames"

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

742

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

772 msgid "archive format"

773 msgstr "arkivformat"

774

775 -#: archive.c:437 builtin/log.c:1459

775 +#: archive.c:437 builtin/log.c:1462

776 msgid "prefix"

777 msgstr "prefix"

778

@@ -780,11 +780,11 @@ msgstr "prefix"

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

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

782

783 -#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62

784 -#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861

785 -#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554

783 +#: archive.c:439 builtin/blame.c:702 builtin/blame.c:703 builtin/config.c:62

784 +#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:869

785 +#: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554

786 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120

787 -#: parse-options.h:153

787 +#: parse-options.h:165

788 msgid "file"

789 msgstr "fil"

790

@@ -816,8 +816,8 @@ msgstr "komprimera bättre"

816 msgid "list supported archive formats"

817 msgstr "visa understödda arkivformat"

818

819 -#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109

820 -#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239

819 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:108 builtin/clone.c:111

820 +#: builtin/submodule--helper.c:1209 builtin/submodule--helper.c:1576

821 msgid "repo"

822 msgstr "arkiv"

823

@@ -868,22 +868,22 @@ msgstr ""

868 "Negativa mönster ignoreras i git-attribut\n"

869 "Använd '\\!' för att inleda med ett utropstecken."

870

871 -#: bisect.c:458

871 +#: bisect.c:460

872 #, c-format

873 msgid "Badly quoted content in file '%s': %s"

874 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"

875

876 -#: bisect.c:666

876 +#: bisect.c:668

877 #, c-format

878 msgid "We cannot bisect more!\n"

879 msgstr "Det finns inte mer att göra \"bisect\" på!\n"

880

881 -#: bisect.c:720

881 +#: bisect.c:722

882 #, c-format

883 msgid "Not a valid commit name %s"

884 msgstr "Namnet på incheckningen är inte giltigt: %s"

885

886 -#: bisect.c:744

886 +#: bisect.c:746

887 #, c-format

888 msgid ""

889 "The merge base %s is bad.\n"

@@ -892,7 +892,7 @@ msgstr ""

892 "Sammanslagningsbasen %s är trasig.\n"

893 "Det betyder att felet har rättats mellan %s och [%s].\n"

894

895 -#: bisect.c:749

895 +#: bisect.c:751

896 #, c-format

897 msgid ""

898 "The merge base %s is new.\n"

@@ -901,7 +901,7 @@ msgstr ""

901 "Sammanslagningsbasen %s är ny.\n"

902 "Egenskapen har ändrats mellan %s och [%s].\n"

903

904 -#: bisect.c:754

904 +#: bisect.c:756

905 #, c-format

906 msgid ""

907 "The merge base %s is %s.\n"

@@ -910,7 +910,7 @@ msgstr ""

910 "Sammanslagningsbasen %s är %s.\n"

911 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"

912

913 -#: bisect.c:762

913 +#: bisect.c:764

914 #, c-format

915 msgid ""

916 "Some %s revs are not ancestors of the %s rev.\n"

@@ -921,7 +921,7 @@ msgstr ""

921 "git bisect kan inte fungera korrekt i detta fall.\n"

922 "Kanske du skrev fel %s- och %s-revisioner?\n"

923

924 -#: bisect.c:775

924 +#: bisect.c:777

925 #, c-format

926 msgid ""

927 "the merge base between %s and [%s] must be skipped.\n"

@@ -938,31 +938,31 @@ msgstr ""

938 msgid "Bisecting: a merge base must be tested\n"

939 msgstr "Bisect: en sammanslagningsbas måste testas\n"

940

941 -#: bisect.c:862

941 +#: bisect.c:850

942 #, c-format

943 msgid "a %s revision is needed"

944 msgstr "en %s-revision behövs"

945

946 -#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234

946 +#: bisect.c:869 builtin/notes.c:175 builtin/tag.c:235

947 #, c-format

948 msgid "could not create file '%s'"

949 msgstr "kunde inte skapa filen \"%s\""

950

951 -#: bisect.c:930

951 +#: bisect.c:920

952 #, c-format

953 msgid "could not read file '%s'"

954 msgstr "kunde inte läsa filen \"%s\""

955

956 -#: bisect.c:960

956 +#: bisect.c:950

957 msgid "reading bisect refs failed"

958 msgstr "misslyckades läsa bisect-referenser"

959

960 -#: bisect.c:979

960 +#: bisect.c:969

961 #, c-format

962 msgid "%s was both %s and %s\n"

963 msgstr "%s var både %s och %s\n"

964

965 -#: bisect.c:987

965 +#: bisect.c:977

966 #, c-format

967 msgid ""

968 "No testable commit found.\n"

@@ -971,7 +971,7 @@ msgstr ""

971 "Ingen testbar incheckning hittades.\n"

972 "Kanske du startade med felaktiga sökvägsparametrar?\n"

973

974 -#: bisect.c:1006

974 +#: bisect.c:996

975 #, c-format

976 msgid "(roughly %d step)"

977 msgid_plural "(roughly %d steps)"

@@ -981,47 +981,47 @@ msgstr[1] "(ungefär %d steg)"

981 #. TRANSLATORS: the last %s will be replaced with "(roughly %d

982 #. steps)" translation.

983 #.

984 -#: bisect.c:1012

984 +#: bisect.c:1002

985 #, c-format

986 msgid "Bisecting: %d revision left to test after this %s\n"

987 msgid_plural "Bisecting: %d revisions left to test after this %s\n"

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

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

990

991 -#: blame.c:1757

991 +#: blame.c:1758

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

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

994

995 -#: blame.c:1768

995 +#: blame.c:1769

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

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

998

999 -#: blame.c:1788

999 +#: blame.c:1789

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

1001 msgstr ""

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

1003 "incheckningen"

1004

1005 -#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177

1006 -#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918

1007 -#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369

1005 +#: blame.c:1798 bundle.c:160 ref-filter.c:1978 sequencer.c:1699

1006 +#: sequencer.c:2901 builtin/commit.c:976 builtin/log.c:366 builtin/log.c:920

1007 +#: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:370

1008 #: builtin/shortlog.c:191

1009 msgid "revision walk setup failed"

1010 msgstr "misslyckades skapa revisionstraversering"

1011

1012 -#: blame.c:1815

1012 +#: blame.c:1816

1013 msgid ""

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

1015 msgstr ""

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

1017 "kedjan"

1018

1019 -#: blame.c:1826

1019 +#: blame.c:1827

1020 #, c-format

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

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

1023

1024 -#: blame.c:1837

1024 +#: blame.c:1838

1025 #, c-format

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

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

@@ -1179,76 +1179,75 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"

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

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

1181

1182 -#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637

1183 -#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782

1182 +#: bundle.c:88 sequencer.c:1879 sequencer.c:2337 builtin/commit.c:750

1183 #, c-format

1184 msgid "could not open '%s'"

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

1186

1188 -#: bundle.c:140

1187 +#: bundle.c:139

1188 msgid "Repository lacks these prerequisite commits:"

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

1190

1192 -#: bundle.c:193

1191 +#: bundle.c:190

1192 #, c-format

1193 msgid "The bundle contains this ref:"

1194 msgid_plural "The bundle contains these %d refs:"

1195 msgstr[0] "Paketet (bundlen) innehåller denna referens:"

1196 msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"

1197

1199 -#: bundle.c:200

1198 +#: bundle.c:197

1199 msgid "The bundle records a complete history."

1200 msgstr "Paketet (bundlen) beskriver en komplett historik."

1201

1203 -#: bundle.c:202

1202 +#: bundle.c:199

1203 #, c-format

1204 msgid "The bundle requires this ref:"

1205 msgid_plural "The bundle requires these %d refs:"

1206 msgstr[0] "Paketet (bundlen) kräver denna referens:"

1207 msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"

1208

1210 -#: bundle.c:261

1209 +#: bundle.c:258

1210 msgid "Could not spawn pack-objects"

1211 msgstr "Kunde inte starta pack-objects"

1212

1214 -#: bundle.c:272

1213 +#: bundle.c:269

1214 msgid "pack-objects died"

1215 msgstr "pack-objects misslyckades"

1216

1218 -#: bundle.c:314

1217 +#: bundle.c:311

1218 msgid "rev-list died"

1219 msgstr "rev-list dog"

1220

1222 -#: bundle.c:363

1221 +#: bundle.c:360

1222 #, c-format

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

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

1225

1227 -#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296

1226 +#: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:296

1227 #, c-format

1228 msgid "unrecognized argument: %s"

1229 msgstr "okänt argument: %s"

1230

1232 -#: bundle.c:461

1231 +#: bundle.c:458

1232 msgid "Refusing to create empty bundle."

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

1234

1236 -#: bundle.c:473

1235 +#: bundle.c:470

1236 #, c-format

1237 msgid "cannot create '%s'"

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

1239

1241 -#: bundle.c:501

1240 +#: bundle.c:498

1241 msgid "index-pack died"

1242 msgstr "index-pack dog"

1243

1245 -#: color.c:301

1244 +#: color.c:296

1245 #, c-format

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

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

1248

1250 -#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465

1251 -#: builtin/am.c:1434 builtin/am.c:2069

1249 +#: commit.c:41 sequencer.c:2141 builtin/am.c:421 builtin/am.c:465

1250 +#: builtin/am.c:1436 builtin/am.c:2072

1251 #, c-format

1252 msgid "could not parse %s"

1253 msgstr "kunde inte tolka %s"

@@ -1258,7 +1257,7 @@ msgstr "kunde inte tolka %s"

1257 msgid "%s %s is not a commit!"

1258 msgstr "%s %s är inte en incheckning!"

1259

1261 -#: commit.c:1524

1260 +#: commit.c:1506

1261 msgid ""

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

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

@@ -1371,66 +1370,66 @@ msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

1370 msgid "bad zlib compression level %d"

1371 msgstr "felaktigt zlib-komprimeringsgrad %d"

1372

1374 -#: config.c:1222

1373 +#: config.c:1225

1374 #, c-format

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

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

1377

1379 -#: config.c:1378

1378 +#: config.c:1386

1379 #, c-format

1380 msgid "bad pack compression level %d"

1381 msgstr "felaktig paketkomprimeringsgrad %d"

1382

1384 -#: config.c:1574

1383 +#: config.c:1582

1384 msgid "unable to parse command-line config"

1385 msgstr "kan inte tolka kommandoradskonfiguration"

1386

1388 -#: config.c:1906

1387 +#: config.c:1914

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

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

1390

1392 -#: config.c:2093

1391 +#: config.c:2101

1392 #, c-format

1393 msgid "Invalid %s: '%s'"

1394 msgstr "Felaktigt %s: \"%s\""

1395

1397 -#: config.c:2136

1396 +#: config.c:2144

1397 #, c-format

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

1399 msgstr ""

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

1401

1403 -#: config.c:2162

1402 +#: config.c:2170

1403 #, c-format

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

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

1406

1408 -#: config.c:2187

1407 +#: config.c:2195

1408 #, c-format

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

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

1411

1413 -#: config.c:2189

1412 +#: config.c:2197

1413 #, c-format

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

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

1416

1418 -#: config.c:2248

1417 +#: config.c:2256

1418 #, c-format

1419 msgid "%s has multiple values"

1420 msgstr "%s har flera värden"

1421

1423 -#: config.c:2591 config.c:2808

1422 +#: config.c:2599 config.c:2816

1423 #, c-format

1424 msgid "fstat on %s failed"

1425 msgstr "fstat misslyckades på %s"

1426

1428 -#: config.c:2698

1427 +#: config.c:2706

1428 #, c-format

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

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

1431

1433 -#: config.c:2700 builtin/remote.c:776

1432 +#: config.c:2708 builtin/remote.c:776

1433 #, c-format

1434 msgid "could not unset '%s'"

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

@@ -1453,24 +1452,29 @@ msgstr ""

1452

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

1454 # objects in the database.

1456 -#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141

1455 +#: connected.c:66 builtin/fsck.c:198 builtin/prune.c:144

1456 msgid "Checking connectivity"

1457 msgstr "Kontrollerar konnektivitet"

1458

1460 -#: connected.c:76

1459 +#: connected.c:78

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

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

1462

1464 -#: connected.c:96

1463 +#: connected.c:98

1464 msgid "failed write to rev-list"

1465 msgstr "kunde inte skriva till rev-list"

1466

1468 -#: connected.c:103

1467 +#: connected.c:105

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

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

1470

1471 #: convert.c:205

1472 #, c-format

1473 +msgid "CRLF would be replaced by LF in %s."

1474 +msgstr "CRLF skulle ersättas av LF i %s."

1475 +

1476 +#: convert.c:207

1477 +#, c-format

1478 msgid ""

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

1480 "The file will have its original line endings in your working directory."

@@ -1478,12 +1482,12 @@ msgstr ""

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

1483 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."

1484

1481 -#: convert.c:209

1485 +#: convert.c:215

1486 #, c-format

1483 -msgid "CRLF would be replaced by LF in %s."

1484 -msgstr "CRLF skulle ersättas av LF i %s."

1487 +msgid "LF would be replaced by CRLF in %s"

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

1489

1486 -#: convert.c:215

1490 +#: convert.c:217

1491 #, c-format

1492 msgid ""

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

@@ -1492,11 +1496,6 @@ msgstr ""

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

1497 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog."

1498

1495 -#: convert.c:219

1496 -#, c-format

1497 -msgid "LF would be replaced by CRLF in %s"

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

1499 -

1499 #: date.c:116

1500 msgid "in the future"

1501 msgstr "i framtiden"

@@ -1611,20 +1610,24 @@ msgstr ""

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

1611 "%s"

1612

1614 -#: diff.c:3799

1613 +#: diff.c:3822

1614 #, c-format

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

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

1617

1619 -#: diff.c:4127

1618 +#: diff.c:4146

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

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

1621

1623 -#: diff.c:4215

1622 +#: diff.c:4149

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

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

1625 +

1626 +#: diff.c:4237

1627 msgid "--follow requires exactly one pathspec"

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

1629

1627 -#: diff.c:4381

1630 +#: diff.c:4403

1631 #, c-format

1632 msgid ""

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

@@ -1633,41 +1636,46 @@ msgstr ""

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

1637 "%s"

1638

1636 -#: diff.c:4395

1639 +#: diff.c:4417

1640 #, c-format

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

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

1643

1641 -#: diff.c:5446

1644 +#: diff.c:5493

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

1646 msgstr ""

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

1648

1646 -#: diff.c:5449

1649 +#: diff.c:5496

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

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

1652

1650 -#: diff.c:5452

1653 +#: diff.c:5499

1654 #, c-format

1655 msgid ""

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

1657 msgstr ""

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

1659

1657 -#: dir.c:2100

1660 +#: dir.c:1866

1661 +#, c-format

1662 +msgid "could not open directory '%s'"

1663 +msgstr "kunde inte öppna katalogen \"%s\""

1664 +

1665 +#: dir.c:2108

1666 msgid "failed to get kernel name and information"

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

1668

1661 -#: dir.c:2219

1669 +#: dir.c:2232

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

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

1672

1665 -#: dir.c:3002 dir.c:3007

1673 +#: dir.c:3024 dir.c:3029

1674 #, c-format

1675 msgid "could not create directories for %s"

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

1677

1670 -#: dir.c:3032

1678 +#: dir.c:3054

1679 #, c-format

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

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

@@ -1686,184 +1694,192 @@ msgstr "Filtrerar innehåll"

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

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

1696

1689 -#: fetch-pack.c:252

1697 +#: fetch-object.c:17

1698 +msgid "Remote with no URL"

1699 +msgstr "Fjärr utan URL"

1700 +

1701 +#: fetch-pack.c:253

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

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

1704

1693 -#: fetch-pack.c:264

1694 -msgid "git fetch-pack: expected ACK/NAK, got EOF"

1695 -msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"

1705 +#: fetch-pack.c:265

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

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

1708

1697 -#: fetch-pack.c:283 builtin/archive.c:63

1709 +#: fetch-pack.c:284 builtin/archive.c:63

1710 #, c-format

1711 msgid "remote error: %s"

1712 msgstr "fjärrfel: %s"

1713

1702 -#: fetch-pack.c:284

1714 +#: fetch-pack.c:285

1715 #, c-format

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

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

1718

1707 -#: fetch-pack.c:336

1719 +#: fetch-pack.c:337

1720 msgid "--stateless-rpc requires multi_ack_detailed"

1721 msgstr "--stateless-rpc kräver ”multi_ack_detailed”"

1722

1711 -#: fetch-pack.c:422

1723 +#: fetch-pack.c:428

1724 #, c-format

1725 msgid "invalid shallow line: %s"

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

1727

1716 -#: fetch-pack.c:428

1728 +#: fetch-pack.c:434

1729 #, c-format

1730 msgid "invalid unshallow line: %s"

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

1732

1721 -#: fetch-pack.c:430

1733 +#: fetch-pack.c:436

1734 #, c-format

1735 msgid "object not found: %s"

1736 msgstr "objektet hittades inte: %s"

1737

1726 -#: fetch-pack.c:433

1738 +#: fetch-pack.c:439

1739 #, c-format

1740 msgid "error in object: %s"

1741 msgstr "fel i objekt: %s"

1742

1731 -#: fetch-pack.c:435

1743 +#: fetch-pack.c:441

1744 #, c-format

1745 msgid "no shallow found: %s"

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

1747

1736 -#: fetch-pack.c:438

1748 +#: fetch-pack.c:444

1749 #, c-format

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

1751 msgstr "förväntade shallow/unshallow, fick %s"

1752

1741 -#: fetch-pack.c:477

1753 +#: fetch-pack.c:485

1754 #, c-format

1755 msgid "got %s %d %s"

1756 msgstr "fick %s %d %s"

1757

1746 -#: fetch-pack.c:491

1758 +#: fetch-pack.c:499

1759 #, c-format

1760 msgid "invalid commit %s"

1761 msgstr "ogiltig incheckning %s"

1762

1751 -#: fetch-pack.c:524

1763 +#: fetch-pack.c:532

1764 msgid "giving up"

1765 msgstr "ger upp"

1766

1755 -#: fetch-pack.c:534 progress.c:229

1767 +#: fetch-pack.c:542 progress.c:229

1768 msgid "done"

1769 msgstr "klart"

1770

1759 -#: fetch-pack.c:546

1771 +#: fetch-pack.c:554

1772 #, c-format

1773 msgid "got %s (%d) %s"

1774 msgstr "fick %s (%d) %s"

1775

1764 -#: fetch-pack.c:592

1776 +#: fetch-pack.c:600

1777 #, c-format

1778 msgid "Marking %s as complete"

1779 msgstr "Markerar %s som komplett"

1780

1769 -#: fetch-pack.c:777

1781 +#: fetch-pack.c:788

1782 #, c-format

1783 msgid "already have %s (%s)"

1784 msgstr "har redan %s (%s)"

1785

1774 -#: fetch-pack.c:815

1786 +#: fetch-pack.c:829

1787 msgid "fetch-pack: unable to fork off sideband demultiplexer"

1788 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"

1789

1778 -#: fetch-pack.c:823

1790 +#: fetch-pack.c:837

1791 msgid "protocol error: bad pack header"

1792 msgstr "protokollfel: felaktigt packhuvud"

1793

1782 -#: fetch-pack.c:879

1794 +#: fetch-pack.c:895

1795 #, c-format

1796 msgid "fetch-pack: unable to fork off %s"

1797 msgstr "fetch-patch: kunde inte grena av %s"

1798

1787 -#: fetch-pack.c:895

1799 +#: fetch-pack.c:911

1800 #, c-format

1801 msgid "%s failed"

1802 msgstr "%s misslyckades"

1803

1792 -#: fetch-pack.c:897

1804 +#: fetch-pack.c:913

1805 msgid "error in sideband demultiplexer"

1806 msgstr "fel i sidbands-avmultiplexare"

1807

1796 -#: fetch-pack.c:924

1808 +#: fetch-pack.c:940

1809 msgid "Server does not support shallow clients"

1810 msgstr "Servern stöder inte klienter med grunda arkiv"

1811

1800 -#: fetch-pack.c:928

1812 +#: fetch-pack.c:944

1813 msgid "Server supports multi_ack_detailed"

1814 msgstr "Servern stöder \"multi_ack_detailed\""

1815

1804 -#: fetch-pack.c:931

1816 +#: fetch-pack.c:947

1817 msgid "Server supports no-done"

1818 msgstr "Servern stöder \"no-done\""

1819

1808 -#: fetch-pack.c:937

1820 +#: fetch-pack.c:953

1821 msgid "Server supports multi_ack"

1822 msgstr "Servern stöder \"multi_ack\""

1823

1812 -#: fetch-pack.c:941

1824 +#: fetch-pack.c:957

1825 msgid "Server supports side-band-64k"

1826 msgstr "Servern stöder \"side-band-64k\""

1827

1816 -#: fetch-pack.c:945

1828 +#: fetch-pack.c:961

1829 msgid "Server supports side-band"

1830 msgstr "Servern stöder \"side-band\""

1831

1820 -#: fetch-pack.c:949

1832 +#: fetch-pack.c:965

1833 msgid "Server supports allow-tip-sha1-in-want"

1834 msgstr "Servern stöder \"allow-tip-sha1-in-want\""

1835

1824 -#: fetch-pack.c:953

1836 +#: fetch-pack.c:969

1837 msgid "Server supports allow-reachable-sha1-in-want"

1838 msgstr "Servern stöder \"allow-reachable-sha1-in-want\""

1839

1828 -#: fetch-pack.c:963

1840 +#: fetch-pack.c:979

1841 msgid "Server supports ofs-delta"

1842 msgstr "Servern stöder \"ofs-delta\""

1843

1832 -#: fetch-pack.c:970

1844 +#: fetch-pack.c:985

1845 +msgid "Server supports filter"

1846 +msgstr "Servern stöder filter"

1847 +

1848 +#: fetch-pack.c:993

1849 #, c-format

1850 msgid "Server version is %.*s"

1851 msgstr "Serverversionen är %.*s"

1852

1837 -#: fetch-pack.c:976

1853 +#: fetch-pack.c:999

1854 msgid "Server does not support --shallow-since"

1855 msgstr "Servern stöder inte --shallow-since"

1856

1841 -#: fetch-pack.c:980

1857 +#: fetch-pack.c:1003

1858 msgid "Server does not support --shallow-exclude"

1859 msgstr "Servern stöder inte --shallow-exclude"

1860

1845 -#: fetch-pack.c:982

1861 +#: fetch-pack.c:1005

1862 msgid "Server does not support --deepen"

1863 msgstr "Servern stöder inte --deepen"

1864

1849 -#: fetch-pack.c:993

1865 +#: fetch-pack.c:1016

1866 msgid "no common commits"

1867 msgstr "inga gemensamma incheckningar"

1868

1853 -#: fetch-pack.c:1005

1869 +#: fetch-pack.c:1028

1870 msgid "git fetch-pack: fetch failed."

1871 msgstr "git fetch-patch: hämtning misslyckades."

1872

1857 -#: fetch-pack.c:1167

1873 +#: fetch-pack.c:1190

1874 msgid "no matching remote head"

1875 msgstr "inget motsvarande fjärrhuvud"

1876

1861 -#: fetch-pack.c:1189

1877 +#: fetch-pack.c:1212

1878 #, c-format

1879 msgid "no such remote ref %s"

1880 msgstr "ingen sådan fjärreferens: %s"

1881

1866 -#: fetch-pack.c:1192

1882 +#: fetch-pack.c:1215

1883 #, c-format

1884 msgid "Server does not allow request for unadvertised object %s"

1885 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"

@@ -1886,17 +1902,18 @@ msgstr "misslyckades skriva fristående signatur till \"%s\""

1902 msgid "ignore invalid color '%.*s' in log.graphColors"

1903 msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"

1904

1889 -#: grep.c:2017

1905 +#: grep.c:2022

1906 #, c-format

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

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

1909

1894 -#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134

1910 +#: grep.c:2039 setup.c:163 builtin/clone.c:407 builtin/diff.c:81

1911 +#: builtin/rm.c:134

1912 #, c-format

1913 msgid "failed to stat '%s'"

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

1915

1899 -#: grep.c:2045

1916 +#: grep.c:2050

1917 #, c-format

1918 msgid "'%s': short read"

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

@@ -2039,19 +2056,18 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"

2056 msgid "name consists only of disallowed characters: %s"

2057 msgstr "namnet består enbart av ej tillåtna tecken: %s"

2058

2042 -#: ident.c:416 builtin/commit.c:616

2059 +#: ident.c:416 builtin/commit.c:582

2060 #, c-format

2061 msgid "invalid date format: %s"

2062 msgstr "felaktigt datumformat: %s"

2063

2047 -#: list-objects-filter-options.c:30

2048 -msgid "multiple object filter types cannot be combined"

2049 -msgstr "flera objektfiltertyper kan inte kombineras"

2064 +#: list-objects-filter-options.c:36

2065 +msgid "multiple filter-specs cannot be combined"

2066 +msgstr "flera filterspecifikationer kan inte kombineras"

2067

2051 -#: list-objects-filter-options.c:41 list-objects-filter-options.c:68

2052 -#, c-format

2053 -msgid "invalid filter-spec expression '%s'"

2054 -msgstr "ogiltig filterspec-utryck \"%s\""

2068 +#: list-objects-filter-options.c:126

2069 +msgid "cannot change partial clone promisor remote"

2070 +msgstr "kan inte ändra kontraktsfjärr för delvis kloning"

2071

2072 #: lockfile.c:151

2073 #, c-format

@@ -2082,8 +2098,8 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

2098 msgid "failed to read the cache"

2099 msgstr "misslyckades läsa cachen"

2100

2085 -#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379

2086 -#: builtin/checkout.c:600 builtin/clone.c:754

2101 +#: merge.c:134 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2102 +#: builtin/checkout.c:599 builtin/clone.c:759

2103 msgid "unable to write new index file"

2104 msgstr "kunde inte skriva ny indexfil"

2105

@@ -2100,60 +2116,60 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

2116 msgid "error building trees"

2117 msgstr "fel vid byggande av träd"

2118

2103 -#: merge-recursive.c:752

2119 +#: merge-recursive.c:771

2120 #, c-format

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

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

2123

2108 -#: merge-recursive.c:763

2124 +#: merge-recursive.c:782

2125 #, c-format

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

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

2128

2113 -#: merge-recursive.c:777 merge-recursive.c:796

2129 +#: merge-recursive.c:796 merge-recursive.c:815

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

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

2132

2117 -#: merge-recursive.c:786

2133 +#: merge-recursive.c:805

2134 #, c-format

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

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

2137

2122 -#: merge-recursive.c:828 builtin/cat-file.c:37

2138 +#: merge-recursive.c:847 builtin/cat-file.c:37

2139 #, c-format

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

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

2142

2127 -#: merge-recursive.c:830

2143 +#: merge-recursive.c:849

2144 #, c-format

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

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

2147

2132 -#: merge-recursive.c:854

2148 +#: merge-recursive.c:873

2149 #, c-format

2150 msgid "failed to open '%s': %s"

2151 msgstr "misslyckades öppna \"%s\": %s"

2152

2137 -#: merge-recursive.c:865

2153 +#: merge-recursive.c:884

2154 #, c-format

2155 msgid "failed to symlink '%s': %s"

2156 msgstr "misslyckades skapa symboliska länken \"%s\": %s"

2157

2142 -#: merge-recursive.c:870

2158 +#: merge-recursive.c:889

2159 #, c-format

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

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

2162

2147 -#: merge-recursive.c:1010

2163 +#: merge-recursive.c:1029

2164 msgid "Failed to execute internal merge"

2165 msgstr "Misslyckades exekvera intern sammanslagning"

2166

2151 -#: merge-recursive.c:1014

2167 +#: merge-recursive.c:1034

2168 #, c-format

2169 msgid "Unable to add %s to database"

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

2171

2156 -#: merge-recursive.c:1117

2172 +#: merge-recursive.c:1146

2173 #, c-format

2174 msgid ""

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

@@ -2162,7 +2178,7 @@ msgstr ""

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

2179 "i trädet."

2180

2165 -#: merge-recursive.c:1122

2181 +#: merge-recursive.c:1151

2182 #, c-format

2183 msgid ""

2184 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2171,7 +2187,7 @@ msgstr ""

2187 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2188 "%s lämnad i trädet."

2189

2174 -#: merge-recursive.c:1129

2190 +#: merge-recursive.c:1158

2191 #, c-format

2192 msgid ""

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

@@ -2180,7 +2196,7 @@ msgstr ""

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

2197 "i trädet vid %s."

2198

2183 -#: merge-recursive.c:1134

2199 +#: merge-recursive.c:1163

2200 #, c-format

2201 msgid ""

2202 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "

@@ -2189,20 +2205,20 @@ msgstr ""

2205 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "

2206 "%s lämnad i trädet vid %s."

2207

2192 -#: merge-recursive.c:1168

2208 +#: merge-recursive.c:1197

2209 msgid "rename"

2210 msgstr "namnbyte"

2211

2196 -#: merge-recursive.c:1168

2212 +#: merge-recursive.c:1197

2213 msgid "renamed"

2214 msgstr "namnbytt"

2215

2200 -#: merge-recursive.c:1225

2216 +#: merge-recursive.c:1254

2217 #, c-format

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

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

2220

2205 -#: merge-recursive.c:1250

2221 +#: merge-recursive.c:1279

2222 #, c-format

2223 msgid ""

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

@@ -2211,140 +2227,140 @@ msgstr ""

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

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

2229

2214 -#: merge-recursive.c:1255

2230 +#: merge-recursive.c:1284

2231 msgid " (left unresolved)"

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

2233

2218 -#: merge-recursive.c:1317

2234 +#: merge-recursive.c:1346

2235 #, c-format

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

2237 msgstr ""

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

2239

2224 -#: merge-recursive.c:1350

2240 +#: merge-recursive.c:1379

2241 #, c-format

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

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

2244

2229 -#: merge-recursive.c:1553

2245 +#: merge-recursive.c:1582

2246 #, c-format

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

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

2249

2234 -#: merge-recursive.c:1568

2250 +#: merge-recursive.c:1597

2251 #, c-format

2252 msgid "Adding merged %s"

2253 msgstr "Lägger till sammanslagen %s"

2254

2239 -#: merge-recursive.c:1575 merge-recursive.c:1805

2255 +#: merge-recursive.c:1604 merge-recursive.c:1834

2256 #, c-format

2257 msgid "Adding as %s instead"

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

2259

2244 -#: merge-recursive.c:1632

2260 +#: merge-recursive.c:1661

2261 #, c-format

2262 msgid "cannot read object %s"

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

2264

2249 -#: merge-recursive.c:1635

2265 +#: merge-recursive.c:1664

2266 #, c-format

2267 msgid "object %s is not a blob"

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

2269

2254 -#: merge-recursive.c:1704

2270 +#: merge-recursive.c:1733

2271 msgid "modify"

2272 msgstr "ändra"

2273

2258 -#: merge-recursive.c:1704

2274 +#: merge-recursive.c:1733

2275 msgid "modified"

2276 msgstr "ändrad"

2277

2262 -#: merge-recursive.c:1714

2278 +#: merge-recursive.c:1743

2279 msgid "content"

2280 msgstr "innehåll"

2281

2266 -#: merge-recursive.c:1721

2282 +#: merge-recursive.c:1750

2283 msgid "add/add"

2284 msgstr "tillägg/tillägg"

2285

2270 -#: merge-recursive.c:1757

2286 +#: merge-recursive.c:1786

2287 #, c-format

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

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

2290

2275 -#: merge-recursive.c:1771

2291 +#: merge-recursive.c:1800

2292 #, c-format

2293 msgid "Auto-merging %s"

2294 msgstr "Slår ihop %s automatiskt"

2295

2280 -#: merge-recursive.c:1775 git-submodule.sh:932

2296 +#: merge-recursive.c:1804 git-submodule.sh:879

2297 msgid "submodule"

2298 msgstr "undermodul"

2299

2284 -#: merge-recursive.c:1776

2300 +#: merge-recursive.c:1805

2301 #, c-format

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

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

2304

2289 -#: merge-recursive.c:1870

2305 +#: merge-recursive.c:1899

2306 #, c-format

2307 msgid "Removing %s"

2308 msgstr "Tar bort %s"

2309

2294 -#: merge-recursive.c:1896

2310 +#: merge-recursive.c:1925

2311 msgid "file/directory"

2312 msgstr "fil/katalog"

2313

2298 -#: merge-recursive.c:1902

2314 +#: merge-recursive.c:1931

2315 msgid "directory/file"

2316 msgstr "katalog/fil"

2317

2302 -#: merge-recursive.c:1909

2318 +#: merge-recursive.c:1938

2319 #, c-format

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

2321 msgstr ""

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

2323

2308 -#: merge-recursive.c:1918

2324 +#: merge-recursive.c:1947

2325 #, c-format

2326 msgid "Adding %s"

2327 msgstr "Lägger till %s"

2328

2313 -#: merge-recursive.c:1958

2329 +#: merge-recursive.c:1987

2330 #, c-format

2331 msgid "Dirty index: cannot merge (dirty: %s)"

2332 msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"

2333

2318 -#: merge-recursive.c:1962

2334 +#: merge-recursive.c:1991

2335 msgid "Already up to date!"

2336 msgstr "Redan à jour!"

2337

2322 -#: merge-recursive.c:1971

2338 +#: merge-recursive.c:2000

2339 #, c-format

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

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

2342

2327 -#: merge-recursive.c:2068

2343 +#: merge-recursive.c:2097

2344 msgid "Merging:"

2345 msgstr "Slår ihop:"

2346

2331 -#: merge-recursive.c:2081

2347 +#: merge-recursive.c:2110

2348 #, c-format

2349 msgid "found %u common ancestor:"

2350 msgid_plural "found %u common ancestors:"

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

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

2353

2338 -#: merge-recursive.c:2120

2354 +#: merge-recursive.c:2149

2355 msgid "merge returned no commit"

2356 msgstr "sammanslagningen returnerade ingen incheckning"

2357

2342 -#: merge-recursive.c:2183

2358 +#: merge-recursive.c:2212

2359 #, c-format

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

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

2362

2347 -#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815

2363 +#: merge-recursive.c:2228 builtin/merge.c:657 builtin/merge.c:816

2364 msgid "Unable to write index."

2365 msgstr "Kunde inte skriva indexet."

2366

@@ -2365,16 +2381,16 @@ msgstr ""

2381 msgid "You have not concluded your notes merge (%s exists)."

2382 msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."

2383

2368 -#: notes-utils.c:42

2384 +#: notes-utils.c:43

2385 msgid "Cannot commit uninitialized/unreferenced notes tree"

2386 msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"

2387

2372 -#: notes-utils.c:101

2388 +#: notes-utils.c:102

2389 #, c-format

2390 msgid "Bad notes.rewriteMode value: '%s'"

2391 msgstr "Felaktigt värde för notes.rewriteMode: '%s'"

2392

2377 -#: notes-utils.c:111

2393 +#: notes-utils.c:112

2394 #, c-format

2395 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"

2396 msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

2399 #. the environment variable, the second %s is

2400 #. its value.

2401 #.

2386 -#: notes-utils.c:141

2402 +#: notes-utils.c:142

2403 #, c-format

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

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

@@ -2393,25 +2409,25 @@ msgstr "Felaktigt värde på %s: \"%s\""

2409 msgid "unable to parse object: %s"

2410 msgstr "kunde inte tolka objektet: %s"

2411

2396 -#: packfile.c:556

2412 +#: packfile.c:561

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

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

2415

2400 -#: packfile.c:1683

2416 +#: packfile.c:1694

2417 #, c-format

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

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

2420

2405 -#: packfile.c:1687

2421 +#: packfile.c:1698

2422 #, c-format

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

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

2425

2410 -#: parse-options.c:573

2426 +#: parse-options.c:619

2427 msgid "..."

2428 msgstr "..."

2429

2414 -#: parse-options.c:592

2430 +#: parse-options.c:638

2431 #, c-format

2432 msgid "usage: %s"

2433 msgstr "användning: %s"

@@ -2419,17 +2435,17 @@ msgstr "användning: %s"

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

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

2437 #.

2422 -#: parse-options.c:598

2438 +#: parse-options.c:644

2439 #, c-format

2440 msgid " or: %s"

2441 msgstr " eller: %s"

2442

2427 -#: parse-options.c:601

2443 +#: parse-options.c:647

2444 #, c-format

2445 msgid " %s"

2446 msgstr " %s"

2447

2432 -#: parse-options.c:640

2448 +#: parse-options.c:686

2449 msgid "-NUM"

2450 msgstr "-TAL"

2451

@@ -2521,7 +2537,7 @@ msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"

2537 msgid "unable to parse --pretty format"

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

2539

2524 -#: read-cache.c:1472

2540 +#: read-cache.c:1473

2541 #, c-format

2542 msgid ""

2543 "index.version set, but the value is invalid.\n"

@@ -2530,7 +2546,7 @@ msgstr ""

2546 "index.version satt, men värdet är ogiltigt.\n"

2547 "Använder version %i"

2548

2533 -#: read-cache.c:1482

2549 +#: read-cache.c:1483

2550 #, c-format

2551 msgid ""

2552 "GIT_INDEX_VERSION set, but the value is invalid.\n"

@@ -2539,22 +2555,22 @@ msgstr ""

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

2556 "Använder version %i"

2557

2542 -#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048

2558 +#: read-cache.c:2375 sequencer.c:3248 wrapper.c:658 builtin/merge.c:1049

2559 #, c-format

2560 msgid "could not close '%s'"

2561 msgstr "kunde inte stänga \"%s\""

2562

2547 -#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096

2563 +#: read-cache.c:2448 sequencer.c:1900 sequencer.c:2627

2564 #, c-format

2565 msgid "could not stat '%s'"

2566 msgstr "kunde inte ta status på \"%s\""

2567

2552 -#: read-cache.c:2455

2568 +#: read-cache.c:2461

2569 #, c-format

2570 msgid "unable to open git dir: %s"

2571 msgstr "kunde inte öppna git-katalog: %s"

2572

2557 -#: read-cache.c:2467

2573 +#: read-cache.c:2473

2574 #, c-format

2575 msgid "unable to unlink: %s"

2576 msgstr "misslyckades ta bort länken: %s"

@@ -2573,18 +2589,18 @@ msgstr "referensuppdateringar förbjudna i karantänmiljö"

2589 msgid "could not remove reference %s"

2590 msgstr "kunde inte ta bort referensen %s"

2591

2576 -#: refs/files-backend.c:1203 refs/packed-backend.c:1524

2577 -#: refs/packed-backend.c:1534

2592 +#: refs/files-backend.c:1203 refs/packed-backend.c:1528

2593 +#: refs/packed-backend.c:1538

2594 #, c-format

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

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

2597

2582 -#: refs/files-backend.c:1206 refs/packed-backend.c:1537

2598 +#: refs/files-backend.c:1206 refs/packed-backend.c:1541

2599 #, c-format

2600 msgid "could not delete references: %s"

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

2602

2587 -#: ref-filter.c:35 wt-status.c:1816

2603 +#: ref-filter.c:35 wt-status.c:1842

2604 msgid "gone"

2605 msgstr "försvunnen"

2606

@@ -2778,128 +2794,138 @@ msgstr "(HEAD frånkopplat från %s)"

2794 msgid "(no branch)"

2795 msgstr "(ingen gren)"

2796

2781 -#: ref-filter.c:1488 ref-filter.c:1519

2797 +#: ref-filter.c:1364

2798 #, c-format

2799 msgid "missing object %s for %s"

2800 msgstr "objektet %s saknas för %s"

2801

2786 -#: ref-filter.c:1491 ref-filter.c:1522

2802 +#: ref-filter.c:1367

2803 #, c-format

2804 msgid "parse_object_buffer failed on %s for %s"

2805 msgstr "parse_object_buffer misslyckades på %s för %s"

2806

2791 -#: ref-filter.c:1822

2807 +#: ref-filter.c:1819

2808 #, c-format

2809 msgid "malformed object at '%s'"

2810 msgstr "felformat objekt vid \"%s\""

2811

2796 -#: ref-filter.c:1889

2812 +#: ref-filter.c:1886

2813 #, c-format

2814 msgid "ignoring ref with broken name %s"

2815 msgstr "ignorerar referens med trasigt namn %s"

2816

2801 -#: ref-filter.c:1894

2817 +#: ref-filter.c:1891

2818 #, c-format

2819 msgid "ignoring broken ref %s"

2820 msgstr "ignorerar trasig referens %s"

2821

2806 -#: ref-filter.c:2156

2822 +#: ref-filter.c:2152

2823 #, c-format

2824 msgid "format: %%(end) atom missing"

2825 msgstr "format: atomen %%(end) saknas"

2826

2811 -#: ref-filter.c:2250

2827 +#: ref-filter.c:2246

2828 #, c-format

2829 msgid "malformed object name %s"

2830 msgstr "felformat objektnamn %s"

2831

2816 -#: remote.c:780

2832 +#: remote.c:795

2833 #, c-format

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

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

2836

2821 -#: remote.c:784

2837 +#: remote.c:799

2838 #, c-format

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

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

2841

2826 -#: remote.c:788

2842 +#: remote.c:803

2843 #, c-format

2844 msgid "%s tracks both %s and %s"

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

2846

2831 -#: remote.c:796

2847 +#: remote.c:811

2848 msgid "Internal error"

2849 msgstr "Internt fel"

2850

2835 -#: remote.c:1711 remote.c:1813

2851 +#: remote.c:1726 remote.c:1828

2852 msgid "HEAD does not point to a branch"

2853 msgstr "HEAD pekar inte på en gren"

2854

2839 -#: remote.c:1720

2855 +#: remote.c:1735

2856 #, c-format

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

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

2859

2844 -#: remote.c:1723

2860 +#: remote.c:1738

2861 #, c-format

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

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

2864

2849 -#: remote.c:1729

2865 +#: remote.c:1744

2866 #, c-format

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

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

2869

2854 -#: remote.c:1744

2870 +#: remote.c:1759

2871 #, c-format

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

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

2874

2859 -#: remote.c:1756

2875 +#: remote.c:1771

2876 #, c-format

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

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

2879

2864 -#: remote.c:1767

2880 +#: remote.c:1782

2881 #, c-format

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

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

2884

2869 -#: remote.c:1780

2885 +#: remote.c:1795

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

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

2888

2873 -#: remote.c:1802

2889 +#: remote.c:1817

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

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

2892

2877 -#: remote.c:2106

2893 +#: remote.c:2132

2894 #, c-format

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

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

2897

2882 -#: remote.c:2110

2898 +#: remote.c:2136

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

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

2901

2886 -#: remote.c:2113

2902 +#: remote.c:2139

2903 #, c-format

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

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

2906

2891 -#: remote.c:2117

2907 +#: remote.c:2143

2908 +#, c-format

2909 +msgid "Your branch and '%s' refer to different commits.\n"

2910 +msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"

2911 +

2912 +#: remote.c:2146

2913 +#, c-format

2914 +msgid " (use \"%s\" for details)\n"

2915 +msgstr " (använd \"%s\" för detaljer)\n"

2916 +

2917 +#: remote.c:2150

2918 #, c-format

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

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

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

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

2923

2898 -#: remote.c:2123

2924 +#: remote.c:2156

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

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

2927

2902 -#: remote.c:2126

2928 +#: remote.c:2159

2929 #, c-format

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

2931 msgid_plural ""

@@ -2909,11 +2935,11 @@ msgstr[0] ""

2935 msgstr[1] ""

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

2937

2912 -#: remote.c:2134

2938 +#: remote.c:2167

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

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

2941

2916 -#: remote.c:2137

2942 +#: remote.c:2170

2943 #, c-format

2944 msgid ""

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

@@ -2928,28 +2954,28 @@ msgstr[1] ""

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

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

2956

2931 -#: remote.c:2147

2957 +#: remote.c:2180

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

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

2960

2935 -#: revision.c:2268

2961 +#: revision.c:2277

2962 msgid "your current branch appears to be broken"

2963 msgstr "din nuvarande gren verkar vara trasig"

2964

2939 -#: revision.c:2271

2965 +#: revision.c:2280

2966 #, c-format

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

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

2969

2944 -#: revision.c:2465

2970 +#: revision.c:2477

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

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

2973

2948 -#: run-command.c:645

2974 +#: run-command.c:731

2975 msgid "open /dev/null failed"

2976 msgstr "misslyckades öppna /dev/null"

2977

2952 -#: run-command.c:1188

2978 +#: run-command.c:1274

2979 #, c-format

2980 msgid ""

2981 "The '%s' hook was ignored because it's not set as executable.\n"

@@ -2959,24 +2985,28 @@ msgstr ""

2985 "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."

2986

2987 #: send-pack.c:141

2988 +msgid "unexpected flush packet while reading remote unpack status"

2989 +msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"

2990 +

2991 +#: send-pack.c:143

2992 #, c-format

2993 msgid "unable to parse remote unpack status: %s"

2994 msgstr "kunde inte tolka fjärruppackningsstatus: %s"

2995

2966 -#: send-pack.c:143

2996 +#: send-pack.c:145

2997 #, c-format

2998 msgid "remote unpack failed: %s"

2999 msgstr "fjärruppackning misslyckades: %s"

3000

2971 -#: send-pack.c:306

3001 +#: send-pack.c:308

3002 msgid "failed to sign the push certificate"

3003 msgstr "misslyckades underteckna push-certifikatet"

3004

2975 -#: send-pack.c:419

3005 +#: send-pack.c:421

3006 msgid "the receiving end does not support --signed push"

3007 msgstr "mottagarsidan stöder inte push med --signed"

3008

2979 -#: send-pack.c:421

3009 +#: send-pack.c:423

3010 msgid ""

3011 "not sending a push certificate since the receiving end does not support --"

3012 "signed push"

@@ -2984,32 +3014,37 @@ msgstr ""

3014 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"

3015 "signed"

3016

2987 -#: send-pack.c:433

3017 +#: send-pack.c:435

3018 msgid "the receiving end does not support --atomic push"

3019 msgstr "mottagarsidan stöder inte push med --atomic"

3020

2991 -#: send-pack.c:438

3021 +#: send-pack.c:440

3022 msgid "the receiving end does not support push options"

3023 msgstr "mottagarsidan stöder inte push-flaggor"

3024

2995 -#: sequencer.c:218

3025 +#: sequencer.c:158

3026 +#, c-format

3027 +msgid "invalid commit message cleanup mode '%s'"

3028 +msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

3029 +

3030 +#: sequencer.c:267

3031 msgid "revert"

3032 msgstr "revert"

3033

2999 -#: sequencer.c:220

3034 +#: sequencer.c:269

3035 msgid "cherry-pick"

3036 msgstr "cherry-pick"

3037

3003 -#: sequencer.c:222

3038 +#: sequencer.c:271

3039 msgid "rebase -i"

3040 msgstr "rebase -i"

3041

3007 -#: sequencer.c:224

3042 +#: sequencer.c:273

3043 #, c-format

3044 msgid "Unknown action: %d"

3045 msgstr "Okänd funktion: %d"

3046

3012 -#: sequencer.c:281

3047 +#: sequencer.c:330

3048 msgid ""

3049 "after resolving the conflicts, mark the corrected paths\n"

3050 "with 'git add <paths>' or 'git rm <paths>'"

@@ -3017,7 +3052,7 @@ msgstr ""

3052 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"

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

3054

3020 -#: sequencer.c:284

3055 +#: sequencer.c:333

3056 msgid ""

3057 "after resolving the conflicts, mark the corrected paths\n"

3058 "with 'git add <paths>' or 'git rm <paths>'\n"

@@ -3027,43 +3062,43 @@ msgstr ""

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

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

3064

3030 -#: sequencer.c:297 sequencer.c:1718

3065 +#: sequencer.c:346 sequencer.c:2245

3066 #, c-format

3067 msgid "could not lock '%s'"

3068 msgstr "kunde inte låsa \"%s\""

3069

3035 -#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737

3036 -#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656

3070 +#: sequencer.c:349 sequencer.c:2124 sequencer.c:2250 sequencer.c:2264

3071 +#: sequencer.c:3246 sequencer.c:3310 wrapper.c:656

3072 #, c-format

3073 msgid "could not write to '%s'"

3074 msgstr "kunde inte skriva till \"%s\""

3075

3041 -#: sequencer.c:304

3076 +#: sequencer.c:353

3077 #, c-format

3078 msgid "could not write eol to '%s'"

3079 msgstr "kunde inte skriva radslut till \"%s\""

3080

3046 -#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725

3081 +#: sequencer.c:356 sequencer.c:2128 sequencer.c:2252

3082 #, c-format

3048 -msgid "failed to finalize '%s'."

3049 -msgstr "misslyckades färdigställa \"%s\"."

3083 +msgid "failed to finalize '%s'"

3084 +msgstr "misslyckades färdigställa \"%s\""

3085

3051 -#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259

3052 -#: builtin/commit.c:754 builtin/merge.c:1046

3086 +#: sequencer.c:379 sequencer.c:1340 sequencer.c:2148 builtin/am.c:259

3087 +#: builtin/commit.c:722 builtin/merge.c:1047

3088 #, c-format

3089 msgid "could not read '%s'"

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

3091

3057 -#: sequencer.c:358

3092 +#: sequencer.c:405

3093 #, c-format

3094 msgid "your local changes would be overwritten by %s."

3095 msgstr "dina lokala ändringar skulle skrivas över av %s."

3096

3062 -#: sequencer.c:362

3097 +#: sequencer.c:409

3098 msgid "commit your changes or stash them to proceed."

3099 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."

3100

3066 -#: sequencer.c:391

3101 +#: sequencer.c:438

3102 #, c-format

3103 msgid "%s: fast-forward"

3104 msgstr "%s: snabbspola"

@@ -3071,20 +3106,20 @@ msgstr "%s: snabbspola"

3106 #. TRANSLATORS: %s will be "revert", "cherry-pick" or

3107 #. "rebase -i".

3108 #.

3074 -#: sequencer.c:477

3109 +#: sequencer.c:526

3110 #, c-format

3111 msgid "%s: Unable to write new index file"

3112 msgstr "%s: Kunde inte skriva ny indexfil"

3113

3079 -#: sequencer.c:496

3114 +#: sequencer.c:542

3115 msgid "could not resolve HEAD commit"

3116 msgstr "kunde inte bestämma HEAD:s incheckning"

3117

3083 -#: sequencer.c:516

3118 +#: sequencer.c:562

3119 msgid "unable to update cache tree"

3120 msgstr "kan inte uppdatera cacheträd"

3121

3087 -#: sequencer.c:600

3122 +#: sequencer.c:658

3123 #, c-format

3124 msgid ""

3125 "you have staged changes in your working tree\n"

@@ -3113,17 +3148,124 @@ msgstr ""

3148 "\n"

3149 " git rebase --continue\n"

3150

3116 -#: sequencer.c:702

3151 +#: sequencer.c:915

3152 +msgid "'prepare-commit-msg' hook failed"

3153 +msgstr "kroken \"prepare-commit-msg\" misslyckades"

3154 +

3155 +#: sequencer.c:922

3156 +msgid ""

3157 +"Your name and email address were configured automatically based\n"

3158 +"on your username and hostname. Please check that they are accurate.\n"

3159 +"You can suppress this message by setting them explicitly. Run the\n"

3160 +"following command and follow the instructions in your editor to edit\n"

3161 +"your configuration file:\n"

3162 +"\n"

3163 +" git config --global --edit\n"

3164 +"\n"

3165 +"After doing this, you may fix the identity used for this commit with:\n"

3166 +"\n"

3167 +" git commit --amend --reset-author\n"

3168 +msgstr ""

3169 +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"

3170 +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"

3171 +"kan förhindra det här meddelandet genom att ställa dem explicit.\n"

3172 +"Kör följande kommandon och följ instruktionerna i textredigeraren\n"

3173 +"för att redigera din konfigurationsfil:\n"

3174 +"\n"

3175 +" git config --global --edit\n"

3176 +"\n"

3177 +"När du gjort det kan du rätta identiteten som användes för den här\n"

3178 +"incheckningen med:\n"

3179 +"\n"

3180 +" git commit --amend --reset-author\n"

3181 +

3182 +#: sequencer.c:935

3183 +msgid ""

3184 +"Your name and email address were configured automatically based\n"

3185 +"on your username and hostname. Please check that they are accurate.\n"

3186 +"You can suppress this message by setting them explicitly:\n"

3187 +"\n"

3188 +" git config --global user.name \"Your Name\"\n"

3189 +" git config --global user.email you@example.com\n"

3190 +"\n"

3191 +"After doing this, you may fix the identity used for this commit with:\n"

3192 +"\n"

3193 +" git commit --amend --reset-author\n"

3194 +msgstr ""

3195 +"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"

3196 +"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"

3197 +"kan förhindra det här meddelandet genom att ställa dem explicit:\n"

3198 +"\n"

3199 +" git config --global user.name \"Ditt namn\"\n"

3200 +" git config --global user.email du@example.com\n"

3201 +"\n"

3202 +"När du gjort det kan du rätta identiteten som användes för den här\n"

3203 +"incheckningen med:\n"

3204 +"\n"

3205 +" git commit --amend --reset-author\n"

3206 +

3207 +#: sequencer.c:975

3208 +msgid "couldn't look up newly created commit"

3209 +msgstr "kunde inte slå upp en precis skapad incheckning"

3210 +

3211 +#: sequencer.c:977

3212 +msgid "could not parse newly created commit"

3213 +msgstr "kunde inte tolka en precis skapad incheckning"

3214 +

3215 +#: sequencer.c:1023

3216 +msgid "unable to resolve HEAD after creating commit"

3217 +msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"

3218 +

3219 +#: sequencer.c:1025

3220 +msgid "detached HEAD"

3221 +msgstr "frånkopplad HEAD"

3222 +

3223 +#: sequencer.c:1029

3224 +msgid " (root-commit)"

3225 +msgstr " (rotincheckning)"

3226 +

3227 +#: sequencer.c:1050

3228 +msgid "could not parse HEAD"

3229 +msgstr "kunde inte tolka HEAD"

3230 +

3231 +#: sequencer.c:1052

3232 +#, c-format

3233 +msgid "HEAD %s is not a commit!"

3234 +msgstr "HEAD %s är inte en incheckning!"

3235 +

3236 +#: sequencer.c:1056 builtin/commit.c:1491

3237 +msgid "could not parse HEAD commit"

3238 +msgstr "kunde inte tolka HEAD:s incheckning"

3239 +

3240 +#: sequencer.c:1107 sequencer.c:1673

3241 +msgid "unable to parse commit author"

3242 +msgstr "kunde inte tolka incheckningens författare"

3243 +

3244 +#: sequencer.c:1117 builtin/am.c:1630 builtin/merge.c:643

3245 +msgid "git write-tree failed to write a tree"

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

3247 +

3248 +#: sequencer.c:1134 sequencer.c:1186

3249 +#, c-format

3250 +msgid "unable to read commit message from '%s'"

3251 +msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""

3252 +

3253 +#: sequencer.c:1154 builtin/am.c:1650 builtin/commit.c:1594 builtin/merge.c:826

3254 +#: builtin/merge.c:851

3255 +msgid "failed to write commit object"

3256 +msgstr "kunde inte skriva incheckningsobjekt"

3257 +

3258 +#: sequencer.c:1213

3259 #, c-format

3260 msgid "could not parse commit %s"

3261 msgstr "kunde inte tolka incheckningen %s"

3262

3121 -#: sequencer.c:707

3263 +#: sequencer.c:1218

3264 #, c-format

3265 msgid "could not parse parent commit %s"

3266 msgstr "kunde inte tolka föräldraincheckningen %s"

3267

3126 -#: sequencer.c:836

3268 +#: sequencer.c:1347

3269 #, c-format

3270 msgid ""

3271 "unexpected 1st line of squash message:\n"

@@ -3134,7 +3276,7 @@ msgstr ""

3276 "\n"

3277 "\t%.*s"

3278

3137 -#: sequencer.c:842

3279 +#: sequencer.c:1353

3280 #, c-format

3281 msgid ""

3282 "invalid 1st line of squash message:\n"

@@ -3145,242 +3287,246 @@ msgstr ""

3287 "\n"

3288 "\t%.*s"

3289

3148 -#: sequencer.c:848 sequencer.c:873

3290 +#: sequencer.c:1359 sequencer.c:1384

3291 #, c-format

3292 msgid "This is a combination of %d commits."

3293 msgstr "Det här är en kombination av %d incheckningar."

3294

3153 -#: sequencer.c:857 sequencer.c:2748

3295 +#: sequencer.c:1368 sequencer.c:3265

3296 msgid "need a HEAD to fixup"

3297 msgstr "behöver en HEAD-incheckning att rätta"

3298

3157 -#: sequencer.c:859

3299 +#: sequencer.c:1370

3300 msgid "could not read HEAD"

3301 msgstr "kunde inte läsa HEAD"

3302

3161 -#: sequencer.c:861

3303 +#: sequencer.c:1372

3304 msgid "could not read HEAD's commit message"

3305 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"

3306

3165 -#: sequencer.c:867

3307 +#: sequencer.c:1378

3308 #, c-format

3309 msgid "cannot write '%s'"

3310 msgstr "kan inte skriva \"%s\""

3311

3170 -#: sequencer.c:876 git-rebase--interactive.sh:446

3312 +#: sequencer.c:1387 git-rebase--interactive.sh:452

3313 msgid "This is the 1st commit message:"

3314 msgstr "Det här är 1:a incheckningsmeddelandet:"

3315

3174 -#: sequencer.c:884

3316 +#: sequencer.c:1395

3317 #, c-format

3318 msgid "could not read commit message of %s"

3319 msgstr "kunde inte läsa incheckningsmeddelande för %s"

3320

3179 -#: sequencer.c:891

3321 +#: sequencer.c:1402

3322 #, c-format

3323 msgid "This is the commit message #%d:"

3324 msgstr "Det här är incheckningsmeddelande %d:"

3325

3184 -#: sequencer.c:896

3326 +#: sequencer.c:1407

3327 #, c-format

3328 msgid "The commit message #%d will be skipped:"

3329 msgstr "Incheckningsmeddelande %d kommer hoppas över:"

3330

3189 -#: sequencer.c:901

3331 +#: sequencer.c:1412

3332 #, c-format

3333 msgid "unknown command: %d"

3334 msgstr "okänt kommando: %d"

3335

3194 -#: sequencer.c:967

3336 +#: sequencer.c:1479

3337 msgid "your index file is unmerged."

3338 msgstr "din indexfil har inte slagits ihop."

3339

3198 -#: sequencer.c:986

3340 +#: sequencer.c:1498

3341 #, c-format

3342 msgid "commit %s is a merge but no -m option was given."

3343 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."

3344

3203 -#: sequencer.c:994

3345 +#: sequencer.c:1506

3346 #, c-format

3347 msgid "commit %s does not have parent %d"

3348 msgstr "incheckning %s har inte förälder %d"

3349

3208 -#: sequencer.c:998

3350 +#: sequencer.c:1510

3351 #, c-format

3352 msgid "mainline was specified but commit %s is not a merge."

3353 msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."

3354

3213 -#: sequencer.c:1004

3355 +#: sequencer.c:1516

3356 #, c-format

3357 msgid "cannot get commit message for %s"

3358 msgstr "kan inte hämta incheckningsmeddelande för %s"

3359

3360 #. TRANSLATORS: The first %s will be a "todo" command like

3361 #. "revert" or "pick", the second %s a SHA1.

3220 -#: sequencer.c:1023

3362 +#: sequencer.c:1535

3363 #, c-format

3364 msgid "%s: cannot parse parent commit %s"

3365 msgstr "%s: kan inte tolka föräldraincheckningen %s"

3366

3225 -#: sequencer.c:1086 sequencer.c:1867

3367 +#: sequencer.c:1600 sequencer.c:2397

3368 #, c-format

3369 msgid "could not rename '%s' to '%s'"

3370 msgstr "kunde inte byta namn på \"%s\" till \"%s\""

3371

3230 -#: sequencer.c:1137

3372 +#: sequencer.c:1654

3373 #, c-format

3374 msgid "could not revert %s... %s"

3375 msgstr "kunde inte ångra %s... %s"

3376

3235 -#: sequencer.c:1138

3377 +#: sequencer.c:1655

3378 #, c-format

3379 msgid "could not apply %s... %s"

3380 msgstr "kunde inte tillämpa %s... %s"

3381

3240 -#: sequencer.c:1180

3382 +#: sequencer.c:1702

3383 msgid "empty commit set passed"

3384 msgstr "den angivna uppsättningen incheckningar är tom"

3385

3244 -#: sequencer.c:1190

3386 +#: sequencer.c:1712

3387 #, c-format

3388 msgid "git %s: failed to read the index"

3389 msgstr "git %s: misslyckades läsa indexet"

3390

3249 -#: sequencer.c:1196

3391 +#: sequencer.c:1718

3392 #, c-format

3393 msgid "git %s: failed to refresh the index"

3394 msgstr "git %s: misslyckades uppdatera indexet"

3395

3254 -#: sequencer.c:1270

3396 +#: sequencer.c:1792

3397 #, c-format

3398 msgid "%s does not accept arguments: '%s'"

3399 msgstr "%s tar inte argument: \"%s\""

3400

3259 -#: sequencer.c:1279

3401 +#: sequencer.c:1801

3402 #, c-format

3403 msgid "missing arguments for %s"

3404 msgstr "argument saknas för %s"

3405

3264 -#: sequencer.c:1322

3406 +#: sequencer.c:1844

3407 #, c-format

3408 msgid "invalid line %d: %.*s"

3409 msgstr "ogiltig rad %d: %.*s"

3410

3269 -#: sequencer.c:1330

3411 +#: sequencer.c:1852

3412 #, c-format

3413 msgid "cannot '%s' without a previous commit"

3414 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"

3415

3274 -#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642

3275 -#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859

3416 +#: sequencer.c:1883 sequencer.c:3056 sequencer.c:3091

3417 #, c-format

3418 msgid "could not read '%s'."

3419 msgstr "kunde inte läsa \"%s\"."

3420

3280 -#: sequencer.c:1375

3421 +#: sequencer.c:1906

3422 msgid "please fix this using 'git rebase --edit-todo'."

3423 msgstr "rätta det med \"git rebase --edit-todo\"."

3424

3284 -#: sequencer.c:1377

3425 +#: sequencer.c:1908

3426 #, c-format

3427 msgid "unusable instruction sheet: '%s'"

3428 msgstr "oanvändbart manus: ”%s”"

3429

3289 -#: sequencer.c:1382

3430 +#: sequencer.c:1913

3431 msgid "no commits parsed."

3432 msgstr "inga incheckningar lästes."

3433

3293 -#: sequencer.c:1393

3434 +#: sequencer.c:1924

3435 msgid "cannot cherry-pick during a revert."

3436 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."

3437

3297 -#: sequencer.c:1395

3438 +#: sequencer.c:1926

3439 msgid "cannot revert during a cherry-pick."

3440 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."

3441

3301 -#: sequencer.c:1462

3442 +#: sequencer.c:1993

3443 #, c-format

3444 msgid "invalid key: %s"

3445 msgstr "felaktig nyckel: %s"

3446

3306 -#: sequencer.c:1465

3447 +#: sequencer.c:1996

3448 #, c-format

3449 msgid "invalid value for %s: %s"

3450 msgstr "felaktigt värde för %s: %s"

3451

3311 -#: sequencer.c:1531

3452 +#: sequencer.c:2062

3453 #, c-format

3454 msgid "malformed options sheet: '%s'"

3455 msgstr "trasigt manus: ”%s”"

3456

3316 -#: sequencer.c:1569

3457 +#: sequencer.c:2100

3458 msgid "a cherry-pick or revert is already in progress"

3459 msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"

3460

3320 -#: sequencer.c:1570

3461 +#: sequencer.c:2101

3462 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""

3463 msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""

3464

3324 -#: sequencer.c:1573

3465 +#: sequencer.c:2104

3466 #, c-format

3467 msgid "could not create sequencer directory '%s'"

3468 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""

3469

3329 -#: sequencer.c:1588

3470 +#: sequencer.c:2118

3471 msgid "could not lock HEAD"

3472 msgstr "kunde inte låsa HEAD"

3473

3333 -#: sequencer.c:1646 sequencer.c:2230

3474 +#: sequencer.c:2173 sequencer.c:2761

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

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

3477

3337 -#: sequencer.c:1648

3478 +#: sequencer.c:2175

3479 msgid "cannot resolve HEAD"

3480 msgstr "kan inte bestämma HEAD"

3481

3341 -#: sequencer.c:1650 sequencer.c:1685

3482 +#: sequencer.c:2177 sequencer.c:2212

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

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

3485

3345 -#: sequencer.c:1671 builtin/grep.c:713

3486 +#: sequencer.c:2198 builtin/grep.c:720

3487 #, c-format

3488 msgid "cannot open '%s'"

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

3490

3350 -#: sequencer.c:1673

3491 +#: sequencer.c:2200

3492 #, c-format

3493 msgid "cannot read '%s': %s"

3494 msgstr "kan inte läsa \"%s\": %s"

3495

3355 -#: sequencer.c:1674

3496 +#: sequencer.c:2201

3497 msgid "unexpected end of file"

3498 msgstr "oväntat filslut"

3499

3359 -#: sequencer.c:1680

3500 +#: sequencer.c:2207

3501 #, c-format

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

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

3504

3364 -#: sequencer.c:1691

3505 +#: sequencer.c:2218

3506 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"

3507 msgstr ""

3508 "Du verkar ha flyttat HEAD.\n"

3509 "Spolar inte tillbaka, kontrollera HEAD!"

3510

3370 -#: sequencer.c:1832 sequencer.c:2128

3511 +#: sequencer.c:2324 sequencer.c:2679

3512 +#, c-format

3513 +msgid "could not update %s"

3514 +msgstr "kunde inte uppdatera %s"

3515 +

3516 +#: sequencer.c:2362 sequencer.c:2659

3517 msgid "cannot read HEAD"

3518 msgstr "kan inte läsa HEAD"

3519

3374 -#: sequencer.c:1872 builtin/difftool.c:639

3520 +#: sequencer.c:2402 builtin/difftool.c:639

3521 #, c-format

3522 msgid "could not copy '%s' to '%s'"

3523 msgstr "kunde inte kopiera in \"%s\" till \"%s\""

3524

3379 -#: sequencer.c:1891

3525 +#: sequencer.c:2421

3526 msgid "could not read index"

3527 msgstr "kunde inte läsa indexet"

3528

3383 -#: sequencer.c:1896

3529 +#: sequencer.c:2426

3530 #, c-format

3531 msgid ""

3532 "execution failed: %s\n"

@@ -3395,11 +3541,11 @@ msgstr ""

3541 "\tgit rebase --continue\n"

3542 "\n"

3543

3398 -#: sequencer.c:1902

3544 +#: sequencer.c:2432

3545 msgid "and made changes to the index and/or the working tree\n"

3546 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"

3547

3402 -#: sequencer.c:1908

3548 +#: sequencer.c:2438

3549 #, c-format

3550 msgid ""

3551 "execution succeeded: %s\n"

@@ -3416,17 +3562,17 @@ msgstr ""

3562 "\tgit rebase --continue\n"

3563 "\n"

3564

3419 -#: sequencer.c:1967

3565 +#: sequencer.c:2497

3566 #, c-format

3567 msgid "Applied autostash.\n"

3568 msgstr "Tillämpade autostash.\n"

3569

3424 -#: sequencer.c:1979

3570 +#: sequencer.c:2509

3571 #, c-format

3572 msgid "cannot store %s"

3573 msgstr "kan inte spara %s"

3574

3429 -#: sequencer.c:1982 git-rebase.sh:175

3575 +#: sequencer.c:2512 git-rebase.sh:178

3576 #, c-format

3577 msgid ""

3578 "Applying autostash resulted in conflicts.\n"

@@ -3437,57 +3583,52 @@ msgstr ""

3583 "Dina ändringar är säkra i stashen.\n"

3584 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"

3585

3440 -#: sequencer.c:2064

3586 +#: sequencer.c:2595

3587 #, c-format

3588 msgid "Stopped at %s... %.*s\n"

3589 msgstr "Stoppade på %s... %.*s\n"

3590

3445 -#: sequencer.c:2106

3591 +#: sequencer.c:2637

3592 #, c-format

3593 msgid "unknown command %d"

3594 msgstr "okänt kommando %d"

3595

3450 -#: sequencer.c:2136

3596 +#: sequencer.c:2667

3597 msgid "could not read orig-head"

3598 msgstr "kunde inte läsa orig-head"

3599

3454 -#: sequencer.c:2141 sequencer.c:2745

3600 +#: sequencer.c:2672 sequencer.c:3262

3601 msgid "could not read 'onto'"

3602 msgstr "kunde inte läsa \"onto\""

3603

3458 -#: sequencer.c:2148

3459 -#, c-format

3460 -msgid "could not update %s"

3461 -msgstr "kunde inte uppdatera %s"

3462 -

3463 -#: sequencer.c:2155

3604 +#: sequencer.c:2686

3605 #, c-format

3606 msgid "could not update HEAD to %s"

3607 msgstr "kunde inte uppdatera HEAD till %s"

3608

3468 -#: sequencer.c:2239

3609 +#: sequencer.c:2770

3610 msgid "cannot rebase: You have unstaged changes."

3611 msgstr "kan inte ombasera: Du har oköade ändringar."

3612

3472 -#: sequencer.c:2244

3613 +#: sequencer.c:2775

3614 msgid "could not remove CHERRY_PICK_HEAD"

3615 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3616

3476 -#: sequencer.c:2253

3617 +#: sequencer.c:2784

3618 msgid "cannot amend non-existing commit"

3619 msgstr "kan inte lägga till incheckning som inte finns"

3620

3480 -#: sequencer.c:2255

3621 +#: sequencer.c:2786

3622 #, c-format

3623 msgid "invalid file: '%s'"

3624 msgstr "ogiltig fil: \"%s\""

3625

3485 -#: sequencer.c:2257

3626 +#: sequencer.c:2788

3627 #, c-format

3628 msgid "invalid contents: '%s'"

3629 msgstr "ogiltigt innehåll: \"%s\""

3630

3490 -#: sequencer.c:2260

3631 +#: sequencer.c:2791

3632 msgid ""

3633 "\n"

3634 "You have uncommitted changes in your working tree. Please, commit them\n"

@@ -3497,45 +3638,45 @@ msgstr ""

3638 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"

3639 "först och kör sedan \"git rebase --continute\" igen."

3640

3500 -#: sequencer.c:2270

3641 +#: sequencer.c:2801

3642 msgid "could not commit staged changes."

3643 msgstr "kunde inte checka in köade ändringar."

3644

3504 -#: sequencer.c:2350

3645 +#: sequencer.c:2881

3646 #, c-format

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

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

3649

3509 -#: sequencer.c:2354

3650 +#: sequencer.c:2885

3651 #, c-format

3652 msgid "%s: bad revision"

3653 msgstr "%s: felaktig revision"

3654

3514 -#: sequencer.c:2387

3655 +#: sequencer.c:2918

3656 msgid "can't revert as initial commit"

3657 msgstr "kan inte ångra som första incheckning"

3658

3518 -#: sequencer.c:2492

3659 +#: sequencer.c:3023

3660 msgid "make_script: unhandled options"

3661 msgstr "make_script: flaggor som inte stöds"

3662

3522 -#: sequencer.c:2495

3663 +#: sequencer.c:3026

3664 msgid "make_script: error preparing revisions"

3665 msgstr "make_script: fel när revisioner skulle förberedas"

3666

3526 -#: sequencer.c:2529 sequencer.c:2564

3667 +#: sequencer.c:3060 sequencer.c:3095

3668 #, c-format

3669 msgid "unusable todo list: '%s'"

3670 msgstr "oanvändbar todo-lista: %s"

3671

3531 -#: sequencer.c:2615

3672 +#: sequencer.c:3146

3673 #, c-format

3674 msgid ""

3675 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."

3676 msgstr ""

3677 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."

3678

3538 -#: sequencer.c:2695

3679 +#: sequencer.c:3212

3680 #, c-format

3681 msgid ""

3682 "Warning: some commits may have been dropped accidentally.\n"

@@ -3544,7 +3685,7 @@ msgstr ""

3685 "Varning: vissa incheckningar kan av misstag ha tappats.\n"

3686 "Tappade incheckningar (nyaste först):\n"

3687

3547 -#: sequencer.c:2702

3688 +#: sequencer.c:3219

3689 #, c-format

3690 msgid ""

3691 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"

@@ -3564,7 +3705,7 @@ msgstr ""

3705 "\" (fel).\n"

3706 "\n"

3707

3567 -#: sequencer.c:2714

3708 +#: sequencer.c:3231

3709 #, c-format

3710 msgid ""

3711 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"

@@ -3575,21 +3716,26 @@ msgstr ""

3716 "continue\".\n"

3717 "Avbryt ombaseringen med \"git rebase --abort\".\n"

3718

3578 -#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395

3719 +#: sequencer.c:3244 sequencer.c:3304 wrapper.c:225 wrapper.c:395

3720 #: builtin/am.c:779

3721 #, c-format

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

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

3724

3584 -#: sequencer.c:2775

3725 +#: sequencer.c:3285

3726 #, c-format

3727 msgid "could not parse commit '%s'"

3728 msgstr "kunde inte tolka incheckningen\" %s\""

3729

3589 -#: sequencer.c:2897

3730 +#: sequencer.c:3401

3731 msgid "the script was already rearranged."

3732 msgstr "skriptet har redan omordnats."

3733

3734 +#: setup.c:122

3735 +#, c-format

3736 +msgid "'%s' is outside repository"

3737 +msgstr "\"%s\" är utanför arkivet"

3738 +

3739 #: setup.c:171

3740 #, c-format

3741 msgid ""

@@ -3612,6 +3758,11 @@ msgstr ""

3758 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3759 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3760

3761 +#: setup.c:233

3762 +#, c-format

3763 +msgid "option '%s' must come before non-option arguments"

3764 +msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"

3765 +

3766 #: setup.c:252

3767 #, c-format

3768 msgid ""

@@ -3623,73 +3774,143 @@ msgstr ""

3774 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

3775 "\"git <kommando> [<revision>...] -- [<fil>...]\""

3776

3626 -#: setup.c:501

3777 +#: setup.c:388

3778 +msgid "unable to set up work tree using invalid config"

3779 +msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"

3780 +

3781 +#: setup.c:395

3782 +msgid "this operation must be run in a work tree"

3783 +msgstr "funktionen måste köras i en arbetskatalog"

3784 +

3785 +#: setup.c:506

3786 #, c-format

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

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

3789

3631 -#: setup.c:509

3790 +#: setup.c:514

3791 msgid "unknown repository extensions found:"

3792 msgstr "okända arkivutökningar hittades:"

3793

3635 -#: setup.c:811

3794 +#: setup.c:533

3795 #, c-format

3637 -msgid "Not a git repository (or any of the parent directories): %s"

3638 -msgstr "Inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3796 +msgid "error opening '%s'"

3797 +msgstr "fel vid öppning av \"%s\""

3798

3640 -#: setup.c:813 builtin/index-pack.c:1653

3641 -msgid "Cannot come back to cwd"

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

3799 +#: setup.c:535

3800 +#, c-format

3801 +msgid "too large to be a .git file: '%s'"

3802 +msgstr "för stor för att vara en .git-fil: \"%s\""

3803 +

3804 +#: setup.c:537

3805 +#, c-format

3806 +msgid "error reading %s"

3807 +msgstr "fel vid läsning av %s"

3808 +

3809 +#: setup.c:539

3810 +#, c-format

3811 +msgid "invalid gitfile format: %s"

3812 +msgstr "ogiltigt gitfilformat: %s"

3813 +

3814 +#: setup.c:541

3815 +#, c-format

3816 +msgid "no path in gitfile: %s"

3817 +msgstr "ingen sökväg i gitfil: %s"

3818 +

3819 +#: setup.c:543

3820 +#, c-format

3821 +msgid "not a git repository: %s"

3822 +msgstr "inte ett git-arkiv: %s"

3823 +

3824 +#: setup.c:642

3825 +#, c-format

3826 +msgid "'$%s' too big"

3827 +msgstr "\"$%s\" för stor"

3828 +

3829 +#: setup.c:656

3830 +#, c-format

3831 +msgid "not a git repository: '%s'"

3832 +msgstr "inte ett git-arkiv: \"%s\""

3833 +

3834 +#: setup.c:685 setup.c:687 setup.c:718

3835 +#, c-format

3836 +msgid "cannot chdir to '%s'"

3837 +msgstr "kan inte byta katalog (chdir) till \"%s\""

3838 +

3839 +#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

3840 +msgid "cannot come back to cwd"

3841 +msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"

3842 +

3843 +#: setup.c:816

3844 +#, c-format

3845 +msgid "not a git repository (or any of the parent directories): %s"

3846 +msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

3847 +

3848 +#: setup.c:827

3849 +#, c-format

3850 +msgid "failed to stat '%*s%s%s'"

3851 +msgstr "misslyckades ta status på \"%*ss%s%s\""

3852

3644 -#: setup.c:1052

3853 +#: setup.c:1057

3854 msgid "Unable to read current working directory"

3855 msgstr "Kan inte läsa aktuell arbetskatalog"

3856

3648 -#: setup.c:1064 setup.c:1070

3857 +#: setup.c:1069 setup.c:1075

3858 #, c-format

3650 -msgid "Cannot change to '%s'"

3651 -msgstr "Kan inte byta till \"%s\""

3859 +msgid "cannot change to '%s'"

3860 +msgstr "kan inte byta till \"%s\""

3861

3653 -#: setup.c:1083

3862 +#: setup.c:1088

3863 #, c-format

3864 msgid ""

3656 -"Not a git repository (or any parent up to mount point %s)\n"

3865 +"not a git repository (or any parent up to mount point %s)\n"

3866 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."

3867 msgstr ""

3659 -"Inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "

3868 +"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "

3869 "monteringspunkten %s)\n"

3870 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

3871

3663 -#: setup.c:1167

3872 +#: setup.c:1172

3873 #, c-format

3874 msgid ""

3666 -"Problem with core.sharedRepository filemode value (0%.3o).\n"

3875 +"problem with core.sharedRepository filemode value (0%.3o).\n"

3876 "The owner of files must always have read and write permissions."

3877 msgstr ""

3669 -"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3878 +"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

3879 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

3880

3672 -#: sha1_file.c:598

3881 +#: setup.c:1215

3882 +msgid "open /dev/null or dup failed"

3883 +msgstr "misslyckades öppna /dev/null eller \"dup\""

3884 +

3885 +#: setup.c:1230

3886 +msgid "fork failed"

3887 +msgstr "\"fork\" misslyckades"

3888 +

3889 +#: setup.c:1235

3890 +msgid "setsid failed"

3891 +msgstr "\"setsid\" misslyckades"

3892 +

3893 +#: sha1_file.c:592

3894 #, c-format

3895 msgid "path '%s' does not exist"

3896 msgstr "sökvägen \"%s\" finns inte"

3897

3677 -#: sha1_file.c:624

3898 +#: sha1_file.c:618

3899 #, c-format

3900 msgid "reference repository '%s' as a linked checkout is not supported yet."

3901 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

3902

3682 -#: sha1_file.c:630

3903 +#: sha1_file.c:624

3904 #, c-format

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

3906 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

3907

3687 -#: sha1_file.c:636

3908 +#: sha1_file.c:630

3909 #, c-format

3910 msgid "reference repository '%s' is shallow"

3911 msgstr "referensarkivet \"%s\" är grunt"

3912

3692 -#: sha1_file.c:644

3913 +#: sha1_file.c:638

3914 #, c-format

3915 msgid "reference repository '%s' is grafted"

3916 msgstr "referensarkivet \"%s\" är ympat"

@@ -3765,7 +3986,7 @@ msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

3986 msgid "submodule entry '%s' (%s) is a %s, not a commit"

3987 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

3988

3768 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387

3989 +#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

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

3991 msgstr "Misslyckades slå upp HEAD som giltig referens."

3992

@@ -3789,7 +4010,7 @@ msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

4010 msgid "submodule '%s' has dirty index"

4011 msgstr "undermodulen \"%s\" har ett smutsigt index"

4012

3792 -#: submodule.c:1876

4013 +#: submodule.c:1878

4014 #, c-format

4015 msgid ""

4016 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -3797,18 +4018,18 @@ msgstr ""

4018 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

4019 "stöds ej"

4020

3800 -#: submodule.c:1888 submodule.c:1944

4021 +#: submodule.c:1890 submodule.c:1946

4022 #, c-format

4023 msgid "could not lookup name for submodule '%s'"

4024 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

4025

3805 -#: submodule.c:1892 builtin/submodule--helper.c:909

3806 -#: builtin/submodule--helper.c:919

4026 +#: submodule.c:1894 builtin/submodule--helper.c:1246

4027 +#: builtin/submodule--helper.c:1256

4028 #, c-format

4029 msgid "could not create directory '%s'"

4030 msgstr "kunde inte skapa katalogen \"%s\""

4031

3811 -#: submodule.c:1895

4032 +#: submodule.c:1897

4033 #, c-format

4034 msgid ""

4035 "Migrating git directory of '%s%s' from\n"

@@ -3819,20 +4040,20 @@ msgstr ""

4040 "\"%s\" till\n"

4041 "\"%s\"\n"

4042

3822 -#: submodule.c:1979

4043 +#: submodule.c:1981

4044 #, c-format

4045 msgid "could not recurse into submodule '%s'"

4046 msgstr "kunde inte rekursera in i undermodulen \"%s\""

4047

3827 -#: submodule.c:2023

4048 +#: submodule.c:2025

4049 msgid "could not start ls-files in .."

4050 msgstr "kunde inte starta ls-files i .."

4051

3831 -#: submodule.c:2043

4052 +#: submodule.c:2045

4053 msgid "BUG: returned path string doesn't match cwd?"

4054 msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"

4055

3835 -#: submodule.c:2062

4056 +#: submodule.c:2064

4057 #, c-format

4058 msgid "ls-tree returned unexpected return code %d"

4059 msgstr "ls-tree returnerade en oväntad returkod %d"

@@ -3910,7 +4131,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

4131 msgid "transport: invalid depth option '%s'"

4132 msgstr "transport: ogiltig flagga för depth: ”%s”"

4133

3913 -#: transport.c:904

4134 +#: transport.c:916

4135 #, c-format

4136 msgid ""

4137 "The following submodule paths contain changes that can\n"

@@ -3919,7 +4140,7 @@ msgstr ""

4140 "Följande undermodulsökvägar innehåller ändringar som\n"

4141 "inte kan hittas av fjärrarna:\n"

4142

3922 -#: transport.c:908

4143 +#: transport.c:920

4144 #, c-format

4145 msgid ""

4146 "\n"

@@ -3946,11 +4167,11 @@ msgstr ""

4167 "för att sända dem till fjärren.\n"

4168 "\n"

4169

3949 -#: transport.c:916

4170 +#: transport.c:928

4171 msgid "Aborting."

4172 msgstr "Avbryter."

4173

3953 -#: transport-helper.c:1074

4174 +#: transport-helper.c:1079

4175 #, c-format

4176 msgid "Could not read ref %s"

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

@@ -3971,7 +4192,7 @@ msgstr "tomt filnamn i trädpost"

4192 msgid "too-short tree file"

4193 msgstr "trädfil för kort"

4194

3974 -#: unpack-trees.c:107

4195 +#: unpack-trees.c:108

4196 #, c-format

4197 msgid ""

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

@@ -3980,7 +4201,7 @@ msgstr ""

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

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

4203

3983 -#: unpack-trees.c:109

4204 +#: unpack-trees.c:110

4205 #, c-format

4206 msgid ""

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

@@ -3989,7 +4210,7 @@ msgstr ""

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

4211 "%%s"

4212

3992 -#: unpack-trees.c:112

4213 +#: unpack-trees.c:113

4214 #, c-format

4215 msgid ""

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

@@ -3999,7 +4220,7 @@ msgstr ""

4220 "sammanslagning:\n"

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

4222

4002 -#: unpack-trees.c:114

4223 +#: unpack-trees.c:115

4224 #, c-format

4225 msgid ""

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

@@ -4009,7 +4230,7 @@ msgstr ""

4230 "sammanslagning:\n"

4231 "%%s"

4232

4012 -#: unpack-trees.c:117

4233 +#: unpack-trees.c:118

4234 #, c-format

4235 msgid ""

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

@@ -4018,7 +4239,7 @@ msgstr ""

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

4240 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

4241

4021 -#: unpack-trees.c:119

4242 +#: unpack-trees.c:120

4243 #, c-format

4244 msgid ""

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

@@ -4027,7 +4248,7 @@ msgstr ""

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

4249 "%%s"

4250

4030 -#: unpack-trees.c:124

4251 +#: unpack-trees.c:125

4252 #, c-format

4253 msgid ""

4254 "Updating the following directories would lose untracked files in them:\n"

@@ -4037,7 +4258,7 @@ msgstr ""

4258 "dem:\n"

4259 "%s"

4260

4040 -#: unpack-trees.c:128

4261 +#: unpack-trees.c:129

4262 #, c-format

4263 msgid ""

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

@@ -4046,7 +4267,7 @@ msgstr ""

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

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

4269

4049 -#: unpack-trees.c:130

4270 +#: unpack-trees.c:131

4271 #, c-format

4272 msgid ""

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

@@ -4055,7 +4276,7 @@ msgstr ""

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

4277 "%%s"

4278

4058 -#: unpack-trees.c:133

4279 +#: unpack-trees.c:134

4280 #, c-format

4281 msgid ""

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

@@ -4065,7 +4286,7 @@ msgstr ""

4286 "sammanslagningen:\n"

4287 "%%sFlytta eller ta bort dem innan du slår samman."

4288

4068 -#: unpack-trees.c:135

4289 +#: unpack-trees.c:136

4290 #, c-format

4291 msgid ""

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

@@ -4075,7 +4296,7 @@ msgstr ""

4296 "sammanslagningen:\n"

4297 "%%s"

4298

4078 -#: unpack-trees.c:138

4299 +#: unpack-trees.c:139

4300 #, c-format

4301 msgid ""

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

@@ -4084,7 +4305,7 @@ msgstr ""

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

4306 "%%sFlytta eller ta bort dem innan du \"%s\"."

4307

4087 -#: unpack-trees.c:140

4308 +#: unpack-trees.c:141

4309 #, c-format

4310 msgid ""

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

@@ -4093,7 +4314,7 @@ msgstr ""

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

4315 "%%s"

4316

4096 -#: unpack-trees.c:145

4317 +#: unpack-trees.c:146

4318 #, c-format

4319 msgid ""

4320 "The following untracked working tree files would be overwritten by "

@@ -4104,7 +4325,7 @@ msgstr ""

4325 "utcheckningen:\n"

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

4327

4107 -#: unpack-trees.c:147

4328 +#: unpack-trees.c:148

4329 #, c-format

4330 msgid ""

4331 "The following untracked working tree files would be overwritten by "

@@ -4115,7 +4336,7 @@ msgstr ""

4336 "utcheckningen:\n"

4337 "%%s"

4338

4118 -#: unpack-trees.c:150

4339 +#: unpack-trees.c:151

4340 #, c-format

4341 msgid ""

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

@@ -4125,7 +4346,7 @@ msgstr ""

4346 "sammanslagningen:\n"

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

4348

4128 -#: unpack-trees.c:152

4349 +#: unpack-trees.c:153

4350 #, c-format

4351 msgid ""

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

@@ -4135,7 +4356,7 @@ msgstr ""

4356 "sammanslagningen:\n"

4357 "%%s"

4358

4138 -#: unpack-trees.c:155

4359 +#: unpack-trees.c:156

4360 #, c-format

4361 msgid ""

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

@@ -4144,7 +4365,7 @@ msgstr ""

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

4366 "%%sFlytta eller ta bort dem innan du \"%s\"."

4367

4147 -#: unpack-trees.c:157

4368 +#: unpack-trees.c:158

4369 #, c-format

4370 msgid ""

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

@@ -4153,12 +4374,12 @@ msgstr ""

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

4375 "%%s"

4376

4156 -#: unpack-trees.c:164

4377 +#: unpack-trees.c:165

4378 #, c-format

4379 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

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

4381

4161 -#: unpack-trees.c:167

4382 +#: unpack-trees.c:168

4383 #, c-format

4384 msgid ""

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

@@ -4167,7 +4388,7 @@ msgstr ""

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

4389 "%s"

4390

4170 -#: unpack-trees.c:169

4391 +#: unpack-trees.c:170

4392 #, c-format

4393 msgid ""

4394 "The following working tree files would be overwritten by sparse checkout "

@@ -4178,7 +4399,7 @@ msgstr ""

4399 "utcheckning:\n"

4400 "%s"

4401

4181 -#: unpack-trees.c:171

4402 +#: unpack-trees.c:172

4403 #, c-format

4404 msgid ""

4405 "The following working tree files would be removed by sparse checkout "

@@ -4189,7 +4410,7 @@ msgstr ""

4410 "utcheckning:\n"

4411 "%s"

4412

4192 -#: unpack-trees.c:173

4413 +#: unpack-trees.c:174

4414 #, c-format

4415 msgid ""

4416 "Cannot update submodule:\n"

@@ -4198,12 +4419,12 @@ msgstr ""

4419 "Kan inte uppdatera undermodul:\n"

4420 "%s"

4421

4201 -#: unpack-trees.c:250

4422 +#: unpack-trees.c:251

4423 #, c-format

4424 msgid "Aborting\n"

4425 msgstr "Avbryter\n"

4426

4206 -#: unpack-trees.c:332

4427 +#: unpack-trees.c:333

4428 msgid "Checking out files"

4429 msgstr "Checkar ut filer"

4430

@@ -4236,18 +4457,43 @@ msgstr "felaktigt portnummer"

4457 msgid "invalid '..' path segment"

4458 msgstr "felaktigt \"..\"-sökvägssegment"

4459

4239 -#: worktree.c:245

4460 +#: worktree.c:245 builtin/am.c:2147

4461 #, c-format

4462 msgid "failed to read '%s'"

4463 msgstr "misslyckades läsa \"%s\""

4464

4465 +#: worktree.c:291

4466 +#, c-format

4467 +msgid "'%s' at main working tree is not the repository directory"

4468 +msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"

4469 +

4470 +#: worktree.c:302

4471 +#, c-format

4472 +msgid "'%s' file does not contain absolute path to the working tree location"

4473 +msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"

4474 +

4475 +#: worktree.c:314

4476 +#, c-format

4477 +msgid "'%s' does not exist"

4478 +msgstr "\"%s\" finns inte"

4479 +

4480 +#: worktree.c:320

4481 +#, c-format

4482 +msgid "'%s' is not a .git file, error code %d"

4483 +msgstr "\"%s\" är inte en .git-fil, felkod %d"

4484 +

4485 +#: worktree.c:328

4486 +#, c-format

4487 +msgid "'%s' does not point back to '%s'"

4488 +msgstr "\"%s\" pekar inte tillbaka till \"%s\""

4489 +

4490 #: wrapper.c:223 wrapper.c:393

4491 #, c-format

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

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

4494

4495 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4250 -#: builtin/am.c:862 builtin/merge.c:1043

4496 +#: builtin/am.c:862 builtin/merge.c:1044

4497 #, c-format

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

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

@@ -4261,155 +4507,155 @@ msgstr "kan inte komma åt \"%s\""

4507 msgid "unable to get current working directory"

4508 msgstr "kan inte hämta aktuell arbetskatalog"

4509

4264 -#: wt-status.c:150

4510 +#: wt-status.c:151

4511 msgid "Unmerged paths:"

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

4513

4268 -#: wt-status.c:177 wt-status.c:204

4514 +#: wt-status.c:178 wt-status.c:205

4515 #, c-format

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

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

4518

4273 -#: wt-status.c:179 wt-status.c:206

4519 +#: wt-status.c:180 wt-status.c:207

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

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

4522

4277 -#: wt-status.c:183

4523 +#: wt-status.c:184

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

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

4526

4281 -#: wt-status.c:185 wt-status.c:189

4527 +#: wt-status.c:186 wt-status.c:190

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

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

4530

4285 -#: wt-status.c:187

4531 +#: wt-status.c:188

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

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

4534

4289 -#: wt-status.c:198 wt-status.c:984

4535 +#: wt-status.c:199 wt-status.c:1007

4536 msgid "Changes to be committed:"

4537 msgstr "Ändringar att checka in:"

4538

4293 -#: wt-status.c:216 wt-status.c:993

4539 +#: wt-status.c:217 wt-status.c:1016

4540 msgid "Changes not staged for commit:"

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

4542

4297 -#: wt-status.c:220

4543 +#: wt-status.c:221

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

4545 msgstr ""

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

4547

4302 -#: wt-status.c:222

4548 +#: wt-status.c:223

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

4550 msgstr ""

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

4552

4307 -#: wt-status.c:223

4553 +#: wt-status.c:224

4554 msgid ""

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

4556 msgstr ""

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

4558 "arbetskatalogen)"

4559

4314 -#: wt-status.c:225

4560 +#: wt-status.c:226

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

4562 msgstr ""

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

4564

4319 -#: wt-status.c:237

4565 +#: wt-status.c:238

4566 #, c-format

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

4568 msgstr ""

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

4570

4325 -#: wt-status.c:252

4571 +#: wt-status.c:253

4572 msgid "both deleted:"

4573 msgstr "borttaget av bägge:"

4574

4329 -#: wt-status.c:254

4575 +#: wt-status.c:255

4576 msgid "added by us:"

4577 msgstr "tillagt av oss:"

4578

4333 -#: wt-status.c:256

4579 +#: wt-status.c:257

4580 msgid "deleted by them:"

4581 msgstr "borttaget av dem:"

4582

4337 -#: wt-status.c:258

4583 +#: wt-status.c:259

4584 msgid "added by them:"

4585 msgstr "tillagt av dem:"

4586

4341 -#: wt-status.c:260

4587 +#: wt-status.c:261

4588 msgid "deleted by us:"

4589 msgstr "borttaget av oss:"

4590

4345 -#: wt-status.c:262

4591 +#: wt-status.c:263

4592 msgid "both added:"

4593 msgstr "tillagt av bägge:"

4594

4349 -#: wt-status.c:264

4595 +#: wt-status.c:265

4596 msgid "both modified:"

4597 msgstr "ändrat av bägge:"

4598

4353 -#: wt-status.c:274

4599 +#: wt-status.c:275

4600 msgid "new file:"

4601 msgstr "ny fil:"

4602

4357 -#: wt-status.c:276

4603 +#: wt-status.c:277

4604 msgid "copied:"

4605 msgstr "kopierad:"

4606

4361 -#: wt-status.c:278

4607 +#: wt-status.c:279

4608 msgid "deleted:"

4609 msgstr "borttagen:"

4610

4365 -#: wt-status.c:280

4611 +#: wt-status.c:281

4612 msgid "modified:"

4613 msgstr "ändrad:"

4614

4369 -#: wt-status.c:282

4615 +#: wt-status.c:283

4616 msgid "renamed:"

4617 msgstr "namnbytt:"

4618

4373 -#: wt-status.c:284

4619 +#: wt-status.c:285

4620 msgid "typechange:"

4621 msgstr "typbyte:"

4622

4377 -#: wt-status.c:286

4623 +#: wt-status.c:287

4624 msgid "unknown:"

4625 msgstr "okänd:"

4626

4381 -#: wt-status.c:288

4627 +#: wt-status.c:289

4628 msgid "unmerged:"

4629 msgstr "osammanslagen:"

4630

4385 -#: wt-status.c:370

4631 +#: wt-status.c:369

4632 msgid "new commits, "

4633 msgstr "nya incheckningar, "

4634

4389 -#: wt-status.c:372

4635 +#: wt-status.c:371

4636 msgid "modified content, "

4637 msgstr "ändrat innehåll, "

4638

4393 -#: wt-status.c:374

4639 +#: wt-status.c:373

4640 msgid "untracked content, "

4641 msgstr "ospårat innehåll, "

4642

4397 -#: wt-status.c:824

4643 +#: wt-status.c:847

4644 #, c-format

4645 msgid "Your stash currently has %d entry"

4646 msgid_plural "Your stash currently has %d entries"

4647 msgstr[0] "Stashen innehåller just nu %d post"

4648 msgstr[1] "Stashen innehåller just nu %d poster"

4649

4404 -#: wt-status.c:856

4650 +#: wt-status.c:879

4651 msgid "Submodules changed but not updated:"

4652 msgstr "Undermoduler ändrade men inte uppdaterade:"

4653

4408 -#: wt-status.c:858

4654 +#: wt-status.c:881

4655 msgid "Submodule changes to be committed:"

4656 msgstr "Undermodulers ändringar att checka in:"

4657

4412 -#: wt-status.c:940

4658 +#: wt-status.c:963

4659 msgid ""

4660 "Do not modify or remove the line above.\n"

4661 "Everything below it will be ignored."

@@ -4417,107 +4663,107 @@ msgstr ""

4663 "Raden ovan får inte ändras eller tas bort.\n"

4664 "Allt under den kommer tas bort."

4665

4420 -#: wt-status.c:1053

4666 +#: wt-status.c:1076

4667 msgid "You have unmerged paths."

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

4669

4424 -#: wt-status.c:1056

4670 +#: wt-status.c:1079

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

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

4673

4428 -#: wt-status.c:1058

4674 +#: wt-status.c:1081

4675 msgid " (use \"git merge --abort\" to abort the merge)"

4676 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

4677

4432 -#: wt-status.c:1063

4678 +#: wt-status.c:1086

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

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

4681

4436 -#: wt-status.c:1066

4682 +#: wt-status.c:1089

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

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

4685

4440 -#: wt-status.c:1076

4686 +#: wt-status.c:1099

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

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

4689

4444 -#: wt-status.c:1079

4690 +#: wt-status.c:1102

4691 msgid "The current patch is empty."

4692 msgstr "Aktuell patch är tom."

4693

4448 -#: wt-status.c:1083

4694 +#: wt-status.c:1106

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

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

4697

4452 -#: wt-status.c:1085

4698 +#: wt-status.c:1108

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

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

4701

4456 -#: wt-status.c:1087

4702 +#: wt-status.c:1110

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

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

4705

4460 -#: wt-status.c:1219

4706 +#: wt-status.c:1242

4707 msgid "git-rebase-todo is missing."

4708 msgstr "git-rebase-todo saknas."

4709

4464 -#: wt-status.c:1221

4710 +#: wt-status.c:1244

4711 msgid "No commands done."

4712 msgstr "Inga kommandon utförda."

4713

4468 -#: wt-status.c:1224

4714 +#: wt-status.c:1247

4715 #, c-format

4716 msgid "Last command done (%d command done):"

4717 msgid_plural "Last commands done (%d commands done):"

4718 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

4719 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

4720

4475 -#: wt-status.c:1235

4721 +#: wt-status.c:1258

4722 #, c-format

4723 msgid " (see more in file %s)"

4724 msgstr " (se fler i filen %s)"

4725

4480 -#: wt-status.c:1240

4726 +#: wt-status.c:1263

4727 msgid "No commands remaining."

4728 msgstr "Inga kommandon återstår."

4729

4484 -#: wt-status.c:1243

4730 +#: wt-status.c:1266

4731 #, c-format

4732 msgid "Next command to do (%d remaining command):"

4733 msgid_plural "Next commands to do (%d remaining commands):"

4734 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

4735 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

4736

4491 -#: wt-status.c:1251

4737 +#: wt-status.c:1274

4738 msgid " (use \"git rebase --edit-todo\" to view and edit)"

4739 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

4740

4495 -#: wt-status.c:1264

4741 +#: wt-status.c:1287

4742 #, c-format

4743 msgid "You are currently rebasing branch '%s' on '%s'."

4744 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

4745

4500 -#: wt-status.c:1269

4746 +#: wt-status.c:1292

4747 msgid "You are currently rebasing."

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

4749

4504 -#: wt-status.c:1283

4750 +#: wt-status.c:1306

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

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

4753

4508 -#: wt-status.c:1285

4754 +#: wt-status.c:1308

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

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

4757

4512 -#: wt-status.c:1287

4758 +#: wt-status.c:1310

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

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

4761

4516 -#: wt-status.c:1293

4762 +#: wt-status.c:1316

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

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

4765

4520 -#: wt-status.c:1297

4766 +#: wt-status.c:1320

4767 #, c-format

4768 msgid ""

4769 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4525,126 +4771,126 @@ msgstr ""

4771 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

4772 "ovanpå \"%s\"."

4773

4528 -#: wt-status.c:1302

4774 +#: wt-status.c:1325

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

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

4777

4532 -#: wt-status.c:1305

4778 +#: wt-status.c:1328

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

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

4781

4536 -#: wt-status.c:1309

4782 +#: wt-status.c:1332

4783 #, c-format

4784 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

4785 msgstr ""

4786 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

4787 "ovanpå \"%s\"."

4788

4543 -#: wt-status.c:1314

4789 +#: wt-status.c:1337

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

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

4792

4547 -#: wt-status.c:1317

4793 +#: wt-status.c:1340

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

4795 msgstr ""

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

4797

4552 -#: wt-status.c:1319

4798 +#: wt-status.c:1342

4799 msgid ""

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

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

4802

4557 -#: wt-status.c:1329

4803 +#: wt-status.c:1352

4804 #, c-format

4805 msgid "You are currently cherry-picking commit %s."

4806 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

4807

4562 -#: wt-status.c:1334

4808 +#: wt-status.c:1357

4809 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

4810 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

4811

4566 -#: wt-status.c:1337

4812 +#: wt-status.c:1360

4813 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

4814 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

4815

4570 -#: wt-status.c:1339

4816 +#: wt-status.c:1362

4817 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

4818 msgstr ""

4819 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

4820 "operationen)"

4821

4576 -#: wt-status.c:1348

4822 +#: wt-status.c:1371

4823 #, c-format

4824 msgid "You are currently reverting commit %s."

4825 msgstr "Du håller på med att ångra incheckningen %s."

4826

4581 -#: wt-status.c:1353

4827 +#: wt-status.c:1376

4828 msgid " (fix conflicts and run \"git revert --continue\")"

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

4830

4585 -#: wt-status.c:1356

4831 +#: wt-status.c:1379

4832 msgid " (all conflicts fixed: run \"git revert --continue\")"

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

4834

4589 -#: wt-status.c:1358

4835 +#: wt-status.c:1381

4836 msgid " (use \"git revert --abort\" to cancel the revert operation)"

4837 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

4838

4593 -#: wt-status.c:1369

4839 +#: wt-status.c:1392

4840 #, c-format

4841 msgid "You are currently bisecting, started from branch '%s'."

4842 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

4843

4598 -#: wt-status.c:1373

4844 +#: wt-status.c:1396

4845 msgid "You are currently bisecting."

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

4847

4602 -#: wt-status.c:1376

4848 +#: wt-status.c:1399

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

4850 msgstr ""

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

4852

4607 -#: wt-status.c:1573

4853 +#: wt-status.c:1596

4854 msgid "On branch "

4855 msgstr "På grenen "

4856

4611 -#: wt-status.c:1579

4857 +#: wt-status.c:1602

4858 msgid "interactive rebase in progress; onto "

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

4860

4615 -#: wt-status.c:1581

4861 +#: wt-status.c:1604

4862 msgid "rebase in progress; onto "

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

4864

4619 -#: wt-status.c:1586

4865 +#: wt-status.c:1609

4866 msgid "HEAD detached at "

4867 msgstr "HEAD frånkopplad vid "

4868

4623 -#: wt-status.c:1588

4869 +#: wt-status.c:1611

4870 msgid "HEAD detached from "

4871 msgstr "HEAD frånkopplad från "

4872

4627 -#: wt-status.c:1591

4873 +#: wt-status.c:1614

4874 msgid "Not currently on any branch."

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

4876

4631 -#: wt-status.c:1611

4877 +#: wt-status.c:1634

4878 msgid "Initial commit"

4879 msgstr "Första incheckning"

4880

4635 -#: wt-status.c:1612

4881 +#: wt-status.c:1635

4882 msgid "No commits yet"

4883 msgstr "Inga incheckningar ännu"

4884

4639 -#: wt-status.c:1626

4885 +#: wt-status.c:1649

4886 msgid "Untracked files"

4887 msgstr "Ospårade filer"

4888

4643 -#: wt-status.c:1628

4889 +#: wt-status.c:1651

4890 msgid "Ignored files"

4891 msgstr "Ignorerade filer"

4892

4647 -#: wt-status.c:1632

4893 +#: wt-status.c:1655

4894 #, c-format

4895 msgid ""

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

@@ -4656,32 +4902,32 @@ msgstr ""

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

4903

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

4659 -#: wt-status.c:1638

4905 +#: wt-status.c:1661

4906 #, c-format

4907 msgid "Untracked files not listed%s"

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

4909

4664 -#: wt-status.c:1640

4910 +#: wt-status.c:1663

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

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

4913

4668 -#: wt-status.c:1646

4914 +#: wt-status.c:1669

4915 msgid "No changes"

4916 msgstr "Inga ändringar"

4917

4672 -#: wt-status.c:1651

4918 +#: wt-status.c:1674

4919 #, c-format

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

4921 msgstr ""

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

4923 "\")\n"

4924

4679 -#: wt-status.c:1654

4925 +#: wt-status.c:1677

4926 #, c-format

4927 msgid "no changes added to commit\n"

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

4929

4684 -#: wt-status.c:1657

4930 +#: wt-status.c:1680

4931 #, c-format

4932 msgid ""

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

@@ -4690,63 +4936,67 @@ msgstr ""

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

4937 "\")\n"

4938

4693 -#: wt-status.c:1660

4939 +#: wt-status.c:1683

4940 #, c-format

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

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

4943

4698 -#: wt-status.c:1663

4944 +#: wt-status.c:1686

4945 #, c-format

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

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

4948

4703 -#: wt-status.c:1666 wt-status.c:1671

4949 +#: wt-status.c:1689 wt-status.c:1694

4950 #, c-format

4951 msgid "nothing to commit\n"

4952 msgstr "inget att checka in\n"

4953

4708 -#: wt-status.c:1669

4954 +#: wt-status.c:1692

4955 #, c-format

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

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

4958

4713 -#: wt-status.c:1673

4959 +#: wt-status.c:1696

4960 #, c-format

4961 msgid "nothing to commit, working tree clean\n"

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

4963

4718 -#: wt-status.c:1785

4964 +#: wt-status.c:1809

4965 msgid "No commits yet on "

4966 msgstr "Inga incheckningar ännu på "

4967

4722 -#: wt-status.c:1789

4968 +#: wt-status.c:1813

4969 msgid "HEAD (no branch)"

4970 msgstr "HEAD (ingen gren)"

4971

4726 -#: wt-status.c:1818 wt-status.c:1826

4972 +#: wt-status.c:1844

4973 +msgid "different"

4974 +msgstr "olika"

4975 +

4976 +#: wt-status.c:1846 wt-status.c:1854

4977 msgid "behind "

4978 msgstr "efter "

4979

4730 -#: wt-status.c:1821 wt-status.c:1824

4980 +#: wt-status.c:1849 wt-status.c:1852

4981 msgid "ahead "

4982 msgstr "före "

4983

4984 #. TRANSLATORS: the action is e.g. "pull with rebase"

4735 -#: wt-status.c:2318

4985 +#: wt-status.c:2358

4986 #, c-format

4987 msgid "cannot %s: You have unstaged changes."

4988 msgstr "kan inte %s: Du har oköade ändringar."

4989

4740 -#: wt-status.c:2324

4990 +#: wt-status.c:2364

4991 msgid "additionally, your index contains uncommitted changes."

4992 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

4993

4744 -#: wt-status.c:2326

4994 +#: wt-status.c:2366

4995 #, c-format

4996 msgid "cannot %s: Your index contains uncommitted changes."

4997 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

4998

4749 -#: compat/precompose_utf8.c:58 builtin/clone.c:437

4999 +#: compat/precompose_utf8.c:58 builtin/clone.c:440

5000 #, c-format

5001 msgid "failed to unlink '%s'"

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

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

5010 msgid "unexpected diff status %c"

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

5012

4763 -#: builtin/add.c:88 builtin/commit.c:291

5013 +#: builtin/add.c:88 builtin/commit.c:257

5014 msgid "updating files failed"

5015 msgstr "misslyckades uppdatera filer"

5016

@@ -4808,7 +5058,7 @@ msgstr "Kunde inte tillämpa \"%s\""

5058 msgid "The following paths are ignored by one of your .gitignore files:\n"

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

5060

4811 -#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124

5061 +#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:146 builtin/mv.c:124

5062 #: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541

5063 #: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164

5064 msgid "dry run"

@@ -4818,7 +5068,7 @@ msgstr "testkörning"

5068 msgid "interactive picking"

5069 msgstr "plocka interaktivt"

5070

4821 -#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310

5071 +#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5072 msgid "select hunks interactively"

5073 msgstr "välj stycken interaktivt"

5074

@@ -4942,10 +5192,10 @@ msgstr "Inget angivet, inget tillagt.\n"

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

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

5194

4945 -#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281

4946 -#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350

4947 -#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249

4948 -#: builtin/rm.c:271 builtin/submodule--helper.c:311

5195 +#: builtin/add.c:449 builtin/check-ignore.c:177 builtin/checkout.c:280

5196 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:316

5197 +#: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5198 +#: builtin/rm.c:271 builtin/submodule--helper.c:326

5199 msgid "index file corrupt"

5200 msgstr "indexfilen trasig"

5201

@@ -4997,60 +5247,60 @@ msgstr "ogiltig tidszons-offset"

5247 msgid "Patch format detection failed."

5248 msgstr "Misslyckades detektera patchformat."

5249

5000 -#: builtin/am.c:1013 builtin/clone.c:402

5250 +#: builtin/am.c:1013 builtin/clone.c:405

5251 #, c-format

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

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

5254

5005 -#: builtin/am.c:1017

5255 +#: builtin/am.c:1018

5256 msgid "Failed to split patches."

5257 msgstr "Misslyckades dela patchar."

5258

5009 -#: builtin/am.c:1146 builtin/commit.c:376

5259 +#: builtin/am.c:1148 builtin/commit.c:342

5260 msgid "unable to write index file"

5261 msgstr "kan inte skriva indexfil"

5262

5013 -#: builtin/am.c:1160

5263 +#: builtin/am.c:1162

5264 #, c-format

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

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

5267

5018 -#: builtin/am.c:1161

5268 +#: builtin/am.c:1163

5269 #, c-format

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

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

5272

5023 -#: builtin/am.c:1162

5273 +#: builtin/am.c:1164

5274 #, c-format

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

5276 msgstr ""

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

5278

5029 -#: builtin/am.c:1269

5279 +#: builtin/am.c:1271

5280 msgid "Patch is empty."

5281 msgstr "Patchen är tom."

5282

5033 -#: builtin/am.c:1335

5283 +#: builtin/am.c:1337

5284 #, c-format

5285 msgid "invalid ident line: %.*s"

5286 msgstr "ogiltig ident-rad: %.*s"

5287

5038 -#: builtin/am.c:1357

5288 +#: builtin/am.c:1359

5289 #, c-format

5290 msgid "unable to parse commit %s"

5291 msgstr "kunde inte tolka incheckningen %s"

5292

5043 -#: builtin/am.c:1550

5293 +#: builtin/am.c:1554

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

5295 msgstr ""

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

5297 "vägssammanslagning."

5298

5049 -#: builtin/am.c:1552

5299 +#: builtin/am.c:1556

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

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

5302

5053 -#: builtin/am.c:1571

5303 +#: builtin/am.c:1575

5304 msgid ""

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

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

@@ -5058,39 +5308,30 @@ msgstr ""

5308 "Har du handredigerat din patch?\n"

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

5310

5061 -#: builtin/am.c:1577

5311 +#: builtin/am.c:1581

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

5313 msgstr ""

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

5315

5066 -#: builtin/am.c:1602

5316 +#: builtin/am.c:1606

5317 msgid "Failed to merge in the changes."

5318 msgstr "Misslyckades slå ihop ändringarna."

5319

5070 -#: builtin/am.c:1626 builtin/merge.c:642

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

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

5073 -

5074 -#: builtin/am.c:1633

5320 +#: builtin/am.c:1637

5321 msgid "applying to an empty history"

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

5323

5078 -#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825

5079 -#: builtin/merge.c:850

5080 -msgid "failed to write commit object"

5081 -msgstr "kunde inte skriva incheckningsobjekt"

5082 -

5083 -#: builtin/am.c:1679 builtin/am.c:1683

5324 +#: builtin/am.c:1683 builtin/am.c:1687

5325 #, c-format

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

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

5328

5088 -#: builtin/am.c:1699

5329 +#: builtin/am.c:1703

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

5331 msgstr ""

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

5333

5093 -#: builtin/am.c:1704

5334 +#: builtin/am.c:1708

5335 msgid "Commit Body is:"

5336 msgstr "Incheckningskroppen är:"

5337

@@ -5098,35 +5339,35 @@ msgstr "Incheckningskroppen är:"

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

5340 #. input at this point.

5341 #.

5101 -#: builtin/am.c:1714

5342 +#: builtin/am.c:1718

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

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

5345

5105 -#: builtin/am.c:1764

5346 +#: builtin/am.c:1768

5347 #, c-format

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

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

5350

5110 -#: builtin/am.c:1804 builtin/am.c:1876

5351 +#: builtin/am.c:1808 builtin/am.c:1879

5352 #, c-format

5353 msgid "Applying: %.*s"

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

5355

5115 -#: builtin/am.c:1820

5356 +#: builtin/am.c:1824

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

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

5359

5119 -#: builtin/am.c:1828

5360 +#: builtin/am.c:1832

5361 #, c-format

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

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

5364

5124 -#: builtin/am.c:1834

5125 -#, c-format

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

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

5365 +#: builtin/am.c:1838

5366 +msgid "Use 'git am --show-current-patch' to see the failed patch"

5367 +msgstr ""

5368 +"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"

5369

5129 -#: builtin/am.c:1879

5370 +#: builtin/am.c:1882

5371 msgid ""

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

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

@@ -5136,7 +5377,7 @@ msgstr ""

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

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

5379

5139 -#: builtin/am.c:1886

5380 +#: builtin/am.c:1889

5381 msgid ""

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

5383 "You should 'git add' each file with resolved conflicts to mark them as "

@@ -5148,17 +5389,17 @@ msgstr ""

5389 "lösta.\n"

5390 "Du kan köra ”git rm” för att godta ”borttagen av dem” för den."

5391

5151 -#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332

5152 -#: builtin/reset.c:340

5392 +#: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324

5393 +#: builtin/reset.c:332

5394 #, c-format

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

5396 msgstr "Kan inte tolka objektet ”%s”."

5397

5157 -#: builtin/am.c:2045

5398 +#: builtin/am.c:2048

5399 msgid "failed to clean index"

5400 msgstr "misslyckades städa upp indexet"

5401

5161 -#: builtin/am.c:2080

5402 +#: builtin/am.c:2083

5403 msgid ""

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

5405 "Not rewinding to ORIG_HEAD"

@@ -5166,133 +5407,141 @@ msgstr ""

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

5408 "Återställer inte till ORIG_HEAD"

5409

5169 -#: builtin/am.c:2143

5410 +#: builtin/am.c:2174

5411 #, c-format

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

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

5414

5174 -#: builtin/am.c:2176

5415 +#: builtin/am.c:2210

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

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

5418

5178 -#: builtin/am.c:2177

5419 +#: builtin/am.c:2211

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

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

5422

5182 -#: builtin/am.c:2183

5423 +#: builtin/am.c:2217

5424 msgid "run interactively"

5425 msgstr "kör interaktivt"

5426

5186 -#: builtin/am.c:2185

5427 +#: builtin/am.c:2219

5428 msgid "historical option -- no-op"

5429 msgstr "historisk flagga -- no-op"

5430

5190 -#: builtin/am.c:2187

5431 +#: builtin/am.c:2221

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

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

5434

5194 -#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57

5195 -#: builtin/repack.c:180

5435 +#: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5436 +#: builtin/repack.c:182

5437 msgid "be quiet"

5438 msgstr "var tyst"

5439

5199 -#: builtin/am.c:2190

5440 +#: builtin/am.c:2224

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

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

5443

5203 -#: builtin/am.c:2193

5444 +#: builtin/am.c:2227

5445 msgid "recode into utf8 (default)"

5446 msgstr "koda om till utf8 (standard)"

5447

5207 -#: builtin/am.c:2195

5448 +#: builtin/am.c:2229

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

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

5451

5211 -#: builtin/am.c:2197

5452 +#: builtin/am.c:2231

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

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

5455

5215 -#: builtin/am.c:2199

5456 +#: builtin/am.c:2233

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

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

5459

5219 -#: builtin/am.c:2201

5460 +#: builtin/am.c:2235

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

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

5463

5223 -#: builtin/am.c:2204

5464 +#: builtin/am.c:2238

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

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

5467

5227 -#: builtin/am.c:2207

5468 +#: builtin/am.c:2241

5469 msgid "strip everything before a scissors line"

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

5471

5231 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218

5232 -#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230

5233 -#: builtin/am.c:2236

5472 +#: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252

5473 +#: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264

5474 +#: builtin/am.c:2270

5475 msgid "pass it through git-apply"

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

5477

5237 -#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5238 -#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203

5239 -#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195

5240 -#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377

5241 -#: parse-options.h:132 parse-options.h:134 parse-options.h:245

5478 +#: builtin/am.c:2260 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668

5479 +#: builtin/grep.c:853 builtin/merge.c:206 builtin/pull.c:145 builtin/pull.c:203

5480 +#: builtin/repack.c:191 builtin/repack.c:195 builtin/repack.c:197

5481 +#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:382

5482 +#: parse-options.h:144 parse-options.h:146 parse-options.h:257

5483 msgid "n"

5484 msgstr "n"

5485

5245 -#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38

5246 -#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39

5486 +#: builtin/am.c:2266 builtin/branch.c:629 builtin/for-each-ref.c:38

5487 +#: builtin/replace.c:445 builtin/tag.c:418 builtin/verify-tag.c:39

5488 msgid "format"

5489 msgstr "format"

5490

5250 -#: builtin/am.c:2233

5491 +#: builtin/am.c:2267

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

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

5494

5254 -#: builtin/am.c:2239

5495 +#: builtin/am.c:2273

5496 msgid "override error message when patch failure occurs"

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

5498

5258 -#: builtin/am.c:2241

5499 +#: builtin/am.c:2275

5500 msgid "continue applying patches after resolving a conflict"

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

5502

5262 -#: builtin/am.c:2244

5503 +#: builtin/am.c:2278

5504 msgid "synonyms for --continue"

5505 msgstr "synonymer till --continue"

5506

5266 -#: builtin/am.c:2247

5507 +#: builtin/am.c:2281

5508 msgid "skip the current patch"

5509 msgstr "hoppa över den aktuella grenen"

5510

5270 -#: builtin/am.c:2250

5511 +#: builtin/am.c:2284

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

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

5514

5274 -#: builtin/am.c:2254

5515 +#: builtin/am.c:2287

5516 +msgid "abort the patching operation but keep HEAD where it is."

5517 +msgstr "avbryt patchningen men behåll HEAD där det är."

5518 +

5519 +#: builtin/am.c:2290

5520 +msgid "show the patch being applied."

5521 +msgstr "visa patchen som tillämpas."

5522 +

5523 +#: builtin/am.c:2294

5524 msgid "lie about committer date"

5525 msgstr "ljug om incheckningsdatum"

5526

5278 -#: builtin/am.c:2256

5527 +#: builtin/am.c:2296

5528 msgid "use current timestamp for author date"

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

5530

5282 -#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236

5283 -#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392

5531 +#: builtin/am.c:2298 builtin/commit.c:1431 builtin/merge.c:237

5532 +#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:398

5533 msgid "key-id"

5534 msgstr "nyckel-id"

5535

5287 -#: builtin/am.c:2259

5536 +#: builtin/am.c:2299

5537 msgid "GPG-sign commits"

5538 msgstr "GPG-signera incheckningar"

5539

5291 -#: builtin/am.c:2262

5540 +#: builtin/am.c:2302

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

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

5543

5295 -#: builtin/am.c:2280

5544 +#: builtin/am.c:2320

5545 msgid ""

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

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

@@ -5300,16 +5549,16 @@ msgstr ""

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

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

5551

5303 -#: builtin/am.c:2287

5552 +#: builtin/am.c:2327

5553 msgid "failed to read the index"

5554 msgstr "misslyckades läsa indexet"

5555

5307 -#: builtin/am.c:2302

5556 +#: builtin/am.c:2342

5557 #, c-format

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

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

5560

5312 -#: builtin/am.c:2326

5561 +#: builtin/am.c:2366

5562 #, c-format

5563 msgid ""

5564 "Stray %s directory found.\n"

@@ -5318,7 +5567,7 @@ msgstr ""

5567 "Kvarbliven katalog %s hittades.\n"

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

5569

5321 -#: builtin/am.c:2332

5570 +#: builtin/am.c:2372

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

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

5573

@@ -5340,8 +5589,8 @@ msgid "git archive: Remote with no URL"

5589 msgstr "git archive: Fjärr utan URL"

5590

5591 #: builtin/archive.c:58

5343 -msgid "git archive: expected ACK/NAK, got EOF"

5344 -msgstr "git archive: förväntade ACK/NAK, fick EOF"

5592 +msgid "git archive: expected ACK/NAK, got a flush packet"

5593 +msgstr "git archive: förväntade ACK/NAK, fick flush-paket"

5594

5595 #: builtin/archive.c:61

5596 #, c-format

@@ -5427,107 +5676,107 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

5676 msgid "<rev-opts> are documented in git-rev-list(1)"

5677 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

5678

5430 -#: builtin/blame.c:668

5679 +#: builtin/blame.c:677

5680 msgid "Show blame entries as we find them, incrementally"

5681 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

5682

5434 -#: builtin/blame.c:669

5683 +#: builtin/blame.c:678

5684 msgid "Show blank SHA-1 for boundary commits (Default: off)"

5685 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

5686

5438 -#: builtin/blame.c:670

5687 +#: builtin/blame.c:679

5688 msgid "Do not treat root commits as boundaries (Default: off)"

5689 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

5690

5442 -#: builtin/blame.c:671

5691 +#: builtin/blame.c:680

5692 msgid "Show work cost statistics"

5693 msgstr "Visa statistik över arbetskostnad"

5694

5446 -#: builtin/blame.c:672

5695 +#: builtin/blame.c:681

5696 msgid "Force progress reporting"

5697 msgstr "Tvinga förloppsrapportering"

5698

5450 -#: builtin/blame.c:673

5699 +#: builtin/blame.c:682

5700 msgid "Show output score for blame entries"

5701 msgstr "Visa utdatapoäng för klandringsposter"

5702

5454 -#: builtin/blame.c:674

5703 +#: builtin/blame.c:683

5704 msgid "Show original filename (Default: auto)"

5705 msgstr "Visa originalfilnamn (Standard: auto)"

5706

5458 -#: builtin/blame.c:675

5707 +#: builtin/blame.c:684

5708 msgid "Show original linenumber (Default: off)"

5709 msgstr "Visa ursprungligt radnummer (Standard: av)"

5710

5462 -#: builtin/blame.c:676

5711 +#: builtin/blame.c:685

5712 msgid "Show in a format designed for machine consumption"

5713 msgstr "Visa i ett format avsett för maskinkonsumtion"

5714

5466 -#: builtin/blame.c:677

5715 +#: builtin/blame.c:686

5716 msgid "Show porcelain format with per-line commit information"

5717 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

5718

5470 -#: builtin/blame.c:678

5719 +#: builtin/blame.c:687

5720 msgid "Use the same output mode as git-annotate (Default: off)"

5721 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

5722

5474 -#: builtin/blame.c:679

5723 +#: builtin/blame.c:688

5724 msgid "Show raw timestamp (Default: off)"

5725 msgstr "Visa rå tidsstämpel (Standard: av)"

5726

5478 -#: builtin/blame.c:680

5727 +#: builtin/blame.c:689

5728 msgid "Show long commit SHA1 (Default: off)"

5729 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

5730

5482 -#: builtin/blame.c:681

5731 +#: builtin/blame.c:690

5732 msgid "Suppress author name and timestamp (Default: off)"

5733 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

5734

5486 -#: builtin/blame.c:682

5735 +#: builtin/blame.c:691

5736 msgid "Show author email instead of name (Default: off)"

5737 msgstr "Visa författarens e-post istället för namn (Standard: av)"

5738

5490 -#: builtin/blame.c:683

5739 +#: builtin/blame.c:692

5740 msgid "Ignore whitespace differences"

5741 msgstr "Ignorera ändringar i blanksteg"

5742

5494 -#: builtin/blame.c:690

5743 +#: builtin/blame.c:699

5744 msgid "Use an experimental heuristic to improve diffs"

5745 msgstr "Använd en experimentell algoritm för att förbättra diffar"

5746

5498 -#: builtin/blame.c:692

5747 +#: builtin/blame.c:701

5748 msgid "Spend extra cycles to find better match"

5749 msgstr "Slösa extra cykler med att hitta bättre träff"

5750

5502 -#: builtin/blame.c:693

5751 +#: builtin/blame.c:702

5752 msgid "Use revisions from <file> instead of calling git-rev-list"

5753 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

5754

5506 -#: builtin/blame.c:694

5755 +#: builtin/blame.c:703

5756 msgid "Use <file>'s contents as the final image"

5757 msgstr "Använd <fil>s innehåll som slutgiltig bild"

5758

5510 -#: builtin/blame.c:695 builtin/blame.c:696

5759 +#: builtin/blame.c:704 builtin/blame.c:705

5760 msgid "score"

5761 msgstr "poäng"

5762

5514 -#: builtin/blame.c:695

5763 +#: builtin/blame.c:704

5764 msgid "Find line copies within and across files"

5765 msgstr "Hitta kopierade rader inuti och mellan filer"

5766

5518 -#: builtin/blame.c:696

5767 +#: builtin/blame.c:705

5768 msgid "Find line movements within and across files"

5769 msgstr "Hitta flyttade rader inuti och mellan filer"

5770

5522 -#: builtin/blame.c:697

5771 +#: builtin/blame.c:706

5772 msgid "n,m"

5773 msgstr "n,m"

5774

5526 -#: builtin/blame.c:697

5775 +#: builtin/blame.c:706

5776 msgid "Process only line range n,m, counting from 1"

5777 msgstr "Behandla endast radintervallet n,m, med början på 1"

5778

5530 -#: builtin/blame.c:744

5779 +#: builtin/blame.c:753

5780 msgid "--progress can't be used with --incremental or porcelain formats"

5781 msgstr "--progress kan inte användas med --incremental eller porslinsformat"

5782

@@ -5539,18 +5788,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"

5788 #. your language may need more or fewer display

5789 #. columns.

5790 #.

5542 -#: builtin/blame.c:795

5791 +#: builtin/blame.c:804

5792 msgid "4 years, 11 months ago"

5793 msgstr "4 år, 11 månader sedan"

5794

5546 -#: builtin/blame.c:882

5795 +#: builtin/blame.c:890

5796 #, c-format

5797 msgid "file %s has only %lu line"

5798 msgid_plural "file %s has only %lu lines"

5799 msgstr[0] "filen %s har bara %lu rad"

5800 msgstr[1] "filen %s har bara %lu rader"

5801

5553 -#: builtin/blame.c:928

5802 +#: builtin/blame.c:936

5803 msgid "Blaming lines"

5804 msgstr "Klandra rader"

5805

@@ -5839,17 +6088,17 @@ msgstr "visa endast ej sammanslagna grenar"

6088 msgid "list branches in columns"

6089 msgstr "visa grenar i spalter"

6090

5842 -#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405

6091 +#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:411

6092 msgid "key"

6093 msgstr "nyckel"

6094

5846 -#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406

6095 +#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:412

6096 msgid "field name to sort on"

6097 msgstr "fältnamn att sortera på"

6098

6099 #: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408

6100 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574

5852 -#: builtin/tag.c:408

6101 +#: builtin/tag.c:414

6102 msgid "object"

6103 msgstr "objekt"

6104

@@ -5857,16 +6106,16 @@ msgstr "objekt"

6106 msgid "print only branches of the object"

6107 msgstr "visa endast grenar för objektet"

6108

5860 -#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415

6109 +#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:421

6110 msgid "sorting and filtering are case insensitive"

6111 msgstr "sortering och filtrering skiljer gemener och VERSALER"

6112

5864 -#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413

6113 +#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:419

6114 #: builtin/verify-tag.c:39

6115 msgid "format to use for the output"

6116 msgstr "format att använda för utdata"

6117

5869 -#: builtin/branch.c:652 builtin/clone.c:730

6118 +#: builtin/branch.c:652 builtin/clone.c:735

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

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

6121

@@ -5966,7 +6215,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."

6215 msgid "Need a repository to unbundle."

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

6217

5969 -#: builtin/cat-file.c:521

6218 +#: builtin/cat-file.c:523

6219 msgid ""

6220 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6221 "p | <type> | --textconv | --filters) [--path=<path>] <object>"

@@ -5974,7 +6223,7 @@ msgstr ""

6223 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"

6224 "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"

6225

5977 -#: builtin/cat-file.c:522

6226 +#: builtin/cat-file.c:524

6227 msgid ""

6228 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6229 "filters]"

@@ -5982,64 +6231,64 @@ msgstr ""

6231 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"

6232 "filters]"

6233

5985 -#: builtin/cat-file.c:559

6234 +#: builtin/cat-file.c:561

6235 msgid "<type> can be one of: blob, tree, commit, tag"

6236 msgstr "<typ> kan vara en av: blob, tree, commit, tag"

6237

5989 -#: builtin/cat-file.c:560

6238 +#: builtin/cat-file.c:562

6239 msgid "show object type"

6240 msgstr "visa objekttyp"

6241

5993 -#: builtin/cat-file.c:561

6242 +#: builtin/cat-file.c:563

6243 msgid "show object size"

6244 msgstr "visa objektstorlek"

6245

5997 -#: builtin/cat-file.c:563

6246 +#: builtin/cat-file.c:565

6247 msgid "exit with zero when there's no error"

6248 msgstr "avsluta med noll när det inte uppstått något fel"

6249

6001 -#: builtin/cat-file.c:564

6250 +#: builtin/cat-file.c:566

6251 msgid "pretty-print object's content"

6252 msgstr "visa objektets innehåll snyggt"

6253

6005 -#: builtin/cat-file.c:566

6254 +#: builtin/cat-file.c:568

6255 msgid "for blob objects, run textconv on object's content"

6256 msgstr "för blob-objekt, kör filter på objektets innehåll"

6257

6009 -#: builtin/cat-file.c:568

6258 +#: builtin/cat-file.c:570

6259 msgid "for blob objects, run filters on object's content"

6260 msgstr "för blob-objekt, kör filger på objektets innehåll"

6261

6013 -#: builtin/cat-file.c:569 git-submodule.sh:931

6262 +#: builtin/cat-file.c:571 git-submodule.sh:878

6263 msgid "blob"

6264 msgstr "blob"

6265

6017 -#: builtin/cat-file.c:570

6266 +#: builtin/cat-file.c:572

6267 msgid "use a specific path for --textconv/--filters"

6268 msgstr "använd specifik sökväg för --textconv/--filters"

6269

6021 -#: builtin/cat-file.c:572

6270 +#: builtin/cat-file.c:574

6271 msgid "allow -s and -t to work with broken/corrupt objects"

6272 msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"

6273

6025 -#: builtin/cat-file.c:573

6274 +#: builtin/cat-file.c:575

6275 msgid "buffer --batch output"

6276 msgstr "buffra utdata från --batch"

6277

6029 -#: builtin/cat-file.c:575

6278 +#: builtin/cat-file.c:577

6279 msgid "show info and content of objects fed from the standard input"

6280 msgstr "visa information och innehåll för objekt som listas på standard in"

6281

6033 -#: builtin/cat-file.c:578

6282 +#: builtin/cat-file.c:580

6283 msgid "show info about objects fed from the standard input"

6284 msgstr "visa information för objekt som listas på standard in"

6285

6037 -#: builtin/cat-file.c:581

6286 +#: builtin/cat-file.c:583

6287 msgid "follow in-tree symlinks (used with --batch or --batch-check)"

6288 msgstr ""

6289 "följ symboliska länkar i trädet (använd med --batch eller --batch-check)"

6290

6042 -#: builtin/cat-file.c:583

6291 +#: builtin/cat-file.c:585

6292 msgid "show all objects with --batch or --batch-check"

6293 msgstr "visa alla objekt med --batch eller --batch-check"

6294

@@ -6059,7 +6308,7 @@ msgstr "visa alla attribut som satts på filen"

6308 msgid "use .gitattributes only from the index"

6309 msgstr "använd .gitattributes endast från indexet"

6310

6062 -#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99

6311 +#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100

6312 msgid "read file names from stdin"

6313 msgstr "läs filnamn från standard in"

6314

@@ -6067,7 +6316,7 @@ msgstr "läs filnamn från standard in"

6316 msgid "terminate input and output records by a NUL character"

6317 msgstr "avsluta in- och utdataposter med NUL-tecken"

6318

6070 -#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358

6319 +#: builtin/check-ignore.c:20 builtin/checkout.c:1106 builtin/gc.c:358

6320 msgid "suppress progress reporting"

6321 msgstr "undertryck förloppsrapportering"

6322

@@ -6079,27 +6328,27 @@ msgstr "visa indatasökvägar som inte träffas"

6328 msgid "ignore index when checking"

6329 msgstr "ignorera index vid kontroll"

6330

6082 -#: builtin/check-ignore.c:158

6331 +#: builtin/check-ignore.c:159

6332 msgid "cannot specify pathnames with --stdin"

6333 msgstr "kan inte ange sökvägsnamn med --stdin"

6334

6086 -#: builtin/check-ignore.c:161

6335 +#: builtin/check-ignore.c:162

6336 msgid "-z only makes sense with --stdin"

6337 msgstr "-z kan endast användas tillsammans med --stdin"

6338

6090 -#: builtin/check-ignore.c:163

6339 +#: builtin/check-ignore.c:164

6340 msgid "no path specified"

6341 msgstr "ingen sökväg angavs"

6342

6094 -#: builtin/check-ignore.c:167

6343 +#: builtin/check-ignore.c:168

6344 msgid "--quiet is only valid with a single pathname"

6345 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"

6346

6098 -#: builtin/check-ignore.c:169

6347 +#: builtin/check-ignore.c:170

6348 msgid "cannot have both --quiet and --verbose"

6349 msgstr "kan inte använda både --quiet och --verbose"

6350

6102 -#: builtin/check-ignore.c:172

6351 +#: builtin/check-ignore.c:173

6352 msgid "--non-matching is only valid with --verbose"

6353 msgstr "--non-matching är endast giltig med --verbose"

6354

@@ -6157,9 +6406,9 @@ msgid "write the content to temporary files"

6406 msgstr "skriv innehåll till temporära filer"

6407

6408 #: builtin/checkout-index.c:173 builtin/column.c:31

6160 -#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869

6161 -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237

6162 -#: builtin/worktree.c:552

6409 +#: builtin/submodule--helper.c:1203 builtin/submodule--helper.c:1206

6410 +#: builtin/submodule--helper.c:1212 builtin/submodule--helper.c:1574

6411 +#: builtin/worktree.c:570

6412 msgid "string"

6413 msgstr "sträng"

6414

@@ -6204,80 +6453,80 @@ msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"

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

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

6455

6207 -#: builtin/checkout.c:232

6456 +#: builtin/checkout.c:231

6457 #, c-format

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

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

6460

6212 -#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260

6213 -#: builtin/checkout.c:263

6461 +#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259

6462 +#: builtin/checkout.c:262

6463 #, c-format

6464 msgid "'%s' cannot be used with updating paths"

6465 msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar"

6466

6218 -#: builtin/checkout.c:266 builtin/checkout.c:269

6467 +#: builtin/checkout.c:265 builtin/checkout.c:268

6468 #, c-format

6469 msgid "'%s' cannot be used with %s"

6470 msgstr "\"%s\" kan inte användas med %s"

6471

6223 -#: builtin/checkout.c:272

6472 +#: builtin/checkout.c:271

6473 #, c-format

6474 msgid "Cannot update paths and switch to branch '%s' at the same time."

6475 msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."

6476

6228 -#: builtin/checkout.c:341 builtin/checkout.c:348

6477 +#: builtin/checkout.c:340 builtin/checkout.c:347

6478 #, c-format

6479 msgid "path '%s' is unmerged"

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

6481

6233 -#: builtin/checkout.c:506

6482 +#: builtin/checkout.c:505

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

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

6485

6237 -#: builtin/checkout.c:637

6486 +#: builtin/checkout.c:636

6487 #, c-format

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

6489 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"

6490

6242 -#: builtin/checkout.c:678

6491 +#: builtin/checkout.c:677

6492 msgid "HEAD is now at"

6493 msgstr "HEAD är nu på"

6494

6246 -#: builtin/checkout.c:682 builtin/clone.c:684

6495 +#: builtin/checkout.c:681 builtin/clone.c:689

6496 msgid "unable to update HEAD"

6497 msgstr "kan inte uppdatera HEAD"

6498

6250 -#: builtin/checkout.c:686

6499 +#: builtin/checkout.c:685

6500 #, c-format

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

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

6503

6255 -#: builtin/checkout.c:689

6504 +#: builtin/checkout.c:688

6505 #, c-format

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

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

6508

6260 -#: builtin/checkout.c:693

6509 +#: builtin/checkout.c:692

6510 #, c-format

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

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

6513

6265 -#: builtin/checkout.c:695 builtin/checkout.c:1051

6514 +#: builtin/checkout.c:694 builtin/checkout.c:1039

6515 #, c-format

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

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

6518

6270 -#: builtin/checkout.c:697

6519 +#: builtin/checkout.c:696

6520 #, c-format

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

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

6523

6275 -#: builtin/checkout.c:748

6524 +#: builtin/checkout.c:747

6525 #, c-format

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

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

6528

6280 -#: builtin/checkout.c:754

6529 +#: builtin/checkout.c:753

6530 #, c-format

6531 msgid ""

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

@@ -6300,7 +6549,7 @@ msgstr[1] ""

6549 "\n"

6550 "%s\n"

6551

6303 -#: builtin/checkout.c:773

6552 +#: builtin/checkout.c:772

6553 #, c-format

6554 msgid ""

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

@@ -6327,161 +6576,161 @@ msgstr[1] ""

6576 " git branch <nytt_grennamn> %s\n"

6577 "\n"

6578

6330 -#: builtin/checkout.c:814

6579 +#: builtin/checkout.c:804

6580 msgid "internal error in revision walk"

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

6582

6334 -#: builtin/checkout.c:818

6583 +#: builtin/checkout.c:808

6584 msgid "Previous HEAD position was"

6585 msgstr "Tidigare position för HEAD var"

6586

6338 -#: builtin/checkout.c:848 builtin/checkout.c:1046

6587 +#: builtin/checkout.c:836 builtin/checkout.c:1034

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

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

6590

6342 -#: builtin/checkout.c:952

6591 +#: builtin/checkout.c:940

6592 #, c-format

6593 msgid "only one reference expected, %d given."

6594 msgstr "endast en referens förväntades, %d gavs."

6595

6347 -#: builtin/checkout.c:992 builtin/worktree.c:247

6596 +#: builtin/checkout.c:980 builtin/worktree.c:249

6597 #, c-format

6598 msgid "invalid reference: %s"

6599 msgstr "felaktig referens: %s"

6600

6352 -#: builtin/checkout.c:1021

6601 +#: builtin/checkout.c:1009

6602 #, c-format

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

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

6605

6357 -#: builtin/checkout.c:1060

6606 +#: builtin/checkout.c:1048

6607 msgid "paths cannot be used with switching branches"

6608 msgstr "sökvägar kan inte användas vid byte av gren"

6609

6361 -#: builtin/checkout.c:1063 builtin/checkout.c:1067

6610 +#: builtin/checkout.c:1051 builtin/checkout.c:1055

6611 #, c-format

6612 msgid "'%s' cannot be used with switching branches"

6613 msgstr "\"%s\" kan inte användas vid byte av gren"

6614

6366 -#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079

6367 -#: builtin/checkout.c:1082

6615 +#: builtin/checkout.c:1059 builtin/checkout.c:1062 builtin/checkout.c:1067

6616 +#: builtin/checkout.c:1070

6617 #, c-format

6618 msgid "'%s' cannot be used with '%s'"

6619 msgstr "\"%s\" kan inte användas med \"%s\""

6620

6372 -#: builtin/checkout.c:1087

6621 +#: builtin/checkout.c:1075

6622 #, c-format

6623 msgid "Cannot switch branch to a non-commit '%s'"

6624 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""

6625

6377 -#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114

6378 -#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369

6379 -#: builtin/worktree.c:371

6626 +#: builtin/checkout.c:1107 builtin/checkout.c:1109 builtin/clone.c:116

6627 +#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:387

6628 +#: builtin/worktree.c:389

6629 msgid "branch"

6630 msgstr "gren"

6631

6383 -#: builtin/checkout.c:1120

6632 +#: builtin/checkout.c:1108

6633 msgid "create and checkout a new branch"

6634 msgstr "skapa och checka ut en ny gren"

6635

6387 -#: builtin/checkout.c:1122

6636 +#: builtin/checkout.c:1110

6637 msgid "create/reset and checkout a branch"

6638 msgstr "skapa/nollställ och checka ut en gren"

6639

6391 -#: builtin/checkout.c:1123

6640 +#: builtin/checkout.c:1111

6641 msgid "create reflog for new branch"

6642 msgstr "skapa reflogg för ny gren"

6643

6395 -#: builtin/checkout.c:1124 builtin/worktree.c:373

6644 +#: builtin/checkout.c:1112 builtin/worktree.c:391

6645 msgid "detach HEAD at named commit"

6646 msgstr "koppla från HEAD vid namngiven incheckning"

6647

6399 -#: builtin/checkout.c:1125

6648 +#: builtin/checkout.c:1113

6649 msgid "set upstream info for new branch"

6650 msgstr "sätt uppströmsinformation för ny gren"

6651

6403 -#: builtin/checkout.c:1127

6652 +#: builtin/checkout.c:1115

6653 msgid "new-branch"

6654 msgstr "ny-gren"

6655

6407 -#: builtin/checkout.c:1127

6656 +#: builtin/checkout.c:1115

6657 msgid "new unparented branch"

6658 msgstr "ny gren utan förälder"

6659

6411 -#: builtin/checkout.c:1128

6660 +#: builtin/checkout.c:1116

6661 msgid "checkout our version for unmerged files"

6662 msgstr "checka ut vår version för ej sammanslagna filer"

6663

6415 -#: builtin/checkout.c:1130

6664 +#: builtin/checkout.c:1118

6665 msgid "checkout their version for unmerged files"

6666 msgstr "checka ut deras version för ej sammanslagna filer"

6667

6419 -#: builtin/checkout.c:1132

6668 +#: builtin/checkout.c:1120

6669 msgid "force checkout (throw away local modifications)"

6670 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"

6671

6423 -#: builtin/checkout.c:1133

6672 +#: builtin/checkout.c:1122

6673 msgid "perform a 3-way merge with the new branch"

6674 msgstr "utför en 3-vägssammanslagning för den nya grenen"

6675

6427 -#: builtin/checkout.c:1134 builtin/merge.c:238

6676 +#: builtin/checkout.c:1124 builtin/merge.c:239

6677 msgid "update ignored files (default)"

6678 msgstr "uppdatera ignorerade filer (standard)"

6679

6431 -#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251

6680 +#: builtin/checkout.c:1126 builtin/log.c:1499 parse-options.h:263

6681 msgid "style"

6682 msgstr "stil"

6683

6435 -#: builtin/checkout.c:1136

6684 +#: builtin/checkout.c:1127

6685 msgid "conflict style (merge or diff3)"

6686 msgstr "konfliktstil (merge eller diff3)"

6687

6439 -#: builtin/checkout.c:1139

6688 +#: builtin/checkout.c:1130

6689 msgid "do not limit pathspecs to sparse entries only"

6690 msgstr "begränsa inte sökvägar till endast glesa poster"

6691

6443 -#: builtin/checkout.c:1141

6692 +#: builtin/checkout.c:1132

6693 msgid "second guess 'git checkout <no-such-branch>'"

6694 msgstr "förutspå \"git checkout <gren-saknas>\""

6695

6447 -#: builtin/checkout.c:1143

6696 +#: builtin/checkout.c:1134

6697 msgid "do not check if another worktree is holding the given ref"

6698 msgstr ""

6699 "kontrollera inte om en annan arbetskatalog håller den angivna referensen"

6700

6452 -#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137

6453 -#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556

6701 +#: builtin/checkout.c:1138 builtin/clone.c:83 builtin/fetch.c:150

6702 +#: builtin/merge.c:236 builtin/pull.c:123 builtin/push.c:556

6703 #: builtin/send-pack.c:173

6704 msgid "force progress reporting"

6705 msgstr "tvinga förloppsrapportering"

6706

6458 -#: builtin/checkout.c:1177

6707 +#: builtin/checkout.c:1168

6708 msgid "-b, -B and --orphan are mutually exclusive"

6709 msgstr "-b, -B och --orphan är ömsesidigt uteslutande"

6710

6462 -#: builtin/checkout.c:1194

6711 +#: builtin/checkout.c:1185

6712 msgid "--track needs a branch name"

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

6714

6466 -#: builtin/checkout.c:1199

6715 +#: builtin/checkout.c:1190

6716 msgid "Missing branch name; try -b"

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

6718

6470 -#: builtin/checkout.c:1235

6719 +#: builtin/checkout.c:1226

6720 msgid "invalid path specification"

6721 msgstr "felaktig sökvägsangivelse"

6722

6474 -#: builtin/checkout.c:1242

6723 +#: builtin/checkout.c:1233

6724 #, c-format

6725 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"

6726 msgstr "”%s” är inte en incheckning och grenen ”%s” kan inte skapas från den"

6727

6479 -#: builtin/checkout.c:1246

6728 +#: builtin/checkout.c:1237

6729 #, c-format

6730 msgid "git checkout: --detach does not take a path argument '%s'"

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

6732

6484 -#: builtin/checkout.c:1250

6733 +#: builtin/checkout.c:1241

6734 msgid ""

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

6736 "checking out of the index."

@@ -6581,7 +6830,7 @@ msgstr "Välj poster att ta bort"

6830 msgid "Remove %s [y/N]? "

6831 msgstr "Ta bort %s [Y=ja / N=nej]? "

6832

6584 -#: builtin/clean.c:788 git-add--interactive.perl:1616

6833 +#: builtin/clean.c:788 git-add--interactive.perl:1710

6834 #, c-format

6835 msgid "Bye.\n"

6836 msgstr "Hej då.\n"

@@ -6604,11 +6853,11 @@ msgstr ""

6853 "help - denna skärm\n"

6854 "? - hjälp för kommandoval"

6855

6607 -#: builtin/clean.c:823 git-add--interactive.perl:1692

6856 +#: builtin/clean.c:823 git-add--interactive.perl:1786

6857 msgid "*** Commands ***"

6858 msgstr "*** Kommandon ***"

6859

6611 -#: builtin/clean.c:824 git-add--interactive.perl:1689

6860 +#: builtin/clean.c:824 git-add--interactive.perl:1783

6861 msgid "What now"

6862 msgstr "Vad nu"

6863

@@ -6638,8 +6887,8 @@ msgstr "städa interaktivt"

6887 msgid "remove whole directories"

6888 msgstr "ta bort hela kataloger"

6889

6641 -#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532

6642 -#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157

6890 +#: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535

6891 +#: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159

6892 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399

6893 #: builtin/show-ref.c:176

6894 msgid "pattern"

@@ -6677,144 +6926,144 @@ msgstr ""

6926 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "

6927 "angavs; vägrar städa"

6928

6680 -#: builtin/clone.c:39

6929 +#: builtin/clone.c:40

6930 msgid "git clone [<options>] [--] <repo> [<dir>]"

6931 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"

6932

6684 -#: builtin/clone.c:83

6933 +#: builtin/clone.c:85

6934 msgid "don't create a checkout"

6935 msgstr "skapa inte någon utcheckning"

6936

6688 -#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479

6937 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/init-db.c:479

6938 msgid "create a bare repository"

6939 msgstr "skapa ett naket (\"bare\") arkiv"

6940

6692 -#: builtin/clone.c:88

6941 +#: builtin/clone.c:90

6942 msgid "create a mirror repository (implies bare)"

6943 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"

6944

6696 -#: builtin/clone.c:90

6945 +#: builtin/clone.c:92

6946 msgid "to clone from a local repository"

6947 msgstr "för att klona från ett lokalt arkiv"

6948

6700 -#: builtin/clone.c:92

6949 +#: builtin/clone.c:94

6950 msgid "don't use local hardlinks, always copy"

6951 msgstr "skapa inte lokala hårda länkar, kopiera alltid"

6952

6704 -#: builtin/clone.c:94

6953 +#: builtin/clone.c:96

6954 msgid "setup as shared repository"

6955 msgstr "skapa som ett delat arkiv"

6956

6708 -#: builtin/clone.c:96 builtin/clone.c:100

6957 +#: builtin/clone.c:98 builtin/clone.c:102

6958 msgid "pathspec"

6959 msgstr "sökvägsangivelse"

6960

6712 -#: builtin/clone.c:96 builtin/clone.c:100

6961 +#: builtin/clone.c:98 builtin/clone.c:102

6962 msgid "initialize submodules in the clone"

6963 msgstr "initiera undermoduler i klonen"

6964

6716 -#: builtin/clone.c:103

6965 +#: builtin/clone.c:105

6966 msgid "number of submodules cloned in parallel"

6967 msgstr "antal undermoduler som klonas parallellt"

6968

6720 -#: builtin/clone.c:104 builtin/init-db.c:476

6969 +#: builtin/clone.c:106 builtin/init-db.c:476

6970 msgid "template-directory"

6971 msgstr "mallkatalog"

6972

6724 -#: builtin/clone.c:105 builtin/init-db.c:477

6973 +#: builtin/clone.c:107 builtin/init-db.c:477

6974 msgid "directory from which templates will be used"

6975 msgstr "katalog att använda mallar från"

6976

6728 -#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873

6729 -#: builtin/submodule--helper.c:1240

6977 +#: builtin/clone.c:109 builtin/clone.c:111 builtin/submodule--helper.c:1210

6978 +#: builtin/submodule--helper.c:1577

6979 msgid "reference repository"

6980 msgstr "referensarkiv"

6981

6733 -#: builtin/clone.c:111

6982 +#: builtin/clone.c:113

6983 msgid "use --reference only while cloning"

6984 msgstr "använd --reference endast under kloningen"

6985

6737 -#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44

6986 +#: builtin/clone.c:114 builtin/column.c:27 builtin/merge-file.c:44

6987 msgid "name"

6988 msgstr "namn"

6989

6741 -#: builtin/clone.c:113

6990 +#: builtin/clone.c:115

6991 msgid "use <name> instead of 'origin' to track upstream"

6992 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"

6993

6745 -#: builtin/clone.c:115

6994 +#: builtin/clone.c:117

6995 msgid "checkout <branch> instead of the remote's HEAD"

6996 msgstr "checka ut <gren> istället för fjärrens HEAD"

6997

6749 -#: builtin/clone.c:117

6998 +#: builtin/clone.c:119

6999 msgid "path to git-upload-pack on the remote"

7000 msgstr "sökväg till git-upload-pack på fjärren"

7001

6753 -#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806

7002 +#: builtin/clone.c:120 builtin/fetch.c:151 builtin/grep.c:813

7003 #: builtin/pull.c:211

7004 msgid "depth"

7005 msgstr "djup"

7006

6758 -#: builtin/clone.c:119

7007 +#: builtin/clone.c:121

7008 msgid "create a shallow clone of that depth"

7009 msgstr "skapa en grund klon på detta djup"

7010

6762 -#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991

6763 -#: parse-options.h:142

7011 +#: builtin/clone.c:122 builtin/fetch.c:153 builtin/pack-objects.c:3017

7012 +#: parse-options.h:154

7013 msgid "time"

7014 msgstr "tid"

7015

6767 -#: builtin/clone.c:121

7016 +#: builtin/clone.c:123

7017 msgid "create a shallow clone since a specific time"

7018 msgstr "skapa en grund klon från en angiven tidpunkt"

7019

6771 -#: builtin/clone.c:122 builtin/fetch.c:142

7020 +#: builtin/clone.c:124 builtin/fetch.c:155

7021 msgid "revision"

7022 msgstr "revision"

7023

6775 -#: builtin/clone.c:123 builtin/fetch.c:143

7024 +#: builtin/clone.c:125 builtin/fetch.c:156

7025 msgid "deepen history of shallow clone, excluding rev"

7026 msgstr "fördjupa historik för grund klon, exkludera revisionen"

7027

6779 -#: builtin/clone.c:125

7028 +#: builtin/clone.c:127

7029 msgid "clone only one branch, HEAD or --branch"

7030 msgstr "klona endast en gren, HEAD eller --branch"

7031

6783 -#: builtin/clone.c:127

7032 +#: builtin/clone.c:129

7033 msgid "don't clone any tags, and make later fetches not to follow them"

7034 msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"

7035

6787 -#: builtin/clone.c:129

7036 +#: builtin/clone.c:131

7037 msgid "any cloned submodules will be shallow"

7038 msgstr "klonade undermoduler kommer vara grunda"

7039

6791 -#: builtin/clone.c:130 builtin/init-db.c:485

7040 +#: builtin/clone.c:132 builtin/init-db.c:485

7041 msgid "gitdir"

7042 msgstr "gitkat"

7043

6795 -#: builtin/clone.c:131 builtin/init-db.c:486

7044 +#: builtin/clone.c:133 builtin/init-db.c:486

7045 msgid "separate git dir from working tree"

7046 msgstr "separera gitkatalogen från arbetskatalogen"

7047

6799 -#: builtin/clone.c:132

7048 +#: builtin/clone.c:134

7049 msgid "key=value"

7050 msgstr "nyckel=värde"

7051

6803 -#: builtin/clone.c:133

7052 +#: builtin/clone.c:135

7053 msgid "set config inside the new repository"

7054 msgstr "ställ in konfiguration i det nya arkivet"

7055

6807 -#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224

7056 +#: builtin/clone.c:136 builtin/fetch.c:173 builtin/pull.c:224

7057 #: builtin/push.c:567

7058 msgid "use IPv4 addresses only"

7059 msgstr "använd endast IPv4-adresser"

7060

6812 -#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227

7061 +#: builtin/clone.c:138 builtin/fetch.c:175 builtin/pull.c:227

7062 #: builtin/push.c:569

7063 msgid "use IPv6 addresses only"

7064 msgstr "använd endast IPv6-adresser"

7065

6817 -#: builtin/clone.c:273

7066 +#: builtin/clone.c:276

7067 msgid ""

7068 "No directory name could be guessed.\n"

7069 "Please specify a directory on the command line"

@@ -6822,42 +7071,42 @@ msgstr ""

7071 "Kunde inte gissa katalognamn.\n"

7072 "Ange en katalog på kommandoraden"

7073

6825 -#: builtin/clone.c:326

7074 +#: builtin/clone.c:329

7075 #, c-format

7076 msgid "info: Could not add alternate for '%s': %s\n"

7077 msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"

7078

6830 -#: builtin/clone.c:398

7079 +#: builtin/clone.c:401

7080 #, c-format

7081 msgid "failed to open '%s'"

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

7083

6835 -#: builtin/clone.c:406

7084 +#: builtin/clone.c:409

7085 #, c-format

7086 msgid "%s exists and is not a directory"

7087 msgstr "%s finns och är ingen katalog"

7088

6840 -#: builtin/clone.c:420

7089 +#: builtin/clone.c:423

7090 #, c-format

7091 msgid "failed to stat %s\n"

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

7093

6845 -#: builtin/clone.c:442

7094 +#: builtin/clone.c:445

7095 #, c-format

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

7097 msgstr "misslyckades skapa länken \"%s\""

7098

6850 -#: builtin/clone.c:446

7099 +#: builtin/clone.c:449

7100 #, c-format

7101 msgid "failed to copy file to '%s'"

7102 msgstr "misslyckades kopiera filen till \"%s\""

7103

6855 -#: builtin/clone.c:472

7104 +#: builtin/clone.c:475

7105 #, c-format

7106 msgid "done.\n"

7107 msgstr "klart.\n"

7108

6860 -#: builtin/clone.c:484

7109 +#: builtin/clone.c:489

7110 msgid ""

7111 "Clone succeeded, but checkout failed.\n"

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