f776897d4f · matheusbsbs/matheus-bagliano

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

5 #

6 msgid ""

7 msgstr ""

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

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

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

10 -"POT-Creation-Date: 2021-08-14 07:56+0800\n"

11 -"PO-Revision-Date: 2021-08-18 07:47+0100\n"

10 +"POT-Creation-Date: 2021-11-04 08:34+0800\n"

11 +"PO-Revision-Date: 2021-11-04 20: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,213 +18,213 @@ msgstr ""

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

19 "X-Generator: Gtranslator 3.30.1\n"

20

21 -#: add-interactive.c:376

21 +#: add-interactive.c:380

22 #, c-format

23 msgid "Huh (%s)?"

24 msgstr "Vadå (%s)?"

25

26 -#: add-interactive.c:529 add-interactive.c:830 reset.c:64 sequencer.c:3493

27 -#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528

28 -#: builtin/rebase.c:1953

26 +#: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3512

27 +#: sequencer.c:3979 sequencer.c:4141 builtin/rebase.c:1233

28 +#: builtin/rebase.c:1642

29 msgid "could not read index"

30 msgstr "kunde inte läsa indexet"

31

32 -#: add-interactive.c:584 git-add--interactive.perl:269

32 +#: add-interactive.c:588 git-add--interactive.perl:269

33 #: git-add--interactive.perl:294

34 msgid "binary"

35 msgstr "binär"

36

37 -#: add-interactive.c:642 git-add--interactive.perl:278

37 +#: add-interactive.c:646 git-add--interactive.perl:278

38 #: git-add--interactive.perl:332

39 msgid "nothing"

40 msgstr "ingenting"

41

42 -#: add-interactive.c:643 git-add--interactive.perl:314

42 +#: add-interactive.c:647 git-add--interactive.perl:314

43 #: git-add--interactive.perl:329

44 msgid "unchanged"

45 msgstr "oändrad"

46

47 -#: add-interactive.c:680 git-add--interactive.perl:641

47 +#: add-interactive.c:684 git-add--interactive.perl:641

48 msgid "Update"

49 msgstr "Uppdatera"

50

51 -#: add-interactive.c:697 add-interactive.c:885

51 +#: add-interactive.c:701 add-interactive.c:889

52 #, c-format

53 msgid "could not stage '%s'"

54 msgstr "kunde inte köa \"%s\""

55

56 -#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707

56 +#: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3718

57 msgid "could not write index"

58 msgstr "kunde inte skriva indexet"

59

60 -#: add-interactive.c:706 git-add--interactive.perl:626

60 +#: add-interactive.c:710 git-add--interactive.perl:626

61 #, c-format, perl-format

62 msgid "updated %d path\n"

63 msgid_plural "updated %d paths\n"

64 msgstr[0] "uppdaterade %d sökväg\n"

65 msgstr[1] "uppdaterade %d sökvägar\n"

66

67 -#: add-interactive.c:724 git-add--interactive.perl:676

67 +#: add-interactive.c:728 git-add--interactive.perl:676

68 #, c-format, perl-format

69 msgid "note: %s is untracked now.\n"

70 msgstr "observera: %s spåras inte längre.\n"

71

72 -#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298

73 -#: builtin/reset.c:145

72 +#: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298

73 +#: builtin/reset.c:151

74 #, c-format

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

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

77

78 -#: add-interactive.c:759 git-add--interactive.perl:653

78 +#: add-interactive.c:763 git-add--interactive.perl:653

79 msgid "Revert"

80 msgstr "Återställ"

81

82 -#: add-interactive.c:775

82 +#: add-interactive.c:779

83 msgid "Could not parse HEAD^{tree}"

84 msgstr "kunde inte tolka HEAD^{tree}"

85

86 -#: add-interactive.c:813 git-add--interactive.perl:629

86 +#: add-interactive.c:817 git-add--interactive.perl:629

87 #, c-format, perl-format

88 msgid "reverted %d path\n"

89 msgid_plural "reverted %d paths\n"

90 msgstr[0] "återställde %d sökväg\n"

91 msgstr[1] "återställde %d sökvägar\n"

92

93 -#: add-interactive.c:864 git-add--interactive.perl:693

93 +#: add-interactive.c:868 git-add--interactive.perl:693

94 #, c-format

95 msgid "No untracked files.\n"

96 msgstr "Inga ospårade filer.\n"

97

98 -#: add-interactive.c:868 git-add--interactive.perl:687

98 +#: add-interactive.c:872 git-add--interactive.perl:687

99 msgid "Add untracked"

100 msgstr "Lägg till ospårad"

101

102 -#: add-interactive.c:895 git-add--interactive.perl:623

102 +#: add-interactive.c:899 git-add--interactive.perl:623

103 #, c-format, perl-format

104 msgid "added %d path\n"

105 msgid_plural "added %d paths\n"

106 msgstr[0] "lade till %d sökväg\n"

107 msgstr[1] "lade till %d sökvägar\n"

108

109 -#: add-interactive.c:925

109 +#: add-interactive.c:929

110 #, c-format

111 msgid "ignoring unmerged: %s"

112 msgstr "ignorerar ej sammanslagen: %s"

113

114 -#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369

114 +#: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369

115 #, c-format

116 msgid "Only binary files changed.\n"

117 msgstr "Endast binära filer ändrade.\n"

118

119 -#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371

119 +#: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371

120 #, c-format

121 msgid "No changes.\n"

122 msgstr "Inga ändringar.\n"

123

124 -#: add-interactive.c:943 git-add--interactive.perl:1379

124 +#: add-interactive.c:947 git-add--interactive.perl:1379

125 msgid "Patch update"

126 msgstr "Uppdatera patch"

127

128 -#: add-interactive.c:982 git-add--interactive.perl:1792

128 +#: add-interactive.c:986 git-add--interactive.perl:1792

129 msgid "Review diff"

130 msgstr "Granska diff"

131

132 -#: add-interactive.c:1010

132 +#: add-interactive.c:1014

133 msgid "show paths with changes"

134 msgstr "visa sökvägar med ändringar"

135

136 -#: add-interactive.c:1012

136 +#: add-interactive.c:1016

137 msgid "add working tree state to the staged set of changes"

138 msgstr "lägg arbetskatalogens tillstånd till köade ändringar"

139

140 -#: add-interactive.c:1014

140 +#: add-interactive.c:1018

141 msgid "revert staged set of changes back to the HEAD version"

142 msgstr "återställ köade ändringar tillbaka till HEAD-versionen"

143

144 -#: add-interactive.c:1016

144 +#: add-interactive.c:1020

145 msgid "pick hunks and update selectively"

146 msgstr "välj stycken och uppdatera selektivt"

147

148 -#: add-interactive.c:1018

148 +#: add-interactive.c:1022

149 msgid "view diff between HEAD and index"

150 msgstr "visa skillnad mellan HEAD och index"

151

152 -#: add-interactive.c:1020

152 +#: add-interactive.c:1024

153 msgid "add contents of untracked files to the staged set of changes"

154 msgstr "lägg innehåll i ospårade filer till köade ändringar"

155

156 -#: add-interactive.c:1028 add-interactive.c:1077

156 +#: add-interactive.c:1032 add-interactive.c:1081

157 msgid "Prompt help:"

158 msgstr "Kommandoradshjälp:"

159

160 -#: add-interactive.c:1030

160 +#: add-interactive.c:1034

161 msgid "select a single item"

162 msgstr "markera en post"

163

164 -#: add-interactive.c:1032

164 +#: add-interactive.c:1036

165 msgid "select a range of items"

166 msgstr "markera intervall av poster"

167

168 -#: add-interactive.c:1034

168 +#: add-interactive.c:1038

169 msgid "select multiple ranges"

170 msgstr "markera flera intervall"

171

172 -#: add-interactive.c:1036 add-interactive.c:1081

172 +#: add-interactive.c:1040 add-interactive.c:1085

173 msgid "select item based on unique prefix"

174 msgstr "markera post baserad på unikt prefix"

175

176 -#: add-interactive.c:1038

176 +#: add-interactive.c:1042

177 msgid "unselect specified items"

178 msgstr "avmarkera angivna poster"

179

180 -#: add-interactive.c:1040

180 +#: add-interactive.c:1044

181 msgid "choose all items"

182 msgstr "välj alla poster"

183

184 -#: add-interactive.c:1042

184 +#: add-interactive.c:1046

185 msgid "(empty) finish selecting"

186 msgstr "(tomt) avsluta markering"

187

188 -#: add-interactive.c:1079

188 +#: add-interactive.c:1083

189 msgid "select a numbered item"

190 msgstr "markera en numrerad post"

191

192 -#: add-interactive.c:1083

192 +#: add-interactive.c:1087

193 msgid "(empty) select nothing"

194 msgstr "(tomt) markera ingenting"

195

196 -#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896

196 +#: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896

197 msgid "*** Commands ***"

198 msgstr "*** Kommandon ***"

199

200 -#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893

200 +#: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893

201 msgid "What now"

202 msgstr "Vad nu"

203

204 -#: add-interactive.c:1144 git-add--interactive.perl:213

204 +#: add-interactive.c:1148 git-add--interactive.perl:213

205 msgid "staged"

206 msgstr "köad"

207

208 -#: add-interactive.c:1144 git-add--interactive.perl:213

208 +#: add-interactive.c:1148 git-add--interactive.perl:213

209 msgid "unstaged"

210 msgstr "ej köad"

211

212 -#: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2309

213 -#: builtin/am.c:2312 builtin/bugreport.c:135 builtin/clone.c:128

214 -#: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190

215 -#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1886

216 -#: builtin/submodule--helper.c:1889 builtin/submodule--helper.c:2343

217 -#: builtin/submodule--helper.c:2346 builtin/submodule--helper.c:2589

218 -#: builtin/submodule--helper.c:2890 builtin/submodule--helper.c:2893

212 +#: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311

213 +#: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128

214 +#: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190

215 +#: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857

216 +#: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503

217 +#: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573

218 +#: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811

219 #: git-add--interactive.perl:213

220 msgid "path"

221 msgstr "sökväg"

222

223 -#: add-interactive.c:1151

223 +#: add-interactive.c:1155

224 msgid "could not refresh index"

225 msgstr "kunde inte uppdatera indexet"

226

227 -#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803

227 +#: add-interactive.c:1169 builtin/clean.c:778 git-add--interactive.perl:1803

228 #, c-format

229 msgid "Bye.\n"

230 msgstr "Hej då.\n"

@@ -737,7 +737,7 @@ msgstr "Beklagar, kan inte redigera stycket"

737 msgid "'git apply' failed"

738 msgstr "\"git apply\" misslyckades"

739

740 -#: advice.c:145

740 +#: advice.c:78

741 #, c-format

742 msgid ""

743 "\n"

@@ -746,47 +746,47 @@ msgstr ""

746 "\n"

747 "Slå av meddelandet med \"git config advice.%s false\""

748

749 -#: advice.c:161

749 +#: advice.c:94

750 #, c-format

751 msgid "%shint: %.*s%s\n"

752 msgstr "%stips: %.*s%s\n"

753

754 -#: advice.c:252

754 +#: advice.c:178

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

756 msgstr ""

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

758 "samman."

759

760 -#: advice.c:254

760 +#: advice.c:180

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

762 msgstr ""

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

764 "samman."

765

766 -#: advice.c:256

766 +#: advice.c:182

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

768 msgstr ""

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

770 "samman."

771

772 -#: advice.c:258

772 +#: advice.c:184

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

774 msgstr ""

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

776

777 -#: advice.c:260

777 +#: advice.c:186

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

779 msgstr ""

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

781 "samman."

782

783 -#: advice.c:262

783 +#: advice.c:188

784 #, c-format

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

786 msgstr ""

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

788

789 -#: advice.c:270

789 +#: advice.c:196

790 msgid ""

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

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

@@ -794,41 +794,48 @@ msgstr ""

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

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

796

797 -#: advice.c:278

797 +#: advice.c:204

798 msgid "Exiting because of an unresolved conflict."

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

800

801 -#: advice.c:283 builtin/merge.c:1375

801 +#: advice.c:209 builtin/merge.c:1379

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

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

804

805 -#: advice.c:285

805 +#: advice.c:211

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

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

808

809 -#: advice.c:286

809 +#: advice.c:212

810 msgid "Exiting because of unfinished merge."

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

812

813 -#: advice.c:296

813 +#: advice.c:217

814 +msgid "Not possible to fast-forward, aborting."

815 +msgstr "Kan inte snabbspola, avbryter."

816 +

817 +#: advice.c:227

818 #, c-format

819 msgid ""

816 -"The following pathspecs didn't match any eligible path, but they do match "

817 -"index\n"

818 -"entries outside the current sparse checkout:\n"

820 +"The following paths and/or pathspecs matched paths that exist\n"

821 +"outside of your sparse-checkout definition, so will not be\n"

822 +"updated in the index:\n"

823 msgstr ""

820 -"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "

821 -"motsvarar\n"

822 -"indexposter utanför den nuvarande glesa utcheckningen:\n"

824 +"Följande sökvägar och/eller ökvägsangivelser motsvarar sökvägar\n"

825 +"utanför din \"sparse-checkout\"-definition, så de kommer inte\n"

826 +"uppdateras i indexet:\n"

827

824 -#: advice.c:303

828 +#: advice.c:234

829 msgid ""

826 -"Disable or modify the sparsity rules if you intend to update such entries."

830 +"If you intend to update such entries, try one of the following:\n"

831 +"* Use the --sparse option.\n"

832 +"* Disable or modify the sparsity rules."

833 msgstr ""

828 -"Du måste ta bort eller ändra glesningsreglerna för att uppdatera sådana "

829 -"poster."

834 +"Om du har tänkt uppdatera sådana poster, försök något av följande:\n"

835 +"* Använd flaggan --sparse.\n"

836 +"* Inaktivera eller ändra reglerna för gles utcheckning."

837

831 -#: advice.c:310

838 +#: advice.c:242

839 #, c-format

840 msgid ""

841 "Note: switching to '%s'.\n"

@@ -1009,49 +1016,49 @@ msgstr "borttagna filen %s har fortfarande innehåll"

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

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

1018

1012 -#: apply.c:1977

1019 +#: apply.c:1978

1020 #, c-format

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

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

1023

1017 -#: apply.c:2014

1024 +#: apply.c:2015

1025 #, c-format

1026 msgid "unrecognized binary patch at line %d"

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

1028

1022 -#: apply.c:2176

1029 +#: apply.c:2177

1030 #, c-format

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

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

1033

1027 -#: apply.c:2262

1034 +#: apply.c:2263

1035 #, c-format

1036 msgid "unable to read symlink %s"

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

1038

1032 -#: apply.c:2266

1039 +#: apply.c:2267

1040 #, c-format

1041 msgid "unable to open or read %s"

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

1043

1037 -#: apply.c:2935

1044 +#: apply.c:2936

1045 #, c-format

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

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

1048

1042 -#: apply.c:3056

1049 +#: apply.c:3057

1050 #, c-format

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

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

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

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

1055

1049 -#: apply.c:3068

1056 +#: apply.c:3069

1057 #, c-format

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

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

1060

1054 -#: apply.c:3074

1061 +#: apply.c:3075

1062 #, c-format

1063 msgid ""

1064 "while searching for:\n"

@@ -1060,25 +1067,25 @@ msgstr ""

1067 "vid sökning efter:\n"

1068 "%.*s"

1069

1063 -#: apply.c:3096

1070 +#: apply.c:3097

1071 #, c-format

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

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

1074

1068 -#: apply.c:3104

1075 +#: apply.c:3105

1076 #, c-format

1077 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"

1078 msgstr ""

1079 "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"

1080 "\""

1081

1075 -#: apply.c:3151

1082 +#: apply.c:3152

1083 #, c-format

1084 msgid "cannot apply binary patch to '%s' without full index line"

1085 msgstr ""

1086 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"

1087

1081 -#: apply.c:3162

1088 +#: apply.c:3163

1089 #, c-format

1090 msgid ""

1091 "the patch applies to '%s' (%s), which does not match the current contents."

@@ -1086,419 +1093,420 @@ msgstr ""

1093 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "

1094 "innehållet."

1095

1089 -#: apply.c:3170

1096 +#: apply.c:3171

1097 #, c-format

1098 msgid "the patch applies to an empty '%s' but it is not empty"

1099 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"

1100

1094 -#: apply.c:3188

1101 +#: apply.c:3189

1102 #, c-format

1103 msgid "the necessary postimage %s for '%s' cannot be read"

1104 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"

1105

1099 -#: apply.c:3201

1106 +#: apply.c:3202

1107 #, c-format

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

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

1110

1104 -#: apply.c:3208

1111 +#: apply.c:3209

1112 #, c-format

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

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

1115

1109 -#: apply.c:3229

1116 +#: apply.c:3230

1117 #, c-format

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

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

1120

1114 -#: apply.c:3352

1121 +#: apply.c:3353

1122 #, c-format

1123 msgid "cannot checkout %s"

1124 msgstr "kan inte checka ut %s"

1125

1119 -#: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214

1126 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214

1127 #: setup.c:308

1128 #, c-format

1129 msgid "failed to read %s"

1130 msgstr "misslyckades läsa %s"

1131

1125 -#: apply.c:3412

1132 +#: apply.c:3413

1133 #, c-format

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

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

1136

1130 -#: apply.c:3441 apply.c:3687

1137 +#: apply.c:3442 apply.c:3709

1138 #, c-format

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

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

1141

1135 -#: apply.c:3527 apply.c:3702

1142 +#: apply.c:3549 apply.c:3724

1143 #, c-format

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

1145 msgstr "%s: finns inte i indexet"

1146

1140 -#: apply.c:3536 apply.c:3710 apply.c:3954

1147 +#: apply.c:3558 apply.c:3732 apply.c:3976

1148 #, c-format

1149 msgid "%s: does not match index"

1150 msgstr "%s: motsvarar inte indexet"

1151

1145 -#: apply.c:3571

1152 +#: apply.c:3593

1153 msgid "repository lacks the necessary blob to perform 3-way merge."

1154 msgstr "arkivet saknar objekt som behövs för att utföra 3-vägssammanslagning."

1155

1149 -#: apply.c:3574

1156 +#: apply.c:3596

1157 #, c-format

1158 msgid "Performing three-way merge...\n"

1159 msgstr "Utför trevägssammanslagning...\n"

1160

1154 -#: apply.c:3590 apply.c:3594

1161 +#: apply.c:3612 apply.c:3616

1162 #, c-format

1163 msgid "cannot read the current contents of '%s'"

1164 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""

1165

1159 -#: apply.c:3606

1166 +#: apply.c:3628

1167 #, c-format

1168 msgid "Failed to perform three-way merge...\n"

1169 msgstr "Misslyckades utföra trevägssammanslagning...\n"

1170

1164 -#: apply.c:3620

1171 +#: apply.c:3642

1172 #, c-format

1173 msgid "Applied patch to '%s' with conflicts.\n"

1174 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"

1175

1169 -#: apply.c:3625

1176 +#: apply.c:3647

1177 #, c-format

1178 msgid "Applied patch to '%s' cleanly.\n"

1179 msgstr "Tillämpade patchen på \"%s\" rent.\n"

1180

1174 -#: apply.c:3642

1181 +#: apply.c:3664

1182 #, c-format

1183 msgid "Falling back to direct application...\n"

1184 msgstr "Faller tillbaka på direkt tillämpning...\n"

1185

1179 -#: apply.c:3654

1186 +#: apply.c:3676

1187 msgid "removal patch leaves file contents"

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

1189

1183 -#: apply.c:3727

1190 +#: apply.c:3749

1191 #, c-format

1192 msgid "%s: wrong type"

1193 msgstr "%s: fel typ"

1194

1188 -#: apply.c:3729

1195 +#: apply.c:3751

1196 #, c-format

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

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

1199

1193 -#: apply.c:3894 apply.c:3896 read-cache.c:863 read-cache.c:892

1194 -#: read-cache.c:1353

1200 +#: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905

1201 +#: read-cache.c:1368

1202 #, c-format

1203 msgid "invalid path '%s'"

1204 msgstr "ogiltig sökväg \"%s\""

1205

1199 -#: apply.c:3952

1206 +#: apply.c:3974

1207 #, c-format

1208 msgid "%s: already exists in index"

1209 msgstr "%s: finns redan i indexet"

1210

