cdd9311290 · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

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

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

10 +"POT-Creation-Date: 2018-05-31 23:32+0800\n"

11 +"PO-Revision-Date: 2018-06-01 14:44+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"

@@ -18,47 +18,47 @@ msgstr ""

18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

19 "X-Generator: Gtranslator 2.91.7\n"

20

21 -#: advice.c:62

21 +#: advice.c:92

22 #, c-format

23 -msgid "hint: %.*s\n"

24 -msgstr "tips: %.*s\n"

23 +msgid "%shint: %.*s%s\n"

24 +msgstr "%stips: %.*s%s\n"

25

26 -#: advice.c:90

26 +#: advice.c:137

27 msgid "Cherry-picking is not possible because you have unmerged files."

28 msgstr ""

29 "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "

30 "samman."

31

32 -#: advice.c:92

32 +#: advice.c:139

33 msgid "Committing is not possible because you have unmerged files."

34 msgstr ""

35 "Du kan inte utföra en incheckning eftersom du har filer som inte slagits "

36 "samman."

37

38 -#: advice.c:94

38 +#: advice.c:141

39 msgid "Merging is not possible because you have unmerged files."

40 msgstr ""

41 "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "

42 "samman."

43

44 -#: advice.c:96

44 +#: advice.c:143

45 msgid "Pulling is not possible because you have unmerged files."

46 msgstr ""

47 "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."

48

49 -#: advice.c:98

49 +#: advice.c:145

50 msgid "Reverting is not possible because you have unmerged files."

51 msgstr ""

52 "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "

53 "samman."

54

55 -#: advice.c:100

55 +#: advice.c:147

56 #, c-format

57 msgid "It is not possible to %s because you have unmerged files."

58 msgstr ""

59 "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."

60

61 -#: advice.c:108

61 +#: advice.c:155

62 msgid ""

63 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"

64 "as appropriate to mark resolution and make a commit."

@@ -66,23 +66,23 @@ msgstr ""

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

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

68

69 -#: advice.c:116

69 +#: advice.c:163

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:1251

73 +#: advice.c:168 builtin/merge.c:1249

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

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

76

77 -#: advice.c:123

77 +#: advice.c:170

78 msgid "Please, commit your changes before merging."

79 msgstr "Checka in dina ändringar innan du utför sammanslagningen."

80

81 -#: advice.c:124

81 +#: advice.c:171

82 msgid "Exiting because of unfinished merge."

83 msgstr "Avslutar på grund av ofullbordad sammanslagning."

84

85 -#: advice.c:130

85 +#: advice.c:177

86 #, c-format

87 msgid ""

88 "Note: checking out '%s'.\n"

@@ -352,7 +352,7 @@ msgstr "patch misslyckades: %s:%ld"

352 msgid "cannot checkout %s"

353 msgstr "kan inte checka ut %s"

354

355 -#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277

355 +#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278

356 #, c-format

357 msgid "failed to read %s"

358 msgstr "misslyckades läsa %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:775 builtin/fetch.c:1025

556 +#: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036

557 #, c-format

558 msgid "cannot open %s"

559 msgstr "kan inte öppna %s"

@@ -607,15 +607,15 @@ msgid_plural "%d lines applied after fixing whitespace errors."

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

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

609

610 -#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390

610 +#: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389

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: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

615 +#: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198

616 +#: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210

617 +#: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584

618 +#: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807

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

620 msgid "path"

621 msgstr "sökväg"

@@ -690,7 +690,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika"

690

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:3035

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

694 msgid "action"

695 msgstr "åtgärd"

696

@@ -718,9 +718,9 @@ msgstr "lämna refuserade stycken i motsvarande *.rej-filer"

718 msgid "allow overlapping hunks"

719 msgstr "tillåt överlappande stycken"

720

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

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

722 +#: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666

723 +#: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124

724 msgid "be verbose"

725 msgstr "var pratsam"

726

@@ -759,7 +759,7 @@ msgstr ""

759 msgid "git archive --remote <repo> [--exec <cmd>] --list"

760 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

761

762 -#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299

762 +#: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298

763 #, c-format

764 msgid "pathspec '%s' did not match any files"

765 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"

@@ -780,10 +780,10 @@ 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:702 builtin/blame.c:703 builtin/config.c:62

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

783 +#: archive.c:439 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127

784 +#: builtin/fast-export.c:1007 builtin/fast-export.c:1009 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

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

787 #: parse-options.h:165

788 msgid "file"

789 msgstr "fil"

@@ -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:108 builtin/clone.c:111

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

819 +#: archive.c:458 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113

820 +#: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593

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:460

871 +#: bisect.c:461

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:668

876 +#: bisect.c:669

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:722

881 +#: bisect.c:723

882 #, c-format

883 msgid "Not a valid commit name %s"

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

885

886 -#: bisect.c:746

886 +#: bisect.c:747

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:751

895 +#: bisect.c:752

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:756

904 +#: bisect.c:757

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:764

913 +#: bisect.c:765

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:777

924 +#: bisect.c:778

925 #, c-format

926 msgid ""

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

@@ -933,36 +933,36 @@ msgstr ""

933 "%s.\n"

934 "Vi fortsätter ändå."

935

936 -#: bisect.c:810

936 +#: bisect.c:811

937 #, c-format

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

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

940

941 -#: bisect.c:850

941 +#: bisect.c:851

942 #, c-format

943 msgid "a %s revision is needed"

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

945

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

946 +#: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236

947 #, c-format

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

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

950

951 -#: bisect.c:920

951 +#: bisect.c:921

952 #, c-format

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

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

955

956 -#: bisect.c:950

956 +#: bisect.c:951

957 msgid "reading bisect refs failed"

958 msgstr "misslyckades läsa bisect-referenser"

959

960 -#: bisect.c:969

960 +#: bisect.c:970

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:977

965 +#: bisect.c:978

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:996

974 +#: bisect.c:997

975 #, c-format

976 msgid "(roughly %d step)"

977 msgid_plural "(roughly %d steps)"

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

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

982 #. steps)" translation.

983 #.

984 -#: bisect.c:1002

984 +#: bisect.c:1003

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:1758

991 +#: blame.c:1756

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

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

994

995 -#: blame.c:1769

995 +#: blame.c:1767

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:1789

999 +#: blame.c:1787

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: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

1005 +#: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1860

1006 +#: sequencer.c:3631 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920

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

1008 +#: builtin/shortlog.c:192

1009 msgid "revision walk setup failed"

1010 msgstr "misslyckades skapa revisionstraversering"

1011

1012 -#: blame.c:1816

1012 +#: blame.c:1814

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:1827

1019 +#: blame.c:1825

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:1838

1024 +#: blame.c:1836

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"

1028

1029 -#: branch.c:53

1029 +#: branch.c:54

1030 #, c-format

1031 msgid ""

1032 "\n"

@@ -1039,92 +1039,92 @@ msgstr ""

1039 "fjärrspårningsinformationen genom att utföra\n"

1040 "\"git branch --set-upstream-to=%s%s%s\"."

1041

1042 -#: branch.c:67

1042 +#: branch.c:68

1043 #, c-format

1044 msgid "Not setting branch %s as its own upstream."

1045 msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."

1046

1047 -#: branch.c:93

1047 +#: branch.c:94

1048 #, c-format

1049 msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."

1050 msgstr ""

1051 "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "

1052 "ombasering."

1053

1054 -#: branch.c:94

1054 +#: branch.c:95

1055 #, c-format

1056 msgid "Branch '%s' set up to track remote branch '%s' from '%s'."

1057 msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."

1058

1059 -#: branch.c:98

1059 +#: branch.c:99

1060 #, c-format

1061 msgid "Branch '%s' set up to track local branch '%s' by rebasing."

1062 msgstr ""

1063 "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "

1064 "ombasering."

1065

1066 -#: branch.c:99

1066 +#: branch.c:100

1067 #, c-format

1068 msgid "Branch '%s' set up to track local branch '%s'."

1069 msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."

1070

1071 -#: branch.c:104

1071 +#: branch.c:105

1072 #, c-format

1073 msgid "Branch '%s' set up to track remote ref '%s' by rebasing."

1074 msgstr ""

1075 "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."

1076

1077 -#: branch.c:105

1077 +#: branch.c:106

1078 #, c-format

1079 msgid "Branch '%s' set up to track remote ref '%s'."

1080 msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."

1081

1082 -#: branch.c:109

1082 +#: branch.c:110

1083 #, c-format

1084 msgid "Branch '%s' set up to track local ref '%s' by rebasing."

1085 msgstr ""

1086 "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "

1087 "ombasering."

1088

1089 -#: branch.c:110

1089 +#: branch.c:111

1090 #, c-format

1091 msgid "Branch '%s' set up to track local ref '%s'."

1092 msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."

1093

1094 -#: branch.c:119

1094 +#: branch.c:120

1095 msgid "Unable to write upstream branch configuration"

1096 msgstr "Kan inte skriva inställningar för uppströmsgren"

1097

1098 -#: branch.c:156

1098 +#: branch.c:157

1099 #, c-format

1100 msgid "Not tracking: ambiguous information for ref %s"

1101 msgstr "Spårar inte: tvetydig information för referensen %s"

1102

1103 -#: branch.c:189

1103 +#: branch.c:190

1104 #, c-format

1105 msgid "'%s' is not a valid branch name."

1106 msgstr "\"%s\" är inte ett giltigt grennamn."

1107

1108 -#: branch.c:208

1108 +#: branch.c:209

1109 #, c-format

1110 msgid "A branch named '%s' already exists."

1111 msgstr "Det finns redan en gren som heter ”%s”."

1112

1113 -#: branch.c:213

1113 +#: branch.c:214

1114 msgid "Cannot force update the current branch."

1115 msgstr "Kan inte tvinga uppdatering av aktuell gren."

1116

1117 -#: branch.c:233

1117 +#: branch.c:234

1118 #, c-format

1119 msgid "Cannot setup tracking information; starting point '%s' is not a branch."

1120 msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."

1121

1122 -#: branch.c:235

1122 +#: branch.c:236

1123 #, c-format

1124 msgid "the requested upstream branch '%s' does not exist"

1125 msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"

1126

1127 -#: branch.c:237

1127 +#: branch.c:238

1128 msgid ""

1129 "\n"

1130 "If you are planning on basing your work on an upstream\n"

@@ -1144,27 +1144,27 @@ msgstr ""

1144 "spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"

1145 "för att ställa in uppströmskonfigurationen när du sänder in."

1146

1147 -#: branch.c:280

1147 +#: branch.c:281

1148 #, c-format

1149 msgid "Not a valid object name: '%s'."

1150 msgstr "Objektnamnet är inte giltigt: \"%s\"."

1151

1152 -#: branch.c:300

1152 +#: branch.c:301

1153 #, c-format

1154 msgid "Ambiguous object name: '%s'."

1155 msgstr "Objektnamnet är tvetydigt: \"%s\"."

1156

1157 -#: branch.c:305

1157 +#: branch.c:306

1158 #, c-format

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

1160 msgstr "Avgreningspunkten är inte giltig: ”%s”."

1161

1162 -#: branch.c:359

1162 +#: branch.c:360

1163 #, c-format

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

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

1166

1167 -#: branch.c:382

1167 +#: branch.c:383

1168 #, c-format

1169 msgid "HEAD of working tree %s is not updated"

1170 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

@@ -1179,7 +1179,7 @@ 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:1879 sequencer.c:2337 builtin/commit.c:750

1182 +#: bundle.c:88 sequencer.c:2080 sequencer.c:2557 builtin/commit.c:755

1183 #, c-format

1184 msgid "could not open '%s'"

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

@@ -1223,7 +1223,7 @@ msgstr "rev-list dog"

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

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

1225

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

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

1227 #, c-format

1228 msgid "unrecognized argument: %s"

1229 msgstr "okänt argument: %s"

@@ -1246,18 +1246,39 @@ msgstr "index-pack dog"

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

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

1248

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

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

1249 +#: commit.c:43 sequencer.c:2363 builtin/am.c:421 builtin/am.c:465

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

1251 +#: builtin/replace.c:448

1252 #, c-format

1253 msgid "could not parse %s"

1254 msgstr "kunde inte tolka %s"

1255

1255 -#: commit.c:43

1256 +#: commit.c:45

1257 #, c-format

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

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

1260

1260 -#: commit.c:1506

1261 +#: commit.c:182

1262 +msgid ""

1263 +"Support for <GIT_DIR>/info/grafts is deprecated\n"

1264 +"and will be removed in a future Git version.\n"

1265 +"\n"

1266 +"Please use \"git replace --convert-graft-file\"\n"

1267 +"to convert the grafts into replace refs.\n"

1268 +"\n"

1269 +"Turn this message off by running\n"

1270 +"\"git config advice.graftFileDeprecated false\""

1271 +msgstr ""

1272 +"Stöd för <GIT_DIR>/info/grafts avråds från och\n"

1273 +"kommer tas bort i en framtida version av Git.\n"

1274 +"\n"

1275 +"Använd \"git replace --convert-graft-file\"\n"

1276 +"för att omvandla grafts till ersättningsreferenser.\n"

1277 +"\n"

1278 +"Slå av detta meddelande genom att skriva\n"

1279 +"\"git config advice.graftFileDeprecated false\""

1280 +

1281 +#: commit.c:1537

1282 msgid ""

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

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

@@ -1267,178 +1288,192 @@ msgstr ""

1288 "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"

1289 "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"

1290

1291 +#: commit-graph.c:669

1292 +#, c-format

1293 +msgid "the commit graph format cannot write %d commits"

1294 +msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"

1295 +

1296 +#: commit-graph.c:696

1297 +msgid "too many commits to write graph"

1298 +msgstr "för många incheckningar för att skriva graf"

1299 +

1300 +#: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521

1301 +#, c-format

1302 +msgid "cannot mkdir %s"

1303 +msgstr "kan inte skapa katalogen (mkdir) %s"

1304 +

1305 #: compat/obstack.c:405 compat/obstack.c:407

1306 msgid "memory exhausted"

1307 msgstr "minnet slut"

1308

1274 -#: config.c:186

1309 +#: config.c:187

1310 msgid "relative config include conditionals must come from files"

1311 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"

1312

1278 -#: config.c:720

1313 +#: config.c:788

1314 #, c-format

1315 msgid "bad config line %d in blob %s"

1316 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"

1317

1283 -#: config.c:724

1318 +#: config.c:792

1319 #, c-format

1320 msgid "bad config line %d in file %s"

1321 msgstr "felaktig konfigurationsfil rad %d i filen %s"

1322

1288 -#: config.c:728

1323 +#: config.c:796

1324 #, c-format

1325 msgid "bad config line %d in standard input"

1326 msgstr "felaktig konfigurationsfil rad %d i standard in"

1327

1293 -#: config.c:732

1328 +#: config.c:800

1329 #, c-format

1330 msgid "bad config line %d in submodule-blob %s"

1331 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"

1332

1298 -#: config.c:736

1333 +#: config.c:804

1334 #, c-format

1335 msgid "bad config line %d in command line %s"

1336 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"

1337

1303 -#: config.c:740

1338 +#: config.c:808

1339 #, c-format

1340 msgid "bad config line %d in %s"

1341 msgstr "felaktig konfigurationsfil rad %d i %s"

1342

1308 -#: config.c:868

1343 +#: config.c:936

1344 msgid "out of range"

1345 msgstr "utanför intervallet"

1346

1312 -#: config.c:868

1347 +#: config.c:936

1348 msgid "invalid unit"

1349 msgstr "ogiltig enhet"

1350

1316 -#: config.c:874

1351 +#: config.c:942

1352 #, c-format

1353 msgid "bad numeric config value '%s' for '%s': %s"

1354 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"

1355

1321 -#: config.c:879

1356 +#: config.c:947

1357 #, c-format

1358 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"

1359 msgstr ""

1360 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"

1361

1327 -#: config.c:882

1362 +#: config.c:950

1363 #, c-format

1364 msgid "bad numeric config value '%s' for '%s' in file %s: %s"

1365 msgstr ""

1366 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"

1367

1333 -#: config.c:885

1368 +#: config.c:953

1369 #, c-format

1370 msgid "bad numeric config value '%s' for '%s' in standard input: %s"

1371 msgstr ""

1372 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"

1373

1339 -#: config.c:888

1374 +#: config.c:956

1375 #, c-format

1376 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"

1377 msgstr ""

1378 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"

1379 "en %s: %s"

1380

1346 -#: config.c:891

1381 +#: config.c:959

1382 #, c-format

1383 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"

1384 msgstr ""

1385 "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "

1386 "%s: %s"

1387

1353 -#: config.c:894

1388 +#: config.c:962

1389 #, c-format

1390 msgid "bad numeric config value '%s' for '%s' in %s: %s"

1391 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"

1392

1358 -#: config.c:989

1393 +#: config.c:1057

1394 #, c-format

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

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

1397

1363 -#: config.c:998

1398 +#: config.c:1066

1399 #, c-format

1400 msgid "'%s' for '%s' is not a valid timestamp"

1401 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"

1402

1368 -#: config.c:1094 config.c:1105

1403 +#: config.c:1171 config.c:1182

1404 #, c-format

1405 msgid "bad zlib compression level %d"

1406 msgstr "felaktigt zlib-komprimeringsgrad %d"

1407

1373 -#: config.c:1225

1408 +#: config.c:1307

1409 #, c-format

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

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

1412

1378 -#: config.c:1386

1413 +#: config.c:1473

1414 #, c-format

1415 msgid "bad pack compression level %d"

1416 msgstr "felaktig paketkomprimeringsgrad %d"

1417

1383 -#: config.c:1582

1418 +#: config.c:1681

1419 msgid "unable to parse command-line config"

1420 msgstr "kan inte tolka kommandoradskonfiguration"

1421

1387 -#: config.c:1914

1422 +#: config.c:2013

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

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

1425

1391 -#: config.c:2101

1426 +#: config.c:2200

1427 #, c-format

1428 msgid "Invalid %s: '%s'"

1429 msgstr "Felaktigt %s: \"%s\""

1430

1396 -#: config.c:2144

1431 +#: config.c:2243

1432 #, c-format

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

1434 msgstr ""

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

1436

