@matheusbsbs / matheus-bagliano / commits / 2591c4cf6d
Fork 0

l10n: sv.po: Update Swedish translation (4835t0f0u)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>

Peter Krefting committed Mar 9, 2020 at 20:57 UTC 2591c4cf6d0e0cbe5cf72086f46519554e15118e
1 file changed +2774 -2389
po/sv.po
+2774 -2389
@@ -5,10 +5,10 @@
5 #
6 msgid ""
7 msgstr ""
8 -"Project-Id-Version: git 2.25.0\n"
8 +"Project-Id-Version: git 2.26.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2019-12-30 08:48+0800\n"
11 -"PO-Revision-Date: 2020-01-04 19:51+0100\n"
10 +"POT-Creation-Date: 2020-03-06 14:25+0800\n"
11 +"PO-Revision-Date: 2020-03-09 20:54+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,250 +18,512 @@ msgstr ""
18 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
19 "X-Generator: Gtranslator 2.91.7\n"
20
21 -#: add-interactive.c:347
21 +#: add-interactive.c:368
22 #, c-format
23 msgid "Huh (%s)?"
24 msgstr "Vadå (%s)?"
25
26 -#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
27 -#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
28 -#: builtin/rebase.c:2019 builtin/rebase.c:2063
26 +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
27 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
28 +#: builtin/rebase.c:2086 builtin/rebase.c:2130
29 msgid "could not read index"
30 msgstr "kunde inte läsa indexet"
31
32 -#: add-interactive.c:555 git-add--interactive.perl:269
32 +#: add-interactive.c:576 git-add--interactive.perl:269
33 #: git-add--interactive.perl:294
34 msgid "binary"
35 msgstr "binär"
36
37 -#: add-interactive.c:613 git-add--interactive.perl:278
37 +#: add-interactive.c:634 git-add--interactive.perl:278
38 #: git-add--interactive.perl:332
39 msgid "nothing"
40 msgstr "ingenting"
41
42 -#: add-interactive.c:614 git-add--interactive.perl:314
42 +#: add-interactive.c:635 git-add--interactive.perl:314
43 #: git-add--interactive.perl:329
44 msgid "unchanged"
45 msgstr "oändrad"
46
47 -#: add-interactive.c:651 git-add--interactive.perl:643
47 +#: add-interactive.c:672 git-add--interactive.perl:643
48 msgid "Update"
49 msgstr "Uppdatera"
50
51 -#: add-interactive.c:668 add-interactive.c:856
51 +#: add-interactive.c:689 add-interactive.c:877
52 #, c-format
53 msgid "could not stage '%s'"
54 msgstr "kunde inte köa \"%s\""
55
56 -#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
57 -#: builtin/rebase.c:895
56 +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
57 +#: builtin/rebase.c:899
58 msgid "could not write index"
59 msgstr "kunde inte skriva indexet"
60
61 -#: add-interactive.c:677 git-add--interactive.perl:628
61 +#: add-interactive.c:698 git-add--interactive.perl:628
62 #, c-format, perl-format
63 msgid "updated %d path\n"
64 msgid_plural "updated %d paths\n"
65 msgstr[0] "uppdaterade %d sökväg\n"
66 msgstr[1] "uppdaterade %d sökvägar\n"
67
68 -#: add-interactive.c:695 git-add--interactive.perl:678
68 +#: add-interactive.c:716 git-add--interactive.perl:678
69 #, c-format, perl-format
70 msgid "note: %s is untracked now.\n"
71 msgstr "observera: %s spåras inte längre.\n"
72
73 -#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
73 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
74 #: builtin/reset.c:144
75 #, c-format
76 msgid "make_cache_entry failed for path '%s'"
77 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
78
79 -#: add-interactive.c:730 git-add--interactive.perl:655
79 +#: add-interactive.c:751 git-add--interactive.perl:655
80 msgid "Revert"
81 msgstr "Återställ"
82
83 -#: add-interactive.c:746
83 +#: add-interactive.c:767
84 msgid "Could not parse HEAD^{tree}"
85 msgstr "kunde inte tolka HEAD^{tree}"
86
87 -#: add-interactive.c:784 git-add--interactive.perl:631
87 +#: add-interactive.c:805 git-add--interactive.perl:631
88 #, c-format, perl-format
89 msgid "reverted %d path\n"
90 msgid_plural "reverted %d paths\n"
91 msgstr[0] "återställde %d sökväg\n"
92 msgstr[1] "återställde %d sökvägar\n"
93
94 -#: add-interactive.c:835 git-add--interactive.perl:695
94 +#: add-interactive.c:856 git-add--interactive.perl:695
95 #, c-format
96 msgid "No untracked files.\n"
97 msgstr "Inga ospårade filer.\n"
98
99 -#: add-interactive.c:839 git-add--interactive.perl:689
99 +#: add-interactive.c:860 git-add--interactive.perl:689
100 msgid "Add untracked"
101 msgstr "Lägg till ospårad"
102
103 -#: add-interactive.c:866 git-add--interactive.perl:625
103 +#: add-interactive.c:887 git-add--interactive.perl:625
104 #, c-format, perl-format
105 msgid "added %d path\n"
106 msgid_plural "added %d paths\n"
107 msgstr[0] "lade till %d sökväg\n"
108 msgstr[1] "lade till %d sökvägar\n"
109
110 -#: add-interactive.c:896
110 +#: add-interactive.c:917
111 #, c-format
112 msgid "ignoring unmerged: %s"
113 msgstr "ignorerar ej sammanslagen: %s"
114
115 -#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
115 +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
116 #, c-format
117 msgid "Only binary files changed.\n"
118 msgstr "Endast binära filer ändrade.\n"
119
120 -#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
120 +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
121 #, c-format
122 msgid "No changes.\n"
123 msgstr "Inga ändringar.\n"
124
125 -#: add-interactive.c:914 git-add--interactive.perl:1376
125 +#: add-interactive.c:935 git-add--interactive.perl:1376
126 msgid "Patch update"
127 msgstr "Uppdatera patch"
128
129 -#: add-interactive.c:953 git-add--interactive.perl:1754
129 +#: add-interactive.c:974 git-add--interactive.perl:1754
130 msgid "Review diff"
131 msgstr "Granska diff"
132
133 -#: add-interactive.c:981
133 +#: add-interactive.c:1002
134 msgid "show paths with changes"
135 msgstr "visa sökvägar med ändringar"
136
137 -#: add-interactive.c:983
137 +#: add-interactive.c:1004
138 msgid "add working tree state to the staged set of changes"
139 msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
140
141 -#: add-interactive.c:985
141 +#: add-interactive.c:1006
142 msgid "revert staged set of changes back to the HEAD version"
143 msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
144
145 -#: add-interactive.c:987
145 +#: add-interactive.c:1008
146 msgid "pick hunks and update selectively"
147 msgstr "välj stycken och uppdatera selektivt"
148
149 -#: add-interactive.c:989
149 +#: add-interactive.c:1010
150 msgid "view diff between HEAD and index"
151 msgstr "visa skillnad mellan HEAD och index"
152
153 -#: add-interactive.c:991
153 +#: add-interactive.c:1012
154 msgid "add contents of untracked files to the staged set of changes"
155 msgstr "lägg innehåll i ospårade filer till köade ändringar"
156
157 -#: add-interactive.c:999 add-interactive.c:1048
157 +#: add-interactive.c:1020 add-interactive.c:1069
158 msgid "Prompt help:"
159 msgstr "Kommandoradshjälp:"
160
161 -#: add-interactive.c:1001
161 +#: add-interactive.c:1022
162 msgid "select a single item"
163 msgstr "markera en post"
164
165 -#: add-interactive.c:1003
165 +#: add-interactive.c:1024
166 msgid "select a range of items"
167 msgstr "markera intervall av poster"
168
169 -#: add-interactive.c:1005
169 +#: add-interactive.c:1026
170 msgid "select multiple ranges"
171 msgstr "markera flera intervall"
172
173 -#: add-interactive.c:1007 add-interactive.c:1052
173 +#: add-interactive.c:1028 add-interactive.c:1073
174 msgid "select item based on unique prefix"
175 msgstr "markera post baserad på unikt prefix"
176
177 -#: add-interactive.c:1009
177 +#: add-interactive.c:1030
178 msgid "unselect specified items"
179 msgstr "avmarkera angivna poster"
180
181 -#: add-interactive.c:1011
181 +#: add-interactive.c:1032
182 msgid "choose all items"
183 msgstr "välj alla poster"
184
185 -#: add-interactive.c:1013
185 +#: add-interactive.c:1034
186 msgid "(empty) finish selecting"
187 msgstr "(tomt) avsluta markering"
188
189 -#: add-interactive.c:1050
189 +#: add-interactive.c:1071
190 msgid "select a numbered item"
191 msgstr "markera en numrerad post"
192
193 -#: add-interactive.c:1054
193 +#: add-interactive.c:1075
194 msgid "(empty) select nothing"
195 msgstr "(tomt) markera ingenting"
196
197 -#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
197 +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
198 msgid "*** Commands ***"
199 msgstr "*** Kommandon ***"
200
201 -#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
201 +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
202 msgid "What now"
203 msgstr "Vad nu"
204
205 -#: add-interactive.c:1115 git-add--interactive.perl:213
205 +#: add-interactive.c:1136 git-add--interactive.perl:213
206 msgid "staged"
207 msgstr "köad"
208
209 -#: add-interactive.c:1115 git-add--interactive.perl:213
209 +#: add-interactive.c:1136 git-add--interactive.perl:213
210 msgid "unstaged"
211 msgstr "ej köad"
212
213 -#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
213 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2197
214 #: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
215 -#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
216 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
217 -#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
218 -#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
215 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
216 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
217 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
218 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
219 msgid "path"
220 msgstr "sökväg"
221
222 -#: add-interactive.c:1122
222 +#: add-interactive.c:1143
223 msgid "could not refresh index"
224 msgstr "kunde inte uppdatera indexet"
225
226 -#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
226 +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
227 #, c-format
228 msgid "Bye.\n"
229 msgstr "Hej då.\n"
230
231 -#: add-patch.c:15
232 -#, c-format
233 -msgid "Stage mode change [y,n,a,q,d%s,?]? "
234 -msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "
231 +#: add-patch.c:33 git-add--interactive.perl:1428
232 +#, c-format, perl-format
233 +msgid "Stage mode change [y,n,q,a,d%s,?]? "
234 +msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
235
236 -#: add-patch.c:16
237 -#, c-format
238 -msgid "Stage deletion [y,n,a,q,d%s,?]? "
239 -msgstr "Köa borttagning [y,n,a,q,d%s,?]? "
236 +#: add-patch.c:34 git-add--interactive.perl:1429
237 +#, c-format, perl-format
238 +msgid "Stage deletion [y,n,q,a,d%s,?]? "
239 +msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
240
241 -#: add-patch.c:17
242 -#, c-format
243 -msgid "Stage this hunk [y,n,a,q,d%s,?]? "
244 -msgstr "Köa stycket [y,n,a,q,d%s,?]? "
241 +#: add-patch.c:35 git-add--interactive.perl:1430
242 +#, c-format, perl-format
243 +msgid "Stage this hunk [y,n,q,a,d%s,?]? "
244 +msgstr "Köa stycket [y,n,q,a,d%s,?]? "
245 +
246 +#: add-patch.c:37
247 +msgid ""
248 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
249 +"staging."
250 +msgstr ""
251 +"Om patchen kan appliceras rent kommer det redigerade stycket att köas "
252 +"omedelbart."
253 +
254 +#: add-patch.c:40
255 +msgid ""
256 +"y - stage this hunk\n"
257 +"n - do not stage this hunk\n"
258 +"q - quit; do not stage this hunk or any of the remaining ones\n"
259 +"a - stage this hunk and all later hunks in the file\n"
260 +"d - do not stage this hunk or any of the later hunks in the file\n"
261 +msgstr ""
262 +"y - köa stycket\n"
263 +"n - köa inte stycket\n"
264 +"q - avsluta; köa inte stycket eller något av de följande\n"
265 +"a - köa stycket och alla följande i filen\n"
266 +"d - köa inte stycket eller något av de följande i filen\n"
267 +
268 +#: add-patch.c:54 git-add--interactive.perl:1433
269 +#, c-format, perl-format
270 +msgid "Stash mode change [y,n,q,a,d%s,?]? "
271 +msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
272 +
273 +#: add-patch.c:55 git-add--interactive.perl:1434
274 +#, c-format, perl-format
275 +msgid "Stash deletion [y,n,q,a,d%s,?]? "
276 +msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
277 +
278 +#: add-patch.c:56 git-add--interactive.perl:1435
279 +#, c-format, perl-format
280 +msgid "Stash this hunk [y,n,q,a,d%s,?]? "
281 +msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
282 +
283 +#: add-patch.c:58
284 +msgid ""
285 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
286 +"stashing."
287 +msgstr ""
288 +"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
289 +"i \"stash\" omedelbart."
290 +
291 +#: add-patch.c:61
292 +msgid ""
293 +"y - stash this hunk\n"
294 +"n - do not stash this hunk\n"
295 +"q - quit; do not stash this hunk or any of the remaining ones\n"
296 +"a - stash this hunk and all later hunks in the file\n"
297 +"d - do not stash this hunk or any of the later hunks in the file\n"
298 +msgstr ""
299 +"y - \"stash\":a stycket\n"
300 +"n - \"stash\":a inte stycket\n"
301 +"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
302 +"a - \"stash\":a stycket och alla följande i filen\n"
303 +"d - \"stash\":a inte stycket eller något av de följande i filen\n"
304 +
305 +#: add-patch.c:77 git-add--interactive.perl:1438
306 +#, c-format, perl-format
307 +msgid "Unstage mode change [y,n,q,a,d%s,?]? "
308 +msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
309 +
310 +#: add-patch.c:78 git-add--interactive.perl:1439
311 +#, c-format, perl-format
312 +msgid "Unstage deletion [y,n,q,a,d%s,?]? "
313 +msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
314 +
315 +#: add-patch.c:79 git-add--interactive.perl:1440
316 +#, c-format, perl-format
317 +msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
318 +msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
319 +
320 +#: add-patch.c:81
321 +msgid ""
322 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
323 +"unstaging."
324 +msgstr ""
325 +"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
326 +"från kön omedelbart."
327 +
328 +#: add-patch.c:84
329 +msgid ""
330 +"y - unstage this hunk\n"
331 +"n - do not unstage this hunk\n"
332 +"q - quit; do not unstage this hunk or any of the remaining ones\n"
333 +"a - unstage this hunk and all later hunks in the file\n"
334 +"d - do not unstage this hunk or any of the later hunks in the file\n"
335 +msgstr ""
336 +"y - ta bort stycket från kön\n"
337 +"n - ta inte bort stycket från kön\n"
338 +"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
339 +"a - ta bort stycket och alla följande i filen från kön\n"
340 +"d - ta inte bort stycket eller något av de följande i filen från kön\n"
341 +
342 +#: add-patch.c:99 git-add--interactive.perl:1443
343 +#, c-format, perl-format
344 +msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
345 +msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
346 +
347 +#: add-patch.c:100 git-add--interactive.perl:1444
348 +#, c-format, perl-format
349 +msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
350 +msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
351 +
352 +#: add-patch.c:101 git-add--interactive.perl:1445
353 +#, c-format, perl-format
354 +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
355 +msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
356 +
357 +#: add-patch.c:103 add-patch.c:168 add-patch.c:211
358 +msgid ""
359 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
360 +"applying."
361 +msgstr ""
362 +"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
363 +"för applicering omedelbart."
364 +
365 +#: add-patch.c:106
366 +msgid ""
367 +"y - apply this hunk to index\n"
368 +"n - do not apply this hunk to index\n"
369 +"q - quit; do not apply this hunk or any of the remaining ones\n"
370 +"a - apply this hunk and all later hunks in the file\n"
371 +"d - do not apply this hunk or any of the later hunks in the file\n"
372 +msgstr ""
373 +"y - applicera stycket på indexet\n"
374 +"n - applicera inte stycket på indexet\n"
375 +"q - avsluta; applicera inte stycket eller något av de följande\n"
376 +"a - applicera stycket och alla följande i filen\n"
377 +"d - applicera inte stycket eller något av de följande i filen\n"
378 +
379 +#: add-patch.c:121 git-add--interactive.perl:1448
380 +#: git-add--interactive.perl:1463
381 +#, c-format, perl-format
382 +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
383 +msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
384 +
385 +#: add-patch.c:122 git-add--interactive.perl:1449
386 +#: git-add--interactive.perl:1464
387 +#, c-format, perl-format
388 +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
389 +msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
390 +
391 +#: add-patch.c:123 git-add--interactive.perl:1450
392 +#: git-add--interactive.perl:1465
393 +#, c-format, perl-format
394 +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
395 +msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
396 +
397 +#: add-patch.c:125 add-patch.c:147 add-patch.c:190
398 +msgid ""
399 +"If the patch applies cleanly, the edited hunk will immediately be marked for "
400 +"discarding."
401 +msgstr ""
402 +"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
403 +"för kasta omedelbart."
404 +
405 +#: add-patch.c:128 add-patch.c:193
406 +msgid ""
407 +"y - discard this hunk from worktree\n"
408 +"n - do not discard this hunk from worktree\n"
409 +"q - quit; do not discard this hunk or any of the remaining ones\n"
410 +"a - discard this hunk and all later hunks in the file\n"
411 +"d - do not discard this hunk or any of the later hunks in the file\n"
412 +msgstr ""
413 +"y - förkasta stycket från arbetskatalogen\n"
414 +"n - förkasta inte stycket från arbetskatalogen\n"
415 +"q - avsluta; förkasta inte stycket eller något av de följande\n"
416 +"a - förkasta stycket och alla följande i filen\n"
417 +"d - förkasta inte stycket eller något av de följande i filen\n"
418 +
419 +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
420 +#, c-format, perl-format
421 +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
422 +msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
423 +
424 +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
425 +#, c-format, perl-format
426 +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
427 +msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
428 +
429 +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
430 +#, c-format, perl-format
431 +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
432 +msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
433 +
434 +#: add-patch.c:150
435 +msgid ""
436 +"y - discard this hunk from index and worktree\n"
437 +"n - do not discard this hunk from index and worktree\n"
438 +"q - quit; do not discard this hunk or any of the remaining ones\n"
439 +"a - discard this hunk and all later hunks in the file\n"
440 +"d - do not discard this hunk or any of the later hunks in the file\n"
441 +msgstr ""
442 +"y - förkasta stycket från indexet och arbetskatalogen\n"
443 +"n - förkasta inte stycket från indexet och arbetskatalogen\n"
444 +"q - avsluta; förkasta inte stycket eller något av de följande\n"
445 +"a - förkasta stycket och alla följande i filen\n"
446 +"d - förkasta inte stycket eller något av de följande i filen\n"
447
246 -#: add-patch.c:111
448 +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
449 +#, c-format, perl-format
450 +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
451 +msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
452 +
453 +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
454 +#, c-format, perl-format
455 +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
456 +msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
457 +
458 +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
459 +#, c-format, perl-format
460 +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
461 +msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
462 +
463 +#: add-patch.c:171
464 +msgid ""
465 +"y - apply this hunk to index and worktree\n"
466 +"n - do not apply this hunk to index and worktree\n"
467 +"q - quit; do not apply this hunk or any of the remaining ones\n"
468 +"a - apply this hunk and all later hunks in the file\n"
469 +"d - do not apply this hunk or any of the later hunks in the file\n"
470 +msgstr ""
471 +"y - applicera stycket på indexet och arbetskatalogen\n"
472 +"n - applicera inte stycket på indexet och arbetskatalogen\n"
473 +"q - avsluta; applicera inte stycket eller något av de följande\n"
474 +"a - applicera stycket och alla följande i filen\n"
475 +"d - applicera inte stycket eller något av de följande i filen\n"
476 +
477 +#: add-patch.c:214
478 +msgid ""
479 +"y - apply this hunk to worktree\n"
480 +"n - do not apply this hunk to worktree\n"
481 +"q - quit; do not apply this hunk or any of the remaining ones\n"
482 +"a - apply this hunk and all later hunks in the file\n"
483 +"d - do not apply this hunk or any of the later hunks in the file\n"
484 +msgstr ""
485 +"y - applicera stycket på arbetskatalogen\n"
486 +"n - applicera inte stycket på arbetskatalogen\n"
487 +"q - avsluta; applicera inte stycket eller något av de följande\n"
488 +"a - applicera stycket och alla följande i filen\n"
489 +"d - applicera inte stycket eller något av de följande i filen\n"
490 +
491 +#: add-patch.c:318
492 #, c-format
493 msgid "could not parse hunk header '%.*s'"
494 msgstr "kunde inte tolka styckehuvudet \"%.*s\""
495
251 -#: add-patch.c:130 add-patch.c:134
496 +#: add-patch.c:337 add-patch.c:341
497 #, c-format
498 msgid "could not parse colored hunk header '%.*s'"
499 msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
500
256 -#: add-patch.c:176
501 +#: add-patch.c:395
502 msgid "could not parse diff"
503 msgstr "kunde inte tolka diff"
504
260 -#: add-patch.c:194
505 +#: add-patch.c:414
506 msgid "could not parse colored diff"
507 msgstr "kunde inte tolka färgad diff"
508
264 -#: add-patch.c:508
509 +#: add-patch.c:428
510 +#, c-format
511 +msgid "failed to run '%s'"
512 +msgstr "misslyckades att köra \"%s\""
513 +
514 +#: add-patch.c:587
515 +msgid "mismatched output from interactive.diffFilter"
516 +msgstr "omaka utdata från interactive.diffFilter"
517 +
518 +#: add-patch.c:588
519 +msgid ""
520 +"Your filter must maintain a one-to-one correspondence\n"
521 +"between its input and output lines."
522 +msgstr ""
523 +"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
524 +"ditt filter."
525 +
526 +#: add-patch.c:761
527 #, c-format
528 msgid ""
529 "expected context line #%d in\n"
@@ -270,7 +532,7 @@ msgstr ""
532 "förväntade sammanhangsrad %d i\n"
533 "%.*s"
534
273 -#: add-patch.c:523
535 +#: add-patch.c:776
536 #, c-format
537 msgid ""
538 "hunks do not overlap:\n"
@@ -283,11 +545,11 @@ msgstr ""
545 "\tavslutas inte med:\n"
546 "%.*s"
547
286 -#: add-patch.c:799 git-add--interactive.perl:1112
548 +#: add-patch.c:1052 git-add--interactive.perl:1112
549 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
550 msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
551
290 -#: add-patch.c:803
552 +#: add-patch.c:1056
553 #, c-format
554 msgid ""
555 "---\n"
@@ -300,16 +562,8 @@ msgstr ""
562 "Ta bort \"%c\" rader genom att radera dem.\n"
563 "Rader som börjar med %c kommer att tas bort.\n"
564
303 -#: add-patch.c:810
304 -msgid ""
305 -"If the patch applies cleanly, the edited hunk will immediately be\n"
306 -"marked for staging.\n"
307 -msgstr ""
308 -"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
309 -"köas omedelbart.\n"
310 -
565 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
312 -#: add-patch.c:818 git-add--interactive.perl:1126
566 +#: add-patch.c:1070 git-add--interactive.perl:1126
567 msgid ""
568 "If it does not apply cleanly, you will be given an opportunity to\n"
569 "edit again. If all lines of the hunk are removed, then the edit is\n"
@@ -319,11 +573,11 @@ msgstr ""
573 "redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
574 "redigeringen och stycket lämnas oförändrat.\n"
575
322 -#: add-patch.c:851
576 +#: add-patch.c:1103
577 msgid "could not parse hunk header"
578 msgstr "kunde inte tolka styckehuvud"
579
326 -#: add-patch.c:895 add-patch.c:1294
580 +#: add-patch.c:1148
581 msgid "'git apply --cached' failed"
582 msgstr "\"git apply --cached\" misslyckades"
583
@@ -339,28 +593,26 @@ msgstr "\"git apply --cached\" misslyckades"
593 #. Consider translating (saying "no" discards!) as
594 #. (saying "n" for "no" discards!) if the translation
595 #. of the word "no" does not start with n.
342 -#: add-patch.c:952 git-add--interactive.perl:1239
596 +#: add-patch.c:1218 git-add--interactive.perl:1239
597 msgid ""
598 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
599 msgstr ""
600 "Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
601 "[y/n]? "
602
349 -#: add-patch.c:1009
350 -msgid ""
351 -"y - stage this hunk\n"
352 -"n - do not stage this hunk\n"
353 -"q - quit; do not stage this hunk or any of the remaining ones\n"
354 -"a - stage this and all the remaining hunks\n"
355 -"d - do not stage this hunk nor any of the remaining hunks\n"
356 -msgstr ""
357 -"y - köa stycket\n"
358 -"n - köa inte stycket\n"
359 -"q - avsluta; köa inte stycket eller något av de följande\n"
360 -"a - köa detta och alla följande stycken\n"
361 -"d - köa inte stycket eller något av de stycken som följer\n"
603 +#: add-patch.c:1261
604 +msgid "The selected hunks do not apply to the index!"
605 +msgstr "Markerade stycken kan inte appliceras på indexet!"
606 +
607 +#: add-patch.c:1262 git-add--interactive.perl:1343
608 +msgid "Apply them to the worktree anyway? "
609 +msgstr "Applicera dem på arbetskatalogen trots det? "
610
363 -#: add-patch.c:1016
611 +#: add-patch.c:1269 git-add--interactive.perl:1346
612 +msgid "Nothing was applied.\n"
613 +msgstr "Ingenting applicerades.\n"
614 +
615 +#: add-patch.c:1326
616 msgid ""
617 "j - leave this hunk undecided, see next undecided hunk\n"
618 "J - leave this hunk undecided, see next hunk\n"
@@ -382,109 +634,113 @@ msgstr ""
634 "e - redigera aktuellt stycke manuellt\n"
635 "? - visa hjälp\n"
636
385 -#: add-patch.c:1137 add-patch.c:1147
637 +#: add-patch.c:1447 add-patch.c:1457
638 msgid "No previous hunk"
639 msgstr "Inget föregående stycke"
640
389 -#: add-patch.c:1142 add-patch.c:1152
641 +#: add-patch.c:1452 add-patch.c:1462
642 msgid "No next hunk"
643 msgstr "Inget följande stycke"
644
393 -#: add-patch.c:1158
645 +#: add-patch.c:1468
646 msgid "No other hunks to goto"
647 msgstr "Inga andra stycken att gå till"
648
397 -#: add-patch.c:1169 git-add--interactive.perl:1577
649 +#: add-patch.c:1479 git-add--interactive.perl:1577
650 msgid "go to which hunk (<ret> to see more)? "
651 msgstr "gå till vilket stycke (<ret> för att se fler)? "
652
401 -#: add-patch.c:1170 git-add--interactive.perl:1579
653 +#: add-patch.c:1480 git-add--interactive.perl:1579
654 msgid "go to which hunk? "
655 msgstr "gå till vilket stycke? "
656
405 -#: add-patch.c:1181
657 +#: add-patch.c:1491
658 #, c-format
659 msgid "Invalid number: '%s'"
660 msgstr "Ogiltigt siffervärde: \"%s\""
661
410 -#: add-patch.c:1186
662 +#: add-patch.c:1496
663 #, c-format
664 msgid "Sorry, only %d hunk available."
665 msgid_plural "Sorry, only %d hunks available."
666 msgstr[0] "Beklagar, det finns bara %d stycke."
667 msgstr[1] "Beklagar, det finns bara %d stycken."
668
417 -#: add-patch.c:1195
669 +#: add-patch.c:1505
670 msgid "No other hunks to search"
671 msgstr "Inga andra stycken att söka efter"
672
421 -#: add-patch.c:1201 git-add--interactive.perl:1623
673 +#: add-patch.c:1511 git-add--interactive.perl:1623
674 msgid "search for regex? "
675 msgstr "sök efter reguljärt uttryck? "
676
425 -#: add-patch.c:1216
677 +#: add-patch.c:1526
678 #, c-format
679 msgid "Malformed search regexp %s: %s"
680 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
681
430 -#: add-patch.c:1233
682 +#: add-patch.c:1543
683 msgid "No hunk matches the given pattern"
684 msgstr "Inga stycken motsvarar givet mönster"
685
434 -#: add-patch.c:1240
686 +#: add-patch.c:1550
687 msgid "Sorry, cannot split this hunk"
688 msgstr "Beklagar, kan inte dela stycket"
689
438 -#: add-patch.c:1244
690 +#: add-patch.c:1554
691 #, c-format
692 msgid "Split into %d hunks."
693 msgstr "Dela i %d stycken."
694
443 -#: add-patch.c:1248
695 +#: add-patch.c:1558
696 msgid "Sorry, cannot edit this hunk"
697 msgstr "Beklagar, kan inte redigera stycket"
698
447 -#: advice.c:111
699 +#: add-patch.c:1609
700 +msgid "'git apply' failed"
701 +msgstr "\"git apply\" misslyckades"
702 +
703 +#: advice.c:115
704 #, c-format
705 msgid "%shint: %.*s%s\n"
706 msgstr "%stips: %.*s%s\n"
707
452 -#: advice.c:164
708 +#: advice.c:168
709 msgid "Cherry-picking is not possible because you have unmerged files."
710 msgstr ""
711 "Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
712 "samman."
713
458 -#: advice.c:166
714 +#: advice.c:170
715 msgid "Committing is not possible because you have unmerged files."
716 msgstr ""
717 "Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
718 "samman."
719
464 -#: advice.c:168
720 +#: advice.c:172
721 msgid "Merging is not possible because you have unmerged files."
722 msgstr ""
723 "Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
724 "samman."
725
470 -#: advice.c:170
726 +#: advice.c:174
727 msgid "Pulling is not possible because you have unmerged files."
728 msgstr ""
729 "Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
730
475 -#: advice.c:172
731 +#: advice.c:176
732 msgid "Reverting is not possible because you have unmerged files."
733 msgstr ""
734 "Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
735 "samman."
736
481 -#: advice.c:174
737 +#: advice.c:178
738 #, c-format
739 msgid "It is not possible to %s because you have unmerged files."
740 msgstr ""
741 "Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
742
487 -#: advice.c:182
743 +#: advice.c:186
744 msgid ""
745 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
746 "as appropriate to mark resolution and make a commit."
@@ -492,23 +748,23 @@ msgstr ""
748 "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
749 "som lämpligt för att ange lösning och checka in."
750
495 -#: advice.c:190
751 +#: advice.c:194
752 msgid "Exiting because of an unresolved conflict."
753 msgstr "Avslutar på grund av olöst konflikgt."
754
499 -#: advice.c:195 builtin/merge.c:1332
755 +#: advice.c:199 builtin/merge.c:1335
756 msgid "You have not concluded your merge (MERGE_HEAD exists)."
757 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
758
503 -#: advice.c:197
759 +#: advice.c:201
760 msgid "Please, commit your changes before merging."
761 msgstr "Checka in dina ändringar innan du utför sammanslagningen."
762
507 -#: advice.c:198
763 +#: advice.c:202
764 msgid "Exiting because of unfinished merge."
765 msgstr "Avslutar på grund av ofullbordad sammanslagning."
766
511 -#: advice.c:204
767 +#: advice.c:208
768 #, c-format
769 msgid ""
770 "Note: switching to '%s'.\n"
@@ -762,7 +1018,7 @@ msgid "cannot apply binary patch to '%s' without full index line"
1018 msgstr ""
1019 "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
1020
765 -#: apply.c:3162
1021 +#: apply.c:3163
1022 #, c-format
1023 msgid ""
1024 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -770,412 +1026,412 @@ msgstr ""
1026 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
1027 "innehållet."
1028
773 -#: apply.c:3170
1029 +#: apply.c:3171
1030 #, c-format
1031 msgid "the patch applies to an empty '%s' but it is not empty"
1032 msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
1033
778 -#: apply.c:3188
1034 +#: apply.c:3189
1035 #, c-format
1036 msgid "the necessary postimage %s for '%s' cannot be read"
1037 msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
1038
783 -#: apply.c:3201
1039 +#: apply.c:3202
1040 #, c-format
1041 msgid "binary patch does not apply to '%s'"
1042 msgstr "binärpatchen kan inte tillämpas på \"%s\""
1043
788 -#: apply.c:3207
1044 +#: apply.c:3209
1045 #, c-format
1046 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
1047 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
1048
793 -#: apply.c:3228
1049 +#: apply.c:3230
1050 #, c-format
1051 msgid "patch failed: %s:%ld"
1052 msgstr "patch misslyckades: %s:%ld"
1053
798 -#: apply.c:3351
1054 +#: apply.c:3353
1055 #, c-format
1056 msgid "cannot checkout %s"
1057 msgstr "kan inte checka ut %s"
1058
803 -#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
1059 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
1060 #, c-format
1061 msgid "failed to read %s"
1062 msgstr "misslyckades läsa %s"
1063
808 -#: apply.c:3411
1064 +#: apply.c:3413
1065 #, c-format
1066 msgid "reading from '%s' beyond a symbolic link"
1067 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
1068
813 -#: apply.c:3440 apply.c:3683
1069 +#: apply.c:3442 apply.c:3685
1070 #, c-format
1071 msgid "path %s has been renamed/deleted"
1072 msgstr "sökvägen %s har ändrat namn/tagits bort"
1073
818 -#: apply.c:3526 apply.c:3698
1074 +#: apply.c:3528 apply.c:3700
1075 #, c-format
1076 msgid "%s: does not exist in index"
1077 msgstr "%s: finns inte i indexet"
1078
823 -#: apply.c:3535 apply.c:3706
1079 +#: apply.c:3537 apply.c:3708
1080 #, c-format
1081 msgid "%s: does not match index"
1082 msgstr "%s: motsvarar inte indexet"
1083
828 -#: apply.c:3570
1084 +#: apply.c:3572
1085 msgid "repository lacks the necessary blob to fall back on 3-way merge."
1086 msgstr ""
1087 "arkivet saknar objekt som behövs för att falla tillbaka på 3-"
1088 "vägssammanslagning."
1089
834 -#: apply.c:3573
1090 +#: apply.c:3575
1091 #, c-format
1092 msgid "Falling back to three-way merge...\n"
1093 msgstr "Faller tillbaka på trevägssammanslagning...\n"
1094
839 -#: apply.c:3589 apply.c:3593
1095 +#: apply.c:3591 apply.c:3595
1096 #, c-format
1097 msgid "cannot read the current contents of '%s'"
1098 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
1099
844 -#: apply.c:3605
1100 +#: apply.c:3607
1101 #, c-format
1102 msgid "Failed to fall back on three-way merge...\n"
1103 msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
1104
849 -#: apply.c:3619
1105 +#: apply.c:3621
1106 #, c-format
1107 msgid "Applied patch to '%s' with conflicts.\n"
1108 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
1109
854 -#: apply.c:3624
1110 +#: apply.c:3626
1111 #, c-format
1112 msgid "Applied patch to '%s' cleanly.\n"
1113 msgstr "Tillämpade patchen på \"%s\" rent.\n"
1114
859 -#: apply.c:3650
1115 +#: apply.c:3652
1116 msgid "removal patch leaves file contents"
1117 msgstr "patch för borttagning lämnar kvar filinnehåll"
1118
863 -#: apply.c:3723
1119 +#: apply.c:3725
1120 #, c-format
1121 msgid "%s: wrong type"
1122 msgstr "%s: fel typ"
1123
868 -#: apply.c:3725
1124 +#: apply.c:3727
1125 #, c-format
1126 msgid "%s has type %o, expected %o"
1127 msgstr "%s har typen %o, förväntade %o"
1128
873 -#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
874 -#: read-cache.c:1320
1129 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
1130 +#: read-cache.c:1325
1131 #, c-format
1132 msgid "invalid path '%s'"
1133 msgstr "ogiltig sökväg \"%s\""
1134
879 -#: apply.c:3934
1135 +#: apply.c:3936
1136 #, c-format
1137 msgid "%s: already exists in index"
1138 msgstr "%s: finns redan i indexet"
1139
884 -#: apply.c:3937
1140 +#: apply.c:3939
1141 #, c-format
1142 msgid "%s: already exists in working directory"
1143 msgstr "%s: finns redan i arbetskatalogen"
1144
889 -#: apply.c:3957
1145 +#: apply.c:3959
1146 #, c-format
1147 msgid "new mode (%o) of %s does not match old mode (%o)"
1148 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
1149
894 -#: apply.c:3962
1150 +#: apply.c:3964
1151 #, c-format
1152 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
1153 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
1154
899 -#: apply.c:3982
1155 +#: apply.c:3984
1156 #, c-format
1157 msgid "affected file '%s' is beyond a symbolic link"
1158 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
1159
904 -#: apply.c:3986
1160 +#: apply.c:3988
1161 #, c-format
1162 msgid "%s: patch does not apply"
1163 msgstr "%s: patchen kan inte tillämpas"
1164
909 -#: apply.c:4001
1165 +#: apply.c:4003
1166 #, c-format
1167 msgid "Checking patch %s..."
1168 msgstr "Kontrollerar patchen %s..."
1169
914 -#: apply.c:4093
1170 +#: apply.c:4095
1171 #, c-format
1172 msgid "sha1 information is lacking or useless for submodule %s"
1173 msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
1174
919 -#: apply.c:4100
1175 +#: apply.c:4102
1176 #, c-format
1177 msgid "mode change for %s, which is not in current HEAD"
1178 msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
1179
924 -#: apply.c:4103
1180 +#: apply.c:4105
1181 #, c-format
1182 msgid "sha1 information is lacking or useless (%s)."
1183 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
1184
929 -#: apply.c:4112
1185 +#: apply.c:4114
1186 #, c-format
1187 msgid "could not add %s to temporary index"
1188 msgstr "kunde inte lägga till %s till temporärt index"
1189
934 -#: apply.c:4122
1190 +#: apply.c:4124
1191 #, c-format
1192 msgid "could not write temporary index to %s"
1193 msgstr "kunde inte skriva temporärt index till %s"
1194
939 -#: apply.c:4260
1195 +#: apply.c:4262
1196 #, c-format
1197 msgid "unable to remove %s from index"
1198 msgstr "kan inte ta bort %s från indexet"
1199
944 -#: apply.c:4294
1200 +#: apply.c:4296
1201 #, c-format
1202 msgid "corrupt patch for submodule %s"
1203 msgstr "trasig patch för undermodulen %s"
1204
949 -#: apply.c:4300
1205 +#: apply.c:4302
1206 #, c-format
1207 msgid "unable to stat newly created file '%s'"
1208 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
1209
954 -#: apply.c:4308
1210 +#: apply.c:4310
1211 #, c-format
1212 msgid "unable to create backing store for newly created file %s"
1213 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
1214
959 -#: apply.c:4314 apply.c:4459
1215 +#: apply.c:4316 apply.c:4461
1216 #, c-format
1217 msgid "unable to add cache entry for %s"
1218 msgstr "kan inte lägga till cachepost för %s"
1219
964 -#: apply.c:4357
1220 +#: apply.c:4359
1221 #, c-format
1222 msgid "failed to write to '%s'"
1223 msgstr "misslyckades skriva till \"%s\""
1224
969 -#: apply.c:4361
1225 +#: apply.c:4363
1226 #, c-format
1227 msgid "closing file '%s'"
1228 msgstr "stänger filen \"%s\""
1229
974 -#: apply.c:4431
1230 +#: apply.c:4433
1231 #, c-format
1232 msgid "unable to write file '%s' mode %o"
1233 msgstr "kan inte skriva filen \"%s\" läge %o"
1234
979 -#: apply.c:4529
1235 +#: apply.c:4531
1236 #, c-format
1237 msgid "Applied patch %s cleanly."
1238 msgstr "Tillämpade patchen %s rent."
1239
984 -#: apply.c:4537
1240 +#: apply.c:4539
1241 msgid "internal error"
1242 msgstr "internt fel"
1243
988 -#: apply.c:4540
1244 +#: apply.c:4542
1245 #, c-format
1246 msgid "Applying patch %%s with %d reject..."
1247 msgid_plural "Applying patch %%s with %d rejects..."
1248 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
1249 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
1250
995 -#: apply.c:4551
1251 +#: apply.c:4553
1252 #, c-format
1253 msgid "truncating .rej filename to %.*s.rej"
1254 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
1255
1000 -#: apply.c:4559 builtin/fetch.c:901 builtin/fetch.c:1192
1256 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
1257 #, c-format
1258 msgid "cannot open %s"
1259 msgstr "kan inte öppna %s"
1260
1005 -#: apply.c:4573
1261 +#: apply.c:4575
1262 #, c-format
1263 msgid "Hunk #%d applied cleanly."
1264 msgstr "Stycke %d tillämpades rent."
1265
1010 -#: apply.c:4577
1266 +#: apply.c:4579
1267 #, c-format
1268 msgid "Rejected hunk #%d."
1269 msgstr "Refuserar stycke %d."
1270
1015 -#: apply.c:4696
1271 +#: apply.c:4698
1272 #, c-format
1273 msgid "Skipped patch '%s'."
1274 msgstr "Ignorerar patch \"%s\"."
1275
1020 -#: apply.c:4704
1276 +#: apply.c:4706
1277 msgid "unrecognized input"
1278 msgstr "indata känns inte igen"
1279
1024 -#: apply.c:4724
1280 +#: apply.c:4726
1281 msgid "unable to read index file"
1282 msgstr "kan inte läsa indexfilen"
1283
1028 -#: apply.c:4881
1284 +#: apply.c:4883
1285 #, c-format
1286 msgid "can't open patch '%s': %s"
1287 msgstr "kan inte öppna patchen \"%s\": %s"
1288
1033 -#: apply.c:4908
1289 +#: apply.c:4910
1290 #, c-format
1291 msgid "squelched %d whitespace error"
1292 msgid_plural "squelched %d whitespace errors"
1293 msgstr[0] "undertryckte %d fel i blanksteg"
1294 msgstr[1] "undertryckte %d fel i blanksteg"
1295
1040 -#: apply.c:4914 apply.c:4929
1296 +#: apply.c:4916 apply.c:4931
1297 #, c-format
1298 msgid "%d line adds whitespace errors."
1299 msgid_plural "%d lines add whitespace errors."
1300 msgstr[0] "%d rad lägger till fel i blanksteg."
1301 msgstr[1] "%d rader lägger till fel i blanksteg."
1302
1047 -#: apply.c:4922
1303 +#: apply.c:4924
1304 #, c-format
1305 msgid "%d line applied after fixing whitespace errors."
1306 msgid_plural "%d lines applied after fixing whitespace errors."
1307 msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
1308 msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
1309
1054 -#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
1310 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:390
1311 msgid "Unable to write new index file"
1312 msgstr "Kunde inte skriva ny indexfil"
1313
1058 -#: apply.c:4966
1314 +#: apply.c:4968
1315 msgid "don't apply changes matching the given path"
1316 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
1317
1062 -#: apply.c:4969
1318 +#: apply.c:4971
1319 msgid "apply changes matching the given path"
1320 msgstr "tillämpa ändringar som motsvarar given sökväg"
1321
1066 -#: apply.c:4971 builtin/am.c:2206
1322 +#: apply.c:4973 builtin/am.c:2206
1323 msgid "num"
1324 msgstr "antal"
1325
1070 -#: apply.c:4972
1326 +#: apply.c:4974
1327 msgid "remove <num> leading slashes from traditional diff paths"
1328 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
1329
1074 -#: apply.c:4975
1330 +#: apply.c:4977
1331 msgid "ignore additions made by the patch"
1332 msgstr "ignorera tillägg gjorda av patchen"
1333
1078 -#: apply.c:4977
1334 +#: apply.c:4979
1335 msgid "instead of applying the patch, output diffstat for the input"
1336 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
1337
1082 -#: apply.c:4981
1338 +#: apply.c:4983
1339 msgid "show number of added and deleted lines in decimal notation"
1340 msgstr "visa antal tillagda och borttagna rader decimalt"
1341
1086 -#: apply.c:4983
1342 +#: apply.c:4985
1343 msgid "instead of applying the patch, output a summary for the input"
1344 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
1345
1090 -#: apply.c:4985
1346 +#: apply.c:4987
1347 msgid "instead of applying the patch, see if the patch is applicable"
1348 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
1349
1094 -#: apply.c:4987
1350 +#: apply.c:4989
1351 msgid "make sure the patch is applicable to the current index"
1352 msgstr "se till att patchen kan tillämpas på aktuellt index"
1353
1098 -#: apply.c:4989
1354 +#: apply.c:4991
1355 msgid "mark new files with `git add --intent-to-add`"
1356 msgstr "markera nya filer med \"git add --intent-to-add\""
1357
1102 -#: apply.c:4991
1358 +#: apply.c:4993
1359 msgid "apply a patch without touching the working tree"
1360 msgstr "tillämpa en patch utan att röra arbetskatalogen"
1361
1106 -#: apply.c:4993
1362 +#: apply.c:4995
1363 msgid "accept a patch that touches outside the working area"
1364 msgstr "godta en patch som rör filer utanför arbetskatalogen"
1365
1110 -#: apply.c:4996
1366 +#: apply.c:4998
1367 msgid "also apply the patch (use with --stat/--summary/--check)"
1368 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
1369
1114 -#: apply.c:4998
1370 +#: apply.c:5000
1371 msgid "attempt three-way merge if a patch does not apply"
1372 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
1373
1118 -#: apply.c:5000
1374 +#: apply.c:5002
1375 msgid "build a temporary index based on embedded index information"
1376 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
1377
1122 -#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
1378 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
1379 msgid "paths are separated with NUL character"
1380 msgstr "sökvägar avdelas med NUL-tecken"
1381
1126 -#: apply.c:5005
1382 +#: apply.c:5007
1383 msgid "ensure at least <n> lines of context match"
1384 msgstr "se till att åtminstone <n> rader sammanhang är lika"
1385
1130 -#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
1386 +#: apply.c:5008 builtin/am.c:2185 builtin/interpret-trailers.c:98
1387 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
1132 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
1388 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
1389 msgid "action"
1390 msgstr "åtgärd"
1391
1136 -#: apply.c:5007
1392 +#: apply.c:5009
1393 msgid "detect new or modified lines that have whitespace errors"
1394 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
1395
1140 -#: apply.c:5010 apply.c:5013
1396 +#: apply.c:5012 apply.c:5015
1397 msgid "ignore changes in whitespace when finding context"
1398 msgstr "ignorera ändringar i blanktecken för sammanhang"
1399
1144 -#: apply.c:5016
1400 +#: apply.c:5018
1401 msgid "apply the patch in reverse"
1402 msgstr "tillämpa patchen baklänges"
1403
1148 -#: apply.c:5018
1404 +#: apply.c:5020
1405 msgid "don't expect at least one line of context"
1406 msgstr "förvänta inte minst en rad sammanhang"
1407
1152 -#: apply.c:5020
1408 +#: apply.c:5022
1409 msgid "leave the rejected hunks in corresponding *.rej files"
1410 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
1411
1156 -#: apply.c:5022
1412 +#: apply.c:5024
1413 msgid "allow overlapping hunks"
1414 msgstr "tillåt överlappande stycken"
1415
1160 -#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
1161 -#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
1416 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
1417 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
1418 #: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
1419 msgid "be verbose"
1420 msgstr "var pratsam"
1421
1166 -#: apply.c:5025
1422 +#: apply.c:5027
1423 msgid "tolerate incorrectly detected missing new-line at the end of file"
1424 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
1425
1170 -#: apply.c:5028
1426 +#: apply.c:5030
1427 msgid "do not trust the line counts in the hunk headers"
1428 msgstr "lite inte på antalet linjer i styckehuvuden"
1429
1174 -#: apply.c:5030 builtin/am.c:2194
1430 +#: apply.c:5032 builtin/am.c:2194
1431 msgid "root"
1432 msgstr "rot"
1433
1178 -#: apply.c:5031
1434 +#: apply.c:5033
1435 msgid "prepend <root> to all filenames"
1436 msgstr "lägg till <rot> i alla filnamn"
1437
@@ -1198,7 +1454,7 @@ msgstr ""
1454 msgid "git archive --remote <repo> [--exec <cmd>] --list"
1455 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
1456
1201 -#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
1457 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:299
1458 #, c-format
1459 msgid "pathspec '%s' did not match any files"
1460 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
@@ -1239,8 +1495,8 @@ msgid "prepend prefix to each pathname in the archive"
1495 msgstr "lägg till prefix till varje sökväg i arkivet"
1496
1497 #: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
1242 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
1243 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
1498 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
1499 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
1500 #: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
1501 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
1502 #: parse-options.h:190
@@ -1276,7 +1532,7 @@ msgid "list supported archive formats"
1532 msgstr "visa understödda arkivformat"
1533
1534 #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
1279 -#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
1535 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
1536 msgid "repo"
1537 msgstr "arkiv"
1538
@@ -1315,17 +1571,17 @@ msgstr "Okänt arkivformat \"%s\""
1571 msgid "Argument not supported for format '%s': -%d"
1572 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
1573
1318 -#: archive-tar.c:125 archive-zip.c:350
1574 +#: archive-tar.c:125 archive-zip.c:351
1575 #, c-format
1576 msgid "cannot stream blob %s"
1577 msgstr "kan inte strömma blob:en %s"
1578
1323 -#: archive-tar.c:266 archive-zip.c:368
1579 +#: archive-tar.c:266 archive-zip.c:369
1580 #, c-format
1581 msgid "unsupported file mode: 0%o (SHA1: %s)"
1582 msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
1583
1328 -#: archive-tar.c:293 archive-zip.c:358
1584 +#: archive-tar.c:293 archive-zip.c:359
1585 #, c-format
1586 msgid "cannot read %s"
1587 msgstr "kan inte läsa %s"
@@ -1354,12 +1610,12 @@ msgstr "sökvägen är inte giltig UTF-8: %s"
1610 msgid "path too long (%d chars, SHA1: %s): %s"
1611 msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
1612
1357 -#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
1613 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
1614 #, c-format
1615 msgid "deflate error (%d)"
1616 msgstr "fel i deflate (%d)"
1617
1362 -#: archive-zip.c:614
1618 +#: archive-zip.c:615
1619 #, c-format
1620 msgid "timestamp too large for this system: %<PRIuMAX>"
1621 msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
@@ -1392,12 +1648,12 @@ msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
1648 msgid "We cannot bisect more!\n"
1649 msgstr "Det finns inte mer att göra \"bisect\" på!\n"
1650
1395 -#: bisect.c:733
1651 +#: bisect.c:745
1652 #, c-format
1653 msgid "Not a valid commit name %s"
1654 msgstr "Namnet på incheckningen är inte giltigt: %s"
1655
1400 -#: bisect.c:758
1656 +#: bisect.c:770
1657 #, c-format
1658 msgid ""
1659 "The merge base %s is bad.\n"
@@ -1406,7 +1662,7 @@ msgstr ""
1662 "Sammanslagningsbasen %s är trasig.\n"
1663 "Det betyder att felet har rättats mellan %s och [%s].\n"
1664
1409 -#: bisect.c:763
1665 +#: bisect.c:775
1666 #, c-format
1667 msgid ""
1668 "The merge base %s is new.\n"
@@ -1415,7 +1671,7 @@ msgstr ""
1671 "Sammanslagningsbasen %s är ny.\n"
1672 "Egenskapen har ändrats mellan %s och [%s].\n"
1673
1418 -#: bisect.c:768
1674 +#: bisect.c:780
1675 #, c-format
1676 msgid ""
1677 "The merge base %s is %s.\n"
@@ -1424,7 +1680,7 @@ msgstr ""
1680 "Sammanslagningsbasen %s är %s.\n"
1681 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
1682
1427 -#: bisect.c:776
1683 +#: bisect.c:788
1684 #, c-format
1685 msgid ""
1686 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1435,7 +1691,7 @@ msgstr ""
1691 "git bisect kan inte fungera korrekt i detta fall.\n"
1692 "Kanske du skrev fel %s- och %s-revisioner?\n"
1693
1438 -#: bisect.c:789
1694 +#: bisect.c:801
1695 #, c-format
1696 msgid ""
1697 "the merge base between %s and [%s] must be skipped.\n"
@@ -1447,36 +1703,36 @@ msgstr ""
1703 "%s.\n"
1704 "Vi fortsätter ändå."
1705
1450 -#: bisect.c:822
1706 +#: bisect.c:840
1707 #, c-format
1708 msgid "Bisecting: a merge base must be tested\n"
1709 msgstr "Bisect: en sammanslagningsbas måste testas\n"
1710
1455 -#: bisect.c:865
1711 +#: bisect.c:890
1712 #, c-format
1713 msgid "a %s revision is needed"
1714 msgstr "en %s-revision behövs"
1715
1460 -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
1716 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
1717 #, c-format
1718 msgid "could not create file '%s'"
1719 msgstr "kunde inte skapa filen \"%s\""
1720
1465 -#: bisect.c:928 builtin/merge.c:148
1721 +#: bisect.c:966 builtin/merge.c:149
1722 #, c-format
1723 msgid "could not read file '%s'"
1724 msgstr "kunde inte läsa filen \"%s\""
1725
1470 -#: bisect.c:958
1726 +#: bisect.c:997
1727 msgid "reading bisect refs failed"
1728 msgstr "misslyckades läsa bisect-referenser"
1729
1474 -#: bisect.c:977
1730 +#: bisect.c:1019
1731 #, c-format
1732 msgid "%s was both %s and %s\n"
1733 msgstr "%s var både %s och %s\n"
1734
1479 -#: bisect.c:985
1735 +#: bisect.c:1028
1736 #, c-format
1737 msgid ""
1738 "No testable commit found.\n"
@@ -1485,7 +1741,7 @@ msgstr ""
1741 "Ingen testbar incheckning hittades.\n"
1742 "Kanske du startade med felaktiga sökvägsparametrar?\n"
1743
1488 -#: bisect.c:1004
1744 +#: bisect.c:1057
1745 #, c-format
1746 msgid "(roughly %d step)"
1747 msgid_plural "(roughly %d steps)"
@@ -1495,7 +1751,7 @@ msgstr[1] "(ungefär %d steg)"
1751 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
1752 #. steps)" translation.
1753 #.
1498 -#: bisect.c:1010
1754 +#: bisect.c:1063
1755 #, c-format
1756 msgid "Bisecting: %d revision left to test after this %s\n"
1757 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
@@ -1516,10 +1772,10 @@ msgstr ""
1772 "--reverse och --first-parent tillsammans kräver att du anger senaste "
1773 "incheckningen"
1774
1519 -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
1520 -#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
1521 -#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
1522 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
1775 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
1776 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
1777 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
1778 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
1779 #: builtin/shortlog.c:192
1780 msgid "revision walk setup failed"
1781 msgstr "misslyckades skapa revisionstraversering"
@@ -1694,8 +1950,8 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
1950 msgid "unrecognized header: %s%s (%d)"
1951 msgstr "okänt huvud: %s%s (%d)"
1952
1697 -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2344 sequencer.c:3108
1698 -#: builtin/commit.c:811
1953 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
1954 +#: builtin/commit.c:815
1955 #, c-format
1956 msgid "could not open '%s'"
1957 msgstr "kunde inte öppna \"%s\""
@@ -1765,13 +2021,13 @@ msgstr "kan inte skapa \"%s\""
2021 msgid "index-pack died"
2022 msgstr "index-pack dog"
2023
1768 -#: color.c:296
2024 +#: color.c:329
2025 #, c-format
2026 msgid "invalid color value: %.*s"
2027 msgstr "felaktigt färgvärde: %.*s"
2028
1773 -#: commit.c:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
1774 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
2029 +#: commit.c:51 sequencer.c:2719 builtin/am.c:354 builtin/am.c:398
2030 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:457
2031 #, c-format
2032 msgid "could not parse %s"
2033 msgstr "kunde inte tolka %s"
@@ -1801,29 +2057,29 @@ msgstr ""
2057 "Slå av detta meddelande genom att skriva\n"
2058 "\"git config advice.graftFileDeprecated false\""
2059
1804 -#: commit.c:1152
2060 +#: commit.c:1153
2061 #, c-format
2062 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
2063 msgstr ""
2064 "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
2065
1810 -#: commit.c:1155
2066 +#: commit.c:1157
2067 #, c-format
2068 msgid "Commit %s has a bad GPG signature allegedly by %s."
2069 msgstr ""
2070 "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
2071
1816 -#: commit.c:1158
2072 +#: commit.c:1160
2073 #, c-format
2074 msgid "Commit %s does not have a GPG signature."
2075 msgstr "Incheckning %s har inte någon GPG-signatur."
2076
1821 -#: commit.c:1161
2077 +#: commit.c:1163
2078 #, c-format
2079 msgid "Commit %s has a good GPG signature by %s\n"
2080 msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
2081
1826 -#: commit.c:1415
2082 +#: commit.c:1417
2083 msgid ""
2084 "Warning: commit message did not conform to UTF-8.\n"
2085 "You may want to amend it after fixing the message, or set the config\n"
@@ -1833,242 +2089,242 @@ msgstr ""
2089 "Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
2090 "i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
2091
1836 -#: commit-graph.c:130
2092 +#: commit-graph.c:122
2093 msgid "commit-graph file is too small"
2094 msgstr "incheckningsgraffilen %s är för liten"
2095
1840 -#: commit-graph.c:195
2096 +#: commit-graph.c:189
2097 #, c-format
2098 msgid "commit-graph signature %X does not match signature %X"
2099 msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
2100
1845 -#: commit-graph.c:202
2101 +#: commit-graph.c:196
2102 #, c-format
2103 msgid "commit-graph version %X does not match version %X"
2104 msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
2105
1850 -#: commit-graph.c:209
2106 +#: commit-graph.c:203
2107 #, c-format
2108 msgid "commit-graph hash version %X does not match version %X"
2109 msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
2110
1855 -#: commit-graph.c:232
2111 +#: commit-graph.c:226
2112 msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
2113 msgstr ""
2114 "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
2115 "ofullständig"
2116
1861 -#: commit-graph.c:243
2117 +#: commit-graph.c:237
2118 #, c-format
2119 msgid "commit-graph improper chunk offset %08x%08x"
2120 msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
2121
1866 -#: commit-graph.c:286
2122 +#: commit-graph.c:280
2123 #, c-format
2124 msgid "commit-graph chunk id %08x appears multiple times"
2125 msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
2126
1871 -#: commit-graph.c:350
2127 +#: commit-graph.c:343
2128 msgid "commit-graph has no base graphs chunk"
2129 msgstr "incheckningsgrafen har inga bas-graf-stycken"
2130
1875 -#: commit-graph.c:360
2131 +#: commit-graph.c:353
2132 msgid "commit-graph chain does not match"
2133 msgstr "incheckningsgrafens kedja stämmer inte"
2134
1879 -#: commit-graph.c:407
2135 +#: commit-graph.c:401
2136 #, c-format
2137 msgid "invalid commit-graph chain: line '%s' not a hash"
2138 msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
2139
1884 -#: commit-graph.c:433
2140 +#: commit-graph.c:425
2141 msgid "unable to find all commit-graph files"
2142 msgstr "kan inte hitta alla incheckingsgraffiler"
2143
1888 -#: commit-graph.c:564 commit-graph.c:624
2144 +#: commit-graph.c:558 commit-graph.c:618
2145 msgid "invalid commit position. commit-graph is likely corrupt"
2146 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
2147
1892 -#: commit-graph.c:585
2148 +#: commit-graph.c:579
2149 #, c-format
2150 msgid "could not find commit %s"
2151 msgstr "kunde inte hitta incheckningen %s"
2152
1897 -#: commit-graph.c:858 builtin/am.c:1287
2153 +#: commit-graph.c:852 builtin/am.c:1287
2154 #, c-format
2155 msgid "unable to parse commit %s"
2156 msgstr "kunde inte tolka incheckningen %s"
2157
1902 -#: commit-graph.c:1017 builtin/pack-objects.c:2641
2158 +#: commit-graph.c:1011 builtin/pack-objects.c:2782
2159 #, c-format
2160 msgid "unable to get type of object %s"
2161 msgstr "kunde inte hämta typ för objektet %s"
2162
1907 -#: commit-graph.c:1049
2163 +#: commit-graph.c:1043
2164 msgid "Loading known commits in commit graph"
2165 msgstr "Läser in kända incheckningar i incheckningsgraf"
2166
1911 -#: commit-graph.c:1066
2167 +#: commit-graph.c:1060
2168 msgid "Expanding reachable commits in commit graph"
2169 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
2170
1915 -#: commit-graph.c:1085
2171 +#: commit-graph.c:1079
2172 msgid "Clearing commit marks in commit graph"
2173 msgstr "Rensar incheckningsmärken i incheckningsgraf"
2174
1919 -#: commit-graph.c:1104
2175 +#: commit-graph.c:1098
2176 msgid "Computing commit graph generation numbers"
2177 msgstr "Beräknar generationsvärden för incheckningsgraf"
2178
1923 -#: commit-graph.c:1179
2179 +#: commit-graph.c:1173
2180 #, c-format
2181 msgid "Finding commits for commit graph in %d pack"
2182 msgid_plural "Finding commits for commit graph in %d packs"
2183 msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
2184 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
2185
1930 -#: commit-graph.c:1192
2186 +#: commit-graph.c:1186
2187 #, c-format
2188 msgid "error adding pack %s"
2189 msgstr "fel vid tillägg av paketet %s"
2190
1935 -#: commit-graph.c:1196
2191 +#: commit-graph.c:1190
2192 #, c-format
2193 msgid "error opening index for %s"
2194 msgstr "fel vid öppning av indexet för %s"
2195
1940 -#: commit-graph.c:1220
2196 +#: commit-graph.c:1214
2197 #, c-format
2198 msgid "Finding commits for commit graph from %d ref"
2199 msgid_plural "Finding commits for commit graph from %d refs"
2200 msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
2201 msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
2202
1947 -#: commit-graph.c:1240
2203 +#: commit-graph.c:1234
2204 #, c-format
2205 msgid "invalid commit object id: %s"
2206 msgstr "ogiltigt inchecknings-objekt-id %s"
2207
1952 -#: commit-graph.c:1255
2208 +#: commit-graph.c:1249
2209 msgid "Finding commits for commit graph among packed objects"
2210 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
2211
1956 -#: commit-graph.c:1270
2212 +#: commit-graph.c:1264
2213 msgid "Counting distinct commits in commit graph"
2214 msgstr "Räknar olika incheckningar i incheckningsgraf"
2215
1960 -#: commit-graph.c:1300
2216 +#: commit-graph.c:1294
2217 msgid "Finding extra edges in commit graph"
2218 msgstr "Söker ytterligare kanter i incheckingsgraf"
2219
1964 -#: commit-graph.c:1346
2220 +#: commit-graph.c:1340
2221 msgid "failed to write correct number of base graph ids"
2222 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
2223
1968 -#: commit-graph.c:1379 midx.c:814
2224 +#: commit-graph.c:1373 midx.c:814
2225 #, c-format
2226 msgid "unable to create leading directories of %s"
2227 msgstr "kunde inte skapa inledande kataloger för %s"
2228
1973 -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
2229 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
2230 #, c-format
2231 msgid "unable to create '%s'"
2232 msgstr "kunde inte skapa \"%s\""
2233
1978 -#: commit-graph.c:1451
2234 +#: commit-graph.c:1445
2235 #, c-format
2236 msgid "Writing out commit graph in %d pass"
2237 msgid_plural "Writing out commit graph in %d passes"
2238 msgstr[0] "Skriver ut incheckningsgraf i %d pass"
2239 msgstr[1] "Skriver ut incheckningsgraf i %d pass"
2240
1985 -#: commit-graph.c:1492
2241 +#: commit-graph.c:1486
2242 msgid "unable to open commit-graph chain file"
2243 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
2244
1989 -#: commit-graph.c:1504
2245 +#: commit-graph.c:1498
2246 msgid "failed to rename base commit-graph file"
2247 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
2248
1993 -#: commit-graph.c:1524
2249 +#: commit-graph.c:1518
2250 msgid "failed to rename temporary commit-graph file"
2251 msgstr "kunde inte byta namn på temporär incheckningsgraffil"
2252
1997 -#: commit-graph.c:1635
2253 +#: commit-graph.c:1631
2254 msgid "Scanning merged commits"
2255 msgstr "Söker sammanslagna incheckningar"
2256
2001 -#: commit-graph.c:1646
2257 +#: commit-graph.c:1642
2258 #, c-format
2259 msgid "unexpected duplicate commit id %s"
2260 msgstr "oväntat duplicerat inchecknings-id %s"
2261
2006 -#: commit-graph.c:1670
2262 +#: commit-graph.c:1665
2263 msgid "Merging commit-graph"
2264 msgstr "Slår ihop incheckningsgraf"
2265
2010 -#: commit-graph.c:1860
2266 +#: commit-graph.c:1844
2267 #, c-format
2268 msgid "the commit graph format cannot write %d commits"
2269 msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
2270
2015 -#: commit-graph.c:1871
2271 +#: commit-graph.c:1855
2272 msgid "too many commits to write graph"
2273 msgstr "för många incheckningar för att skriva graf"
2274
2019 -#: commit-graph.c:1961
2275 +#: commit-graph.c:1944
2276 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
2277 msgstr ""
2278 "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
2279
2024 -#: commit-graph.c:1971
2280 +#: commit-graph.c:1954
2281 #, c-format
2282 msgid "commit-graph has incorrect OID order: %s then %s"
2283 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
2284
2029 -#: commit-graph.c:1981 commit-graph.c:1996
2285 +#: commit-graph.c:1964 commit-graph.c:1979
2286 #, c-format
2287 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
2288 msgstr ""
2289 "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
2290
2035 -#: commit-graph.c:1988
2291 +#: commit-graph.c:1971
2292 #, c-format
2293 msgid "failed to parse commit %s from commit-graph"
2294 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
2295
2040 -#: commit-graph.c:2006
2296 +#: commit-graph.c:1989
2297 msgid "Verifying commits in commit graph"
2298 msgstr "Bekräftar incheckningar i incheckningsgrafen"
2299
2044 -#: commit-graph.c:2020
2300 +#: commit-graph.c:2003
2301 #, c-format
2302 msgid "failed to parse commit %s from object database for commit-graph"
2303 msgstr ""
2304 "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
2305
2050 -#: commit-graph.c:2027
2306 +#: commit-graph.c:2010
2307 #, c-format
2308 msgid "root tree OID for commit %s in commit-graph is %s != %s"
2309 msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
2310
2055 -#: commit-graph.c:2037
2311 +#: commit-graph.c:2020
2312 #, c-format
2313 msgid "commit-graph parent list for commit %s is too long"
2314 msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
2315
2060 -#: commit-graph.c:2046
2316 +#: commit-graph.c:2029
2317 #, c-format
2318 msgid "commit-graph parent for %s is %s != %s"
2319 msgstr "incheckningsgrafens förälder för %s är %s != %s"
2320
2065 -#: commit-graph.c:2059
2321 +#: commit-graph.c:2042
2322 #, c-format
2323 msgid "commit-graph parent list for commit %s terminates early"
2324 msgstr ""
2325 "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
2326
2071 -#: commit-graph.c:2064
2327 +#: commit-graph.c:2047
2328 #, c-format
2329 msgid ""
2330 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -2076,7 +2332,7 @@ msgstr ""
2332 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
2333 "noll på annan plats"
2334
2079 -#: commit-graph.c:2068
2335 +#: commit-graph.c:2051
2336 #, c-format
2337 msgid ""
2338 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -2084,12 +2340,12 @@ msgstr ""
2340 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
2341 "%s, men noll på annan plats"
2342
2087 -#: commit-graph.c:2083
2343 +#: commit-graph.c:2066
2344 #, c-format
2345 msgid "commit-graph generation for commit %s is %u != %u"
2346 msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
2347
2092 -#: commit-graph.c:2089
2348 +#: commit-graph.c:2072
2349 #, c-format
2350 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
2351 msgstr ""
@@ -2138,7 +2394,7 @@ msgstr "nyckeln innehåller inte ett stycke: %s"
2394 msgid "key does not contain variable name: %s"
2395 msgstr "nyckeln innehåller inte variabelnamn: %s"
2396
2141 -#: config.c:406 sequencer.c:2530
2397 +#: config.c:406 sequencer.c:2444
2398 #, c-format
2399 msgid "invalid key: %s"
2400 msgstr "felaktig nyckel: %s"
@@ -2281,7 +2537,7 @@ msgstr "felformat värde för %s: %s"
2537 msgid "must be one of nothing, matching, simple, upstream or current"
2538 msgstr "måste vara en av nothing, matching, simple, upstream eller current"
2539
2284 -#: config.c:1518 builtin/pack-objects.c:3394
2540 +#: config.c:1518 builtin/pack-objects.c:3541
2541 #, c-format
2542 msgid "bad pack compression level %d"
2543 msgstr "felaktig paketkomprimeringsgrad %d"
@@ -2306,105 +2562,105 @@ msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
2562 msgid "failed to parse %s"
2563 msgstr "kunde inte tolka %s"
2564
2309 -#: config.c:1745
2565 +#: config.c:1743
2566 msgid "unable to parse command-line config"
2567 msgstr "kan inte tolka kommandoradskonfiguration"
2568
2313 -#: config.c:2096
2569 +#: config.c:2097
2570 msgid "unknown error occurred while reading the configuration files"
2571 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
2572
2317 -#: config.c:2266
2573 +#: config.c:2267
2574 #, c-format
2575 msgid "Invalid %s: '%s'"
2576 msgstr "Felaktigt %s: \"%s\""
2577
2322 -#: config.c:2311
2578 +#: config.c:2312
2579 #, c-format
2580 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
2581 msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
2582
2327 -#: config.c:2357
2583 +#: config.c:2358
2584 #, c-format
2585 msgid "unable to parse '%s' from command-line config"
2586 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
2587
2332 -#: config.c:2359
2588 +#: config.c:2360
2589 #, c-format
2590 msgid "bad config variable '%s' in file '%s' at line %d"
2591 msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
2592
2337 -#: config.c:2440
2593 +#: config.c:2441
2594 #, c-format
2595 msgid "invalid section name '%s'"
2596 msgstr "felaktigt sektionsnamn \"%s\""
2597
2342 -#: config.c:2472
2598 +#: config.c:2473
2599 #, c-format
2600 msgid "%s has multiple values"
2601 msgstr "%s har flera värden"
2602
2347 -#: config.c:2501
2603 +#: config.c:2502
2604 #, c-format
2605 msgid "failed to write new configuration file %s"
2606 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
2607
2352 -#: config.c:2753 config.c:3077
2608 +#: config.c:2754 config.c:3078
2609 #, c-format
2610 msgid "could not lock config file %s"
2611 msgstr "kunde inte låsa konfigurationsfilen %s"
2612
2357 -#: config.c:2764
2613 +#: config.c:2765
2614 #, c-format
2615 msgid "opening %s"
2616 msgstr "öppnar %s"
2617
2362 -#: config.c:2799 builtin/config.c:328
2618 +#: config.c:2800 builtin/config.c:344
2619 #, c-format
2620 msgid "invalid pattern: %s"
2621 msgstr "ogiltigt mönster: %s"
2622
2367 -#: config.c:2824
2623 +#: config.c:2825
2624 #, c-format
2625 msgid "invalid config file %s"
2626 msgstr "ogiltig konfigurationsfil: \"%s\""
2627
2372 -#: config.c:2837 config.c:3090
2628 +#: config.c:2838 config.c:3091
2629 #, c-format
2630 msgid "fstat on %s failed"
2631 msgstr "fstat misslyckades på %s"
2632
2377 -#: config.c:2848
2633 +#: config.c:2849
2634 #, c-format
2635 msgid "unable to mmap '%s'"
2636 msgstr "kunde inte utföra mmap på \"%s\""
2637
2382 -#: config.c:2857 config.c:3095
2638 +#: config.c:2858 config.c:3096
2639 #, c-format
2640 msgid "chmod on %s failed"
2641 msgstr "chmod misslyckades på %s"
2642
2387 -#: config.c:2942 config.c:3192
2643 +#: config.c:2943 config.c:3193
2644 #, c-format
2645 msgid "could not write config file %s"
2646 msgstr "kunde inte skriva konfigurationsfilen %s"
2647
2392 -#: config.c:2976
2648 +#: config.c:2977
2649 #, c-format
2650 msgid "could not set '%s' to '%s'"
2651 msgstr "kunde inte ställa in \"%s\" till \"%s\""
2652
2397 -#: config.c:2978 builtin/remote.c:781
2653 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
2654 #, c-format
2655 msgid "could not unset '%s'"
2656 msgstr "kunde inte ta bort inställning för \"%s\""
2657
2402 -#: config.c:3068
2658 +#: config.c:3069
2659 #, c-format
2660 msgid "invalid section name: %s"
2661 msgstr "felaktigt namn på stycke: %s"
2662
2407 -#: config.c:3235
2663 +#: config.c:3236
2664 #, c-format
2665 msgid "missing value for '%s'"
2666 msgstr "värde saknas för \"%s\""
@@ -2570,19 +2826,19 @@ msgstr "kunde inte grena (fork)"
2826
2827 # Vague original, not networking-related, but rather related to the actual
2828 # objects in the database.
2573 -#: connected.c:89 builtin/fsck.c:208 builtin/prune.c:43
2829 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
2830 msgid "Checking connectivity"
2831 msgstr "Kontrollerar konnektivitet"
2832
2577 -#: connected.c:101
2833 +#: connected.c:110
2834 msgid "Could not run 'git rev-list'"
2835 msgstr "Kunde inte köra \"git rev-list\""
2836
2581 -#: connected.c:121
2837 +#: connected.c:130
2838 msgid "failed write to rev-list"
2839 msgstr "kunde inte skriva till rev-list"
2840
2585 -#: connected.c:128
2841 +#: connected.c:137
2842 msgid "failed to close rev-list's stdin"
2843 msgstr "kunde inte stänga rev-list:s standard in"
2844
@@ -3417,61 +3673,61 @@ msgid ""
3673 msgstr ""
3674 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
3675
3420 -#: dir.c:554
3676 +#: dir.c:555
3677 #, c-format
3678 msgid "pathspec '%s' did not match any file(s) known to git"
3679 msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
3680
3425 -#: dir.c:664
3681 +#: dir.c:695 dir.c:724 dir.c:737
3682 #, c-format
3683 msgid "unrecognized pattern: '%s'"
3684 msgstr "okänt mönster: %s"
3685
3430 -#: dir.c:682 dir.c:696
3686 +#: dir.c:754 dir.c:768
3687 #, c-format
3688 msgid "unrecognized negative pattern: '%s'"
3689 msgstr "okänt negativt mönster: %s"
3690
3435 -#: dir.c:714
3691 +#: dir.c:786
3692 #, c-format
3693 msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
3694 msgstr ""
3695 "din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
3696 "gånger"
3697
3442 -#: dir.c:724
3698 +#: dir.c:796
3699 msgid "disabling cone pattern matching"
3700 msgstr "inaktiverar konmönstermatchning"
3701
3446 -#: dir.c:1101
3702 +#: dir.c:1173
3703 #, c-format
3704 msgid "cannot use %s as an exclude file"
3705 msgstr "kan inte använda %s som exkluderingsfil"
3706
3451 -#: dir.c:2078
3707 +#: dir.c:2144
3708 #, c-format
3709 msgid "could not open directory '%s'"
3710 msgstr "kunde inte öppna katalogen \"%s\""
3711
3456 -#: dir.c:2415
3712 +#: dir.c:2479
3713 msgid "failed to get kernel name and information"
3714 msgstr "misslyckades hämta kärnans namn och information"
3715
3460 -#: dir.c:2539
3716 +#: dir.c:2603
3717 msgid "untracked cache is disabled on this system or location"
3718 msgstr "ospårad cache är inaktiverad på systemet eller platsen"
3719
3464 -#: dir.c:3343
3720 +#: dir.c:3407
3721 #, c-format
3722 msgid "index file corrupt in repo %s"
3723 msgstr "indexfilen trasig i arkivet %s"
3724
3469 -#: dir.c:3388 dir.c:3393
3725 +#: dir.c:3452 dir.c:3457
3726 #, c-format
3727 msgid "could not create directories for %s"
3728 msgstr "kunde inte skapa kataloger för %s"
3729
3474 -#: dir.c:3422
3730 +#: dir.c:3486
3731 #, c-format
3732 msgid "could not migrate git directory from '%s' to '%s'"
3733 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
@@ -3717,7 +3973,7 @@ msgstr "fel vid hantering av önskade referenser: %d"
3973 msgid "no matching remote head"
3974 msgstr "inget motsvarande fjärrhuvud"
3975
3720 -#: fetch-pack.c:1785 builtin/clone.c:688
3976 +#: fetch-pack.c:1785 builtin/clone.c:689
3977 msgid "remote did not send all necessary objects"
3978 msgstr "fjärren sände inte alla nödvändiga objekt"
3979
@@ -3731,19 +3987,19 @@ msgstr "ingen sådan fjärreferens: %s"
3987 msgid "Server does not allow request for unadvertised object %s"
3988 msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
3989
3734 -#: gpg-interface.c:223
3990 +#: gpg-interface.c:408
3991 +msgid "gpg failed to sign the data"
3992 +msgstr "gpg misslyckades signera data"
3993 +
3994 +#: gpg-interface.c:434
3995 msgid "could not create temporary file"
3996 msgstr "kunde inte skapa temporära fil"
3997
3738 -#: gpg-interface.c:226
3998 +#: gpg-interface.c:437
3999 #, c-format
4000 msgid "failed writing detached signature to '%s'"
4001 msgstr "misslyckades skriva fristående signatur till \"%s\""
4002
3743 -#: gpg-interface.c:390
3744 -msgid "gpg failed to sign the data"
3745 -msgstr "gpg misslyckades signera data"
3746 -
4003 #: graph.c:98
4004 #, c-format
4005 msgid "ignore invalid color '%.*s' in log.graphColors"
@@ -3757,18 +4013,18 @@ msgstr ""
4013 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
4014 "P under PCRE v2"
4015
3760 -#: grep.c:2124
4016 +#: grep.c:2128
4017 #, c-format
4018 msgid "'%s': unable to read %s"
4019 msgstr "\"%s\" kunde inte läsa %s"
4020
3765 -#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
4021 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
4022 #: builtin/rm.c:135
4023 #, c-format
4024 msgid "failed to stat '%s'"
4025 msgstr "misslyckades ta status på \"%s\""
4026
3771 -#: grep.c:2152
4027 +#: grep.c:2156
4028 #, c-format
4029 msgid "'%s': short read"
4030 msgstr "\"%s\": kort läsning"
@@ -3984,7 +4240,7 @@ msgstr "tomt ident-namn (för <%s>) ej tillåtet"
4240 msgid "name consists only of disallowed characters: %s"
4241 msgstr "namnet består enbart av ej tillåtna tecken: %s"
4242
3987 -#: ident.c:436 builtin/commit.c:631
4243 +#: ident.c:436 builtin/commit.c:635
4244 #, c-format
4245 msgid "invalid date format: %s"
4246 msgstr "felaktigt datumformat: %s"
@@ -4070,116 +4326,116 @@ msgid "failed to read the cache"
4326 msgstr "misslyckades läsa cachen"
4327
4328 #: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
4073 -#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
4329 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
4330 #: builtin/stash.c:264
4331 msgid "unable to write new index file"
4332 msgstr "kunde inte skriva ny indexfil"
4333
4078 -#: merge-recursive.c:367
4334 +#: merge-recursive.c:356
4335 msgid "(bad commit)\n"
4336 msgstr "(felaktig incheckning)\n"
4337
4082 -#: merge-recursive.c:390
4338 +#: merge-recursive.c:379
4339 #, c-format
4340 msgid "add_cacheinfo failed for path '%s'; merge aborting."
4341 msgstr ""
4342 "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
4343
4088 -#: merge-recursive.c:399
4344 +#: merge-recursive.c:388
4345 #, c-format
4346 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
4347 msgstr ""
4348 "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
4349 "sammanslagningen."
4350
4095 -#: merge-recursive.c:885
4351 +#: merge-recursive.c:874
4352 #, c-format
4353 msgid "failed to create path '%s'%s"
4354 msgstr "misslyckades skapa sökvägen \"%s\"%s"
4355
4100 -#: merge-recursive.c:896
4356 +#: merge-recursive.c:885
4357 #, c-format
4358 msgid "Removing %s to make room for subdirectory\n"
4359 msgstr "Tar bort %s för att göra plats för underkatalog\n"
4360
4105 -#: merge-recursive.c:910 merge-recursive.c:929
4361 +#: merge-recursive.c:899 merge-recursive.c:918
4362 msgid ": perhaps a D/F conflict?"
4363 msgstr ": kanske en K/F-konflikt?"
4364
4109 -#: merge-recursive.c:919
4365 +#: merge-recursive.c:908
4366 #, c-format
4367 msgid "refusing to lose untracked file at '%s'"
4368 msgstr "vägrar förlora ospårad fil vid \"%s\""
4369
4114 -#: merge-recursive.c:960 builtin/cat-file.c:41
4370 +#: merge-recursive.c:949 builtin/cat-file.c:41
4371 #, c-format
4372 msgid "cannot read object %s '%s'"
4373 msgstr "kan inte läsa objektet %s: \"%s\""
4374
4119 -#: merge-recursive.c:965
4375 +#: merge-recursive.c:954
4376 #, c-format
4377 msgid "blob expected for %s '%s'"
4378 msgstr "blob förväntades för %s \"%s\""
4379
4124 -#: merge-recursive.c:990
4380 +#: merge-recursive.c:979
4381 #, c-format
4382 msgid "failed to open '%s': %s"
4383 msgstr "misslyckades öppna \"%s\": %s"
4384
4129 -#: merge-recursive.c:1001
4385 +#: merge-recursive.c:990
4386 #, c-format
4387 msgid "failed to symlink '%s': %s"
4388 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
4389
4134 -#: merge-recursive.c:1006
4390 +#: merge-recursive.c:995
4391 #, c-format
4392 msgid "do not know what to do with %06o %s '%s'"
4393 msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
4394
4139 -#: merge-recursive.c:1199
4395 +#: merge-recursive.c:1191
4396 #, c-format
4397 msgid "Failed to merge submodule %s (not checked out)"
4398 msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
4399
4144 -#: merge-recursive.c:1206
4400 +#: merge-recursive.c:1198
4401 #, c-format
4402 msgid "Failed to merge submodule %s (commits not present)"
4403 msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
4404
4149 -#: merge-recursive.c:1213
4405 +#: merge-recursive.c:1205
4406 #, c-format
4407 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
4408 msgstr ""
4409 "Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
4410 "sammanslagningsbasen)"
4411
4156 -#: merge-recursive.c:1221 merge-recursive.c:1233
4412 +#: merge-recursive.c:1213 merge-recursive.c:1225
4413 #, c-format
4414 msgid "Fast-forwarding submodule %s to the following commit:"
4415 msgstr "Snabbspolar undermodulen %s till följande incheckning:"
4416
4161 -#: merge-recursive.c:1224 merge-recursive.c:1236
4417 +#: merge-recursive.c:1216 merge-recursive.c:1228
4418 #, c-format
4419 msgid "Fast-forwarding submodule %s"
4420 msgstr "Snabbspolar undermodulen %s"
4421
4166 -#: merge-recursive.c:1259
4422 +#: merge-recursive.c:1251
4423 #, c-format
4424 msgid "Failed to merge submodule %s (merge following commits not found)"
4425 msgstr ""
4426 "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
4427 "hittades inte)"
4428
4173 -#: merge-recursive.c:1263
4429 +#: merge-recursive.c:1255
4430 #, c-format
4431 msgid "Failed to merge submodule %s (not fast-forward)"
4432 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
4433
4178 -#: merge-recursive.c:1264
4434 +#: merge-recursive.c:1256
4435 msgid "Found a possible merge resolution for the submodule:\n"
4436 msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
4437
4182 -#: merge-recursive.c:1267
4438 +#: merge-recursive.c:1259
4439 #, c-format
4440 msgid ""
4441 "If this is correct simply add it to the index for example\n"
@@ -4196,32 +4452,32 @@ msgstr ""
4452 "\n"
4453 "vilket godtar lösningen.\n"
4454
4199 -#: merge-recursive.c:1276
4455 +#: merge-recursive.c:1268
4456 #, c-format
4457 msgid "Failed to merge submodule %s (multiple merges found)"
4458 msgstr ""
4459 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
4460
4205 -#: merge-recursive.c:1349
4461 +#: merge-recursive.c:1341
4462 msgid "Failed to execute internal merge"
4463 msgstr "Misslyckades exekvera intern sammanslagning"
4464
4209 -#: merge-recursive.c:1354
4465 +#: merge-recursive.c:1346
4466 #, c-format
4467 msgid "Unable to add %s to database"
4468 msgstr "Kunde inte lägga till %s till databasen"
4469
4214 -#: merge-recursive.c:1386
4470 +#: merge-recursive.c:1378
4471 #, c-format
4472 msgid "Auto-merging %s"
4473 msgstr "Slår ihop %s automatiskt"
4474
4219 -#: merge-recursive.c:1410
4475 +#: merge-recursive.c:1402
4476 #, c-format
4477 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
4478 msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
4479
4224 -#: merge-recursive.c:1482
4480 +#: merge-recursive.c:1474
4481 #, c-format
4482 msgid ""
4483 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4230,7 +4486,7 @@ msgstr ""
4486 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
4487 "i trädet."
4488
4233 -#: merge-recursive.c:1487
4489 +#: merge-recursive.c:1479
4490 #, c-format
4491 msgid ""
4492 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4239,7 +4495,7 @@ msgstr ""
4495 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
4496 "%s lämnad i trädet."
4497
4242 -#: merge-recursive.c:1494
4498 +#: merge-recursive.c:1486
4499 #, c-format
4500 msgid ""
4501 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4248,7 +4504,7 @@ msgstr ""
4504 "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
4505 "i trädet vid %s."
4506
4251 -#: merge-recursive.c:1499
4507 +#: merge-recursive.c:1491
4508 #, c-format
4509 msgid ""
4510 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4257,35 +4513,35 @@ msgstr ""
4513 "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
4514 "%s lämnad i trädet vid %s."
4515
4260 -#: merge-recursive.c:1534
4516 +#: merge-recursive.c:1526
4517 msgid "rename"
4518 msgstr "namnbyte"
4519
4264 -#: merge-recursive.c:1534
4520 +#: merge-recursive.c:1526
4521 msgid "renamed"
4522 msgstr "namnbytt"
4523
4268 -#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
4524 +#: merge-recursive.c:1606 merge-recursive.c:2530 merge-recursive.c:3175
4525 #, c-format
4526 msgid "Refusing to lose dirty file at %s"
4527 msgstr "Vägrar förlora lortig fil vid \"%s\""
4528
4273 -#: merge-recursive.c:1624
4529 +#: merge-recursive.c:1616
4530 #, c-format
4531 msgid "Refusing to lose untracked file at %s, even though it's in the way."
4532 msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
4533
4278 -#: merge-recursive.c:1682
4534 +#: merge-recursive.c:1674
4535 #, c-format
4536 msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
4537 msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
4538
4283 -#: merge-recursive.c:1713
4539 +#: merge-recursive.c:1705
4540 #, c-format
4541 msgid "%s is a directory in %s adding as %s instead"
4542 msgstr "%s är en katalog i %s lägger till som %s istället"
4543
4288 -#: merge-recursive.c:1718
4544 +#: merge-recursive.c:1710
4545 #, c-format
4546 msgid "Refusing to lose untracked file at %s; adding as %s instead"
4547 msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
@@ -4387,7 +4643,7 @@ msgstr "tillägg/tillägg"
4643 msgid "Skipped %s (merged same as existing)"
4644 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
4645
4390 -#: merge-recursive.c:3147 git-submodule.sh:993
4646 +#: merge-recursive.c:3147 git-submodule.sh:1003
4647 msgid "submodule"
4648 msgstr "undermodul"
4649
@@ -4505,7 +4761,7 @@ msgstr ""
4761 msgid "Could not parse object '%s'"
4762 msgstr "Kunde inte tolka objektet \"%s\""
4763
4508 -#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
4764 +#: merge-recursive.c:3832 builtin/merge.c:697 builtin/merge.c:877
4765 msgid "Unable to write index."
4766 msgstr "Kunde inte skriva indexet."
4767
@@ -4738,25 +4994,30 @@ msgstr "objektet %s har okänd typ-id %d"
4994 msgid "unable to parse object: %s"
4995 msgstr "kunde inte tolka objektet: %s"
4996
4741 -#: object.c:266 object.c:277
4997 +#: object.c:266 object.c:278
4998 #, c-format
4999 msgid "hash mismatch %s"
5000 msgstr "hashvärde stämmer inte överens %s"
5001
4746 -#: packfile.c:641
5002 +#: packfile.c:629
5003 msgid "offset before end of packfile (broken .idx?)"
5004 msgstr "offset före slutet av packfilen (trasig .idx?)"
5005
4750 -#: packfile.c:1888
5006 +#: packfile.c:1899
5007 #, c-format
5008 msgid "offset before start of pack index for %s (corrupt index?)"
5009 msgstr "offset före slutet av packindex för %s (trasigt index?)"
5010
4755 -#: packfile.c:1892
5011 +#: packfile.c:1903
5012 #, c-format
5013 msgid "offset beyond end of pack index for %s (truncated index?)"
5014 msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
5015
5016 +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
5017 +#, c-format
5018 +msgid "unable to get size of %s"
5019 +msgstr "kan inte hämta storlek på %s"
5020 +
5021 #: parse-options.c:38
5022 #, c-format
5023 msgid "%s requires a value"
@@ -4787,36 +5048,36 @@ msgstr "%s är inte tillgängligt"
5048 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
5049 msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
5050
4790 -#: parse-options.c:389
5051 +#: parse-options.c:388
5052 #, c-format
5053 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
5054 msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
5055
4795 -#: parse-options.c:423 parse-options.c:431
5056 +#: parse-options.c:422 parse-options.c:430
5057 #, c-format
4797 -msgid "did you mean `--%s` (with two dashes ?)"
4798 -msgstr "menade du \"--%s\" (med två bindestreck?)"
5058 +msgid "did you mean `--%s` (with two dashes)?"
5059 +msgstr "menade du \"--%s\" (med två bindestreck)?"
5060
4800 -#: parse-options.c:860
5061 +#: parse-options.c:859
5062 #, c-format
5063 msgid "unknown option `%s'"
5064 msgstr "okänd flagga \"%s\""
5065
4805 -#: parse-options.c:862
5066 +#: parse-options.c:861
5067 #, c-format
5068 msgid "unknown switch `%c'"
5069 msgstr "okänd flagga \"%c\""
5070
4810 -#: parse-options.c:864
5071 +#: parse-options.c:863
5072 #, c-format
5073 msgid "unknown non-ascii option in string: `%s'"
5074 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
5075
4815 -#: parse-options.c:888
5076 +#: parse-options.c:887
5077 msgid "..."
5078 msgstr "..."
5079
4819 -#: parse-options.c:907
5080 +#: parse-options.c:906
5081 #, c-format
5082 msgid "usage: %s"
5083 msgstr "användning: %s"
@@ -4824,21 +5085,21 @@ msgstr "användning: %s"
5085 #. TRANSLATORS: the colon here should align with the
5086 #. one in "usage: %s" translation.
5087 #.
4827 -#: parse-options.c:913
5088 +#: parse-options.c:912
5089 #, c-format
5090 msgid " or: %s"
5091 msgstr " eller: %s"
5092
4832 -#: parse-options.c:916
5093 +#: parse-options.c:915
5094 #, c-format
5095 msgid " %s"
5096 msgstr " %s"
5097
4837 -#: parse-options.c:955
5098 +#: parse-options.c:954
5099 msgid "-NUM"
5100 msgstr "-TAL"
5101
4841 -#: parse-options.c:969
5102 +#: parse-options.c:968
5103 #, c-format
5104 msgid "alias of --%s"
5105 msgstr "alias för --%s"
@@ -4925,25 +5186,25 @@ msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
5186
5187 #: pathspec.c:442
5188 #, c-format
4928 -msgid "%s: '%s' is outside repository"
4929 -msgstr "%s: \"%s\" är utanför arkivet"
5189 +msgid "%s: '%s' is outside repository at '%s'"
5190 +msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
5191
4931 -#: pathspec.c:516
5192 +#: pathspec.c:517
5193 #, c-format
5194 msgid "'%s' (mnemonic: '%c')"
5195 msgstr "\"%s\" (minnesstöd: \"%c\")"
5196
4936 -#: pathspec.c:526
5197 +#: pathspec.c:527
5198 #, c-format
5199 msgid "%s: pathspec magic not supported by this command: %s"
5200 msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
5201
4941 -#: pathspec.c:593
5202 +#: pathspec.c:594
5203 #, c-format
5204 msgid "pathspec '%s' is beyond a symbolic link"
5205 msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
5206
4946 -#: pathspec.c:638
5207 +#: pathspec.c:639
5208 #, c-format
5209 msgid "line is badly quoted: %s"
5210 msgstr "linjen er felaktigt citerad: %s"
@@ -5029,7 +5290,7 @@ msgstr "kunde inte starta \"log\""
5290 msgid "could not read `log` output"
5291 msgstr "kunde inte läsa utdata från \"log\""
5292
5032 -#: range-diff.c:96 sequencer.c:5163
5293 +#: range-diff.c:96 sequencer.c:5020
5294 #, c-format
5295 msgid "could not parse commit '%s'"
5296 msgstr "kunde inte tolka incheckningen \"%s\""
@@ -5083,16 +5344,16 @@ msgstr "kan inte lägga till \"%s\" till indexet"
5344 msgid "unable to stat '%s'"
5345 msgstr "kan inte ta status på \"%s\""
5346
5086 -#: read-cache.c:1325
5347 +#: read-cache.c:1330
5348 #, c-format
5349 msgid "'%s' appears as both a file and as a directory"
5350 msgstr "\"%s\" finns både som en fil och en katalog"
5351
5091 -#: read-cache.c:1531
5352 +#: read-cache.c:1536
5353 msgid "Refresh index"
5354 msgstr "Uppdatera indexet"
5355
5095 -#: read-cache.c:1646
5356 +#: read-cache.c:1651
5357 #, c-format
5358 msgid ""
5359 "index.version set, but the value is invalid.\n"
@@ -5101,7 +5362,7 @@ msgstr ""
5362 "index.version satt, men värdet är ogiltigt.\n"
5363 "Använder version %i"
5364
5104 -#: read-cache.c:1656
5365 +#: read-cache.c:1661
5366 #, c-format
5367 msgid ""
5368 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5110,150 +5371,161 @@ msgstr ""
5371 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
5372 "Använder version %i"
5373
5113 -#: read-cache.c:1712
5374 +#: read-cache.c:1717
5375 #, c-format
5376 msgid "bad signature 0x%08x"
5377 msgstr "felaktig signatur 0x%08x"
5378
5118 -#: read-cache.c:1715
5379 +#: read-cache.c:1720
5380 #, c-format
5381 msgid "bad index version %d"
5382 msgstr "felaktig indexversion %d"
5383
5123 -#: read-cache.c:1724
5384 +#: read-cache.c:1729
5385 msgid "bad index file sha1 signature"
5386 msgstr "felaktig sha1-signatur för indexfil"
5387
5127 -#: read-cache.c:1754
5388 +#: read-cache.c:1759
5389 #, c-format
5390 msgid "index uses %.4s extension, which we do not understand"
5391 msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
5392
5132 -#: read-cache.c:1756
5393 +#: read-cache.c:1761
5394 #, c-format
5395 msgid "ignoring %.4s extension"
5396 msgstr "ignorerar filtillägget %.4s"
5397
5137 -#: read-cache.c:1793
5398 +#: read-cache.c:1798
5399 #, c-format
5400 msgid "unknown index entry format 0x%08x"
5401 msgstr "okänt format 0x%08x på indexpost"
5402
5142 -#: read-cache.c:1809
5403 +#: read-cache.c:1814
5404 #, c-format
5405 msgid "malformed name field in the index, near path '%s'"
5406 msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
5407
5147 -#: read-cache.c:1866
5408 +#: read-cache.c:1871
5409 msgid "unordered stage entries in index"
5410 msgstr "osorterade köposter i index"
5411
5151 -#: read-cache.c:1869
5412 +#: read-cache.c:1874
5413 #, c-format
5414 msgid "multiple stage entries for merged file '%s'"
5415 msgstr "flera köposter för den sammanslagna filen \"%s\""
5416
5156 -#: read-cache.c:1872
5417 +#: read-cache.c:1877
5418 #, c-format
5419 msgid "unordered stage entries for '%s'"
5420 msgstr "osorterade köposter för \"%s\""
5421
5161 -#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
5162 -#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
5163 -#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
5164 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
5165 -#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
5422 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
5423 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
5424 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
5425 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
5426 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:271
5427 +#: builtin/submodule--helper.c:332
5428 msgid "index file corrupt"
5429 msgstr "indexfilen trasig"
5430
5169 -#: read-cache.c:2119
5431 +#: read-cache.c:2124
5432 #, c-format
5433 msgid "unable to create load_cache_entries thread: %s"
5434 msgstr "kunde inte läsa in cache_entries-tråden: %s"
5435
5174 -#: read-cache.c:2132
5436 +#: read-cache.c:2137
5437 #, c-format
5438 msgid "unable to join load_cache_entries thread: %s"
5439 msgstr "kunde inte utföra join på cache_entries-tråden: %s"
5440
5179 -#: read-cache.c:2165
5441 +#: read-cache.c:2170
5442 #, c-format
5443 msgid "%s: index file open failed"
5444 msgstr "%s: öppning av indexfilen misslyckades"
5445
5184 -#: read-cache.c:2169
5446 +#: read-cache.c:2174
5447 #, c-format
5448 msgid "%s: cannot stat the open index"
5449 msgstr "%s: kan inte ta startus på det öppna indexet"
5450
5189 -#: read-cache.c:2173
5451 +#: read-cache.c:2178
5452 #, c-format
5453 msgid "%s: index file smaller than expected"
5454 msgstr "%s: indexfilen mindre än förväntat"
5455
5194 -#: read-cache.c:2177
5456 +#: read-cache.c:2182
5457 #, c-format
5458 msgid "%s: unable to map index file"
5459 msgstr "%s: kan inte koppla indexfilen"
5460
5199 -#: read-cache.c:2219
5461 +#: read-cache.c:2224
5462 #, c-format
5463 msgid "unable to create load_index_extensions thread: %s"
5464 msgstr "kunde inte skapa load_index_extensions-tråden: %s"
5465
5204 -#: read-cache.c:2246
5466 +#: read-cache.c:2251
5467 #, c-format
5468 msgid "unable to join load_index_extensions thread: %s"
5469 msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
5470
5209 -#: read-cache.c:2278
5471 +#: read-cache.c:2283
5472 #, c-format
5473 msgid "could not freshen shared index '%s'"
5474 msgstr "kunde inte uppdatera delat index \"%s\""
5475
5214 -#: read-cache.c:2325
5476 +#: read-cache.c:2330
5477 #, c-format
5478 msgid "broken index, expect %s in %s, got %s"
5479 msgstr "trasigt index, förväntade %s i %s, fick %s"
5480
5219 -#: read-cache.c:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
5481 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
5482 #, c-format
5483 msgid "could not close '%s'"
5484 msgstr "kunde inte stänga \"%s\""
5485
5224 -#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
5486 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
5487 #, c-format
5488 msgid "could not stat '%s'"
5489 msgstr "kunde inte ta status på \"%s\""
5490
5229 -#: read-cache.c:3137
5491 +#: read-cache.c:3142
5492 #, c-format
5493 msgid "unable to open git dir: %s"
5494 msgstr "kunde inte öppna git-katalog: %s"
5495
5234 -#: read-cache.c:3149
5496 +#: read-cache.c:3154
5497 #, c-format
5498 msgid "unable to unlink: %s"
5499 msgstr "misslyckades ta bort länken: %s"
5500
5239 -#: read-cache.c:3174
5501 +#: read-cache.c:3179
5502 #, c-format
5503 msgid "cannot fix permission bits on '%s'"
5504 msgstr "kan inte rätta behörighetsbitar på \"%s\""
5505
5244 -#: read-cache.c:3323
5506 +#: read-cache.c:3328
5507 #, c-format
5508 msgid "%s: cannot drop to stage #0"
5509 msgstr "%s: kan inte återgå till kö 0"
5510
5249 -#: rebase-interactive.c:26
5511 +#: rebase-interactive.c:11
5512 +msgid ""
5513 +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
5514 +"continue'.\n"
5515 +"Or you can abort the rebase with 'git rebase --abort'.\n"
5516 +msgstr ""
5517 +"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
5518 +"continue\".\n"
5519 +"Avbryt ombaseringen med \"git rebase --abort\".\n"
5520 +
5521 +#: rebase-interactive.c:33
5522 #, c-format
5523 msgid ""
5524 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
5525 msgstr ""
5526 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
5527
5256 -#: rebase-interactive.c:35
5528 +#: rebase-interactive.c:42
5529 msgid ""
5530 "\n"
5531 "Commands:\n"
@@ -5297,14 +5569,14 @@ msgstr ""
5569 "\n"
5570 "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
5571
5300 -#: rebase-interactive.c:56
5572 +#: rebase-interactive.c:63
5573 #, c-format
5574 msgid "Rebase %s onto %s (%d command)"
5575 msgid_plural "Rebase %s onto %s (%d commands)"
5576 msgstr[0] "Ombasera %s på %s (%d kommando)"
5577 msgstr[1] "Ombasera %s på %s (%d kommandon)"
5578
5307 -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
5579 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
5580 msgid ""
5581 "\n"
5582 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5313,7 +5585,7 @@ msgstr ""
5585 "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
5586 "incheckning.\n"
5587
5316 -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
5588 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
5589 msgid ""
5590 "\n"
5591 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5321,7 +5593,7 @@ msgstr ""
5593 "\n"
5594 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
5595
5324 -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
5596 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
5597 msgid ""
5598 "\n"
5599 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5335,7 +5607,7 @@ msgstr ""
5607 " git rebase --continue\n"
5608 "\n"
5609
5338 -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
5610 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
5611 msgid ""
5612 "\n"
5613 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5345,22 +5617,19 @@ msgstr ""
5617 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
5618 "\n"
5619
5348 -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
5349 -msgid "Note that empty commits are commented out"
5350 -msgstr "Observera att tomma incheckningar är utkommenterade"
5351 -
5352 -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3536
5353 -#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
5620 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
5621 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
5622 #, c-format
5623 msgid "could not write '%s'"
5624 msgstr "kunde inte skriva \"%s\""
5625
5358 -#: rebase-interactive.c:108
5626 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
5627 +#: builtin/rebase.c:234
5628 #, c-format
5360 -msgid "could not copy '%s' to '%s'."
5361 -msgstr "kunde inte kopiera \"%s\" till \"%s\"."
5629 +msgid "could not write '%s'."
5630 +msgstr "kunde inte skriva \"%s\"."
5631
5363 -#: rebase-interactive.c:173
5632 +#: rebase-interactive.c:193
5633 #, c-format
5634 msgid ""
5635 "Warning: some commits may have been dropped accidentally.\n"
@@ -5369,7 +5638,7 @@ msgstr ""
5638 "Varning: vissa incheckningar kan av misstag ha tappats.\n"
5639 "Tappade incheckningar (nyaste först):\n"
5640
5372 -#: rebase-interactive.c:180
5641 +#: rebase-interactive.c:200
5642 #, c-format
5643 msgid ""
5644 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5389,6 +5658,13 @@ msgstr ""
5658 "\" (fel).\n"
5659 "\n"
5660
5661 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
5662 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
5663 +#: builtin/rebase.c:246
5664 +#, c-format
5665 +msgid "could not read '%s'."
5666 +msgstr "kunde inte läsa \"%s\"."
5667 +
5668 #: refs.c:262
5669 #, c-format
5670 msgid "%s does not point to a valid object!"
@@ -5424,15 +5700,15 @@ msgstr "referensen \"%s\" finns redan"
5700 msgid "unexpected object ID when writing '%s'"
5701 msgstr "oväntat objekt-id vid skrivning \"%s\""
5702
5427 -#: refs.c:833 sequencer.c:405 sequencer.c:2793 sequencer.c:2997
5428 -#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
5703 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
5704 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
5705 #: wrapper.c:620
5706 #, c-format
5707 msgid "could not write to '%s'"
5708 msgstr "kunde inte skriva till \"%s\""
5709
5434 -#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5435 -#: builtin/rebase.c:1031
5710 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:714
5711 +#: builtin/rebase.c:1029
5712 #, c-format
5713 msgid "could not open '%s' for writing"
5714 msgstr "kunde inte öppna \"%s\" för skrivning"
@@ -5486,18 +5762,18 @@ msgstr "\"%s\" finns; kan inte skapa \"%s\""
5762 msgid "cannot process '%s' and '%s' at the same time"
5763 msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
5764
5489 -#: refs/files-backend.c:1234
5765 +#: refs/files-backend.c:1233
5766 #, c-format
5767 msgid "could not remove reference %s"
5768 msgstr "kunde inte ta bort referensen %s"
5769
5494 -#: refs/files-backend.c:1248 refs/packed-backend.c:1541
5770 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541
5771 #: refs/packed-backend.c:1551
5772 #, c-format
5773 msgid "could not delete reference %s: %s"
5774 msgstr "kunde inte ta bort referensen %s: %s"
5775
5500 -#: refs/files-backend.c:1251 refs/packed-backend.c:1554
5776 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554
5777 #, c-format
5778 msgid "could not delete references: %s"
5779 msgstr "kunde inte ta bort referenser: %s"
@@ -5762,45 +6038,45 @@ msgstr "flaggan \"%s\" måste peka på en incheckning"
6038 msgid "config remote shorthand cannot begin with '/': %s"
6039 msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
6040
5765 -#: remote.c:413
6041 +#: remote.c:414
6042 msgid "more than one receivepack given, using the first"
6043 msgstr "mer än en receivepack angavs, använder den första"
6044
5769 -#: remote.c:421
6045 +#: remote.c:422
6046 msgid "more than one uploadpack given, using the first"
6047 msgstr "mer än en uploadpack angavs, använder den första"
6048
5773 -#: remote.c:611
6049 +#: remote.c:612
6050 #, c-format
6051 msgid "Cannot fetch both %s and %s to %s"
6052 msgstr "Kan inte hämta både %s och %s till %s"
6053
5778 -#: remote.c:615
6054 +#: remote.c:616
6055 #, c-format
6056 msgid "%s usually tracks %s, not %s"
6057 msgstr "%s spårar vanligtvis %s, inte %s"
6058
5783 -#: remote.c:619
6059 +#: remote.c:620
6060 #, c-format
6061 msgid "%s tracks both %s and %s"
6062 msgstr "%s spårar både %s och %s"
6063
5788 -#: remote.c:687
6064 +#: remote.c:688
6065 #, c-format
6066 msgid "key '%s' of pattern had no '*'"
6067 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
6068
5793 -#: remote.c:697
6069 +#: remote.c:698
6070 #, c-format
6071 msgid "value '%s' of pattern has no '*'"
6072 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
6073
5798 -#: remote.c:1003
6074 +#: remote.c:1004
6075 #, c-format
6076 msgid "src refspec %s does not match any"
6077 msgstr "käll-referensspecifikationen %s motsvarar ingen"
6078
5803 -#: remote.c:1008
6079 +#: remote.c:1009
6080 #, c-format
6081 msgid "src refspec %s matches more than one"
6082 msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -5809,7 +6085,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"
6085 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
6086 #. the <src>.
6087 #.
5812 -#: remote.c:1023
6088 +#: remote.c:1024
6089 #, c-format
6090 msgid ""
6091 "The destination you provided is not a full refname (i.e.,\n"
@@ -5832,7 +6108,7 @@ msgstr ""
6108 "\n"
6109 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
6110
5835 -#: remote.c:1043
6111 +#: remote.c:1044
6112 #, c-format
6113 msgid ""
6114 "The <src> part of the refspec is a commit object.\n"
@@ -5843,7 +6119,7 @@ msgstr ""
6119 "Var det meningen att skapa en ny gren genom att sända\n"
6120 "till \"%s:refs/heads/%s\"?"
6121
5846 -#: remote.c:1048
6122 +#: remote.c:1049
6123 #, c-format
6124 msgid ""
6125 "The <src> part of the refspec is a tag object.\n"
@@ -5854,7 +6130,7 @@ msgstr ""
6130 "Var det meningen att skapa en ny tagg genom att sända\n"
6131 "till \"%s:refs/tags/%s\"?"
6132
5857 -#: remote.c:1053
6133 +#: remote.c:1054
6134 #, c-format
6135 msgid ""
6136 "The <src> part of the refspec is a tree object.\n"
@@ -5865,7 +6141,7 @@ msgstr ""
6141 "Var det meningen att tagga ett nytt träd genom att sända\n"
6142 "till \"%s:refs/tags/%s\"?"
6143
5868 -#: remote.c:1058
6144 +#: remote.c:1059
6145 #, c-format
6146 msgid ""
6147 "The <src> part of the refspec is a blob object.\n"
@@ -5876,114 +6152,114 @@ msgstr ""
6152 "Var det meningen att tagga en ny blob genom att sända\n"
6153 "till \"%s:refs/tags/%s\"?"
6154
5879 -#: remote.c:1094
6155 +#: remote.c:1095
6156 #, c-format
6157 msgid "%s cannot be resolved to branch"
6158 msgstr "%s kan inte slås upp till en gren"
6159
5884 -#: remote.c:1105
6160 +#: remote.c:1106
6161 #, c-format
6162 msgid "unable to delete '%s': remote ref does not exist"
6163 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
6164
5889 -#: remote.c:1117
6165 +#: remote.c:1118
6166 #, c-format
6167 msgid "dst refspec %s matches more than one"
6168 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
6169
5894 -#: remote.c:1124
6170 +#: remote.c:1125
6171 #, c-format
6172 msgid "dst ref %s receives from more than one src"
6173 msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
6174
5899 -#: remote.c:1627 remote.c:1728
6175 +#: remote.c:1628 remote.c:1729
6176 msgid "HEAD does not point to a branch"
6177 msgstr "HEAD pekar inte på en gren"
6178
5903 -#: remote.c:1636
6179 +#: remote.c:1637
6180 #, c-format
6181 msgid "no such branch: '%s'"
6182 msgstr "okänd gren: \"%s\""
6183
5908 -#: remote.c:1639
6184 +#: remote.c:1640
6185 #, c-format
6186 msgid "no upstream configured for branch '%s'"
6187 msgstr "ingen standarduppström angiven för grenen \"%s\""
6188
5913 -#: remote.c:1645
6189 +#: remote.c:1646
6190 #, c-format
6191 msgid "upstream branch '%s' not stored as a remote-tracking branch"
6192 msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
6193
5918 -#: remote.c:1660
6194 +#: remote.c:1661
6195 #, c-format
6196 msgid "push destination '%s' on remote '%s' has no local tracking branch"
6197 msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
6198
5923 -#: remote.c:1672
6199 +#: remote.c:1673
6200 #, c-format
6201 msgid "branch '%s' has no remote for pushing"
6202 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
6203
5928 -#: remote.c:1682
6204 +#: remote.c:1683
6205 #, c-format
6206 msgid "push refspecs for '%s' do not include '%s'"
6207 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
6208
5933 -#: remote.c:1695
6209 +#: remote.c:1696
6210 msgid "push has no destination (push.default is 'nothing')"
6211 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
6212
5937 -#: remote.c:1717
6213 +#: remote.c:1718
6214 msgid "cannot resolve 'simple' push to a single destination"
6215 msgstr "\"enkel push\" motsvarar flera olika mål"
6216
5941 -#: remote.c:1843
6217 +#: remote.c:1844
6218 #, c-format
6219 msgid "couldn't find remote ref %s"
6220 msgstr "Kunde inte hitta fjärr-referensen %s"
6221
5946 -#: remote.c:1856
6222 +#: remote.c:1857
6223 #, c-format
6224 msgid "* Ignoring funny ref '%s' locally"
6225 msgstr "* Ignorerar märklig referens \"%s\" lokalt"
6226
5951 -#: remote.c:2019
6227 +#: remote.c:2020
6228 #, c-format
6229 msgid "Your branch is based on '%s', but the upstream is gone.\n"
6230 msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
6231
5956 -#: remote.c:2023
6232 +#: remote.c:2024
6233 msgid " (use \"git branch --unset-upstream\" to fixup)\n"
6234 msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
6235
5960 -#: remote.c:2026
6236 +#: remote.c:2027
6237 #, c-format
6238 msgid "Your branch is up to date with '%s'.\n"
6239 msgstr "Din gren är à jour med \"%s\".\n"
6240
5965 -#: remote.c:2030
6241 +#: remote.c:2031
6242 #, c-format
6243 msgid "Your branch and '%s' refer to different commits.\n"
6244 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
6245
5970 -#: remote.c:2033
6246 +#: remote.c:2034
6247 #, c-format
6248 msgid " (use \"%s\" for details)\n"
6249 msgstr " (använd \"%s\" för detaljer)\n"
6250
5975 -#: remote.c:2037
6251 +#: remote.c:2038
6252 #, c-format
6253 msgid "Your branch is ahead of '%s' by %d commit.\n"
6254 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
6255 msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
6256 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
6257
5982 -#: remote.c:2043
6258 +#: remote.c:2044
6259 msgid " (use \"git push\" to publish your local commits)\n"
6260 msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
6261
5986 -#: remote.c:2046
6262 +#: remote.c:2047
6263 #, c-format
6264 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
6265 msgid_plural ""
@@ -5993,11 +6269,11 @@ msgstr[0] ""
6269 msgstr[1] ""
6270 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
6271
5996 -#: remote.c:2054
6272 +#: remote.c:2055
6273 msgid " (use \"git pull\" to update your local branch)\n"
6274 msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
6275
6000 -#: remote.c:2057
6276 +#: remote.c:2058
6277 #, c-format
6278 msgid ""
6279 "Your branch and '%s' have diverged,\n"
@@ -6012,11 +6288,11 @@ msgstr[1] ""
6288 "Din gren och \"%s\" har divergerat,\n"
6289 "och har %d respektive %d olika incheckningar.\n"
6290
6015 -#: remote.c:2067
6291 +#: remote.c:2068
6292 msgid " (use \"git pull\" to merge the remote branch into yours)\n"
6293 msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
6294
6019 -#: remote.c:2250
6295 +#: remote.c:2251
6296 #, c-format
6297 msgid "cannot parse expected object name '%s'"
6298 msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -6031,7 +6307,7 @@ msgstr "felaktig ersättningsreferensnamn: %s"
6307 msgid "duplicate replace ref: %s"
6308 msgstr "duplicerat ersättningsreferensnamn: %s"
6309
6034 -#: replace-object.c:73
6310 +#: replace-object.c:82
6311 #, c-format
6312 msgid "replace depth too high for object %s"
6313 msgstr "ersättningsdjupet för högt för objektet %s"
@@ -6094,8 +6370,8 @@ msgstr "kan inte ta bort lös länk \"%s\""
6370 msgid "Recorded preimage for '%s'"
6371 msgstr "Sparade förhandsbild för \"%s\""
6372
6097 -#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
6098 -#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
6373 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
6374 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
6375 #, c-format
6376 msgid "could not create directory '%s'"
6377 msgstr "kunde inte skapa katalogen \"%s\""
@@ -6146,16 +6422,16 @@ msgstr "--first-parent är inkompatibelt med --bisect"
6422 msgid "-L does not yet support diff formats besides -p and -s"
6423 msgstr "-L stöder ännu inte andra diff-format än -p och -s"
6424
6149 -#: run-command.c:762
6425 +#: run-command.c:763
6426 msgid "open /dev/null failed"
6427 msgstr "misslyckades öppna /dev/null"
6428
6153 -#: run-command.c:1268
6429 +#: run-command.c:1269
6430 #, c-format
6431 msgid "cannot create async thread: %s"
6432 msgstr "kan inte skapa asynkron tråd: %s"
6433
6158 -#: run-command.c:1332
6434 +#: run-command.c:1333
6435 #, c-format
6436 msgid ""
6437 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -6202,39 +6478,39 @@ msgstr "mottagarsidan stöder inte push med --atomic"
6478 msgid "the receiving end does not support push options"
6479 msgstr "mottagarsidan stöder inte push-flaggor"
6480
6205 -#: sequencer.c:189
6481 +#: sequencer.c:191
6482 #, c-format
6483 msgid "invalid commit message cleanup mode '%s'"
6484 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
6485
6210 -#: sequencer.c:294
6486 +#: sequencer.c:296
6487 #, c-format
6488 msgid "could not delete '%s'"
6489 msgstr "kunde inte ta bort \"%s\""
6490
6215 -#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
6491 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:369
6492 #, c-format
6493 msgid "could not remove '%s'"
6494 msgstr "kunde inte ta bort \"%s\""
6495
6220 -#: sequencer.c:323
6496 +#: sequencer.c:325
6497 msgid "revert"
6498 msgstr "revert"
6499
6224 -#: sequencer.c:325
6500 +#: sequencer.c:327
6501 msgid "cherry-pick"
6502 msgstr "cherry-pick"
6503
6228 -#: sequencer.c:327
6229 -msgid "rebase -i"
6230 -msgstr "rebase -i"
6231 -
6504 #: sequencer.c:329
6505 +msgid "rebase"
6506 +msgstr "rebase"
6507 +
6508 +#: sequencer.c:331
6509 #, c-format
6510 msgid "unknown action: %d"
6511 msgstr "okänd funktion: %d"
6512
6237 -#: sequencer.c:387
6513 +#: sequencer.c:389
6514 msgid ""
6515 "after resolving the conflicts, mark the corrected paths\n"
6516 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6242,7 +6518,7 @@ msgstr ""
6518 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
6519 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
6520
6245 -#: sequencer.c:390
6521 +#: sequencer.c:392
6522 msgid ""
6523 "after resolving the conflicts, mark the corrected paths\n"
6524 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6252,114 +6528,110 @@ msgstr ""
6528 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
6529 "och checka in resultatet med \"git commit\""
6530
6255 -#: sequencer.c:403 sequencer.c:2993
6531 +#: sequencer.c:405 sequencer.c:2901
6532 #, c-format
6533 msgid "could not lock '%s'"
6534 msgstr "kunde inte låsa \"%s\""
6535
6260 -#: sequencer.c:410
6536 +#: sequencer.c:412
6537 #, c-format
6538 msgid "could not write eol to '%s'"
6539 msgstr "kunde inte skriva radslut till \"%s\""
6540
6265 -#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
6266 -#: sequencer.c:3277
6541 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
6542 +#: sequencer.c:3185
6543 #, c-format
6544 msgid "failed to finalize '%s'"
6545 msgstr "misslyckades färdigställa \"%s\""
6546
6271 -#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
6272 -#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
6273 -#: builtin/rebase.c:589
6547 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
6548 +#: sequencer.c:3276 builtin/am.c:244 builtin/commit.c:787 builtin/merge.c:1120
6549 +#: builtin/rebase.c:593
6550 #, c-format
6551 msgid "could not read '%s'"
6552 msgstr "kunde inte läsa \"%s\""
6553
6278 -#: sequencer.c:464
6554 +#: sequencer.c:466
6555 #, c-format
6556 msgid "your local changes would be overwritten by %s."
6557 msgstr "dina lokala ändringar skulle skrivas över av %s."
6558
6283 -#: sequencer.c:468
6559 +#: sequencer.c:470
6560 msgid "commit your changes or stash them to proceed."
6561 msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
6562
6287 -#: sequencer.c:500
6563 +#: sequencer.c:502
6564 #, c-format
6565 msgid "%s: fast-forward"
6566 msgstr "%s: snabbspola"
6567
6292 -#: sequencer.c:539 builtin/tag.c:565
6568 +#: sequencer.c:541 builtin/tag.c:565
6569 #, c-format
6570 msgid "Invalid cleanup mode %s"
6571 msgstr "Felaktigt städningsläge %s"
6572
6573 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
6298 -#. "rebase -i".
6574 +#. "rebase".
6575 #.
6300 -#: sequencer.c:633
6576 +#: sequencer.c:635
6577 #, c-format
6578 msgid "%s: Unable to write new index file"
6579 msgstr "%s: Kunde inte skriva ny indexfil"
6580
6305 -#: sequencer.c:650
6581 +#: sequencer.c:652
6582 msgid "unable to update cache tree"
6583 msgstr "kan inte uppdatera cacheträd"
6584
6309 -#: sequencer.c:664
6585 +#: sequencer.c:666
6586 msgid "could not resolve HEAD commit"
6587 msgstr "kunde inte bestämma HEAD:s incheckning"
6588
6313 -#: sequencer.c:744
6589 +#: sequencer.c:746
6590 #, c-format
6591 msgid "no key present in '%.*s'"
6592 msgstr "ingen nyckel i \"%.*s\""
6593
6318 -#: sequencer.c:755
6594 +#: sequencer.c:757
6595 #, c-format
6596 msgid "unable to dequote value of '%s'"
6597 msgstr "kan inte ta bort citering av värdet \"%s\""
6598
6323 -#: sequencer.c:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6324 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
6599 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:705
6600 +#: builtin/am.c:797 builtin/merge.c:1117 builtin/rebase.c:1072
6601 #, c-format
6602 msgid "could not open '%s' for reading"
6603 msgstr "kunde inte öppna \"%s\" för läsning"
6604
6329 -#: sequencer.c:802
6605 +#: sequencer.c:804
6606 msgid "'GIT_AUTHOR_NAME' already given"
6607 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
6608
6333 -#: sequencer.c:807
6609 +#: sequencer.c:809
6610 msgid "'GIT_AUTHOR_EMAIL' already given"
6611 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
6612
6337 -#: sequencer.c:812
6613 +#: sequencer.c:814
6614 msgid "'GIT_AUTHOR_DATE' already given"
6615 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
6616
6341 -#: sequencer.c:816
6617 +#: sequencer.c:818
6618 #, c-format
6619 msgid "unknown variable '%s'"
6620 msgstr "okänd variabel \"%s\""
6621
6346 -#: sequencer.c:821
6622 +#: sequencer.c:823
6623 msgid "missing 'GIT_AUTHOR_NAME'"
6624 msgstr "\"GIT_AUTHOR_NAME\" saknas"
6625
6350 -#: sequencer.c:823
6626 +#: sequencer.c:825
6627 msgid "missing 'GIT_AUTHOR_EMAIL'"
6628 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
6629
6354 -#: sequencer.c:825
6630 +#: sequencer.c:827
6631 msgid "missing 'GIT_AUTHOR_DATE'"
6632 msgstr "\"GIT_AUTHOR_DATE\" saknas"
6633
6358 -#: sequencer.c:902 sequencer.c:1427
6359 -msgid "malformed ident line"
6360 -msgstr "felaktig ident-rad"
6361 -
6362 -#: sequencer.c:925
6634 +#: sequencer.c:876
6635 #, c-format
6636 msgid ""
6637 "you have staged changes in your working tree\n"
@@ -6388,11 +6660,11 @@ msgstr ""
6660 "\n"
6661 " git rebase --continue\n"
6662
6391 -#: sequencer.c:1218
6663 +#: sequencer.c:1148
6664 msgid "'prepare-commit-msg' hook failed"
6665 msgstr "kroken \"prepare-commit-msg\" misslyckades"
6666
6395 -#: sequencer.c:1224
6667 +#: sequencer.c:1154
6668 msgid ""
6669 "Your name and email address were configured automatically based\n"
6670 "on your username and hostname. Please check that they are accurate.\n"
@@ -6419,7 +6691,7 @@ msgstr ""
6691 "\n"
6692 " git commit --amend --reset-author\n"
6693
6422 -#: sequencer.c:1237
6694 +#: sequencer.c:1167
6695 msgid ""
6696 "Your name and email address were configured automatically based\n"
6697 "on your username and hostname. Please check that they are accurate.\n"
@@ -6444,331 +6716,326 @@ msgstr ""
6716 "\n"
6717 " git commit --amend --reset-author\n"
6718
6447 -#: sequencer.c:1279
6719 +#: sequencer.c:1209
6720 msgid "couldn't look up newly created commit"
6721 msgstr "kunde inte slå upp en precis skapad incheckning"
6722
6451 -#: sequencer.c:1281
6723 +#: sequencer.c:1211
6724 msgid "could not parse newly created commit"
6725 msgstr "kunde inte tolka en precis skapad incheckning"
6726
6455 -#: sequencer.c:1327
6727 +#: sequencer.c:1257
6728 msgid "unable to resolve HEAD after creating commit"
6729 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
6730
6459 -#: sequencer.c:1329
6731 +#: sequencer.c:1259
6732 msgid "detached HEAD"
6733 msgstr "frånkopplad HEAD"
6734
6463 -#: sequencer.c:1333
6735 +#: sequencer.c:1263
6736 msgid " (root-commit)"
6737 msgstr " (rotincheckning)"
6738
6467 -#: sequencer.c:1354
6739 +#: sequencer.c:1284
6740 msgid "could not parse HEAD"
6741 msgstr "kunde inte tolka HEAD"
6742
6471 -#: sequencer.c:1356
6743 +#: sequencer.c:1286
6744 #, c-format
6745 msgid "HEAD %s is not a commit!"
6746 msgstr "HEAD %s är inte en incheckning!"
6747
6476 -#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
6748 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
6749 msgid "could not parse HEAD commit"
6750 msgstr "kunde inte tolka HEAD:s incheckning"
6751
6480 -#: sequencer.c:1411 sequencer.c:2055
6752 +#: sequencer.c:1342 sequencer.c:1968
6753 msgid "unable to parse commit author"
6754 msgstr "kunde inte tolka incheckningens författare"
6755
6484 -#: sequencer.c:1431
6485 -msgid "corrupted author without date information"
6486 -msgstr "trasig författare utan datuminformation"
6487 -
6488 -#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
6756 +#: sequencer.c:1353 builtin/am.c:1561 builtin/merge.c:687
6757 msgid "git write-tree failed to write a tree"
6758 msgstr "git write-tree misslyckades skriva ett träd"
6759
6492 -#: sequencer.c:1480 sequencer.c:1550
6760 +#: sequencer.c:1386 sequencer.c:1447
6761 #, c-format
6762 msgid "unable to read commit message from '%s'"
6763 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
6764
6497 -#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
6498 -#: builtin/merge.c:908
6765 +#: sequencer.c:1413 builtin/am.c:1583 builtin/commit.c:1673 builtin/merge.c:886
6766 +#: builtin/merge.c:911
6767 msgid "failed to write commit object"
6768 msgstr "kunde inte skriva incheckningsobjekt"
6769
6502 -#: sequencer.c:1577
6770 +#: sequencer.c:1474
6771 #, c-format
6772 msgid "could not parse commit %s"
6773 msgstr "kunde inte tolka incheckningen %s"
6774
6507 -#: sequencer.c:1582
6775 +#: sequencer.c:1479
6776 #, c-format
6777 msgid "could not parse parent commit %s"
6778 msgstr "kunde inte tolka föräldraincheckningen %s"
6779
6512 -#: sequencer.c:1656 sequencer.c:1767
6780 +#: sequencer.c:1562 sequencer.c:1673
6781 #, c-format
6782 msgid "unknown command: %d"
6783 msgstr "okänt kommando: %d"
6784
6517 -#: sequencer.c:1714 sequencer.c:1739
6785 +#: sequencer.c:1620 sequencer.c:1645
6786 #, c-format
6787 msgid "This is a combination of %d commits."
6788 msgstr "Det här är en kombination av %d incheckningar."
6789
6522 -#: sequencer.c:1724
6790 +#: sequencer.c:1630
6791 msgid "need a HEAD to fixup"
6792 msgstr "behöver en HEAD-incheckning att rätta"
6793
6526 -#: sequencer.c:1726 sequencer.c:3304
6794 +#: sequencer.c:1632 sequencer.c:3212
6795 msgid "could not read HEAD"
6796 msgstr "kunde inte läsa HEAD"
6797
6530 -#: sequencer.c:1728
6798 +#: sequencer.c:1634
6799 msgid "could not read HEAD's commit message"
6800 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
6801
6534 -#: sequencer.c:1734
6802 +#: sequencer.c:1640
6803 #, c-format
6804 msgid "cannot write '%s'"
6805 msgstr "kan inte skriva \"%s\""
6806
6539 -#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
6807 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
6808 msgid "This is the 1st commit message:"
6809 msgstr "Det här är 1:a incheckningsmeddelandet:"
6810
6543 -#: sequencer.c:1749
6811 +#: sequencer.c:1655
6812 #, c-format
6813 msgid "could not read commit message of %s"
6814 msgstr "kunde inte läsa incheckningsmeddelande för %s"
6815
6548 -#: sequencer.c:1756
6816 +#: sequencer.c:1662
6817 #, c-format
6818 msgid "This is the commit message #%d:"
6819 msgstr "Det här är incheckningsmeddelande %d:"
6820
6553 -#: sequencer.c:1762
6821 +#: sequencer.c:1668
6822 #, c-format
6823 msgid "The commit message #%d will be skipped:"
6824 msgstr "Incheckningsmeddelande %d kommer hoppas över:"
6825
6558 -#: sequencer.c:1850
6826 +#: sequencer.c:1756
6827 msgid "your index file is unmerged."
6828 msgstr "din indexfil har inte slagits ihop."
6829
6562 -#: sequencer.c:1857
6830 +#: sequencer.c:1763
6831 msgid "cannot fixup root commit"
6832 msgstr "kan inte göra \"fixup\" på rotincheckning"
6833
6566 -#: sequencer.c:1876
6834 +#: sequencer.c:1782
6835 #, c-format
6836 msgid "commit %s is a merge but no -m option was given."
6837 msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
6838
6571 -#: sequencer.c:1884 sequencer.c:1892
6839 +#: sequencer.c:1790 sequencer.c:1798
6840 #, c-format
6841 msgid "commit %s does not have parent %d"
6842 msgstr "incheckning %s har inte förälder %d"
6843
6576 -#: sequencer.c:1898
6844 +#: sequencer.c:1804
6845 #, c-format
6846 msgid "cannot get commit message for %s"
6847 msgstr "kan inte hämta incheckningsmeddelande för %s"
6848
6849 #. TRANSLATORS: The first %s will be a "todo" command like
6850 #. "revert" or "pick", the second %s a SHA1.
6583 -#: sequencer.c:1917
6851 +#: sequencer.c:1823
6852 #, c-format
6853 msgid "%s: cannot parse parent commit %s"
6854 msgstr "%s: kan inte tolka föräldraincheckningen %s"
6855
6588 -#: sequencer.c:1982
6856 +#: sequencer.c:1888
6857 #, c-format
6858 msgid "could not rename '%s' to '%s'"
6859 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
6860
6593 -#: sequencer.c:2037
6861 +#: sequencer.c:1943
6862 #, c-format
6863 msgid "could not revert %s... %s"
6864 msgstr "kunde inte ångra %s... %s"
6865
6598 -#: sequencer.c:2038
6866 +#: sequencer.c:1944
6867 #, c-format
6868 msgid "could not apply %s... %s"
6869 msgstr "kunde inte tillämpa %s... %s"
6870
6603 -#: sequencer.c:2105
6871 +#: sequencer.c:1961
6872 +#, c-format
6873 +msgid "dropping %s %s -- patch contents already upstream\n"
6874 +msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
6875 +
6876 +#: sequencer.c:2018
6877 #, c-format
6878 msgid "git %s: failed to read the index"
6879 msgstr "git %s: misslyckades läsa indexet"
6880
6608 -#: sequencer.c:2112
6881 +#: sequencer.c:2025
6882 #, c-format
6883 msgid "git %s: failed to refresh the index"
6884 msgstr "git %s: misslyckades uppdatera indexet"
6885
6613 -#: sequencer.c:2189
6886 +#: sequencer.c:2102
6887 #, c-format
6888 msgid "%s does not accept arguments: '%s'"
6889 msgstr "%s tar inte argument: \"%s\""
6890
6618 -#: sequencer.c:2198
6891 +#: sequencer.c:2111
6892 #, c-format
6893 msgid "missing arguments for %s"
6894 msgstr "argument saknas för %s"
6895
6623 -#: sequencer.c:2235
6896 +#: sequencer.c:2142
6897 #, c-format
6625 -msgid "could not parse '%.*s'"
6626 -msgstr "kunde inte tolka \"%.*s\""
6898 +msgid "could not parse '%s'"
6899 +msgstr "kunde inte tolka \"%s\""
6900
6628 -#: sequencer.c:2289
6901 +#: sequencer.c:2203
6902 #, c-format
6903 msgid "invalid line %d: %.*s"
6904 msgstr "ogiltig rad %d: %.*s"
6905
6633 -#: sequencer.c:2300
6906 +#: sequencer.c:2214
6907 #, c-format
6908 msgid "cannot '%s' without a previous commit"
6909 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
6910
6638 -#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
6639 -#: builtin/rebase.c:223 builtin/rebase.c:248
6640 -#, c-format
6641 -msgid "could not read '%s'."
6642 -msgstr "kunde inte läsa \"%s\"."
6643 -
6644 -#: sequencer.c:2384
6911 +#: sequencer.c:2298
6912 msgid "cancelling a cherry picking in progress"
6913 msgstr "avbryter pågående \"cherry-pick\""
6914
6648 -#: sequencer.c:2391
6915 +#: sequencer.c:2305
6916 msgid "cancelling a revert in progress"
6917 msgstr "avbryter pågående \"revert\""
6918
6652 -#: sequencer.c:2435
6919 +#: sequencer.c:2349
6920 msgid "please fix this using 'git rebase --edit-todo'."
6921 msgstr "rätta det med \"git rebase --edit-todo\"."
6922
6656 -#: sequencer.c:2437
6923 +#: sequencer.c:2351
6924 #, c-format
6925 msgid "unusable instruction sheet: '%s'"
6926 msgstr "oanvändbart manus: \"%s\""
6927
6661 -#: sequencer.c:2442
6928 +#: sequencer.c:2356
6929 msgid "no commits parsed."
6930 msgstr "inga incheckningar lästes."
6931
6665 -#: sequencer.c:2453
6932 +#: sequencer.c:2367
6933 msgid "cannot cherry-pick during a revert."
6934 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
6935
6669 -#: sequencer.c:2455
6936 +#: sequencer.c:2369
6937 msgid "cannot revert during a cherry-pick."
6938 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
6939
6673 -#: sequencer.c:2533
6940 +#: sequencer.c:2447
6941 #, c-format
6942 msgid "invalid value for %s: %s"
6943 msgstr "felaktigt värde för %s: %s"
6944
6678 -#: sequencer.c:2630
6945 +#: sequencer.c:2540
6946 msgid "unusable squash-onto"
6947 msgstr "oanvändbar squash-onto"
6948
6682 -#: sequencer.c:2646
6949 +#: sequencer.c:2556
6950 #, c-format
6951 msgid "malformed options sheet: '%s'"
6952 msgstr "trasigt manus: \"%s\""
6953
6687 -#: sequencer.c:2736 sequencer.c:4463
6954 +#: sequencer.c:2644 sequencer.c:4361
6955 msgid "empty commit set passed"
6956 msgstr "den angivna uppsättningen incheckningar är tom"
6957
6691 -#: sequencer.c:2752
6958 +#: sequencer.c:2660
6959 msgid "revert is already in progress"
6960 msgstr "en \"revert\" pågår redan"
6961
6695 -#: sequencer.c:2754
6962 +#: sequencer.c:2662
6963 #, c-format
6964 msgid "try \"git revert (--continue | %s--abort | --quit)\""
6965 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
6966
6700 -#: sequencer.c:2757
6967 +#: sequencer.c:2665
6968 msgid "cherry-pick is already in progress"
6969 msgstr "en \"cherry-pick\" pågår redan"
6970
6704 -#: sequencer.c:2759
6971 +#: sequencer.c:2667
6972 #, c-format
6973 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
6974 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
6975
6709 -#: sequencer.c:2773
6976 +#: sequencer.c:2681
6977 #, c-format
6978 msgid "could not create sequencer directory '%s'"
6979 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
6980
6714 -#: sequencer.c:2788
6981 +#: sequencer.c:2696
6982 msgid "could not lock HEAD"
6983 msgstr "kunde inte låsa HEAD"
6984
6718 -#: sequencer.c:2848 sequencer.c:4209
6985 +#: sequencer.c:2756 sequencer.c:4099
6986 msgid "no cherry-pick or revert in progress"
6987 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
6988
6722 -#: sequencer.c:2850 sequencer.c:2861
6989 +#: sequencer.c:2758 sequencer.c:2769
6990 msgid "cannot resolve HEAD"
6991 msgstr "kan inte bestämma HEAD"
6992
6726 -#: sequencer.c:2852 sequencer.c:2896
6993 +#: sequencer.c:2760 sequencer.c:2804
6994 msgid "cannot abort from a branch yet to be born"
6995 msgstr "kan inte avbryta från en gren som ännu inte är född"
6996
6730 -#: sequencer.c:2882 builtin/grep.c:736
6997 +#: sequencer.c:2790 builtin/grep.c:724
6998 #, c-format
6999 msgid "cannot open '%s'"
7000 msgstr "kan inte öppna \"%s\""
7001
6735 -#: sequencer.c:2884
7002 +#: sequencer.c:2792
7003 #, c-format
7004 msgid "cannot read '%s': %s"
7005 msgstr "kan inte läsa \"%s\": %s"
7006
6740 -#: sequencer.c:2885
7007 +#: sequencer.c:2793
7008 msgid "unexpected end of file"
7009 msgstr "oväntat filslut"
7010
6744 -#: sequencer.c:2891
7011 +#: sequencer.c:2799
7012 #, c-format
7013 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
7014 msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
7015
6749 -#: sequencer.c:2902
7016 +#: sequencer.c:2810
7017 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
7018 msgstr ""
7019 "Du verkar ha flyttat HEAD.\n"
7020 "Spolar inte tillbaka, kontrollera HEAD!"
7021
6755 -#: sequencer.c:2943
7022 +#: sequencer.c:2851
7023 msgid "no revert in progress"
7024 msgstr "ingen \"revers\" pågår"
7025
6759 -#: sequencer.c:2951
7026 +#: sequencer.c:2859
7027 msgid "no cherry-pick in progress"
7028 msgstr "ingen \"cherry-pick\" pågår"
7029
6763 -#: sequencer.c:2961
7030 +#: sequencer.c:2869
7031 msgid "failed to skip the commit"
7032 msgstr "kunde inte hoppa över incheckningen"
7033
6767 -#: sequencer.c:2968
7034 +#: sequencer.c:2876
7035 msgid "there is nothing to skip"
7036 msgstr "ingenting att hoppa över"
7037
6771 -#: sequencer.c:2971
7038 +#: sequencer.c:2879
7039 #, c-format
7040 msgid ""
7041 "have you committed already?\n"
@@ -6777,21 +7044,21 @@ msgstr ""
7044 "har du redan checkat in?\n"
7045 "testa \"git %s --continue\""
7046
6780 -#: sequencer.c:3095 sequencer.c:4121
7047 +#: sequencer.c:3003 sequencer.c:4011
7048 #, c-format
7049 msgid "could not update %s"
7050 msgstr "kunde inte uppdatera %s"
7051
6785 -#: sequencer.c:3134 sequencer.c:4101
7052 +#: sequencer.c:3042 sequencer.c:3991
7053 msgid "cannot read HEAD"
7054 msgstr "kan inte läsa HEAD"
7055
6789 -#: sequencer.c:3151
7056 +#: sequencer.c:3059
7057 #, c-format
7058 msgid "unable to copy '%s' to '%s'"
7059 msgstr "kan inte kopiera in \"%s\" till \"%s\""
7060
6794 -#: sequencer.c:3159
7061 +#: sequencer.c:3067
7062 #, c-format
7063 msgid ""
7064 "You can amend the commit now, with\n"
@@ -6810,22 +7077,22 @@ msgstr ""
7077 "\n"
7078 "\tgit rebase --continue\n"
7079
6813 -#: sequencer.c:3169
7080 +#: sequencer.c:3077
7081 #, c-format
7082 msgid "Could not apply %s... %.*s"
7083 msgstr "Kunde inte tillämpa %s... %.*s"
7084
6818 -#: sequencer.c:3176
7085 +#: sequencer.c:3084
7086 #, c-format
7087 msgid "Could not merge %.*s"
7088 msgstr "Kunde inte slå ihop %.*s"
7089
6823 -#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
7090 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
7091 #, c-format
7092 msgid "could not copy '%s' to '%s'"
7093 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
7094
6828 -#: sequencer.c:3221
7095 +#: sequencer.c:3129
7096 #, c-format
7097 msgid ""
7098 "execution failed: %s\n"
@@ -6840,11 +7107,11 @@ msgstr ""
7107 "\tgit rebase --continue\n"
7108 "\n"
7109
6843 -#: sequencer.c:3227
7110 +#: sequencer.c:3135
7111 msgid "and made changes to the index and/or the working tree\n"
7112 msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
7113
6847 -#: sequencer.c:3233
7114 +#: sequencer.c:3141
7115 #, c-format
7116 msgid ""
7117 "execution succeeded: %s\n"
@@ -6861,72 +7128,72 @@ msgstr ""
7128 "\tgit rebase --continue\n"
7129 "\n"
7130
6864 -#: sequencer.c:3294
7131 +#: sequencer.c:3202
7132 #, c-format
7133 msgid "illegal label name: '%.*s'"
7134 msgstr "ogiltigt etikettnamn: \"%.*s\""
7135
6869 -#: sequencer.c:3348
7136 +#: sequencer.c:3256
7137 msgid "writing fake root commit"
7138 msgstr "skriver fejkad rotincheckning"
7139
6873 -#: sequencer.c:3353
7140 +#: sequencer.c:3261
7141 msgid "writing squash-onto"
7142 msgstr "skriver squash-onto"
7143
6877 -#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
7144 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
7145 #, c-format
7146 msgid "failed to find tree of %s"
7147 msgstr "kunde inte hitta trädet för %s."
7148
6882 -#: sequencer.c:3436
7149 +#: sequencer.c:3344
7150 #, c-format
7151 msgid "could not resolve '%s'"
7152 msgstr "kunde inte upplösa \"%s\""
7153
6887 -#: sequencer.c:3467
7154 +#: sequencer.c:3375
7155 msgid "cannot merge without a current revision"
7156 msgstr "kan inte slå ihop utan en aktuell incheckning"
7157
6891 -#: sequencer.c:3489
7158 +#: sequencer.c:3397
7159 #, c-format
7160 msgid "unable to parse '%.*s'"
7161 msgstr "kan inte tolka \"%.*s\""
7162
6896 -#: sequencer.c:3498
7163 +#: sequencer.c:3406
7164 #, c-format
7165 msgid "nothing to merge: '%.*s'"
7166 msgstr "inget att slå samman: \"%.*s\""
7167
6901 -#: sequencer.c:3510
7168 +#: sequencer.c:3418
7169 msgid "octopus merge cannot be executed on top of a [new root]"
7170 msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
7171
6905 -#: sequencer.c:3526
7172 +#: sequencer.c:3434
7173 #, c-format
7174 msgid "could not get commit message of '%s'"
7175 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
7176
6910 -#: sequencer.c:3688
7177 +#: sequencer.c:3594
7178 #, c-format
7179 msgid "could not even attempt to merge '%.*s'"
7180 msgstr "kunde inte ens försöka slå ihop \"%.*s\""
7181
6915 -#: sequencer.c:3704
7182 +#: sequencer.c:3610
7183 msgid "merge: Unable to write new index file"
7184 msgstr "sammanslagning: Kunde inte skriva ny indexfil"
7185
6919 -#: sequencer.c:3773 builtin/rebase.c:733
7186 +#: sequencer.c:3679 builtin/rebase.c:737
7187 #, c-format
7188 msgid "Applied autostash.\n"
7189 msgstr "Tillämpade autostash.\n"
7190
6924 -#: sequencer.c:3785
7191 +#: sequencer.c:3691
7192 #, c-format
7193 msgid "cannot store %s"
7194 msgstr "kan inte spara %s"
7195
6929 -#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
7196 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
7197 #, c-format
7198 msgid ""
7199 "Applying autostash resulted in conflicts.\n"
@@ -6937,31 +7204,26 @@ msgstr ""
7204 "Dina ändringar är säkra i stashen.\n"
7205 "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
7206
6940 -#: sequencer.c:3849
6941 -#, c-format
6942 -msgid "could not checkout %s"
6943 -msgstr "kunde inte checka ut %s"
6944 -
6945 -#: sequencer.c:3863
7207 +#: sequencer.c:3755
7208 #, c-format
7209 msgid "%s: not a valid OID"
7210 msgstr "%s: inte ett giltigt OID"
7211
6950 -#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
7212 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
7213 msgid "could not detach HEAD"
7214 msgstr "kunde inte koppla från HEAD"
7215
6954 -#: sequencer.c:3883
7216 +#: sequencer.c:3775
7217 #, c-format
7218 msgid "Stopped at HEAD\n"
7219 msgstr "Stoppade på HEAD\n"
7220
6959 -#: sequencer.c:3885
7221 +#: sequencer.c:3777
7222 #, c-format
7223 msgid "Stopped at %s\n"
7224 msgstr "Stoppade på %s\n"
7225
6964 -#: sequencer.c:3893
7226 +#: sequencer.c:3785
7227 #, c-format
7228 msgid ""
7229 "Could not execute the todo command\n"
@@ -6982,48 +7244,48 @@ msgstr ""
7244 " git rebase --edit-todo\n"
7245 " git rebase --continue\n"
7246
6985 -#: sequencer.c:3979
7247 +#: sequencer.c:3869
7248 #, c-format
7249 msgid "Stopped at %s... %.*s\n"
7250 msgstr "Stoppade på %s... %.*s\n"
7251
6990 -#: sequencer.c:4050
7252 +#: sequencer.c:3940
7253 #, c-format
7254 msgid "unknown command %d"
7255 msgstr "okänt kommando %d"
7256
6995 -#: sequencer.c:4109
7257 +#: sequencer.c:3999
7258 msgid "could not read orig-head"
7259 msgstr "kunde inte läsa orig-head"
7260
6999 -#: sequencer.c:4114
7261 +#: sequencer.c:4004
7262 msgid "could not read 'onto'"
7263 msgstr "kunde inte läsa \"onto\""
7264
7003 -#: sequencer.c:4128
7265 +#: sequencer.c:4018
7266 #, c-format
7267 msgid "could not update HEAD to %s"
7268 msgstr "kunde inte uppdatera HEAD till %s"
7269
7008 -#: sequencer.c:4221
7270 +#: sequencer.c:4111
7271 msgid "cannot rebase: You have unstaged changes."
7272 msgstr "kan inte ombasera: Du har oköade ändringar."
7273
7012 -#: sequencer.c:4230
7274 +#: sequencer.c:4120
7275 msgid "cannot amend non-existing commit"
7276 msgstr "kan inte lägga till incheckning som inte finns"
7277
7016 -#: sequencer.c:4232
7278 +#: sequencer.c:4122
7279 #, c-format
7280 msgid "invalid file: '%s'"
7281 msgstr "ogiltig fil: \"%s\""
7282
7021 -#: sequencer.c:4234
7283 +#: sequencer.c:4124
7284 #, c-format
7285 msgid "invalid contents: '%s'"
7286 msgstr "ogiltigt innehåll: \"%s\""
7287
7026 -#: sequencer.c:4237
7288 +#: sequencer.c:4127
7289 msgid ""
7290 "\n"
7291 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7033,69 +7295,59 @@ msgstr ""
7295 "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
7296 "först och kör sedan \"git rebase --continue\" igen."
7297
7036 -#: sequencer.c:4273 sequencer.c:4312
7298 +#: sequencer.c:4163 sequencer.c:4202
7299 #, c-format
7300 msgid "could not write file: '%s'"
7301 msgstr "kunde inte skriva fil: \"%s\""
7302
7041 -#: sequencer.c:4327
7303 +#: sequencer.c:4217
7304 msgid "could not remove CHERRY_PICK_HEAD"
7305 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
7306
7045 -#: sequencer.c:4334
7307 +#: sequencer.c:4224
7308 msgid "could not commit staged changes."
7309 msgstr "kunde inte checka in köade ändringar."
7310
7049 -#: sequencer.c:4440
7311 +#: sequencer.c:4338
7312 #, c-format
7313 msgid "%s: can't cherry-pick a %s"
7314 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
7315
7054 -#: sequencer.c:4444
7316 +#: sequencer.c:4342
7317 #, c-format
7318 msgid "%s: bad revision"
7319 msgstr "%s: felaktig revision"
7320
7059 -#: sequencer.c:4479
7321 +#: sequencer.c:4377
7322 msgid "can't revert as initial commit"
7323 msgstr "kan inte ångra som första incheckning"
7324
7063 -#: sequencer.c:4952
7325 +#: sequencer.c:4846
7326 msgid "make_script: unhandled options"
7327 msgstr "make_script: flaggor som inte stöds"
7328
7067 -#: sequencer.c:4955
7329 +#: sequencer.c:4849
7330 msgid "make_script: error preparing revisions"
7331 msgstr "make_script: fel när revisioner skulle förberedas"
7332
7071 -#: sequencer.c:5113
7072 -msgid ""
7073 -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
7074 -"continue'.\n"
7075 -"Or you can abort the rebase with 'git rebase --abort'.\n"
7076 -msgstr ""
7077 -"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
7078 -"continue\".\n"
7079 -"Avbryt ombaseringen med \"git rebase --abort\".\n"
7080 -
7081 -#: sequencer.c:5226 sequencer.c:5243
7333 +#: sequencer.c:5083 sequencer.c:5100
7334 msgid "nothing to do"
7335 msgstr "inget att göra"
7336
7085 -#: sequencer.c:5257
7337 +#: sequencer.c:5119
7338 msgid "could not skip unnecessary pick commands"
7339 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
7340
7089 -#: sequencer.c:5351
7341 +#: sequencer.c:5213
7342 msgid "the script was already rearranged."
7343 msgstr "skriptet har redan omordnats."
7344
7345 #: setup.c:124
7346 #, c-format
7095 -msgid "'%s' is outside repository"
7096 -msgstr "\"%s\" är utanför arkivet"
7347 +msgid "'%s' is outside repository at '%s'"
7348 +msgstr "\"%s\" är utanför arkivet på \"%s\""
7349
7098 -#: setup.c:174
7350 +#: setup.c:175
7351 #, c-format
7352 msgid ""
7353 "%s: no such path in the working tree.\n"
@@ -7105,7 +7357,7 @@ msgstr ""
7357 "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
7358 "lokalt."
7359
7108 -#: setup.c:187
7360 +#: setup.c:188
7361 #, c-format
7362 msgid ""
7363 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7117,12 +7369,12 @@ msgstr ""
7369 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
7370 "\"git <kommando> [<revision>...] -- [<fil>...]\""
7371
7120 -#: setup.c:236
7372 +#: setup.c:254
7373 #, c-format
7374 msgid "option '%s' must come before non-option arguments"
7375 msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
7376
7125 -#: setup.c:255
7377 +#: setup.c:273
7378 #, c-format
7379 msgid ""
7380 "ambiguous argument '%s': both revision and filename\n"
@@ -7133,92 +7385,92 @@ msgstr ""
7385 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
7386 "\"git <kommando> [<revision>...] -- [<fil>...]\""
7387
7136 -#: setup.c:391
7388 +#: setup.c:409
7389 msgid "unable to set up work tree using invalid config"
7390 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
7391
7140 -#: setup.c:395
7392 +#: setup.c:413
7393 msgid "this operation must be run in a work tree"
7394 msgstr "funktionen måste köras i en arbetskatalog"
7395
7144 -#: setup.c:541
7396 +#: setup.c:559
7397 #, c-format
7398 msgid "Expected git repo version <= %d, found %d"
7399 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
7400
7149 -#: setup.c:549
7401 +#: setup.c:567
7402 msgid "unknown repository extensions found:"
7403 msgstr "okända arkivutökningar hittades:"
7404
7153 -#: setup.c:568
7405 +#: setup.c:586
7406 #, c-format
7407 msgid "error opening '%s'"
7408 msgstr "fel vid öppning av \"%s\""
7409
7158 -#: setup.c:570
7410 +#: setup.c:588
7411 #, c-format
7412 msgid "too large to be a .git file: '%s'"
7413 msgstr "för stor för att vara en .git-fil: \"%s\""
7414
7163 -#: setup.c:572
7415 +#: setup.c:590
7416 #, c-format
7417 msgid "error reading %s"
7418 msgstr "fel vid läsning av %s"
7419
7168 -#: setup.c:574
7420 +#: setup.c:592
7421 #, c-format
7422 msgid "invalid gitfile format: %s"
7423 msgstr "ogiltigt gitfilformat: %s"
7424
7173 -#: setup.c:576
7425 +#: setup.c:594
7426 #, c-format
7427 msgid "no path in gitfile: %s"
7428 msgstr "ingen sökväg i gitfil: %s"
7429
7178 -#: setup.c:578
7430 +#: setup.c:596
7431 #, c-format
7432 msgid "not a git repository: %s"
7433 msgstr "inte ett git-arkiv: %s"
7434
7183 -#: setup.c:677
7435 +#: setup.c:695
7436 #, c-format
7437 msgid "'$%s' too big"
7438 msgstr "\"$%s\" för stor"
7439
7188 -#: setup.c:691
7440 +#: setup.c:709
7441 #, c-format
7442 msgid "not a git repository: '%s'"
7443 msgstr "inte ett git-arkiv: \"%s\""
7444
7193 -#: setup.c:720 setup.c:722 setup.c:753
7445 +#: setup.c:738 setup.c:740 setup.c:771
7446 #, c-format
7447 msgid "cannot chdir to '%s'"
7448 msgstr "kan inte byta katalog (chdir) till \"%s\""
7449
7198 -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
7450 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
7451 msgid "cannot come back to cwd"
7452 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
7453
7202 -#: setup.c:852
7454 +#: setup.c:870
7455 #, c-format
7456 msgid "failed to stat '%*s%s%s'"
7457 msgstr "misslyckades ta status på \"%*ss%s%s\""
7458
7207 -#: setup.c:1090
7459 +#: setup.c:1108
7460 msgid "Unable to read current working directory"
7461 msgstr "Kan inte läsa aktuell arbetskatalog"
7462
7211 -#: setup.c:1099 setup.c:1105
7463 +#: setup.c:1117 setup.c:1123
7464 #, c-format
7465 msgid "cannot change to '%s'"
7466 msgstr "kan inte byta till \"%s\""
7467
7216 -#: setup.c:1110
7468 +#: setup.c:1128
7469 #, c-format
7470 msgid "not a git repository (or any of the parent directories): %s"
7471 msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
7472
7221 -#: setup.c:1116
7473 +#: setup.c:1134
7474 #, c-format
7475 msgid ""
7476 "not a git repository (or any parent up to mount point %s)\n"
@@ -7228,7 +7480,7 @@ msgstr ""
7480 "monteringspunkten %s)\n"
7481 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
7482
7231 -#: setup.c:1227
7483 +#: setup.c:1245
7484 #, c-format
7485 msgid ""
7486 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7237,15 +7489,15 @@ msgstr ""
7489 "problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
7490 "Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
7491
7240 -#: setup.c:1271
7492 +#: setup.c:1289
7493 msgid "open /dev/null or dup failed"
7494 msgstr "misslyckades öppna /dev/null eller \"dup\""
7495
7244 -#: setup.c:1286
7496 +#: setup.c:1304
7497 msgid "fork failed"
7498 msgstr "\"fork\" misslyckades"
7499
7248 -#: setup.c:1291
7500 +#: setup.c:1309
7501 msgid "setsid failed"
7502 msgstr "\"setsid\" misslyckades"
7503
@@ -7325,195 +7577,195 @@ msgstr "mmap misslyckades"
7577 msgid "object file %s is empty"
7578 msgstr "objektfilen %s är tom"
7579
7328 -#: sha1-file.c:1252 sha1-file.c:2392
7580 +#: sha1-file.c:1263 sha1-file.c:2443
7581 #, c-format
7582 msgid "corrupt loose object '%s'"
7583 msgstr "trasigt löst objekt \"%s\""
7584
7333 -#: sha1-file.c:1254 sha1-file.c:2396
7585 +#: sha1-file.c:1265 sha1-file.c:2447
7586 #, c-format
7587 msgid "garbage at end of loose object '%s'"
7588 msgstr "skräp i slutet av löst objekt \"%s\""
7589
7338 -#: sha1-file.c:1296
7590 +#: sha1-file.c:1307
7591 msgid "invalid object type"
7592 msgstr "felaktig objekttyp"
7593
7342 -#: sha1-file.c:1380
7594 +#: sha1-file.c:1391
7595 #, c-format
7596 msgid "unable to unpack %s header with --allow-unknown-type"
7597 msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
7598
7347 -#: sha1-file.c:1383
7599 +#: sha1-file.c:1394
7600 #, c-format
7601 msgid "unable to unpack %s header"
7602 msgstr "kan inte packa upp %s-huvudet"
7603
7352 -#: sha1-file.c:1389
7604 +#: sha1-file.c:1400
7605 #, c-format
7606 msgid "unable to parse %s header with --allow-unknown-type"
7607 msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
7608
7357 -#: sha1-file.c:1392
7609 +#: sha1-file.c:1403
7610 #, c-format
7611 msgid "unable to parse %s header"
7612 msgstr "kan inte tolka %s-huvud"
7613
7362 -#: sha1-file.c:1584
7614 +#: sha1-file.c:1629
7615 #, c-format
7616 msgid "failed to read object %s"
7617 msgstr "misslyckades läsa objektet %s"
7618
7367 -#: sha1-file.c:1588
7619 +#: sha1-file.c:1633
7620 #, c-format
7621 msgid "replacement %s not found for %s"
7622 msgstr "ersättningen %s hittades inte för %s"
7623
7372 -#: sha1-file.c:1592
7624 +#: sha1-file.c:1637
7625 #, c-format
7626 msgid "loose object %s (stored in %s) is corrupt"
7627 msgstr "löst objekt %s (lagrat i %s) är trasigt"
7628
7377 -#: sha1-file.c:1596
7629 +#: sha1-file.c:1641
7630 #, c-format
7631 msgid "packed object %s (stored in %s) is corrupt"
7632 msgstr "packat objekt %s (lagrat i %s) är trasigt"
7633
7382 -#: sha1-file.c:1699
7634 +#: sha1-file.c:1746
7635 #, c-format
7636 msgid "unable to write file %s"
7637 msgstr "kunde inte skriva filen %s"
7638
7387 -#: sha1-file.c:1706
7639 +#: sha1-file.c:1753
7640 #, c-format
7641 msgid "unable to set permission to '%s'"
7642 msgstr "kan inte sätta behörigheten till \"%s\""
7643
7392 -#: sha1-file.c:1713
7644 +#: sha1-file.c:1760
7645 msgid "file write error"
7646 msgstr "fel vid skrivning av fil"
7647
7396 -#: sha1-file.c:1732
7648 +#: sha1-file.c:1780
7649 msgid "error when closing loose object file"
7650 msgstr "fel vid stängning av fil för löst objekt"
7651
7400 -#: sha1-file.c:1797
7652 +#: sha1-file.c:1845
7653 #, c-format
7654 msgid "insufficient permission for adding an object to repository database %s"
7655 msgstr ""
7656 "otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
7657
7406 -#: sha1-file.c:1799
7658 +#: sha1-file.c:1847
7659 msgid "unable to create temporary file"
7660 msgstr "kan inte skapa temporär fil"
7661
7410 -#: sha1-file.c:1823
7662 +#: sha1-file.c:1871
7663 msgid "unable to write loose object file"
7664 msgstr "kunde inte skriva fil för löst objekt"
7665
7414 -#: sha1-file.c:1829
7666 +#: sha1-file.c:1877
7667 #, c-format
7668 msgid "unable to deflate new object %s (%d)"
7669 msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
7670
7419 -#: sha1-file.c:1833
7671 +#: sha1-file.c:1881
7672 #, c-format
7673 msgid "deflateEnd on object %s failed (%d)"
7674 msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
7675
7424 -#: sha1-file.c:1837
7676 +#: sha1-file.c:1885
7677 #, c-format
7678 msgid "confused by unstable object source data for %s"
7679 msgstr "förvirrad av instabil objektkälldata för %s"
7680
7429 -#: sha1-file.c:1847 builtin/pack-objects.c:925
7681 +#: sha1-file.c:1895 builtin/pack-objects.c:1054
7682 #, c-format
7683 msgid "failed utime() on %s"
7684 msgstr "\"utime()\" misslyckades på %s"
7685
7434 -#: sha1-file.c:1922
7686 +#: sha1-file.c:1972
7687 #, c-format
7688 msgid "cannot read object for %s"
7689 msgstr "kan inte läsa objekt för %s"
7690
7439 -#: sha1-file.c:1962
7691 +#: sha1-file.c:2011
7692 msgid "corrupt commit"
7693 msgstr "trasik incheckning"
7694
7443 -#: sha1-file.c:1970
7695 +#: sha1-file.c:2019
7696 msgid "corrupt tag"
7697 msgstr "trasig tagg"
7698
7447 -#: sha1-file.c:2069
7699 +#: sha1-file.c:2119
7700 #, c-format
7701 msgid "read error while indexing %s"
7702 msgstr "läsfel vid indexering av %s"
7703
7452 -#: sha1-file.c:2072
7704 +#: sha1-file.c:2122
7705 #, c-format
7706 msgid "short read while indexing %s"
7707 msgstr "för lite lästes vid indexering av %s"
7708
7457 -#: sha1-file.c:2145 sha1-file.c:2154
7709 +#: sha1-file.c:2195 sha1-file.c:2205
7710 #, c-format
7711 msgid "%s: failed to insert into database"
7712 msgstr "%s: misslyckades lägga in i databasen"
7713
7462 -#: sha1-file.c:2160
7714 +#: sha1-file.c:2211
7715 #, c-format
7716 msgid "%s: unsupported file type"
7717 msgstr "%s: filtypen stöds ej"
7718
7467 -#: sha1-file.c:2184
7719 +#: sha1-file.c:2235
7720 #, c-format
7721 msgid "%s is not a valid object"
7722 msgstr "%s är inte ett giltigt objekt"
7723
7472 -#: sha1-file.c:2186
7724 +#: sha1-file.c:2237
7725 #, c-format
7726 msgid "%s is not a valid '%s' object"
7727 msgstr "%s är inte ett giltigt \"%s\"-objekt"
7728
7477 -#: sha1-file.c:2213 builtin/index-pack.c:155
7729 +#: sha1-file.c:2264 builtin/index-pack.c:155
7730 #, c-format
7731 msgid "unable to open %s"
7732 msgstr "kan inte öppna %s"
7733
7482 -#: sha1-file.c:2403 sha1-file.c:2455
7734 +#: sha1-file.c:2454 sha1-file.c:2507
7735 #, c-format
7736 msgid "hash mismatch for %s (expected %s)"
7737 msgstr "hash stämmer inte för %s (förväntade %s)"
7738
7487 -#: sha1-file.c:2427
7739 +#: sha1-file.c:2478
7740 #, c-format
7741 msgid "unable to mmap %s"
7742 msgstr "kan inte utföra \"mmap\" för %s"
7743
7492 -#: sha1-file.c:2432
7744 +#: sha1-file.c:2483
7745 #, c-format
7746 msgid "unable to unpack header of %s"
7747 msgstr "kan inte packa upp huvud för %s"
7748
7497 -#: sha1-file.c:2438
7749 +#: sha1-file.c:2489
7750 #, c-format
7751 msgid "unable to parse header of %s"
7752 msgstr "kan inte tolka huvud för %s"
7753
7502 -#: sha1-file.c:2449
7754 +#: sha1-file.c:2500
7755 #, c-format
7756 msgid "unable to unpack contents of %s"
7757 msgstr "kan inte tolka innehåll i %s"
7758
7507 -#: sha1-name.c:487
7759 +#: sha1-name.c:486
7760 #, c-format
7761 msgid "short SHA1 %s is ambiguous"
7762 msgstr "kort SHA1 %s är tvetydig"
7763
7512 -#: sha1-name.c:498
7764 +#: sha1-name.c:497
7765 msgid "The candidates are:"
7766 msgstr "Kandidaterna är:"
7767
7516 -#: sha1-name.c:797
7768 +#: sha1-name.c:796
7769 msgid ""
7770 "Git normally never creates a ref that ends with 40 hex characters\n"
7771 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -7535,44 +7787,110 @@ msgstr ""
7787 "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
7788 "genom att köra \"git config advice.objectNameWarning false\""
7789
7790 +#: sha1-name.c:916
7791 +#, c-format
7792 +msgid "log for '%.*s' only goes back to %s"
7793 +msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
7794 +
7795 +#: sha1-name.c:924
7796 +#, c-format
7797 +msgid "log for '%.*s' only has %d entries"
7798 +msgstr "loggen för \"%.*s\" har bara %d poster"
7799 +
7800 +#: sha1-name.c:1689
7801 +#, c-format
7802 +msgid "path '%s' exists on disk, but not in '%.*s'"
7803 +msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
7804 +
7805 +#: sha1-name.c:1695
7806 +#, c-format
7807 +msgid ""
7808 +"path '%s' exists, but not '%s'\n"
7809 +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
7810 +msgstr ""
7811 +"sökvägen \"%s\" finns, men inte i \"%s\"\n"
7812 +"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
7813 +
7814 +#: sha1-name.c:1704
7815 +#, c-format
7816 +msgid "path '%s' does not exist in '%.*s'"
7817 +msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
7818 +
7819 +#: sha1-name.c:1732
7820 +#, c-format
7821 +msgid ""
7822 +"path '%s' is in the index, but not at stage %d\n"
7823 +"hint: Did you mean ':%d:%s'?"
7824 +msgstr ""
7825 +"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
7826 +"tips: Menade du \":%d:%s\"?"
7827 +
7828 +#: sha1-name.c:1748
7829 +#, c-format
7830 +msgid ""
7831 +"path '%s' is in the index, but not '%s'\n"
7832 +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
7833 +msgstr ""
7834 +"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
7835 +"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
7836 +
7837 +#: sha1-name.c:1756
7838 +#, c-format
7839 +msgid "path '%s' exists on disk, but not in the index"
7840 +msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
7841 +
7842 +#: sha1-name.c:1758
7843 +#, c-format
7844 +msgid "path '%s' does not exist (neither on disk nor in the index)"
7845 +msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
7846 +
7847 +#: sha1-name.c:1771
7848 +msgid "relative path syntax can't be used outside working tree"
7849 +msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
7850 +
7851 +#: sha1-name.c:1909
7852 +#, c-format
7853 +msgid "invalid object name '%.*s'."
7854 +msgstr "felaktigt objektnamn \"%.*s\"."
7855 +
7856 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
7539 -#: strbuf.c:822
7857 +#: strbuf.c:837
7858 #, c-format
7859 msgid "%u.%2.2u GiB"
7860 msgstr "%u,%2.2u GiB"
7861
7862 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
7545 -#: strbuf.c:824
7863 +#: strbuf.c:839
7864 #, c-format
7865 msgid "%u.%2.2u GiB/s"
7866 msgstr "%u,%2.2u GiB/s"
7867
7868 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
7551 -#: strbuf.c:832
7869 +#: strbuf.c:847
7870 #, c-format
7871 msgid "%u.%2.2u MiB"
7872 msgstr "%u,%2.2u MiB"
7873
7874 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
7557 -#: strbuf.c:834
7875 +#: strbuf.c:849
7876 #, c-format
7877 msgid "%u.%2.2u MiB/s"
7878 msgstr "%u,%2.2u MiB/s"
7879
7880 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
7563 -#: strbuf.c:841
7881 +#: strbuf.c:856
7882 #, c-format
7883 msgid "%u.%2.2u KiB"
7884 msgstr "%u,%2.2u KiB"
7885
7886 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
7569 -#: strbuf.c:843
7887 +#: strbuf.c:858
7888 #, c-format
7889 msgid "%u.%2.2u KiB/s"
7890 msgstr "%u,%2.2u KiB/s"
7891
7892 #. TRANSLATORS: IEC 80000-13:2008 byte
7575 -#: strbuf.c:849
7893 +#: strbuf.c:864
7894 #, c-format
7895 msgid "%u byte"
7896 msgid_plural "%u bytes"
@@ -7580,14 +7898,14 @@ msgstr[0] "%u byte"
7898 msgstr[1] "%u bytes"
7899
7900 #. TRANSLATORS: IEC 80000-13:2008 byte/second
7583 -#: strbuf.c:851
7901 +#: strbuf.c:866
7902 #, c-format
7903 msgid "%u byte/s"
7904 msgid_plural "%u bytes/s"
7905 msgstr[0] "%u byte/s"
7906 msgstr[1] "%u bytes/s"
7907
7590 -#: strbuf.c:1149
7908 +#: strbuf.c:1164
7909 #, c-format
7910 msgid "could not edit '%s'"
7911 msgstr "kunde inte redigera \"%s\""
@@ -7622,56 +7940,127 @@ msgstr "i ej utcheckad undermodul \"%s\""
7940 msgid "Pathspec '%s' is in submodule '%.*s'"
7941 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
7942
7943 +#: submodule.c:434
7944 +#, c-format
7945 +msgid "bad --ignore-submodules argument: %s"
7946 +msgstr "felaktigt argument till --ignore-submodules: %s"
7947 +
7948 +#: submodule.c:815
7949 +#, c-format
7950 +msgid ""
7951 +"Submodule in commit %s at path: '%s' collides with a submodule named the "
7952 +"same. Skipping it."
7953 +msgstr ""
7954 +"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
7955 +"med samma namn. Hoppar över den."
7956 +
7957 #: submodule.c:910
7958 #, c-format
7959 msgid "submodule entry '%s' (%s) is a %s, not a commit"
7960 msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
7961
7630 -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2016
7962 +#: submodule.c:995
7963 +#, c-format
7964 +msgid ""
7965 +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
7966 +"submodule %s"
7967 +msgstr ""
7968 +"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
7969 +"undermodulen \"%s\""
7970 +
7971 +#: submodule.c:1118
7972 +#, c-format
7973 +msgid "process for submodule '%s' failed"
7974 +msgstr "process för undermodulen \"%s\" misslyckades"
7975 +
7976 +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
7977 msgid "Failed to resolve HEAD as a valid ref."
7978 msgstr "Misslyckades slå upp HEAD som giltig referens."
7979
7634 -#: submodule.c:1481
7980 +#: submodule.c:1158
7981 +#, c-format
7982 +msgid "Pushing submodule '%s'\n"
7983 +msgstr "Sänder undermodulen \"%s\"\n"
7984 +
7985 +#: submodule.c:1161
7986 #, c-format
7636 -msgid "Could not access submodule '%s'"
7637 -msgstr "kunde inte komma åt undermodulen \"%s\""
7987 +msgid "Unable to push submodule '%s'\n"
7988 +msgstr "Kunde inte sända undermodulen \"%s\"\n"
7989 +
7990 +#: submodule.c:1453
7991 +#, c-format
7992 +msgid "Fetching submodule %s%s\n"
7993 +msgstr "Hämtar undermodulen %s%s\n"
7994 +
7995 +#: submodule.c:1483
7996 +#, c-format
7997 +msgid "Could not access submodule '%s'\n"
7998 +msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
7999 +
8000 +#: submodule.c:1637
8001 +#, c-format
8002 +msgid ""
8003 +"Errors during submodule fetch:\n"
8004 +"%s"
8005 +msgstr ""
8006 +"Fel vid hämtning av undermodul:\n"
8007 +"%s"
8008
7639 -#: submodule.c:1651
8009 +#: submodule.c:1662
8010 #, c-format
8011 msgid "'%s' not recognized as a git repository"
8012 msgstr "\"%s\" känns inte igen som ett git-arkiv"
8013
7644 -#: submodule.c:1789
8014 +#: submodule.c:1679
8015 +#, c-format
8016 +msgid "Could not run 'git status --porcelain=2' in submodule %s"
8017 +msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
8018 +
8019 +#: submodule.c:1720
8020 +#, c-format
8021 +msgid "'git status --porcelain=2' failed in submodule %s"
8022 +msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
8023 +
8024 +#: submodule.c:1800
8025 #, c-format
8026 msgid "could not start 'git status' in submodule '%s'"
8027 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
8028
7649 -#: submodule.c:1802
8029 +#: submodule.c:1813
8030 #, c-format
8031 msgid "could not run 'git status' in submodule '%s'"
8032 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
8033
7654 -#: submodule.c:1817
8034 +#: submodule.c:1828
8035 #, c-format
8036 msgid "Could not unset core.worktree setting in submodule '%s'"
8037 msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
8038
7659 -#: submodule.c:1907
8039 +#: submodule.c:1855 submodule.c:2165
8040 +#, c-format
8041 +msgid "could not recurse into submodule '%s'"
8042 +msgstr "kunde inte rekursera in i undermodulen \"%s\""
8043 +
8044 +#: submodule.c:1876
8045 +msgid "could not reset submodule index"
8046 +msgstr "kunde inte återställa indexet i undermodul"
8047 +
8048 +#: submodule.c:1918
8049 #, c-format
8050 msgid "submodule '%s' has dirty index"
8051 msgstr "undermodulen \"%s\" har ett smutsigt index"
8052
7664 -#: submodule.c:1959
8053 +#: submodule.c:1970
8054 #, c-format
8055 msgid "Submodule '%s' could not be updated."
8056 msgstr "Undermoduler \"%s\" kunde inte uppdateras."
8057
7669 -#: submodule.c:2027
8058 +#: submodule.c:2038
8059 #, c-format
8060 msgid "submodule git dir '%s' is inside git dir '%.*s'"
8061 msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
8062
7674 -#: submodule.c:2048
8063 +#: submodule.c:2059
8064 #, c-format
8065 msgid ""
8066 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7679,17 +8068,17 @@ msgstr ""
8068 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
8069 "stöds ej"
8070
7682 -#: submodule.c:2060 submodule.c:2119
8071 +#: submodule.c:2071 submodule.c:2130
8072 #, c-format
8073 msgid "could not lookup name for submodule '%s'"
8074 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
8075
7687 -#: submodule.c:2064
8076 +#: submodule.c:2075
8077 #, c-format
8078 msgid "refusing to move '%s' into an existing git dir"
8079 msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
8080
7692 -#: submodule.c:2071
8081 +#: submodule.c:2082
8082 #, c-format
8083 msgid ""
8084 "Migrating git directory of '%s%s' from\n"
@@ -7700,16 +8089,11 @@ msgstr ""

This file is too large to show in full.