1204 -#: apply.c:3956

1211 +#: apply.c:3978

1212 #, c-format

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

1214 msgstr "%s: finns redan i arbetskatalogen"

1215

1209 -#: apply.c:3976

1216 +#: apply.c:3998

1217 #, c-format

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

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

1220

1214 -#: apply.c:3981

1221 +#: apply.c:4003

1222 #, c-format

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

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

1225

1219 -#: apply.c:4001

1226 +#: apply.c:4023

1227 #, c-format

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

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

1230

1224 -#: apply.c:4005

1231 +#: apply.c:4027

1232 #, c-format

1233 msgid "%s: patch does not apply"

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

1235

1229 -#: apply.c:4020

1236 +#: apply.c:4042

1237 #, c-format

1238 msgid "Checking patch %s..."

1239 msgstr "Kontrollerar patchen %s..."

1240

1234 -#: apply.c:4112

1241 +#: apply.c:4134

1242 #, c-format

1243 msgid "sha1 information is lacking or useless for submodule %s"

1244 msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"

1245

1239 -#: apply.c:4119

1246 +#: apply.c:4141

1247 #, c-format

1248 msgid "mode change for %s, which is not in current HEAD"

1249 msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"

1250

1244 -#: apply.c:4122

1251 +#: apply.c:4144

1252 #, c-format

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

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

1255

1249 -#: apply.c:4131

1256 +#: apply.c:4153

1257 #, c-format

1258 msgid "could not add %s to temporary index"

1259 msgstr "kunde inte lägga till %s till temporärt index"

1260

1254 -#: apply.c:4141

1261 +#: apply.c:4163

1262 #, c-format

1263 msgid "could not write temporary index to %s"

1264 msgstr "kunde inte skriva temporärt index till %s"

1265

1259 -#: apply.c:4279

1266 +#: apply.c:4301

1267 #, c-format

1268 msgid "unable to remove %s from index"

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

1270

1264 -#: apply.c:4313

1271 +#: apply.c:4335

1272 #, c-format

1273 msgid "corrupt patch for submodule %s"

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

1275

1269 -#: apply.c:4319

1276 +#: apply.c:4341

1277 #, c-format

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

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

1280

1274 -#: apply.c:4327

1281 +#: apply.c:4349

1282 #, c-format

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

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

1285

1279 -#: apply.c:4333 apply.c:4478

1286 +#: apply.c:4355 apply.c:4500

1287 #, c-format

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

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

1290

1284 -#: apply.c:4376 builtin/bisect--helper.c:525

1291 +#: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2241

1292 +#: builtin/gc.c:2276

1293 #, c-format

1294 msgid "failed to write to '%s'"

1295 msgstr "misslyckades skriva till \"%s\""

1296

1289 -#: apply.c:4380

1297 +#: apply.c:4402

1298 #, c-format

1299 msgid "closing file '%s'"

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

1301

1294 -#: apply.c:4450

1302 +#: apply.c:4472

1303 #, c-format

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

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

1306

1299 -#: apply.c:4548

1307 +#: apply.c:4570

1308 #, c-format

1309 msgid "Applied patch %s cleanly."

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

1311

1304 -#: apply.c:4556

1312 +#: apply.c:4578

1313 msgid "internal error"

1314 msgstr "internt fel"

1315

1308 -#: apply.c:4559

1316 +#: apply.c:4581

1317 #, c-format

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

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

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

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

1322

1315 -#: apply.c:4570

1323 +#: apply.c:4592

1324 #, c-format

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

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

1327

1320 -#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394

1328 +#: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408

1329 #, c-format

1330 msgid "cannot open %s"

1331 msgstr "kan inte öppna %s"

1332

1325 -#: apply.c:4592

1333 +#: apply.c:4614

1334 #, c-format

1335 msgid "Hunk #%d applied cleanly."

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

1337

1330 -#: apply.c:4596

1338 +#: apply.c:4618

1339 #, c-format

1340 msgid "Rejected hunk #%d."

1341 msgstr "Refuserar stycke %d."

1342

1335 -#: apply.c:4725

1343 +#: apply.c:4747

1344 #, c-format

1345 msgid "Skipped patch '%s'."

1346 msgstr "Ignorerar patch \"%s\"."

1347

1340 -#: apply.c:4733

1348 +#: apply.c:4755

1349 msgid "unrecognized input"

1350 msgstr "indata känns inte igen"

1351

1344 -#: apply.c:4753

1352 +#: apply.c:4775

1353 msgid "unable to read index file"

1354 msgstr "kan inte läsa indexfilen"

1355

1348 -#: apply.c:4910

1356 +#: apply.c:4932

1357 #, c-format

1358 msgid "can't open patch '%s': %s"

1359 msgstr "kan inte öppna patchen \"%s\": %s"

1360

1353 -#: apply.c:4937

1361 +#: apply.c:4959

1362 #, c-format

1363 msgid "squelched %d whitespace error"

1364 msgid_plural "squelched %d whitespace errors"

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

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

1367

1360 -#: apply.c:4943 apply.c:4958

1368 +#: apply.c:4965 apply.c:4980

1369 #, c-format

1370 msgid "%d line adds whitespace errors."

1371 msgid_plural "%d lines add whitespace errors."

1372 msgstr[0] "%d rad lägger till fel i blanksteg."

1373 msgstr[1] "%d rader lägger till fel i blanksteg."

1374

1367 -#: apply.c:4951

1375 +#: apply.c:4973

1376 #, c-format

1377 msgid "%d line applied after fixing whitespace errors."

1378 msgid_plural "%d lines applied after fixing whitespace errors."

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

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

1381

1374 -#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423

1382 +#: apply.c:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429

1383 msgid "Unable to write new index file"

1384 msgstr "Kunde inte skriva ny indexfil"

1385

1378 -#: apply.c:4995

1386 +#: apply.c:5017

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

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

1389

1382 -#: apply.c:4998

1390 +#: apply.c:5020

1391 msgid "apply changes matching the given path"

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

1393

1386 -#: apply.c:5000 builtin/am.c:2318

1394 +#: apply.c:5022 builtin/am.c:2320

1395 msgid "num"

1396 msgstr "antal"

1397

1390 -#: apply.c:5001

1398 +#: apply.c:5023

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

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

1401

1394 -#: apply.c:5004

1402 +#: apply.c:5026

1403 msgid "ignore additions made by the patch"

1404 msgstr "ignorera tillägg gjorda av patchen"

1405

1398 -#: apply.c:5006

1406 +#: apply.c:5028

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

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

1409

1402 -#: apply.c:5010

1410 +#: apply.c:5032

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

1412 msgstr "visa antal tillagda och borttagna rader decimalt"

1413

1406 -#: apply.c:5012

1414 +#: apply.c:5034

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

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

1417

1410 -#: apply.c:5014

1418 +#: apply.c:5036

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

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

1421

1414 -#: apply.c:5016

1422 +#: apply.c:5038

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

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

1425

1418 -#: apply.c:5018

1426 +#: apply.c:5040

1427 msgid "mark new files with `git add --intent-to-add`"

1428 msgstr "markera nya filer med \"git add --intent-to-add\""

1429

1422 -#: apply.c:5020

1430 +#: apply.c:5042

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

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

1433

1426 -#: apply.c:5022

1434 +#: apply.c:5044

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

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

1437

1430 -#: apply.c:5025

1438 +#: apply.c:5047

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

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

1441

1434 -#: apply.c:5027

1442 +#: apply.c:5049

1443 msgid "attempt three-way merge, fall back on normal patch if that fails"

1444 msgstr ""

1445 "försök en trevägssammanslagning, fall tillbaka på normal patch om det "

1446 "misslyckas"

1447

1440 -#: apply.c:5029

1448 +#: apply.c:5051

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

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

1451

1444 -#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617

1452 +#: apply.c:5054 builtin/checkout-index.c:196

1453 msgid "paths are separated with NUL character"

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

1455

1448 -#: apply.c:5034

1456 +#: apply.c:5056

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

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

1459

1452 -#: apply.c:5035 builtin/am.c:2294 builtin/am.c:2297

1460 +#: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299

1461 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100

1454 -#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3991

1455 -#: builtin/rebase.c:1347

1462 +#: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960

1463 +#: builtin/rebase.c:1051

1464 msgid "action"

1465 msgstr "åtgärd"

1466

1459 -#: apply.c:5036

1467 +#: apply.c:5058

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

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

1470

1463 -#: apply.c:5039 apply.c:5042

1471 +#: apply.c:5061 apply.c:5064

1472 msgid "ignore changes in whitespace when finding context"

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

1474

1467 -#: apply.c:5045

1475 +#: apply.c:5067

1476 msgid "apply the patch in reverse"

1477 msgstr "tillämpa patchen baklänges"

1478

1471 -#: apply.c:5047

1479 +#: apply.c:5069

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

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

1482

1475 -#: apply.c:5049

1483 +#: apply.c:5071

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

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

1486

1479 -#: apply.c:5051

1487 +#: apply.c:5073

1488 msgid "allow overlapping hunks"

1489 msgstr "tillåt överlappande stycken"

1490

1483 -#: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22

1484 -#: builtin/commit.c:1481 builtin/count-objects.c:98 builtin/fsck.c:756

1485 -#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:128

1491 +#: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22

1492 +#: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788

1493 +#: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120

1494 msgid "be verbose"

1495 msgstr "var pratsam"

1496

1489 -#: apply.c:5054

1497 +#: apply.c:5076

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

1499 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"

1500

1493 -#: apply.c:5057

1501 +#: apply.c:5079

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

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

1504

1497 -#: apply.c:5059 builtin/am.c:2306

1505 +#: apply.c:5081 builtin/am.c:2308

1506 msgid "root"

1507 msgstr "rot"

1508

1501 -#: apply.c:5060

1509 +#: apply.c:5082

1510 msgid "prepend <root> to all filenames"

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

1512

@@ -1570,152 +1578,151 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"

1578 msgid "cannot read %s"

1579 msgstr "kan inte läsa %s"

1580

1573 -#: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095

1574 -#: sequencer.c:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833

1575 -#: builtin/merge.c:1144

1581 +#: archive.c:341 sequencer.c:473 sequencer.c:1932 sequencer.c:3114

1582 +#: sequencer.c:3556 sequencer.c:3684 builtin/am.c:263 builtin/commit.c:834

1583 +#: builtin/merge.c:1145

1584 #, c-format

1585 msgid "could not read '%s'"

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

1587

1580 -#: archive.c:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328

1588 +#: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334

1589 #, c-format

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

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

1592

1585 -#: archive.c:451

1593 +#: archive.c:450

1594 #, c-format

1595 msgid "no such ref: %.*s"

1596 msgstr "ingen sådan referens: %.*s"

1597

1590 -#: archive.c:457

1598 +#: archive.c:456

1599 #, c-format

1600 msgid "not a valid object name: %s"

1601 msgstr "objektnamnet är inte giltigt: %s"

1602

1595 -#: archive.c:470

1603 +#: archive.c:469

1604 #, c-format

1605 msgid "not a tree object: %s"

1606 msgstr "inte ett trädobjekt: %s"

1607

1600 -#: archive.c:482

1608 +#: archive.c:481

1609 msgid "current working directory is untracked"

1610 msgstr "aktuell arbetskatalog är inte spårad"

1611

1604 -#: archive.c:523

1612 +#: archive.c:522

1613 #, c-format

1614 msgid "File not found: %s"

1615 msgstr "Hittar inte filen: %s"

1616

1609 -#: archive.c:525

1617 +#: archive.c:524

1618 #, c-format

1619 msgid "Not a regular file: %s"

1620 msgstr "Inte en vanlig fil: %s"

1621

1614 -#: archive.c:552

1622 +#: archive.c:551

1623 msgid "fmt"

1624 msgstr "fmt"

1625

1618 -#: archive.c:552

1626 +#: archive.c:551

1627 msgid "archive format"

1628 msgstr "arkivformat"

1629

1622 -#: archive.c:553 builtin/log.c:1775

1630 +#: archive.c:552 builtin/log.c:1775

1631 msgid "prefix"

1632 msgstr "prefix"

1633

1626 -#: archive.c:554

1634 +#: archive.c:553

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

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

1637

1630 -#: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888

1631 -#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135

1632 -#: builtin/fast-export.c:1207 builtin/fast-export.c:1209

1633 -#: builtin/fast-export.c:1213 builtin/grep.c:921 builtin/hash-object.c:105

1634 -#: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412

1635 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191

1638 +#: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884

1639 +#: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135

1640 +#: builtin/fast-export.c:1208 builtin/fast-export.c:1210

1641 +#: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103

1642 +#: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410

1643 +#: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190

1644 msgid "file"

1645 msgstr "fil"

1646

1639 -#: archive.c:556

1647 +#: archive.c:555

1648 msgid "add untracked file to archive"

1649 msgstr "ta med ospårade filer i arkivet"

1650

1643 -#: archive.c:559 builtin/archive.c:90

1651 +#: archive.c:558 builtin/archive.c:88

1652 msgid "write the archive to this file"

1653 msgstr "skriv arkivet till filen"

1654

1647 -#: archive.c:561

1655 +#: archive.c:560

1656 msgid "read .gitattributes in working directory"

1657 msgstr "läs .gitattributes i arbetskatalogen"

1658

1651 -#: archive.c:562

1659 +#: archive.c:561

1660 msgid "report archived files on stderr"

1661 msgstr "rapportera arkiverade filer på standard fel"

1662

1655 -#: archive.c:564

1663 +#: archive.c:563

1664 msgid "set compression level"

1665 msgstr "välj komprimeringsgrad"

1666

1659 -#: archive.c:567

1667 +#: archive.c:566

1668 msgid "list supported archive formats"

1669 msgstr "visa understödda arkivformat"

1670

1663 -#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121

1664 -#: builtin/submodule--helper.c:1898 builtin/submodule--helper.c:2352

1665 -#: builtin/submodule--helper.c:2902

1671 +#: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121

1672 +#: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512

1673 msgid "repo"

1674 msgstr "arkiv"

1675

1669 -#: archive.c:570 builtin/archive.c:92

1676 +#: archive.c:569 builtin/archive.c:90

1677 msgid "retrieve the archive from remote repository <repo>"

1678 msgstr "hämta arkivet från fjärrarkivet <arkiv>"

1679

1673 -#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717

1674 -#: builtin/notes.c:498

1680 +#: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714

1681 +#: builtin/notes.c:496

1682 msgid "command"

1683 msgstr "kommando"

1684

1678 -#: archive.c:572 builtin/archive.c:94

1685 +#: archive.c:571 builtin/archive.c:92

1686 msgid "path to the remote git-upload-archive command"

1687 msgstr "sökväg till kommandot git-upload-archive på fjärren"

1688

1682 -#: archive.c:579

1689 +#: archive.c:578

1690 msgid "Unexpected option --remote"

1691 msgstr "Oväntad flagga --remote"

1692

1686 -#: archive.c:581

1693 +#: archive.c:580

1694 msgid "Option --exec can only be used together with --remote"

1695 msgstr "Flaggan --exec kan endast användas tillsammans med --remote"

1696

1690 -#: archive.c:583

1697 +#: archive.c:582

1698 msgid "Unexpected option --output"

1699 msgstr "Oväntad flagga --output"

1700

1694 -#: archive.c:585

1701 +#: archive.c:584

1702 msgid "Options --add-file and --remote cannot be used together"

1703 msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"

1704

1698 -#: archive.c:607

1705 +#: archive.c:606

1706 #, c-format

1707 msgid "Unknown archive format '%s'"

1708 msgstr "Okänt arkivformat \"%s\""

1709

1703 -#: archive.c:616

1710 +#: archive.c:615

1711 #, c-format

1712 msgid "Argument not supported for format '%s': -%d"

1713 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"

1714

1708 -#: attr.c:202

1715 +#: attr.c:203

1716 #, c-format

1717 msgid "%.*s is not a valid attribute name"

1718 msgstr "%-*s är inte ett giltigt namn på attribut"

1719

1713 -#: attr.c:363

1720 +#: attr.c:364

1721 #, c-format

1722 msgid "%s not allowed: %s:%d"

1723 msgstr "%s inte tillåtet: %s:%d"

1724

1718 -#: attr.c:403

1725 +#: attr.c:404

1726 msgid ""

1727 "Negative patterns are ignored in git attributes\n"

1728 "Use '\\!' for literal leading exclamation."

@@ -1723,22 +1730,22 @@ msgstr ""

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

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

1732

1726 -#: bisect.c:489

1733 +#: bisect.c:488

1734 #, c-format

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

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

1737

1731 -#: bisect.c:699

1738 +#: bisect.c:698

1739 #, c-format

1740 msgid "We cannot bisect more!\n"

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

1742

1736 -#: bisect.c:766

1743 +#: bisect.c:764

1744 #, c-format

1745 msgid "Not a valid commit name %s"

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

1747

1741 -#: bisect.c:791

1748 +#: bisect.c:789

1749 #, c-format

1750 msgid ""

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

@@ -1747,7 +1754,7 @@ msgstr ""

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

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

1756

1750 -#: bisect.c:796

1757 +#: bisect.c:794

1758 #, c-format

1759 msgid ""

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

@@ -1756,7 +1763,7 @@ msgstr ""

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

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

1765

1759 -#: bisect.c:801

1766 +#: bisect.c:799

1767 #, c-format

1768 msgid ""

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

@@ -1765,7 +1772,7 @@ msgstr ""

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

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

1774

1768 -#: bisect.c:809

1775 +#: bisect.c:807

1776 #, c-format

1777 msgid ""

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

@@ -1776,7 +1783,7 @@ msgstr ""

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

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

1785

1779 -#: bisect.c:822

1786 +#: bisect.c:820

1787 #, c-format

1788 msgid ""

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

@@ -1788,36 +1795,36 @@ msgstr ""

1795 "%s.\n"

1796 "Vi fortsätter ändå."

1797

1791 -#: bisect.c:861

1798 +#: bisect.c:859

1799 #, c-format

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

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

1802

1796 -#: bisect.c:911

1803 +#: bisect.c:909

1804 #, c-format

1805 msgid "a %s revision is needed"

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

1807

1801 -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298

1808 +#: bisect.c:939

1809 #, c-format

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

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

1812

1806 -#: bisect.c:987 builtin/merge.c:153

1813 +#: bisect.c:985 builtin/merge.c:154

1814 #, c-format

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

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

1817

1811 -#: bisect.c:1027

1818 +#: bisect.c:1025

1819 msgid "reading bisect refs failed"

1820 msgstr "misslyckades läsa bisect-referenser"

1821

1815 -#: bisect.c:1057

1822 +#: bisect.c:1055

1823 #, c-format

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

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

1826

1820 -#: bisect.c:1066

1827 +#: bisect.c:1064

1828 #, c-format

1829 msgid ""

1830 "No testable commit found.\n"

@@ -1826,7 +1833,7 @@ msgstr ""

1833 "Ingen testbar incheckning hittades.\n"

1834 "Kanske du startade med felaktiga sökvägsargument?\n"

1835

1829 -#: bisect.c:1095

1836 +#: bisect.c:1093

1837 #, c-format

1838 msgid "(roughly %d step)"

1839 msgid_plural "(roughly %d steps)"

@@ -1836,7 +1843,7 @@ msgstr[1] "(ungefär %d steg)"

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

1844 #. steps)" translation.

1845 #.

1839 -#: bisect.c:1101

1846 +#: bisect.c:1099

1847 #, c-format

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

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

@@ -1857,11 +1864,12 @@ msgstr ""

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

1865 "incheckningen"

1866

1860 -#: blame.c:2820 bundle.c:224 ref-filter.c:2278 remote.c:2041 sequencer.c:2333

1861 -#: sequencer.c:4865 submodule.c:844 builtin/commit.c:1113 builtin/log.c:414

1862 -#: builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 builtin/log.c:2346

1863 -#: builtin/merge.c:428 builtin/pack-objects.c:3343 builtin/pack-objects.c:3806

1864 -#: builtin/pack-objects.c:3821 builtin/shortlog.c:255

1867 +#: blame.c:2820 bundle.c:224 midx.c:1039 ref-filter.c:2370 remote.c:2041

1868 +#: sequencer.c:2350 sequencer.c:4902 submodule.c:883 builtin/commit.c:1114

1869 +#: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056

1870 +#: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373

1871 +#: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790

1872 +#: builtin/shortlog.c:255