1402 -#: config.c:2170

1437 +#: config.c:2269

1438 #, c-format

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

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

1441

1407 -#: config.c:2195

1442 +#: config.c:2294

1443 #, c-format

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

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

1446

1412 -#: config.c:2197

1447 +#: config.c:2296

1448 #, c-format

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

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

1451

1417 -#: config.c:2256

1452 +#: config.c:2402

1453 #, c-format

1454 msgid "%s has multiple values"

1455 msgstr "%s har flera värden"

1456

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

1457 +#: config.c:2766 config.c:3019

1458 #, c-format

1459 msgid "fstat on %s failed"

1460 msgstr "fstat misslyckades på %s"

1461

1427 -#: config.c:2706

1462 +#: config.c:2905

1463 #, c-format

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

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

1466

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

1467 +#: config.c:2907 builtin/remote.c:779

1468 #, c-format

1469 msgid "could not unset '%s'"

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

1471

1437 -#: connect.c:52

1472 +#: connect.c:60

1473 msgid "The remote end hung up upon initial contact"

1474 msgstr "Fjärren lade på vid inledande kontakt"

1475

1441 -#: connect.c:54

1476 +#: connect.c:62

1477 msgid ""

1478 "Could not read from remote repository.\n"

1479 "\n"

@@ -1452,7 +1487,7 @@ msgstr ""

1487

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

1489 # objects in the database.

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

1490 +#: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145

1491 msgid "Checking connectivity"

1492 msgstr "Kontrollerar konnektivitet"

1493

@@ -1468,12 +1503,12 @@ msgstr "kunde inte skriva till rev-list"

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

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

1505

1471 -#: convert.c:205

1506 +#: convert.c:206

1507 #, c-format

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

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

1510

1476 -#: convert.c:207

1511 +#: convert.c:208

1512 #, c-format

1513 msgid ""

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

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

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

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

1519

1485 -#: convert.c:215

1520 +#: convert.c:216

1521 #, c-format

1522 msgid "LF would be replaced by CRLF in %s"

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

1524

1490 -#: convert.c:217

1525 +#: convert.c:218

1526 #, c-format

1527 msgid ""

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

@@ -1496,6 +1531,49 @@ msgstr ""

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

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

1533

1534 +#: convert.c:279

1535 +#, c-format

1536 +msgid "BOM is prohibited in '%s' if encoded as %s"

1537 +msgstr "BOM är förbjudet i \"%s\" om kodat som %s"

1538 +

1539 +#: convert.c:286

1540 +#, c-format

1541 +msgid ""

1542 +"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"

1543 +"tree-encoding."

1544 +msgstr ""

1545 +"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "

1546 +"teckenkodning i arbetskatalogen."

1547 +

1548 +#: convert.c:304

1549 +#, c-format

1550 +msgid "BOM is required in '%s' if encoded as %s"

1551 +msgstr "BOM krävs om \"%s\" kodas som %s"

1552 +

1553 +#: convert.c:306

1554 +#, c-format

1555 +msgid ""

1556 +"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"

1557 +"%sLE (depending on the byte order) as working-tree-encoding."

1558 +msgstr ""

1559 +"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "

1560 +"(beroende på byteordning) som teckenkodning i arbetskatalogen."

1561 +

1562 +#: convert.c:424

1563 +#, c-format

1564 +msgid "failed to encode '%s' from %s to %s"

1565 +msgstr "misslyckades omkoda \"%s\" från %s till %s"

1566 +

1567 +#: convert.c:467

1568 +#, c-format

1569 +msgid "encoding '%s' from %s to %s and back is not the same"

1570 +msgstr ""

1571 +"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"

1572 +

1573 +#: convert.c:1225

1574 +msgid "true/false are no valid working-tree-encodings"

1575 +msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"

1576 +

1577 #: date.c:116

1578 msgid "in the future"

1579 msgstr "i framtiden"

@@ -1610,24 +1688,24 @@ msgstr ""

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

1689 "%s"

1690

1613 -#: diff.c:3822

1691 +#: diff.c:3823

1692 #, c-format

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

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

1695

1618 -#: diff.c:4146

1696 +#: diff.c:4153

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

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

1699

1622 -#: diff.c:4149

1700 +#: diff.c:4156

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

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

1703

1626 -#: diff.c:4237

1704 +#: diff.c:4244

1705 msgid "--follow requires exactly one pathspec"

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

1707

1630 -#: diff.c:4403

1708 +#: diff.c:4410

1709 #, c-format

1710 msgid ""

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

@@ -1636,46 +1714,46 @@ msgstr ""

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

1715 "%s"

1716

1639 -#: diff.c:4417

1717 +#: diff.c:4424

1718 #, c-format

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

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

1721

1644 -#: diff.c:5493

1722 +#: diff.c:5500

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

1724 msgstr ""

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

1726

1649 -#: diff.c:5496

1727 +#: diff.c:5503

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

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

1730

1653 -#: diff.c:5499

1731 +#: diff.c:5506

1732 #, c-format

1733 msgid ""

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

1735 msgstr ""

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

1737

1660 -#: dir.c:1866

1738 +#: dir.c:1867

1739 #, c-format

1740 msgid "could not open directory '%s'"

1741 msgstr "kunde inte öppna katalogen \"%s\""

1742

1665 -#: dir.c:2108

1743 +#: dir.c:2109

1744 msgid "failed to get kernel name and information"

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

1746

1669 -#: dir.c:2232

1747 +#: dir.c:2233

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

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

1750

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

1751 +#: dir.c:3075 dir.c:3080

1752 #, c-format

1753 msgid "could not create directories for %s"

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

1755

1678 -#: dir.c:3054

1756 +#: dir.c:3109

1757 #, c-format

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

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

@@ -1698,201 +1776,205 @@ msgstr "kunde inte ta status på filen \"%s\""

1776 msgid "Remote with no URL"

1777 msgstr "Fjärr utan URL"

1778

1701 -#: fetch-pack.c:253

1779 +#: fetch-pack.c:254

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

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

1782

1705 -#: fetch-pack.c:265

1783 +#: fetch-pack.c:266

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

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

1786

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

1787 +#: fetch-pack.c:285 builtin/archive.c:63

1788 #, c-format

1789 msgid "remote error: %s"

1790 msgstr "fjärrfel: %s"

1791

1714 -#: fetch-pack.c:285

1792 +#: fetch-pack.c:286

1793 #, c-format

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

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

1796

1719 -#: fetch-pack.c:337

1797 +#: fetch-pack.c:338

1798 msgid "--stateless-rpc requires multi_ack_detailed"

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

1800

1723 -#: fetch-pack.c:428

1801 +#: fetch-pack.c:429 fetch-pack.c:1310

1802 #, c-format

1803 msgid "invalid shallow line: %s"

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

1805

1728 -#: fetch-pack.c:434

1806 +#: fetch-pack.c:435 fetch-pack.c:1316

1807 #, c-format

1808 msgid "invalid unshallow line: %s"

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

1810

1733 -#: fetch-pack.c:436

1811 +#: fetch-pack.c:437 fetch-pack.c:1318

1812 #, c-format

1813 msgid "object not found: %s"

1814 msgstr "objektet hittades inte: %s"

1815

1738 -#: fetch-pack.c:439

1816 +#: fetch-pack.c:440 fetch-pack.c:1321

1817 #, c-format

1818 msgid "error in object: %s"

1819 msgstr "fel i objekt: %s"

1820

1743 -#: fetch-pack.c:441

1821 +#: fetch-pack.c:442 fetch-pack.c:1323

1822 #, c-format

1823 msgid "no shallow found: %s"

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

1825

1748 -#: fetch-pack.c:444

1826 +#: fetch-pack.c:445 fetch-pack.c:1326

1827 #, c-format

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

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

1830

1753 -#: fetch-pack.c:485

1831 +#: fetch-pack.c:486

1832 #, c-format

1833 msgid "got %s %d %s"

1834 msgstr "fick %s %d %s"

1835

1758 -#: fetch-pack.c:499

1836 +#: fetch-pack.c:500

1837 #, c-format

1838 msgid "invalid commit %s"

1839 msgstr "ogiltig incheckning %s"

1840

1763 -#: fetch-pack.c:532

1841 +#: fetch-pack.c:533

1842 msgid "giving up"

1843 msgstr "ger upp"

1844

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

1845 +#: fetch-pack.c:543 progress.c:229

1846 msgid "done"

1847 msgstr "klart"

1848

1771 -#: fetch-pack.c:554

1849 +#: fetch-pack.c:555

1850 #, c-format

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

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

1853

1776 -#: fetch-pack.c:600

1854 +#: fetch-pack.c:601

1855 #, c-format

1856 msgid "Marking %s as complete"

1857 msgstr "Markerar %s som komplett"

1858

1781 -#: fetch-pack.c:788

1859 +#: fetch-pack.c:828

1860 #, c-format

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

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

1863

1786 -#: fetch-pack.c:829

1864 +#: fetch-pack.c:869

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

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

1867

1790 -#: fetch-pack.c:837

1868 +#: fetch-pack.c:877

1869 msgid "protocol error: bad pack header"

1870 msgstr "protokollfel: felaktigt packhuvud"

1871

1794 -#: fetch-pack.c:895

1872 +#: fetch-pack.c:944

1873 #, c-format

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

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

1876

1799 -#: fetch-pack.c:911

1877 +#: fetch-pack.c:960

1878 #, c-format

1879 msgid "%s failed"

1880 msgstr "%s misslyckades"

1881

1804 -#: fetch-pack.c:913

1882 +#: fetch-pack.c:962

1883 msgid "error in sideband demultiplexer"

1884 msgstr "fel i sidbands-avmultiplexare"

1885

1808 -#: fetch-pack.c:940

1886 +#: fetch-pack.c:989

1887 msgid "Server does not support shallow clients"

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

1889

1812 -#: fetch-pack.c:944

1890 +#: fetch-pack.c:993

1891 msgid "Server supports multi_ack_detailed"

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

1893

1816 -#: fetch-pack.c:947

1894 +#: fetch-pack.c:996

1895 msgid "Server supports no-done"

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

1897

1820 -#: fetch-pack.c:953

1898 +#: fetch-pack.c:1002

1899 msgid "Server supports multi_ack"

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

1901

1824 -#: fetch-pack.c:957

1902 +#: fetch-pack.c:1006

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

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

1905

1828 -#: fetch-pack.c:961

1906 +#: fetch-pack.c:1010

1907 msgid "Server supports side-band"

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

1909

1832 -#: fetch-pack.c:965

1910 +#: fetch-pack.c:1014

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

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

1913

1836 -#: fetch-pack.c:969

1914 +#: fetch-pack.c:1018

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

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

1917

1840 -#: fetch-pack.c:979

1918 +#: fetch-pack.c:1028

1919 msgid "Server supports ofs-delta"

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

1921

1844 -#: fetch-pack.c:985

1922 +#: fetch-pack.c:1034 fetch-pack.c:1204

1923 msgid "Server supports filter"

1924 msgstr "Servern stöder filter"

1925

1848 -#: fetch-pack.c:993

1926 +#: fetch-pack.c:1042

1927 #, c-format

1928 msgid "Server version is %.*s"

1929 msgstr "Serverversionen är %.*s"

1930

1853 -#: fetch-pack.c:999

1931 +#: fetch-pack.c:1048

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

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

1934

1857 -#: fetch-pack.c:1003

1935 +#: fetch-pack.c:1052

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

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

1938

1861 -#: fetch-pack.c:1005

1939 +#: fetch-pack.c:1054

1940 msgid "Server does not support --deepen"

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

1942

1865 -#: fetch-pack.c:1016

1943 +#: fetch-pack.c:1065

1944 msgid "no common commits"

1945 msgstr "inga gemensamma incheckningar"

1946

1869 -#: fetch-pack.c:1028

1947 +#: fetch-pack.c:1077 fetch-pack.c:1414

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

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

1950

1873 -#: fetch-pack.c:1190

1951 +#: fetch-pack.c:1199

1952 +msgid "Server does not support shallow requests"

1953 +msgstr "Servern stöder inte grunda förfrågningar"

1954 +

1955 +#: fetch-pack.c:1584

1956 msgid "no matching remote head"

1957 msgstr "inget motsvarande fjärrhuvud"

1958

1877 -#: fetch-pack.c:1212

1959 +#: fetch-pack.c:1610

1960 #, c-format

1961 msgid "no such remote ref %s"

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

1963

1882 -#: fetch-pack.c:1215

1964 +#: fetch-pack.c:1613

1965 #, c-format

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

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

1968

1887 -#: gpg-interface.c:181

1969 +#: gpg-interface.c:185

1970 msgid "gpg failed to sign the data"

1971 msgstr "gpg misslyckades signera data"

1972

1891 -#: gpg-interface.c:211

1973 +#: gpg-interface.c:210

1974 msgid "could not create temporary file"

1975 msgstr "kunde inte skapa temporära fil"

1976

1895 -#: gpg-interface.c:214

1977 +#: gpg-interface.c:213

1978 #, c-format

1979 msgid "failed writing detached signature to '%s'"

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

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

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

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

1986

1905 -#: grep.c:2022

1987 +#: grep.c:2020

1988 #, c-format

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

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

1991

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

1992 +#: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81

1993 #: builtin/rm.c:134

1994 #, c-format

1995 msgid "failed to stat '%s'"

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

1997

1916 -#: grep.c:2050

1998 +#: grep.c:2048

1999 #, c-format

2000 msgid "'%s': short read"

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

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

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

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

2140

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

2141 +#: ident.c:416 builtin/commit.c:587

2142 #, c-format

2143 msgid "invalid date format: %s"

2144 msgstr "felaktigt datumformat: %s"

@@ -2094,82 +2176,166 @@ msgstr ""

2176 msgid "Unable to create '%s.lock': %s"

2177 msgstr "Kunde inte skapa \"%s.lock\": %s"

2178

2097 -#: merge.c:74

2179 +#: merge.c:71

2180 msgid "failed to read the cache"

2181 msgstr "misslyckades läsa cachen"

2182

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

2183 +#: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378

2184 +#: builtin/checkout.c:606 builtin/clone.c:761

2185 msgid "unable to write new index file"

2186 msgstr "kunde inte skriva ny indexfil"

2187

2106 -#: merge-recursive.c:235

2188 +#: merge-recursive.c:298

2189 msgid "(bad commit)\n"

2190 msgstr "(felaktig incheckning)\n"

2191

2110 -#: merge-recursive.c:257 merge-recursive.c:265

2192 +#: merge-recursive.c:320

2193 #, c-format

2112 -msgid "addinfo_cache failed for path '%s'"

2113 -msgstr "addinfo_cache misslyckades för sökvägen \"%s\""

2194 +msgid "add_cacheinfo failed for path '%s'; merge aborting."

2195 +msgstr ""

2196 +"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

2197 +

2198 +#: merge-recursive.c:328

2199 +#, c-format

2200 +msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."

2201 +msgstr ""

2202 +"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "

2203 +"sammanslagningen."

2204

2115 -#: merge-recursive.c:329

2205 +#: merge-recursive.c:410

2206 msgid "error building trees"

2207 msgstr "fel vid byggande av träd"

2208

2119 -#: merge-recursive.c:771

2209 +#: merge-recursive.c:881

2210 #, c-format

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

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

2213

2124 -#: merge-recursive.c:782

2214 +#: merge-recursive.c:892

2215 #, c-format

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

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

2218

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

2219 +#: merge-recursive.c:906 merge-recursive.c:925

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

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

2222

2133 -#: merge-recursive.c:805

2223 +#: merge-recursive.c:915

2224 #, c-format

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

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

2227

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

2228 +#: merge-recursive.c:957 builtin/cat-file.c:37

2229 #, c-format

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

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

2232

2143 -#: merge-recursive.c:849

2233 +#: merge-recursive.c:959

2234 #, c-format

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

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

2237

2148 -#: merge-recursive.c:873

2238 +#: merge-recursive.c:983

2239 #, c-format

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

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

2242

2153 -#: merge-recursive.c:884

2243 +#: merge-recursive.c:994

2244 #, c-format

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

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

2247

2158 -#: merge-recursive.c:889

2248 +#: merge-recursive.c:999

2249 #, c-format

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

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

2252

2163 -#: merge-recursive.c:1029

2253 +#: merge-recursive.c:1186

2254 +#, c-format

2255 +msgid "Failed to merge submodule %s (not checked out)"

2256 +msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"

2257 +

2258 +#: merge-recursive.c:1193

2259 +#, c-format

2260 +msgid "Failed to merge submodule %s (commits not present)"

2261 +msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"

2262 +

2263 +#: merge-recursive.c:1200

2264 +#, c-format

2265 +msgid "Failed to merge submodule %s (commits don't follow merge-base)"

2266 +msgstr ""

2267 +"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "

2268 +"sammanslagningsbasen)"

2269 +

2270 +#: merge-recursive.c:1208 merge-recursive.c:1220

2271 +#, c-format

2272 +msgid "Fast-forwarding submodule %s to the following commit:"

2273 +msgstr "Snabbspolar undermodulen %s till följande incheckning:"

2274 +

2275 +#: merge-recursive.c:1211 merge-recursive.c:1223

2276 +#, c-format

2277 +msgid "Fast-forwarding submodule %s to %s"

2278 +msgstr "Snabbspolar undermodulen %s till %s"

2279 +

2280 +#: merge-recursive.c:1245

2281 +#, c-format

2282 +msgid "Failed to merge submodule %s (merge following commits not found)"

2283 +msgstr ""

2284 +"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "

2285 +"hittades inte)"

2286 +

2287 +#: merge-recursive.c:1249

2288 +#, c-format

2289 +msgid "Failed to merge submodule %s (not fast-forward)"

2290 +msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"

2291 +

2292 +#: merge-recursive.c:1250

2293 +msgid "Found a possible merge resolution for the submodule:\n"

2294 +msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"

2295 +

2296 +#: merge-recursive.c:1253

2297 +#, c-format

2298 +msgid ""

2299 +"If this is correct simply add it to the index for example\n"

2300 +"by using:\n"

2301 +"\n"

2302 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2303 +"\n"

2304 +"which will accept this suggestion.\n"

2305 +msgstr ""

2306 +"Om detta är riktigt lägger du bara till det i indexet, till\n"

