@matheusbsbs / matheus-bagliano / commits / 9386878f69

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

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

Peter Krefting committed Apr 7, 2015 at 08:45 UTC 9386878f69f871879e27e2918688da882c14e5d4
1 file changed +244 -241
po/sv.po
+244 -241
@@ -7,8 +7,8 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git 2.4.0\n"
9 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
10 -"POT-Creation-Date: 2015-03-27 13:33+0800\n"
11 -"PO-Revision-Date: 2015-03-27 09:56+0100\n"
10 +"POT-Creation-Date: 2015-04-03 08:13+0800\n"
11 +"PO-Revision-Date: 2015-04-07 08:44+0100\n"
12 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
13 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
14 "Language: sv\n"
@@ -252,7 +252,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
252 msgid "unrecognized header: %s%s (%d)"
253 msgstr "okänt huvud: %s%s (%d)"
254
255 -#: bundle.c:87 builtin/commit.c:764
255 +#: bundle.c:87 builtin/commit.c:766
256 #, c-format
257 msgid "could not open '%s'"
258 msgstr "kunde inte öppna \"%s\""
@@ -262,7 +262,7 @@ msgid "Repository lacks these prerequisite commits:"
262 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
263
264 #: bundle.c:163 sequencer.c:650 sequencer.c:1105 builtin/blame.c:2705
265 -#: builtin/branch.c:659 builtin/commit.c:1043 builtin/log.c:330
265 +#: builtin/branch.c:659 builtin/commit.c:1045 builtin/log.c:330
266 #: builtin/log.c:823 builtin/log.c:1432 builtin/log.c:1669 builtin/merge.c:358
267 #: builtin/shortlog.c:158
268 msgid "revision walk setup failed"
@@ -877,27 +877,27 @@ msgstr "sammanslagning av träden %s och %s misslyckades"
877 msgid "Unprocessed path??? %s"
878 msgstr "Obehandlad sökväg??? %s"
879
880 -#: merge-recursive.c:1898
880 +#: merge-recursive.c:1901
881 msgid "Merging:"
882 msgstr "Slår ihop:"
883
884 -#: merge-recursive.c:1911
884 +#: merge-recursive.c:1914
885 #, c-format
886 msgid "found %u common ancestor:"
887 msgid_plural "found %u common ancestors:"
888 msgstr[0] "hittade %u gemensam förfader:"
889 msgstr[1] "hittade %u gemensamma förfäder:"
890
891 -#: merge-recursive.c:1948
891 +#: merge-recursive.c:1951
892 msgid "merge returned no commit"
893 msgstr "sammanslagningen returnerade ingen incheckning"
894
895 -#: merge-recursive.c:2005
895 +#: merge-recursive.c:2008
896 #, c-format
897 msgid "Could not parse object '%s'"
898 msgstr "Kunde inte tolka objektet \"%s\""
899
900 -#: merge-recursive.c:2016 builtin/merge.c:667
900 +#: merge-recursive.c:2019 builtin/merge.c:667
901 msgid "Unable to write index."
902 msgstr "Kunde inte skriva indexet."
903
@@ -1025,7 +1025,7 @@ msgstr "kunde inte tolka format för --pretty"
1025 msgid "done"
1026 msgstr "klart"
1027
1028 -#: read-cache.c:1273
1028 +#: read-cache.c:1275
1029 #, c-format
1030 msgid ""
1031 "index.version set, but the value is invalid.\n"
@@ -1034,7 +1034,7 @@ msgstr ""
1034 "index.version satt, men värdet är ogiltigt.\n"
1035 "Använder version %i"
1036
1037 -#: read-cache.c:1283
1037 +#: read-cache.c:1285
1038 #, c-format
1039 msgid ""
1040 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -1142,8 +1142,8 @@ msgid "the receiving end does not support --signed push"
1142 msgstr "mottagarsidan stöder inte push med --signed"
1143
1144 #: send-pack.c:366
1145 -msgid "server does not support --atomic push"
1146 -msgstr "servern stöder inte push med --atomic"
1145 +msgid "the receiving end does not support --atomic push"
1146 +msgstr "mottagarsidan stöder inte push med --atomic"
1147
1148 #: sequencer.c:172 builtin/merge.c:782 builtin/merge.c:893 builtin/merge.c:995
1149 #: builtin/merge.c:1005
@@ -1350,7 +1350,7 @@ msgstr "kan inte bestämma HEAD"
1350 msgid "cannot abort from a branch yet to be born"
1351 msgstr "kan inte avbryta från en gren som ännu inte är född"
1352
1353 -#: sequencer.c:908 builtin/apply.c:4286
1353 +#: sequencer.c:908 builtin/apply.c:4288
1354 #, c-format
1355 msgid "cannot open %s: %s"
1356 msgstr "kan inte öppna %s: %s"
@@ -1989,7 +1989,7 @@ msgstr "git add [<flaggor>] [--] <sökväg>..."
1989 msgid "unexpected diff status %c"
1990 msgstr "diff-status %c förväntades inte"
1991
1992 -#: builtin/add.c:70 builtin/commit.c:275
1992 +#: builtin/add.c:70 builtin/commit.c:277
1993 msgid "updating files failed"
1994 msgstr "misslyckades uppdatera filer"
1995
@@ -2039,8 +2039,8 @@ msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
2039 msgid "dry run"
2040 msgstr "testkörning"
2041
2042 -#: builtin/add.c:249 builtin/apply.c:4575 builtin/check-ignore.c:19
2043 -#: builtin/commit.c:1320 builtin/count-objects.c:63 builtin/fsck.c:608
2042 +#: builtin/add.c:249 builtin/apply.c:4577 builtin/check-ignore.c:19
2043 +#: builtin/commit.c:1322 builtin/count-objects.c:63 builtin/fsck.c:608
2044 #: builtin/log.c:1617 builtin/mv.c:109 builtin/read-tree.c:114
2045 msgid "be verbose"
2046 msgstr "var pratsam"
@@ -2117,11 +2117,11 @@ msgid "Maybe you wanted to say 'git add .'?\n"
2117 msgstr "Kanske menade du att skriva \"git add .\"?\n"
2118
2119 #: builtin/add.c:363 builtin/check-ignore.c:172 builtin/clean.c:920
2120 -#: builtin/commit.c:333 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2120 +#: builtin/commit.c:335 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:299
2121 msgid "index file corrupt"
2122 msgstr "indexfilen trasig"
2123
2124 -#: builtin/add.c:446 builtin/apply.c:4673 builtin/mv.c:279 builtin/rm.c:431
2124 +#: builtin/add.c:446 builtin/apply.c:4675 builtin/mv.c:279 builtin/rm.c:431
2125 msgid "Unable to write new index file"
2126 msgstr "Kunde inte skriva ny indexfil"
2127
@@ -2258,19 +2258,19 @@ msgstr "kunde inte öppna eller läsa %s"
2258 msgid "invalid start of line: '%c'"
2259 msgstr "felaktig inledning på rad: \"%c\""
2260
2261 -#: builtin/apply.c:2896
2261 +#: builtin/apply.c:2897
2262 #, c-format
2263 msgid "Hunk #%d succeeded at %d (offset %d line)."
2264 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
2265 msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
2266 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
2267
2268 -#: builtin/apply.c:2908
2268 +#: builtin/apply.c:2909
2269 #, c-format
2270 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
2271 msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
2272
2273 -#: builtin/apply.c:2914
2273 +#: builtin/apply.c:2915
2274 #, c-format
2275 msgid ""
2276 "while searching for:\n"
@@ -2279,336 +2279,336 @@ msgstr ""
2279 "vid sökning efter:\n"
2280 "%.*s"
2281
2282 -#: builtin/apply.c:2933
2282 +#: builtin/apply.c:2935
2283 #, c-format
2284 msgid "missing binary patch data for '%s'"
2285 msgstr "saknar binära patchdata för \"%s\""
2286
2287 -#: builtin/apply.c:3034
2287 +#: builtin/apply.c:3036
2288 #, c-format
2289 msgid "binary patch does not apply to '%s'"
2290 msgstr "binärpatchen kan inte tillämpas på \"%s\""
2291
2292 -#: builtin/apply.c:3040
2292 +#: builtin/apply.c:3042
2293 #, c-format
2294 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
2295 msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
2296
2297 -#: builtin/apply.c:3061
2297 +#: builtin/apply.c:3063
2298 #, c-format
2299 msgid "patch failed: %s:%ld"
2300 msgstr "patch misslyckades: %s:%ld"
2301
2302 -#: builtin/apply.c:3185
2302 +#: builtin/apply.c:3187
2303 #, c-format
2304 msgid "cannot checkout %s"
2305 msgstr "kan inte checka ut %s"
2306
2307 -#: builtin/apply.c:3230 builtin/apply.c:3241 builtin/apply.c:3286
2307 +#: builtin/apply.c:3232 builtin/apply.c:3243 builtin/apply.c:3288
2308 #, c-format
2309 msgid "read of %s failed"
2310 msgstr "misslyckades läsa %s"
2311
2312 -#: builtin/apply.c:3238
2312 +#: builtin/apply.c:3240
2313 #, c-format
2314 msgid "reading from '%s' beyond a symbolic link"
2315 msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
2316
2317 -#: builtin/apply.c:3266 builtin/apply.c:3488
2317 +#: builtin/apply.c:3268 builtin/apply.c:3490
2318 #, c-format
2319 msgid "path %s has been renamed/deleted"
2320 msgstr "sökvägen %s har ändrat namn/tagits bort"
2321
2322 -#: builtin/apply.c:3347 builtin/apply.c:3502
2322 +#: builtin/apply.c:3349 builtin/apply.c:3504
2323 #, c-format
2324 msgid "%s: does not exist in index"
2325 msgstr "%s: finns inte i indexet"
2326
2327 -#: builtin/apply.c:3351 builtin/apply.c:3494 builtin/apply.c:3516
2327 +#: builtin/apply.c:3353 builtin/apply.c:3496 builtin/apply.c:3518
2328 #, c-format
2329 msgid "%s: %s"
2330 msgstr "%s: %s"
2331
2332 -#: builtin/apply.c:3356 builtin/apply.c:3510
2332 +#: builtin/apply.c:3358 builtin/apply.c:3512
2333 #, c-format
2334 msgid "%s: does not match index"
2335 msgstr "%s: motsvarar inte indexet"
2336
2337 -#: builtin/apply.c:3458
2337 +#: builtin/apply.c:3460
2338 msgid "removal patch leaves file contents"
2339 msgstr "patch för borttagning lämnar kvar filinnehåll"
2340
2341 -#: builtin/apply.c:3527
2341 +#: builtin/apply.c:3529
2342 #, c-format
2343 msgid "%s: wrong type"
2344 msgstr "%s: fel typ"
2345
2346 -#: builtin/apply.c:3529
2346 +#: builtin/apply.c:3531
2347 #, c-format
2348 msgid "%s has type %o, expected %o"
2349 msgstr "%s har typen %o, förväntade %o"
2350
2351 -#: builtin/apply.c:3688 builtin/apply.c:3690
2351 +#: builtin/apply.c:3690 builtin/apply.c:3692
2352 #, c-format
2353 msgid "invalid path '%s'"
2354 msgstr "ogiltig sökväg: %s"
2355
2356 -#: builtin/apply.c:3745
2356 +#: builtin/apply.c:3747
2357 #, c-format
2358 msgid "%s: already exists in index"
2359 msgstr "%s: finns redan i indexet"
2360
2361 -#: builtin/apply.c:3748
2361 +#: builtin/apply.c:3750
2362 #, c-format
2363 msgid "%s: already exists in working directory"
2364 msgstr "%s: finns redan i arbetskatalogen"
2365
2366 -#: builtin/apply.c:3768
2366 +#: builtin/apply.c:3770
2367 #, c-format
2368 msgid "new mode (%o) of %s does not match old mode (%o)"
2369 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
2370
2371 -#: builtin/apply.c:3773
2371 +#: builtin/apply.c:3775
2372 #, c-format
2373 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
2374 msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
2375
2376 -#: builtin/apply.c:3793
2376 +#: builtin/apply.c:3795
2377 #, c-format
2378 msgid "affected file '%s' is beyond a symbolic link"
2379 msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
2380
2381 -#: builtin/apply.c:3797
2381 +#: builtin/apply.c:3799
2382 #, c-format
2383 msgid "%s: patch does not apply"
2384 msgstr "%s: patchen kan inte tillämpas"
2385
2386 -#: builtin/apply.c:3811
2386 +#: builtin/apply.c:3813
2387 #, c-format
2388 msgid "Checking patch %s..."
2389 msgstr "Kontrollerar patchen %s..."
2390
2391 -#: builtin/apply.c:3904 builtin/checkout.c:231 builtin/reset.c:135
2391 +#: builtin/apply.c:3906 builtin/checkout.c:231 builtin/reset.c:135
2392 #, c-format
2393 msgid "make_cache_entry failed for path '%s'"
2394 msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
2395
2396 -#: builtin/apply.c:4047
2396 +#: builtin/apply.c:4049
2397 #, c-format
2398 msgid "unable to remove %s from index"
2399 msgstr "kan inte ta bort %s från indexet"
2400
2401 -#: builtin/apply.c:4076
2401 +#: builtin/apply.c:4078
2402 #, c-format
2403 msgid "corrupt patch for submodule %s"
2404 msgstr "trasig patch för undermodulen %s"
2405
2406 -#: builtin/apply.c:4080
2406 +#: builtin/apply.c:4082
2407 #, c-format
2408 msgid "unable to stat newly created file '%s'"
2409 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
2410
2411 -#: builtin/apply.c:4085
2411 +#: builtin/apply.c:4087
2412 #, c-format
2413 msgid "unable to create backing store for newly created file %s"
2414 msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
2415
2416 -#: builtin/apply.c:4088 builtin/apply.c:4196
2416 +#: builtin/apply.c:4090 builtin/apply.c:4198
2417 #, c-format
2418 msgid "unable to add cache entry for %s"
2419 msgstr "kan inte lägga till cachepost för %s"
2420
2421 -#: builtin/apply.c:4121
2421 +#: builtin/apply.c:4123
2422 #, c-format
2423 msgid "closing file '%s'"
2424 msgstr "stänger filen \"%s\""
2425
2426 -#: builtin/apply.c:4170
2426 +#: builtin/apply.c:4172
2427 #, c-format
2428 msgid "unable to write file '%s' mode %o"
2429 msgstr "kan inte skriva filen \"%s\" läge %o"
2430
2431 -#: builtin/apply.c:4257
2431 +#: builtin/apply.c:4259
2432 #, c-format
2433 msgid "Applied patch %s cleanly."
2434 msgstr "Tillämpade patchen %s rent."
2435
2436 -#: builtin/apply.c:4265
2436 +#: builtin/apply.c:4267
2437 msgid "internal error"
2438 msgstr "internt fel"
2439
2440 -#: builtin/apply.c:4268
2440 +#: builtin/apply.c:4270
2441 #, c-format
2442 msgid "Applying patch %%s with %d reject..."
2443 msgid_plural "Applying patch %%s with %d rejects..."
2444 msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
2445 msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
2446
2447 -#: builtin/apply.c:4278
2447 +#: builtin/apply.c:4280
2448 #, c-format
2449 msgid "truncating .rej filename to %.*s.rej"
2450 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
2451
2452 -#: builtin/apply.c:4299
2452 +#: builtin/apply.c:4301
2453 #, c-format
2454 msgid "Hunk #%d applied cleanly."
2455 msgstr "Stycke %d tillämpades rent."
2456
2457 -#: builtin/apply.c:4302
2457 +#: builtin/apply.c:4304
2458 #, c-format
2459 msgid "Rejected hunk #%d."
2460 msgstr "Refuserar stycke %d."
2461
2462 -#: builtin/apply.c:4392
2462 +#: builtin/apply.c:4394
2463 msgid "unrecognized input"
2464 msgstr "indata känns inte igen"
2465
2466 -#: builtin/apply.c:4403
2466 +#: builtin/apply.c:4405
2467 msgid "unable to read index file"
2468 msgstr "kan inte läsa indexfilen"
2469
2470 -#: builtin/apply.c:4520 builtin/apply.c:4523 builtin/clone.c:92
2470 +#: builtin/apply.c:4522 builtin/apply.c:4525 builtin/clone.c:92
2471 #: builtin/fetch.c:92
2472 msgid "path"
2473 msgstr "sökväg"
2474
2475 -#: builtin/apply.c:4521
2475 +#: builtin/apply.c:4523
2476 msgid "don't apply changes matching the given path"
2477 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
2478
2479 -#: builtin/apply.c:4524
2479 +#: builtin/apply.c:4526
2480 msgid "apply changes matching the given path"
2481 msgstr "tillämpa ändringar som motsvarar given sökväg"
2482
2483 -#: builtin/apply.c:4526
2483 +#: builtin/apply.c:4528
2484 msgid "num"
2485 msgstr "antal"
2486
2487 -#: builtin/apply.c:4527
2487 +#: builtin/apply.c:4529
2488 msgid "remove <num> leading slashes from traditional diff paths"
2489 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
2490
2491 -#: builtin/apply.c:4530
2491 +#: builtin/apply.c:4532
2492 msgid "ignore additions made by the patch"
2493 msgstr "ignorera tillägg gjorda av patchen"
2494
2495 -#: builtin/apply.c:4532
2495 +#: builtin/apply.c:4534
2496 msgid "instead of applying the patch, output diffstat for the input"
2497 msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
2498
2499 -#: builtin/apply.c:4536
2499 +#: builtin/apply.c:4538
2500 msgid "show number of added and deleted lines in decimal notation"
2501 msgstr "visa antal tillagda och borttagna rader decimalt"
2502
2503 -#: builtin/apply.c:4538
2503 +#: builtin/apply.c:4540
2504 msgid "instead of applying the patch, output a summary for the input"
2505 msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
2506
2507 -#: builtin/apply.c:4540
2507 +#: builtin/apply.c:4542
2508 msgid "instead of applying the patch, see if the patch is applicable"
2509 msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
2510
2511 -#: builtin/apply.c:4542
2511 +#: builtin/apply.c:4544
2512 msgid "make sure the patch is applicable to the current index"
2513 msgstr "se till att patchen kan tillämpas på aktuellt index"
2514
2515 -#: builtin/apply.c:4544
2515 +#: builtin/apply.c:4546
2516 msgid "apply a patch without touching the working tree"
2517 msgstr "tillämpa en patch utan att röra arbetskatalogen"
2518
2519 -#: builtin/apply.c:4546
2519 +#: builtin/apply.c:4548
2520 msgid "accept a patch that touches outside the working area"
2521 msgstr "godta en patch som rör filer utanför arbetskatalogen"
2522
2523 -#: builtin/apply.c:4548
2523 +#: builtin/apply.c:4550
2524 msgid "also apply the patch (use with --stat/--summary/--check)"
2525 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
2526
2527 -#: builtin/apply.c:4550
2527 +#: builtin/apply.c:4552
2528 msgid "attempt three-way merge if a patch does not apply"
2529 msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
2530
2531 -#: builtin/apply.c:4552
2531 +#: builtin/apply.c:4554
2532 msgid "build a temporary index based on embedded index information"
2533 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
2534
2535 -#: builtin/apply.c:4554 builtin/checkout-index.c:198 builtin/ls-files.c:412
2535 +#: builtin/apply.c:4556 builtin/checkout-index.c:198 builtin/ls-files.c:412
2536 msgid "paths are separated with NUL character"
2537 msgstr "sökvägar avdelas med NUL-tecken"
2538
2539 -#: builtin/apply.c:4557
2539 +#: builtin/apply.c:4559
2540 msgid "ensure at least <n> lines of context match"
2541 msgstr "se till att åtminstone <n> rader sammanhang är lika"
2542
2543 -#: builtin/apply.c:4558
2543 +#: builtin/apply.c:4560
2544 msgid "action"
2545 msgstr "åtgärd"
2546
2547 -#: builtin/apply.c:4559
2547 +#: builtin/apply.c:4561
2548 msgid "detect new or modified lines that have whitespace errors"
2549 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
2550
2551 -#: builtin/apply.c:4562 builtin/apply.c:4565
2551 +#: builtin/apply.c:4564 builtin/apply.c:4567
2552 msgid "ignore changes in whitespace when finding context"
2553 msgstr "ignorera ändringar i blanktecken för sammanhang"
2554
2555 -#: builtin/apply.c:4568
2555 +#: builtin/apply.c:4570
2556 msgid "apply the patch in reverse"
2557 msgstr "tillämpa patchen baklänges"
2558
2559 -#: builtin/apply.c:4570
2559 +#: builtin/apply.c:4572
2560 msgid "don't expect at least one line of context"
2561 msgstr "förvänta inte minst en rad sammanhang"
2562
2563 -#: builtin/apply.c:4572
2563 +#: builtin/apply.c:4574
2564 msgid "leave the rejected hunks in corresponding *.rej files"
2565 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
2566
2567 -#: builtin/apply.c:4574
2567 +#: builtin/apply.c:4576
2568 msgid "allow overlapping hunks"
2569 msgstr "tillåt överlappande stycken"
2570
2571 -#: builtin/apply.c:4577
2571 +#: builtin/apply.c:4579
2572 msgid "tolerate incorrectly detected missing new-line at the end of file"
2573 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
2574
2575 -#: builtin/apply.c:4580
2575 +#: builtin/apply.c:4582
2576 msgid "do not trust the line counts in the hunk headers"
2577 msgstr "lite inte på antalet linjer i styckehuvuden"
2578
2579 -#: builtin/apply.c:4582
2579 +#: builtin/apply.c:4584
2580 msgid "root"
2581 msgstr "rot"
2582
2583 -#: builtin/apply.c:4583
2583 +#: builtin/apply.c:4585
2584 msgid "prepend <root> to all filenames"
2585 msgstr "lägg till <rot> i alla filnamn"
2586
2587 -#: builtin/apply.c:4605
2587 +#: builtin/apply.c:4607
2588 msgid "--3way outside a repository"
2589 msgstr "--3way utanför arkiv"
2590
2591 -#: builtin/apply.c:4613
2591 +#: builtin/apply.c:4615
2592 msgid "--index outside a repository"
2593 msgstr "--index utanför arkiv"
2594
2595 -#: builtin/apply.c:4616
2595 +#: builtin/apply.c:4618
2596 msgid "--cached outside a repository"
2597 msgstr "--cached utanför arkiv"
2598
2599 -#: builtin/apply.c:4635
2599 +#: builtin/apply.c:4637
2600 #, c-format
2601 msgid "can't open patch '%s'"
2602 msgstr "kan inte öppna patchen \"%s\""
2603
2604 -#: builtin/apply.c:4649
2604 +#: builtin/apply.c:4651
2605 #, c-format
2606 msgid "squelched %d whitespace error"
2607 msgid_plural "squelched %d whitespace errors"
2608 msgstr[0] "undertryckte %d fel i blanksteg"
2609 msgstr[1] "undertryckte %d fel i blanksteg"
2610
2611 -#: builtin/apply.c:4655 builtin/apply.c:4665
2611 +#: builtin/apply.c:4657 builtin/apply.c:4667
2612 #, c-format
2613 msgid "%d line adds whitespace errors."
2614 msgid_plural "%d lines add whitespace errors."
@@ -3016,8 +3016,8 @@ msgid "act on remote-tracking branches"
3016 msgstr "arbeta på fjärrspårande grenar"
3017
3018 #: builtin/branch.c:834 builtin/branch.c:840 builtin/branch.c:861
3019 -#: builtin/branch.c:867 builtin/commit.c:1580 builtin/commit.c:1581
3020 -#: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:616
3019 +#: builtin/branch.c:867 builtin/commit.c:1582 builtin/commit.c:1583
3020 +#: builtin/commit.c:1584 builtin/commit.c:1585 builtin/tag.c:616
3021 #: builtin/tag.c:622
3022 msgid "commit"
3023 msgstr "incheckning"
@@ -4258,70 +4258,70 @@ msgstr ""
4258 "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
4259 "cherry-pick för återstående incheckningar.\n"
4260
4261 -#: builtin/commit.c:302
4261 +#: builtin/commit.c:304
4262 msgid "failed to unpack HEAD tree object"
4263 msgstr "misslyckades packa upp HEAD:s trädobjekt"
4264
4265 -#: builtin/commit.c:342
4265 +#: builtin/commit.c:344
4266 msgid "unable to create temporary index"
4267 msgstr "kunde inte skapa temporär indexfil"
4268
4269 -#: builtin/commit.c:348
4269 +#: builtin/commit.c:350
4270 msgid "interactive add failed"
4271 msgstr "interaktiv tilläggning misslyckades"
4272
4273 -#: builtin/commit.c:359
4273 +#: builtin/commit.c:361
4274 msgid "unable to write index file"
4275 msgstr "kan inte skriva indexfil"
4276
4277 -#: builtin/commit.c:361
4277 +#: builtin/commit.c:363
4278 msgid "unable to update temporary index"
4279 msgstr "kan inte uppdatera temporärt index"
4280
4281 -#: builtin/commit.c:363
4281 +#: builtin/commit.c:365
4282 msgid "Failed to update main cache tree"
4283 msgstr "Misslyckades uppdatera huvud-cacheträdet"
4284
4285 -#: builtin/commit.c:387 builtin/commit.c:412 builtin/commit.c:461
4285 +#: builtin/commit.c:389 builtin/commit.c:414 builtin/commit.c:463
4286 msgid "unable to write new_index file"
4287 msgstr "kunde inte skriva filen new_index"
4288
4289 -#: builtin/commit.c:443
4289 +#: builtin/commit.c:445
4290 msgid "cannot do a partial commit during a merge."
4291 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
4292
4293 -#: builtin/commit.c:445
4293 +#: builtin/commit.c:447
4294 msgid "cannot do a partial commit during a cherry-pick."
4295 msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
4296
4297 -#: builtin/commit.c:454
4297 +#: builtin/commit.c:456
4298 msgid "cannot read the index"
4299 msgstr "kan inte läsa indexet"
4300
4301 -#: builtin/commit.c:473
4301 +#: builtin/commit.c:475
4302 msgid "unable to write temporary index file"
4303 msgstr "kunde inte skriva temporär indexfil"
4304
4305 -#: builtin/commit.c:578
4305 +#: builtin/commit.c:580
4306 #, c-format
4307 msgid "commit '%s' lacks author header"
4308 msgstr "incheckningen \"%s\" saknar författarhuvud"
4309
4310 -#: builtin/commit.c:580
4310 +#: builtin/commit.c:582
4311 #, c-format
4312 msgid "commit '%s' has malformed author line"
4313 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
4314
4315 -#: builtin/commit.c:599
4315 +#: builtin/commit.c:601
4316 msgid "malformed --author parameter"
4317 msgstr "felformad \"--author\"-flagga"
4318
4319 -#: builtin/commit.c:607
4319 +#: builtin/commit.c:609
4320 #, c-format
4321 msgid "invalid date format: %s"
4322 msgstr "felaktigt datumformat: %s"
4323
4324 -#: builtin/commit.c:651
4324 +#: builtin/commit.c:653
4325 msgid ""
4326 "unable to select a comment character that is not used\n"
4327 "in the current commit message"
@@ -4329,43 +4329,43 @@ msgstr ""
4329 "kunde inte välja ett kommentarstecken som inte använts\n"
4330 "i det befintliga incheckningsmeddelandet"
4331
4332 -#: builtin/commit.c:688 builtin/commit.c:721 builtin/commit.c:1078
4332 +#: builtin/commit.c:690 builtin/commit.c:723 builtin/commit.c:1080
4333 #, c-format
4334 msgid "could not lookup commit %s"
4335 msgstr "kunde inte slå upp incheckningen %s"
4336
4337 -#: builtin/commit.c:700 builtin/shortlog.c:273
4337 +#: builtin/commit.c:702 builtin/shortlog.c:273
4338 #, c-format
4339 msgid "(reading log message from standard input)\n"
4340 msgstr "(läser loggmeddelande från standard in)\n"
4341
4342 -#: builtin/commit.c:702
4342 +#: builtin/commit.c:704
4343 msgid "could not read log from standard input"
4344 msgstr "kunde inte läsa logg från standard in"
4345
4346 -#: builtin/commit.c:706
4346 +#: builtin/commit.c:708
4347 #, c-format
4348 msgid "could not read log file '%s'"
4349 msgstr "kunde inte läsa loggfilen \"%s\""
4350
4351 -#: builtin/commit.c:728
4351 +#: builtin/commit.c:730
4352 msgid "could not read MERGE_MSG"
4353 msgstr "kunde inte läsa MERGE_MSG"
4354
4355 -#: builtin/commit.c:732
4355 +#: builtin/commit.c:734
4356 msgid "could not read SQUASH_MSG"
4357 msgstr "kunde inte läsa SQUASH_MSG"
4358
4359 -#: builtin/commit.c:736
4359 +#: builtin/commit.c:738
4360 #, c-format
4361 msgid "could not read '%s'"
4362 msgstr "kunde inte läsa \"%s\""
4363
4364 -#: builtin/commit.c:783
4364 +#: builtin/commit.c:785
4365 msgid "could not write commit template"
4366 msgstr "kunde inte skriva incheckningsmall"
4367
4368 -#: builtin/commit.c:801
4368 +#: builtin/commit.c:803
4369 #, c-format
4370 msgid ""
4371 "\n"
@@ -4380,7 +4380,7 @@ msgstr ""
4380 "\t%s\n"
4381 "och försöker igen.\n"
4382
4383 -#: builtin/commit.c:806
4383 +#: builtin/commit.c:808
4384 #, c-format
4385 msgid ""
4386 "\n"
@@ -4395,7 +4395,7 @@ msgstr ""
4395 "\t%s\n"
4396 "och försöker igen.\n"
4397
4398 -#: builtin/commit.c:819
4398 +#: builtin/commit.c:821
4399 #, c-format
4400 msgid ""
4401 "Please enter the commit message for your changes. Lines starting\n"
@@ -4405,7 +4405,7 @@ msgstr ""
4405 "med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
4406 "incheckningen.\n"
4407
4408 -#: builtin/commit.c:826
4408 +#: builtin/commit.c:828
4409 #, c-format
4410 msgid ""
4411 "Please enter the commit message for your changes. Lines starting\n"
@@ -4416,145 +4416,145 @@ msgstr ""
4416 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
4417 "Ett tomt meddelande avbryter incheckningen.\n"
4418
4419 -#: builtin/commit.c:846
4419 +#: builtin/commit.c:848
4420 #, c-format
4421 msgid "%sAuthor: %.*s <%.*s>"
4422 msgstr "%sFörfattare: %.*s <%.*s>"
4423
4424 -#: builtin/commit.c:854
4424 +#: builtin/commit.c:856
4425 #, c-format
4426 msgid "%sDate: %s"
4427 msgstr "%sDatum: %s"
4428
4429 -#: builtin/commit.c:861
4429 +#: builtin/commit.c:863
4430 #, c-format
4431 msgid "%sCommitter: %.*s <%.*s>"
4432 msgstr "%sIncheckare: %.*s <%.*s>"
4433
4434 -#: builtin/commit.c:879
4434 +#: builtin/commit.c:881
4435 msgid "Cannot read index"
4436 msgstr "Kan inte läsa indexet"
4437
4438 -#: builtin/commit.c:936
4438 +#: builtin/commit.c:938
4439 msgid "Error building trees"
4440 msgstr "Fel vid byggande av träd"
4441
4442 -#: builtin/commit.c:951 builtin/tag.c:495
4442 +#: builtin/commit.c:953 builtin/tag.c:495
4443 #, c-format
4444 msgid "Please supply the message using either -m or -F option.\n"
4445 msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
4446
4447 -#: builtin/commit.c:1053
4447 +#: builtin/commit.c:1055
4448 #, c-format
4449 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
4450 msgstr ""
4451 "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
4452
4453 -#: builtin/commit.c:1068 builtin/commit.c:1308
4453 +#: builtin/commit.c:1070 builtin/commit.c:1310
4454 #, c-format
4455 msgid "Invalid untracked files mode '%s'"
4456 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
4457
4458 -#: builtin/commit.c:1105
4458 +#: builtin/commit.c:1107
4459 msgid "--long and -z are incompatible"
4460 msgstr "--long och -z är inkompatibla"
4461
4462 -#: builtin/commit.c:1135
4462 +#: builtin/commit.c:1137
4463 msgid "Using both --reset-author and --author does not make sense"
4464 msgstr "Kan inte använda både --reset-author och --author"
4465
4466 -#: builtin/commit.c:1144
4466 +#: builtin/commit.c:1146
4467 msgid "You have nothing to amend."
4468 msgstr "Du har inget att utöka."
4469
4470 -#: builtin/commit.c:1147
4470 +#: builtin/commit.c:1149
4471 msgid "You are in the middle of a merge -- cannot amend."
4472 msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
4473
4474 -#: builtin/commit.c:1149
4474 +#: builtin/commit.c:1151
4475 msgid "You are in the middle of a cherry-pick -- cannot amend."
4476 msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
4477
4478 -#: builtin/commit.c:1152
4478 +#: builtin/commit.c:1154
4479 msgid "Options --squash and --fixup cannot be used together"
4480 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
4481
4482 -#: builtin/commit.c:1162
4482 +#: builtin/commit.c:1164
4483 msgid "Only one of -c/-C/-F/--fixup can be used."
4484 msgstr "Endast en av -c/-C/-F/--fixup kan användas."
4485
4486 -#: builtin/commit.c:1164
4486 +#: builtin/commit.c:1166
4487 msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
4488 msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
4489
4490 -#: builtin/commit.c:1172
4490 +#: builtin/commit.c:1174
4491 msgid "--reset-author can be used only with -C, -c or --amend."
4492 msgstr "--reset-author kan endast användas med -C, -c eller --amend."
4493
4494 -#: builtin/commit.c:1189
4494 +#: builtin/commit.c:1191
4495 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
4496 msgstr ""
4497 "Endast en av --include/--only/--all/--interactive/--patch kan användas."
4498
4499 -#: builtin/commit.c:1191
4499 +#: builtin/commit.c:1193
4500 msgid "No paths with --include/--only does not make sense."
4501 msgstr "Du måste ange sökvägar tillsammans med --include/--only."
4502
4503 -#: builtin/commit.c:1193
4503 +#: builtin/commit.c:1195
4504 msgid "Clever... amending the last one with dirty index."
4505 msgstr "Smart... utöka den senaste med smutsigt index."
4506
4507 -#: builtin/commit.c:1195
4507 +#: builtin/commit.c:1197
4508 msgid "Explicit paths specified without -i or -o; assuming --only paths..."
4509 msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
4510
4511 -#: builtin/commit.c:1207 builtin/tag.c:728
4511 +#: builtin/commit.c:1209 builtin/tag.c:728
4512 #, c-format
4513 msgid "Invalid cleanup mode %s"
4514 msgstr "Felaktigt städningsläge %s"
4515
4516 -#: builtin/commit.c:1212
4516 +#: builtin/commit.c:1214
4517 msgid "Paths with -a does not make sense."
4518 msgstr "Kan inte ange sökvägar med -a."
4519
4520 -#: builtin/commit.c:1322 builtin/commit.c:1602
4520 +#: builtin/commit.c:1324 builtin/commit.c:1604
4521 msgid "show status concisely"
4522 msgstr "visa koncis status"
4523
4524 -#: builtin/commit.c:1324 builtin/commit.c:1604
4524 +#: builtin/commit.c:1326 builtin/commit.c:1606
4525 msgid "show branch information"
4526 msgstr "visa information om gren"
4527
4528 -#: builtin/commit.c:1326 builtin/commit.c:1606 builtin/push.c:509
4528 +#: builtin/commit.c:1328 builtin/commit.c:1608 builtin/push.c:509
4529 msgid "machine-readable output"
4530 msgstr "maskinläsbar utdata"
4531
4532 -#: builtin/commit.c:1329 builtin/commit.c:1608
4532 +#: builtin/commit.c:1331 builtin/commit.c:1610
4533 msgid "show status in long format (default)"
4534 msgstr "visa status i långt format (standard)"
4535
4536 -#: builtin/commit.c:1332 builtin/commit.c:1611
4536 +#: builtin/commit.c:1334 builtin/commit.c:1613
4537 msgid "terminate entries with NUL"
4538 msgstr "terminera poster med NUL"
4539
4540 -#: builtin/commit.c:1334 builtin/commit.c:1614 builtin/fast-export.c:980
4540 +#: builtin/commit.c:1336 builtin/commit.c:1616 builtin/fast-export.c:980
4541 #: builtin/fast-export.c:983 builtin/tag.c:603
4542 msgid "mode"
4543 msgstr "läge"
4544
4545 -#: builtin/commit.c:1335 builtin/commit.c:1614
4545 +#: builtin/commit.c:1337 builtin/commit.c:1616
4546 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
4547 msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
4548
4549 -#: builtin/commit.c:1338
4549 +#: builtin/commit.c:1340
4550 msgid "show ignored files"
4551 msgstr "visa ignorerade filer"
4552
4553 -#: builtin/commit.c:1339 parse-options.h:153
4553 +#: builtin/commit.c:1341 parse-options.h:153
4554 msgid "when"
4555 msgstr "när"
4556
4557 -#: builtin/commit.c:1340
4557 +#: builtin/commit.c:1342
4558 msgid ""
4559 "ignore changes to submodules, optional when: all, dirty, untracked. "
4560 "(Default: all)"
@@ -4562,209 +4562,209 @@ msgstr ""
4562 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
4563 "(Default: all)"
4564
4565 -#: builtin/commit.c:1342
4565 +#: builtin/commit.c:1344
4566 msgid "list untracked files in columns"
4567 msgstr "visa ospårade filer i spalter"
4568
4569 -#: builtin/commit.c:1429
4569 +#: builtin/commit.c:1431
4570 msgid "couldn't look up newly created commit"
4571 msgstr "kunde inte slå upp en precis skapad incheckning"
4572
4573 -#: builtin/commit.c:1431
4573 +#: builtin/commit.c:1433
4574 msgid "could not parse newly created commit"
4575 msgstr "kunde inte tolka en precis skapad incheckning"
4576
4577 -#: builtin/commit.c:1476
4577 +#: builtin/commit.c:1478
4578 msgid "detached HEAD"
4579 msgstr "frånkopplad HEAD"
4580
4581 -#: builtin/commit.c:1479
4581 +#: builtin/commit.c:1481
4582 msgid " (root-commit)"
4583 msgstr " (rotincheckning)"
4584
4585 -#: builtin/commit.c:1572
4585 +#: builtin/commit.c:1574
4586 msgid "suppress summary after successful commit"
4587 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
4588
4589 -#: builtin/commit.c:1573
4589 +#: builtin/commit.c:1575
4590 msgid "show diff in commit message template"
4591 msgstr "visa diff i mallen för incheckningsmeddelandet"
4592
4593 -#: builtin/commit.c:1575
4593 +#: builtin/commit.c:1577
4594 msgid "Commit message options"
4595 msgstr "Alternativ för incheckningsmeddelande"
4596
4597 -#: builtin/commit.c:1576 builtin/tag.c:601
4597 +#: builtin/commit.c:1578 builtin/tag.c:601
4598 msgid "read message from file"
4599 msgstr "läs meddelande från fil"
4600
4601 -#: builtin/commit.c:1577
4601 +#: builtin/commit.c:1579
4602 msgid "author"
4603 msgstr "författare"
4604
4605 -#: builtin/commit.c:1577
4605 +#: builtin/commit.c:1579
4606 msgid "override author for commit"
4607 msgstr "överstyr författare för incheckningen"
4608
4609 -#: builtin/commit.c:1578 builtin/gc.c:275
4609 +#: builtin/commit.c:1580 builtin/gc.c:275
4610 msgid "date"
4611 msgstr "datum"
4612
4613 -#: builtin/commit.c:1578
4613 +#: builtin/commit.c:1580
4614 msgid "override date for commit"
4615 msgstr "överstyr datum för incheckningen"
4616
4617 -#: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:391
4617 +#: builtin/commit.c:1581 builtin/merge.c:218 builtin/notes.c:391
4618 #: builtin/notes.c:554 builtin/tag.c:599
4619 msgid "message"
4620 msgstr "meddelande"
4621
4622 -#: builtin/commit.c:1579
4622 +#: builtin/commit.c:1581
4623 msgid "commit message"
4624 msgstr "incheckningsmeddelande"
4625
4626 -#: builtin/commit.c:1580
4626 +#: builtin/commit.c:1582
4627 msgid "reuse and edit message from specified commit"
4628 msgstr "återanvänd och redigera meddelande från angiven incheckning"
4629
4630 -#: builtin/commit.c:1581
4630 +#: builtin/commit.c:1583
4631 msgid "reuse message from specified commit"
4632 msgstr "återanvänd meddelande från angiven incheckning"
4633
4634 -#: builtin/commit.c:1582
4634 +#: builtin/commit.c:1584
4635 msgid "use autosquash formatted message to fixup specified commit"
4636 msgstr ""
4637 "använd autosquash-formaterat meddelande för att fixa angiven incheckning"
4638
4639 -#: builtin/commit.c:1583
4639 +#: builtin/commit.c:1585
4640 msgid "use autosquash formatted message to squash specified commit"
4641 msgstr ""
4642 "använd autosquash-formaterat meddelande för att slå ihop med angiven "
4643 "incheckning"
4644
4645 -#: builtin/commit.c:1584
4645 +#: builtin/commit.c:1586
4646 msgid "the commit is authored by me now (used with -C/-c/--amend)"
4647 msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
4648
4649 -#: builtin/commit.c:1585 builtin/log.c:1191 builtin/revert.c:86
4649 +#: builtin/commit.c:1587 builtin/log.c:1191 builtin/revert.c:86
4650 msgid "add Signed-off-by:"
4651 msgstr "lägg till Signed-off-by:"
4652
4653 -#: builtin/commit.c:1586
4653 +#: builtin/commit.c:1588
4654 msgid "use specified template file"
4655 msgstr "använd angiven mallfil"
4656
4657 -#: builtin/commit.c:1587
4657 +#: builtin/commit.c:1589
4658 msgid "force edit of commit"
4659 msgstr "tvinga redigering av incheckning"
4660
4661 -#: builtin/commit.c:1588
4661 +#: builtin/commit.c:1590
4662 msgid "default"
4663 msgstr "standard"
4664
4665 -#: builtin/commit.c:1588 builtin/tag.c:604
4665 +#: builtin/commit.c:1590 builtin/tag.c:604
4666 msgid "how to strip spaces and #comments from message"
4667 msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
4668
4669 -#: builtin/commit.c:1589
4669 +#: builtin/commit.c:1591
4670 msgid "include status in commit message template"
4671 msgstr "inkludera status i mallen för incheckningsmeddelandet"
4672
4673 -#: builtin/commit.c:1590 builtin/merge.c:225 builtin/revert.c:92
4673 +#: builtin/commit.c:1592 builtin/merge.c:225 builtin/revert.c:92
4674 #: builtin/tag.c:605
4675 msgid "key-id"
4676 msgstr "nyckel-id"
4677
4678 -#: builtin/commit.c:1591 builtin/merge.c:226 builtin/revert.c:93
4678 +#: builtin/commit.c:1593 builtin/merge.c:226 builtin/revert.c:93
4679 msgid "GPG sign commit"
4680 msgstr "GPG-signera incheckning"
4681
4682 -#: builtin/commit.c:1594
4682 +#: builtin/commit.c:1596
4683 msgid "Commit contents options"
4684 msgstr "Alternativ för incheckningens innehåll"
4685
4686 -#: builtin/commit.c:1595
4686 +#: builtin/commit.c:1597
4687 msgid "commit all changed files"
4688 msgstr "checka in alla ändrade filer"
4689
4690 -#: builtin/commit.c:1596
4690 +#: builtin/commit.c:1598
4691 msgid "add specified files to index for commit"
4692 msgstr "lägg till angivna filer till indexet för incheckning"
4693
4694 -#: builtin/commit.c:1597
4694 +#: builtin/commit.c:1599
4695 msgid "interactively add files"
4696 msgstr "lägg till filer interaktivt"
4697
4698 -#: builtin/commit.c:1598
4698 +#: builtin/commit.c:1600
4699 msgid "interactively add changes"
4700 msgstr "lägg till ändringar interaktivt"
4701
4702 -#: builtin/commit.c:1599
4702 +#: builtin/commit.c:1601
4703 msgid "commit only specified files"
4704 msgstr "checka endast in angivna filer"
4705
4706 -#: builtin/commit.c:1600
4706 +#: builtin/commit.c:1602
4707 msgid "bypass pre-commit hook"
4708 msgstr "förbigå pre-commit-krok"
4709
4710 -#: builtin/commit.c:1601
4710 +#: builtin/commit.c:1603
4711 msgid "show what would be committed"
4712 msgstr "visa vad som skulle checkas in"
4713
4714 -#: builtin/commit.c:1612
4714 +#: builtin/commit.c:1614
4715 msgid "amend previous commit"
4716 msgstr "lägg till föregående incheckning"
4717
4718 -#: builtin/commit.c:1613
4718 +#: builtin/commit.c:1615
4719 msgid "bypass post-rewrite hook"
4720 msgstr "förbigå post-rewrite-krok"
4721
4722 -#: builtin/commit.c:1618
4722 +#: builtin/commit.c:1620
4723 msgid "ok to record an empty change"
4724 msgstr "ok att registrera en tom ändring"
4725
4726 -#: builtin/commit.c:1620
4726 +#: builtin/commit.c:1622
4727 msgid "ok to record a change with an empty message"
4728 msgstr "ok att registrera en ändring med tomt meddelande"
4729
4730 -#: builtin/commit.c:1649
4730 +#: builtin/commit.c:1651
4731 msgid "could not parse HEAD commit"
4732 msgstr "kunde inte tolka HEAD:s incheckning"
4733
4734 -#: builtin/commit.c:1688 builtin/merge.c:519
4734 +#: builtin/commit.c:1690 builtin/merge.c:519
4735 #, c-format
4736 msgid "could not open '%s' for reading"
4737 msgstr "kunde inte öppna \"%s\" för läsning"
4738
4739 -#: builtin/commit.c:1695
4739 +#: builtin/commit.c:1697
4740 #, c-format
4741 msgid "Corrupt MERGE_HEAD file (%s)"
4742 msgstr "Trasig MERGE_HEAD-fil (%s)"
4743
4744 -#: builtin/commit.c:1702
4744 +#: builtin/commit.c:1704
4745 msgid "could not read MERGE_MODE"
4746 msgstr "kunde inte läsa MERGE_MODE"
4747
4748 -#: builtin/commit.c:1721
4748 +#: builtin/commit.c:1723
4749 #, c-format
4750 msgid "could not read commit message: %s"
4751 msgstr "kunde inte läsa incheckningsmeddelande: %s"
4752
4753 -#: builtin/commit.c:1732
4753 +#: builtin/commit.c:1734
4754 #, c-format
4755 msgid "Aborting commit; you did not edit the message.\n"
4756 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
4757
4758 -#: builtin/commit.c:1737
4758 +#: builtin/commit.c:1739
4759 #, c-format
4760 msgid "Aborting commit due to empty commit message.\n"
4761 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
4762
4763 -#: builtin/commit.c:1752 builtin/merge.c:851 builtin/merge.c:876
4763 +#: builtin/commit.c:1754 builtin/merge.c:851 builtin/merge.c:876
4764 msgid "failed to write commit object"
4765 msgstr "kunde inte skriva incheckningsobjekt"
4766
4767 -#: builtin/commit.c:1785
4767 +#: builtin/commit.c:1787
4768 msgid ""
4769 "Repository has been updated, but unable to write\n"
4770 "new_index file. Check that disk is not full and quota is\n"
@@ -6397,11 +6397,11 @@ msgstr " delat"
6397
6398 #: builtin/init-db.c:475
6399 msgid ""
6400 -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
6401 -"shared[=<permissions>]] [<directory>]"
6400 +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared"
6401 +"[=<permissions>]] [<directory>]"
6402 msgstr ""
6403 -"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
6404 -"shared[=<behörigheter>]] [<katalog>]"
6403 +"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--shared"
6404 +"[=<behörigheter>]] [<katalog>]"
6405
6406 #: builtin/init-db.c:498
6407 msgid "permissions"
@@ -6444,8 +6444,8 @@ msgid ""
6444 "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] "
6445 "[<file>...]"
6446 msgstr ""
6447 -"git interpret-trailers [--trim-empty] [(--trailer "
6448 -"<symbol>[(=|:)<värde>])...] [<fil>...]"
6447 +"git interpret-trailers [--trim-empty] [(--trailer <symbol>[(=|:)"
6448 +"<värde>])...] [<fil>...]"
6449
6450 #: builtin/interpret-trailers.c:25
6451 msgid "trim empty trailers"
@@ -9844,115 +9844,115 @@ msgstr "Packar upp objekt"
9844 msgid "git update-index [<options>] [--] [<file>...]"
9845 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
9846
9847 -#: builtin/update-index.c:756
9847 +#: builtin/update-index.c:757
9848 msgid "continue refresh even when index needs update"
9849 msgstr "fortsätt uppdatera även när index inte är àjour"
9850
9851 -#: builtin/update-index.c:759
9851 +#: builtin/update-index.c:760
9852 msgid "refresh: ignore submodules"
9853 msgstr "refresh: ignorera undermoduler"
9854
9855 -#: builtin/update-index.c:762
9855 +#: builtin/update-index.c:763
9856 msgid "do not ignore new files"
9857 msgstr "ignorera inte nya filer"
9858
9859 -#: builtin/update-index.c:764
9859 +#: builtin/update-index.c:765
9860 msgid "let files replace directories and vice-versa"
9861 msgstr "låt filer ersätta kataloger och omvänt"
9862
9863 -#: builtin/update-index.c:766
9863 +#: builtin/update-index.c:767
9864 msgid "notice files missing from worktree"
9865 msgstr "lägg märke till filer som saknas i arbetskatalogen"
9866
9867 -#: builtin/update-index.c:768
9867 +#: builtin/update-index.c:769
9868 msgid "refresh even if index contains unmerged entries"
9869 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
9870
9871 -#: builtin/update-index.c:771
9871 +#: builtin/update-index.c:772
9872 msgid "refresh stat information"
9873 msgstr "uppdatera statusinformation"
9874
9875 -#: builtin/update-index.c:775
9875 +#: builtin/update-index.c:776
9876 msgid "like --refresh, but ignore assume-unchanged setting"
9877 msgstr "som --refresh, men ignorera assume-unchanged-inställning"
9878
9879 -#: builtin/update-index.c:779
9879 +#: builtin/update-index.c:780
9880 msgid "<mode>,<object>,<path>"
9881 msgstr "<läge>,<objekt>,<sökväg>"
9882
9883 -#: builtin/update-index.c:780
9883 +#: builtin/update-index.c:781
9884 msgid "add the specified entry to the index"
9885 msgstr "lägg till angiven post i indexet"
9886
9887 -#: builtin/update-index.c:784
9887 +#: builtin/update-index.c:785
9888 msgid "(+/-)x"
9889 msgstr "(+/-)x"
9890
9891 -#: builtin/update-index.c:785
9891 +#: builtin/update-index.c:786
9892 msgid "override the executable bit of the listed files"
9893 msgstr "överstyr exekveringsbiten för angivna filer"
9894
9895 -#: builtin/update-index.c:789
9895 +#: builtin/update-index.c:790
9896 msgid "mark files as \"not changing\""
9897 msgstr "markera filer som \"ändras inte\""
9898
9899 -#: builtin/update-index.c:792
9899 +#: builtin/update-index.c:793
9900 msgid "clear assumed-unchanged bit"
9901 msgstr "rensa \"assume-unchanged\"-biten"
9902
9903 -#: builtin/update-index.c:795
9903 +#: builtin/update-index.c:796
9904 msgid "mark files as \"index-only\""
9905 msgstr "markera filer som \"endast index\""
9906
9907 -#: builtin/update-index.c:798
9907 +#: builtin/update-index.c:799
9908 msgid "clear skip-worktree bit"
9909 msgstr "töm \"skip-worktree\"-biten"
9910
9911 -#: builtin/update-index.c:801
9911 +#: builtin/update-index.c:802
9912 msgid "add to index only; do not add content to object database"
9913 msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
9914
9915 -#: builtin/update-index.c:803
9915 +#: builtin/update-index.c:804
9916 msgid "remove named paths even if present in worktree"
9917 msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
9918
9919 -#: builtin/update-index.c:805
9919 +#: builtin/update-index.c:806
9920 msgid "with --stdin: input lines are terminated by null bytes"
9921 msgstr "med --stdin: indatarader termineras med null-byte"
9922
9923 -#: builtin/update-index.c:807
9923 +#: builtin/update-index.c:808
9924 msgid "read list of paths to be updated from standard input"
9925 msgstr "läs lista över sökvägar att uppdatera från standard in"
9926
9927 -#: builtin/update-index.c:811
9927 +#: builtin/update-index.c:812
9928 msgid "add entries from standard input to the index"
9929 msgstr "lägg poster från standard in till indexet"
9930
9931 -#: builtin/update-index.c:815
9931 +#: builtin/update-index.c:816
9932 msgid "repopulate stages #2 and #3 for the listed paths"
9933 msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
9934
9935 -#: builtin/update-index.c:819
9935 +#: builtin/update-index.c:820
9936 msgid "only update entries that differ from HEAD"
9937 msgstr "uppdatera endast poster som skiljer sig från HEAD"
9938
9939 -#: builtin/update-index.c:823
9939 +#: builtin/update-index.c:824
9940 msgid "ignore files missing from worktree"
9941 msgstr "ignorera filer som saknas i arbetskatalogen"
9942
9943 -#: builtin/update-index.c:826
9943 +#: builtin/update-index.c:827
9944 msgid "report actions to standard output"
9945 msgstr "rapportera åtgärder på standard ut"
9946
9947 -#: builtin/update-index.c:828
9947 +#: builtin/update-index.c:829
9948 msgid "(for porcelains) forget saved unresolved conflicts"
9949 msgstr "(för porslin) glöm sparade olösta konflikter"
9950
9951 -#: builtin/update-index.c:832
9951 +#: builtin/update-index.c:833
9952 msgid "write index in this format"
9953 msgstr "skriv index i detta format"
9954
9955 -#: builtin/update-index.c:834
9955 +#: builtin/update-index.c:835
9956 msgid "enable or disable split index"
9957 msgstr "aktivera eller inaktivera delat index"
9958
@@ -11122,6 +11122,9 @@ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
11122 msgid "Synchronizing submodule url for '$displaypath'"
11123 msgstr "Synkroniserar undermodul-url för \"$displaypath\""
11124
11125 +#~ msgid "server does not support --atomic push"
11126 +#~ msgstr "servern stöder inte push med --atomic"
11127 +
11128 #~ msgid "(detached from %s)"
11129 #~ msgstr "(frånkopplad från %s)"
11130