1873 msgid "revision walk setup failed"

1874 msgstr "misslyckades skapa revisionstraversering"

1875

@@ -2028,7 +2036,7 @@ msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"

2036 #: bundle.c:44

2037 #, c-format

2038 msgid "unrecognized bundle hash algorithm: %s"

2031 -msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""

2039 +msgstr "okänd hashningsalgoritm för bunt: \"%s\""

2040

2041 #: bundle.c:48

2042 #, c-format

@@ -2038,15 +2046,15 @@ msgstr "okänd kapabilitet \"%s\""

2046 #: bundle.c:74

2047 #, c-format

2048 msgid "'%s' does not look like a v2 or v3 bundle file"

2041 -msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)"

2049 +msgstr "'%s' ser inte ut som en v2- eller v3-bunt-fil"

2050

2051 #: bundle.c:113

2052 #, c-format

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

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

2055

2048 -#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385

2049 -#: builtin/commit.c:861

2056 +#: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2618 sequencer.c:3404

2057 +#: builtin/commit.c:862

2058 #, c-format

2059 msgid "could not open '%s'"

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

@@ -2057,29 +2065,29 @@ msgstr "Arkivet saknar dessa nödvändiga incheckningar:"

2065

2066 #: bundle.c:201

2067 msgid "need a repository to verify a bundle"

2060 -msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."

2068 +msgstr "behöver ett arkiv för att bekräfta en bunt."

2069

2070 #: bundle.c:257

2071 #, c-format

2072 msgid "The bundle contains this ref:"

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

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

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

2074 +msgstr[0] "Bunten innehåller denna referens:"

2075 +msgstr[1] "Bunten innehåller dessa %d referenser:"

2076

2077 #: bundle.c:264

2078 msgid "The bundle records a complete history."

2071 -msgstr "Paketet (bundlen) beskriver en komplett historik."

2079 +msgstr "Bunten beskriver en komplett historik."

2080

2081 #: bundle.c:266

2082 #, c-format

2083 msgid "The bundle requires this ref:"

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

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

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

2085 +msgstr[0] "Bunten kräver denna referens:"

2086 +msgstr[1] "Bunten kräver dessa %d referenser:"

2087

2088 #: bundle.c:333

2089 msgid "unable to dup bundle descriptor"

2082 -msgstr "kan inte duplicera pakethandtag"

2090 +msgstr "kan inte duplicera bunthandtag"

2091

2092 #: bundle.c:340

2093 msgid "Could not spawn pack-objects"

@@ -2097,21 +2105,21 @@ msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"

2105 #: bundle.c:504

2106 #, c-format

2107 msgid "unsupported bundle version %d"

2100 -msgstr "version %d för paket (bundle) stöds ej"

2108 +msgstr "version %d för bunt stöds ej"

2109

2110 #: bundle.c:506

2111 #, c-format

2112 msgid "cannot write bundle version %d with algorithm %s"

2105 -msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s"

2113 +msgstr "kan inte skriva bunt med version %d med algoritmen %s"

2114

2107 -#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396

2115 +#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399

2116 #, c-format

2117 msgid "unrecognized argument: %s"

2118 msgstr "okänt argument: %s"

2119

2120 #: bundle.c:553

2121 msgid "Refusing to create empty bundle."

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

2122 +msgstr "Vägrar skapa en tom bunt."

2123

2124 #: bundle.c:563

2125 #, c-format

@@ -2146,7 +2154,7 @@ msgstr "avslutande stycke har id %<PRIx32> som inte är noll"

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

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

2156

2149 -#: commit-graph.c:204 midx.c:47

2157 +#: commit-graph.c:204 midx.c:51

2158 msgid "invalid hash version"

2159 msgstr "felaktig hashnings-version"

2160

@@ -2191,190 +2199,190 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"

2199 msgid "unable to find all commit-graph files"

2200 msgstr "kan inte hitta alla incheckingsgraffiler"

2201

2194 -#: commit-graph.c:745 commit-graph.c:782

2202 +#: commit-graph.c:746 commit-graph.c:783

2203 msgid "invalid commit position. commit-graph is likely corrupt"

2204 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"

2205

2198 -#: commit-graph.c:766

2206 +#: commit-graph.c:767

2207 #, c-format

2208 msgid "could not find commit %s"

2209 msgstr "kunde inte hitta incheckningen %s"

2210

2203 -#: commit-graph.c:799

2211 +#: commit-graph.c:800

2212 msgid "commit-graph requires overflow generation data but has none"

2213 msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"

2214

2207 -#: commit-graph.c:1075 builtin/am.c:1341

2215 +#: commit-graph.c:1105 builtin/am.c:1342

2216 #, c-format

2217 msgid "unable to parse commit %s"

2218 msgstr "kunde inte tolka incheckningen %s"

2219

2212 -#: commit-graph.c:1337 builtin/pack-objects.c:3057

2220 +#: commit-graph.c:1367 builtin/pack-objects.c:3070

2221 #, c-format

2222 msgid "unable to get type of object %s"

2223 msgstr "kunde inte hämta typ för objektet %s"

2224

2217 -#: commit-graph.c:1368

2225 +#: commit-graph.c:1398

2226 msgid "Loading known commits in commit graph"

2227 msgstr "Läser in kända incheckningar i incheckningsgraf"

2228

2221 -#: commit-graph.c:1385

2229 +#: commit-graph.c:1415

2230 msgid "Expanding reachable commits in commit graph"

2231 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"

2232

2225 -#: commit-graph.c:1405

2233 +#: commit-graph.c:1435

2234 msgid "Clearing commit marks in commit graph"

2235 msgstr "Rensar incheckningsmärken i incheckningsgraf"

2236

2229 -#: commit-graph.c:1424

2237 +#: commit-graph.c:1454

2238 msgid "Computing commit graph topological levels"

2239 msgstr "Beräknar topografiska nivåer för incheckningsgraf"

2240

2233 -#: commit-graph.c:1477

2241 +#: commit-graph.c:1507

2242 msgid "Computing commit graph generation numbers"

2243 msgstr "Beräknar generationsvärden för incheckningsgraf"

2244

2237 -#: commit-graph.c:1558

2245 +#: commit-graph.c:1588

2246 msgid "Computing commit changed paths Bloom filters"

2247 msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"

2248

2241 -#: commit-graph.c:1635

2249 +#: commit-graph.c:1665

2250 msgid "Collecting referenced commits"

2251 msgstr "Samlar refererade incheckningar"

2252

2245 -#: commit-graph.c:1660

2253 +#: commit-graph.c:1690

2254 #, c-format

2255 msgid "Finding commits for commit graph in %d pack"

2256 msgid_plural "Finding commits for commit graph in %d packs"

2257 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"

2258 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"

2259

2252 -#: commit-graph.c:1673

2260 +#: commit-graph.c:1703

2261 #, c-format

2262 msgid "error adding pack %s"

2263 msgstr "fel vid tillägg av paketet %s"

2264

2257 -#: commit-graph.c:1677

2265 +#: commit-graph.c:1707

2266 #, c-format

2267 msgid "error opening index for %s"

2268 msgstr "fel vid öppning av indexet för %s"

2269

2262 -#: commit-graph.c:1714

2270 +#: commit-graph.c:1744

2271 msgid "Finding commits for commit graph among packed objects"

2272 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"

2273

2266 -#: commit-graph.c:1732

2274 +#: commit-graph.c:1762

2275 msgid "Finding extra edges in commit graph"

2276 msgstr "Söker ytterligare kanter i incheckingsgraf"

2277

2270 -#: commit-graph.c:1781

2278 +#: commit-graph.c:1811

2279 msgid "failed to write correct number of base graph ids"

2280 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"

2281

2274 -#: commit-graph.c:1812 midx.c:911

2282 +#: commit-graph.c:1842 midx.c:1146

2283 #, c-format

2284 msgid "unable to create leading directories of %s"

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

2286

2279 -#: commit-graph.c:1825

2287 +#: commit-graph.c:1855

2288 msgid "unable to create temporary graph layer"

2289 msgstr "kan inte skapa temporärt graflager"

2290

2283 -#: commit-graph.c:1830

2291 +#: commit-graph.c:1860

2292 #, c-format

2293 msgid "unable to adjust shared permissions for '%s'"

2294 msgstr "kan inte justera delade behörigheter för \"%s\""

2295

2288 -#: commit-graph.c:1887

2296 +#: commit-graph.c:1917

2297 #, c-format

2298 msgid "Writing out commit graph in %d pass"

2299 msgid_plural "Writing out commit graph in %d passes"

2300 msgstr[0] "Skriver ut incheckningsgraf i %d pass"

2301 msgstr[1] "Skriver ut incheckningsgraf i %d pass"

2302

2295 -#: commit-graph.c:1923

2303 +#: commit-graph.c:1953

2304 msgid "unable to open commit-graph chain file"

2305 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"

2306

2299 -#: commit-graph.c:1939

2307 +#: commit-graph.c:1969

2308 msgid "failed to rename base commit-graph file"

2309 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"

2310

2303 -#: commit-graph.c:1959

2311 +#: commit-graph.c:1989

2312 msgid "failed to rename temporary commit-graph file"

2313 msgstr "kunde inte byta namn på temporär incheckningsgraffil"

2314

2307 -#: commit-graph.c:2092

2315 +#: commit-graph.c:2122

2316 msgid "Scanning merged commits"

2317 msgstr "Söker sammanslagna incheckningar"

2318

2311 -#: commit-graph.c:2136

2319 +#: commit-graph.c:2166

2320 msgid "Merging commit-graph"

2321 msgstr "Slår ihop incheckningsgraf"

2322

2315 -#: commit-graph.c:2244

2323 +#: commit-graph.c:2274

2324 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"

2325 msgstr ""

2326 "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"

2327

2320 -#: commit-graph.c:2351

2328 +#: commit-graph.c:2381

2329 msgid "too many commits to write graph"

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

2331

2324 -#: commit-graph.c:2449

2332 +#: commit-graph.c:2479

2333 msgid "the commit-graph file has incorrect checksum and is likely corrupt"

2334 msgstr ""

2335 "filen med incheckningsgraf har felaktig kontrollsumma och är troligtvis "

2336 "trasig"

2337

2330 -#: commit-graph.c:2459

2338 +#: commit-graph.c:2489

2339 #, c-format

2340 msgid "commit-graph has incorrect OID order: %s then %s"

2341 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"

2342

2335 -#: commit-graph.c:2469 commit-graph.c:2484

2343 +#: commit-graph.c:2499 commit-graph.c:2514

2344 #, c-format

2345 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"

2346 msgstr ""

2347 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"

2348

2341 -#: commit-graph.c:2476

2349 +#: commit-graph.c:2506

2350 #, c-format

2351 msgid "failed to parse commit %s from commit-graph"

2352 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"

2353

2346 -#: commit-graph.c:2494

2354 +#: commit-graph.c:2524

2355 msgid "Verifying commits in commit graph"

2356 msgstr "Bekräftar incheckningar i incheckningsgrafen"

2357

2350 -#: commit-graph.c:2509

2358 +#: commit-graph.c:2539

2359 #, c-format

2360 msgid "failed to parse commit %s from object database for commit-graph"

2361 msgstr ""

2362 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"

2363

2356 -#: commit-graph.c:2516

2364 +#: commit-graph.c:2546

2365 #, c-format

2366 msgid "root tree OID for commit %s in commit-graph is %s != %s"

2367 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"

2368

2361 -#: commit-graph.c:2526

2369 +#: commit-graph.c:2556

2370 #, c-format

2371 msgid "commit-graph parent list for commit %s is too long"

2372 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"

2373

2366 -#: commit-graph.c:2535

2374 +#: commit-graph.c:2565

2375 #, c-format

2376 msgid "commit-graph parent for %s is %s != %s"

2377 msgstr "incheckningsgrafens förälder för %s är %s != %s"

2378

2371 -#: commit-graph.c:2549

2379 +#: commit-graph.c:2579

2380 #, c-format

2381 msgid "commit-graph parent list for commit %s terminates early"

2382 msgstr ""

2383 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"

2384

2377 -#: commit-graph.c:2554

2385 +#: commit-graph.c:2584

2386 #, c-format

2387 msgid ""

2388 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"

@@ -2382,7 +2390,7 @@ msgstr ""

2390 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"

2391 "noll på annan plats"

2392

2385 -#: commit-graph.c:2558

2393 +#: commit-graph.c:2588

2394 #, c-format

2395 msgid ""

2396 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"

@@ -2390,32 +2398,32 @@ msgstr ""

2398 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "

2399 "%s, men noll på annan plats"

2400

2393 -#: commit-graph.c:2575

2401 +#: commit-graph.c:2605

2402 #, c-format

2403 msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"

2404 msgstr ""

2405 "incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "

2406 "%<PRIuMAX>"

2407

2400 -#: commit-graph.c:2581

2408 +#: commit-graph.c:2611

2409 #, c-format

2410 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"

2411 msgstr ""

2412 "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"

2413 "= %<PRIuMAX>"

2414

2407 -#: commit.c:52 sequencer.c:3088 builtin/am.c:372 builtin/am.c:417

2408 -#: builtin/am.c:422 builtin/am.c:1420 builtin/am.c:2067 builtin/replace.c:457

2415 +#: commit.c:53 sequencer.c:3107 builtin/am.c:373 builtin/am.c:418

2416 +#: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457

2417 #, c-format

2418 msgid "could not parse %s"

2419 msgstr "kunde inte tolka %s"

2420

2413 -#: commit.c:54

2421 +#: commit.c:55

2422 #, c-format

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

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

2425

2418 -#: commit.c:194

2426 +#: commit.c:196

2427 msgid ""

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

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

@@ -2435,29 +2443,29 @@ msgstr ""

2443 "Slå av detta meddelande genom att skriva\n"

2444 "\"git config advice.graftFileDeprecated false\""

2445

2438 -#: commit.c:1237

2446 +#: commit.c:1239

2447 #, c-format

2448 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."

2449 msgstr ""

2450 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."

2451

2444 -#: commit.c:1241

2452 +#: commit.c:1243

2453 #, c-format

2454 msgid "Commit %s has a bad GPG signature allegedly by %s."

2455 msgstr ""

2456 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."

2457

2450 -#: commit.c:1244

2458 +#: commit.c:1246

2459 #, c-format

2460 msgid "Commit %s does not have a GPG signature."

2461 msgstr "Incheckning %s har inte någon GPG-signatur."

2462

2455 -#: commit.c:1247

2463 +#: commit.c:1249

2464 #, c-format

2465 msgid "Commit %s has a good GPG signature by %s\n"

2466 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"

2467

2460 -#: commit.c:1501

2468 +#: commit.c:1503

2469 msgid ""

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

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

@@ -2471,7 +2479,7 @@ msgstr ""

2479 msgid "memory exhausted"

2480 msgstr "minnet slut"

2481

2474 -#: config.c:126

2482 +#: config.c:125

2483 #, c-format

2484 msgid ""

2485 "exceeded maximum include depth (%d) while including\n"

@@ -2486,35 +2494,35 @@ msgstr ""

2494 "\t%s\n"

2495 "Det kan bero på cirkulära inkluderingar."

2496

2489 -#: config.c:142

2497 +#: config.c:141

2498 #, c-format

2499 msgid "could not expand include path '%s'"

2500 msgstr "kunde inte expandera inkluderingssökväg \"%s\""

2501

2494 -#: config.c:153

2502 +#: config.c:152

2503 msgid "relative config includes must come from files"

2504 msgstr "relativa konfigureringsinkluderingar måste komma från filer"

2505

2498 -#: config.c:199

2506 +#: config.c:201

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

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

2509

2502 -#: config.c:396

2510 +#: config.c:398

2511 #, c-format

2512 msgid "invalid config format: %s"

2513 msgstr "felaktigt konfigurationsformat: %s"

2514

2507 -#: config.c:400

2515 +#: config.c:402

2516 #, c-format

2517 msgid "missing environment variable name for configuration '%.*s'"

2518 msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""

2519

2512 -#: config.c:405

2520 +#: config.c:407

2521 #, c-format

2522 msgid "missing environment variable '%s' for configuration '%.*s'"

2523 msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""

2524

2517 -#: config.c:442

2525 +#: config.c:443

2526 #, c-format

2527 msgid "key does not contain a section: %s"

2528 msgstr "nyckeln innehåller inte ett stycke: %s"

@@ -2524,303 +2532,303 @@ msgstr "nyckeln innehåller inte ett stycke: %s"

2532 msgid "key does not contain variable name: %s"

2533 msgstr "nyckeln innehåller inte variabelnamn: %s"

2534

2527 -#: config.c:472 sequencer.c:2785

2535 +#: config.c:470 sequencer.c:2804

2536 #, c-format

2537 msgid "invalid key: %s"

2538 msgstr "felaktig nyckel: %s"

2539

2532 -#: config.c:478

2540 +#: config.c:475

2541 #, c-format

2542 msgid "invalid key (newline): %s"

2543 msgstr "ogiltig nyckel (nyradstecken): %s"

2544

2537 -#: config.c:511

2545 +#: config.c:495

2546 msgid "empty config key"

2547 msgstr "tom konfigurationsnyckel"

2548

2541 -#: config.c:529 config.c:541

2549 +#: config.c:513 config.c:525

2550 #, c-format

2551 msgid "bogus config parameter: %s"

2552 msgstr "falsk konfigureringsparameter: %s"

2553

2546 -#: config.c:555 config.c:572 config.c:579 config.c:588

2554 +#: config.c:539 config.c:556 config.c:563 config.c:572

2555 #, c-format

2556 msgid "bogus format in %s"

2557 msgstr "felaktigt format i %s"

2558

2551 -#: config.c:622

2559 +#: config.c:606

2560 #, c-format

2561 msgid "bogus count in %s"

2562 msgstr "felaktigt antal i %s"

2563

2556 -#: config.c:626

2564 +#: config.c:610

2565 #, c-format

2566 msgid "too many entries in %s"

2567 msgstr "för många poster i %s"

2568

2561 -#: config.c:636

2569 +#: config.c:620

2570 #, c-format

2571 msgid "missing config key %s"

2572 msgstr "konfigurationsnyckel saknas för %s"

2573

2566 -#: config.c:644

2574 +#: config.c:628

2575 #, c-format

2576 msgid "missing config value %s"

2577 msgstr "konfigurationsvärde saknas för %s"

2578

2571 -#: config.c:995

2579 +#: config.c:979

2580 #, c-format

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

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

2583

2576 -#: config.c:999

2584 +#: config.c:983

2585 #, c-format

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

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

2588

2581 -#: config.c:1003

2589 +#: config.c:987

2590 #, c-format

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

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

2593

2586 -#: config.c:1007

2594 +#: config.c:991

2595 #, c-format

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

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

2598

2591 -#: config.c:1011

2599 +#: config.c:995

2600 #, c-format

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

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

2603

2596 -#: config.c:1015

2604 +#: config.c:999

2605 #, c-format

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

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

2608

2601 -#: config.c:1152

2609 +#: config.c:1136

2610 msgid "out of range"

2611 msgstr "utanför intervallet"

2612

2605 -#: config.c:1152

2613 +#: config.c:1136

2614 msgid "invalid unit"

2615 msgstr "ogiltig enhet"

2616

2609 -#: config.c:1153

2617 +#: config.c:1137

2618 #, c-format

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

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

2621

2614 -#: config.c:1163

2622 +#: config.c:1147

2623 #, c-format

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

2625 msgstr ""

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

2627

2620 -#: config.c:1166

2628 +#: config.c:1150

2629 #, c-format

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

2631 msgstr ""

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

2633

2626 -#: config.c:1169

2634 +#: config.c:1153

2635 #, c-format

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

2637 msgstr ""

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

2639

2632 -#: config.c:1172

2640 +#: config.c:1156

2641 #, c-format

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

2643 msgstr ""

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

2645 "en %s: %s"

2646

2639 -#: config.c:1175

2647 +#: config.c:1159

2648 #, c-format

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

2650 msgstr ""

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

2652 "%s: %s"

2653

2646 -#: config.c:1178

2654 +#: config.c:1162

2655 #, c-format

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

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

2658

2651 -#: config.c:1257

2659 +#: config.c:1241

2660 #, c-format

2661 msgid "bad boolean config value '%s' for '%s'"

2662 msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""

2663

2656 -#: config.c:1275