2307 +"exempel så här:\n"

2308 +"\n"

2309 +" git update-index --cacheinfo 160000 %s \"%s\"\n"

2310 +"\n"

2311 +"vilket godtar lösningen.\n"

2312 +

2313 +#: merge-recursive.c:1262

2314 +#, c-format

2315 +msgid "Failed to merge submodule %s (multiple merges found)"

2316 +msgstr ""

2317 +"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"

2318 +

2319 +#: merge-recursive.c:1321

2320 msgid "Failed to execute internal merge"

2321 msgstr "Misslyckades exekvera intern sammanslagning"

2322

2167 -#: merge-recursive.c:1034

2323 +#: merge-recursive.c:1326

2324 #, c-format

2325 msgid "Unable to add %s to database"

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

2327

2172 -#: merge-recursive.c:1146

2328 +#: merge-recursive.c:1358

2329 +#, c-format

2330 +msgid "Auto-merging %s"

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

2332 +

2333 +#: merge-recursive.c:1423

2334 +#, c-format

2335 +msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."

2336 +msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."

2337 +

2338 +#: merge-recursive.c:1475

2339 #, c-format

2340 msgid ""

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

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

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

2345 "i trädet."

2346

2181 -#: merge-recursive.c:1151

2347 +#: merge-recursive.c:1480

2348 #, c-format

2349 msgid ""

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

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

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

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

2355

2190 -#: merge-recursive.c:1158

2356 +#: merge-recursive.c:1487

2357 #, c-format

2358 msgid ""

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

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

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

2363 "i trädet vid %s."

2364

2199 -#: merge-recursive.c:1163

2365 +#: merge-recursive.c:1492

2366 #, c-format

2367 msgid ""

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

@@ -2205,20 +2371,31 @@ msgstr ""

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

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

2373

2208 -#: merge-recursive.c:1197

2374 +#: merge-recursive.c:1526

2375 msgid "rename"

2376 msgstr "namnbyte"

2377

2212 -#: merge-recursive.c:1197

2378 +#: merge-recursive.c:1526

2379 msgid "renamed"

2380 msgstr "namnbytt"

2381

2216 -#: merge-recursive.c:1254

2382 +#: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368

2383 +#: merge-recursive.c:3086

2384 +#, c-format

2385 +msgid "Refusing to lose dirty file at %s"

2386 +msgstr "Vägrar förlora lortig fil vid \"%s\""

2387 +

2388 +#: merge-recursive.c:1594

2389 #, c-format

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

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

2392

2221 -#: merge-recursive.c:1279

2393 +#: merge-recursive.c:1599

2394 +#, c-format

2395 +msgid "Refusing to lose untracked file at %s; adding as %s instead"

2396 +msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"

2397 +

2398 +#: merge-recursive.c:1625

2399 #, c-format

2400 msgid ""

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

@@ -2227,140 +2404,187 @@ msgstr ""

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

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

2406

2230 -#: merge-recursive.c:1284

2407 +#: merge-recursive.c:1630

2408 msgid " (left unresolved)"

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

2410

2234 -#: merge-recursive.c:1346

2411 +#: merge-recursive.c:1694

2412 #, c-format

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

2414 msgstr ""

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

2416

2240 -#: merge-recursive.c:1379

2417 +#: merge-recursive.c:1733

2418 #, c-format

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

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

2421

2245 -#: merge-recursive.c:1582

2422 +#: merge-recursive.c:1745

2423 +#, c-format

2424 +msgid "Refusing to lose untracked file at %s, even though it's in the way."

2425 +msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."

2426 +

2427 +#: merge-recursive.c:1951

2428 +#, c-format

2429 +msgid ""

2430 +"CONFLICT (directory rename split): Unclear where to place %s because "

2431 +"directory %s was renamed to multiple other directories, with no destination "

2432 +"getting a majority of the files."

2433 +msgstr ""

2434 +"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då "

2435 +"katalogen %s bytte namn till flera andra kataloger, utan att någon "

2436 +"destination fick en majoritet av filerna."

2437 +

2438 +#: merge-recursive.c:1983

2439 +#, c-format

2440 +msgid ""

2441 +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "

2442 +"implicit directory rename(s) putting the following path(s) there: %s."

2443 +msgstr ""

2444 +"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "

2445 +"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."

2446 +

2447 +#: merge-recursive.c:1993

2448 +#, c-format

2449 +msgid ""

2450 +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "

2451 +"implicit directory renames tried to put these paths there: %s"

2452 +msgstr ""

2453 +"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "

2454 +"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"

2455 +

2456 +#: merge-recursive.c:2085

2457 +#, c-format

2458 +msgid ""

2459 +"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"

2460 +">%s in %s"

2461 +msgstr ""

2462 +"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "

2463 +"%s->%s i %s"

2464 +

2465 +#: merge-recursive.c:2330

2466 +#, c-format

2467 +msgid ""

2468 +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "

2469 +"renamed."

2470 +msgstr ""

2471 +"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "

2472 +"bytt namn."

2473 +

2474 +#: merge-recursive.c:2736

2475 #, c-format

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

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

2478

2250 -#: merge-recursive.c:1597

2479 +#: merge-recursive.c:2751

2480 #, c-format

2481 msgid "Adding merged %s"

2482 msgstr "Lägger till sammanslagen %s"

2483

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

2484 +#: merge-recursive.c:2758 merge-recursive.c:3089

2485 #, c-format

2486 msgid "Adding as %s instead"

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

2488

2260 -#: merge-recursive.c:1661

2489 +#: merge-recursive.c:2914

2490 #, c-format

2491 msgid "cannot read object %s"

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

2493

2265 -#: merge-recursive.c:1664

2494 +#: merge-recursive.c:2917

2495 #, c-format

2496 msgid "object %s is not a blob"

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

2498

2270 -#: merge-recursive.c:1733

2499 +#: merge-recursive.c:2986

2500 msgid "modify"

2501 msgstr "ändra"

2502

2274 -#: merge-recursive.c:1733

2503 +#: merge-recursive.c:2986

2504 msgid "modified"

2505 msgstr "ändrad"

2506

2278 -#: merge-recursive.c:1743

2507 +#: merge-recursive.c:2997

2508 msgid "content"

2509 msgstr "innehåll"

2510

2282 -#: merge-recursive.c:1750

2511 +#: merge-recursive.c:3004

2512 msgid "add/add"

2513 msgstr "tillägg/tillägg"

2514

2286 -#: merge-recursive.c:1786

2515 +#: merge-recursive.c:3046

2516 #, c-format

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

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

2519

2291 -#: merge-recursive.c:1800

2292 -#, c-format

2293 -msgid "Auto-merging %s"

2294 -msgstr "Slår ihop %s automatiskt"

2295 -

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

2520 +#: merge-recursive.c:3055 git-submodule.sh:895

2521 msgid "submodule"

2522 msgstr "undermodul"

2523

2300 -#: merge-recursive.c:1805

2524 +#: merge-recursive.c:3056

2525 #, c-format

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

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

2528

2305 -#: merge-recursive.c:1899

2529 +#: merge-recursive.c:3178

2530 #, c-format

2531 msgid "Removing %s"

2532 msgstr "Tar bort %s"

2533

2310 -#: merge-recursive.c:1925

2534 +#: merge-recursive.c:3204

2535 msgid "file/directory"

2536 msgstr "fil/katalog"

2537

2314 -#: merge-recursive.c:1931

2538 +#: merge-recursive.c:3210

2539 msgid "directory/file"

2540 msgstr "katalog/fil"

2541

2318 -#: merge-recursive.c:1938

2542 +#: merge-recursive.c:3217

2543 #, c-format

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

2545 msgstr ""

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

2547

2324 -#: merge-recursive.c:1947

2548 +#: merge-recursive.c:3226

2549 #, c-format

2550 msgid "Adding %s"

2551 msgstr "Lägger till %s"

2552

2329 -#: merge-recursive.c:1987

2553 +#: merge-recursive.c:3267

2554 #, c-format

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

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

2557

2334 -#: merge-recursive.c:1991

2558 +#: merge-recursive.c:3271

2559 msgid "Already up to date!"

2560 msgstr "Redan à jour!"

2561

2338 -#: merge-recursive.c:2000

2562 +#: merge-recursive.c:3280

2563 #, c-format

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

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

2566

2343 -#: merge-recursive.c:2097

2567 +#: merge-recursive.c:3379

2568 msgid "Merging:"

2569 msgstr "Slår ihop:"

2570

2347 -#: merge-recursive.c:2110

2571 +#: merge-recursive.c:3392

2572 #, c-format

2573 msgid "found %u common ancestor:"

2574 msgid_plural "found %u common ancestors:"

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

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

2577

2354 -#: merge-recursive.c:2149

2578 +#: merge-recursive.c:3431

2579 msgid "merge returned no commit"

2580 msgstr "sammanslagningen returnerade ingen incheckning"

2581

2358 -#: merge-recursive.c:2212

2582 +#: merge-recursive.c:3495

2583 #, c-format

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

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

2586

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

2587 +#: merge-recursive.c:3511 builtin/merge.c:658 builtin/merge.c:815

2588 msgid "Unable to write index."

2589 msgstr "Kunde inte skriva indexet."

2590

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

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

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

2630

2407 -#: object.c:239

2631 +#: object.c:242

2632 #, c-format

2633 msgid "unable to parse object: %s"

2634 msgstr "kunde inte tolka objektet: %s"

2635

2412 -#: packfile.c:561

2636 +#: packfile.c:563

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

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

2639

2416 -#: packfile.c:1694

2640 +#: packfile.c:1742

2641 #, c-format

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

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

2644

2421 -#: packfile.c:1698

2645 +#: packfile.c:1746

2646 #, c-format

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

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

2649

2426 -#: parse-options.c:619

2650 +#: parse-options.c:621

2651 msgid "..."

2652 msgstr "..."

2653

2430 -#: parse-options.c:638

2654 +#: parse-options.c:640

2655 #, c-format

2656 msgid "usage: %s"

2657 msgstr "användning: %s"

@@ -2435,26 +2659,31 @@ msgstr "användning: %s"

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

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

2661 #.

2438 -#: parse-options.c:644

2662 +#: parse-options.c:646

2663 #, c-format

2664 msgid " or: %s"

2665 msgstr " eller: %s"

2666

2443 -#: parse-options.c:647

2667 +#: parse-options.c:649

2668 #, c-format

2669 msgid " %s"

2670 msgstr " %s"

2671

2448 -#: parse-options.c:686

2672 +#: parse-options.c:688

2673 msgid "-NUM"

2674 msgstr "-TAL"

2675

2452 -#: parse-options-cb.c:108

2676 +#: parse-options-cb.c:44

2677 +#, c-format

2678 +msgid "malformed expiration date '%s'"

2679 +msgstr "trasigt utlöpsdatum: ”%s”"

2680 +

2681 +#: parse-options-cb.c:112

2682 #, c-format

2683 msgid "malformed object name '%s'"

2684 msgstr "felformat objektnamn \"%s\""

2685

2457 -#: path.c:891

2686 +#: path.c:892

2687 #, c-format

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

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

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

2766 msgid "unable to parse --pretty format"

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

2768

2540 -#: read-cache.c:1473

2769 +#: read-cache.c:1500

2770 #, c-format

2771 msgid ""

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

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

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

2776 "Använder version %i"

2777

2549 -#: read-cache.c:1483

2778 +#: read-cache.c:1510

2779 #, c-format

2780 msgid ""

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

@@ -2555,52 +2784,53 @@ msgstr ""

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

2785 "Använder version %i"

2786

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

2787 +#: read-cache.c:2404 sequencer.c:4337 wrapper.c:658 builtin/merge.c:1047

2788 #, c-format

2789 msgid "could not close '%s'"

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

2791

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

2792 +#: read-cache.c:2477 sequencer.c:2101 sequencer.c:3233

2793 #, c-format

2794 msgid "could not stat '%s'"

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

2796

2568 -#: read-cache.c:2461

2797 +#: read-cache.c:2490

2798 #, c-format

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

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

2801

2573 -#: read-cache.c:2473

2802 +#: read-cache.c:2502

2803 #, c-format

2804 msgid "unable to unlink: %s"

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

2806

2578 -#: refs.c:706

2807 +#: refs.c:732 sequencer.c:4333 sequencer.c:4392 wrapper.c:225 wrapper.c:395

2808 +#: builtin/am.c:779

2809 #, c-format

2580 -msgid "Could not open '%s' for writing"

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

2810 +msgid "could not open '%s' for writing"

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

2812

2583 -#: refs.c:1850

2813 +#: refs.c:1880

2814 msgid "ref updates forbidden inside quarantine environment"

2815 msgstr "referensuppdateringar förbjudna i karantänmiljö"

2816

2587 -#: refs/files-backend.c:1189

2817 +#: refs/files-backend.c:1191

2818 #, c-format

2819 msgid "could not remove reference %s"

2820 msgstr "kunde inte ta bort referensen %s"

2821

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

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

2822 +#: refs/files-backend.c:1205 refs/packed-backend.c:1531

2823 +#: refs/packed-backend.c:1541

2824 #, c-format

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

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

2827

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

2828 +#: refs/files-backend.c:1208 refs/packed-backend.c:1544

2829 #, c-format

2830 msgid "could not delete references: %s"

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

2832

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

2833 +#: ref-filter.c:35 wt-status.c:1850

2834 msgid "gone"

2835 msgstr "försvunnen"

2836

@@ -2619,157 +2849,162 @@ msgstr "bakom %d"

2849 msgid "ahead %d, behind %d"

2850 msgstr "före %d, bakom %d"

2851

2622 -#: ref-filter.c:107

2852 +#: ref-filter.c:121

2853 #, c-format

2854 msgid "expected format: %%(color:<color>)"

2855 msgstr "förväntat format: %%(color:<color>)"

2856

2627 -#: ref-filter.c:109

2857 +#: ref-filter.c:123

2858 #, c-format

2859 msgid "unrecognized color: %%(color:%s)"

2860 msgstr "okänd färg: %%(color:%s)"

2861

2632 -#: ref-filter.c:129

2862 +#: ref-filter.c:145

2863 #, c-format

2864 msgid "Integer value expected refname:lstrip=%s"

2865 msgstr "Heltalsvärde förväntades refname:lstrip=%s"

2866

2637 -#: ref-filter.c:133

2867 +#: ref-filter.c:149

2868 #, c-format

2869 msgid "Integer value expected refname:rstrip=%s"

2870 msgstr "Heltalsvärde förväntades refname:rstrip=%s"

2871

2642 -#: ref-filter.c:135

2872 +#: ref-filter.c:151

2873 #, c-format

2874 msgid "unrecognized %%(%s) argument: %s"

2875 msgstr "okänt %%(%s)-argument: %s"

2876

2647 -#: ref-filter.c:184

2877 +#: ref-filter.c:206

2878 #, c-format

2879 msgid "%%(body) does not take arguments"

2880 msgstr "%%(body) tar inte argument"

2881

2652 -#: ref-filter.c:191

2882 +#: ref-filter.c:215

2883 #, c-format

2884 msgid "%%(subject) does not take arguments"

2885 msgstr "%%(subject) tar inte argument"

2886

2657 -#: ref-filter.c:209

2887 +#: ref-filter.c:235

2888 #, c-format

2889 msgid "unknown %%(trailers) argument: %s"

2890 msgstr "okänt %%(trailers)-argument: %s"

2891

2662 -#: ref-filter.c:232

2892 +#: ref-filter.c:264

2893 #, c-format

2894 msgid "positive value expected contents:lines=%s"

2895 msgstr "positivt värde förväntat contents:lines=%s"

2896

2667 -#: ref-filter.c:234

2897 +#: ref-filter.c:266

2898 #, c-format

2899 msgid "unrecognized %%(contents) argument: %s"

2900 msgstr "okänt %%(contents)-argument: %s"

2901

2672 -#: ref-filter.c:247

2902 +#: ref-filter.c:281

2903 #, c-format

2904 msgid "positive value expected objectname:short=%s"

2905 msgstr "positivt värde förväntat objectname:short=%s"

2906

2677 -#: ref-filter.c:251

2907 +#: ref-filter.c:285

2908 #, c-format

2909 msgid "unrecognized %%(objectname) argument: %s"

2910 msgstr "okänt %%(objectname)-argument: %s"

2911

2682 -#: ref-filter.c:278

2912 +#: ref-filter.c:315

2913 #, c-format

2914 msgid "expected format: %%(align:<width>,<position>)"

2915 msgstr "förväntat format: %%(align:<bredd>,<position>)"

2916

2687 -#: ref-filter.c:290

2917 +#: ref-filter.c:327

2918 #, c-format

2919 msgid "unrecognized position:%s"

2920 msgstr "okänd position:%s"

2921

2692 -#: ref-filter.c:294

2922 +#: ref-filter.c:334

2923 #, c-format

2924 msgid "unrecognized width:%s"

2925 msgstr "okänd bredd:%s"

2926

2697 -#: ref-filter.c:300

2927 +#: ref-filter.c:343

2928 #, c-format

2929 msgid "unrecognized %%(align) argument: %s"

2930 msgstr "okänt %%(align)-argument: %s"

2931

2702 -#: ref-filter.c:304

2932 +#: ref-filter.c:351

2933 #, c-format

2934 msgid "positive width expected with the %%(align) atom"

2935 msgstr "positiv bredd förväntad med atomen %%(align)"

2936

2707 -#: ref-filter.c:319

2937 +#: ref-filter.c:369

2938 #, c-format

2939 msgid "unrecognized %%(if) argument: %s"

2940 msgstr "okänt %%(if)-argument: %s"

2941

2712 -#: ref-filter.c:409

2942 +#: ref-filter.c:464

2943 #, c-format

2944 msgid "malformed field name: %.*s"

2945 msgstr "felformat fältnamn: %.*s"

2946

2717 -#: ref-filter.c:435

2947 +#: ref-filter.c:491

2948 #, c-format

2949 msgid "unknown field name: %.*s"

2950 msgstr "okänt fältnamn: %.*s"

2951

2722 -#: ref-filter.c:547

2952 +#: ref-filter.c:608

2953 #, c-format

2954 msgid "format: %%(if) atom used without a %%(then) atom"

2955 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"

2956

2727 -#: ref-filter.c:607

2957 +#: ref-filter.c:671

2958 #, c-format

2959 msgid "format: %%(then) atom used without an %%(if) atom"

2960 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"

2961

2732 -#: ref-filter.c:609

2962 +#: ref-filter.c:673

2963 #, c-format

2964 msgid "format: %%(then) atom used more than once"

2965 msgstr "format: atomen %%(then) använd mer än en gång"

2966

2737 -#: ref-filter.c:611

2967 +#: ref-filter.c:675

2968 #, c-format

2969 msgid "format: %%(then) atom used after %%(else)"

2970 msgstr "format: atomen %%(then) använd efter %%(else)"

2971

2742 -#: ref-filter.c:637

2972 +#: ref-filter.c:703

2973 #, c-format

2974 msgid "format: %%(else) atom used without an %%(if) atom"

2975 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"

2976

2747 -#: ref-filter.c:639

2977 +#: ref-filter.c:705

2978 #, c-format

2979 msgid "format: %%(else) atom used without a %%(then) atom"

2980 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"

2981

2752 -#: ref-filter.c:641

2982 +#: ref-filter.c:707

2983 #, c-format

2984 msgid "format: %%(else) atom used more than once"

2985 msgstr "format: atomen %%(else) använd mer än en gång"

2986

2757 -#: ref-filter.c:654

2987 +#: ref-filter.c:722

2988 #, c-format

2989 msgid "format: %%(end) atom used without corresponding atom"

2990 msgstr "format: atomen %%(end) använd utan motsvarande atom"

2991

2762 -#: ref-filter.c:709

2992 +#: ref-filter.c:779

2993 #, c-format

2994 msgid "malformed format string %s"

2995 msgstr "felformad formatsträng %s"

2996

2767 -#: ref-filter.c:1313

2997 +#: ref-filter.c:1387

2998 #, c-format

2999 msgid "(no branch, rebasing %s)"

3000 msgstr "(ingen gren, ombaserar %s)"

3001

2772 -#: ref-filter.c:1316

3002 +#: ref-filter.c:1390

3003 +#, c-format

3004 +msgid "(no branch, rebasing detached HEAD %s)"

3005 +msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"

3006 +

3007 +#: ref-filter.c:1393

3008 #, c-format

3009 msgid "(no branch, bisect started on %s)"

3010 msgstr "(ingen gren, \"bisect\" startad på %s)"

@@ -2777,7 +3012,7 @@ msgstr "(ingen gren, \"bisect\" startad på %s)"

3012 #. TRANSLATORS: make sure this matches "HEAD

3013 #. detached at " in wt-status.c

3014 #.

2780 -#: ref-filter.c:1324

3015 +#: ref-filter.c:1401

3016 #, c-format

3017 msgid "(HEAD detached at %s)"

3018 msgstr "(HEAD frånkopplat vid %s)"

@@ -2785,147 +3020,147 @@ msgstr "(HEAD frånkopplat vid %s)"

3020 #. TRANSLATORS: make sure this matches "HEAD

3021 #. detached from " in wt-status.c

3022 #.

2788 -#: ref-filter.c:1331

3023 +#: ref-filter.c:1408

3024 #, c-format

3025 msgid "(HEAD detached from %s)"

3026 msgstr "(HEAD frånkopplat från %s)"

3027

2793 -#: ref-filter.c:1335

3028 +#: ref-filter.c:1412

3029 msgid "(no branch)"

3030 msgstr "(ingen gren)"

3031

2797 -#: ref-filter.c:1364

3032 +#: ref-filter.c:1442

3033 #, c-format

3034 msgid "missing object %s for %s"

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

3036

2802 -#: ref-filter.c:1367

3037 +#: ref-filter.c:1445

3038 #, c-format

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

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

3041

2807 -#: ref-filter.c:1819

3042 +#: ref-filter.c:1902

3043 #, c-format

3044 msgid "malformed object at '%s'"

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

3046

2812 -#: ref-filter.c:1886

3047 +#: ref-filter.c:1984

3048 #, c-format

3049 msgid "ignoring ref with broken name %s"

3050 msgstr "ignorerar referens med trasigt namn %s"

3051

2817 -#: ref-filter.c:1891

3052 +#: ref-filter.c:1989

3053 #, c-format

3054 msgid "ignoring broken ref %s"

3055 msgstr "ignorerar trasig referens %s"

3056

2822 -#: ref-filter.c:2152

3057 +#: ref-filter.c:2261

3058 #, c-format

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

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

3061

2827 -#: ref-filter.c:2246

3062 +#: ref-filter.c:2365

3063 #, c-format

3064 msgid "malformed object name %s"

3065 msgstr "felformat objektnamn %s"

3066

2832 -#: remote.c:795

3067 +#: remote.c:605

3068 #, c-format

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

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

3071

2837 -#: remote.c:799

3072 +#: remote.c:609

3073 #, c-format

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

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

3076

2842 -#: remote.c:803

3077 +#: remote.c:613

3078 #, c-format

3079 msgid "%s tracks both %s and %s"

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

3081

2847 -#: remote.c:811

3082 +#: remote.c:621

3083 msgid "Internal error"

3084 msgstr "Internt fel"

3085

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

3086 +#: remote.c:1534 remote.c:1635

3087 msgid "HEAD does not point to a branch"

3088 msgstr "HEAD pekar inte på en gren"

3089

2855 -#: remote.c:1735

3090 +#: remote.c:1543

3091 #, c-format

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

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

3094

2860 -#: remote.c:1738

3095 +#: remote.c:1546

3096 #, c-format

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

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

3099

2865 -#: remote.c:1744

3100 +#: remote.c:1552

3101 #, c-format

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

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

3104

2870 -#: remote.c:1759

3105 +#: remote.c:1567

3106 #, c-format

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

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

3109

2875 -#: remote.c:1771

3110 +#: remote.c:1579

3111 #, c-format

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

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

3114

2880 -#: remote.c:1782

3115 +#: remote.c:1589

3116 #, c-format

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

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

3119

2885 -#: remote.c:1795

3120 +#: remote.c:1602

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

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

3123

2889 -#: remote.c:1817

3124 +#: remote.c:1624

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

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

3127

2893 -#: remote.c:2132

3128 +#: remote.c:1939

3129 #, c-format

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

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

3132

2898 -#: remote.c:2136

3133 +#: remote.c:1943

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

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

3136

2902 -#: remote.c:2139

3137 +#: remote.c:1946

3138 #, c-format

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

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

3141

2907 -#: remote.c:2143

3142 +#: remote.c:1950

3143 #, c-format

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

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

3146

2912 -#: remote.c:2146

3147 +#: remote.c:1953

3148 #, c-format

3149 msgid " (use \"%s\" for details)\n"

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

3151

2917 -#: remote.c:2150

3152 +#: remote.c:1957

3153 #, c-format

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

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

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

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

3158

2924 -#: remote.c:2156

3159 +#: remote.c:1963

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

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

3162

2928 -#: remote.c:2159

3163 +#: remote.c:1966

3164 #, c-format

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

3166 msgid_plural ""

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

3170 msgstr[1] ""

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

3172

2938 -#: remote.c:2167

3173 +#: remote.c:1974

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

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

3176

2942 -#: remote.c:2170

3177 +#: remote.c:1977

3178 #, c-format

3179 msgid ""

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

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

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

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

3191

2957 -#: remote.c:2180

3192 +#: remote.c:1987

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

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

3195

2961 -#: revision.c:2277

3196 +#: revision.c:2289

3197 msgid "your current branch appears to be broken"

3198 msgstr "din nuvarande gren verkar vara trasig"

3199

2965 -#: revision.c:2280

3200 +#: revision.c:2292

3201 #, c-format

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

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

3204

2970 -#: revision.c:2477

3205 +#: revision.c:2489

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

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

3208

2974 -#: run-command.c:731

3209 +#: run-command.c:728

3210 msgid "open /dev/null failed"

3211 msgstr "misslyckades öppna /dev/null"

3212

2978 -#: run-command.c:1274

3213 +#: run-command.c:1271

3214 #, c-format

3215 msgid ""

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

@@ -3022,29 +3257,34 @@ msgstr "mottagarsidan stöder inte push med --atomic"

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

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

3259

3025 -#: sequencer.c:158

3260 +#: sequencer.c:174

3261 #, c-format

3262 msgid "invalid commit message cleanup mode '%s'"

3263 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""

3264

3030 -#: sequencer.c:267

3265 +#: sequencer.c:274

3266 +#, c-format

3267 +msgid "could not delete '%s'"

3268 +msgstr "kunde inte ta bort \"%s\""

3269 +

3270 +#: sequencer.c:300

3271 msgid "revert"

3272 msgstr "revert"

3273

3034 -#: sequencer.c:269

3274 +#: sequencer.c:302

3275 msgid "cherry-pick"

3276 msgstr "cherry-pick"

3277

3038 -#: sequencer.c:271

3278 +#: sequencer.c:304

3279 msgid "rebase -i"

3280 msgstr "rebase -i"

3281

3042 -#: sequencer.c:273

3282 +#: sequencer.c:306

3283 #, c-format

3284 msgid "Unknown action: %d"

3285 msgstr "Okänd funktion: %d"

3286

3047 -#: sequencer.c:330

3287 +#: sequencer.c:363

3288 msgid ""

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

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

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

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

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

3294

3055 -#: sequencer.c:333

3295 +#: sequencer.c:366

3296 msgid ""

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

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

@@ -3062,43 +3302,45 @@ msgstr ""

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

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

3304

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

3305 +#: sequencer.c:379 sequencer.c:2467

3306 #, c-format

3307 msgid "could not lock '%s'"

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

3309

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

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

3310 +#: sequencer.c:381 sequencer.c:2345 sequencer.c:2471 sequencer.c:2485

3311 +#: sequencer.c:2693 sequencer.c:4335 sequencer.c:4398 wrapper.c:656

3312 #, c-format

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

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

3315

3076 -#: sequencer.c:353

3316 +#: sequencer.c:386

3317 #, c-format

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

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

3320

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

3321 +#: sequencer.c:391 sequencer.c:2350 sequencer.c:2473 sequencer.c:2487

3322 +#: sequencer.c:2701

3323 #, c-format

3324 msgid "failed to finalize '%s'"

3325 msgstr "misslyckades färdigställa \"%s\""

3326

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

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

3327 +#: sequencer.c:414 sequencer.c:803 sequencer.c:1492 sequencer.c:2370

3328 +#: sequencer.c:2683 sequencer.c:2787 builtin/am.c:259 builtin/commit.c:727

3329 +#: builtin/merge.c:1045

3330 #, c-format

3331 msgid "could not read '%s'"

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

3333

3092 -#: sequencer.c:405

3334 +#: sequencer.c:440

3335 #, c-format

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

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

3338

3097 -#: sequencer.c:409

3339 +#: sequencer.c:444

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

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

3342

3101 -#: sequencer.c:438

3343 +#: sequencer.c:473

3344 #, c-format

3345 msgid "%s: fast-forward"

3346 msgstr "%s: snabbspola"

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

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

3349 #. "rebase -i".

3350 #.

3109 -#: sequencer.c:526

3351 +#: sequencer.c:562

3352 #, c-format

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

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

3355

3114 -#: sequencer.c:542

3115 -msgid "could not resolve HEAD commit"

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

3117 -

3118 -#: sequencer.c:562

3356 +#: sequencer.c:578

3357 msgid "unable to update cache tree"

3358 msgstr "kan inte uppdatera cacheträd"

3359

3122 -#: sequencer.c:658

3360 +#: sequencer.c:591

3361 +msgid "could not resolve HEAD commit"

3362 +msgstr "kunde inte bestämma HEAD:s incheckning"

3363 +

3364 +#: sequencer.c:748

3365 #, c-format

3366 msgid ""

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

@@ -3148,11 +3390,15 @@ msgstr ""

3390 "\n"

3391 " git rebase --continue\n"

3392

3151 -#: sequencer.c:915

3393 +#: sequencer.c:817

3394 +msgid "writing root commit"

3395 +msgstr "skriver rotincheckning"

3396 +

3397 +#: sequencer.c:1042

3398 msgid "'prepare-commit-msg' hook failed"

3399 msgstr "kroken \"prepare-commit-msg\" misslyckades"

3400

3155 -#: sequencer.c:922

3401 +#: sequencer.c:1049

3402 msgid ""

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

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

@@ -3179,7 +3425,7 @@ msgstr ""

3425 "\n"

3426 " git commit --amend --reset-author\n"

3427

3182 -#: sequencer.c:935

3428 +#: sequencer.c:1062

3429 msgid ""

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

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

@@ -3204,329 +3450,315 @@ msgstr ""

3450 "\n"

3451 " git commit --amend --reset-author\n"

3452

3207 -#: sequencer.c:975

3453 +#: sequencer.c:1102

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

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

3456

3211 -#: sequencer.c:977

3457 +#: sequencer.c:1104

3458 msgid "could not parse newly created commit"

3459 msgstr "kunde inte tolka en precis skapad incheckning"

3460

3215 -#: sequencer.c:1023

3461 +#: sequencer.c:1150

3462 msgid "unable to resolve HEAD after creating commit"

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

3464

3219 -#: sequencer.c:1025

3465 +#: sequencer.c:1152

3466 msgid "detached HEAD"

3467 msgstr "frånkopplad HEAD"

3468

3223 -#: sequencer.c:1029

3469 +#: sequencer.c:1156

3470 msgid " (root-commit)"

3471 msgstr " (rotincheckning)"

3472

3227 -#: sequencer.c:1050

3473 +#: sequencer.c:1177

3474 msgid "could not parse HEAD"

3475 msgstr "kunde inte tolka HEAD"

3476

3231 -#: sequencer.c:1052

3477 +#: sequencer.c:1179

3478 #, c-format

3479 msgid "HEAD %s is not a commit!"

3480 msgstr "HEAD %s är inte en incheckning!"

3481

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

3482 +#: sequencer.c:1183 builtin/commit.c:1528

3483 msgid "could not parse HEAD commit"

3484 msgstr "kunde inte tolka HEAD:s incheckning"

3485

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

3486 +#: sequencer.c:1234 sequencer.c:1831

3487 msgid "unable to parse commit author"

3488 msgstr "kunde inte tolka incheckningens författare"

3489

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

3490 +#: sequencer.c:1244 builtin/am.c:1630 builtin/merge.c:644

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

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

3493

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

3494 +#: sequencer.c:1261 sequencer.c:1316

3495 #, c-format

3496 msgid "unable to read commit message from '%s'"

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

3498

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

3254 -#: builtin/merge.c:851

3499 +#: sequencer.c:1283 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:824

3500 +#: builtin/merge.c:849

3501 msgid "failed to write commit object"

3502 msgstr "kunde inte skriva incheckningsobjekt"

3503

3258 -#: sequencer.c:1213

3504 +#: sequencer.c:1343

3505 #, c-format

3506 msgid "could not parse commit %s"

3507 msgstr "kunde inte tolka incheckningen %s"

3508

3263 -#: sequencer.c:1218

3509 +#: sequencer.c:1348

3510 #, c-format

3511 msgid "could not parse parent commit %s"

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

3513

3268 -#: sequencer.c:1347

3269 -#, c-format

3270 -msgid ""

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

3272 -"\n"

3273 -"\t%.*s"

3274 -msgstr ""

3275 -"oväntad första rad i squash-meddelande:\n"

3276 -"\n"

3277 -"\t%.*s"

3278 -

3279 -#: sequencer.c:1353

3280 -#, c-format

3281 -msgid ""

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

3283 -"\n"

3284 -"\t%.*s"

3285 -msgstr ""

3286 -"ogiltig första rad i squash-meddelande:\n"

3287 -"\n"

3288 -"\t%.*s"

3289 -

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

3514 +#: sequencer.c:1499 sequencer.c:1524

3515 #, c-format

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

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

3518

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

3519 +#: sequencer.c:1509 sequencer.c:4354

3520 msgid "need a HEAD to fixup"

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

3522

3299 -#: sequencer.c:1370

3523 +#: sequencer.c:1511 sequencer.c:2728

3524 msgid "could not read HEAD"

3525 msgstr "kunde inte läsa HEAD"

3526

3303 -#: sequencer.c:1372

3527 +#: sequencer.c:1513

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

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

3530

3307 -#: sequencer.c:1378

3531 +#: sequencer.c:1519

3532 #, c-format

3533 msgid "cannot write '%s'"

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

3535

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

3536 +#: sequencer.c:1526 git-rebase--interactive.sh:457

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

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

3539

3316 -#: sequencer.c:1395

3540 +#: sequencer.c:1534

3541 #, c-format

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

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

3544

3321 -#: sequencer.c:1402

3545 +#: sequencer.c:1541

3546 #, c-format

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

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

3549

3326 -#: sequencer.c:1407

3550 +#: sequencer.c:1547

3551 #, c-format

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

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

3554

3331 -#: sequencer.c:1412

3555 +#: sequencer.c:1552

3556 #, c-format

3557 msgid "unknown command: %d"

3558 msgstr "okänt kommando: %d"

3559

3336 -#: sequencer.c:1479

3560 +#: sequencer.c:1630

3561 msgid "your index file is unmerged."

3562 msgstr "din indexfil har inte slagits ihop."

3563

3340 -#: sequencer.c:1498

3564 +#: sequencer.c:1637

3565 +msgid "cannot fixup root commit"

3566 +msgstr "kan inte göra \"fixup\" på rotincheckning"

3567 +

3568 +#: sequencer.c:1656

3569 #, c-format

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

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

3572

3345 -#: sequencer.c:1506

3573 +#: sequencer.c:1664

3574 #, c-format

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

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

3577

3350 -#: sequencer.c:1510

3578 +#: sequencer.c:1668

3579 #, c-format

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

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

3582

3355 -#: sequencer.c:1516

3583 +#: sequencer.c:1674

3584 #, c-format

3585 msgid "cannot get commit message for %s"

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

3587

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

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

3362 -#: sequencer.c:1535

3590 +#: sequencer.c:1693

3591 #, c-format

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

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

3594

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

3595 +#: sequencer.c:1758

3596 #, c-format

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

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

3599