2664 +#: config.c:1259

2665 #, c-format

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

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

2668

2661 -#: config.c:1284

2669 +#: config.c:1268

2670 #, c-format

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

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

2673

2666 -#: config.c:1377

2674 +#: config.c:1361

2675 #, c-format

2676 msgid "abbrev length out of range: %d"

2677 msgstr "förkortningslängd utanför intervallet: %d"

2678

2671 -#: config.c:1391 config.c:1402

2679 +#: config.c:1375 config.c:1386

2680 #, c-format

2681 msgid "bad zlib compression level %d"

2682 msgstr "felaktigt zlib-komprimeringsgrad %d"

2683

2676 -#: config.c:1494

2684 +#: config.c:1476

2685 msgid "core.commentChar should only be one character"

2686 msgstr "core.commentChar kan bara vara ett tecken"

2687

2680 -#: config.c:1527

2688 +#: config.c:1509

2689 #, c-format

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

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

2692

2685 -#: config.c:1599

2693 +#: config.c:1581

2694 #, c-format

2695 msgid "malformed value for %s"

2696 msgstr "felformat värde för %s"

2697

2690 -#: config.c:1625

2698 +#: config.c:1607

2699 #, c-format

2700 msgid "malformed value for %s: %s"

2701 msgstr "felformat värde för %s: %s"

2702

2695 -#: config.c:1626

2703 +#: config.c:1608

2704 msgid "must be one of nothing, matching, simple, upstream or current"

2705 msgstr "måste vara en av nothing, matching, simple, upstream eller current"

2706

2699 -#: config.c:1687 builtin/pack-objects.c:4084

2707 +#: config.c:1669 builtin/pack-objects.c:4053

2708 #, c-format

2709 msgid "bad pack compression level %d"

2710 msgstr "felaktig paketkomprimeringsgrad %d"

2711

2704 -#: config.c:1809

2712 +#: config.c:1792

2713 #, c-format

2714 msgid "unable to load config blob object '%s'"

2715 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""

2716

2709 -#: config.c:1812

2717 +#: config.c:1795

2718 #, c-format

2719 msgid "reference '%s' does not point to a blob"

2720 msgstr "referensen \"%s\" pekar inte på en blob"

2721

2714 -#: config.c:1829

2722 +#: config.c:1813

2723 #, c-format

2724 msgid "unable to resolve config blob '%s'"

2725 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""

2726

2719 -#: config.c:1874

2727 +#: config.c:1858

2728 #, c-format

2729 msgid "failed to parse %s"

2730 msgstr "kunde inte tolka %s"

2731

2724 -#: config.c:1930

2732 +#: config.c:1914

2733 msgid "unable to parse command-line config"

2734 msgstr "kan inte tolka kommandoradskonfiguration"

2735

2728 -#: config.c:2294

2736 +#: config.c:2282

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

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

2739

2732 -#: config.c:2468

2740 +#: config.c:2456

2741 #, c-format

2742 msgid "Invalid %s: '%s'"

2743 msgstr "Felaktigt %s: \"%s\""

2744

2737 -#: config.c:2513

2745 +#: config.c:2501

2746 #, c-format

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

2748 msgstr ""

2749 "värdet \"%d\" för splitIndex.maxPercentChange borde vara mellan 0 och 100"

2750

2743 -#: config.c:2559

2751 +#: config.c:2547

2752 #, c-format

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

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

2755

2748 -#: config.c:2561

2756 +#: config.c:2549

2757 #, c-format

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

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

2760

2753 -#: config.c:2645

2761 +#: config.c:2633

2762 #, c-format

2763 msgid "invalid section name '%s'"

2764 msgstr "felaktigt sektionsnamn \"%s\""

2765

2758 -#: config.c:2677

2766 +#: config.c:2665

2767 #, c-format

2768 msgid "%s has multiple values"

2769 msgstr "%s har flera värden"

2770

2763 -#: config.c:2706

2771 +#: config.c:2694

2772 #, c-format

2773 msgid "failed to write new configuration file %s"

2774 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""

2775

2768 -#: config.c:2958 config.c:3285

2776 +#: config.c:2946 config.c:3273

2777 #, c-format

2778 msgid "could not lock config file %s"

2779 msgstr "kunde inte låsa konfigurationsfilen %s"

2780

2773 -#: config.c:2969

2781 +#: config.c:2957

2782 #, c-format

2783 msgid "opening %s"

2784 msgstr "öppnar %s"

2785

2778 -#: config.c:3006 builtin/config.c:361

2786 +#: config.c:2994 builtin/config.c:361

2787 #, c-format

2788 msgid "invalid pattern: %s"

2789 msgstr "ogiltigt mönster: %s"

2790

2783 -#: config.c:3031

2791 +#: config.c:3019

2792 #, c-format

2793 msgid "invalid config file %s"

2794 msgstr "ogiltig konfigurationsfil: \"%s\""

2795

2788 -#: config.c:3044 config.c:3298

2796 +#: config.c:3032 config.c:3286

2797 #, c-format

2798 msgid "fstat on %s failed"

2799 msgstr "fstat misslyckades på %s"

2800

2793 -#: config.c:3055

2801 +#: config.c:3043

2802 #, c-format

2803 msgid "unable to mmap '%s'%s"

2804 msgstr "kunde inte utföra mmap på \"%s\"%s"

2805

2798 -#: config.c:3065 config.c:3303

2806 +#: config.c:3053 config.c:3291

2807 #, c-format

2808 msgid "chmod on %s failed"

2809 msgstr "chmod misslyckades på %s"

2810

2803 -#: config.c:3150 config.c:3400

2811 +#: config.c:3138 config.c:3388

2812 #, c-format

2813 msgid "could not write config file %s"

2814 msgstr "kunde inte skriva konfigurationsfilen %s"

2815

2808 -#: config.c:3184

2816 +#: config.c:3172

2817 #, c-format

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

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

2820

2813 -#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863

2821 +#: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868

2822 #, c-format

2823 msgid "could not unset '%s'"

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

2825

2818 -#: config.c:3276

2826 +#: config.c:3264

2827 #, c-format

2828 msgid "invalid section name: %s"

2829 msgstr "felaktigt namn på stycke: %s"

2830

2823 -#: config.c:3443

2831 +#: config.c:3431

2832 #, c-format

2833 msgid "missing value for '%s'"

2834 msgstr "värde saknas för \"%s\""

@@ -2855,72 +2863,72 @@ msgstr "servern stöder inte funktionen \"%s\""

2863 msgid "expected flush after capabilities"

2864 msgstr "förväntade \"flush\" efter förmågor"

2865

2858 -#: connect.c:263

2866 +#: connect.c:265

2867 #, c-format

2868 msgid "ignoring capabilities after first line '%s'"

2869 msgstr "ignorerar förmågor efter första raden \"%s\""

2870

2863 -#: connect.c:284

2871 +#: connect.c:286

2872 msgid "protocol error: unexpected capabilities^{}"

2873 msgstr "protokollfel: förväntade inte capabilities^{}"

2874

2867 -#: connect.c:306

2875 +#: connect.c:308

2876 #, c-format

2877 msgid "protocol error: expected shallow sha-1, got '%s'"

2878 msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""

2879

2872 -#: connect.c:308

2880 +#: connect.c:310

2881 msgid "repository on the other end cannot be shallow"

2882 msgstr "arkivet på andra sidan kan inte vara grunt"

2883

2876 -#: connect.c:347

2884 +#: connect.c:349

2885 msgid "invalid packet"

2886 msgstr "ogiltigt paket"

2887

2880 -#: connect.c:367

2888 +#: connect.c:369

2889 #, c-format

2890 msgid "protocol error: unexpected '%s'"

2891 msgstr "protokollfel: förväntade inte \"%s\""

2892

2885 -#: connect.c:497

2893 +#: connect.c:499

2894 #, c-format

2895 msgid "unknown object format '%s' specified by server"

2896 msgstr "okänt objektformat \"%s\" angavs av servern"

2897

2890 -#: connect.c:526

2898 +#: connect.c:528

2899 #, c-format

2900 msgid "invalid ls-refs response: %s"

2901 msgstr "ogiltigt svar på ls-refs: %s"

2902

2895 -#: connect.c:530

2903 +#: connect.c:532

2904 msgid "expected flush after ref listing"

2905 msgstr "förväntade \"flush\" efter ref-listan"

2906

2899 -#: connect.c:533

2907 +#: connect.c:535

2908 msgid "expected response end packet after ref listing"

2909 msgstr "förväntade svarsavslutningspaket efter ref-listan"

2910

2903 -#: connect.c:666

2911 +#: connect.c:670

2912 #, c-format

2913 msgid "protocol '%s' is not supported"

2914 msgstr "protokollet \"%s\" stöds inte"

2915

2908 -#: connect.c:717

2916 +#: connect.c:721

2917 msgid "unable to set SO_KEEPALIVE on socket"

2918 msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"

2919

2912 -#: connect.c:757 connect.c:820

2920 +#: connect.c:761 connect.c:824

2921 #, c-format

2922 msgid "Looking up %s ... "

2923 msgstr "Slår upp %s..."

2924

2917 -#: connect.c:761

2925 +#: connect.c:765

2926 #, c-format

2927 msgid "unable to look up %s (port %s) (%s)"

2928 msgstr "kan inte slå upp %s (port %s) (%s)"

2929

2930 #. TRANSLATORS: this is the end of "Looking up %s ... "

2923 -#: connect.c:765 connect.c:836

2931 +#: connect.c:769 connect.c:840

2932 #, c-format

2933 msgid ""

2934 "done.\n"

@@ -2929,7 +2937,7 @@ msgstr ""

2937 "klart.\n"

2938 "Ansluter till %s (port %s)..."

2939

2932 -#: connect.c:787 connect.c:864

2940 +#: connect.c:791 connect.c:868

2941 #, c-format

2942 msgid ""

2943 "unable to connect to %s:\n"

@@ -2939,79 +2947,79 @@ msgstr ""

2947 "%s"

2948

2949 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "

2942 -#: connect.c:793 connect.c:870

2950 +#: connect.c:797 connect.c:874

2951 msgid "done."

2952 msgstr "klart."

2953

2946 -#: connect.c:824

2954 +#: connect.c:828

2955 #, c-format

2956 msgid "unable to look up %s (%s)"

2957 msgstr "kunde inte slå upp %s (%s)"

2958

2951 -#: connect.c:830

2959 +#: connect.c:834

2960 #, c-format

2961 msgid "unknown port %s"

2962 msgstr "okänd port %s"

2963

2956 -#: connect.c:967 connect.c:1299

2964 +#: connect.c:971 connect.c:1303

2965 #, c-format

2966 msgid "strange hostname '%s' blocked"

2967 msgstr "konstigt värdnamn \"%s\" blockerat"

2968

2961 -#: connect.c:969

2969 +#: connect.c:973

2970 #, c-format

2971 msgid "strange port '%s' blocked"

2972 msgstr "konstig port \"%s\" blockerad"

2973

2966 -#: connect.c:979

2974 +#: connect.c:983

2975 #, c-format

2976 msgid "cannot start proxy %s"

2977 msgstr "kan inte starta mellanserver (proxy) %s"

2978

2971 -#: connect.c:1050

2979 +#: connect.c:1054

2980 msgid "no path specified; see 'git help pull' for valid url syntax"

2981 msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"

2982

2975 -#: connect.c:1190

2983 +#: connect.c:1194

2984 msgid "newline is forbidden in git:// hosts and repo paths"

2985 msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"

2986

2979 -#: connect.c:1247

2987 +#: connect.c:1251

2988 msgid "ssh variant 'simple' does not support -4"

2989 msgstr "ssh-varianten \"simple\" stöder inte -4"

2990

2983 -#: connect.c:1259

2991 +#: connect.c:1263

2992 msgid "ssh variant 'simple' does not support -6"

2993 msgstr "ssh-varianten \"simple\" stöder inte -6"

2994

2987 -#: connect.c:1276

2995 +#: connect.c:1280

2996 msgid "ssh variant 'simple' does not support setting port"

2997 msgstr "ssh-varianten \"simple\" stöder inte val av port"

2998

2991 -#: connect.c:1388

2999 +#: connect.c:1392

3000 #, c-format

3001 msgid "strange pathname '%s' blocked"

3002 msgstr "konstigt sökvägsnamn \"%s\" blockerat"

3003

2996 -#: connect.c:1436

3004 +#: connect.c:1440

3005 msgid "unable to fork"

3006 msgstr "kunde inte grena (fork)"

3007

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

3009 # objects in the database.

3002 -#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45

3010 +#: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45

3011 msgid "Checking connectivity"

3012 msgstr "Kontrollerar konnektivitet"

3013

3006 -#: connected.c:120

3014 +#: connected.c:122

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

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

3017

3010 -#: connected.c:144

3018 +#: connected.c:146

3019 msgid "failed write to rev-list"

3020 msgstr "kunde inte skriva till rev-list"

3021

3014 -#: connected.c:149

3022 +#: connected.c:151

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

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

3025

@@ -3156,17 +3164,17 @@ msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"

3164 msgid "refusing to work with credential missing protocol field"

3165 msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"

3166

3159 -#: credential.c:394

3167 +#: credential.c:395

3168 #, c-format

3169 msgid "url contains a newline in its %s component: %s"

3170 msgstr "url innehåller radbrytning i komponenten %s: %s"

3171

3164 -#: credential.c:438

3172 +#: credential.c:439

3173 #, c-format

3174 msgid "url has no scheme: %s"

3175 msgstr "url saknar protokoll: %s"

3176

3169 -#: credential.c:511

3177 +#: credential.c:512

3178 #, c-format

3179 msgid "credential url cannot be parsed: %s"

3180 msgstr "kan inte tolka url för inloggingsuppgifter: %s"

@@ -3268,23 +3276,23 @@ msgstr "Markerade %d öar, klar.\n"

3276 msgid "unknown value for --diff-merges: %s"

3277 msgstr "okänt värde för --diff-merges: %s"

3278

3271 -#: diff-lib.c:557

3279 +#: diff-lib.c:561

3280 msgid "--merge-base does not work with ranges"

3281 msgstr "--merge-base fungerar inte med intervall"

3282

3275 -#: diff-lib.c:559

3283 +#: diff-lib.c:563

3284 msgid "--merge-base only works with commits"

3285 msgstr "--merge-base fungerar bara med incheckningar"

3286

3279 -#: diff-lib.c:576

3287 +#: diff-lib.c:580

3288 msgid "unable to get HEAD"

3289 msgstr "kan inte hämta HEAD"

3290

3283 -#: diff-lib.c:583

3291 +#: diff-lib.c:587

3292 msgid "no merge base found"

3293 msgstr "ingen sammanslagningsbas hittades"

3294

3287 -#: diff-lib.c:585

3295 +#: diff-lib.c:589

3296 msgid "multiple merge bases found"

3297 msgstr "flera sammanslagningsbaser hittades"

3298

@@ -3300,17 +3308,17 @@ msgstr ""

3308 "Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "

3309 "en arbetskatalog."

3310

3303 -#: diff.c:156

3311 +#: diff.c:157

3312 #, c-format

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

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

3315

3308 -#: diff.c:161

3316 +#: diff.c:162

3317 #, c-format

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

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

3320

3313 -#: diff.c:297

3321 +#: diff.c:298

3322 msgid ""

3323 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "

3324 "'dimmed-zebra', 'plain'"

@@ -3318,7 +3326,7 @@ msgstr ""

3326 "färginställningen för flyttade block måste vara en av \"no\", \"default\", "

3327 "\"blocks\", \"zebra\", \"dimmed-zebra\", \"plain\""

3328

3321 -#: diff.c:325

3329 +#: diff.c:326

3330 #, c-format

3331 msgid ""

3332 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "

@@ -3328,7 +3336,7 @@ msgstr ""

3336 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"

3337 "\""

3338

3331 -#: diff.c:333

3339 +#: diff.c:334

3340 msgid ""

3341 "color-moved-ws: allow-indentation-change cannot be combined with other "

3342 "whitespace modes"

@@ -3336,12 +3344,12 @@ msgstr ""

3344 "color-moved-ws: allow-indentation-change kan inte kombineras med andra "

3345 "blankstegslägen"

3346

3339 -#: diff.c:410

3347 +#: diff.c:411

3348 #, c-format

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

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

3351

3344 -#: diff.c:470

3352 +#: diff.c:471

3353 #, c-format

3354 msgid ""

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

@@ -3350,27 +3358,27 @@ msgstr ""

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

3359 "%s"

3360

3353 -#: diff.c:4282

3361 +#: diff.c:4290

3362 #, c-format

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

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

3365

3358 -#: diff.c:4634

3366 +#: diff.c:4642

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

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

3369

3362 -#: diff.c:4637

3370 +#: diff.c:4645

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

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

3373

3366 -#: diff.c:4640

3374 +#: diff.c:4648

3375 msgid ""

3376 "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"

3377 msgstr ""

3378 "-G och --pickaxe-regex är ömsesidigt uteslutande, använd --pickaxe-regex med "

3379 "-S"

3380

3373 -#: diff.c:4643

3381 +#: diff.c:4651

3382 msgid ""

3383 "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "

3384 "with -G and -S"

@@ -3378,22 +3386,22 @@ msgstr ""

3386 "--pickaxe-all och --find-object är ömsesidigt uteslutande, använd --pickaxe-"

3387 "all med -G och -S"

3388

3381 -#: diff.c:4722

3389 +#: diff.c:4730

3390 msgid "--follow requires exactly one pathspec"

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

3392

3385 -#: diff.c:4770

3393 +#: diff.c:4778

3394 #, c-format

3395 msgid "invalid --stat value: %s"

3396 msgstr "ogiltigt värde för --stat: %s"

3397

3390 -#: diff.c:4775 diff.c:4780 diff.c:4785 diff.c:4790 diff.c:5318

3391 -#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180

3398 +#: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326

3399 +#: parse-options.c:217 parse-options.c:221

3400 #, c-format

3401 msgid "%s expects a numerical value"

3402 msgstr "%s förväntar ett numeriskt värde"

3403

3396 -#: diff.c:4807

3404 +#: diff.c:4815

3405 #, c-format

3406 msgid ""

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

@@ -3402,42 +3410,42 @@ msgstr ""

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

3411 "%s"

3412

3405 -#: diff.c:4892

3413 +#: diff.c:4900

3414 #, c-format

3415 msgid "unknown change class '%c' in --diff-filter=%s"

3416 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"

3417

3410 -#: diff.c:4916

3418 +#: diff.c:4924

3419 #, c-format

3420 msgid "unknown value after ws-error-highlight=%.*s"

3421 msgstr "okänt värde efter ws-error-highlight=%.*s"

3422

3415 -#: diff.c:4930

3423 +#: diff.c:4938

3424 #, c-format

3425 msgid "unable to resolve '%s'"

3426 msgstr "kunde inte slå upp \"%s\""

3427

3420 -#: diff.c:4980 diff.c:4986

3428 +#: diff.c:4988 diff.c:4994

3429 #, c-format

3430 msgid "%s expects <n>/<m> form"

3431 msgstr "%s förväntar formen <n>/<m>"

3432

3425 -#: diff.c:4998

3433 +#: diff.c:5006

3434 #, c-format

3435 msgid "%s expects a character, got '%s'"

3436 msgstr "%s förväntar ett tecken, fick \"%s\""

3437

3430 -#: diff.c:5019

3438 +#: diff.c:5027

3439 #, c-format

3440 msgid "bad --color-moved argument: %s"

3441 msgstr "felaktigt argument till --color-moved: %s"

3442

3435 -#: diff.c:5038

3443 +#: diff.c:5046

3444 #, c-format

3445 msgid "invalid mode '%s' in --color-moved-ws"

3446 msgstr "ogiltigt läge %s\" i --color-moved-ws"

3447

3440 -#: diff.c:5078

3448 +#: diff.c:5086

3449 msgid ""

3450 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "

3451 "\"histogram\""

@@ -3445,154 +3453,154 @@ msgstr ""

3453 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "

3454 "\"histogram\""

3455

3448 -#: diff.c:5114 diff.c:5134

3456 +#: diff.c:5122 diff.c:5142

3457 #, c-format

3458 msgid "invalid argument to %s"

3459 msgstr "ogiltigt argument för %s"

3460

3453 -#: diff.c:5238

3461 +#: diff.c:5246

3462 #, c-format