3372 -#: sequencer.c:1654

3600 +#: sequencer.c:1812

3601 #, c-format

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

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

3604

3377 -#: sequencer.c:1655

3605 +#: sequencer.c:1813

3606 #, c-format

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

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

3609

3382 -#: sequencer.c:1702

3610 +#: sequencer.c:1863

3611 msgid "empty commit set passed"

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

3613

3386 -#: sequencer.c:1712

3614 +#: sequencer.c:1873

3615 #, c-format

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

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

3618

3391 -#: sequencer.c:1718

3619 +#: sequencer.c:1880

3620 #, c-format

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

3622 msgstr "git %s: misslyckades uppdatera indexet"

3623

3396 -#: sequencer.c:1792

3624 +#: sequencer.c:1960

3625 #, c-format

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

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

3628

3401 -#: sequencer.c:1801

3629 +#: sequencer.c:1969

3630 #, c-format

3631 msgid "missing arguments for %s"

3632 msgstr "argument saknas för %s"

3633

3406 -#: sequencer.c:1844

3634 +#: sequencer.c:2028

3635 #, c-format

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

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

3638

3411 -#: sequencer.c:1852

3639 +#: sequencer.c:2036

3640 #, c-format

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

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

3643

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

3644 +#: sequencer.c:2084 sequencer.c:4137 sequencer.c:4172

3645 #, c-format

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

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

3648

3421 -#: sequencer.c:1906

3649 +#: sequencer.c:2107

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

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

3652

3425 -#: sequencer.c:1908

3653 +#: sequencer.c:2109

3654 #, c-format

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

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

3657

3430 -#: sequencer.c:1913

3658 +#: sequencer.c:2114

3659 msgid "no commits parsed."

3660 msgstr "inga incheckningar lästes."

3661

3434 -#: sequencer.c:1924

3662 +#: sequencer.c:2125

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

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

3665

3438 -#: sequencer.c:1926

3666 +#: sequencer.c:2127

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

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

3669

3442 -#: sequencer.c:1993

3670 +#: sequencer.c:2194

3671 #, c-format

3672 msgid "invalid key: %s"

3673 msgstr "felaktig nyckel: %s"

3674

3447 -#: sequencer.c:1996

3675 +#: sequencer.c:2197

3676 #, c-format

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

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

3679

3452 -#: sequencer.c:2062

3680 +#: sequencer.c:2268

3681 +msgid "unusable squash-onto"

3682 +msgstr "oanvändbar squash-onto"

3683 +

3684 +#: sequencer.c:2284

3685 #, c-format

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

3687 msgstr "trasigt manus: ”%s”"

3688

3457 -#: sequencer.c:2100

3689 +#: sequencer.c:2322

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

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

3692

3461 -#: sequencer.c:2101

3693 +#: sequencer.c:2323

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

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

3696

3465 -#: sequencer.c:2104

3697 +#: sequencer.c:2326

3698 #, c-format

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

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

3701

3470 -#: sequencer.c:2118

3702 +#: sequencer.c:2340

3703 msgid "could not lock HEAD"

3704 msgstr "kunde inte låsa HEAD"

3705

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

3706 +#: sequencer.c:2395 sequencer.c:3402

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

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

3709

3478 -#: sequencer.c:2175

3710 +#: sequencer.c:2397

3711 msgid "cannot resolve HEAD"

3712 msgstr "kan inte bestämma HEAD"

3713

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

3714 +#: sequencer.c:2399 sequencer.c:2434

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

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

3717

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

3718 +#: sequencer.c:2420 builtin/grep.c:720

3719 #, c-format

3720 msgid "cannot open '%s'"

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

3722

3491 -#: sequencer.c:2200

3723 +#: sequencer.c:2422

3724 #, c-format

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

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

3727

3496 -#: sequencer.c:2201

3728 +#: sequencer.c:2423

3729 msgid "unexpected end of file"

3730 msgstr "oväntat filslut"

3731

3500 -#: sequencer.c:2207

3732 +#: sequencer.c:2429

3733 #, c-format

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

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

3736

3505 -#: sequencer.c:2218

3737 +#: sequencer.c:2440

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

3739 msgstr ""

3740 "Du verkar ha flyttat HEAD.\n"

3741 "Spolar inte tillbaka, kontrollera HEAD!"

3742

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

3743 +#: sequencer.c:2544 sequencer.c:3320

3744 #, c-format

3745 msgid "could not update %s"

3746 msgstr "kunde inte uppdatera %s"

3747

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

3748 +#: sequencer.c:2582 sequencer.c:3300

3749 msgid "cannot read HEAD"

3750 msgstr "kan inte läsa HEAD"

3751

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

3752 +#: sequencer.c:2617 sequencer.c:2621 builtin/difftool.c:639

3753 #, c-format

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

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

3756

3525 -#: sequencer.c:2421

3757 +#: sequencer.c:2640

3758 msgid "could not read index"

3759 msgstr "kunde inte läsa indexet"

3760

3529 -#: sequencer.c:2426

3761 +#: sequencer.c:2645

3762 #, c-format

3763 msgid ""

3764 "execution failed: %s\n"

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

3773 "\tgit rebase --continue\n"

3774 "\n"

3775

3544 -#: sequencer.c:2432

3776 +#: sequencer.c:2651

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

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

3779

3548 -#: sequencer.c:2438

3780 +#: sequencer.c:2657

3781 #, c-format

3782 msgid ""

3783 "execution succeeded: %s\n"

@@ -3562,17 +3794,62 @@ msgstr ""

3794 "\tgit rebase --continue\n"

3795 "\n"

3796

3565 -#: sequencer.c:2497

3797 +#: sequencer.c:2770

3798 +msgid "writing fake root commit"

3799 +msgstr "skriver fejkad rotincheckning"

3800 +

3801 +#: sequencer.c:2775

3802 +msgid "writing squash-onto"

3803 +msgstr "skriver squash-onto"

3804 +

3805 +#: sequencer.c:2810

3806 +#, c-format

3807 +msgid "failed to find tree of %s"

3808 +msgstr "kunde inte hitta trädet för %s."

3809 +

3810 +#: sequencer.c:2828

3811 +msgid "could not write index"

3812 +msgstr "kunde inte skriva indexet"

3813 +

3814 +#: sequencer.c:2860

3815 +msgid "cannot merge without a current revision"

3816 +msgstr "kan inte slå ihop utan en aktuell incheckning"

3817 +

3818 +#: sequencer.c:2883

3819 +#, c-format

3820 +msgid "could not resolve '%s'"

3821 +msgstr "kunde inte upplösa \"%s\""

3822 +

3823 +#: sequencer.c:2905

3824 +#, c-format

3825 +msgid "could not get commit message of '%s'"

3826 +msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""

3827 +

3828 +#: sequencer.c:2915 sequencer.c:2940

3829 +#, c-format

3830 +msgid "could not write '%s'"

3831 +msgstr "kunde inte skriva \"%s\""

3832 +

3833 +#: sequencer.c:3004

3834 +#, c-format

3835 +msgid "could not even attempt to merge '%.*s'"

3836 +msgstr "kunde inte ens försöka slå ihop \"%.*s\""

3837 +

3838 +#: sequencer.c:3020

3839 +msgid "merge: Unable to write new index file"

3840 +msgstr "sammanslagning: Kunde inte skriva ny indexfil"

3841 +

3842 +#: sequencer.c:3087

3843 #, c-format

3844 msgid "Applied autostash.\n"

3845 msgstr "Tillämpade autostash.\n"

3846

3570 -#: sequencer.c:2509

3847 +#: sequencer.c:3099

3848 #, c-format

3849 msgid "cannot store %s"

3850 msgstr "kan inte spara %s"

3851

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

3852 +#: sequencer.c:3102 git-rebase.sh:188

3853 #, c-format

3854 msgid ""

3855 "Applying autostash resulted in conflicts.\n"

@@ -3583,52 +3860,69 @@ msgstr ""

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

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

3862

3586 -#: sequencer.c:2595

3863 +#: sequencer.c:3133

3864 +#, c-format

3865 +msgid ""

3866 +"Could not execute the todo command\n"

3867 +"\n"

3868 +" %.*s\n"

3869 +"It has been rescheduled; To edit the command before continuing, please\n"

3870 +"edit the todo list first:\n"

3871 +"\n"

3872 +" git rebase --edit-todo\n"

3873 +" git rebase --continue\n"

3874 +msgstr ""

3875 +"Kunde inte köra todo-kommandot\n"

3876 +"\n"

3877 +" %.*s\n"

3878 +"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n"

3879 +"fortsätter, redigera först attgöra-listan:\n"

3880 +"\n"

3881 +" git rebase --edit-todo\n"

3882 +" git rebase --continue\n"

3883 +

3884 +#: sequencer.c:3201

3885 #, c-format

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

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

3888

3591 -#: sequencer.c:2637

3889 +#: sequencer.c:3263

3890 #, c-format

3891 msgid "unknown command %d"

3892 msgstr "okänt kommando %d"

3893

3596 -#: sequencer.c:2667

3894 +#: sequencer.c:3308

3895 msgid "could not read orig-head"

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

3897

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

3898 +#: sequencer.c:3313 sequencer.c:4351

3899 msgid "could not read 'onto'"

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

3901

3604 -#: sequencer.c:2686

3902 +#: sequencer.c:3327

3903 #, c-format

3904 msgid "could not update HEAD to %s"

3905 msgstr "kunde inte uppdatera HEAD till %s"

3906

3609 -#: sequencer.c:2770

3907 +#: sequencer.c:3413

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

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

3910

3613 -#: sequencer.c:2775

3614 -msgid "could not remove CHERRY_PICK_HEAD"

3615 -msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3616 -

3617 -#: sequencer.c:2784

3911 +#: sequencer.c:3422

3912 msgid "cannot amend non-existing commit"

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

3914

3621 -#: sequencer.c:2786

3915 +#: sequencer.c:3424

3916 #, c-format

3917 msgid "invalid file: '%s'"

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

3919

3626 -#: sequencer.c:2788

3920 +#: sequencer.c:3426

3921 #, c-format

3922 msgid "invalid contents: '%s'"

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

3924

3631 -#: sequencer.c:2791

3925 +#: sequencer.c:3429

3926 msgid ""

3927 "\n"

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

@@ -3638,45 +3932,54 @@ msgstr ""

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

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

3934

3641 -#: sequencer.c:2801

3935 +#: sequencer.c:3454 sequencer.c:3492

3936 +#, c-format

3937 +msgid "could not write file: '%s'"

3938 +msgstr "kunde inte skriva fil: \"%s\""

3939 +

3940 +#: sequencer.c:3507

3941 +msgid "could not remove CHERRY_PICK_HEAD"

3942 +msgstr "kunde inte ta bort CHERRY_PICK_HEAD"

3943 +

3944 +#: sequencer.c:3514

3945 msgid "could not commit staged changes."

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

3947

3645 -#: sequencer.c:2881

3948 +#: sequencer.c:3611

3949 #, c-format

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

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

3952

3650 -#: sequencer.c:2885

3953 +#: sequencer.c:3615

3954 #, c-format

3955 msgid "%s: bad revision"

3956 msgstr "%s: felaktig revision"

3957

3655 -#: sequencer.c:2918

3958 +#: sequencer.c:3648

3959 msgid "can't revert as initial commit"

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

3961

3659 -#: sequencer.c:3023

3962 +#: sequencer.c:4097

3963 msgid "make_script: unhandled options"

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

3965

3663 -#: sequencer.c:3026

3966 +#: sequencer.c:4100

3967 msgid "make_script: error preparing revisions"

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

3969

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

3970 +#: sequencer.c:4141 sequencer.c:4176

3971 #, c-format

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

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

3974

3672 -#: sequencer.c:3146

3975 +#: sequencer.c:4235

3976 #, c-format

3977 msgid ""

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

3979 msgstr ""

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

3981

3679 -#: sequencer.c:3212

3982 +#: sequencer.c:4301

3983 #, c-format

3984 msgid ""

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

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

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

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

3990

3688 -#: sequencer.c:3219

3991 +#: sequencer.c:4308

3992 #, c-format

3993 msgid ""

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

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

4008 "\" (fel).\n"

4009 "\n"

4010

3708 -#: sequencer.c:3231

4011 +#: sequencer.c:4320

4012 #, c-format

4013 msgid ""

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

@@ -3716,27 +4019,21 @@ msgstr ""

4019 "continue\".\n"

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

4021

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 -

3725 -#: sequencer.c:3285

4022 +#: sequencer.c:4374

4023 #, c-format

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

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

4026

3730 -#: sequencer.c:3401

4027 +#: sequencer.c:4489

4028 msgid "the script was already rearranged."

4029 msgstr "skriptet har redan omordnats."

4030

3734 -#: setup.c:122

4031 +#: setup.c:123

4032 #, c-format

4033 msgid "'%s' is outside repository"

4034 msgstr "\"%s\" är utanför arkivet"

4035

3739 -#: setup.c:171

4036 +#: setup.c:172

4037 #, c-format

4038 msgid ""

4039 "%s: no such path in the working tree.\n"

@@ -3746,7 +4043,7 @@ msgstr ""

4043 "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "

4044 "lokalt."

4045

3749 -#: setup.c:184

4046 +#: setup.c:185

4047 #, c-format

4048 msgid ""

4049 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"

@@ -3758,12 +4055,12 @@ msgstr ""

4055 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

4056 "\"git <kommando> [<revision>...] -- [<fil>...]\""

4057

3761 -#: setup.c:233

4058 +#: setup.c:234

4059 #, c-format

4060 msgid "option '%s' must come before non-option arguments"

4061 msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"

4062

3766 -#: setup.c:252

4063 +#: setup.c:253

4064 #, c-format

4065 msgid ""

4066 "ambiguous argument '%s': both revision and filename\n"

@@ -3774,92 +4071,92 @@ msgstr ""

4071 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"

4072 "\"git <kommando> [<revision>...] -- [<fil>...]\""

4073

3777 -#: setup.c:388

4074 +#: setup.c:389

4075 msgid "unable to set up work tree using invalid config"

4076 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"

4077

3781 -#: setup.c:395

4078 +#: setup.c:393

4079 msgid "this operation must be run in a work tree"

4080 msgstr "funktionen måste köras i en arbetskatalog"

4081

3785 -#: setup.c:506

4082 +#: setup.c:503

4083 #, c-format

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

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

4086

3790 -#: setup.c:514

4087 +#: setup.c:511

4088 msgid "unknown repository extensions found:"

4089 msgstr "okända arkivutökningar hittades:"

4090

3794 -#: setup.c:533

4091 +#: setup.c:530

4092 #, c-format

4093 msgid "error opening '%s'"

4094 msgstr "fel vid öppning av \"%s\""

4095

3799 -#: setup.c:535

4096 +#: setup.c:532

4097 #, c-format

4098 msgid "too large to be a .git file: '%s'"

4099 msgstr "för stor för att vara en .git-fil: \"%s\""

4100

3804 -#: setup.c:537

4101 +#: setup.c:534

4102 #, c-format

4103 msgid "error reading %s"

4104 msgstr "fel vid läsning av %s"

4105

3809 -#: setup.c:539

4106 +#: setup.c:536

4107 #, c-format

4108 msgid "invalid gitfile format: %s"

4109 msgstr "ogiltigt gitfilformat: %s"

4110

3814 -#: setup.c:541

4111 +#: setup.c:538

4112 #, c-format

4113 msgid "no path in gitfile: %s"

4114 msgstr "ingen sökväg i gitfil: %s"

4115

3819 -#: setup.c:543

4116 +#: setup.c:540

4117 #, c-format

4118 msgid "not a git repository: %s"

4119 msgstr "inte ett git-arkiv: %s"

4120

3824 -#: setup.c:642

4121 +#: setup.c:639

4122 #, c-format

4123 msgid "'$%s' too big"

4124 msgstr "\"$%s\" för stor"

4125

3829 -#: setup.c:656

4126 +#: setup.c:653

4127 #, c-format

4128 msgid "not a git repository: '%s'"

4129 msgstr "inte ett git-arkiv: \"%s\""

4130

3834 -#: setup.c:685 setup.c:687 setup.c:718

4131 +#: setup.c:682 setup.c:684 setup.c:715

4132 #, c-format

4133 msgid "cannot chdir to '%s'"

4134 msgstr "kan inte byta katalog (chdir) till \"%s\""

4135

3839 -#: setup.c:690 setup.c:746 setup.c:756 setup.c:795 setup.c:803 setup.c:818

4136 +#: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815

4137 msgid "cannot come back to cwd"

4138 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"

4139

3843 -#: setup.c:816

4140 +#: setup.c:813

4141 #, c-format

4142 msgid "not a git repository (or any of the parent directories): %s"

4143 msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"

4144

3848 -#: setup.c:827

4145 +#: setup.c:824

4146 #, c-format

4147 msgid "failed to stat '%*s%s%s'"

4148 msgstr "misslyckades ta status på \"%*ss%s%s\""

4149

3853 -#: setup.c:1057

4150 +#: setup.c:1054

4151 msgid "Unable to read current working directory"

4152 msgstr "Kan inte läsa aktuell arbetskatalog"

4153

3857 -#: setup.c:1069 setup.c:1075

4154 +#: setup.c:1066 setup.c:1072

4155 #, c-format

4156 msgid "cannot change to '%s'"

4157 msgstr "kan inte byta till \"%s\""

4158

3862 -#: setup.c:1088

4159 +#: setup.c:1085

4160 #, c-format

4161 msgid ""

4162 "not a git repository (or any parent up to mount point %s)\n"

@@ -3869,7 +4166,7 @@ msgstr ""

4166 "monteringspunkten %s)\n"

4167 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."

4168

3872 -#: setup.c:1172

4169 +#: setup.c:1168

4170 #, c-format

4171 msgid ""

4172 "problem with core.sharedRepository filemode value (0%.3o).\n"

@@ -3878,53 +4175,53 @@ msgstr ""

4175 "problem med filläges-värdet i core.sharedRepository (0%.3o).\n"

4176 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."

4177

3881 -#: setup.c:1215

4178 +#: setup.c:1211

4179 msgid "open /dev/null or dup failed"

4180 msgstr "misslyckades öppna /dev/null eller \"dup\""

4181

3885 -#: setup.c:1230

4182 +#: setup.c:1226

4183 msgid "fork failed"

4184 msgstr "\"fork\" misslyckades"

4185

3889 -#: setup.c:1235

4186 +#: setup.c:1231

4187 msgid "setsid failed"

4188 msgstr "\"setsid\" misslyckades"

4189

3893 -#: sha1_file.c:592

4190 +#: sha1-file.c:625

4191 #, c-format

4192 msgid "path '%s' does not exist"

4193 msgstr "sökvägen \"%s\" finns inte"

4194

3898 -#: sha1_file.c:618

4195 +#: sha1-file.c:651

4196 #, c-format

4197 msgid "reference repository '%s' as a linked checkout is not supported yet."

4198 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

4199

3903 -#: sha1_file.c:624

4200 +#: sha1-file.c:657

4201 #, c-format

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

4203 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

4204

3908 -#: sha1_file.c:630

4205 +#: sha1-file.c:663

4206 #, c-format

4207 msgid "reference repository '%s' is shallow"

4208 msgstr "referensarkivet \"%s\" är grunt"

4209

3913 -#: sha1_file.c:638

4210 +#: sha1-file.c:671

4211 #, c-format

4212 msgid "reference repository '%s' is grafted"

4213 msgstr "referensarkivet \"%s\" är ympat"

4214

3918 -#: sha1_name.c:422

4215 +#: sha1-name.c:442

4216 #, c-format

4217 msgid "short SHA1 %s is ambiguous"

4218 msgstr "kort SHA1 %s är tvetydig"

4219

3923 -#: sha1_name.c:433

4220 +#: sha1-name.c:453

4221 msgid "The candidates are:"

4222 msgstr "Kandidaterna är:"

4223

3927 -#: sha1_name.c:693

4224 +#: sha1-name.c:695

4225 msgid ""

4226 "Git normally never creates a ref that ends with 40 hex characters\n"

4227 "because it will be ignored when you just specify 40-hex. These refs\n"

@@ -3946,71 +4243,71 @@ msgstr ""

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

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

4245

3949 -#: submodule.c:96 submodule.c:130

4246 +#: submodule.c:97 submodule.c:131

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

4248 msgstr ""

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

4250 "sammanslagningskonflikter först"

4251

3955 -#: submodule.c:100 submodule.c:134

4252 +#: submodule.c:101 submodule.c:135

4253 #, c-format

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

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

4256

3960 -#: submodule.c:108

4257 +#: submodule.c:109

4258 #, c-format

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

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

4261

3965 -#: submodule.c:141

4262 +#: submodule.c:142

4263 #, c-format

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

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

4266

3970 -#: submodule.c:152

4267 +#: submodule.c:153

4268 msgid "staging updated .gitmodules failed"

4269 msgstr "misslyckades köa uppdaterad .gitmodules"

4270

3974 -#: submodule.c:312

4271 +#: submodule.c:315

4272 #, c-format

4273 msgid "in unpopulated submodule '%s'"

4274 msgstr "i ej utcheckad undermodul \"%s\""

4275

3979 -#: submodule.c:343

4276 +#: submodule.c:346

4277 #, c-format

4278 msgid "Pathspec '%s' is in submodule '%.*s'"

4279 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""

4280

3984 -#: submodule.c:833

4281 +#: submodule.c:837

4282 #, c-format

4283 msgid "submodule entry '%s' (%s) is a %s, not a commit"

4284 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"

4285

3989 -#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1724

4286 +#: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743

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

4288 msgstr "Misslyckades slå upp HEAD som giltig referens."

4289

3993 -#: submodule.c:1370

4290 +#: submodule.c:1373

4291 #, c-format

4292 msgid "'%s' not recognized as a git repository"

4293 msgstr "\"%s\" känns inte igen som ett git-arkiv"

4294

3998 -#: submodule.c:1508

4295 +#: submodule.c:1511

4296 #, c-format

4297 msgid "could not start 'git status' in submodule '%s'"

4298 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""

4299

4003 -#: submodule.c:1521

4300 +#: submodule.c:1524

4301 #, c-format

4302 msgid "could not run 'git status' in submodule '%s'"

4303 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""

4304

4008 -#: submodule.c:1614

4305 +#: submodule.c:1617

4306 #, c-format

4307 msgid "submodule '%s' has dirty index"

4308 msgstr "undermodulen \"%s\" har ett smutsigt index"

4309

4013 -#: submodule.c:1878

4310 +#: submodule.c:1716

4311 #, c-format

4312 msgid ""

4313 "relocate_gitdir for submodule '%s' with more than one worktree not supported"

@@ -4018,18 +4315,18 @@ msgstr ""

4315 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "

4316 "stöds ej"

4317

4021 -#: submodule.c:1890 submodule.c:1946

4318 +#: submodule.c:1728 submodule.c:1784

4319 #, c-format

4320 msgid "could not lookup name for submodule '%s'"

4321 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""

4322

4026 -#: submodule.c:1894 builtin/submodule--helper.c:1246

4027 -#: builtin/submodule--helper.c:1256

4323 +#: submodule.c:1732 builtin/submodule--helper.c:1261

4324 +#: builtin/submodule--helper.c:1271

4325 #, c-format

4326 msgid "could not create directory '%s'"

4327 msgstr "kunde inte skapa katalogen \"%s\""

4328

4032 -#: submodule.c:1897

4329 +#: submodule.c:1735

4330 #, c-format

4331 msgid ""

4332 "Migrating git directory of '%s%s' from\n"

@@ -4040,29 +4337,30 @@ msgstr ""

4337 "\"%s\" till\n"

4338 "\"%s\"\n"

4339

4043 -#: submodule.c:1981

4340 +#: submodule.c:1819

4341 #, c-format

4342 msgid "could not recurse into submodule '%s'"

4343 msgstr "kunde inte rekursera in i undermodulen \"%s\""

4344

4048 -#: submodule.c:2025

4345 +#: submodule.c:1863

4346 msgid "could not start ls-files in .."

4347 msgstr "kunde inte starta ls-files i .."

4348

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 -

4056 -#: submodule.c:2064

4349 +#: submodule.c:1902

4350 #, c-format

4351 msgid "ls-tree returned unexpected return code %d"

4352 msgstr "ls-tree returnerade en oväntad returkod %d"

4353

4061 -#: submodule-config.c:263

4354 +#: submodule-config.c:230

4355 +#, c-format

4356 +msgid "ignoring suspicious submodule name: %s"

4357 +msgstr "ignorerar misstänkt undermodulnamn: %s"

4358 +

4359 +#: submodule-config.c:294

4360 msgid "negative values not allowed for submodule.fetchjobs"

4361 msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"

4362

4065 -#: submodule-config.c:436

4363 +#: submodule-config.c:467

4364 #, c-format

4365 msgid "invalid value for %s"

4366 msgstr "ogiltigt värde för %s"

@@ -4078,7 +4376,7 @@ msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""

4376 msgid "unknown value '%s' for key '%s'"

4377 msgstr "okänt värde \"%s\" för nyckeln \"%s\""

4378

4081 -#: trailer.c:539 trailer.c:544 builtin/remote.c:290

4379 +#: trailer.c:539 trailer.c:544 builtin/remote.c:293

4380 #, c-format

4381 msgid "more than one %s"

4382 msgstr "mer än en %s"

@@ -4121,17 +4419,21 @@ msgstr "kunde inte öppna temporär fil"

4419 msgid "could not rename temporary file to %s"

4420 msgstr "kunde inte byta namn på temporär fil till %s"

4421

4124 -#: transport.c:63

4422 +#: transport.c:116

4423 #, c-format

4424 msgid "Would set upstream of '%s' to '%s' of '%s'\n"

4425 msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"

4426

4129 -#: transport.c:152

4427 +#: transport.c:208

4428 #, c-format

4429 msgid "transport: invalid depth option '%s'"

4430 msgstr "transport: ogiltig flagga för depth: ”%s”"

4431

4134 -#: transport.c:916

4432 +#: transport.c:584

4433 +msgid "could not parse transport.color.* config"

4434 +msgstr "kunde inte tolka inställningen för transport.color.*"

4435 +

4436 +#: transport.c:996

4437 #, c-format

4438 msgid ""

4439 "The following submodule paths contain changes that can\n"

@@ -4140,7 +4442,7 @@ msgstr ""

4442 "Följande undermodulsökvägar innehåller ändringar som\n"

4443 "inte kan hittas av fjärrarna:\n"

4444

4143 -#: transport.c:920

4445 +#: transport.c:1000

4446 #, c-format

4447 msgid ""

4448 "\n"

@@ -4167,11 +4469,11 @@ msgstr ""

4469 "för att sända dem till fjärren.\n"

4470 "\n"

4471

4170 -#: transport.c:928

4472 +#: transport.c:1008

4473 msgid "Aborting."

4474 msgstr "Avbryter."

4475

4174 -#: transport-helper.c:1079

4476 +#: transport-helper.c:1087

4477 #, c-format

4478 msgid "Could not read ref %s"

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

@@ -4188,11 +4490,11 @@ msgstr "felformat läge i trädpost"

4490 msgid "empty filename in tree entry"

4491 msgstr "tomt filnamn i trädpost"

4492

4191 -#: tree-walk.c:114

4493 +#: tree-walk.c:113

4494 msgid "too-short tree file"

4495 msgstr "trädfil för kort"

4496

4195 -#: unpack-trees.c:108

4497 +#: unpack-trees.c:111

4498 #, c-format

4499 msgid ""

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

@@ -4201,7 +4503,7 @@ msgstr ""

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

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

4505

4204 -#: unpack-trees.c:110

4506 +#: unpack-trees.c:113

4507 #, c-format

4508 msgid ""

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

@@ -4210,7 +4512,7 @@ msgstr ""

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

4513 "%%s"

4514

4213 -#: unpack-trees.c:113

4515 +#: unpack-trees.c:116

4516 #, c-format

4517 msgid ""

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

@@ -4220,7 +4522,7 @@ msgstr ""

4522 "sammanslagning:\n"

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

4524

4223 -#: unpack-trees.c:115

4525 +#: unpack-trees.c:118

4526 #, c-format

4527 msgid ""

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

@@ -4230,7 +4532,7 @@ msgstr ""

4532 "sammanslagning:\n"

4533 "%%s"

4534

4233 -#: unpack-trees.c:118

4535 +#: unpack-trees.c:121

4536 #, c-format

4537 msgid ""

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

@@ -4239,7 +4541,7 @@ msgstr ""

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

4542 "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."

4543

4242 -#: unpack-trees.c:120

4544 +#: unpack-trees.c:123

4545 #, c-format

4546 msgid ""

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

@@ -4248,7 +4550,7 @@ msgstr ""

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

4551 "%%s"

4552

4251 -#: unpack-trees.c:125

4553 +#: unpack-trees.c:128

4554 #, c-format

4555 msgid ""

4556 "Updating the following directories would lose untracked files in them:\n"

@@ -4258,7 +4560,7 @@ msgstr ""

4560 "dem:\n"

4561 "%s"

4562

4261 -#: unpack-trees.c:129

4563 +#: unpack-trees.c:132

4564 #, c-format

4565 msgid ""

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

@@ -4267,7 +4569,7 @@ msgstr ""

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

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

4571

4270 -#: unpack-trees.c:131

4572 +#: unpack-trees.c:134

4573 #, c-format

4574 msgid ""

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

@@ -4276,7 +4578,7 @@ msgstr ""

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

4579 "%%s"

4580

4279 -#: unpack-trees.c:134

4581 +#: unpack-trees.c:137

4582 #, c-format

4583 msgid ""

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

@@ -4286,7 +4588,7 @@ msgstr ""

4588 "sammanslagningen:\n"

4589 "%%sFlytta eller ta bort dem innan du slår samman."

4590

4289 -#: unpack-trees.c:136

4591 +#: unpack-trees.c:139

4592 #, c-format

4593 msgid ""

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

@@ -4296,7 +4598,7 @@ msgstr ""

4598 "sammanslagningen:\n"

4599 "%%s"

4600

4299 -#: unpack-trees.c:139

4601 +#: unpack-trees.c:142

4602 #, c-format

4603 msgid ""

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

@@ -4305,7 +4607,7 @@ msgstr ""

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

4608 "%%sFlytta eller ta bort dem innan du \"%s\"."

4609

4308 -#: unpack-trees.c:141

4610 +#: unpack-trees.c:144

4611 #, c-format

4612 msgid ""

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

@@ -4314,7 +4616,7 @@ msgstr ""

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

4617 "%%s"

4618

4317 -#: unpack-trees.c:146

4619 +#: unpack-trees.c:150

4620 #, c-format

4621 msgid ""

4622 "The following untracked working tree files would be overwritten by "

@@ -4325,7 +4627,7 @@ msgstr ""

4627 "utcheckningen:\n"

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

4629

4328 -#: unpack-trees.c:148

4630 +#: unpack-trees.c:152

4631 #, c-format

4632 msgid ""

4633 "The following untracked working tree files would be overwritten by "

@@ -4336,7 +4638,7 @@ msgstr ""

4638 "utcheckningen:\n"

4639 "%%s"

4640

4339 -#: unpack-trees.c:151

4641 +#: unpack-trees.c:155

4642 #, c-format

4643 msgid ""

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

@@ -4346,7 +4648,7 @@ msgstr ""

4648 "sammanslagningen:\n"

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

4650

4349 -#: unpack-trees.c:153

4651 +#: unpack-trees.c:157

4652 #, c-format

4653 msgid ""

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

@@ -4356,7 +4658,7 @@ msgstr ""

4658 "sammanslagningen:\n"

4659 "%%s"

4660

4359 -#: unpack-trees.c:156

4661 +#: unpack-trees.c:160

4662 #, c-format

4663 msgid ""

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

@@ -4365,7 +4667,7 @@ msgstr ""

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

4668 "%%sFlytta eller ta bort dem innan du \"%s\"."

4669

4368 -#: unpack-trees.c:158

4670 +#: unpack-trees.c:162

4671 #, c-format

4672 msgid ""

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

@@ -4374,12 +4676,12 @@ msgstr ""

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

4677 "%%s"

4678

4377 -#: unpack-trees.c:165

4679 +#: unpack-trees.c:170

4680 #, c-format

4681 msgid "Entry '%s' overlaps with '%s'. Cannot bind."

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

4683

4382 -#: unpack-trees.c:168

4684 +#: unpack-trees.c:173

4685 #, c-format

4686 msgid ""

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

@@ -4388,7 +4690,7 @@ msgstr ""

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

4691 "%s"

4692

4391 -#: unpack-trees.c:170

4693 +#: unpack-trees.c:175

4694 #, c-format

4695 msgid ""

4696 "The following working tree files would be overwritten by sparse checkout "

@@ -4399,7 +4701,7 @@ msgstr ""

4701 "utcheckning:\n"

4702 "%s"

4703

4402 -#: unpack-trees.c:172

4704 +#: unpack-trees.c:177

4705 #, c-format

4706 msgid ""

4707 "The following working tree files would be removed by sparse checkout "

@@ -4410,7 +4712,7 @@ msgstr ""

4712 "utcheckning:\n"

4713 "%s"

4714

4413 -#: unpack-trees.c:174

4715 +#: unpack-trees.c:179

4716 #, c-format

4717 msgid ""

4718 "Cannot update submodule:\n"

@@ -4419,12 +4721,12 @@ msgstr ""

4721 "Kan inte uppdatera undermodul:\n"

4722 "%s"

4723

4422 -#: unpack-trees.c:251

4724 +#: unpack-trees.c:262

4725 #, c-format

4726 msgid "Aborting\n"

4727 msgstr "Avbryter\n"

4728

4427 -#: unpack-trees.c:333

4729 +#: unpack-trees.c:344

4730 msgid "Checking out files"

4731 msgstr "Checkar ut filer"

4732

@@ -4493,7 +4795,7 @@ msgid "could not open '%s' for reading and writing"

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

4796

4797 #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770

4496 -#: builtin/am.c:862 builtin/merge.c:1044

4798 +#: builtin/am.c:862 builtin/merge.c:1042

4799 #, c-format

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

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

@@ -4507,155 +4809,155 @@ msgstr "kan inte komma åt \"%s\""

4809 msgid "unable to get current working directory"

4810 msgstr "kan inte hämta aktuell arbetskatalog"

4811

4510 -#: wt-status.c:151

4812 +#: wt-status.c:154

4813 msgid "Unmerged paths:"

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

4815

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

4816 +#: wt-status.c:181 wt-status.c:208

4817 #, c-format

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

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

4820

4519 -#: wt-status.c:180 wt-status.c:207

4821 +#: wt-status.c:183 wt-status.c:210

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

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

4824

4523 -#: wt-status.c:184

4825 +#: wt-status.c:187

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

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

4828

4527 -#: wt-status.c:186 wt-status.c:190

4829 +#: wt-status.c:189 wt-status.c:193

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

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

4832

4531 -#: wt-status.c:188

4833 +#: wt-status.c:191

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

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

4836

4535 -#: wt-status.c:199 wt-status.c:1007

4837 +#: wt-status.c:202 wt-status.c:1015

4838 msgid "Changes to be committed:"

4839 msgstr "Ändringar att checka in:"

4840

4539 -#: wt-status.c:217 wt-status.c:1016

4841 +#: wt-status.c:220 wt-status.c:1024

4842 msgid "Changes not staged for commit:"

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

4844

4543 -#: wt-status.c:221

4845 +#: wt-status.c:224

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

4847 msgstr ""

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

4849

4548 -#: wt-status.c:223

4850 +#: wt-status.c:226

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

4852 msgstr ""

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

4854

4553 -#: wt-status.c:224

4855 +#: wt-status.c:227

4856 msgid ""

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

4858 msgstr ""

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

4860 "arbetskatalogen)"

4861

4560 -#: wt-status.c:226

4862 +#: wt-status.c:229

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

4864 msgstr ""

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

4866

4565 -#: wt-status.c:238

4867 +#: wt-status.c:241

4868 #, c-format

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

4870 msgstr ""

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

4872

4571 -#: wt-status.c:253

4873 +#: wt-status.c:256

4874 msgid "both deleted:"

4875 msgstr "borttaget av bägge:"

4876