3463 msgid "invalid regex given to -I: '%s'"

3464 msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""

3465

3458 -#: diff.c:5287

3466 +#: diff.c:5295

3467 #, c-format

3468 msgid "failed to parse --submodule option parameter: '%s'"

3469 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""

3470

3463 -#: diff.c:5343

3471 +#: diff.c:5351

3472 #, c-format

3473 msgid "bad --word-diff argument: %s"

3474 msgstr "felaktigt argument --word-diff: %s"

3475

3468 -#: diff.c:5379

3476 +#: diff.c:5387

3477 msgid "Diff output format options"

3478 msgstr "Formatflaggor för diff-utdata"

3479

3472 -#: diff.c:5381 diff.c:5387

3480 +#: diff.c:5389 diff.c:5395

3481 msgid "generate patch"

3482 msgstr "skapar patch"

3483

3476 -#: diff.c:5384 builtin/log.c:179

3484 +#: diff.c:5392 builtin/log.c:179

3485 msgid "suppress diff output"

3486 msgstr "undertryck diff-utdata"

3487

3480 -#: diff.c:5389 diff.c:5503 diff.c:5510

3488 +#: diff.c:5397 diff.c:5511 diff.c:5518

3489 msgid "<n>"

3490 msgstr "<n>"

3491

3484 -#: diff.c:5390 diff.c:5393

3492 +#: diff.c:5398 diff.c:5401

3493 msgid "generate diffs with <n> lines context"

3494 msgstr "skapa diffar med <n> rader sammanhang"

3495

3488 -#: diff.c:5395

3496 +#: diff.c:5403

3497 msgid "generate the diff in raw format"

3498 msgstr "generera diff i råformat"

3499

3492 -#: diff.c:5398

3500 +#: diff.c:5406

3501 msgid "synonym for '-p --raw'"

3502 msgstr "synonym till \"-p --raw\""

3503

3496 -#: diff.c:5402

3504 +#: diff.c:5410

3505 msgid "synonym for '-p --stat'"

3506 msgstr "synonym till \"-p --stat\""

3507

3500 -#: diff.c:5406

3508 +#: diff.c:5414

3509 msgid "machine friendly --stat"

3510 msgstr "maskinläsbar --stat"

3511

3504 -#: diff.c:5409

3512 +#: diff.c:5417

3513 msgid "output only the last line of --stat"

3514 msgstr "skriv bara ut den sista raden för --stat"

3515

3508 -#: diff.c:5411 diff.c:5419

3516 +#: diff.c:5419 diff.c:5427

3517 msgid "<param1,param2>..."

3518 msgstr "<param1,param2>..."

3519

3512 -#: diff.c:5412

3520 +#: diff.c:5420

3521 msgid ""

3522 "output the distribution of relative amount of changes for each sub-directory"

3523 msgstr ""

3524 "skriv ut distributionen av relativa mängder ändringar för varje underkatalog"

3525

3518 -#: diff.c:5416

3526 +#: diff.c:5424

3527 msgid "synonym for --dirstat=cumulative"

3528 msgstr "synonym för --dirstat=cumulative"

3529

3522 -#: diff.c:5420

3530 +#: diff.c:5428

3531 msgid "synonym for --dirstat=files,param1,param2..."

3532 msgstr "synonym för --dirstat=filer,param1,param2..."

3533

3526 -#: diff.c:5424

3534 +#: diff.c:5432

3535 msgid "warn if changes introduce conflict markers or whitespace errors"

3536 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"

3537

3530 -#: diff.c:5427

3538 +#: diff.c:5435

3539 msgid "condensed summary such as creations, renames and mode changes"

3540 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"

3541

3534 -#: diff.c:5430

3542 +#: diff.c:5438

3543 msgid "show only names of changed files"

3544 msgstr "visa endast namnen på ändrade filer"

3545

3538 -#: diff.c:5433

3546 +#: diff.c:5441

3547 msgid "show only names and status of changed files"

3548 msgstr "visa endast namn och status för ändrade filer"

3549

3542 -#: diff.c:5435

3550 +#: diff.c:5443

3551 msgid "<width>[,<name-width>[,<count>]]"

3552 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"

3553

3546 -#: diff.c:5436

3554 +#: diff.c:5444

3555 msgid "generate diffstat"

3556 msgstr "skapa diffstat"

3557

3550 -#: diff.c:5438 diff.c:5441 diff.c:5444

3558 +#: diff.c:5446 diff.c:5449 diff.c:5452

3559 msgid "<width>"

3560 msgstr "<bredd>"

3561

3554 -#: diff.c:5439

3562 +#: diff.c:5447

3563 msgid "generate diffstat with a given width"

3564 msgstr "generera en diffstat med given bredd"

3565

3558 -#: diff.c:5442

3566 +#: diff.c:5450

3567 msgid "generate diffstat with a given name width"

3568 msgstr "generera en diffstat med given namnbredd"

3569

3562 -#: diff.c:5445

3570 +#: diff.c:5453

3571 msgid "generate diffstat with a given graph width"

3572 msgstr "generera en diffstat med given grafbredd"

3573

3566 -#: diff.c:5447

3574 +#: diff.c:5455

3575 msgid "<count>"

3576 msgstr "<antal>"

3577

3570 -#: diff.c:5448

3578 +#: diff.c:5456

3579 msgid "generate diffstat with limited lines"

3580 msgstr "generera diffstat med begränsade rader"

3581

3574 -#: diff.c:5451

3582 +#: diff.c:5459

3583 msgid "generate compact summary in diffstat"

3584 msgstr "skapa kompakt översikt i diffstat"

3585

3578 -#: diff.c:5454

3586 +#: diff.c:5462

3587 msgid "output a binary diff that can be applied"

3588 msgstr "skapa en binärdiff som kan appliceras"

3589

3582 -#: diff.c:5457

3590 +#: diff.c:5465

3591 msgid "show full pre- and post-image object names on the \"index\" lines"

3592 msgstr ""

3593 "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"

3594

3587 -#: diff.c:5459

3595 +#: diff.c:5467

3596 msgid "show colored diff"

3597 msgstr "visa färgad diff"

3598

3591 -#: diff.c:5460

3599 +#: diff.c:5468

3600 msgid "<kind>"

3601 msgstr "<typ>"

3602

3595 -#: diff.c:5461

3603 +#: diff.c:5469

3604 msgid ""

3605 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "

3606 "diff"

@@ -3600,7 +3608,7 @@ msgstr ""

3608 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "

3609 "\"new\" (nya) rader i diffen"

3610

3603 -#: diff.c:5464

3611 +#: diff.c:5472

3612 msgid ""

3613 "do not munge pathnames and use NULs as output field terminators in --raw or "

3614 "--numstat"

@@ -3608,87 +3616,87 @@ msgstr ""

3616 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "

3617 "eller --numstat"

3618

3611 -#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582

3619 +#: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590

3620 msgid "<prefix>"

3621 msgstr "<prefix>"

3622

3615 -#: diff.c:5468

3623 +#: diff.c:5476

3624 msgid "show the given source prefix instead of \"a/\""

3625 msgstr "visa givet källprefix istället för \"a/\""

3626

3619 -#: diff.c:5471

3627 +#: diff.c:5479

3628 msgid "show the given destination prefix instead of \"b/\""

3629 msgstr "visa givet målprefix istället för \"b/\""

3630

3623 -#: diff.c:5474

3631 +#: diff.c:5482

3632 msgid "prepend an additional prefix to every line of output"

3633 msgstr "lägg till ytterligare prefix på alla rader i utdata"

3634

3627 -#: diff.c:5477

3635 +#: diff.c:5485

3636 msgid "do not show any source or destination prefix"

3637 msgstr "visa inte käll- eller målprefix"

3638

3631 -#: diff.c:5480

3639 +#: diff.c:5488

3640 msgid "show context between diff hunks up to the specified number of lines"

3641 msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"

3642

3635 -#: diff.c:5484 diff.c:5489 diff.c:5494

3643 +#: diff.c:5492 diff.c:5497 diff.c:5502

3644 msgid "<char>"

3645 msgstr "<tecken>"

3646

3639 -#: diff.c:5485

3647 +#: diff.c:5493

3648 msgid "specify the character to indicate a new line instead of '+'"

3649 msgstr "ange tecken för att ange ny rad istället för \"+\""

3650

3643 -#: diff.c:5490

3651 +#: diff.c:5498

3652 msgid "specify the character to indicate an old line instead of '-'"

3653 msgstr "ange tecken för att ange gammal rad istället för \"-\""

3654

3647 -#: diff.c:5495

3655 +#: diff.c:5503

3656 msgid "specify the character to indicate a context instead of ' '"

3657 msgstr "ange tecken för att ange sammanhang istället för \" \""

3658

3651 -#: diff.c:5498

3659 +#: diff.c:5506

3660 msgid "Diff rename options"

3661 msgstr "Diff-namnbytesflaggor"

3662

3655 -#: diff.c:5499

3663 +#: diff.c:5507

3664 msgid "<n>[/<m>]"

3665 msgstr "<n>[/<m>]"

3666

3659 -#: diff.c:5500

3667 +#: diff.c:5508

3668 msgid "break complete rewrite changes into pairs of delete and create"

3669 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"

3670

3663 -#: diff.c:5504

3671 +#: diff.c:5512

3672 msgid "detect renames"

3673 msgstr "detektera namnändringar"

3674

3667 -#: diff.c:5508

3675 +#: diff.c:5516

3676 msgid "omit the preimage for deletes"

3677 msgstr "ta bort för-version för borttagningar"

3678

3671 -#: diff.c:5511

3679 +#: diff.c:5519

3680 msgid "detect copies"

3681 msgstr "detektera kopior"

3682

3675 -#: diff.c:5515

3683 +#: diff.c:5523

3684 msgid "use unmodified files as source to find copies"

3685 msgstr "använd oförändrade som källa för att hitta kopior"

3686

3679 -#: diff.c:5517

3687 +#: diff.c:5525

3688 msgid "disable rename detection"

3689 msgstr "inaktivera detektering av namnbyten"

3690

3683 -#: diff.c:5520

3691 +#: diff.c:5528

3692 msgid "use empty blobs as rename source"

3693 msgstr "använd tomma blob:ar som namnändringskälla"

3694

3687 -#: diff.c:5522

3695 +#: diff.c:5530

3696 msgid "continue listing the history of a file beyond renames"

3697 msgstr "fortsätt lista historiken för en fil bortom namnändringar"

3698

3691 -#: diff.c:5525

3699 +#: diff.c:5533

3700 msgid ""

3701 "prevent rename/copy detection if the number of rename/copy targets exceeds "

3702 "given limit"

@@ -3696,163 +3704,163 @@ msgstr ""

3704 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "

3705 "given gräns"

3706

3699 -#: diff.c:5527

3707 +#: diff.c:5535

3708 msgid "Diff algorithm options"

3709 msgstr "Alternativ för diff-algoritm"

3710

3703 -#: diff.c:5529

3711 +#: diff.c:5537

3712 msgid "produce the smallest possible diff"

3713 msgstr "skapa minsta möjliga diff"

3714

3707 -#: diff.c:5532

3715 +#: diff.c:5540

3716 msgid "ignore whitespace when comparing lines"

3717 msgstr "ignorera blanktecken vid radjämförelse"

3718

3711 -#: diff.c:5535

3719 +#: diff.c:5543

3720 msgid "ignore changes in amount of whitespace"

3721 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"

3722

3715 -#: diff.c:5538

3723 +#: diff.c:5546

3724 msgid "ignore changes in whitespace at EOL"

3725 msgstr "ignorera blanktecken vid radslut"

3726

3719 -#: diff.c:5541

3727 +#: diff.c:5549

3728 msgid "ignore carrier-return at the end of line"

3729 msgstr "ignorera CR-tecken vid radslut"

3730

3723 -#: diff.c:5544

3731 +#: diff.c:5552

3732 msgid "ignore changes whose lines are all blank"

3733 msgstr "ignorera ändringar i rader som är helt blanka"

3734

3727 -#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616

3735 +#: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624

3736 msgid "<regex>"

3737 msgstr "<reguttr>"

3738

3731 -#: diff.c:5547

3739 +#: diff.c:5555

3740 msgid "ignore changes whose all lines match <regex>"

3741 msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"

3742

3735 -#: diff.c:5550

3743 +#: diff.c:5558

3744 msgid "heuristic to shift diff hunk boundaries for easy reading"

3745 msgstr "heuristik för att flytta diff-gränser för lättare läsning"

3746

3739 -#: diff.c:5553

3747 +#: diff.c:5561

3748 msgid "generate diff using the \"patience diff\" algorithm"

3749 msgstr "skapa diffar med algoritmen \"patience diff\""

3750

3743 -#: diff.c:5557

3751 +#: diff.c:5565

3752 msgid "generate diff using the \"histogram diff\" algorithm"

3753 msgstr "skapa diffar med algoritmen \"histogram diff\""

3754

3747 -#: diff.c:5559

3755 +#: diff.c:5567

3756 msgid "<algorithm>"

3757 msgstr "<algoritm>"

3758

3751 -#: diff.c:5560

3759 +#: diff.c:5568

3760 msgid "choose a diff algorithm"

3761 msgstr "välj en diff-algoritm"

3762

3755 -#: diff.c:5562

3763 +#: diff.c:5570

3764 msgid "<text>"

3765 msgstr "<text>"

3766

3759 -#: diff.c:5563

3767 +#: diff.c:5571

3768 msgid "generate diff using the \"anchored diff\" algorithm"

3769 msgstr "skapa diffar med algoritmen \"anchored diff\""

3770

3763 -#: diff.c:5565 diff.c:5574 diff.c:5577

3771 +#: diff.c:5573 diff.c:5582 diff.c:5585

3772 msgid "<mode>"

3773 msgstr "<läge>"

3774

3767 -#: diff.c:5566

3775 +#: diff.c:5574

3776 msgid "show word diff, using <mode> to delimit changed words"

3777 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"

3778

3771 -#: diff.c:5569

3779 +#: diff.c:5577

3780 msgid "use <regex> to decide what a word is"

3781 msgstr "använd <reguttr> för att bestämma vad som är ett ord"

3782

3775 -#: diff.c:5572

3783 +#: diff.c:5580

3784 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"

3785 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"

3786

3779 -#: diff.c:5575

3787 +#: diff.c:5583

3788 msgid "moved lines of code are colored differently"

3789 msgstr "flyttade kodrader färgas på annat sätt"

3790

3783 -#: diff.c:5578

3791 +#: diff.c:5586

3792 msgid "how white spaces are ignored in --color-moved"

3793 msgstr "hur blanktecken ignoreras i --color-moved"

3794

3787 -#: diff.c:5581

3795 +#: diff.c:5589

3796 msgid "Other diff options"

3797 msgstr "Andra diff-flaggor"

3798

3791 -#: diff.c:5583

3799 +#: diff.c:5591

3800 msgid "when run from subdir, exclude changes outside and show relative paths"

3801 msgstr ""

3802 "vid start från underkatalog, uteslut ändringar utanför och visa relativa "

3803 "sökvägar"

3804

3797 -#: diff.c:5587

3805 +#: diff.c:5595

3806 msgid "treat all files as text"

3807 msgstr "hantera alla filer som text"

3808

3801 -#: diff.c:5589

3809 +#: diff.c:5597

3810 msgid "swap two inputs, reverse the diff"

3811 msgstr "växla två indatafiler, vänd diffen"

3812

3805 -#: diff.c:5591

3813 +#: diff.c:5599

3814 msgid "exit with 1 if there were differences, 0 otherwise"

3815 msgstr "avsluta med 1 vid ändringar, annars 0"

3816

3809 -#: diff.c:5593

3817 +#: diff.c:5601

3818 msgid "disable all output of the program"

3819 msgstr "slå av alla utdata från programmet"

3820

3813 -#: diff.c:5595

3821 +#: diff.c:5603

3822 msgid "allow an external diff helper to be executed"

3823 msgstr "tillåt köra en extern diff-hjälpare"

3824

3817 -#: diff.c:5597

3825 +#: diff.c:5605

3826 msgid "run external text conversion filters when comparing binary files"

3827 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"

3828

3821 -#: diff.c:5599

3829 +#: diff.c:5607

3830 msgid "<when>"

3831 msgstr "<när>"

3832

3825 -#: diff.c:5600

3833 +#: diff.c:5608

3834 msgid "ignore changes to submodules in the diff generation"

3835 msgstr "ignorera ändringar i undermoduler när diffen skapas"

3836

3829 -#: diff.c:5603

3837 +#: diff.c:5611

3838 msgid "<format>"

3839 msgstr "<format>"

3840

3833 -#: diff.c:5604

3841 +#: diff.c:5612

3842 msgid "specify how differences in submodules are shown"

3843 msgstr "ange hur ändringar i undermoduler visas"

3844

3837 -#: diff.c:5608

3845 +#: diff.c:5616

3846 msgid "hide 'git add -N' entries from the index"

3847 msgstr "dölj \"git add -N\"-poster från indexet"

3848

3841 -#: diff.c:5611

3849 +#: diff.c:5619

3850 msgid "treat 'git add -N' entries as real in the index"

3851 msgstr "tolka \"git add -N\"-poster som äkta i indexet"

3852

3845 -#: diff.c:5613

3853 +#: diff.c:5621

3854 msgid "<string>"

3855 msgstr "<sträng>"

3856

3849 -#: diff.c:5614

3857 +#: diff.c:5622

3858 msgid ""

3859 "look for differences that change the number of occurrences of the specified "

3860 "string"

3861 msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"

3862

3855 -#: diff.c:5617

3863 +#: diff.c:5625

3864 msgid ""

3865 "look for differences that change the number of occurrences of the specified "

3866 "regex"

@@ -3860,66 +3868,66 @@ msgstr ""

3868 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "

3869 "uttryck"

3870

3863 -#: diff.c:5620

3871 +#: diff.c:5628

3872 msgid "show all changes in the changeset with -S or -G"

3873 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"

3874

3867 -#: diff.c:5623

3875 +#: diff.c:5631

3876 msgid "treat <string> in -S as extended POSIX regular expression"

3877 msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"

3878

3871 -#: diff.c:5626

3879 +#: diff.c:5634

3880 msgid "control the order in which files appear in the output"

3881 msgstr "styr ordningen i vilken filer visas i utdata"

3882

3875 -#: diff.c:5627 diff.c:5630

3883 +#: diff.c:5635 diff.c:5638

3884 msgid "<path>"

3885 msgstr "<sökväg>"

3886

3879 -#: diff.c:5628

3887 +#: diff.c:5636

3888 msgid "show the change in the specified path first"

3889 msgstr "visa ändringen i angiven sökväg först"

3890

3883 -#: diff.c:5631

3891 +#: diff.c:5639

3892 msgid "skip the output to the specified path"

3893 msgstr "hoppa över utdata fram till angiven sökväg"

3894

3887 -#: diff.c:5633

3895 +#: diff.c:5641

3896 msgid "<object-id>"

3897 msgstr "<objekt-id>"

3898

3891 -#: diff.c:5634

3899 +#: diff.c:5642

3900 msgid ""

3901 "look for differences that change the number of occurrences of the specified "

3902 "object"

3903 msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"

3904

3897 -#: diff.c:5636

3905 +#: diff.c:5644

3906 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"

3907 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"

3908

3901 -#: diff.c:5637

3909 +#: diff.c:5645

3910 msgid "select files by diff type"

3911 msgstr "välj filter efter diff-typ"

3912

3905 -#: diff.c:5639

3913 +#: diff.c:5647

3914 msgid "<file>"

3915 msgstr "<fil>"

3916

3909 -#: diff.c:5640

3917 +#: diff.c:5648

3918 msgid "Output to a specific file"

3919 msgstr "Skriv utdata till en specifik fil"

3920

3913 -#: diff.c:6298

3921 +#: diff.c:6306

3922 msgid "exhaustive rename detection was skipped due to too many files."

3923 msgstr ""

3924 "uttömmande namnbytesdetektering hoppades över på grund av för många filer."

3925

3918 -#: diff.c:6301

3926 +#: diff.c:6309

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

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

3929

3922 -#: diff.c:6304

3930 +#: diff.c:6312

3931 #, c-format

3932 msgid ""

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

@@ -3931,7 +3939,7 @@ msgstr ""

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

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

3941

3934 -#: diffcore-rename.c:1514

3942 +#: diffcore-rename.c:1564

3943 msgid "Performing inexact rename detection"

3944 msgstr "Utför onöjaktig namnbytesdetektering"

3945

@@ -3971,338 +3979,416 @@ msgstr "inaktiverar konmönstermatchning"

3979 msgid "cannot use %s as an exclude file"

3980 msgstr "kan inte använda %s som exkluderingsfil"

3981

3974 -#: dir.c:2351

3982 +#: dir.c:2464

3983 #, c-format

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

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

3986

3979 -#: dir.c:2653

3987 +#: dir.c:2766

3988 msgid "failed to get kernel name and information"

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

3990

3983 -#: dir.c:2777

3991 +#: dir.c:2890

3992 msgid "untracked cache is disabled on this system or location"

3993 msgstr "ospårad cache är inaktiverad på systemet eller platsen"

3994

3987 -#: dir.c:3610

3995 +#: dir.c:3158

3996 +msgid ""

3997 +"No directory name could be guessed.\n"

3998 +"Please specify a directory on the command line"

3999 +msgstr ""

4000 +"Kunde inte gissa katalognamn.\n"

4001 +"Ange en katalog på kommandoraden"

4002 +

4003 +#: dir.c:3837

4004 #, c-format

4005 msgid "index file corrupt in repo %s"

4006 msgstr "indexfilen trasig i arkivet %s"

4007

3992 -#: dir.c:3657 dir.c:3662

4008 +#: dir.c:3884 dir.c:3889

4009 #, c-format

4010 msgid "could not create directories for %s"

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

4012

3997 -#: dir.c:3691

4013 +#: dir.c:3918

4014 #, c-format

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

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

4017

4002 -#: editor.c:74

4018 +#: editor.c:77

4019 #, c-format

4020 msgid "hint: Waiting for your editor to close the file...%c"

4021 msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"

4022

4007 -#: entry.c:176

4023 +#: entry.c:177

4024 msgid "Filtering content"

4025 msgstr "Filtrerar innehåll"

4026

4011 -#: entry.c:497

4027 +#: entry.c:498

4028 #, c-format

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

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

4031

4016 -#: environment.c:152

4032 +#: environment.c:143

4033 #, c-format

4034 msgid "bad git namespace path \"%s\""

4035 msgstr "felaktig git-namnrymdssökväg \"%s\""

4036

4021 -#: environment.c:334

4022 -#, c-format

4023 -msgid "could not set GIT_DIR to '%s'"

4024 -msgstr "kunde inte ställa in GIT_DIR till \"%s\""

4025 -

4037 #: exec-cmd.c:363

4038 #, c-format

4039 msgid "too many args to run %s"

4040 msgstr "för många flaggor för att köra %s"

4041

4031 -#: fetch-pack.c:182

4042 +#: fetch-pack.c:193

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

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

4045

4035 -#: fetch-pack.c:185

4046 +#: fetch-pack.c:196

4047 msgid "git fetch-pack: expected a flush packet after shallow list"

4048 msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"

4049

4039 -#: fetch-pack.c:196

4050 +#: fetch-pack.c:207

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

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

4053

4043 -#: fetch-pack.c:216

4054 +#: fetch-pack.c:227

4055 #, c-format

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

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

4058

4048 -#: fetch-pack.c:227

4059 +#: fetch-pack.c:238

4060 msgid "unable to write to remote"

4061 msgstr "kunde inte skriva till fjärren"

4062

4052 -#: fetch-pack.c:288

4063 +#: fetch-pack.c:299

4064 msgid "--stateless-rpc requires multi_ack_detailed"

4065 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""

4066

4056 -#: fetch-pack.c:383 fetch-pack.c:1423

4067 +#: fetch-pack.c:394 fetch-pack.c:1434

4068 #, c-format

4069 msgid "invalid shallow line: %s"

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

4071

4061 -#: fetch-pack.c:389 fetch-pack.c:1429

4072 +#: fetch-pack.c:400 fetch-pack.c:1440

4073 #, c-format

4074 msgid "invalid unshallow line: %s"

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

4076

4066 -#: fetch-pack.c:391 fetch-pack.c:1431

4077 +#: fetch-pack.c:402 fetch-pack.c:1442

4078 #, c-format

4079 msgid "object not found: %s"

4080 msgstr "objektet hittades inte: %s"

4081

4071 -#: fetch-pack.c:394 fetch-pack.c:1434

4082 +#: fetch-pack.c:405 fetch-pack.c:1445

4083 #, c-format

4084 msgid "error in object: %s"

4085 msgstr "fel i objekt: %s"

4086

4076 -#: fetch-pack.c:396 fetch-pack.c:1436

4087 +#: fetch-pack.c:407 fetch-pack.c:1447

4088 #, c-format

4089 msgid "no shallow found: %s"

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

4091

4081 -#: fetch-pack.c:399 fetch-pack.c:1440

4092 +#: fetch-pack.c:410 fetch-pack.c:1451

4093 #, c-format

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

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

4096

4086 -#: fetch-pack.c:439

4097 +#: fetch-pack.c:450

4098 #, c-format

4099 msgid "got %s %d %s"

4100 msgstr "fick %s %d %s"

4101

4091 -#: fetch-pack.c:456

4102 +#: fetch-pack.c:467

4103 #, c-format

4104 msgid "invalid commit %s"

4105 msgstr "ogiltig incheckning %s"

4106

4096 -#: fetch-pack.c:487

4107 +#: fetch-pack.c:498

4108 msgid "giving up"

4109 msgstr "ger upp"

4110

4100 -#: fetch-pack.c:500 progress.c:339

4111 +#: fetch-pack.c:511 progress.c:339

4112 msgid "done"

4113 msgstr "klart"

4114

4104 -#: fetch-pack.c:512

4115 +#: fetch-pack.c:523

4116 #, c-format

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

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

4119

4109 -#: fetch-pack.c:548

4120 +#: fetch-pack.c:559

4121 #, c-format

4122 msgid "Marking %s as complete"

4123 msgstr "Markerar %s som komplett"

4124

4114 -#: fetch-pack.c:763

4125 +#: fetch-pack.c:774

4126 #, c-format

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

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

4129

4119 -#: fetch-pack.c:849

4130 +#: fetch-pack.c:860

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

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

4133

4123 -#: fetch-pack.c:857

4134 +#: fetch-pack.c:868

4135 msgid "protocol error: bad pack header"

4136 msgstr "protokollfel: felaktigt packhuvud"

4137

4127 -#: fetch-pack.c:951

4138 +#: fetch-pack.c:962

4139 #, c-format

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

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

4142

4132 -#: fetch-pack.c:957

4143 +#: fetch-pack.c:968

4144 msgid "fetch-pack: invalid index-pack output"

4145 msgstr "fetch-patch: ogiltig utdata från index-pack"

4146

4136 -#: fetch-pack.c:974

4147 +#: fetch-pack.c:985

4148 #, c-format

4149 msgid "%s failed"

4150 msgstr "%s misslyckades"

4151

4141 -#: fetch-pack.c:976

4152 +#: fetch-pack.c:987

4153 msgid "error in sideband demultiplexer"

4154 msgstr "fel i sidbands-avmultiplexare"

4155

4145 -#: fetch-pack.c:1019

4156 +#: fetch-pack.c:1030

4157 #, c-format

4158 msgid "Server version is %.*s"

4159 msgstr "Serverversionen är %.*s"

4160

4150 -#: fetch-pack.c:1027 fetch-pack.c:1033 fetch-pack.c:1036 fetch-pack.c:1042

4151 -#: fetch-pack.c:1046 fetch-pack.c:1050 fetch-pack.c:1054 fetch-pack.c:1058

4152 -#: fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070 fetch-pack.c:1074

4153 -#: fetch-pack.c:1080 fetch-pack.c:1086 fetch-pack.c:1091 fetch-pack.c:1096

4161 +#: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053

4162 +#: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069

4163 +#: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085

4164 +#: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107

4165 #, c-format

4166 msgid "Server supports %s"

4167 msgstr "Servern stöder %s"

4168

4158 -#: fetch-pack.c:1029

4169 +#: fetch-pack.c:1040

4170 msgid "Server does not support shallow clients"

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

4172

4162 -#: fetch-pack.c:1089

4173 +#: fetch-pack.c:1100

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

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

4176

4166 -#: fetch-pack.c:1094

4177 +#: fetch-pack.c:1105

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

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

4180

4170 -#: fetch-pack.c:1098

4181 +#: fetch-pack.c:1109

4182 msgid "Server does not support --deepen"

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

4184

4174 -#: fetch-pack.c:1100

4185 +#: fetch-pack.c:1111

4186 msgid "Server does not support this repository's object format"

4187 msgstr "Servern stöder inte det här arkivets objektformat"

4188

4178 -#: fetch-pack.c:1113

4189 +#: fetch-pack.c:1124

4190 msgid "no common commits"

4191 msgstr "inga gemensamma incheckningar"

4192

4182 -#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238

4193 +#: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130

4194 msgid "source repository is shallow, reject to clone."

4195 msgstr "källarkivet är grunt, tillåter inte kloning."

4196

4186 -#: fetch-pack.c:1128 fetch-pack.c:1660

4197 +#: fetch-pack.c:1139 fetch-pack.c:1671

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

4199 msgstr "git fetch-pack: hämtning misslyckades."

4200

4190 -#: fetch-pack.c:1242

4201 +#: fetch-pack.c:1253

4202 #, c-format

4203 msgid "mismatched algorithms: client %s; server %s"

4204 msgstr "omaka algoritmer: klient %s; server %s"

4205

4195 -#: fetch-pack.c:1246

4206 +#: fetch-pack.c:1257

4207 #, c-format

4208 msgid "the server does not support algorithm '%s'"

4209 msgstr "servern stöder inte algoritmen \"%s\""

4210

4200 -#: fetch-pack.c:1279

4211 +#: fetch-pack.c:1290

4212 msgid "Server does not support shallow requests"

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

4214

4204 -#: fetch-pack.c:1286

4215 +#: fetch-pack.c:1297

4216 msgid "Server supports filter"

4217 msgstr "Servern stöder filter"

4218

4208 -#: fetch-pack.c:1329 fetch-pack.c:2043

4219 +#: fetch-pack.c:1340 fetch-pack.c:2053

4220 msgid "unable to write request to remote"

4221 msgstr "kunde inte skriva anrop till fjärren"

4222

4212 -#: fetch-pack.c:1347

4223 +#: fetch-pack.c:1358

4224 #, c-format

4225 msgid "error reading section header '%s'"

4226 msgstr "fel vid läsning av styckehuvudet \"%s\""

4227

4217 -#: fetch-pack.c:1353

4228 +#: fetch-pack.c:1364

4229 #, c-format

4230 msgid "expected '%s', received '%s'"

4231 msgstr "förväntade \"%s\", tog emot \"%s\""

4232

4222 -#: fetch-pack.c:1387

4233 +#: fetch-pack.c:1398

4234 #, c-format

4235 msgid "unexpected acknowledgment line: '%s'"

4236 msgstr "oväntad bekräftelserad: \"%s\""

4237

4227 -#: fetch-pack.c:1392

4238 +#: fetch-pack.c:1403

4239 #, c-format

4240 msgid "error processing acks: %d"

4241 msgstr "fel vid hantering av bekräftelser: %d"

4242

4232 -#: fetch-pack.c:1402

4243 +#: fetch-pack.c:1413

4244 msgid "expected packfile to be sent after 'ready'"

4245 msgstr "väntade att paketfil skulle sändas efter \"ready\""

4246

4236 -#: fetch-pack.c:1404

4247 +#: fetch-pack.c:1415

4248 msgid "expected no other sections to be sent after no 'ready'"

4249 msgstr ""

4250 "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""

4251

4241 -#: fetch-pack.c:1445

4252 +#: fetch-pack.c:1456

4253 #, c-format

4254 msgid "error processing shallow info: %d"

4255 msgstr "fel vid hantering av grund (\"shallow\") info: %d"

4256

4246 -#: fetch-pack.c:1494

4257 +#: fetch-pack.c:1505

4258 #, c-format

4259 msgid "expected wanted-ref, got '%s'"

4260 msgstr "förväntade wanted-ref, fick %s"

4261

4251 -#: fetch-pack.c:1499

4262 +#: fetch-pack.c:1510

4263 #, c-format

4264 msgid "unexpected wanted-ref: '%s'"

4265 msgstr "oväntad wanted-ref: \"%s\""

4266

4256 -#: fetch-pack.c:1504

4267 +#: fetch-pack.c:1515

4268 #, c-format

4269 msgid "error processing wanted refs: %d"

4270 msgstr "fel vid hantering av önskade referenser: %d"

4271

4261 -#: fetch-pack.c:1534

4272 +#: fetch-pack.c:1545

4273 msgid "git fetch-pack: expected response end packet"

4274 msgstr "git fetch-pack: förväntade svarsavslutningspaket"

4275

4265 -#: fetch-pack.c:1939

4276 +#: fetch-pack.c:1949

4277 msgid "no matching remote head"

4278 msgstr "inget motsvarande fjärrhuvud"

4279

4269 -#: fetch-pack.c:1962 builtin/clone.c:697

4280 +#: fetch-pack.c:1972 builtin/clone.c:581

4281 msgid "remote did not send all necessary objects"

4282 msgstr "fjärren sände inte alla nödvändiga objekt"

4283

4273 -#: fetch-pack.c:2065

4284 +#: fetch-pack.c:2075

4285 msgid "unexpected 'ready' from remote"

4286 msgstr "oväntat \"ready\" från fjärr"

4287

4277 -#: fetch-pack.c:2088

4288 +#: fetch-pack.c:2098

4289 #, c-format

4290 msgid "no such remote ref %s"

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

4292

4282 -#: fetch-pack.c:2091

4293 +#: fetch-pack.c:2101

4294 #, c-format

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

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

4297

4287 -#: gpg-interface.c:273

4298 +#: gpg-interface.c:329 gpg-interface.c:451 gpg-interface.c:902

4299 +#: gpg-interface.c:918

4300 msgid "could not create temporary file"

4301 msgstr "kunde inte skapa temporära fil"

4302

4291 -#: gpg-interface.c:276

4303 +#: gpg-interface.c:332 gpg-interface.c:454

4304 #, c-format

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

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

4307

4296 -#: gpg-interface.c:470

4308 +#: gpg-interface.c:445

4309 +msgid ""

4310 +"gpg.ssh.allowedSignersFile needs to be configured and exist for ssh "

4311 +"signature verification"

4312 +msgstr ""

4313 +"gpg.ssh.allowedSignersFile måste ställas in och finnas för att bekräfta ssh-"

4314 +"signaturer"

4315 +

4316 +#: gpg-interface.c:469

4317 +msgid ""

4318 +"ssh-keygen -Y find-principals/verify is needed for ssh signature "

4319 +"verification (available in openssh version 8.2p1+)"

4320 +msgstr ""

4321 +"\"ssh-keygen -Y find-principals/verify\" behövs för att bekräfta ssh-"

4322 +"signaturer (tillgängligt i openssh version 8.2p1+)"

4323 +

4324 +#: gpg-interface.c:523

4325 +#, c-format

4326 +msgid "ssh signing revocation file configured but not found: %s"

4327 +msgstr "återkallningsfilen för ssh-signering inställd men saknas: %s"

4328 +

4329 +#: gpg-interface.c:576

4330 +#, c-format

4331 +msgid "bad/incompatible signature '%s'"

4332 +msgstr "felaktig/inkompatibel signatur \"%s\""

4333 +

4334 +#: gpg-interface.c:735 gpg-interface.c:740

4335 +#, c-format

4336 +msgid "failed to get the ssh fingerprint for key '%s'"

4337 +msgstr "misslyckades hämta ssh-fingeravtrycket för nyckeln \"%s\""

4338 +

4339 +#: gpg-interface.c:762

4340 +msgid ""

4341 +"either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured"

4342 +msgstr ""

4343 +"måste konfigurera antingen user.signingkey eller gpg.ssh.defaultKeyCommand"

4344 +

4345 +#: gpg-interface.c:780

4346 +#, c-format

4347 +msgid "gpg.ssh.defaultKeyCommand succeeded but returned no keys: %s %s"

4348 +msgstr "gpg.ssh.defaultKeyCommand lyckades men gav inga nycklar: %s %s"

4349 +

4350 +#: gpg-interface.c:786

4351 +#, c-format

4352 +msgid "gpg.ssh.defaultKeyCommand failed: %s %s"

4353 +msgstr "gpg.ssh.defaultKeyCommand misslyckades: %s %s"

4354 +

4355 +#: gpg-interface.c:874

4356 msgid "gpg failed to sign the data"

4357 msgstr "gpg misslyckades signera data"

4358

4359 +#: gpg-interface.c:895

4360 +msgid "user.signingkey needs to be set for ssh signing"

4361 +msgstr "user.signingkey måste anges för ssh-signering"

4362 +

4363 +#: gpg-interface.c:906

4364 +#, c-format

4365 +msgid "failed writing ssh signing key to '%s'"

4366 +msgstr "misslyckades skriva ssh-signeringsnyckel till \"%s\""

4367 +

4368 +#: gpg-interface.c:924

4369 +#, c-format

4370 +msgid "failed writing ssh signing key buffer to '%s'"

4371 +msgstr "misslyckades skriva ssh-signeringsnyckelbuffert till \"%s\""

4372 +

4373 +#: gpg-interface.c:942

4374 +msgid ""

4375 +"ssh-keygen -Y sign is needed for ssh signing (available in openssh version "

4376 +"8.2p1+)"

4377 +msgstr ""

4378 +"\"ssh-keygen -Y sign\" behövs för ssh-signering (tillgängligt i openssh "

4379 +"version 8.2p1+)"

4380 +

4381 +#: gpg-interface.c:954

4382 +#, c-format

4383 +msgid "failed reading ssh signing data buffer from '%s'"

4384 +msgstr "misslyckades läsa ssh-signeringsdatabuffert från \"%s\""

4385 +

4386 #: graph.c:98

4387 #, c-format

4388 msgid "ignored invalid color '%.*s' in log.graphColors"

4389 msgstr "ignorerade felaktig färg \"%.*s\" i log.graphColors"

4390

4305 -#: grep.c:531

4391 +#: grep.c:533

4392 msgid ""

4393 "given pattern contains NULL byte (via -f <file>). This is only supported "

4394 "with -P under PCRE v2"

@@ -4310,109 +4396,109 @@ msgstr ""

4396 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"

4397 "P under PCRE v2"

4398

4313 -#: grep.c:1895

4399 +#: grep.c:1928

4400 #, c-format

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

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

4403

4318 -#: grep.c:1912 setup.c:176 builtin/clone.c:416 builtin/diff.c:90

4404 +#: grep.c:1945 setup.c:176 builtin/clone.c:302 builtin/diff.c:90

4405 #: builtin/rm.c:136

4406 #, c-format

4407 msgid "failed to stat '%s'"

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

4409

4324 -#: grep.c:1923

4410 +#: grep.c:1956

4411 #, c-format

4412 msgid "'%s': short read"

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

4414

4329 -#: help.c:23

4415 +#: help.c:24

4416 msgid "start a working area (see also: git help tutorial)"

4417 msgstr "starta arbetskatalog (se också: git help tutorial)"

4418

4333 -#: help.c:24

4419 +#: help.c:25

4420 msgid "work on the current change (see also: git help everyday)"

4421 msgstr "jobba med aktuell förändring (se också: git help everyday)"

4422

4337 -#: help.c:25

4423 +#: help.c:26

4424 msgid "examine the history and state (see also: git help revisions)"

4425 msgstr "utforska historiken och tillståndet (se också: git help revisions)"

4426

4341 -#: help.c:26

4427 +#: help.c:27

4428 msgid "grow, mark and tweak your common history"

4429 msgstr "utöka, markera och justera din gemensamma historik"

4430

4345 -#: help.c:27

4431 +#: help.c:28

4432 msgid "collaborate (see also: git help workflows)"

4433 msgstr "samarbeta (se också: git help workflows)"

4434

4349 -#: help.c:31

4435 +#: help.c:32

4436 msgid "Main Porcelain Commands"

4437 msgstr "Huvudsakliga porslinskommandon"

4438

4353 -#: help.c:32

4439 +#: help.c:33

4440 msgid "Ancillary Commands / Manipulators"