4575 -#: wt-status.c:255

4877 +#: wt-status.c:258

4878 msgid "added by us:"

4879 msgstr "tillagt av oss:"

4880

4579 -#: wt-status.c:257

4881 +#: wt-status.c:260

4882 msgid "deleted by them:"

4883 msgstr "borttaget av dem:"

4884

4583 -#: wt-status.c:259

4885 +#: wt-status.c:262

4886 msgid "added by them:"

4887 msgstr "tillagt av dem:"

4888

4587 -#: wt-status.c:261

4889 +#: wt-status.c:264

4890 msgid "deleted by us:"

4891 msgstr "borttaget av oss:"

4892

4591 -#: wt-status.c:263

4893 +#: wt-status.c:266

4894 msgid "both added:"

4895 msgstr "tillagt av bägge:"

4896

4595 -#: wt-status.c:265

4897 +#: wt-status.c:268

4898 msgid "both modified:"

4899 msgstr "ändrat av bägge:"

4900

4599 -#: wt-status.c:275

4901 +#: wt-status.c:278

4902 msgid "new file:"

4903 msgstr "ny fil:"

4904

4603 -#: wt-status.c:277

4905 +#: wt-status.c:280

4906 msgid "copied:"

4907 msgstr "kopierad:"

4908

4607 -#: wt-status.c:279

4909 +#: wt-status.c:282

4910 msgid "deleted:"

4911 msgstr "borttagen:"

4912

4611 -#: wt-status.c:281

4913 +#: wt-status.c:284

4914 msgid "modified:"

4915 msgstr "ändrad:"

4916

4615 -#: wt-status.c:283

4917 +#: wt-status.c:286

4918 msgid "renamed:"

4919 msgstr "namnbytt:"

4920

4619 -#: wt-status.c:285

4921 +#: wt-status.c:288

4922 msgid "typechange:"

4923 msgstr "typbyte:"

4924

4623 -#: wt-status.c:287

4925 +#: wt-status.c:290

4926 msgid "unknown:"

4927 msgstr "okänd:"

4928

4627 -#: wt-status.c:289

4929 +#: wt-status.c:292

4930 msgid "unmerged:"

4931 msgstr "osammanslagen:"

4932

4631 -#: wt-status.c:369

4933 +#: wt-status.c:372

4934 msgid "new commits, "

4935 msgstr "nya incheckningar, "

4936

4635 -#: wt-status.c:371

4937 +#: wt-status.c:374

4938 msgid "modified content, "

4939 msgstr "ändrat innehåll, "

4940

4639 -#: wt-status.c:373

4941 +#: wt-status.c:376

4942 msgid "untracked content, "

4943 msgstr "ospårat innehåll, "

4944

4643 -#: wt-status.c:847

4945 +#: wt-status.c:853

4946 #, c-format

4947 msgid "Your stash currently has %d entry"

4948 msgid_plural "Your stash currently has %d entries"

4949 msgstr[0] "Stashen innehåller just nu %d post"

4950 msgstr[1] "Stashen innehåller just nu %d poster"

4951

4650 -#: wt-status.c:879

4952 +#: wt-status.c:885

4953 msgid "Submodules changed but not updated:"

4954 msgstr "Undermoduler ändrade men inte uppdaterade:"

4955

4654 -#: wt-status.c:881

4956 +#: wt-status.c:887

4957 msgid "Submodule changes to be committed:"

4958 msgstr "Undermodulers ändringar att checka in:"

4959

4658 -#: wt-status.c:963

4960 +#: wt-status.c:969

4961 msgid ""

4962 "Do not modify or remove the line above.\n"

4963 "Everything below it will be ignored."

@@ -4663,107 +4965,107 @@ msgstr ""

4965 "Raden ovan får inte ändras eller tas bort.\n"

4966 "Allt under den kommer tas bort."

4967

4666 -#: wt-status.c:1076

4968 +#: wt-status.c:1084

4969 msgid "You have unmerged paths."

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

4971

4670 -#: wt-status.c:1079

4972 +#: wt-status.c:1087

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

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

4975

4674 -#: wt-status.c:1081

4976 +#: wt-status.c:1089

4977 msgid " (use \"git merge --abort\" to abort the merge)"

4978 msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"

4979

4678 -#: wt-status.c:1086

4980 +#: wt-status.c:1094

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

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

4983

4682 -#: wt-status.c:1089

4984 +#: wt-status.c:1097

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

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

4987

4686 -#: wt-status.c:1099

4988 +#: wt-status.c:1107

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

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

4991

4690 -#: wt-status.c:1102

4992 +#: wt-status.c:1110

4993 msgid "The current patch is empty."

4994 msgstr "Aktuell patch är tom."

4995

4694 -#: wt-status.c:1106

4996 +#: wt-status.c:1114

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

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

4999

4698 -#: wt-status.c:1108

5000 +#: wt-status.c:1116

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

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

5003

4702 -#: wt-status.c:1110

5004 +#: wt-status.c:1118

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

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

5007

4706 -#: wt-status.c:1242

5008 +#: wt-status.c:1250

5009 msgid "git-rebase-todo is missing."

5010 msgstr "git-rebase-todo saknas."

5011

4710 -#: wt-status.c:1244

5012 +#: wt-status.c:1252

5013 msgid "No commands done."

5014 msgstr "Inga kommandon utförda."

5015

4714 -#: wt-status.c:1247

5016 +#: wt-status.c:1255

5017 #, c-format

5018 msgid "Last command done (%d command done):"

5019 msgid_plural "Last commands done (%d commands done):"

5020 msgstr[0] "Sista kommandot utfört (%d kommando utfört):"

5021 msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"

5022

4721 -#: wt-status.c:1258

5023 +#: wt-status.c:1266

5024 #, c-format

5025 msgid " (see more in file %s)"

5026 msgstr " (se fler i filen %s)"

5027

4726 -#: wt-status.c:1263

5028 +#: wt-status.c:1271

5029 msgid "No commands remaining."

5030 msgstr "Inga kommandon återstår."

5031

4730 -#: wt-status.c:1266

5032 +#: wt-status.c:1274

5033 #, c-format

5034 msgid "Next command to do (%d remaining command):"

5035 msgid_plural "Next commands to do (%d remaining commands):"

5036 msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"

5037 msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"

5038

4737 -#: wt-status.c:1274

5039 +#: wt-status.c:1282

5040 msgid " (use \"git rebase --edit-todo\" to view and edit)"

5041 msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"

5042

4741 -#: wt-status.c:1287

5043 +#: wt-status.c:1295

5044 #, c-format

5045 msgid "You are currently rebasing branch '%s' on '%s'."

5046 msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."

5047

4746 -#: wt-status.c:1292

5048 +#: wt-status.c:1300

5049 msgid "You are currently rebasing."

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

5051

4750 -#: wt-status.c:1306

5052 +#: wt-status.c:1314

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

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

5055

4754 -#: wt-status.c:1308

5056 +#: wt-status.c:1316

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

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

5059

4758 -#: wt-status.c:1310

5060 +#: wt-status.c:1318

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

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

5063

4762 -#: wt-status.c:1316

5064 +#: wt-status.c:1324

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

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

5067

4766 -#: wt-status.c:1320

5068 +#: wt-status.c:1328

5069 #, c-format

5070 msgid ""

5071 "You are currently splitting a commit while rebasing branch '%s' on '%s'."

@@ -4771,126 +5073,126 @@ msgstr ""

5073 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "

5074 "ovanpå \"%s\"."

5075

4774 -#: wt-status.c:1325

5076 +#: wt-status.c:1333

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

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

5079

4778 -#: wt-status.c:1328

5080 +#: wt-status.c:1336

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

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

5083

4782 -#: wt-status.c:1332

5084 +#: wt-status.c:1340

5085 #, c-format

5086 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."

5087 msgstr ""

5088 "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "

5089 "ovanpå \"%s\"."

5090

4789 -#: wt-status.c:1337

5091 +#: wt-status.c:1345

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

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

5094

4793 -#: wt-status.c:1340

5095 +#: wt-status.c:1348

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

5097 msgstr ""

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

5099

4798 -#: wt-status.c:1342

5100 +#: wt-status.c:1350

5101 msgid ""

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

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

5104

4803 -#: wt-status.c:1352

5105 +#: wt-status.c:1360

5106 #, c-format

5107 msgid "You are currently cherry-picking commit %s."

5108 msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."

5109

4808 -#: wt-status.c:1357

5110 +#: wt-status.c:1365

5111 msgid " (fix conflicts and run \"git cherry-pick --continue\")"

5112 msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"

5113

4812 -#: wt-status.c:1360

5114 +#: wt-status.c:1368

5115 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"

5116 msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"

5117

4816 -#: wt-status.c:1362

5118 +#: wt-status.c:1370

5119 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"

5120 msgstr ""

5121 " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"

5122 "operationen)"

5123

4822 -#: wt-status.c:1371

5124 +#: wt-status.c:1379

5125 #, c-format

5126 msgid "You are currently reverting commit %s."

5127 msgstr "Du håller på med att ångra incheckningen %s."

5128

4827 -#: wt-status.c:1376

5129 +#: wt-status.c:1384

5130 msgid " (fix conflicts and run \"git revert --continue\")"

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

5132

4831 -#: wt-status.c:1379

5133 +#: wt-status.c:1387

5134 msgid " (all conflicts fixed: run \"git revert --continue\")"

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

5136

4835 -#: wt-status.c:1381

5137 +#: wt-status.c:1389

5138 msgid " (use \"git revert --abort\" to cancel the revert operation)"

5139 msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"

5140

4839 -#: wt-status.c:1392

5141 +#: wt-status.c:1400

5142 #, c-format

5143 msgid "You are currently bisecting, started from branch '%s'."

5144 msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."

5145

4844 -#: wt-status.c:1396

5146 +#: wt-status.c:1404

5147 msgid "You are currently bisecting."

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

5149

4848 -#: wt-status.c:1399

5150 +#: wt-status.c:1407

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

5152 msgstr ""

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

5154

4853 -#: wt-status.c:1596

5155 +#: wt-status.c:1604

5156 msgid "On branch "

5157 msgstr "På grenen "

5158

4857 -#: wt-status.c:1602

5159 +#: wt-status.c:1610

5160 msgid "interactive rebase in progress; onto "

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

5162

4861 -#: wt-status.c:1604

5163 +#: wt-status.c:1612

5164 msgid "rebase in progress; onto "

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

5166

4865 -#: wt-status.c:1609

5167 +#: wt-status.c:1617

5168 msgid "HEAD detached at "

5169 msgstr "HEAD frånkopplad vid "

5170

4869 -#: wt-status.c:1611

5171 +#: wt-status.c:1619

5172 msgid "HEAD detached from "

5173 msgstr "HEAD frånkopplad från "

5174

4873 -#: wt-status.c:1614

5175 +#: wt-status.c:1622

5176 msgid "Not currently on any branch."

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

5178

4877 -#: wt-status.c:1634

5179 +#: wt-status.c:1642

5180 msgid "Initial commit"

5181 msgstr "Första incheckning"

5182

4881 -#: wt-status.c:1635

5183 +#: wt-status.c:1643

5184 msgid "No commits yet"

5185 msgstr "Inga incheckningar ännu"

5186

4885 -#: wt-status.c:1649

5187 +#: wt-status.c:1657

5188 msgid "Untracked files"

5189 msgstr "Ospårade filer"

5190

4889 -#: wt-status.c:1651

5191 +#: wt-status.c:1659

5192 msgid "Ignored files"

5193 msgstr "Ignorerade filer"

5194

4893 -#: wt-status.c:1655

5195 +#: wt-status.c:1663

5196 #, c-format

5197 msgid ""

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

@@ -4902,32 +5204,32 @@ msgstr ""

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

5205

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

4905 -#: wt-status.c:1661

5207 +#: wt-status.c:1669

5208 #, c-format

5209 msgid "Untracked files not listed%s"

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

5211

4910 -#: wt-status.c:1663

5212 +#: wt-status.c:1671

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

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

5215

4914 -#: wt-status.c:1669

5216 +#: wt-status.c:1677

5217 msgid "No changes"

5218 msgstr "Inga ändringar"

5219

4918 -#: wt-status.c:1674

5220 +#: wt-status.c:1682

5221 #, c-format

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

5223 msgstr ""

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

5225 "\")\n"

5226

4925 -#: wt-status.c:1677

5227 +#: wt-status.c:1685

5228 #, c-format

5229 msgid "no changes added to commit\n"

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

5231

4930 -#: wt-status.c:1680

5232 +#: wt-status.c:1688

5233 #, c-format

5234 msgid ""

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

@@ -4936,67 +5238,67 @@ msgstr ""

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

5239 "\")\n"

5240

4939 -#: wt-status.c:1683

5241 +#: wt-status.c:1691

5242 #, c-format

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

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

5245

4944 -#: wt-status.c:1686

5246 +#: wt-status.c:1694

5247 #, c-format

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

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

5250

4949 -#: wt-status.c:1689 wt-status.c:1694

5251 +#: wt-status.c:1697 wt-status.c:1702

5252 #, c-format

5253 msgid "nothing to commit\n"

5254 msgstr "inget att checka in\n"

5255

4954 -#: wt-status.c:1692

5256 +#: wt-status.c:1700

5257 #, c-format

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

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

5260

4959 -#: wt-status.c:1696

5261 +#: wt-status.c:1704

5262 #, c-format

5263 msgid "nothing to commit, working tree clean\n"

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

5265

4964 -#: wt-status.c:1809

5266 +#: wt-status.c:1817

5267 msgid "No commits yet on "

5268 msgstr "Inga incheckningar ännu på "

5269

4968 -#: wt-status.c:1813

5270 +#: wt-status.c:1821

5271 msgid "HEAD (no branch)"

5272 msgstr "HEAD (ingen gren)"

5273

4972 -#: wt-status.c:1844

5274 +#: wt-status.c:1852

5275 msgid "different"

5276 msgstr "olika"

5277

4976 -#: wt-status.c:1846 wt-status.c:1854

5278 +#: wt-status.c:1854 wt-status.c:1862

5279 msgid "behind "

5280 msgstr "efter "

5281

4980 -#: wt-status.c:1849 wt-status.c:1852

5282 +#: wt-status.c:1857 wt-status.c:1860

5283 msgid "ahead "

5284 msgstr "före "

5285

5286 #. TRANSLATORS: the action is e.g. "pull with rebase"

4985 -#: wt-status.c:2358

5287 +#: wt-status.c:2366

5288 #, c-format

5289 msgid "cannot %s: You have unstaged changes."

5290 msgstr "kan inte %s: Du har oköade ändringar."

5291

4990 -#: wt-status.c:2364

5292 +#: wt-status.c:2372

5293 msgid "additionally, your index contains uncommitted changes."

5294 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."

5295

4994 -#: wt-status.c:2366

5296 +#: wt-status.c:2374

5297 #, c-format

5298 msgid "cannot %s: Your index contains uncommitted changes."

5299 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."

5300

4999 -#: compat/precompose_utf8.c:58 builtin/clone.c:440

5301 +#: compat/precompose_utf8.c:58 builtin/clone.c:442

5302 #, c-format

5303 msgid "failed to unlink '%s'"

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

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

5312 msgid "unexpected diff status %c"

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

5314

5013 -#: builtin/add.c:88 builtin/commit.c:257

5315 +#: builtin/add.c:88 builtin/commit.c:266

5316 msgid "updating files failed"

5317 msgstr "misslyckades uppdatera filer"

5318

@@ -5054,77 +5356,77 @@ msgstr "Tom patch. Avbryter."

5356 msgid "Could not apply '%s'"

5357 msgstr "Kunde inte tillämpa \"%s\""

5358

5057 -#: builtin/add.c:271

5359 +#: builtin/add.c:269

5360 msgid "The following paths are ignored by one of your .gitignore files:\n"

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

5362

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

5363 +#: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123

5364 +#: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557

5365 +#: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165

5366 msgid "dry run"

5367 msgstr "testkörning"

5368

5067 -#: builtin/add.c:294

5369 +#: builtin/add.c:292

5370 msgid "interactive picking"

5371 msgstr "plocka interaktivt"

5372

5071 -#: builtin/add.c:295 builtin/checkout.c:1128 builtin/reset.c:302

5373 +#: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302

5374 msgid "select hunks interactively"

5375 msgstr "välj stycken interaktivt"

5376

5075 -#: builtin/add.c:296

5377 +#: builtin/add.c:294

5378 msgid "edit current diff and apply"

5379 msgstr "redigera aktuell diff och applicera"

5380

5079 -#: builtin/add.c:297

5381 +#: builtin/add.c:295

5382 msgid "allow adding otherwise ignored files"

5383 msgstr "tillåt lägga till annars ignorerade filer"

5384

5083 -#: builtin/add.c:298

5385 +#: builtin/add.c:296

5386 msgid "update tracked files"

5387 msgstr "uppdatera spårade filer"

5388

5087 -#: builtin/add.c:299

5389 +#: builtin/add.c:297

5390 msgid "renormalize EOL of tracked files (implies -u)"

5391 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"

5392

5091 -#: builtin/add.c:300

5393 +#: builtin/add.c:298

5394 msgid "record only the fact that the path will be added later"

5395 msgstr "registrera endast att sökvägen kommer läggas till senare"

5396

5095 -#: builtin/add.c:301

5397 +#: builtin/add.c:299

5398 msgid "add changes from all tracked and untracked files"

5399 msgstr "lägg till ändringar från alla spårade och ospårade filer"

5400

5099 -#: builtin/add.c:304

5401 +#: builtin/add.c:302

5402 msgid "ignore paths removed in the working tree (same as --no-all)"

5403 msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"

5404

5103 -#: builtin/add.c:306

5405 +#: builtin/add.c:304

5406 msgid "don't add, only refresh the index"

5407 msgstr "lägg inte till, uppdatera endast indexet"

5408

5107 -#: builtin/add.c:307

5409 +#: builtin/add.c:305

5410 msgid "just skip files which cannot be added because of errors"

5411 msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"

5412

5111 -#: builtin/add.c:308

5413 +#: builtin/add.c:306

5414 msgid "check if - even missing - files are ignored in dry run"