4441 msgstr "Tilläggskommandon / manipulerare"

4442

4357 -#: help.c:33

4443 +#: help.c:34

4444 msgid "Ancillary Commands / Interrogators"

4445 msgstr "Tilläggskommandon / frågare"

4446

4361 -#: help.c:34

4447 +#: help.c:35

4448 msgid "Interacting with Others"

4449 msgstr "Interaktion med andra"

4450

4365 -#: help.c:35

4451 +#: help.c:36

4452 msgid "Low-level Commands / Manipulators"

4453 msgstr "Lågnivåkommandon / maniupulerare"

4454

4369 -#: help.c:36

4455 +#: help.c:37

4456 msgid "Low-level Commands / Interrogators"

4457 msgstr "Lågnivåkommandon / frågare"

4458

4373 -#: help.c:37

4459 +#: help.c:38

4460 msgid "Low-level Commands / Syncing Repositories"

4461 msgstr "Lågnivåkommandon / synka arkiv"

4462

4377 -#: help.c:38

4463 +#: help.c:39

4464 msgid "Low-level Commands / Internal Helpers"

4465 msgstr "Lågnivåkommandon / interna hjälpare"

4466

4381 -#: help.c:300

4467 +#: help.c:313

4468 #, c-format

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

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

4471

4386 -#: help.c:307

4472 +#: help.c:320

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

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

4475

4390 -#: help.c:316

4476 +#: help.c:329

4477 msgid "These are common Git commands used in various situations:"

4478 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"

4479

4394 -#: help.c:365 git.c:100

4480 +#: help.c:378 git.c:100

4481 #, c-format

4482 msgid "unsupported command listing type '%s'"

4483 msgstr "okänd kommandolisttyp \"%s\""

4484

4399 -#: help.c:405

4485 +#: help.c:418

4486 msgid "The Git concept guides are:"

4487 msgstr "Vägledningar för Git-koncept:"

4488

4403 -#: help.c:429

4489 +#: help.c:442

4490 msgid "See 'git help <command>' to read about a specific subcommand"

4491 msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"

4492

4407 -#: help.c:434

4493 +#: help.c:447

4494 msgid "External commands"

4495 msgstr "Externa kommandon"

4496

4411 -#: help.c:449

4497 +#: help.c:462

4498 msgid "Command aliases"

4499 msgstr "Kommadoalias"

4500

4415 -#: help.c:527

4501 +#: help.c:543

4502 #, c-format

4503 msgid ""

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

@@ -4421,32 +4507,37 @@ msgstr ""

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

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

4509

4424 -#: help.c:543 help.c:631

4510 +#: help.c:565 help.c:662

4511 #, c-format

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

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

4514

4429 -#: help.c:591

4515 +#: help.c:613

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

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

4518

4433 -#: help.c:613

4519 +#: help.c:635

4520 #, c-format

4521 msgid "WARNING: You called a Git command named '%s', which does not exist."

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

4523

4438 -#: help.c:618

4524 +#: help.c:640

4525 #, c-format

4526 msgid "Continuing under the assumption that you meant '%s'."

4527 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."

4528

4443 -#: help.c:623

4529 +#: help.c:646

4530 +#, c-format

4531 +msgid "Run '%s' instead? (y/N)"

4532 +msgstr "Köra \"%s\" istället? (j/N)"

4533 +

4534 +#: help.c:654

4535 #, c-format

4536 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."

4537 msgstr ""

4538 "Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."

4539

4449 -#: help.c:635

4540 +#: help.c:666

4541 msgid ""

4542 "\n"

4543 "The most similar command is"

@@ -4460,16 +4551,16 @@ msgstr[1] ""

4551 "\n"

4552 "Mest lika kommandon är"

4553

4463 -#: help.c:675

4554 +#: help.c:706

4555 msgid "git version [<options>]"

4556 msgstr "git version [<flaggor>]"

4557

4467 -#: help.c:730

4558 +#: help.c:761

4559 #, c-format

4560 msgid "%s: %s - %s"

4561 msgstr "%s: %s - %s"

4562

4472 -#: help.c:734

4563 +#: help.c:765

4564 msgid ""

4565 "\n"

4566 "Did you mean this?"

@@ -4483,6 +4574,15 @@ msgstr[1] ""

4574 "\n"

4575 "Menade du ett av dessa?"

4576

4577 +#: hook.c:27

4578 +#, c-format

4579 +msgid ""

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

4581 +"You can disable this warning with `git config advice.ignoredHook false`."

4582 +msgstr ""

4583 +"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"

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

4585 +

4586 #: ident.c:353

4587 msgid "Author identity unknown\n"

4588 msgstr "Författar-identitet okänd\n"

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

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

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

4647

4548 -#: ident.c:454 builtin/commit.c:647

4648 +#: ident.c:454 builtin/commit.c:648

4649 #, c-format

4650 msgid "invalid date format: %s"

4651 msgstr "felaktigt datumformat: %s"

@@ -4640,7 +4740,12 @@ msgstr "Kunde inte skapa \"%s.lock\": %s"

4740 msgid "invalid value '%s' for lsrefs.unborn"

4741 msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"

4742

4643 -#: ls-refs.c:167

4743 +#: ls-refs.c:174

4744 +#, c-format

4745 +msgid "unexpected line: '%s'"

4746 +msgstr "oväntad rad: \"%s\""

4747 +

4748 +#: ls-refs.c:178

4749 msgid "expected flush after ls-refs arguments"

4750 msgstr "förväntade \"flush\" efter ls-refs-argument"

4751

@@ -4648,39 +4753,39 @@ msgstr "förväntade \"flush\" efter ls-refs-argument"

4753 msgid "quoted CRLF detected"

4754 msgstr "citerad CRLF upptäcktes"

4755

4651 -#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46

4756 +#: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46

4757 #, c-format

4758 msgid "bad action '%s' for '%s'"

4759 msgstr "felaktig funktion \"%s\" för \"%s\""

4760

4656 -#: merge-ort.c:1569 merge-recursive.c:1201

4761 +#: merge-ort.c:1584 merge-recursive.c:1211

4762 #, c-format

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

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

4765

4661 -#: merge-ort.c:1578 merge-recursive.c:1208

4766 +#: merge-ort.c:1593 merge-recursive.c:1218

4767 #, c-format

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

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

4770

4666 -#: merge-ort.c:1587 merge-recursive.c:1215

4771 +#: merge-ort.c:1602 merge-recursive.c:1225

4772 #, c-format

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

4774 msgstr ""

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

4776 "sammanslagningsbasen)"

4777

4673 -#: merge-ort.c:1597 merge-ort.c:1604

4778 +#: merge-ort.c:1612 merge-ort.c:1620

4779 #, c-format

4780 msgid "Note: Fast-forwarding submodule %s to %s"

4781 msgstr "Obs: Snabbspolar undermodulen %s till %s"

4782

4678 -#: merge-ort.c:1625

4783 +#: merge-ort.c:1642

4784 #, c-format

4785 msgid "Failed to merge submodule %s"

4786 msgstr "Misslyckades slå ihop undermodulen %s"

4787

4683 -#: merge-ort.c:1632

4788 +#: merge-ort.c:1649

4789 #, c-format

4790 msgid ""

4791 "Failed to merge submodule %s, but a possible merge resolution exists:\n"

@@ -4689,7 +4794,7 @@ msgstr ""

4794 "Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"

4795 "%s\n"

4796

4692 -#: merge-ort.c:1636 merge-recursive.c:1269

4797 +#: merge-ort.c:1653 merge-recursive.c:1281

4798 #, c-format

4799 msgid ""

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

@@ -4706,7 +4811,7 @@ msgstr ""

4811 "\n"

4812 "vilket godtar lösningen.\n"

4813

4709 -#: merge-ort.c:1649

4814 +#: merge-ort.c:1666

4815 #, c-format

4816 msgid ""

4817 "Failed to merge submodule %s, but multiple possible merges exist:\n"

@@ -4716,21 +4821,21 @@ msgstr ""

4821 "finns:\n"

4822 "%s"

4823

4719 -#: merge-ort.c:1868 merge-recursive.c:1358

4824 +#: merge-ort.c:1887 merge-recursive.c:1372

4825 msgid "Failed to execute internal merge"

4826 msgstr "Misslyckades exekvera intern sammanslagning"

4827

4723 -#: merge-ort.c:1873 merge-recursive.c:1363

4828 +#: merge-ort.c:1892 merge-recursive.c:1377

4829 #, c-format

4830 msgid "Unable to add %s to database"

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

4832

4728 -#: merge-ort.c:1880 merge-recursive.c:1396

4833 +#: merge-ort.c:1899 merge-recursive.c:1410

4834 #, c-format

4835 msgid "Auto-merging %s"

4836 msgstr "Slår ihop %s automatiskt"

4837

4733 -#: merge-ort.c:2019 merge-recursive.c:2118

4838 +#: merge-ort.c:2038 merge-recursive.c:2132

4839 #, c-format

4840 msgid ""

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

@@ -4739,7 +4844,7 @@ msgstr ""

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

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

4846

4742 -#: merge-ort.c:2029 merge-recursive.c:2128

4847 +#: merge-ort.c:2048 merge-recursive.c:2142

4848 #, c-format

4849 msgid ""

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

@@ -4748,7 +4853,7 @@ msgstr ""

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

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

4855

4751 -#: merge-ort.c:2087

4856 +#: merge-ort.c:2106

4857 #, c-format

4858 msgid ""

4859 "CONFLICT (directory rename split): Unclear where to rename %s to; it was "

@@ -4759,7 +4864,7 @@ msgstr ""

4864 "den har namnbytts till flera andra kataloger, utan att någon destination "

4865 "fick en majoritet av filerna."

4866

4762 -#: merge-ort.c:2241 merge-recursive.c:2464

4867 +#: merge-ort.c:2260 merge-recursive.c:2478

4868 #, c-format

4869 msgid ""

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

@@ -4768,7 +4873,7 @@ msgstr ""

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

4874 "bytt namn."

4875

4771 -#: merge-ort.c:2385 merge-recursive.c:3247

4876 +#: merge-ort.c:2400 merge-recursive.c:3261

4877 #, c-format

4878 msgid ""

4879 "Path updated: %s added in %s inside a directory that was renamed in %s; "

@@ -4777,7 +4882,7 @@ msgstr ""

4882 "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "

4883 "flyttar den till %s."

4884

4780 -#: merge-ort.c:2392 merge-recursive.c:3254

4885 +#: merge-ort.c:2407 merge-recursive.c:3268

4886 #, c-format

4887 msgid ""

4888 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "

@@ -4786,7 +4891,7 @@ msgstr ""

4891 "Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "

4892 "namn i %s; flyttar den till %s."

4893

4789 -#: merge-ort.c:2405 merge-recursive.c:3250

4894 +#: merge-ort.c:2420 merge-recursive.c:3264

4895 #, c-format

4896 msgid ""

4897 "CONFLICT (file location): %s added in %s inside a directory that was renamed "

@@ -4795,7 +4900,7 @@ msgstr ""

4900 "KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "

4901 "%s, föreslår att den bör flyttas till%s."

4902

4798 -#: merge-ort.c:2413 merge-recursive.c:3257

4903 +#: merge-ort.c:2428 merge-recursive.c:3271

4904 #, c-format

4905 msgid ""

4906 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "

@@ -4804,13 +4909,13 @@ msgstr ""

4909 "KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "

4910 "bytte namn i %s; flyttar den till %s."

4911

4807 -#: merge-ort.c:2569

4912 +#: merge-ort.c:2584

4913 #, c-format

4914 msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."

4915 msgstr ""

4916 "KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."

4917

4813 -#: merge-ort.c:2664

4918 +#: merge-ort.c:2679

4919 #, c-format

4920 msgid ""

4921 "CONFLICT (rename involved in collision): rename of %s -> %s has content "

@@ -4821,23 +4926,23 @@ msgstr ""

4926 "innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "

4927 "nästlade konfliktmarkörer."

4928

4824 -#: merge-ort.c:2683 merge-ort.c:2707

4929 +#: merge-ort.c:2698 merge-ort.c:2722

4930 #, c-format

4931 msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."

4932 msgstr ""

4933 "KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."

4934

4830 -#: merge-ort.c:3182 merge-recursive.c:3008

4935 +#: merge-ort.c:3212 merge-recursive.c:3022

4936 #, c-format

4937 msgid "cannot read object %s"

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

4939

4835 -#: merge-ort.c:3185 merge-recursive.c:3011

4940 +#: merge-ort.c:3215 merge-recursive.c:3025

4941 #, c-format

4942 msgid "object %s is not a blob"

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

4944

4840 -#: merge-ort.c:3613

4945 +#: merge-ort.c:3644

4946 #, c-format

4947 msgid ""

4948 "CONFLICT (file/directory): directory in the way of %s from %s; moving it to "

@@ -4846,7 +4951,7 @@ msgstr ""

4951 "KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "

4952 "till %s istället."

4953

4849 -#: merge-ort.c:3689

4954 +#: merge-ort.c:3721

4955 #, c-format

4956 msgid ""

4957 "CONFLICT (distinct types): %s had different types on each side; renamed both "

@@ -4855,7 +4960,7 @@ msgstr ""

4960 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "

4961 "så att de kan protokollföras någonstans."

4962

4858 -#: merge-ort.c:3696

4963 +#: merge-ort.c:3728

4964 #, c-format

4965 msgid ""

4966 "CONFLICT (distinct types): %s had different types on each side; renamed one "

@@ -4864,24 +4969,24 @@ msgstr ""

4969 "KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "

4970 "så att de kan protokollföras någonstans."

4971

4867 -#: merge-ort.c:3796 merge-recursive.c:3087

4972 +#: merge-ort.c:3819 merge-recursive.c:3101

4973 msgid "content"

4974 msgstr "innehåll"

4975

4871 -#: merge-ort.c:3798 merge-recursive.c:3091

4976 +#: merge-ort.c:3821 merge-recursive.c:3105

4977 msgid "add/add"

4978 msgstr "tillägg/tillägg"

4979

4875 -#: merge-ort.c:3800 merge-recursive.c:3136

4980 +#: merge-ort.c:3823 merge-recursive.c:3150

4981 msgid "submodule"

4982 msgstr "undermodul"

4983

4879 -#: merge-ort.c:3802 merge-recursive.c:3137

4984 +#: merge-ort.c:3825 merge-recursive.c:3151

4985 #, c-format

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

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

4988

4884 -#: merge-ort.c:3833

4989 +#: merge-ort.c:3856

4990 #, c-format

4991 msgid ""

4992 "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "

@@ -4890,7 +4995,7 @@ msgstr ""

4995 "KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "

4996 "lämnad i trädet."

4997

4893 -#: merge-ort.c:4120

4998 +#: merge-ort.c:4152

4999 #, c-format

5000 msgid ""

5001 "Note: %s not up to date and in way of checking out conflicted version; old "

@@ -4902,12 +5007,12 @@ msgstr ""

5007 #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge

5008 #. base, and 2-3) the trees for the two trees we're merging.

5009 #.

4905 -#: merge-ort.c:4487

5010 +#: merge-ort.c:4521

5011 #, c-format

5012 msgid "collecting merge info failed for trees %s, %s, %s"

5013 msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"

5014

4910 -#: merge-ort-wrappers.c:13 merge-recursive.c:3702

5015 +#: merge-ort-wrappers.c:13 merge-recursive.c:3716

5016 #, c-format

5017 msgid ""

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

@@ -4917,109 +5022,109 @@ msgstr ""

5022 "sammanslagning:\n"

5023 " %s"

5024

4920 -#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402

5025 +#: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403

5026 msgid "Already up to date."

5027 msgstr "Redan à jour."

5028

4924 -#: merge-recursive.c:352

5029 +#: merge-recursive.c:353

5030 msgid "(bad commit)\n"

5031 msgstr "(felaktig incheckning)\n"

5032

4928 -#: merge-recursive.c:375

5033 +#: merge-recursive.c:381

5034 #, c-format

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

5036 msgstr ""

5037 "add_cacheinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."

5038

4934 -#: merge-recursive.c:384

5039 +#: merge-recursive.c:390

5040 #, c-format

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

5042 msgstr ""

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

5044 "sammanslagningen."

5045

4941 -#: merge-recursive.c:872

5046 +#: merge-recursive.c:881

5047 #, c-format

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

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

5050

4946 -#: merge-recursive.c:883

5051 +#: merge-recursive.c:892

5052 #, c-format

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

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

5055

4951 -#: merge-recursive.c:897 merge-recursive.c:916

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

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

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

5059

4955 -#: merge-recursive.c:906

5060 +#: merge-recursive.c:915

5061 #, c-format

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

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

5064

4960 -#: merge-recursive.c:947 builtin/cat-file.c:41

5065 +#: merge-recursive.c:956 builtin/cat-file.c:41

5066 #, c-format

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

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

5069

4965 -#: merge-recursive.c:952

5070 +#: merge-recursive.c:961

5071 #, c-format

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

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

5074

4970 -#: merge-recursive.c:977

5075 +#: merge-recursive.c:986

5076 #, c-format

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

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

5079

4975 -#: merge-recursive.c:988

5080 +#: merge-recursive.c:997

5081 #, c-format

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

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

5084

4980 -#: merge-recursive.c:993

5085 +#: merge-recursive.c:1002

5086 #, c-format

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

5088 msgstr "vet inte hur %06o %s \"%s\" ska hanteras"

5089

4985 -#: merge-recursive.c:1223 merge-recursive.c:1235

5090 +#: merge-recursive.c:1233 merge-recursive.c:1246

5091 #, c-format

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

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

5094

4990 -#: merge-recursive.c:1226 merge-recursive.c:1238

5095 +#: merge-recursive.c:1236 merge-recursive.c:1249

5096 #, c-format

5097 msgid "Fast-forwarding submodule %s"

5098 msgstr "Snabbspolar undermodulen %s"

5099

4995 -#: merge-recursive.c:1261

5100 +#: merge-recursive.c:1273

5101 #, c-format

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

5103 msgstr ""

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

5105 "hittades inte)"

5106

5002 -#: merge-recursive.c:1265

5107 +#: merge-recursive.c:1277

5108 #, c-format

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

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

5111

5007 -#: merge-recursive.c:1266

5112 +#: merge-recursive.c:1278

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

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

5115

5011 -#: merge-recursive.c:1278

5116 +#: merge-recursive.c:1290

5117 #, c-format

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

5119 msgstr ""

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

5121

5017 -#: merge-recursive.c:1420

5122 +#: merge-recursive.c:1434

5123 #, c-format

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

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

5126

5022 -#: merge-recursive.c:1492

5127 +#: merge-recursive.c:1506

5128 #, c-format

5129 msgid ""

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

@@ -5028,7 +5133,7 @@ msgstr ""

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

5134 "i trädet."

5135

5031 -#: merge-recursive.c:1497

5136 +#: merge-recursive.c:1511

5137 #, c-format

5138 msgid ""

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

@@ -5037,7 +5142,7 @@ msgstr ""

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

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

5144

5040 -#: merge-recursive.c:1504

5145 +#: merge-recursive.c:1518

5146 #, c-format

5147 msgid ""

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

@@ -5046,7 +5151,7 @@ msgstr ""

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

5152 "i trädet vid %s."

5153

5049 -#: merge-recursive.c:1509

5154 +#: merge-recursive.c:1523

5155 #, c-format

5156 msgid ""

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

@@ -5055,40 +5160,40 @@ msgstr ""

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

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

5162

5058 -#: merge-recursive.c:1544

5163 +#: merge-recursive.c:1558

5164 msgid "rename"

5165 msgstr "namnbyte"

5166

5062 -#: merge-recursive.c:1544

5167 +#: merge-recursive.c:1558

5168 msgid "renamed"

5169 msgstr "namnbytt"

5170

5066 -#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164

5171 +#: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178

5172 #, c-format

5173 msgid "Refusing to lose dirty file at %s"

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

5175

5071 -#: merge-recursive.c:1605

5176 +#: merge-recursive.c:1619

5177 #, c-format

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

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

5180

5076 -#: merge-recursive.c:1663

5181 +#: merge-recursive.c:1677

5182 #, c-format

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

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

5185

5081 -#: merge-recursive.c:1694

5186 +#: merge-recursive.c:1708

5187 #, c-format

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

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

5190

5086 -#: merge-recursive.c:1699

5191 +#: merge-recursive.c:1713

5192 #, c-format

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

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

5195

5091 -#: merge-recursive.c:1726

5196 +#: merge-recursive.c:1740

5197 #, c-format

5198 msgid ""

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

@@ -5097,17 +5202,17 @@ msgstr ""

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

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

5204

5100 -#: merge-recursive.c:1731

5205 +#: merge-recursive.c:1745

5206 msgid " (left unresolved)"

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

5208

5104 -#: merge-recursive.c:1823

5209 +#: merge-recursive.c:1837

5210 #, c-format

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

5212 msgstr ""

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

5214

5110 -#: merge-recursive.c:2086

5215 +#: merge-recursive.c:2100

5216 #, c-format

5217 msgid ""

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

@@ -5118,7 +5223,7 @@ msgstr ""

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

5224 "destination fick en majoritet av filerna."

5225

5121 -#: merge-recursive.c:2220

5226 +#: merge-recursive.c:2234

5227 #, c-format

5228 msgid ""

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

@@ -5127,80 +5232,80 @@ msgstr ""

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

5233 "%s->%s i %s"

5234

5130 -#: merge-recursive.c:3075

5235 +#: merge-recursive.c:3089

5236 msgid "modify"

5237 msgstr "ändra"

5238

5134 -#: merge-recursive.c:3075

5239 +#: merge-recursive.c:3089

5240 msgid "modified"

5241 msgstr "ändrad"

5242

5138 -#: merge-recursive.c:3114

5243 +#: merge-recursive.c:3128

5244 #, c-format

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

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

5247

5143 -#: merge-recursive.c:3167

5248 +#: merge-recursive.c:3181

5249 #, c-format

5250 msgid "Adding as %s instead"

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

5252

5148 -#: merge-recursive.c:3371

5253 +#: merge-recursive.c:3385

5254 #, c-format

5255 msgid "Removing %s"

5256 msgstr "Tar bort %s"

5257

5153 -#: merge-recursive.c:3394

5258 +#: merge-recursive.c:3408

5259 msgid "file/directory"

5260 msgstr "fil/katalog"

5261

5157 -#: merge-recursive.c:3399

5262 +#: merge-recursive.c:3413

5263 msgid "directory/file"

5264 msgstr "katalog/fil"

5265

5161 -#: merge-recursive.c:3406

5266 +#: merge-recursive.c:3420

5267 #, c-format

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

5269 msgstr ""

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

5271

5167 -#: merge-recursive.c:3415

5272 +#: merge-recursive.c:3429

5273 #, c-format

5274 msgid "Adding %s"

5275 msgstr "Lägger till %s"

5276

5172 -#: merge-recursive.c:3424

5277 +#: merge-recursive.c:3438

5278 #, c-format

5279 msgid "CONFLICT (add/add): Merge conflict in %s"

5280 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"

5281

5177 -#: merge-recursive.c:3477

5282 +#: merge-recursive.c:3491

5283 #, c-format

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

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

5286

5182 -#: merge-recursive.c:3571

5287 +#: merge-recursive.c:3585

5288 msgid "Merging:"

5289 msgstr "Slår ihop:"

5290

5186 -#: merge-recursive.c:3584

5291 +#: merge-recursive.c:3598

5292 #, c-format

5293 msgid "found %u common ancestor:"

5294 msgid_plural "found %u common ancestors:"

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

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

5297

5193 -#: merge-recursive.c:3634

5298 +#: merge-recursive.c:3648

5299 msgid "merge returned no commit"

5300 msgstr "sammanslagningen returnerade ingen incheckning"

5301

5197 -#: merge-recursive.c:3799

5302 +#: merge-recursive.c:3816

5303 #, c-format

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

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

5306

5202 -#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901

5203 -#: builtin/stash.c:473

5307 +#: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904

5308 +#: builtin/stash.c:489

5309 msgid "Unable to write index."

5310 msgstr "Kunde inte skriva indexet."

5311

@@ -5208,190 +5313,222 @@ msgstr "Kunde inte skriva indexet."

5313 msgid "failed to read the cache"

5314 msgstr "misslyckades läsa cachen"

5315

5211 -#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966

5212 -#: builtin/checkout.c:590 builtin/checkout.c:844 builtin/clone.c:821

5213 -#: builtin/stash.c:267

5316 +#: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967

5317 +#: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706

5318 +#: builtin/stash.c:269

5319 msgid "unable to write new index file"

5320 msgstr "kunde inte skriva ny indexfil"

5321

5217 -#: midx.c:74

5322 +#: midx.c:78

5323 msgid "multi-pack-index OID fanout is of the wrong size"

5324 msgstr "multi-pack-indexets OID-utbredning har fel storlek"

5325

5221 -#: midx.c:105

5326 +#: midx.c:109

5327 #, c-format

5328 msgid "multi-pack-index file %s is too small"

5329 msgstr "multi-pack-indexfilen %s är för liten"

5330

5226 -#: midx.c:121

5331 +#: midx.c:125

5332 #, c-format

5333 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"

5334 msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"

5335

5231 -#: midx.c:126

5336 +#: midx.c:130

5337 #, c-format

5338 msgid "multi-pack-index version %d not recognized"

5339 msgstr "multi-pack-indexversionen %d stöds inte"

5340

5236 -#: midx.c:131

5341 +#: midx.c:135

5342 #, c-format

5343 msgid "multi-pack-index hash version %u does not match version %u"

5344 msgstr "multi-pack-index-hashversionen %u stämmer inte med versionen %u"

5345

5241 -#: midx.c:148

5346 +#: midx.c:152

5347 msgid "multi-pack-index missing required pack-name chunk"

5348 msgstr "multi-pack-index saknar krävd paketnamn-stycke"

5349

5245 -#: midx.c:150

5350 +#: midx.c:154

5351 msgid "multi-pack-index missing required OID fanout chunk"

5352 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"

5353

5249 -#: midx.c:152

5354 +#: midx.c:156

5355 msgid "multi-pack-index missing required OID lookup chunk"

5356 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"

5357

5253 -#: midx.c:154

5358 +#: midx.c:158

5359 msgid "multi-pack-index missing required object offsets chunk"

5360 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"

5361

5257 -#: midx.c:170

5362 +#: midx.c:174

5363 #, c-format

5364 msgid "multi-pack-index pack names out of order: '%s' before '%s'"

5365 msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""

5366

5262 -#: midx.c:214

5367 +#: midx.c:221

5368 #, c-format

5369 msgid "bad pack-int-id: %u (%u total packs)"

5370 msgstr "bad pack-int-id: %u (%u paket totalt)"

5371

5267 -#: midx.c:264

5372 +#: midx.c:271

5373 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"

5374 msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"

5375

5271 -#: midx.c:490

5376 +#: midx.c:502

5377 #, c-format

5378 msgid "failed to add packfile '%s'"

5379 msgstr "misslyckades läsa paketfilen \"%s\""

5380

5276 -#: midx.c:496

5381 +#: midx.c:508

5382 #, c-format

5383 msgid "failed to open pack-index '%s'"

5384 msgstr "misslyckades öppna paketindexet \"%s\""

5385

5281 -#: midx.c:564

5386 +#: midx.c:576

5387 #, c-format

5388 msgid "failed to locate object %d in packfile"

5389 msgstr "misslyckades hitta objekt %d i paketfilen"

5390

5286 -#: midx.c:880 builtin/index-pack.c:1533

5391 +#: midx.c:892

5392 msgid "cannot store reverse index file"

5393 msgstr "kan inte spara reverse-index-fil"

5394

5290 -#: midx.c:920

5395 +#: midx.c:990

5396 +#, c-format

5397 +msgid "could not parse line: %s"

5398 +msgstr "kunde inte tolka rad: %s"

5399 +

5400 +#: midx.c:992

5401 +#, c-format

5402 +msgid "malformed line: %s"

5403 +msgstr "felaktig rad: %s"

5404 +

5405 +#: midx.c:1159

5406 msgid "ignoring existing multi-pack-index; checksum mismatch"

5407 msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"

5408

5294 -#: midx.c:943

5295 -msgid "Adding packfiles to multi-pack-index"

5296 -msgstr "Lägger till paketfiler till multi-pack-index"

5409 +#: midx.c:1184

5410 +msgid "could not load pack"

5411 +msgstr "kunde inte läsa paket{"

5412

5298 -#: midx.c:989

5413 +#: midx.c:1190

5414 #, c-format

5300 -msgid "did not see pack-file %s to drop"

5301 -msgstr "såg inte paketfilen %s som skulle kastas"

5415 +msgid "could not open index for %s"

5416 +msgstr "kunde inte öppna indexet för %s"

5417 +

5418 +#: midx.c:1201

5419 +msgid "Adding packfiles to multi-pack-index"

5420 +msgstr "Lägger till paketfiler till multi-pack-index"

5421

5303 -#: midx.c:1034

5422 +#: midx.c:1244

5423 #, c-format

5424 msgid "unknown preferred pack: '%s'"

5425 msgstr "okänt föredraget paket: %s"

5426

5308 -#: midx.c:1039

5427 +#: midx.c:1289

5428 +#, c-format

5429 +msgid "cannot select preferred pack %s with no objects"

5430 +msgstr "kan inte välja föredraget paket %s som inte har några objekt"

5431 +

5432 +#: midx.c:1321

5433 +#, c-format

5434 +msgid "did not see pack-file %s to drop"

5435 +msgstr "såg inte paketfilen %s som skulle kastas"

5436 +

5437 +#: midx.c:1367

5438 #, c-format

5439 msgid "preferred pack '%s' is expired"

5440 msgstr "föredraget paket \"%s\" har löpt ut"

5441

5313 -#: midx.c:1055

5442 +#: midx.c:1380

5443 msgid "no pack files to index."

5444 msgstr "inga paketfiler att indexera."

5445

5317 -#: midx.c:1135 builtin/clean.c:37

5446 +#: midx.c:1417

5447 +msgid "could not write multi-pack bitmap"

5448 +msgstr "kunde inte skriva fler-paketsbitkarta"

5449 +

5450 +#: midx.c:1427

5451 +msgid "could not write multi-pack-index"

5452 +msgstr "kunde inte skriva flerpakets-index"

5453 +

5454 +#: midx.c:1486 builtin/clean.c:37

5455 #, c-format

5456 msgid "failed to remove %s"

5457 msgstr "misslyckades ta bort %s"

5458

5322 -#: midx.c:1166

5459 +#: midx.c:1517

5460 #, c-format

5461 msgid "failed to clear multi-pack-index at %s"

5462 msgstr "misslyckades städa multi-pack-index på %s"

5463

5327 -#: midx.c:1225

5464 +#: midx.c:1577

5465 msgid "multi-pack-index file exists, but failed to parse"

5466 msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"

5467

5331 -#: midx.c:1233

5468 +#: midx.c:1585

5469 msgid "incorrect checksum"

5470 msgstr "felaktig kontrollsumma"

5471

5335 -#: midx.c:1236

5472 +#: midx.c:1588

5473 msgid "Looking for referenced packfiles"

5474 msgstr "Ser efter refererade packfiler"

5475

5339 -#: midx.c:1251

5476 +#: midx.c:1603

5477 #, c-format

5478 msgid ""

5479 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5480 msgstr ""

5481 "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"

5482

5346 -#: midx.c:1256

5483 +#: midx.c:1608

5484 msgid "the midx contains no oid"

5485 msgstr "midx saknar oid"

5486

5350 -#: midx.c:1265

5487 +#: midx.c:1617

5488 msgid "Verifying OID order in multi-pack-index"

5489 msgstr "Bekräftar OID-ordning i multi-pack-index"

5490

5354 -#: midx.c:1274

5491 +#: midx.c:1626

5492 #, c-format

5493 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"

5494 msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"

5495

5359 -#: midx.c:1294

5496 +#: midx.c:1646

5497 msgid "Sorting objects by packfile"

5498 msgstr "Sorterar objekt efter packfil"

5499

5363 -#: midx.c:1301

5500 +#: midx.c:1653

5501 msgid "Verifying object offsets"

5502 msgstr "Bekräftar offset för objekt"

5503

5367 -#: midx.c:1317

5504 +#: midx.c:1669

5505 #, c-format

5506 msgid "failed to load pack entry for oid[%d] = %s"

5507 msgstr "misslyckades läsa paketpost för oid[%d] = %s"

5508

5372 -#: midx.c:1323

5509 +#: midx.c:1675

5510 #, c-format

5511 msgid "failed to load pack-index for packfile %s"

5512 msgstr "misslyckades läsa paketindex för paketfil %s"

5513

5377 -#: midx.c:1332

5514 +#: midx.c:1684

5515 #, c-format

5516 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5517 msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"

5518

5382 -#: midx.c:1357

5519 +#: midx.c:1709

5520 msgid "Counting referenced objects"

5521 msgstr "Räknar refererade objekt"

5522

5386 -#: midx.c:1367

5523 +#: midx.c:1719

5524 msgid "Finding and deleting unreferenced packfiles"

5525 msgstr "Ser efter och tar bort orefererade packfiler"

5526

5390 -#: midx.c:1558

5527 +#: midx.c:1911

5528 msgid "could not start pack-objects"

5529 msgstr "kunde inte starta pack-objects"

5530

5394 -#: midx.c:1578

5531 +#: midx.c:1931

5532 msgid "could not finish pack-objects"

5533 msgstr "kunde inte avsluta pack-objects"

5534

@@ -5450,258 +5587,258 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"

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

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

5589

5453 -#: object-file.c:526

5590 +#: object-file.c:459

5591 #, c-format

5592 msgid "object directory %s does not exist; check .git/objects/info/alternates"

5593 msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"

5594

5458 -#: object-file.c:584

5595 +#: object-file.c:517

5596 #, c-format

5597 msgid "unable to normalize alternate object path: %s"

5598 msgstr "kunde inte normalisera supplerande objektsökväg: %s"

5599

5463 -#: object-file.c:658

5600 +#: object-file.c:591

5601 #, c-format

5602 msgid "%s: ignoring alternate object stores, nesting too deep"

5603 msgstr "%s: ignorerar supplerande objektlager, för djup nästling"

5604

5468 -#: object-file.c:665

5605 +#: object-file.c:598

5606 #, c-format

5607 msgid "unable to normalize object directory: %s"

5608 msgstr "kan inte normalisera objektkatalogen: %s"

5609

5473 -#: object-file.c:708

5610 +#: object-file.c:641

5611 msgid "unable to fdopen alternates lockfile"

5612 msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"

5613

5477 -#: object-file.c:726

5614 +#: object-file.c:659

5615 msgid "unable to read alternates file"

5616 msgstr "kan inte läsa \"alternates\"-filen"

5617

5481 -#: object-file.c:733

5618 +#: object-file.c:666

5619 msgid "unable to move new alternates file into place"

5620 msgstr "kan inte flytta ny \"alternates\"-fil på plats"

5621

5485 -#: object-file.c:768

5622 +#: object-file.c:701

5623 #, c-format

5624 msgid "path '%s' does not exist"

5625 msgstr "sökvägen \"%s\" finns inte"

5626

5490 -#: object-file.c:789

5627 +#: object-file.c:722

5628 #, c-format

5629 msgid "reference repository '%s' as a linked checkout is not supported yet."

5630 msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."

5631

5495 -#: object-file.c:795

5632 +#: object-file.c:728

5633 #, c-format

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

5635 msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."

5636

5500 -#: object-file.c:801

5637 +#: object-file.c:734

5638 #, c-format

5639 msgid "reference repository '%s' is shallow"

5640 msgstr "referensarkivet \"%s\" är grunt"

5641

5505 -#: object-file.c:809

5642 +#: object-file.c:742

5643 #, c-format

5644 msgid "reference repository '%s' is grafted"

5645 msgstr "referensarkivet \"%s\" är ympat"

5646

5510 -#: object-file.c:869

5647 +#: object-file.c:773

5648 +#, c-format

5649 +msgid "could not find object directory matching %s"

5650 +msgstr "kunde inte hitta objektkatalog för %s"

5651 +

5652 +#: object-file.c:823

5653 #, c-format

5654 msgid "invalid line while parsing alternate refs: %s"

5655 msgstr "felaktig rad vid tolkning av supplerande referenser: %s"

5656

5515 -#: object-file.c:1019

5657 +#: object-file.c:973

5658 #, c-format

5659 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"

5660 msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"

5661

5520 -#: object-file.c:1054

5662 +#: object-file.c:1008

5663 #, c-format

5664 msgid "mmap failed%s"

5665 msgstr "mmap misslyckades%s"

5666

5525 -#: object-file.c:1218

5667 +#: object-file.c:1174

5668 #, c-format

5669 msgid "object file %s is empty"

5670 msgstr "objektfilen %s är tom"

5671

5530 -#: object-file.c:1353 object-file.c:2548

5672 +#: object-file.c:1293 object-file.c:2499

5673 #, c-format

5674 msgid "corrupt loose object '%s'"

5675 msgstr "trasigt löst objekt \"%s\""

5676

5535 -#: object-file.c:1355 object-file.c:2552

5677 +#: object-file.c:1295 object-file.c:2503

5678 #, c-format

5679 msgid "garbage at end of loose object '%s'"

5680 msgstr "skräp i slutet av löst objekt \"%s\""

5681

5540 -#: object-file.c:1397

5682 +#: object-file.c:1417

5683 +#, c-format

5684 +msgid "unable to parse %s header"

5685 +msgstr "kan inte tolka %s-huvud"

5686 +

5687 +#: object-file.c:1419

5688 msgid "invalid object type"

5689 msgstr "felaktig objekttyp"

5690

5544 -#: object-file.c:1481

5545 -#, c-format

5546 -msgid "unable to unpack %s header with --allow-unknown-type"

5547 -msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"

5548 -

5549 -#: object-file.c:1484

5691 +#: object-file.c:1430

5692 #, c-format

5693 msgid "unable to unpack %s header"

5694 msgstr "kan inte packa upp %s-huvudet"

5695

5554 -#: object-file.c:1490

5555 -#, c-format

5556 -msgid "unable to parse %s header with --allow-unknown-type"

5557 -msgstr "kan inte tolka %s-huvud med --allow-unknown-type"

5558 -

5559 -#: object-file.c:1493

5696 +#: object-file.c:1434

5697 #, c-format

5561 -msgid "unable to parse %s header"

5562 -msgstr "kan inte tolka %s-huvud"

5698 +msgid "header for %s too long, exceeds %d bytes"

5699 +msgstr "huvudet för %s är för långt, mer än %d byte"

5700

5564 -#: object-file.c:1717

5701 +#: object-file.c:1664

5702 #, c-format

5703 msgid "failed to read object %s"

5704 msgstr "misslyckades läsa objektet %s"

5705

5569 -#: object-file.c:1721

5706 +#: object-file.c:1668

5707 #, c-format

5708 msgid "replacement %s not found for %s"

5709 msgstr "ersättningen %s hittades inte för %s"

5710

5574 -#: object-file.c:1725

5711 +#: object-file.c:1672

5712 #, c-format

5713 msgid "loose object %s (stored in %s) is corrupt"

5714 msgstr "löst objekt %s (lagrat i %s) är trasigt"

5715

5579 -#: object-file.c:1729

5716 +#: object-file.c:1676

5717 #, c-format

5718 msgid "packed object %s (stored in %s) is corrupt"

5719 msgstr "packat objekt %s (lagrat i %s) är trasigt"

5720

5584 -#: object-file.c:1834

5721 +#: object-file.c:1781

5722 #, c-format

5723 msgid "unable to write file %s"

5724 msgstr "kunde inte skriva filen %s"

5725

5589 -#: object-file.c:1841

5726 +#: object-file.c:1788

5727 #, c-format

5728 msgid "unable to set permission to '%s'"

5729 msgstr "kan inte sätta behörigheten till \"%s\""

5730

5594 -#: object-file.c:1848

5731 +#: object-file.c:1795

5732 msgid "file write error"

5733 msgstr "fel vid skrivning av fil"

5734

5598 -#: object-file.c:1868

5735 +#: object-file.c:1815

5736 msgid "error when closing loose object file"

5737 msgstr "fel vid stängning av fil för löst objekt"

5738

5602 -#: object-file.c:1933

5739 +#: object-file.c:1882

5740 #, c-format

5741 msgid "insufficient permission for adding an object to repository database %s"

l10n: sv.po: Update Swedish translation (5210t0f0u)