5415 msgstr "se om - även saknade - filer ignoreras i testkörning"

5416

5115 -#: builtin/add.c:309 builtin/update-index.c:964

5417 +#: builtin/add.c:307 builtin/update-index.c:974

5418 msgid "(+/-)x"

5419 msgstr "(+/-)x"

5420

5119 -#: builtin/add.c:309 builtin/update-index.c:965

5421 +#: builtin/add.c:307 builtin/update-index.c:975

5422 msgid "override the executable bit of the listed files"

5423 msgstr "överstyr exekveringsbiten för angivna filer"

5424

5123 -#: builtin/add.c:311

5425 +#: builtin/add.c:309

5426 msgid "warn when adding an embedded repository"

5427 msgstr "varna när ett inbyggt arkiv läggs till"

5428

5127 -#: builtin/add.c:326

5429 +#: builtin/add.c:324

5430 #, c-format

5431 msgid ""

5432 "You've added another git repository inside your current repository.\n"

@@ -5155,47 +5457,47 @@ msgstr ""

5457 "\n"

5458 "Se ”git help submodule” för ytterligare information."

5459

5158 -#: builtin/add.c:354

5460 +#: builtin/add.c:352

5461 #, c-format

5462 msgid "adding embedded git repository: %s"

5463 msgstr "lägger till inbäddat git-arkiv: %s"

5464

5163 -#: builtin/add.c:372

5465 +#: builtin/add.c:370

5466 #, c-format

5467 msgid "Use -f if you really want to add them.\n"

5468 msgstr "Använd -f om du verkligen vill lägga till dem.\n"

5469

5168 -#: builtin/add.c:380

5470 +#: builtin/add.c:378

5471 msgid "adding files failed"

5472 msgstr "misslyckades lägga till filer"

5473

5172 -#: builtin/add.c:417

5474 +#: builtin/add.c:416

5475 msgid "-A and -u are mutually incompatible"

5476 msgstr "-A och -u är ömsesidigt inkompatibla"

5477

5176 -#: builtin/add.c:424

5478 +#: builtin/add.c:423

5479 msgid "Option --ignore-missing can only be used together with --dry-run"

5480 msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"

5481

5180 -#: builtin/add.c:428

5482 +#: builtin/add.c:427

5483 #, c-format

5484 msgid "--chmod param '%s' must be either -x or +x"

5485 msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"

5486

5185 -#: builtin/add.c:443

5487 +#: builtin/add.c:442

5488 #, c-format

5489 msgid "Nothing specified, nothing added.\n"

5490 msgstr "Inget angivet, inget tillagt.\n"

5491

5190 -#: builtin/add.c:444

5492 +#: builtin/add.c:443

5493 #, c-format

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

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

5496

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

5497 +#: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280

5498 +#: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325

5499 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241

5198 -#: builtin/rm.c:271 builtin/submodule--helper.c:326

5500 +#: builtin/rm.c:270 builtin/submodule--helper.c:328

5501 msgid "index file corrupt"

5502 msgstr "indexfilen trasig"

5503

@@ -5247,7 +5549,7 @@ msgstr "ogiltig tidszons-offset"

5549 msgid "Patch format detection failed."

5550 msgstr "Misslyckades detektera patchformat."

5551

5250 -#: builtin/am.c:1013 builtin/clone.c:405

5552 +#: builtin/am.c:1013 builtin/clone.c:407

5553 #, c-format

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

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

@@ -5256,7 +5558,7 @@ msgstr "misslyckades skapa katalogen \"%s\""

5558 msgid "Failed to split patches."

5559 msgstr "Misslyckades dela patchar."

5560

5259 -#: builtin/am.c:1148 builtin/commit.c:342

5561 +#: builtin/am.c:1148 builtin/commit.c:351

5562 msgid "unable to write index file"

5563 msgstr "kan inte skriva indexfil"

5564

@@ -5433,7 +5735,7 @@ msgid "allow fall back on 3way merging if needed"

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

5736

5737 #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57

5436 -#: builtin/repack.c:182

5738 +#: builtin/repack.c:192

5739 msgid "be quiet"

5740 msgstr "var tyst"

5741

@@ -5475,16 +5777,17 @@ msgstr "ta bort allting före en saxlinje"

5777 msgid "pass it through git-apply"

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

5779

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

5780 +#: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665

5781 +#: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:207

5782 +#: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201

5783 +#: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631

5784 +#: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144

5785 +#: parse-options.h:146 parse-options.h:258

5786 msgid "n"

5787 msgstr "n"

5788

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

5789 +#: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38

5790 +#: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39

5791 msgid "format"

5792 msgstr "format"

5793

@@ -5528,8 +5831,8 @@ msgstr "ljug om incheckningsdatum"

5831 msgid "use current timestamp for author date"

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

5833

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

5834 +#: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:238

5835 +#: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399

5836 msgid "key-id"

5837 msgstr "nyckel-id"

5838

@@ -5668,115 +5971,141 @@ msgstr "--write-terms kräver två argument"

5971 msgid "--bisect-clean-state requires no arguments"

5972 msgstr "--bisect-clean-state tar inga argument"

5973

5671 -#: builtin/blame.c:27

5974 +#: builtin/blame.c:29

5975 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"

5976 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"

5977

5675 -#: builtin/blame.c:32

5978 +#: builtin/blame.c:34

5979 msgid "<rev-opts> are documented in git-rev-list(1)"

5980 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"

5981

5679 -#: builtin/blame.c:677

5982 +#: builtin/blame.c:404

5983 +#, c-format

5984 +msgid "expecting a color: %s"

5985 +msgstr "förväntade en färg: %s"

5986 +

5987 +#: builtin/blame.c:411

5988 +msgid "must end with a color"

5989 +msgstr "måste sluta med en färg"

5990 +

5991 +#: builtin/blame.c:697

5992 +#, c-format

5993 +msgid "invalid color '%s' in color.blame.repeatedLines"

5994 +msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"

5995 +

5996 +#: builtin/blame.c:715

5997 +msgid "invalid value for blame.coloring"

5998 +msgstr "ogiltigt värde för blame.coloring"

5999 +

6000 +#: builtin/blame.c:786

6001 msgid "Show blame entries as we find them, incrementally"

6002 msgstr "Visa klandringsposter när vi hittar dem, interaktivt"

6003

5683 -#: builtin/blame.c:678

6004 +#: builtin/blame.c:787

6005 msgid "Show blank SHA-1 for boundary commits (Default: off)"

6006 msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"

6007

5687 -#: builtin/blame.c:679

6008 +#: builtin/blame.c:788

6009 msgid "Do not treat root commits as boundaries (Default: off)"

6010 msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"

6011

5691 -#: builtin/blame.c:680

6012 +#: builtin/blame.c:789

6013 msgid "Show work cost statistics"

6014 msgstr "Visa statistik över arbetskostnad"

6015

5695 -#: builtin/blame.c:681

6016 +#: builtin/blame.c:790

6017 msgid "Force progress reporting"

6018 msgstr "Tvinga förloppsrapportering"

6019

5699 -#: builtin/blame.c:682

6020 +#: builtin/blame.c:791

6021 msgid "Show output score for blame entries"

6022 msgstr "Visa utdatapoäng för klandringsposter"

6023

5703 -#: builtin/blame.c:683

6024 +#: builtin/blame.c:792

6025 msgid "Show original filename (Default: auto)"

6026 msgstr "Visa originalfilnamn (Standard: auto)"

6027

5707 -#: builtin/blame.c:684

6028 +#: builtin/blame.c:793

6029 msgid "Show original linenumber (Default: off)"

6030 msgstr "Visa ursprungligt radnummer (Standard: av)"

6031

5711 -#: builtin/blame.c:685

6032 +#: builtin/blame.c:794

6033 msgid "Show in a format designed for machine consumption"

6034 msgstr "Visa i ett format avsett för maskinkonsumtion"

6035

5715 -#: builtin/blame.c:686

6036 +#: builtin/blame.c:795

6037 msgid "Show porcelain format with per-line commit information"

6038 msgstr "Visa porslinsformat med per-rad-incheckningsinformation"

6039

5719 -#: builtin/blame.c:687

6040 +#: builtin/blame.c:796

6041 msgid "Use the same output mode as git-annotate (Default: off)"

6042 msgstr "Använd samma utdataläge som git-annotate (Standard: av)"

6043

5723 -#: builtin/blame.c:688

6044 +#: builtin/blame.c:797

6045 msgid "Show raw timestamp (Default: off)"

6046 msgstr "Visa rå tidsstämpel (Standard: av)"

6047

5727 -#: builtin/blame.c:689

6048 +#: builtin/blame.c:798

6049 msgid "Show long commit SHA1 (Default: off)"

6050 msgstr "Visa lång inchecknings-SHA1 (Standard: av)"

6051

5731 -#: builtin/blame.c:690

6052 +#: builtin/blame.c:799

6053 msgid "Suppress author name and timestamp (Default: off)"

6054 msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"

6055

5735 -#: builtin/blame.c:691

6056 +#: builtin/blame.c:800

6057 msgid "Show author email instead of name (Default: off)"

6058 msgstr "Visa författarens e-post istället för namn (Standard: av)"

6059

5739 -#: builtin/blame.c:692

6060 +#: builtin/blame.c:801

6061 msgid "Ignore whitespace differences"

6062 msgstr "Ignorera ändringar i blanksteg"

6063

5743 -#: builtin/blame.c:699

6064 +#: builtin/blame.c:802

6065 +msgid "color redundant metadata from previous line differently"

6066 +msgstr "färglägg redundant metadata från tidigare rader annorlunda"

6067 +

6068 +#: builtin/blame.c:803

6069 +msgid "color lines by age"

6070 +msgstr "färglägg rader efter ålder"

6071 +

6072 +#: builtin/blame.c:810

6073 msgid "Use an experimental heuristic to improve diffs"

6074 msgstr "Använd en experimentell algoritm för att förbättra diffar"

6075

5747 -#: builtin/blame.c:701

6076 +#: builtin/blame.c:812

6077 msgid "Spend extra cycles to find better match"

6078 msgstr "Slösa extra cykler med att hitta bättre träff"

6079

5751 -#: builtin/blame.c:702

6080 +#: builtin/blame.c:813

6081 msgid "Use revisions from <file> instead of calling git-rev-list"

6082 msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"

6083

5755 -#: builtin/blame.c:703

6084 +#: builtin/blame.c:814

6085 msgid "Use <file>'s contents as the final image"

6086 msgstr "Använd <fil>s innehåll som slutgiltig bild"

6087

5759 -#: builtin/blame.c:704 builtin/blame.c:705

6088 +#: builtin/blame.c:815 builtin/blame.c:816

6089 msgid "score"

6090 msgstr "poäng"

6091

5763 -#: builtin/blame.c:704

6092 +#: builtin/blame.c:815

6093 msgid "Find line copies within and across files"

6094 msgstr "Hitta kopierade rader inuti och mellan filer"

6095

5767 -#: builtin/blame.c:705

6096 +#: builtin/blame.c:816

6097 msgid "Find line movements within and across files"

6098 msgstr "Hitta flyttade rader inuti och mellan filer"

6099

5771 -#: builtin/blame.c:706

6100 +#: builtin/blame.c:817

6101 msgid "n,m"

6102 msgstr "n,m"

6103

5775 -#: builtin/blame.c:706

6104 +#: builtin/blame.c:817

6105 msgid "Process only line range n,m, counting from 1"

6106 msgstr "Behandla endast radintervallet n,m, med början på 1"

6107

5779 -#: builtin/blame.c:753

6108 +#: builtin/blame.c:866

6109 msgid "--progress can't be used with --incremental or porcelain formats"

6110 msgstr "--progress kan inte användas med --incremental eller porslinsformat"

6111

@@ -5788,18 +6117,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"

6117 #. your language may need more or fewer display

6118 #. columns.

6119 #.

5791 -#: builtin/blame.c:804

6120 +#: builtin/blame.c:917

6121 msgid "4 years, 11 months ago"

6122 msgstr "4 år, 11 månader sedan"

6123

5795 -#: builtin/blame.c:890

6124 +#: builtin/blame.c:1003

6125 #, c-format

6126 msgid "file %s has only %lu line"

6127 msgid_plural "file %s has only %lu lines"

6128 msgstr[0] "filen %s har bara %lu rad"

6129 msgstr[1] "filen %s har bara %lu rader"

6130

5802 -#: builtin/blame.c:936

6131 +#: builtin/blame.c:1049

6132 msgid "Blaming lines"

6133 msgstr "Klandra rader"

6134

@@ -5910,66 +6239,66 @@ msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"

6239 msgid "Deleted branch %s (was %s).\n"

6240 msgstr "Tog bort grenen %s (var %s).\n"

6241

5913 -#: builtin/branch.c:417 builtin/tag.c:58

6242 +#: builtin/branch.c:416 builtin/tag.c:58

6243 msgid "unable to parse format string"

6244 msgstr "kan inte tolka formatsträng"

6245

5917 -#: builtin/branch.c:450

6246 +#: builtin/branch.c:453

6247 #, c-format

6248 msgid "Branch %s is being rebased at %s"

6249 msgstr "Grenen %s ombaseras på %s"

6250

5922 -#: builtin/branch.c:454

6251 +#: builtin/branch.c:457

6252 #, c-format

6253 msgid "Branch %s is being bisected at %s"

6254 msgstr "Grenen %s är i en \"bisect\" på %s"

6255

5927 -#: builtin/branch.c:471

6256 +#: builtin/branch.c:474

6257 msgid "cannot copy the current branch while not on any."

6258 msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."

6259

5931 -#: builtin/branch.c:473

6260 +#: builtin/branch.c:476

6261 msgid "cannot rename the current branch while not on any."

6262 msgstr ""

6263 "kunde inte byta namn på aktuell gren när du inte befinner dig på någon."

6264

5936 -#: builtin/branch.c:484

6265 +#: builtin/branch.c:487

6266 #, c-format

6267 msgid "Invalid branch name: '%s'"

6268 msgstr "Felaktigt namn på gren: \"%s\""

6269

5941 -#: builtin/branch.c:511

6270 +#: builtin/branch.c:514

6271 msgid "Branch rename failed"

6272 msgstr "Misslyckades byta namn på gren"

6273

5945 -#: builtin/branch.c:513

6274 +#: builtin/branch.c:516

6275 msgid "Branch copy failed"

6276 msgstr "Misslyckades kopiera gren"

6277

5949 -#: builtin/branch.c:517

6278 +#: builtin/branch.c:520

6279 #, c-format

6280 msgid "Created a copy of a misnamed branch '%s'"

6281 msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""

6282

5954 -#: builtin/branch.c:520

6283 +#: builtin/branch.c:523

6284 #, c-format

6285 msgid "Renamed a misnamed branch '%s' away"

6286 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""

6287

5959 -#: builtin/branch.c:526

6288 +#: builtin/branch.c:529

6289 #, c-format

6290 msgid "Branch renamed to %s, but HEAD is not updated!"

6291 msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"

6292

5964 -#: builtin/branch.c:535

6293 +#: builtin/branch.c:538

6294 msgid "Branch is renamed, but update of config-file failed"

6295 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"

6296

5968 -#: builtin/branch.c:537

6297 +#: builtin/branch.c:540

6298 msgid "Branch is copied, but update of config-file failed"

6299 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"

6300

5972 -#: builtin/branch.c:553

6301 +#: builtin/branch.c:556

6302 #, c-format

6303 msgid ""

6304 "Please edit the description for the branch\n"

@@ -5980,221 +6309,223 @@ msgstr ""

6309 " %s\n"

6310 "Rader som inleds med \"%c\" ignoreras.\n"

6311

5983 -#: builtin/branch.c:586

6312 +#: builtin/branch.c:589

6313 msgid "Generic options"

6314 msgstr "Allmänna flaggor"

6315

5987 -#: builtin/branch.c:588

6316 +#: builtin/branch.c:591

6317 msgid "show hash and subject, give twice for upstream branch"

6318 msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"

6319

5991 -#: builtin/branch.c:589

6320 +#: builtin/branch.c:592

6321 msgid "suppress informational messages"

6322 msgstr "undertryck informationsmeddelanden"

6323

5995 -#: builtin/branch.c:590

6324 +#: builtin/branch.c:593

6325 msgid "set up tracking mode (see git-pull(1))"

6326 msgstr "ställ in spårningsläge (se git-pull(1))"

6327

5999 -#: builtin/branch.c:592

6328 +#: builtin/branch.c:595

6329 msgid "do not use"

6330 msgstr "använd ej"

6331

6003 -#: builtin/branch.c:594

6332 +#: builtin/branch.c:597

6333 msgid "upstream"

6334 msgstr "uppströms"

6335

6007 -#: builtin/branch.c:594

6336 +#: builtin/branch.c:597

6337 msgid "change the upstream info"

6338 msgstr "ändra uppströmsinformationen"

6339

6011 -#: builtin/branch.c:595

6340 +#: builtin/branch.c:598

6341 msgid "Unset the upstream info"

6342 msgstr "Ta bort uppströmsinformationen"

6343

6015 -#: builtin/branch.c:596

6344 +#: builtin/branch.c:599

6345 msgid "use colored output"

6346 msgstr "använd färgad utdata"

6347

6019 -#: builtin/branch.c:597

6348 +#: builtin/branch.c:600

6349 msgid "act on remote-tracking branches"

6350 msgstr "arbeta på fjärrspårande grenar"

6351

6023 -#: builtin/branch.c:599 builtin/branch.c:601

6352 +#: builtin/branch.c:602 builtin/branch.c:604

6353 msgid "print only branches that contain the commit"

6354 msgstr "visa endast grenar som innehåller incheckningen"

6355

6027 -#: builtin/branch.c:600 builtin/branch.c:602

6356 +#: builtin/branch.c:603 builtin/branch.c:605

6357 msgid "print only branches that don't contain the commit"

6358 msgstr "visa endast grenar som inte innehåller incheckningen"

6359

6031 -#: builtin/branch.c:605

6360 +#: builtin/branch.c:608

6361 msgid "Specific git-branch actions:"

6362 msgstr "Specifika git-branch-åtgärder:"

6363

6035 -#: builtin/branch.c:606

6364 +#: builtin/branch.c:609

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