diff options
Diffstat (limited to 'po')
| -rw-r--r-- | po/sv.po | 6274 |
1 files changed, 3348 insertions, 2926 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010-2020. +# Peter Krefting <peter@softwolves.pp.se>, 2010-2021. # msgid "" msgstr "" -"Project-Id-Version: git 2.30.0\n" +"Project-Id-Version: git 2.31.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2020-12-21 07:10+0800\n" -"PO-Revision-Date: 2020-12-21 08:08+0100\n" +"POT-Creation-Date: 2021-02-26 22:09+0800\n" +"PO-Revision-Date: 2021-02-28 22:18+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -23,9 +23,9 @@ msgstr "" msgid "Huh (%s)?" msgstr "Vadå (%s)?" -#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284 -#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532 -#: builtin/rebase.c:1955 +#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292 +#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538 +#: builtin/rebase.c:1963 msgid "could not read index" msgstr "kunde inte läsa indexet" @@ -53,7 +53,7 @@ msgstr "Uppdatera" msgid "could not stage '%s'" msgstr "kunde inte köa \"%s\"" -#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478 +#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486 msgid "could not write index" msgstr "kunde inte skriva indexet" @@ -211,7 +211,7 @@ msgstr "ej köad" #: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257 #: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124 -#: builtin/fetch.c:147 builtin/merge.c:284 builtin/pull.c:190 +#: builtin/fetch.c:150 builtin/merge.c:285 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1818 #: builtin/submodule--helper.c:1821 builtin/submodule--helper.c:2326 #: builtin/submodule--helper.c:2329 builtin/submodule--helper.c:2572 @@ -797,7 +797,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:281 builtin/merge.c:1369 +#: advice.c:281 builtin/merge.c:1370 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -1101,7 +1101,8 @@ msgstr "patch misslyckades: %s:%ld" msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213 +#: setup.c:308 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" @@ -1262,7 +1263,7 @@ msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4374 builtin/bisect--helper.c:524 +#: apply.c:4374 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" @@ -1298,7 +1299,7 @@ msgstr[1] "Tillämpade patchen %%s med %d refuserade..." msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228 +#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" @@ -1352,7 +1353,7 @@ msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg." msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg." -#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406 +#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1420,7 +1421,7 @@ msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525 +#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" @@ -1430,7 +1431,7 @@ msgstr "se till att åtminstone <n> rader sammanhang är lika" #: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3562 builtin/rebase.c:1346 +#: builtin/pack-objects.c:3577 builtin/rebase.c:1352 msgid "action" msgstr "åtgärd" @@ -1458,9 +1459,9 @@ msgstr "lämna refuserade stycken i motsvarande *.rej-filer" msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5045 builtin/add.c:329 builtin/check-ignore.c:22 -#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:775 -#: builtin/log.c:2287 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22 +#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757 +#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" @@ -1548,14 +1549,14 @@ msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886 -#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786 -#: builtin/merge.c:1138 +#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894 +#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786 +#: builtin/merge.c:1139 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315 +#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -1597,7 +1598,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:556 builtin/log.c:1765 +#: archive.c:556 builtin/log.c:1764 msgid "prefix" msgstr "prefix" @@ -1605,11 +1606,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890 -#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135 +#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888 +#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 -#: builtin/fast-export.c:1213 builtin/grep.c:919 builtin/hash-object.c:105 -#: builtin/ls-files.c:561 builtin/ls-files.c:564 builtin/notes.c:412 +#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105 +#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190 msgid "file" msgstr "fil" @@ -1775,12 +1776,12 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255 +#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: bisect.c:987 builtin/merge.c:152 +#: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "kunde inte läsa filen \"%s\"" @@ -1798,10 +1799,10 @@ msgstr "%s var både %s och %s\n" #, c-format msgid "" "No testable commit found.\n" -"Maybe you started with bad path parameters?\n" +"Maybe you started with bad path arguments?\n" msgstr "" "Ingen testbar incheckning hittades.\n" -"Kanske du startade med felaktiga sökvägsparametrar?\n" +"Kanske du startade med felaktiga sökvägsargument?\n" #: bisect.c:1095 #, c-format @@ -1834,11 +1835,11 @@ msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138 -#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409 -#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336 -#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395 -#: builtin/shortlog.c:267 +#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146 +#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411 +#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335 +#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410 +#: builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -2022,7 +2023,7 @@ msgstr "'%s' ser inte ut som en v2- eller v3-paket-fil (bundle)" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176 +#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184 #: builtin/commit.c:814 #, c-format msgid "could not open '%s'" @@ -2066,40 +2067,36 @@ msgstr "Kunde inte starta pack-objects" msgid "pack-objects died" msgstr "pack-objects misslyckades" -#: bundle.c:379 -msgid "rev-list died" -msgstr "rev-list dog" - -#: bundle.c:428 +#: bundle.c:386 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:498 +#: bundle.c:490 #, c-format msgid "unsupported bundle version %d" msgstr "version %d för paket (bundle) stöds ej" -#: bundle.c:500 +#: bundle.c:492 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "kan inte skriva paket (bundle) med version %d med algoritmen %s" -#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408 +#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" -#: bundle.c:530 +#: bundle.c:539 msgid "Refusing to create empty bundle." msgstr "Vägrar skapa ett tomt paket (bundle)." -#: bundle.c:540 +#: bundle.c:549 #, c-format msgid "cannot create '%s'" msgstr "kan inte skapa \"%s\"" -#: bundle.c:565 +#: bundle.c:574 msgid "index-pack died" msgstr "index-pack dog" @@ -2108,236 +2105,257 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit-graph.c:188 midx.c:47 +#: commit-graph.c:198 midx.c:47 msgid "invalid hash version" msgstr "felaktig hashnings-version" -#: commit-graph.c:246 +#: commit-graph.c:219 +msgid "repository contains replace objects; skipping commit-graph" +msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf" + +#: commit-graph.c:228 +msgid "repository contains (deprecated) grafts; skipping commit-graph" +msgstr "" +"arkivet innehåller ympningar (avråds från); hoppar över incheckningsgraf" + +#: commit-graph.c:233 +msgid "repository is shallow; skipping commit-graph" +msgstr "källarkivet är grunt; hoppar över incheckningsgraf" + +#: commit-graph.c:264 msgid "commit-graph file is too small" msgstr "incheckningsgraffilen %s är för liten" -#: commit-graph.c:311 +#: commit-graph.c:329 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X" -#: commit-graph.c:318 +#: commit-graph.c:336 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "incheckningsgrafens version %X stämmer inte med versionen %X" -#: commit-graph.c:325 +#: commit-graph.c:343 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X" -#: commit-graph.c:342 +#: commit-graph.c:360 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken" -#: commit-graph.c:361 +#: commit-graph.c:379 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen" -#: commit-graph.c:433 +#: commit-graph.c:465 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger" -#: commit-graph.c:499 +#: commit-graph.c:531 msgid "commit-graph has no base graphs chunk" msgstr "incheckningsgrafen har inga bas-graf-stycken" -#: commit-graph.c:509 +#: commit-graph.c:541 msgid "commit-graph chain does not match" msgstr "incheckningsgrafens kedja stämmer inte" -#: commit-graph.c:557 +#: commit-graph.c:589 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" -#: commit-graph.c:581 +#: commit-graph.c:613 msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:721 commit-graph.c:785 +#: commit-graph.c:794 commit-graph.c:831 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:742 +#: commit-graph.c:815 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1036 builtin/am.c:1292 +#: commit-graph.c:848 +msgid "commit-graph requires overflow generation data but has none" +msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen" + +#: commit-graph.c:1121 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: commit-graph.c:1252 builtin/pack-objects.c:2864 +#: commit-graph.c:1378 builtin/pack-objects.c:2872 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1283 +#: commit-graph.c:1409 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1300 +#: commit-graph.c:1426 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1320 +#: commit-graph.c:1446 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1339 +#: commit-graph.c:1465 +msgid "Computing commit graph topological levels" +msgstr "Beräknar topografiska nivåer för incheckningsgraf" + +#: commit-graph.c:1518 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1406 +#: commit-graph.c:1599 msgid "Computing commit changed paths Bloom filters" msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen" -#: commit-graph.c:1483 +#: commit-graph.c:1676 msgid "Collecting referenced commits" msgstr "Samlar refererade incheckningar" -#: commit-graph.c:1508 +#: commit-graph.c:1701 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket" msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket" -#: commit-graph.c:1521 +#: commit-graph.c:1714 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1525 +#: commit-graph.c:1718 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1562 +#: commit-graph.c:1755 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1580 +#: commit-graph.c:1773 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1628 +#: commit-graph.c:1821 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1670 midx.c:819 +#: commit-graph.c:1863 midx.c:819 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1683 +#: commit-graph.c:1876 msgid "unable to create temporary graph layer" msgstr "kan inte skapa temporärt graflager" -#: commit-graph.c:1688 +#: commit-graph.c:1881 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "kan inte justera delade behörigheter för \"%s\"" -#: commit-graph.c:1758 +#: commit-graph.c:1966 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Skriver ut incheckningsgraf i %d pass" msgstr[1] "Skriver ut incheckningsgraf i %d pass" -#: commit-graph.c:1803 +#: commit-graph.c:2011 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1819 +#: commit-graph.c:2027 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1839 +#: commit-graph.c:2047 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1965 +#: commit-graph.c:2180 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:2009 +#: commit-graph.c:2224 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:2115 +#: commit-graph.c:2331 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "" "försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad" -#: commit-graph.c:2214 +#: commit-graph.c:2438 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:2307 +#: commit-graph.c:2536 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig" -#: commit-graph.c:2317 +#: commit-graph.c:2546 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:2327 commit-graph.c:2342 +#: commit-graph.c:2556 commit-graph.c:2571 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u" -#: commit-graph.c:2334 +#: commit-graph.c:2563 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:2352 +#: commit-graph.c:2581 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2367 +#: commit-graph.c:2596 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf" -#: commit-graph.c:2374 +#: commit-graph.c:2603 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s" -#: commit-graph.c:2384 +#: commit-graph.c:2613 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång" -#: commit-graph.c:2393 +#: commit-graph.c:2622 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "incheckningsgrafens förälder för %s är %s != %s" -#: commit-graph.c:2407 +#: commit-graph.c:2636 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt" -#: commit-graph.c:2412 +#: commit-graph.c:2641 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -2345,7 +2363,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2416 +#: commit-graph.c:2645 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -2353,19 +2371,21 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2432 +#: commit-graph.c:2662 #, c-format -msgid "commit-graph generation for commit %s is %u != %u" -msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" +msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>" +msgstr "" +"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < " +"%<PRIuMAX>" -#: commit-graph.c:2438 +#: commit-graph.c:2668 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" "incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !" "= %<PRIuMAX>" -#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403 +#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403 #: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457 #, c-format msgid "could not parse %s" @@ -2396,29 +2416,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1172 +#: commit.c:1223 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s." -#: commit.c:1176 +#: commit.c:1227 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "" "Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s." -#: commit.c:1179 +#: commit.c:1230 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1182 +#: commit.c:1233 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: commit.c:1436 +#: commit.c:1487 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -2432,7 +2452,7 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:125 +#: config.c:126 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" @@ -2447,296 +2467,340 @@ msgstr "" "\t%s\n" "Det kan bero på cirkulära inkluderingar." -#: config.c:141 +#: config.c:142 #, c-format msgid "could not expand include path '%s'" msgstr "kunde inte expandera inkluderingssökväg \"%s\"" -#: config.c:152 +#: config.c:153 msgid "relative config includes must come from files" msgstr "relativa konfigureringsinkluderingar måste komma från filer" -#: config.c:198 +#: config.c:199 msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:378 +#: config.c:396 +#, c-format +msgid "invalid config format: %s" +msgstr "felaktigt konfigurationsformat: %s" + +#: config.c:400 +#, c-format +msgid "missing environment variable name for configuration '%.*s'" +msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\"" + +#: config.c:405 +#, c-format +msgid "missing environment variable '%s' for configuration '%.*s'" +msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\"" + +#: config.c:442 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:384 +#: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:408 sequencer.c:2580 +#: config.c:472 sequencer.c:2588 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:414 +#: config.c:478 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:450 config.c:462 +#: config.c:511 +msgid "empty config key" +msgstr "tom konfigurationsnyckel" + +#: config.c:529 config.c:541 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:497 +#: config.c:555 config.c:572 config.c:579 config.c:588 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:836 +#: config.c:622 +#, c-format +msgid "bogus count in %s" +msgstr "felaktigt antal i %s" + +#: config.c:626 +#, c-format +msgid "too many entries in %s" +msgstr "för många poster i %s" + +#: config.c:636 +#, c-format +msgid "missing config key %s" +msgstr "konfigurationsnyckel saknas för %s" + +#: config.c:644 +#, c-format +msgid "missing config value %s" +msgstr "konfigurationsvärde saknas för %s" + +#: config.c:995 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:840 +#: config.c:999 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:844 +#: config.c:1003 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:848 +#: config.c:1007 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:852 +#: config.c:1011 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:856 +#: config.c:1015 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:993 +#: config.c:1152 msgid "out of range" msgstr "utanför intervallet" -#: config.c:993 +#: config.c:1152 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:994 +#: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:1013 +#: config.c:1163 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s" -#: config.c:1016 +#: config.c:1166 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s" -#: config.c:1019 +#: config.c:1169 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s" -#: config.c:1022 +#: config.c:1172 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:" "en %s: %s" -#: config.c:1025 +#: config.c:1175 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden " "%s: %s" -#: config.c:1028 +#: config.c:1178 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s" -#: config.c:1123 +#: config.c:1194 +#, c-format +msgid "bad boolean config value '%s' for '%s'" +msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\"" + +#: config.c:1289 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1132 +#: config.c:1298 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1223 +#: config.c:1391 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1237 config.c:1248 +#: config.c:1405 config.c:1416 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1340 +#: config.c:1508 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1373 +#: config.c:1541 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1445 +#: config.c:1613 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1471 +#: config.c:1639 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1472 +#: config.c:1640 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "måste vara en av nothing, matching, simple, upstream eller current" -#: config.c:1533 builtin/pack-objects.c:3649 +#: config.c:1701 builtin/pack-objects.c:3666 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1655 +#: config.c:1823 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1658 +#: config.c:1826 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1675 +#: config.c:1843 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1705 +#: config.c:1873 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1759 +#: config.c:1927 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2122 +#: config.c:2290 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2296 +#: config.c:2464 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: config.c:2341 +#: config.c:2509 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100" -#: config.c:2387 +#: config.c:2555 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2389 +#: config.c:2557 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d" -#: config.c:2473 +#: config.c:2641 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2505 +#: config.c:2673 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2534 +#: config.c:2702 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2786 config.c:3112 +#: config.c:2954 config.c:3280 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2797 +#: config.c:2965 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2834 builtin/config.c:361 +#: config.c:3002 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2859 +#: config.c:3027 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2872 config.c:3125 +#: config.c:3040 config.c:3293 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2883 +#: config.c:3051 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2892 config.c:3130 +#: config.c:3060 config.c:3298 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2977 config.c:3227 +#: config.c:3145 config.c:3395 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:3011 +#: config.c:3179 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 +#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3103 +#: config.c:3271 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3270 +#: config.c:3438 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2798,45 +2862,45 @@ msgstr "ogiltigt paket" msgid "protocol error: unexpected '%s'" msgstr "protokollfel: förväntade inte \"%s\"" -#: connect.c:473 +#: connect.c:497 #, c-format msgid "unknown object format '%s' specified by server" msgstr "okänt objektformat \"%s\" angavs av servern" -#: connect.c:500 +#: connect.c:526 #, c-format msgid "invalid ls-refs response: %s" msgstr "ogiltigt svar på ls-refs: %s" -#: connect.c:504 +#: connect.c:530 msgid "expected flush after ref listing" msgstr "förväntade \"flush\" efter ref-listan" -#: connect.c:507 +#: connect.c:533 msgid "expected response end packet after ref listing" msgstr "förväntade svarsavslutningspaket efter ref-listan" -#: connect.c:640 +#: connect.c:666 #, c-format msgid "protocol '%s' is not supported" msgstr "protokollet \"%s\" stöds inte" -#: connect.c:691 +#: connect.c:717 msgid "unable to set SO_KEEPALIVE on socket" msgstr "kunde inte sätta SO_KEEPALIVE på uttaget" -#: connect.c:731 connect.c:794 +#: connect.c:757 connect.c:820 #, c-format msgid "Looking up %s ... " msgstr "Slår upp %s..." -#: connect.c:735 +#: connect.c:761 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "kan inte slå upp %s (port %s) (%s)" #. TRANSLATORS: this is the end of "Looking up %s ... " -#: connect.c:739 connect.c:810 +#: connect.c:765 connect.c:836 #, c-format msgid "" "done.\n" @@ -2845,7 +2909,7 @@ msgstr "" "klart.\n" "Ansluter till %s (port %s)..." -#: connect.c:761 connect.c:838 +#: connect.c:787 connect.c:864 #, c-format msgid "" "unable to connect to %s:\n" @@ -2855,63 +2919,67 @@ msgstr "" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " -#: connect.c:767 connect.c:844 +#: connect.c:793 connect.c:870 msgid "done." msgstr "klart." -#: connect.c:798 +#: connect.c:824 #, c-format msgid "unable to look up %s (%s)" msgstr "kunde inte slå upp %s (%s)" -#: connect.c:804 +#: connect.c:830 #, c-format msgid "unknown port %s" msgstr "okänd port %s" -#: connect.c:941 connect.c:1271 +#: connect.c:967 connect.c:1299 #, c-format msgid "strange hostname '%s' blocked" msgstr "konstigt värdnamn \"%s\" blockerat" -#: connect.c:943 +#: connect.c:969 #, c-format msgid "strange port '%s' blocked" msgstr "konstig port \"%s\" blockerad" -#: connect.c:953 +#: connect.c:979 #, c-format msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" -#: connect.c:1024 +#: connect.c:1050 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax" -#: connect.c:1219 +#: connect.c:1190 +msgid "newline is forbidden in git:// hosts and repo paths" +msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar" + +#: connect.c:1247 msgid "ssh variant 'simple' does not support -4" msgstr "ssh-varianten \"simple\" stöder inte -4" -#: connect.c:1231 +#: connect.c:1259 msgid "ssh variant 'simple' does not support -6" msgstr "ssh-varianten \"simple\" stöder inte -6" -#: connect.c:1248 +#: connect.c:1276 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stöder inte val av port" -#: connect.c:1360 +#: connect.c:1388 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1408 +#: connect.c:1436 msgid "unable to fork" msgstr "kunde inte grena (fork)" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45 +#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -3175,6 +3243,11 @@ msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)" msgid "Marked %d islands, done.\n" msgstr "Markerade %d öar, klar.\n" +#: diff-merges.c:70 +#, c-format +msgid "unknown value for --diff-merges: %s" +msgstr "okänt värde för --diff-merges: %s" + #: diff-lib.c:534 msgid "--merge-base does not work with ranges" msgstr "--merge-base fungerar inte med intervall" @@ -3262,30 +3335,30 @@ msgstr "" msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4625 +#: diff.c:4628 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4628 +#: diff.c:4631 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4707 +#: diff.c:4710 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4755 +#: diff.c:4758 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303 +#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306 #: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4792 +#: diff.c:4795 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -3294,42 +3367,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4877 +#: diff.c:4880 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4901 +#: diff.c:4904 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4915 +#: diff.c:4918 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4965 diff.c:4971 +#: diff.c:4968 diff.c:4974 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4983 +#: diff.c:4986 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:5004 +#: diff.c:5007 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:5023 +#: diff.c:5026 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:5063 +#: diff.c:5066 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -3337,154 +3410,154 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5099 diff.c:5119 +#: diff.c:5102 diff.c:5122 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5223 +#: diff.c:5226 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\"" -#: diff.c:5272 +#: diff.c:5275 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5328 +#: diff.c:5331 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5351 +#: diff.c:5367 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5353 diff.c:5359 +#: diff.c:5369 diff.c:5375 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5356 builtin/log.c:178 +#: diff.c:5372 builtin/log.c:179 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5361 diff.c:5475 diff.c:5482 +#: diff.c:5377 diff.c:5491 diff.c:5498 msgid "<n>" msgstr "<n>" -#: diff.c:5362 diff.c:5365 +#: diff.c:5378 diff.c:5381 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5367 +#: diff.c:5383 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5370 +#: diff.c:5386 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5374 +#: diff.c:5390 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5378 +#: diff.c:5394 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5381 +#: diff.c:5397 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5383 diff.c:5391 +#: diff.c:5399 diff.c:5407 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5384 +#: diff.c:5400 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "skriv ut distributionen av relativa mängder ändringar för varje underkatalog" -#: diff.c:5388 +#: diff.c:5404 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5392 +#: diff.c:5408 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5396 +#: diff.c:5412 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5399 +#: diff.c:5415 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5402 +#: diff.c:5418 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5405 +#: diff.c:5421 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5407 +#: diff.c:5423 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5408 +#: diff.c:5424 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5410 diff.c:5413 diff.c:5416 +#: diff.c:5426 diff.c:5429 diff.c:5432 msgid "<width>" msgstr "<bredd>" -#: diff.c:5411 +#: diff.c:5427 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5414 +#: diff.c:5430 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5417 +#: diff.c:5433 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5419 +#: diff.c:5435 msgid "<count>" msgstr "<antal>" -#: diff.c:5420 +#: diff.c:5436 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5423 +#: diff.c:5439 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5426 +#: diff.c:5442 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5429 +#: diff.c:5445 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "" "visa fullständiga objektnamn i \"index\"-rader för läget både före och efter" -#: diff.c:5431 +#: diff.c:5447 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5432 +#: diff.c:5448 msgid "<kind>" msgstr "<typ>" -#: diff.c:5433 +#: diff.c:5449 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -3492,7 +3565,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5436 +#: diff.c:5452 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -3500,87 +3573,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554 +#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5440 +#: diff.c:5456 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5443 +#: diff.c:5459 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5446 +#: diff.c:5462 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5449 +#: diff.c:5465 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5452 +#: diff.c:5468 msgid "show context between diff hunks up to the specified number of lines" msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader" -#: diff.c:5456 diff.c:5461 diff.c:5466 +#: diff.c:5472 diff.c:5477 diff.c:5482 msgid "<char>" msgstr "<tecken>" -#: diff.c:5457 +#: diff.c:5473 msgid "specify the character to indicate a new line instead of '+'" msgstr "ange tecken för att ange ny rad istället för \"+\"" -#: diff.c:5462 +#: diff.c:5478 msgid "specify the character to indicate an old line instead of '-'" msgstr "ange tecken för att ange gammal rad istället för \"-\"" -#: diff.c:5467 +#: diff.c:5483 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5470 +#: diff.c:5486 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5471 +#: diff.c:5487 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5472 +#: diff.c:5488 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5476 +#: diff.c:5492 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5480 +#: diff.c:5496 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5483 +#: diff.c:5499 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5487 +#: diff.c:5503 msgid "use unmodified files as source to find copies" msgstr "använd oförändrade som källa för att hitta kopior" -#: diff.c:5489 +#: diff.c:5505 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5492 +#: diff.c:5508 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5494 +#: diff.c:5510 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5497 +#: diff.c:5513 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -3588,163 +3661,163 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5499 +#: diff.c:5515 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5501 +#: diff.c:5517 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5504 +#: diff.c:5520 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5507 +#: diff.c:5523 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5510 +#: diff.c:5526 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5513 +#: diff.c:5529 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5516 +#: diff.c:5532 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588 +#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5519 +#: diff.c:5535 msgid "ignore changes whose all lines match <regex>" msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>" -#: diff.c:5522 +#: diff.c:5538 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "heuristik för att flytta diff-gränser för lättare läsning" -#: diff.c:5525 +#: diff.c:5541 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5529 +#: diff.c:5545 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5531 +#: diff.c:5547 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5532 +#: diff.c:5548 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5534 +#: diff.c:5550 msgid "<text>" msgstr "<text>" -#: diff.c:5535 +#: diff.c:5551 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5537 diff.c:5546 diff.c:5549 +#: diff.c:5553 diff.c:5562 diff.c:5565 msgid "<mode>" msgstr "<läge>" -#: diff.c:5538 +#: diff.c:5554 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5541 +#: diff.c:5557 msgid "use <regex> to decide what a word is" msgstr "använd <reguttr> för att bestämma vad som är ett ord" -#: diff.c:5544 +#: diff.c:5560 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5547 +#: diff.c:5563 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5550 +#: diff.c:5566 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5553 +#: diff.c:5569 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5555 +#: diff.c:5571 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "vid start från underkatalog, uteslut ändringar utanför och visa relativa " "sökvägar" -#: diff.c:5559 +#: diff.c:5575 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5561 +#: diff.c:5577 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5563 +#: diff.c:5579 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5565 +#: diff.c:5581 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5567 +#: diff.c:5583 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5569 +#: diff.c:5585 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5571 +#: diff.c:5587 msgid "<when>" msgstr "<när>" -#: diff.c:5572 +#: diff.c:5588 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5575 +#: diff.c:5591 msgid "<format>" msgstr "<format>" -#: diff.c:5576 +#: diff.c:5592 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5580 +#: diff.c:5596 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5583 +#: diff.c:5599 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5585 +#: diff.c:5601 msgid "<string>" msgstr "<sträng>" -#: diff.c:5586 +#: diff.c:5602 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng" -#: diff.c:5589 +#: diff.c:5605 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3752,54 +3825,66 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5592 +#: diff.c:5608 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5595 +#: diff.c:5611 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck" -#: diff.c:5598 +#: diff.c:5614 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5599 +#: diff.c:5615 diff.c:5618 +msgid "<path>" +msgstr "<sökväg>" + +#: diff.c:5616 +msgid "show the change in the specified path first" +msgstr "visa ändringen i angiven sökväg först" + +#: diff.c:5619 +msgid "skip the output to the specified path" +msgstr "hoppa över utdata fram till angiven sökväg" + +#: diff.c:5621 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5600 +#: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt" -#: diff.c:5602 +#: diff.c:5624 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5603 +#: diff.c:5625 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5605 +#: diff.c:5627 msgid "<file>" msgstr "<fil>" -#: diff.c:5606 +#: diff.c:5628 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6263 +#: diff.c:6285 msgid "inexact rename detection was skipped due to too many files." msgstr "" "onöjaktig namnbytesdetektering utfördes inte på grund av för många filer." -#: diff.c:6266 +#: diff.c:6288 msgid "only found copies from modified paths due to too many files." msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer." -#: diff.c:6269 +#: diff.c:6291 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3811,10 +3896,15 @@ msgstr "" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:592 +#: diffcore-rename.c:555 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" +#: diffcore-rotate.c:29 +#, c-format +msgid "No such path '%s' in the diff" +msgstr "Sökvägen \"%s\" finns inte i diffen" + #: dir.c:578 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" @@ -3859,17 +3949,17 @@ msgstr "misslyckades hämta kärnans namn och information" msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3520 +#: dir.c:3537 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3565 dir.c:3570 +#: dir.c:3582 dir.c:3587 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3599 +#: dir.c:3616 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3888,12 +3978,12 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:150 +#: environment.c:152 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:337 +#: environment.c:335 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" @@ -3928,32 +4018,32 @@ msgstr "kunde inte skriva till fjärren" msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:378 fetch-pack.c:1406 +#: fetch-pack.c:378 fetch-pack.c:1400 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:384 fetch-pack.c:1412 +#: fetch-pack.c:384 fetch-pack.c:1406 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:386 fetch-pack.c:1414 +#: fetch-pack.c:386 fetch-pack.c:1408 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:389 fetch-pack.c:1417 +#: fetch-pack.c:389 fetch-pack.c:1411 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:391 fetch-pack.c:1419 +#: fetch-pack.c:391 fetch-pack.c:1413 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:394 fetch-pack.c:1423 +#: fetch-pack.c:394 fetch-pack.c:1417 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" @@ -3991,172 +4081,172 @@ msgstr "Markerar %s som komplett" msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:827 +#: fetch-pack.c:821 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:835 +#: fetch-pack.c:829 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:919 +#: fetch-pack.c:913 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:937 +#: fetch-pack.c:931 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:939 +#: fetch-pack.c:933 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:982 +#: fetch-pack.c:976 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005 -#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021 -#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037 -#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059 +#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999 +#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015 +#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031 +#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:992 +#: fetch-pack.c:986 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:1052 +#: fetch-pack.c:1046 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:1057 +#: fetch-pack.c:1051 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:1061 +#: fetch-pack.c:1055 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1063 +#: fetch-pack.c:1057 msgid "Server does not support this repository's object format" msgstr "Servern stöder inte det här arkivets objektformat" -#: fetch-pack.c:1076 +#: fetch-pack.c:1070 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1088 fetch-pack.c:1628 +#: fetch-pack.c:1082 fetch-pack.c:1622 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1214 +#: fetch-pack.c:1208 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "omaka algoritmer: klient %s; server %s" -#: fetch-pack.c:1218 +#: fetch-pack.c:1212 #, c-format msgid "the server does not support algorithm '%s'" msgstr "servern stöder inte algoritmen \"%s\"" -#: fetch-pack.c:1238 +#: fetch-pack.c:1232 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" -#: fetch-pack.c:1245 +#: fetch-pack.c:1239 msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1284 +#: fetch-pack.c:1278 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1302 +#: fetch-pack.c:1296 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1308 +#: fetch-pack.c:1302 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1369 +#: fetch-pack.c:1363 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "oväntad bekräftelserad: \"%s\"" -#: fetch-pack.c:1374 +#: fetch-pack.c:1368 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1384 +#: fetch-pack.c:1378 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1386 +#: fetch-pack.c:1380 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "väntade inte att några ytterligare sektioner skulle sändas efter \"ready\"" -#: fetch-pack.c:1428 +#: fetch-pack.c:1422 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1475 +#: fetch-pack.c:1469 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1480 +#: fetch-pack.c:1474 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1485 +#: fetch-pack.c:1479 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1515 +#: fetch-pack.c:1509 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack: förväntade svarsavslutningspaket" -#: fetch-pack.c:1897 +#: fetch-pack.c:1891 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1920 builtin/clone.c:693 +#: fetch-pack.c:1914 builtin/clone.c:693 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1947 +#: fetch-pack.c:1941 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1950 +#: fetch-pack.c:1944 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s" -#: gpg-interface.c:272 +#: gpg-interface.c:273 msgid "could not create temporary file" msgstr "kunde inte skapa temporära fil" -#: gpg-interface.c:275 +#: gpg-interface.c:276 #, c-format msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: gpg-interface.c:457 +#: gpg-interface.c:470 msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" @@ -4165,7 +4255,7 @@ msgstr "gpg misslyckades signera data" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:640 +#: grep.c:543 msgid "" "given pattern contains NULL byte (via -f <file>). This is only supported " "with -P under PCRE v2" @@ -4173,18 +4263,18 @@ msgstr "" "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" "P under PCRE v2" -#: grep.c:2100 +#: grep.c:1906 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89 +#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2128 +#: grep.c:1934 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -4254,7 +4344,7 @@ msgstr "git-kommandon från andra platser i din $PATH" msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:365 git.c:99 +#: help.c:365 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "okänd kommandolisttyp \"%s\"" @@ -4493,11 +4583,250 @@ msgstr "" msgid "Unable to create '%s.lock': %s" msgstr "Kunde inte skapa \"%s.lock\": %s" -#: ls-refs.c:109 +#: ls-refs.c:37 +#, c-format +msgid "invalid value '%s' for lsrefs.unborn" +msgstr "ogiltigt värde \"%s\" för lsrefs.unborn" + +#: ls-refs.c:167 msgid "expected flush after ls-refs arguments" msgstr "förväntade \"flush\" efter ls-refs-argument" -#: merge-ort-wrappers.c:13 merge-recursive.c:3672 +#: merge-ort.c:855 merge-recursive.c:1191 +#, c-format +msgid "Failed to merge submodule %s (not checked out)" +msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" + +#: merge-ort.c:864 merge-recursive.c:1198 +#, c-format +msgid "Failed to merge submodule %s (commits not present)" +msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" + +#: merge-ort.c:873 merge-recursive.c:1205 +#, c-format +msgid "Failed to merge submodule %s (commits don't follow merge-base)" +msgstr "" +"Misslyckades slå ihop undermodulen %s (incheckningar följer inte " +"sammanslagningsbasen)" + +#: merge-ort.c:883 merge-ort.c:890 +#, c-format +msgid "Note: Fast-forwarding submodule %s to %s" +msgstr "Obs: Snabbspolar undermodulen %s till %s" + +#: merge-ort.c:911 +#, c-format +msgid "Failed to merge submodule %s" +msgstr "Misslyckades slå ihop undermodulen %s" + +#: merge-ort.c:918 +#, c-format +msgid "" +"Failed to merge submodule %s, but a possible merge resolution exists:\n" +"%s\n" +msgstr "" +"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n" +"%s\n" + +#: merge-ort.c:922 merge-recursive.c:1259 +#, c-format +msgid "" +"If this is correct simply add it to the index for example\n" +"by using:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"which will accept this suggestion.\n" +msgstr "" +"Om detta är riktigt lägger du bara till det i indexet, till\n" +"exempel så här:\n" +"\n" +" git update-index --cacheinfo 160000 %s \"%s\"\n" +"\n" +"vilket godtar lösningen.\n" + +#: merge-ort.c:935 +#, c-format +msgid "" +"Failed to merge submodule %s, but multiple possible merges exist:\n" +"%s" +msgstr "" +"Misslyckades slå ihop undermodulen %s, men flera möjliga sammanslagningar " +"finns:\n" +"%s" + +#: merge-ort.c:1094 merge-recursive.c:1341 +msgid "Failed to execute internal merge" +msgstr "Misslyckades exekvera intern sammanslagning" + +#: merge-ort.c:1099 merge-recursive.c:1346 +#, c-format +msgid "Unable to add %s to database" +msgstr "Kunde inte lägga till %s till databasen" + +#: merge-ort.c:1106 merge-recursive.c:1378 +#, c-format +msgid "Auto-merging %s" +msgstr "Slår ihop %s automatiskt" + +#: merge-ort.c:1245 merge-recursive.c:2100 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " +"implicit directory rename(s) putting the following path(s) there: %s." +msgstr "" +"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " +"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." + +#: merge-ort.c:1255 merge-recursive.c:2110 +#, c-format +msgid "" +"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " +"implicit directory renames tried to put these paths there: %s" +msgstr "" +"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " +"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" + +#: merge-ort.c:1438 +#, c-format +msgid "" +"CONFLICT (directory rename split): Unclear where to rename %s to; it was " +"renamed to multiple other directories, with no destination getting a " +"majority of the files." +msgstr "" +"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska namnbytas till; " +"den har namnbytts till flera andra kataloger, utan att någon destination " +"fick en majoritet av filerna." + +#: merge-ort.c:1604 merge-recursive.c:2447 +#, c-format +msgid "" +"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " +"renamed." +msgstr "" +"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " +"bytt namn." + +#: merge-ort.c:1748 merge-recursive.c:3215 +#, c-format +msgid "" +"Path updated: %s added in %s inside a directory that was renamed in %s; " +"moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " +"flyttar den till %s." + +#: merge-ort.c:1755 merge-recursive.c:3222 +#, c-format +msgid "" +"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " +"%s; moving it to %s." +msgstr "" +"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " +"namn i %s; flyttar den till %s." + +#: merge-ort.c:1768 merge-recursive.c:3218 +#, c-format +msgid "" +"CONFLICT (file location): %s added in %s inside a directory that was renamed " +"in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " +"%s, föreslår att den bör flyttas till%s." + +#: merge-ort.c:1776 merge-recursive.c:3225 +#, c-format +msgid "" +"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " +"was renamed in %s, suggesting it should perhaps be moved to %s." +msgstr "" +"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " +"bytte namn i %s; flyttar den till %s." + +#: merge-ort.c:1919 +#, c-format +msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." +msgstr "" +"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s." + +#: merge-ort.c:2014 +#, c-format +msgid "" +"CONFLICT (rename involved in collision): rename of %s -> %s has content " +"conflicts AND collides with another path; this may result in nested conflict " +"markers." +msgstr "" +"KONFLIKT (namnbyte involverad i krock): namnbyte av %s -> %s har " +"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till " +"nästlade konfliktmarkörer." + +#: merge-ort.c:2033 merge-ort.c:2057 +#, c-format +msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." +msgstr "" +"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s." + +#: merge-ort.c:2683 +#, c-format +msgid "" +"CONFLICT (file/directory): directory in the way of %s from %s; moving it to " +"%s instead." +msgstr "" +"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den " +"till %s istället." + +#: merge-ort.c:2756 +#, c-format +msgid "" +"CONFLICT (distinct types): %s had different types on each side; renamed %s " +"of them so each can be recorded somewhere." +msgstr "" +"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte %s så " +"att de kan protokollföras någonstans." + +#: merge-ort.c:2760 +msgid "both" +msgstr "båda" + +#: merge-ort.c:2760 +msgid "one" +msgstr "en" + +#: merge-ort.c:2855 merge-recursive.c:3052 +msgid "content" +msgstr "innehåll" + +#: merge-ort.c:2857 merge-recursive.c:3056 +msgid "add/add" +msgstr "tillägg/tillägg" + +#: merge-ort.c:2859 merge-recursive.c:3101 +msgid "submodule" +msgstr "undermodul" + +#: merge-ort.c:2861 merge-recursive.c:3102 +#, c-format +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" + +#: merge-ort.c:2886 +#, c-format +msgid "" +"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " +"of %s left in tree." +msgstr "" +"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s " +"lämnad i trädet." + +#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge +#. base, and 2-3) the trees for the two trees we're merging. +#. +#: merge-ort.c:3354 +#, c-format +msgid "collecting merge info failed for trees %s, %s, %s" +msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s" + +#: merge-ort-wrappers.c:13 merge-recursive.c:3661 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4573,23 +4902,6 @@ msgstr "misslyckades skapa symboliska länken \"%s\": %s" msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" ska hanteras" -#: merge-recursive.c:1191 -#, c-format -msgid "Failed to merge submodule %s (not checked out)" -msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" - -#: merge-recursive.c:1198 -#, c-format -msgid "Failed to merge submodule %s (commits not present)" -msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" - -#: merge-recursive.c:1205 -#, c-format -msgid "Failed to merge submodule %s (commits don't follow merge-base)" -msgstr "" -"Misslyckades slå ihop undermodulen %s (incheckningar följer inte " -"sammanslagningsbasen)" - #: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" @@ -4616,43 +4928,12 @@ msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" msgid "Found a possible merge resolution for the submodule:\n" msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n" -#: merge-recursive.c:1259 -#, c-format -msgid "" -"If this is correct simply add it to the index for example\n" -"by using:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"which will accept this suggestion.\n" -msgstr "" -"Om detta är riktigt lägger du bara till det i indexet, till\n" -"exempel så här:\n" -"\n" -" git update-index --cacheinfo 160000 %s \"%s\"\n" -"\n" -"vilket godtar lösningen.\n" - #: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1341 -msgid "Failed to execute internal merge" -msgstr "Misslyckades exekvera intern sammanslagning" - -#: merge-recursive.c:1346 -#, c-format -msgid "Unable to add %s to database" -msgstr "Kunde inte lägga till %s till databasen" - -#: merge-recursive.c:1378 -#, c-format -msgid "Auto-merging %s" -msgstr "Slår ihop %s automatiskt" - #: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." @@ -4757,24 +5038,6 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2100 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " -"implicit directory rename(s) putting the following path(s) there: %s." -msgstr "" -"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för " -"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s." - -#: merge-recursive.c:2110 -#, c-format -msgid "" -"CONFLICT (implicit dir rename): Cannot map more than one path to %s; " -"implicit directory renames tried to put these paths there: %s" -msgstr "" -"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till " -"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s" - #: merge-recursive.c:2202 #, c-format msgid "" @@ -4784,15 +5047,6 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2447 -#, c-format -msgid "" -"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " -"renamed." -msgstr "" -"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " -"bytt namn." - #: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" @@ -4811,69 +5065,16 @@ msgstr "ändra" msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3052 -msgid "content" -msgstr "innehåll" - -#: merge-recursive.c:3056 -msgid "add/add" -msgstr "tillägg/tillägg" - #: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3101 -msgid "submodule" -msgstr "undermodul" - -#: merge-recursive.c:3102 -#, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" - #: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3215 -#, c-format -msgid "" -"Path updated: %s added in %s inside a directory that was renamed in %s; " -"moving it to %s." -msgstr "" -"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " -"flyttar den till %s." - -#: merge-recursive.c:3218 -#, c-format -msgid "" -"CONFLICT (file location): %s added in %s inside a directory that was renamed " -"in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i " -"%s, föreslår att den bör flyttas till%s." - -#: merge-recursive.c:3222 -#, c-format -msgid "" -"Path updated: %s renamed to %s in %s, inside a directory that was renamed in " -"%s; moving it to %s." -msgstr "" -"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte " -"namn i %s; flyttar den till %s." - -#: merge-recursive.c:3225 -#, c-format -msgid "" -"CONFLICT (file location): %s renamed to %s in %s, inside a directory that " -"was renamed in %s, suggesting it should perhaps be moved to %s." -msgstr "" -"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som " -"bytte namn i %s; flyttar den till %s." - #: merge-recursive.c:3339 #, c-format msgid "Removing %s" @@ -4908,27 +5109,28 @@ msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3550 +#: merge-recursive.c:3539 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3563 +#: merge-recursive.c:3552 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:3613 +#: merge-recursive.c:3602 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3769 +#: merge-recursive.c:3758 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895 +#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896 +#: builtin/stash.c:471 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -4936,8 +5138,8 @@ msgstr "Kunde inte skriva indexet." msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917 -#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817 +#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917 +#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817 #: builtin/stash.c:265 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -5104,17 +5306,17 @@ msgstr "kunde inte starta pack-objects" msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:537 +#: name-hash.c:538 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:559 +#: name-hash.c:560 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:565 +#: name-hash.c:566 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -5159,6 +5361,358 @@ msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" +#: object-file.c:480 +#, c-format +msgid "object directory %s does not exist; check .git/objects/info/alternates" +msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" + +#: object-file.c:531 +#, c-format +msgid "unable to normalize alternate object path: %s" +msgstr "kunde inte normalisera supplerande objektsökväg: %s" + +#: object-file.c:603 +#, c-format +msgid "%s: ignoring alternate object stores, nesting too deep" +msgstr "%s: ignorerar supplerande objektlager, för djup nästling" + +#: object-file.c:610 +#, c-format +msgid "unable to normalize object directory: %s" +msgstr "kan inte normalisera objektkatalogen: %s" + +#: object-file.c:653 +msgid "unable to fdopen alternates lockfile" +msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" + +#: object-file.c:671 +msgid "unable to read alternates file" +msgstr "kan inte läsa \"alternates\"-filen" + +#: object-file.c:678 +msgid "unable to move new alternates file into place" +msgstr "kan inte flytta ny \"alternates\"-fil på plats" + +#: object-file.c:713 +#, c-format +msgid "path '%s' does not exist" +msgstr "sökvägen \"%s\" finns inte" + +#: object-file.c:734 +#, c-format +msgid "reference repository '%s' as a linked checkout is not supported yet." +msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." + +#: object-file.c:740 +#, c-format +msgid "reference repository '%s' is not a local repository." +msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." + +#: object-file.c:746 +#, c-format +msgid "reference repository '%s' is shallow" +msgstr "referensarkivet \"%s\" är grunt" + +#: object-file.c:754 +#, c-format +msgid "reference repository '%s' is grafted" +msgstr "referensarkivet \"%s\" är ympat" + +#: object-file.c:814 +#, c-format +msgid "invalid line while parsing alternate refs: %s" +msgstr "felaktig rad vid tolkning av supplerande referenser: %s" + +#: object-file.c:964 +#, c-format +msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" +msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" + +#: object-file.c:985 +msgid "mmap failed" +msgstr "mmap misslyckades" + +#: object-file.c:1149 +#, c-format +msgid "object file %s is empty" +msgstr "objektfilen %s är tom" + +#: object-file.c:1284 object-file.c:2477 +#, c-format +msgid "corrupt loose object '%s'" +msgstr "trasigt löst objekt \"%s\"" + +#: object-file.c:1286 object-file.c:2481 +#, c-format +msgid "garbage at end of loose object '%s'" +msgstr "skräp i slutet av löst objekt \"%s\"" + +#: object-file.c:1328 +msgid "invalid object type" +msgstr "felaktig objekttyp" + +#: object-file.c:1412 +#, c-format +msgid "unable to unpack %s header with --allow-unknown-type" +msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" + +#: object-file.c:1415 +#, c-format +msgid "unable to unpack %s header" +msgstr "kan inte packa upp %s-huvudet" + +#: object-file.c:1421 +#, c-format +msgid "unable to parse %s header with --allow-unknown-type" +msgstr "kan inte tolka %s-huvud med --allow-unknown-type" + +#: object-file.c:1424 +#, c-format +msgid "unable to parse %s header" +msgstr "kan inte tolka %s-huvud" + +#: object-file.c:1651 +#, c-format +msgid "failed to read object %s" +msgstr "misslyckades läsa objektet %s" + +#: object-file.c:1655 +#, c-format +msgid "replacement %s not found for %s" +msgstr "ersättningen %s hittades inte för %s" + +#: object-file.c:1659 +#, c-format +msgid "loose object %s (stored in %s) is corrupt" +msgstr "löst objekt %s (lagrat i %s) är trasigt" + +#: object-file.c:1663 +#, c-format +msgid "packed object %s (stored in %s) is corrupt" +msgstr "packat objekt %s (lagrat i %s) är trasigt" + +#: object-file.c:1768 +#, c-format +msgid "unable to write file %s" +msgstr "kunde inte skriva filen %s" + +#: object-file.c:1775 +#, c-format +msgid "unable to set permission to '%s'" +msgstr "kan inte sätta behörigheten till \"%s\"" + +#: object-file.c:1782 +msgid "file write error" +msgstr "fel vid skrivning av fil" + +#: object-file.c:1802 +msgid "error when closing loose object file" +msgstr "fel vid stängning av fil för löst objekt" + +#: object-file.c:1867 +#, c-format +msgid "insufficient permission for adding an object to repository database %s" +msgstr "" +"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" + +#: object-file.c:1869 +msgid "unable to create temporary file" +msgstr "kan inte skapa temporär fil" + +#: object-file.c:1893 +msgid "unable to write loose object file" +msgstr "kunde inte skriva fil för löst objekt" + +#: object-file.c:1899 +#, c-format +msgid "unable to deflate new object %s (%d)" +msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" + +#: object-file.c:1903 +#, c-format +msgid "deflateEnd on object %s failed (%d)" +msgstr "\"deflateend\" på objektet %s misslyckades (%d)" + +#: object-file.c:1907 +#, c-format +msgid "confused by unstable object source data for %s" +msgstr "förvirrad av instabil objektkälldata för %s" + +#: object-file.c:1917 builtin/pack-objects.c:1097 +#, c-format +msgid "failed utime() on %s" +msgstr "\"utime()\" misslyckades på %s" + +#: object-file.c:1994 +#, c-format +msgid "cannot read object for %s" +msgstr "kan inte läsa objekt för %s" + +#: object-file.c:2045 +msgid "corrupt commit" +msgstr "trasik incheckning" + +#: object-file.c:2053 +msgid "corrupt tag" +msgstr "trasig tagg" + +#: object-file.c:2153 +#, c-format +msgid "read error while indexing %s" +msgstr "läsfel vid indexering av %s" + +#: object-file.c:2156 +#, c-format +msgid "short read while indexing %s" +msgstr "för lite lästes vid indexering av %s" + +#: object-file.c:2229 object-file.c:2239 +#, c-format +msgid "%s: failed to insert into database" +msgstr "%s: misslyckades lägga in i databasen" + +#: object-file.c:2245 +#, c-format +msgid "%s: unsupported file type" +msgstr "%s: filtypen stöds ej" + +#: object-file.c:2269 +#, c-format +msgid "%s is not a valid object" +msgstr "%s är inte ett giltigt objekt" + +#: object-file.c:2271 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: object-file.c:2298 builtin/index-pack.c:192 +#, c-format +msgid "unable to open %s" +msgstr "kan inte öppna %s" + +#: object-file.c:2488 object-file.c:2541 +#, c-format +msgid "hash mismatch for %s (expected %s)" +msgstr "hash stämmer inte för %s (förväntade %s)" + +#: object-file.c:2512 +#, c-format +msgid "unable to mmap %s" +msgstr "kan inte utföra \"mmap\" för %s" + +#: object-file.c:2517 +#, c-format +msgid "unable to unpack header of %s" +msgstr "kan inte packa upp huvud för %s" + +#: object-file.c:2523 +#, c-format +msgid "unable to parse header of %s" +msgstr "kan inte tolka huvud för %s" + +#: object-file.c:2534 +#, c-format +msgid "unable to unpack contents of %s" +msgstr "kan inte tolka innehåll i %s" + +#: object-name.c:486 +#, c-format +msgid "short object ID %s is ambiguous" +msgstr "kort objekt-ID %s är tvetydigt" + +#: object-name.c:497 +msgid "The candidates are:" +msgstr "Kandidaterna är:" + +#: object-name.c:796 +msgid "" +"Git normally never creates a ref that ends with 40 hex characters\n" +"because it will be ignored when you just specify 40-hex. These refs\n" +"may be created by mistake. For example,\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" +"examine these refs and maybe delete them. Turn this message off by\n" +"running \"git config advice.objectNameWarning false\"" +msgstr "" +"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n" +"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n" +"referenser kan skapas av misstag. Till exempel, för\n" +"\n" +" git switch -c $br $(git rev-parse ...)\n" +"\n" +"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n" +"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" +"genom att köra \"git config advice.objectNameWarning false\"" + +#: object-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" + +#: object-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "loggen för \"%.*s\" har bara %d poster" + +#: object-name.c:1702 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" + +#: object-name.c:1708 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"sökvägen \"%s\" finns, men inte i \"%s\"\n" +"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" + +#: object-name.c:1717 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" + +#: object-name.c:1745 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"sökvägen \"%s\" finns i indexet men inte i etapp %d\n" +"tips: Menade du \":%d:%s\"?" + +#: object-name.c:1761 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" +"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" + +#: object-name.c:1769 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" + +#: object-name.c:1771 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" + +#: object-name.c:1784 +msgid "relative path syntax can't be used outside working tree" +msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" + +#: object-name.c:1922 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "felaktigt objektnamn \"%.*s\"." + #: object.c:53 #, c-format msgid "invalid object type \"%s\"" @@ -5184,21 +5738,70 @@ msgstr "kunde inte tolka objektet: %s" msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216 +#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: packfile.c:615 +#: pack-bitmap.c:1489 builtin/rev-list.c:92 +#, c-format +msgid "unable to get disk usage of %s" +msgstr "kan inte hämta diskanvändning för %s" + +#: pack-revindex.c:220 +#, c-format +msgid "reverse-index file %s is too small" +msgstr "reverse-index-filen %s är för liten" + +#: pack-revindex.c:225 +#, c-format +msgid "reverse-index file %s is corrupt" +msgstr "reverse-index-filen %s är trasig" + +#: pack-revindex.c:233 +#, c-format +msgid "reverse-index file %s has unknown signature" +msgstr "reverse-index-filen %s har okänd signatur" + +#: pack-revindex.c:237 +#, c-format +msgid "reverse-index file %s has unsupported version %<PRIu32>" +msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds" + +#: pack-revindex.c:242 +#, c-format +msgid "reverse-index file %s has unsupported hash id %<PRIu32>" +msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds" + +#: pack-write.c:236 +msgid "cannot both write and verify reverse index" +msgstr "kan inte både skriva och bekräfta reverse-index" + +#: pack-write.c:257 +#, c-format +msgid "could not stat: %s" +msgstr "kunde inte ta status: %s" + +#: pack-write.c:269 +#, c-format +msgid "failed to make %s readable" +msgstr "kunde inte göra %s läsbar" + +#: pack-write.c:502 +#, c-format +msgid "could not write '%s' promisor file" +msgstr "kunde inte skriva kontraktsfilen \"%s\"" + +#: packfile.c:625 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1907 +#: packfile.c:1934 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "offset före slutet av packindex för %s (trasigt index?)" -#: packfile.c:1911 +#: packfile.c:1938 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -5458,7 +6061,7 @@ msgstr "Uppdaterar indexet" msgid "unable to create threaded lstat: %s" msgstr "kunde inte skapa trådad lstat: %s" -#: pretty.c:983 +#: pretty.c:984 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" @@ -5484,20 +6087,20 @@ msgstr "kontraktsfjärr kan inte börja med \"/\": %s" msgid "Removing duplicate objects" msgstr "Tar bort duplicerade objekt" -#: range-diff.c:77 +#: range-diff.c:78 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:79 +#: range-diff.c:80 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:98 sequencer.c:5310 +#: range-diff.c:101 sequencer.c:5318 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:112 +#: range-diff.c:115 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " @@ -5506,16 +6109,20 @@ msgstr "" "kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": " "\"%s\"" -#: range-diff.c:137 +#: range-diff.c:140 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:299 +#: range-diff.c:306 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:532 range-diff.c:534 +#: range-diff.c:558 +msgid "--left-only and --right-only are mutually exclusive" +msgstr "--left-only och --right-only är ömsesidigt uteslutande" + +#: range-diff.c:561 range-diff.c:563 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -5630,10 +6237,10 @@ msgstr "flera köposter för den sammanslagna filen \"%s\"" msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1971 read-cache.c:2262 rerere.c:565 rerere.c:599 rerere.c:1111 -#: submodule.c:1628 builtin/add.c:538 builtin/check-ignore.c:181 -#: builtin/checkout.c:502 builtin/checkout.c:688 builtin/clean.c:991 -#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:507 +#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095 +#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181 +#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991 +#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505 #: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290 #: builtin/submodule--helper.c:332 msgid "index file corrupt" @@ -5689,12 +6296,12 @@ msgstr "kunde inte uppdatera delat index \"%s\"" msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140 +#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231 +#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" @@ -5828,14 +6435,14 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607 -#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270 +#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615 +#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" -#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228 -#: builtin/rebase.c:252 +#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230 +#: builtin/rebase.c:254 #, c-format msgid "could not write '%s'." msgstr "kunde inte skriva \"%s\"." @@ -5869,14 +6476,14 @@ msgstr "" "\" (fel).\n" "\n" -#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394 -#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239 -#: builtin/rebase.c:264 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402 +#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241 +#: builtin/rebase.c:266 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: ref-filter.c:42 wt-status.c:1973 +#: ref-filter.c:42 wt-status.c:1975 msgid "gone" msgstr "försvunnen" @@ -6067,24 +6674,34 @@ msgstr "format: atomen %%(end) använd utan motsvarande atom" msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1549 +#: ref-filter.c:1551 +#, c-format +msgid "(no branch, rebasing %s)" +msgstr "(ingen gren, ombaserar %s)" + +#: ref-filter.c:1554 #, c-format -msgid "no branch, rebasing %s" -msgstr "ingen gren, ombaserar %s" +msgid "(no branch, rebasing detached HEAD %s)" +msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)" -#: ref-filter.c:1552 +#: ref-filter.c:1557 #, c-format -msgid "no branch, rebasing detached HEAD %s" -msgstr "ingen gren, ombaserar frånkopplat HEAD %s" +msgid "(no branch, bisect started on %s)" +msgstr "(ingen gren, \"bisect\" startad på %s)" -#: ref-filter.c:1555 +#: ref-filter.c:1561 #, c-format -msgid "no branch, bisect started on %s" -msgstr "ingen gren, \"bisect\" startad på %s" +msgid "(HEAD detached at %s)" +msgstr "(HEAD frånkopplat vid %s)" -#: ref-filter.c:1565 -msgid "no branch" -msgstr "ingen gren" +#: ref-filter.c:1564 +#, c-format +msgid "(HEAD detached from %s)" +msgstr "(HEAD frånkopplat från %s)" + +#: ref-filter.c:1567 +msgid "(no branch)" +msgstr "(ingen gren)" #: ref-filter.c:1599 ref-filter.c:1808 #, c-format @@ -6096,32 +6713,32 @@ msgstr "objektet %s saknas för %s" msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:2062 +#: ref-filter.c:1992 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2151 +#: ref-filter.c:2081 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2156 refs.c:676 +#: ref-filter.c:2086 refs.c:676 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:2472 +#: ref-filter.c:2426 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2571 +#: ref-filter.c:2525 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2576 +#: ref-filter.c:2530 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" @@ -6171,50 +6788,50 @@ msgstr "felaktigt namn på gren: %s = %s" msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:911 +#: refs.c:922 #, c-format msgid "log for ref %s has gap after %s" msgstr "loggen för referensen %s har lucka efter %s" -#: refs.c:917 +#: refs.c:929 #, c-format msgid "log for ref %s unexpectedly ended on %s" msgstr "loggen för referensen %s slutade oväntat på %s" -#: refs.c:976 +#: refs.c:994 #, c-format msgid "log for %s is empty" msgstr "loggen för %s är tom" -#: refs.c:1068 +#: refs.c:1086 #, c-format msgid "refusing to update ref with bad name '%s'" msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" -#: refs.c:1139 +#: refs.c:1157 #, c-format msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:1963 +#: refs.c:2051 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2043 +#: refs.c:2131 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2054 +#: refs.c:2142 msgid "ref updates aborted by hook" msgstr "referensuppdateringar avbrutna av krok" -#: refs.c:2154 refs.c:2184 +#: refs.c:2242 refs.c:2272 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2160 refs.c:2195 +#: refs.c:2248 refs.c:2283 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" @@ -6278,12 +6895,12 @@ msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1073 +#: remote.c:1083 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1078 +#: remote.c:1088 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -6292,7 +6909,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1093 +#: remote.c:1103 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -6315,7 +6932,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1113 +#: remote.c:1123 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -6326,7 +6943,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1118 +#: remote.c:1128 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -6337,7 +6954,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1123 +#: remote.c:1133 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -6348,7 +6965,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1128 +#: remote.c:1138 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -6359,114 +6976,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1164 +#: remote.c:1174 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1175 +#: remote.c:1185 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1187 +#: remote.c:1197 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1194 +#: remote.c:1204 #, c-format msgid "dst ref %s receives from more than one src" msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa" -#: remote.c:1714 remote.c:1815 +#: remote.c:1724 remote.c:1825 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1723 +#: remote.c:1733 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1726 +#: remote.c:1736 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1732 +#: remote.c:1742 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" -#: remote.c:1747 +#: remote.c:1757 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren" -#: remote.c:1759 +#: remote.c:1769 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1769 +#: remote.c:1779 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1782 +#: remote.c:1792 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1804 +#: remote.c:1814 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1933 +#: remote.c:1943 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1946 +#: remote.c:1956 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2109 +#: remote.c:2119 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n" -#: remote.c:2113 +#: remote.c:2123 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2116 +#: remote.c:2126 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2120 +#: remote.c:2130 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2123 +#: remote.c:2133 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2127 +#: remote.c:2137 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:2133 +#: remote.c:2143 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:2136 +#: remote.c:2146 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -6476,11 +7093,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2144 +#: remote.c:2154 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:2147 +#: remote.c:2157 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -6495,11 +7112,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2157 +#: remote.c:2167 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" -#: remote.c:2349 +#: remote.c:2359 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -6519,96 +7136,96 @@ msgstr "duplicerat ersättningsreferensnamn: %s" msgid "replace depth too high for object %s" msgstr "ersättningsdjupet för högt för objektet %s" -#: rerere.c:217 rerere.c:226 rerere.c:229 +#: rerere.c:201 rerere.c:210 rerere.c:213 msgid "corrupt MERGE_RR" msgstr "trasig MERGE_RR" -#: rerere.c:264 rerere.c:269 +#: rerere.c:248 rerere.c:253 msgid "unable to write rerere record" msgstr "kunde inte skriva rerere-post" -#: rerere.c:495 +#: rerere.c:479 #, c-format msgid "there were errors while writing '%s' (%s)" msgstr "fel vid skrivning av \"%s\" (%s)" -#: rerere.c:498 +#: rerere.c:482 #, c-format msgid "failed to flush '%s'" msgstr "misslyckades spola \"%s\"" -#: rerere.c:503 rerere.c:1039 +#: rerere.c:487 rerere.c:1023 #, c-format msgid "could not parse conflict hunks in '%s'" msgstr "kunde inte tolka konflikt-stycket i \"%s\"" -#: rerere.c:684 +#: rerere.c:668 #, c-format msgid "failed utime() on '%s'" msgstr "\"utime()\" misslyckades på \"%s\"" -#: rerere.c:694 +#: rerere.c:678 #, c-format msgid "writing '%s' failed" msgstr "misslyckades skriva \"%s\"" -#: rerere.c:714 +#: rerere.c:698 #, c-format msgid "Staged '%s' using previous resolution." msgstr "Köade \"%s\" med sparad lösning." -#: rerere.c:753 +#: rerere.c:737 #, c-format msgid "Recorded resolution for '%s'." msgstr "Sparade lösning för \"%s\"." -#: rerere.c:788 +#: rerere.c:772 #, c-format msgid "Resolved '%s' using previous resolution." msgstr "Löste \"%s\" med tidigare lösning." -#: rerere.c:803 +#: rerere.c:787 #, c-format msgid "cannot unlink stray '%s'" msgstr "kan inte ta bort lös länk \"%s\"" -#: rerere.c:807 +#: rerere.c:791 #, c-format msgid "Recorded preimage for '%s'" msgstr "Sparade förhandsbild för \"%s\"" -#: rerere.c:881 submodule.c:2082 builtin/log.c:1992 +#: rerere.c:865 submodule.c:2088 builtin/log.c:1991 #: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890 #, c-format msgid "could not create directory '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: rerere.c:1057 +#: rerere.c:1041 #, c-format msgid "failed to update conflicted state in '%s'" msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\"" -#: rerere.c:1068 rerere.c:1075 +#: rerere.c:1052 rerere.c:1059 #, c-format msgid "no remembered resolution for '%s'" msgstr "inget sparat sammanslagningsresultat för \"%s\"" -#: rerere.c:1077 +#: rerere.c:1061 #, c-format msgid "cannot unlink '%s'" msgstr "kan inte ta bort länken \"%s\"" -#: rerere.c:1087 +#: rerere.c:1071 #, c-format msgid "Updated preimage for '%s'" msgstr "Uppdaterade förhandsbild för \"%s\"" -#: rerere.c:1096 +#: rerere.c:1080 #, c-format msgid "Forgot resolution for '%s'\n" msgstr "Glömde lösning för \"%s\"\n" -#: rerere.c:1199 +#: rerere.c:1191 msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" @@ -6616,43 +7233,38 @@ msgstr "kan inte uppdatera katalogen rr-cache" msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: reset.c:70 reset.c:76 sequencer.c:3460 +#: reset.c:70 reset.c:76 sequencer.c:3468 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: revision.c:2336 +#: revision.c:2338 msgid "--unpacked=<packfile> no longer supported" msgstr "--unpacked=<paketfil> stöds inte längre" -#: revision.c:2356 -#, c-format -msgid "unknown value for --diff-merges: %s" -msgstr "okänt värde för --diff-merges: %s" - -#: revision.c:2694 +#: revision.c:2668 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2697 +#: revision.c:2671 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" -#: revision.c:2907 +#: revision.c:2877 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L stöder ännu inte andra diff-format än -p och -s" -#: run-command.c:764 +#: run-command.c:767 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:1271 +#: run-command.c:1274 #, c-format msgid "cannot create async thread: %s" msgstr "kan inte skapa asynkron tråd: %s" -#: run-command.c:1335 +#: run-command.c:1338 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" @@ -6713,7 +7325,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385 +#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" @@ -6753,13 +7365,13 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:434 sequencer.c:3062 +#: sequencer.c:434 sequencer.c:3070 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080 -#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631 +#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088 +#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" @@ -6769,8 +7381,8 @@ msgstr "kunde inte skriva till \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082 -#: sequencer.c:3345 +#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090 +#: sequencer.c:3353 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" @@ -6789,7 +7401,7 @@ msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." msgid "%s: fast-forward" msgstr "%s: snabbspola" -#: sequencer.c:560 builtin/tag.c:566 +#: sequencer.c:560 builtin/tag.c:598 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" @@ -6802,60 +7414,60 @@ msgstr "Felaktigt städningsläge %s" msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:687 +#: sequencer.c:684 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:701 +#: sequencer.c:698 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:781 +#: sequencer.c:778 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:792 +#: sequencer.c:789 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710 -#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908 +#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:839 +#: sequencer.c:836 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:844 +#: sequencer.c:841 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:849 +#: sequencer.c:846 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:853 +#: sequencer.c:850 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:858 +#: sequencer.c:855 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:860 +#: sequencer.c:857 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:862 +#: sequencer.c:859 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:927 +#: sequencer.c:924 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6884,11 +7496,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:1208 +#: sequencer.c:1211 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1214 +#: sequencer.c:1217 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6915,7 +7527,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1227 +#: sequencer.c:1230 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6940,340 +7552,340 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1269 +#: sequencer.c:1272 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1271 +#: sequencer.c:1274 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1317 +#: sequencer.c:1320 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1319 +#: sequencer.c:1322 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1323 +#: sequencer.c:1326 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1344 +#: sequencer.c:1347 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1346 +#: sequencer.c:1349 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577 +#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1403 sequencer.c:2100 +#: sequencer.c:1409 sequencer.c:2108 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701 +#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1447 sequencer.c:1565 +#: sequencer.c:1453 sequencer.c:1573 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1476 sequencer.c:1508 +#: sequencer.c:1484 sequencer.c:1516 #, c-format msgid "invalid author identity '%s'" msgstr "ogiltig författar-identitet \"%s\"" -#: sequencer.c:1482 +#: sequencer.c:1490 msgid "corrupt author: missing date information" msgstr "trasig författare: saknar datuminformation" -#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904 -#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78 +#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905 +#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198 +#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:1597 +#: sequencer.c:1605 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1602 +#: sequencer.c:1610 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1685 sequencer.c:1796 +#: sequencer.c:1693 sequencer.c:1804 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1743 sequencer.c:1768 +#: sequencer.c:1751 sequencer.c:1776 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1753 +#: sequencer.c:1761 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1755 sequencer.c:3372 +#: sequencer.c:1763 sequencer.c:3380 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1757 +#: sequencer.c:1765 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1763 +#: sequencer.c:1771 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1770 git-rebase--preserve-merges.sh:486 +#: sequencer.c:1778 git-rebase--preserve-merges.sh:486 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1778 +#: sequencer.c:1786 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1785 +#: sequencer.c:1793 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1791 +#: sequencer.c:1799 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1879 +#: sequencer.c:1887 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1886 +#: sequencer.c:1894 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1905 +#: sequencer.c:1913 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:1913 sequencer.c:1921 +#: sequencer.c:1921 sequencer.c:1929 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1927 +#: sequencer.c:1935 #, c-format msgid "cannot get commit message for %s" msgstr "kan inte hämta incheckningsmeddelande för %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1946 +#: sequencer.c:1954 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:2011 +#: sequencer.c:2019 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:2071 +#: sequencer.c:2079 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:2072 +#: sequencer.c:2080 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2092 +#: sequencer.c:2100 #, c-format msgid "dropping %s %s -- patch contents already upstream\n" msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n" -#: sequencer.c:2150 +#: sequencer.c:2158 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2157 +#: sequencer.c:2165 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2234 +#: sequencer.c:2242 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2243 +#: sequencer.c:2251 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2274 +#: sequencer.c:2282 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: sequencer.c:2335 +#: sequencer.c:2343 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2346 +#: sequencer.c:2354 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2432 +#: sequencer.c:2440 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2441 +#: sequencer.c:2449 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2485 +#: sequencer.c:2493 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2487 +#: sequencer.c:2495 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2492 +#: sequencer.c:2500 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2503 +#: sequencer.c:2511 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2505 +#: sequencer.c:2513 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2583 +#: sequencer.c:2591 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2690 +#: sequencer.c:2698 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2710 +#: sequencer.c:2718 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2803 sequencer.c:4636 +#: sequencer.c:2811 sequencer.c:4644 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2820 +#: sequencer.c:2828 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2822 +#: sequencer.c:2830 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2825 +#: sequencer.c:2833 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2827 +#: sequencer.c:2835 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2841 +#: sequencer.c:2849 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2856 +#: sequencer.c:2864 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2916 sequencer.c:4371 +#: sequencer.c:2924 sequencer.c:4379 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2918 sequencer.c:2929 +#: sequencer.c:2926 sequencer.c:2937 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2920 sequencer.c:2964 +#: sequencer.c:2928 sequencer.c:2972 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:2950 builtin/grep.c:756 +#: sequencer.c:2958 builtin/grep.c:757 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2952 +#: sequencer.c:2960 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2953 +#: sequencer.c:2961 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2959 +#: sequencer.c:2967 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:2970 +#: sequencer.c:2978 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Du verkar ha flyttat HEAD.\n" "Spolar inte tillbaka, kontrollera HEAD!" -#: sequencer.c:3011 +#: sequencer.c:3019 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:3020 +#: sequencer.c:3028 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:3030 +#: sequencer.c:3038 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:3037 +#: sequencer.c:3045 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:3040 +#: sequencer.c:3048 #, c-format msgid "" "have you committed already?\n" @@ -7282,16 +7894,16 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3202 sequencer.c:4263 +#: sequencer.c:3210 sequencer.c:4271 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3219 +#: sequencer.c:3227 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3227 +#: sequencer.c:3235 #, c-format msgid "" "You can amend the commit now, with\n" @@ -7310,27 +7922,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3237 +#: sequencer.c:3245 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3244 +#: sequencer.c:3252 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640 +#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3274 +#: sequencer.c:3282 #, c-format msgid "Executing: %s\n" msgstr "Kör: %s\n" -#: sequencer.c:3289 +#: sequencer.c:3297 #, c-format msgid "" "execution failed: %s\n" @@ -7345,11 +7957,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3295 +#: sequencer.c:3303 msgid "and made changes to the index and/or the working tree\n" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n" -#: sequencer.c:3301 +#: sequencer.c:3309 #, c-format msgid "" "execution succeeded: %s\n" @@ -7366,90 +7978,90 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3362 +#: sequencer.c:3370 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3416 +#: sequencer.c:3424 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3421 +#: sequencer.c:3429 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3505 +#: sequencer.c:3513 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3538 +#: sequencer.c:3546 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3560 +#: sequencer.c:3568 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3569 +#: sequencer.c:3577 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3581 +#: sequencer.c:3589 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]" -#: sequencer.c:3597 +#: sequencer.c:3605 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3780 +#: sequencer.c:3788 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3796 +#: sequencer.c:3804 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3870 +#: sequencer.c:3878 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: sequencer.c:3873 +#: sequencer.c:3881 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: sequencer.c:3879 +#: sequencer.c:3887 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: sequencer.c:3882 +#: sequencer.c:3890 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: sequencer.c:3886 +#: sequencer.c:3894 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: sequencer.c:3911 +#: sequencer.c:3919 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3923 +#: sequencer.c:3931 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3926 +#: sequencer.c:3934 #, c-format msgid "" "%s\n" @@ -7460,29 +8072,29 @@ msgstr "" "Dina ändringar är säkra i stashen.\n" "Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" -#: sequencer.c:3931 +#: sequencer.c:3939 msgid "Applying autostash resulted in conflicts." msgstr "Tillämpning av autostash gav konflikter." -#: sequencer.c:3932 +#: sequencer.c:3940 msgid "Autostash exists; creating a new stash entry." msgstr "Autostash finns; skapar ny stash-post." -#: sequencer.c:4025 git-rebase--preserve-merges.sh:769 +#: sequencer.c:4033 git-rebase--preserve-merges.sh:769 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:4040 +#: sequencer.c:4048 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:4042 +#: sequencer.c:4050 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:4050 +#: sequencer.c:4058 #, c-format msgid "" "Could not execute the todo command\n" @@ -7503,58 +8115,58 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:4096 +#: sequencer.c:4104 #, c-format msgid "Rebasing (%d/%d)%s" msgstr "Ombaserar (%d/%d)%s" -#: sequencer.c:4141 +#: sequencer.c:4149 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:4212 +#: sequencer.c:4220 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4271 +#: sequencer.c:4279 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4276 +#: sequencer.c:4284 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4290 +#: sequencer.c:4298 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4350 +#: sequencer.c:4358 #, c-format msgid "Successfully rebased and updated %s.\n" msgstr "Lyckades ombasera och uppdatera %s.\n" -#: sequencer.c:4383 +#: sequencer.c:4391 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4392 +#: sequencer.c:4400 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4394 +#: sequencer.c:4402 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4396 +#: sequencer.c:4404 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4399 +#: sequencer.c:4407 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -7564,50 +8176,50 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continue\" igen." -#: sequencer.c:4435 sequencer.c:4474 +#: sequencer.c:4443 sequencer.c:4482 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4490 +#: sequencer.c:4498 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4497 +#: sequencer.c:4505 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4613 +#: sequencer.c:4621 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4617 +#: sequencer.c:4625 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4652 +#: sequencer.c:4660 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:5129 +#: sequencer.c:5137 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:5132 +#: sequencer.c:5140 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:5374 sequencer.c:5391 +#: sequencer.c:5382 sequencer.c:5399 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5410 +#: sequencer.c:5418 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5504 +#: sequencer.c:5512 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." @@ -7774,358 +8386,6 @@ msgstr "\"fork\" misslyckades" msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:480 -#, c-format -msgid "object directory %s does not exist; check .git/objects/info/alternates" -msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates" - -#: sha1-file.c:531 -#, c-format -msgid "unable to normalize alternate object path: %s" -msgstr "kunde inte normalisera supplerande objektsökväg: %s" - -#: sha1-file.c:603 -#, c-format -msgid "%s: ignoring alternate object stores, nesting too deep" -msgstr "%s: ignorerar supplerande objektlager, för djup nästling" - -#: sha1-file.c:610 -#, c-format -msgid "unable to normalize object directory: %s" -msgstr "kan inte normalisera objektkatalogen: %s" - -#: sha1-file.c:653 -msgid "unable to fdopen alternates lockfile" -msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil" - -#: sha1-file.c:671 -msgid "unable to read alternates file" -msgstr "kan inte läsa \"alternates\"-filen" - -#: sha1-file.c:678 -msgid "unable to move new alternates file into place" -msgstr "kan inte flytta ny \"alternates\"-fil på plats" - -#: sha1-file.c:713 -#, c-format -msgid "path '%s' does not exist" -msgstr "sökvägen \"%s\" finns inte" - -#: sha1-file.c:734 -#, c-format -msgid "reference repository '%s' as a linked checkout is not supported yet." -msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu." - -#: sha1-file.c:740 -#, c-format -msgid "reference repository '%s' is not a local repository." -msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." - -#: sha1-file.c:746 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "referensarkivet \"%s\" är grunt" - -#: sha1-file.c:754 -#, c-format -msgid "reference repository '%s' is grafted" -msgstr "referensarkivet \"%s\" är ympat" - -#: sha1-file.c:814 -#, c-format -msgid "invalid line while parsing alternate refs: %s" -msgstr "felaktig rad vid tolkning av supplerande referenser: %s" - -#: sha1-file.c:964 -#, c-format -msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" -msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>" - -#: sha1-file.c:985 -msgid "mmap failed" -msgstr "mmap misslyckades" - -#: sha1-file.c:1149 -#, c-format -msgid "object file %s is empty" -msgstr "objektfilen %s är tom" - -#: sha1-file.c:1284 sha1-file.c:2477 -#, c-format -msgid "corrupt loose object '%s'" -msgstr "trasigt löst objekt \"%s\"" - -#: sha1-file.c:1286 sha1-file.c:2481 -#, c-format -msgid "garbage at end of loose object '%s'" -msgstr "skräp i slutet av löst objekt \"%s\"" - -#: sha1-file.c:1328 -msgid "invalid object type" -msgstr "felaktig objekttyp" - -#: sha1-file.c:1412 -#, c-format -msgid "unable to unpack %s header with --allow-unknown-type" -msgstr "kan inte packa upp %s-huvud med --allow-unknown-type" - -#: sha1-file.c:1415 -#, c-format -msgid "unable to unpack %s header" -msgstr "kan inte packa upp %s-huvudet" - -#: sha1-file.c:1421 -#, c-format -msgid "unable to parse %s header with --allow-unknown-type" -msgstr "kan inte tolka %s-huvud med --allow-unknown-type" - -#: sha1-file.c:1424 -#, c-format -msgid "unable to parse %s header" -msgstr "kan inte tolka %s-huvud" - -#: sha1-file.c:1651 -#, c-format -msgid "failed to read object %s" -msgstr "misslyckades läsa objektet %s" - -#: sha1-file.c:1655 -#, c-format -msgid "replacement %s not found for %s" -msgstr "ersättningen %s hittades inte för %s" - -#: sha1-file.c:1659 -#, c-format -msgid "loose object %s (stored in %s) is corrupt" -msgstr "löst objekt %s (lagrat i %s) är trasigt" - -#: sha1-file.c:1663 -#, c-format -msgid "packed object %s (stored in %s) is corrupt" -msgstr "packat objekt %s (lagrat i %s) är trasigt" - -#: sha1-file.c:1768 -#, c-format -msgid "unable to write file %s" -msgstr "kunde inte skriva filen %s" - -#: sha1-file.c:1775 -#, c-format -msgid "unable to set permission to '%s'" -msgstr "kan inte sätta behörigheten till \"%s\"" - -#: sha1-file.c:1782 -msgid "file write error" -msgstr "fel vid skrivning av fil" - -#: sha1-file.c:1802 -msgid "error when closing loose object file" -msgstr "fel vid stängning av fil för löst objekt" - -#: sha1-file.c:1867 -#, c-format -msgid "insufficient permission for adding an object to repository database %s" -msgstr "" -"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s" - -#: sha1-file.c:1869 -msgid "unable to create temporary file" -msgstr "kan inte skapa temporär fil" - -#: sha1-file.c:1893 -msgid "unable to write loose object file" -msgstr "kunde inte skriva fil för löst objekt" - -#: sha1-file.c:1899 -#, c-format -msgid "unable to deflate new object %s (%d)" -msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" - -#: sha1-file.c:1903 -#, c-format -msgid "deflateEnd on object %s failed (%d)" -msgstr "\"deflateend\" på objektet %s misslyckades (%d)" - -#: sha1-file.c:1907 -#, c-format -msgid "confused by unstable object source data for %s" -msgstr "förvirrad av instabil objektkälldata för %s" - -#: sha1-file.c:1917 builtin/pack-objects.c:1086 -#, c-format -msgid "failed utime() on %s" -msgstr "\"utime()\" misslyckades på %s" - -#: sha1-file.c:1994 -#, c-format -msgid "cannot read object for %s" -msgstr "kan inte läsa objekt för %s" - -#: sha1-file.c:2045 -msgid "corrupt commit" -msgstr "trasik incheckning" - -#: sha1-file.c:2053 -msgid "corrupt tag" -msgstr "trasig tagg" - -#: sha1-file.c:2153 -#, c-format -msgid "read error while indexing %s" -msgstr "läsfel vid indexering av %s" - -#: sha1-file.c:2156 -#, c-format -msgid "short read while indexing %s" -msgstr "för lite lästes vid indexering av %s" - -#: sha1-file.c:2229 sha1-file.c:2239 -#, c-format -msgid "%s: failed to insert into database" -msgstr "%s: misslyckades lägga in i databasen" - -#: sha1-file.c:2245 -#, c-format -msgid "%s: unsupported file type" -msgstr "%s: filtypen stöds ej" - -#: sha1-file.c:2269 -#, c-format -msgid "%s is not a valid object" -msgstr "%s är inte ett giltigt objekt" - -#: sha1-file.c:2271 -#, c-format -msgid "%s is not a valid '%s' object" -msgstr "%s är inte ett giltigt \"%s\"-objekt" - -#: sha1-file.c:2298 builtin/index-pack.c:192 -#, c-format -msgid "unable to open %s" -msgstr "kan inte öppna %s" - -#: sha1-file.c:2488 sha1-file.c:2541 -#, c-format -msgid "hash mismatch for %s (expected %s)" -msgstr "hash stämmer inte för %s (förväntade %s)" - -#: sha1-file.c:2512 -#, c-format -msgid "unable to mmap %s" -msgstr "kan inte utföra \"mmap\" för %s" - -#: sha1-file.c:2517 -#, c-format -msgid "unable to unpack header of %s" -msgstr "kan inte packa upp huvud för %s" - -#: sha1-file.c:2523 -#, c-format -msgid "unable to parse header of %s" -msgstr "kan inte tolka huvud för %s" - -#: sha1-file.c:2534 -#, c-format -msgid "unable to unpack contents of %s" -msgstr "kan inte tolka innehåll i %s" - -#: sha1-name.c:486 -#, c-format -msgid "short SHA1 %s is ambiguous" -msgstr "kort SHA1 %s är tvetydig" - -#: sha1-name.c:497 -msgid "The candidates are:" -msgstr "Kandidaterna är:" - -#: sha1-name.c:796 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"may be created by mistake. For example,\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" -"examine these refs and maybe delete them. Turn this message off by\n" -"running \"git config advice.objectNameWarning false\"" -msgstr "" -"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n" -"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n" -"referenser kan skapas av misstag. Till exempel, för\n" -"\n" -" git switch -c $br $(git rev-parse ...)\n" -"\n" -"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n" -"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" -"genom att köra \"git config advice.objectNameWarning false\"" - -#: sha1-name.c:916 -#, c-format -msgid "log for '%.*s' only goes back to %s" -msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s" - -#: sha1-name.c:924 -#, c-format -msgid "log for '%.*s' only has %d entries" -msgstr "loggen för \"%.*s\" har bara %d poster" - -#: sha1-name.c:1702 -#, c-format -msgid "path '%s' exists on disk, but not in '%.*s'" -msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\"" - -#: sha1-name.c:1708 -#, c-format -msgid "" -"path '%s' exists, but not '%s'\n" -"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" -msgstr "" -"sökvägen \"%s\" finns, men inte i \"%s\"\n" -"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?" - -#: sha1-name.c:1717 -#, c-format -msgid "path '%s' does not exist in '%.*s'" -msgstr "sökvägen \"%s\" finns inte i \"%.*s\"" - -#: sha1-name.c:1745 -#, c-format -msgid "" -"path '%s' is in the index, but not at stage %d\n" -"hint: Did you mean ':%d:%s'?" -msgstr "" -"sökvägen \"%s\" finns i indexet men inte i etapp %d\n" -"tips: Menade du \":%d:%s\"?" - -#: sha1-name.c:1761 -#, c-format -msgid "" -"path '%s' is in the index, but not '%s'\n" -"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" -msgstr "" -"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n" -"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?" - -#: sha1-name.c:1769 -#, c-format -msgid "path '%s' exists on disk, but not in the index" -msgstr "sökvägen \"%s\" finns på disk, men inte i indexet" - -#: sha1-name.c:1771 -#, c-format -msgid "path '%s' does not exist (neither on disk nor in the index)" -msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)" - -#: sha1-name.c:1784 -msgid "relative path syntax can't be used outside working tree" -msgstr "relativ sökväg kan inte användas utanför arbetskatalogen" - -#: sha1-name.c:1922 -#, c-format -msgid "invalid object name '%.*s'." -msgstr "felaktigt objektnamn \"%.*s\"." - #. TRANSLATORS: IEC 80000-13:2008 gibibyte #: strbuf.c:848 #, c-format @@ -8179,7 +8439,7 @@ msgstr[0] "%u byte/s" msgstr[1] "%u bytes/s" #: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719 -#: builtin/rebase.c:864 +#: builtin/rebase.c:866 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -8243,12 +8503,12 @@ msgstr "i ej utcheckad undermodul \"%s\"" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" -#: submodule.c:434 +#: submodule.c:435 #, c-format msgid "bad --ignore-submodules argument: %s" msgstr "felaktigt argument till --ignore-submodules: %s" -#: submodule.c:816 +#: submodule.c:817 #, c-format msgid "" "Submodule in commit %s at path: '%s' collides with a submodule named the " @@ -8257,12 +8517,12 @@ msgstr "" "Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul " "med samma namn. Hoppar över den." -#: submodule.c:919 +#: submodule.c:920 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning" -#: submodule.c:1004 +#: submodule.c:1005 #, c-format msgid "" "Could not run 'git rev-list <commits> --not --remotes -n 1' command in " @@ -8271,36 +8531,36 @@ msgstr "" "kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i " "undermodulen \"%s\"" -#: submodule.c:1127 +#: submodule.c:1128 #, c-format msgid "process for submodule '%s' failed" msgstr "process för undermodulen \"%s\" misslyckades" -#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469 +#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens." -#: submodule.c:1167 +#: submodule.c:1168 #, c-format msgid "Pushing submodule '%s'\n" msgstr "Sänder undermodulen \"%s\"\n" -#: submodule.c:1170 +#: submodule.c:1171 #, c-format msgid "Unable to push submodule '%s'\n" msgstr "Kunde inte sända undermodulen \"%s\"\n" -#: submodule.c:1462 +#: submodule.c:1463 #, c-format msgid "Fetching submodule %s%s\n" msgstr "Hämtar undermodulen %s%s\n" -#: submodule.c:1492 +#: submodule.c:1497 #, c-format msgid "Could not access submodule '%s'\n" msgstr "Kunde inte komma åt undermodulen \"%s\"\n" -#: submodule.c:1646 +#: submodule.c:1652 #, c-format msgid "" "Errors during submodule fetch:\n" @@ -8309,61 +8569,61 @@ msgstr "" "Fel vid hämtning av undermodul:\n" "%s" -#: submodule.c:1671 +#: submodule.c:1677 #, c-format msgid "'%s' not recognized as a git repository" msgstr "\"%s\" känns inte igen som ett git-arkiv" -#: submodule.c:1688 +#: submodule.c:1694 #, c-format msgid "Could not run 'git status --porcelain=2' in submodule %s" msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\"" -#: submodule.c:1729 +#: submodule.c:1735 #, c-format msgid "'git status --porcelain=2' failed in submodule %s" msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\"" -#: submodule.c:1804 +#: submodule.c:1810 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" -#: submodule.c:1817 +#: submodule.c:1823 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" -#: submodule.c:1832 +#: submodule.c:1838 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\"" -#: submodule.c:1859 submodule.c:2169 +#: submodule.c:1865 submodule.c:2175 #, c-format msgid "could not recurse into submodule '%s'" msgstr "kunde inte rekursera in i undermodulen \"%s\"" -#: submodule.c:1880 +#: submodule.c:1886 msgid "could not reset submodule index" msgstr "kunde inte återställa indexet i undermodul" -#: submodule.c:1922 +#: submodule.c:1928 #, c-format msgid "submodule '%s' has dirty index" msgstr "undermodulen \"%s\" har ett smutsigt index" -#: submodule.c:1974 +#: submodule.c:1980 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Undermoduler \"%s\" kunde inte uppdateras." -#: submodule.c:2042 +#: submodule.c:2048 #, c-format msgid "submodule git dir '%s' is inside git dir '%.*s'" msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\"" -#: submodule.c:2063 +#: submodule.c:2069 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -8371,17 +8631,17 @@ msgstr "" "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " "stöds ej" -#: submodule.c:2075 submodule.c:2134 +#: submodule.c:2081 submodule.c:2140 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" -#: submodule.c:2079 +#: submodule.c:2085 #, c-format msgid "refusing to move '%s' into an existing git dir" msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog" -#: submodule.c:2086 +#: submodule.c:2092 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -8392,11 +8652,11 @@ msgstr "" "\"%s\" till\n" "\"%s\"\n" -#: submodule.c:2214 +#: submodule.c:2220 msgid "could not start ls-files in .." msgstr "kunde inte starta ls-files i .." -#: submodule.c:2254 +#: submodule.c:2260 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" @@ -8427,7 +8687,7 @@ msgstr "tom släpradssymbol i släpraden \"%.*s\"" msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:751 +#: trailer.c:751 builtin/mktag.c:91 msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" @@ -8501,7 +8761,7 @@ msgstr "kunde inte köra fast-import" msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:549 transport-helper.c:1236 +#: transport-helper.c:549 transport-helper.c:1237 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" @@ -8519,7 +8779,7 @@ msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:661 transport.c:1446 +#: transport-helper.c:661 transport.c:1447 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" @@ -8598,52 +8858,52 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren.\n" -#: transport-helper.c:1213 +#: transport-helper.c:1214 #, c-format msgid "unsupported object format '%s'" msgstr "objektformatet \"%s\" stöds ej" -#: transport-helper.c:1222 +#: transport-helper.c:1223 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1374 +#: transport-helper.c:1375 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1401 +#: transport-helper.c:1402 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1450 +#: transport-helper.c:1451 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1454 +#: transport-helper.c:1455 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1473 transport-helper.c:1477 +#: transport-helper.c:1474 transport-helper.c:1478 #, c-format msgid "can't start thread for copying data: %s" msgstr "kan inte starta tråd för kopiering av data: %s" -#: transport-helper.c:1514 +#: transport-helper.c:1515 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1518 +#: transport-helper.c:1519 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1536 transport-helper.c:1545 +#: transport-helper.c:1537 transport-helper.c:1546 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -8732,23 +8992,23 @@ msgstr "" msgid "Aborting." msgstr "Avbryter." -#: transport.c:1315 +#: transport.c:1316 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: tree-walk.c:32 +#: tree-walk.c:33 msgid "too-short tree object" msgstr "trädobjekt för kort" -#: tree-walk.c:38 +#: tree-walk.c:39 msgid "malformed mode in tree entry" msgstr "felformat läge i trädpost" -#: tree-walk.c:42 +#: tree-walk.c:43 msgid "empty filename in tree entry" msgstr "tomt filnamn i trädpost" -#: tree-walk.c:117 +#: tree-walk.c:118 msgid "too-short tree file" msgstr "trädfil för kort" @@ -9011,7 +9271,7 @@ msgstr "" msgid "Updating index flags" msgstr "Uppdaterar indexflaggor" -#: upload-pack.c:1550 +#: upload-pack.c:1543 msgid "expected flush after fetch arguments" msgstr "förväntade \"flush\" efter \"fetch\"-argument" @@ -9048,72 +9308,102 @@ msgstr "felaktigt \"..\"-sökvägssegment" msgid "Fetching objects" msgstr "Hämtar objekt" -#: worktree.c:236 builtin/am.c:2103 +#: worktree.c:238 builtin/am.c:2103 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" -#: worktree.c:283 +#: worktree.c:304 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen" -#: worktree.c:294 +#: worktree.c:315 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen" -#: worktree.c:306 +#: worktree.c:327 #, c-format msgid "'%s' does not exist" msgstr "\"%s\" finns inte" -#: worktree.c:312 +#: worktree.c:333 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "\"%s\" är inte en .git-fil, felkod %d" -#: worktree.c:321 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: worktree.c:587 +#: worktree.c:608 msgid "not a directory" msgstr "inte en katalog" -#: worktree.c:596 +#: worktree.c:617 msgid ".git is not a file" msgstr ".git är inte en fil" -#: worktree.c:598 +#: worktree.c:619 msgid ".git file broken" msgstr ".git-filen är trasig" -#: worktree.c:600 +#: worktree.c:621 msgid ".git file incorrect" msgstr ".git-filen är felaktig" -#: worktree.c:670 +#: worktree.c:727 msgid "not a valid path" msgstr "inte en giltig sökväg" -#: worktree.c:676 +#: worktree.c:733 msgid "unable to locate repository; .git is not a file" msgstr "hittar inte arkivet; .git är inte en fil" -#: worktree.c:679 +#: worktree.c:737 +msgid "unable to locate repository; .git file does not reference a repository" +msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv" + +#: worktree.c:741 msgid "unable to locate repository; .git file broken" msgstr "hittar inte arkivet; .git-filen är trasig" -#: worktree.c:685 +#: worktree.c:747 msgid "gitdir unreadable" msgstr "gitdir är oläsbar" -#: worktree.c:689 +#: worktree.c:751 msgid "gitdir incorrect" msgstr "gitdir är felaktig" +#: worktree.c:776 +msgid "not a valid directory" +msgstr "inte i en giltig katalog" + +#: worktree.c:782 +msgid "gitdir file does not exist" +msgstr "gitdir-filen existerar inte" + +#: worktree.c:787 worktree.c:796 +#, c-format +msgid "unable to read gitdir file (%s)" +msgstr "kunde inte läsa gitdir-filen (%s)" + +#: worktree.c:806 +#, c-format +msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" +msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)" + +#: worktree.c:814 +msgid "invalid gitdir file" +msgstr "ogiltig gitdir-fil" + +#: worktree.c:822 +msgid "gitdir file points to non-existent location" +msgstr "gitdir-filen pekar på en ickeexisterande plats" + #: wrapper.c:197 wrapper.c:367 #, c-format msgid "could not open '%s' for reading and writing" @@ -9159,11 +9449,11 @@ msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning) msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (använd \"git rm <fil>...\" för att ange lösning)" -#: wt-status.c:211 wt-status.c:1070 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Ändringar att checka in:" -#: wt-status.c:234 wt-status.c:1079 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Ändringar ej i incheckningskön:" @@ -9266,22 +9556,22 @@ msgstr "ändrat innehåll, " msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:903 +#: wt-status.c:905 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "Stashen innehåller just nu %d post" msgstr[1] "Stashen innehåller just nu %d poster" -#: wt-status.c:934 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Undermoduler ändrade men inte uppdaterade:" -#: wt-status.c:936 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Undermodulers ändringar att checka in:" -#: wt-status.c:1018 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -9289,7 +9579,7 @@ msgstr "" "Raden ovan får inte ändras eller tas bort.\n" "Allt under den kommer tas bort." -#: wt-status.c:1110 +#: wt-status.c:1112 #, c-format msgid "" "\n" @@ -9300,107 +9590,107 @@ msgstr "" "Det tog %.2f sekunder att räkna före/bakom-värden.\n" "Du kan använda \"--no-ahead-behind\" för undvika detta.\n" -#: wt-status.c:1140 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:1143 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:1145 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)" -#: wt-status.c:1149 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:1152 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:1161 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:1164 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:1168 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (rätta konflikter och kör sedan \"git am --continue\")" -#: wt-status.c:1170 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:1172 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1305 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo saknas." -#: wt-status.c:1307 +#: wt-status.c:1309 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1310 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1321 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1326 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1329 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1337 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1349 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1354 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1367 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1369 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1371 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1378 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1382 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -9408,147 +9698,155 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1387 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1390 +#: wt-status.c:1392 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1394 +#: wt-status.c:1396 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1399 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1402 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1404 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1415 +#: wt-status.c:1417 msgid "Cherry-pick currently in progress." msgstr "Cherry-pick pågår." -#: wt-status.c:1418 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1425 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1428 +#: wt-status.c:1430 msgid " (run \"git cherry-pick --continue\" to continue)" msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)" -#: wt-status.c:1431 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1433 +#: wt-status.c:1435 msgid " (use \"git cherry-pick --skip\" to skip this patch)" msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)" -#: wt-status.c:1435 +#: wt-status.c:1437 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-" "operationen)" -#: wt-status.c:1445 +#: wt-status.c:1447 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1448 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1454 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1457 +#: wt-status.c:1459 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1460 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (use \"git revert --skip\" to skip this patch)" msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" -#: wt-status.c:1464 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1474 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"." -#: wt-status.c:1478 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1481 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:1492 +#: wt-status.c:1494 #, c-format msgid "You are in a sparse checkout with %d%% of tracked files present." msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats." -#: wt-status.c:1731 +#: wt-status.c:1733 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1738 +#: wt-status.c:1740 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1740 +#: wt-status.c:1742 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1750 +#: wt-status.c:1747 +msgid "HEAD detached at " +msgstr "HEAD frånkopplad vid " + +#: wt-status.c:1749 +msgid "HEAD detached from " +msgstr "HEAD frånkopplad från " + +#: wt-status.c:1752 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1767 +#: wt-status.c:1769 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1768 +#: wt-status.c:1770 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1782 +#: wt-status.c:1784 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1784 +#: wt-status.c:1786 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1788 +#: wt-status.c:1790 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -9560,32 +9858,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1794 +#: wt-status.c:1796 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1796 +#: wt-status.c:1798 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1802 +#: wt-status.c:1804 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1807 +#: wt-status.c:1809 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1811 +#: wt-status.c:1813 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1815 +#: wt-status.c:1817 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -9594,62 +9892,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1819 +#: wt-status.c:1821 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1823 +#: wt-status.c:1825 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1827 wt-status.c:1833 +#: wt-status.c:1829 wt-status.c:1835 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1830 +#: wt-status.c:1832 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1835 +#: wt-status.c:1837 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1940 +#: wt-status.c:1942 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1944 +#: wt-status.c:1946 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1975 +#: wt-status.c:1977 msgid "different" msgstr "olika" -#: wt-status.c:1977 wt-status.c:1985 +#: wt-status.c:1979 wt-status.c:1987 msgid "behind " msgstr "efter " -#: wt-status.c:1980 wt-status.c:1983 +#: wt-status.c:1982 wt-status.c:1985 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2505 +#: wt-status.c:2507 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2511 +#: wt-status.c:2513 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2513 +#: wt-status.c:2515 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -9663,126 +9961,131 @@ msgstr "misslyckades ta bort länken \"%s\"" msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." -#: builtin/add.c:88 +#: builtin/add.c:58 +#, c-format +msgid "cannot chmod %cx '%s'" +msgstr "kan inte utföra chmod %cx \"%s\"" + +#: builtin/add.c:96 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:93 builtin/commit.c:285 +#: builtin/add.c:101 builtin/commit.c:285 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:103 +#: builtin/add.c:111 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:178 +#: builtin/add.c:186 msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:272 builtin/rev-parse.c:908 +#: builtin/add.c:280 builtin/rev-parse.c:991 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:283 +#: builtin/add.c:291 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning." -#: builtin/add.c:287 +#: builtin/add.c:295 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:290 +#: builtin/add.c:298 msgid "editing patch failed" msgstr "redigering av patch misslyckades" -#: builtin/add.c:293 +#: builtin/add.c:301 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:295 +#: builtin/add.c:303 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:300 +#: builtin/add.c:308 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:308 +#: builtin/add.c:316 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:328 builtin/clean.c:904 builtin/fetch.c:166 builtin/mv.c:124 +#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124 #: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559 #: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:331 +#: builtin/add.c:339 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308 +#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:333 +#: builtin/add.c:341 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:334 +#: builtin/add.c:342 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:335 +#: builtin/add.c:343 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:336 +#: builtin/add.c:344 msgid "renormalize EOL of tracked files (implies -u)" msgstr "åternormalisera radslut i spårade filer (implicerar -u)" -#: builtin/add.c:337 +#: builtin/add.c:345 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:338 +#: builtin/add.c:346 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:341 +#: builtin/add.c:349 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)" -#: builtin/add.c:343 +#: builtin/add.c:351 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:344 +#: builtin/add.c:352 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:345 +#: builtin/add.c:353 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:347 builtin/update-index.c:1004 +#: builtin/add.c:355 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" -#: builtin/add.c:349 +#: builtin/add.c:357 msgid "warn when adding an embedded repository" msgstr "varna när ett inbyggt arkiv läggs till" -#: builtin/add.c:351 +#: builtin/add.c:359 msgid "backend for `git stash -p`" msgstr "bakända för \"git stash -p\"" -#: builtin/add.c:369 +#: builtin/add.c:377 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -9813,12 +10116,12 @@ msgstr "" "\n" "Se \"git help submodule\" för ytterligare information." -#: builtin/add.c:397 +#: builtin/add.c:405 #, c-format msgid "adding embedded git repository: %s" msgstr "lägger till inbäddat git-arkiv: %s" -#: builtin/add.c:416 +#: builtin/add.c:424 msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" @@ -9828,47 +10131,47 @@ msgstr "" "Slå av detta meddelande med\n" "\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:425 +#: builtin/add.c:433 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:453 builtin/commit.c:345 +#: builtin/add.c:461 builtin/commit.c:345 msgid "--pathspec-from-file is incompatible with --interactive/--patch" msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch" -#: builtin/add.c:470 +#: builtin/add.c:478 msgid "--pathspec-from-file is incompatible with --edit" msgstr "--pathspec-from-file är inkompatibelt med --edit" -#: builtin/add.c:482 +#: builtin/add.c:490 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:485 +#: builtin/add.c:493 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" -#: builtin/add.c:489 +#: builtin/add.c:497 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x" -#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351 -#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502 +#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351 +#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569 msgid "--pathspec-from-file is incompatible with pathspec arguments" msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar" -#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357 -#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508 +#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357 +#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575 msgid "--pathspec-file-nul requires --pathspec-from-file" msgstr "--pathspec-file-nul kräver --pathspec-from-file" -#: builtin/add.c:518 +#: builtin/add.c:526 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:520 +#: builtin/add.c:528 msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" @@ -10124,7 +10427,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" #: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16 -#: builtin/repack.c:335 builtin/stash.c:815 +#: builtin/repack.c:334 builtin/stash.c:882 msgid "be quiet" msgstr "var tyst" @@ -10167,17 +10470,17 @@ msgid "pass it through git-apply" msgstr "sänd det genom git-apply" #: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17 -#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261 #: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 -#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350 -#: builtin/repack.c:352 builtin/show-branch.c:650 builtin/show-ref.c:172 -#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349 +#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175 #: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136 -#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438 +#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136 +#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470 #: builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -10203,12 +10506,12 @@ msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" #: builtin/am.c:2287 -msgid "restore the original branch and abort the patching operation." -msgstr "återställ originalgrenen och avbryt patchningen." +msgid "restore the original branch and abort the patching operation" +msgstr "återställ originalgrenen och avbryt patchningen" #: builtin/am.c:2290 -msgid "abort the patching operation but keep HEAD where it is." -msgstr "avbryt patchningen men behåll HEAD där det är." +msgid "abort the patching operation but keep HEAD where it is" +msgstr "avbryt patchningen men behåll HEAD där det är" #: builtin/am.c:2294 msgid "show the patch being applied" @@ -10223,12 +10526,12 @@ msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" #: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515 -#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536 -#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419 +#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538 +#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395 +#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" @@ -10309,27 +10612,11 @@ msgid "git bisect--helper --bisect-reset [<commit>]" msgstr "git bisect--helper --bisect-reset [<incheckning>]" #: builtin/bisect--helper.c:24 -msgid "" -"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-" -"för-rätt> <term-för-fel>" - -#: builtin/bisect--helper.c:25 -msgid "" -"git bisect--helper --bisect-check-and-set-terms <command> <good_term> " -"<bad_term>" -msgstr "" -"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> " -"<term-för-fel>" - -#: builtin/bisect--helper.c:26 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]" msgstr "" "git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>" -#: builtin/bisect--helper.c:27 +#: builtin/bisect--helper.c:25 msgid "" "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" @@ -10337,7 +10624,7 @@ msgstr "" "git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --" "term-new]" -#: builtin/bisect--helper.c:28 +#: builtin/bisect--helper.c:26 msgid "" "git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}" "=<term>] [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] " @@ -10347,62 +10634,66 @@ msgstr "" "=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] " "[<sökvägar>...]" -#: builtin/bisect--helper.c:30 +#: builtin/bisect--helper.c:28 msgid "git bisect--helper --bisect-next" msgstr "git bisect--helper --bisect-next" -#: builtin/bisect--helper.c:31 -msgid "git bisect--helper --bisect-auto-next" -msgstr "git bisect--helper --bisect-auto-next" - -#: builtin/bisect--helper.c:32 +#: builtin/bisect--helper.c:29 msgid "git bisect--helper --bisect-state (bad|new) [<rev>]" msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]" -#: builtin/bisect--helper.c:33 +#: builtin/bisect--helper.c:30 msgid "git bisect--helper --bisect-state (good|old) [<rev>...]" msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]" -#: builtin/bisect--helper.c:108 +#: builtin/bisect--helper.c:31 +msgid "git bisect--helper --bisect-replay <filename>" +msgstr "git bisect--helper --bisect-replay <filnamn>" + +#: builtin/bisect--helper.c:32 +msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]" +msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]" + +#: builtin/bisect--helper.c:107 #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "kan inte kopiera filen \"%s\" i läget \"%s\"" -#: builtin/bisect--helper.c:115 +#: builtin/bisect--helper.c:114 #, c-format msgid "could not write to file '%s'" msgstr "kunde inte skriva till filen \"%s\"" -#: builtin/bisect--helper.c:154 +#: builtin/bisect--helper.c:153 #, c-format msgid "'%s' is not a valid term" msgstr "\"%s\" är inte en giltig term" -#: builtin/bisect--helper.c:158 +#: builtin/bisect--helper.c:157 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "kan inte använda det inbyggda kommandot \"%s\" som term" -#: builtin/bisect--helper.c:168 +#: builtin/bisect--helper.c:167 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "kan inte ändra betydelsen av termen \"%s\"" -#: builtin/bisect--helper.c:178 +#: builtin/bisect--helper.c:177 msgid "please use two different terms" msgstr "termerna måste vara olika" -#: builtin/bisect--helper.c:194 +#: builtin/bisect--helper.c:193 #, c-format msgid "We are not bisecting.\n" msgstr "Vi utför ingen bisect för tillfället.\n" -#: builtin/bisect--helper.c:202 +#: builtin/bisect--helper.c:201 #, c-format msgid "'%s' is not a valid commit" msgstr "\"%s\" är inte en giltig incheckning" -#: builtin/bisect--helper.c:211 +#: builtin/bisect--helper.c:210 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -10410,27 +10701,27 @@ msgstr "" "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset " "<incheckning>\"." -#: builtin/bisect--helper.c:255 +#: builtin/bisect--helper.c:254 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Felaktigt argument till bisect_write: %s" -#: builtin/bisect--helper.c:260 +#: builtin/bisect--helper.c:259 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "kan inte läsa oid för referensen \"%s\"" -#: builtin/bisect--helper.c:272 +#: builtin/bisect--helper.c:271 #, c-format msgid "couldn't open the file '%s'" msgstr "kunde inte öppna filen \"%s\"" -#: builtin/bisect--helper.c:298 +#: builtin/bisect--helper.c:297 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s." -#: builtin/bisect--helper.c:325 +#: builtin/bisect--helper.c:324 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -10439,7 +10730,7 @@ msgstr "" "Du måste ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:328 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -10450,7 +10741,7 @@ msgstr "" "Du måste sedan ange åtminstone en %s och en %s version.\n" "(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)" -#: builtin/bisect--helper.c:349 +#: builtin/bisect--helper.c:348 #, c-format msgid "bisecting only with a %s commit" msgstr "utför bisect med endast en %s incheckning" @@ -10459,15 +10750,15 @@ msgstr "utför bisect med endast en %s incheckning" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:357 +#: builtin/bisect--helper.c:356 msgid "Are you sure [Y/n]? " msgstr "Är du säker [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:418 +#: builtin/bisect--helper.c:417 msgid "no terms defined" msgstr "inga termer angivna" -#: builtin/bisect--helper.c:421 +#: builtin/bisect--helper.c:420 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -10476,7 +10767,7 @@ msgstr "" "Aktuella termer är %s för det gamla tillståndet\n" "och %s för det nya tillståndet.\n" -#: builtin/bisect--helper.c:431 +#: builtin/bisect--helper.c:430 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -10485,54 +10776,54 @@ msgstr "" "ogiltigt argument %s för \"git bisect terms\".\n" "Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new." -#: builtin/bisect--helper.c:498 +#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014 msgid "revision walk setup failed\n" msgstr "misslyckades starta revisionstraversering\n" -#: builtin/bisect--helper.c:520 +#: builtin/bisect--helper.c:519 #, c-format msgid "could not open '%s' for appending" msgstr "kunde inte öppna \"%s\" för tillägg" -#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651 msgid "'' is not a valid term" msgstr "\"\" är inte en giltig term" -#: builtin/bisect--helper.c:662 +#: builtin/bisect--helper.c:661 #, c-format msgid "unrecognized option: '%s'" msgstr "okänd flagga: %s" -#: builtin/bisect--helper.c:666 +#: builtin/bisect--helper.c:665 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "\"%s\" verkar inte vara en giltig revision" -#: builtin/bisect--helper.c:697 +#: builtin/bisect--helper.c:696 msgid "bad HEAD - I need a HEAD" msgstr "felaktigt HEAD - Jag behöver ett HEAD" -#: builtin/bisect--helper.c:712 +#: builtin/bisect--helper.c:711 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat -#: builtin/bisect--helper.c:733 +#: builtin/bisect--helper.c:732 msgid "won't bisect on cg-seek'ed tree" msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts" -#: builtin/bisect--helper.c:736 +#: builtin/bisect--helper.c:735 msgid "bad HEAD - strange symbolic ref" msgstr "felaktigt HEAD - konstig symbolisk referens" -#: builtin/bisect--helper.c:756 +#: builtin/bisect--helper.c:755 #, c-format msgid "invalid ref: '%s'" msgstr "ogiltig referens: \"%s\"" -#: builtin/bisect--helper.c:814 +#: builtin/bisect--helper.c:813 msgid "You need to start by \"git bisect start\"\n" msgstr "Du måste starta med \"git bisect start\"\n" @@ -10540,92 +10831,101 @@ msgstr "Du måste starta med \"git bisect start\"\n" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:825 +#: builtin/bisect--helper.c:824 msgid "Do you want me to do it for you [Y/n]? " msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? " -#: builtin/bisect--helper.c:843 +#: builtin/bisect--helper.c:842 msgid "Please call `--bisect-state` with at least one argument" msgstr "Anropa \"--bisect-state\" med minst ett argument." -#: builtin/bisect--helper.c:856 +#: builtin/bisect--helper.c:855 #, c-format msgid "'git bisect %s' can take only one argument." msgstr "\"git bisect %s\" kan bara ta ett argument." -#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879 +#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878 #, c-format msgid "Bad rev input: %s" msgstr "Felaktig rev-indata: %s" -#: builtin/bisect--helper.c:924 -msgid "reset the bisection state" -msgstr "återställ bisect-tillstånd" +#: builtin/bisect--helper.c:912 +msgid "We are not bisecting." +msgstr "Vi utför ingen bisect för tillfället." -#: builtin/bisect--helper.c:926 -msgid "write out the bisection state in BISECT_LOG" -msgstr "skriver bisect-tillståndet i BISECT_LOG" +#: builtin/bisect--helper.c:962 +#, c-format +msgid "'%s'?? what are you talking about?" +msgstr "\"%s\"?? vad menar du?" -#: builtin/bisect--helper.c:928 -msgid "check and set terms in a bisection state" -msgstr "visa och ange termer för bisect-tillstånd" +#: builtin/bisect--helper.c:974 +#, c-format +msgid "cannot read file '%s' for replaying" +msgstr "kan inte läsa filen \"%s\" för återuppspelning" -#: builtin/bisect--helper.c:930 +#: builtin/bisect--helper.c:1047 +msgid "reset the bisection state" +msgstr "återställ bisect-tillstånd" + +#: builtin/bisect--helper.c:1049 msgid "check whether bad or good terms exist" msgstr "se efter om termer för rätt och fel finns" -#: builtin/bisect--helper.c:932 +#: builtin/bisect--helper.c:1051 msgid "print out the bisect terms" msgstr "skriv ut termer för bisect" -#: builtin/bisect--helper.c:934 +#: builtin/bisect--helper.c:1053 msgid "start the bisect session" msgstr "påbörja bisect-körningen" -#: builtin/bisect--helper.c:936 +#: builtin/bisect--helper.c:1055 msgid "find the next bisection commit" msgstr "hitta nästa incheckning i bisect" -#: builtin/bisect--helper.c:938 -msgid "verify the next bisection state then checkout the next bisection commit" -msgstr "" -"kontrollera nästa bisect-tillstånd och checka så ut nästa bisect-incheckning" - -#: builtin/bisect--helper.c:940 +#: builtin/bisect--helper.c:1057 msgid "mark the state of ref (or refs)" msgstr "markera tillståndet för en eller flera referenser" -#: builtin/bisect--helper.c:942 +#: builtin/bisect--helper.c:1059 +msgid "list the bisection steps so far" +msgstr "lista \"bisect\"-stegen som utförts så långt" + +#: builtin/bisect--helper.c:1061 +msgid "replay the bisection process from the given file" +msgstr "spela upp \"bisect\"-processen från angiven fil" + +#: builtin/bisect--helper.c:1063 +msgid "skip some commits for checkout" +msgstr "hoppa över ett par incheckningar" + +#: builtin/bisect--helper.c:1065 msgid "no log for BISECT_WRITE" msgstr "ingen logg för BISECT_WRITE" -#: builtin/bisect--helper.c:957 +#: builtin/bisect--helper.c:1080 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset kräver antingen inget argument eller en incheckning" -#: builtin/bisect--helper.c:961 -msgid "--bisect-write requires either 4 or 5 arguments" -msgstr "--bisect-write kräver antingen 4 eller 5 argument" - -#: builtin/bisect--helper.c:967 -msgid "--check-and-set-terms requires 3 arguments" -msgstr "--check-and-set-terms kräver tre argument" - -#: builtin/bisect--helper.c:973 +#: builtin/bisect--helper.c:1085 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check kräver 2 eller 3 argument" -#: builtin/bisect--helper.c:979 +#: builtin/bisect--helper.c:1091 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/bisect--helper.c:988 +#: builtin/bisect--helper.c:1100 msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next kräver 0 argument" -#: builtin/bisect--helper.c:994 -msgid "--bisect-auto-next requires 0 arguments" -msgstr "--bisect-auto-next kräver 0 argument" +#: builtin/bisect--helper.c:1111 +msgid "--bisect-log requires 0 arguments" +msgstr "--bisect-log kräver 0 argument" + +#: builtin/bisect--helper.c:1116 +msgid "no logfile given" +msgstr "ingen loggfil angiven" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" @@ -10644,138 +10944,141 @@ msgstr "förväntade en färg: %s" msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:730 +#: builtin/blame.c:728 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "felaktig färg \"%s\" i color.blame.repeatedLines" -#: builtin/blame.c:748 +#: builtin/blame.c:746 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:847 +#: builtin/blame.c:845 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" +#: builtin/blame.c:867 +msgid "show blame entries as we find them, incrementally" +msgstr "visa klandringsposter när vi hittar dem, interaktivt" + +#: builtin/blame.c:868 +msgid "do not show object names of boundary commits (Default: off)" +msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)" + #: builtin/blame.c:869 -msgid "Show blame entries as we find them, incrementally" -msgstr "Visa klandringsposter när vi hittar dem, interaktivt" +msgid "do not treat root commits as boundaries (Default: off)" +msgstr "vehandla inte rotincheckningar som gränser (Standard: av)" #: builtin/blame.c:870 -msgid "Do not show object names of boundary commits (Default: off)" -msgstr "Visa inte objektnamn för gränsincheckningar (Standard: av)" +msgid "show work cost statistics" +msgstr "visa statistik över arbetskostnad" -#: builtin/blame.c:871 -msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" +#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92 +#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175 +#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119 +#: builtin/push.c:575 builtin/send-pack.c:198 +msgid "force progress reporting" +msgstr "tvinga förloppsrapportering" #: builtin/blame.c:872 -msgid "Show work cost statistics" -msgstr "Visa statistik över arbetskostnad" +msgid "show output score for blame entries" +msgstr "visa utdatapoäng för klandringsposter" #: builtin/blame.c:873 -msgid "Force progress reporting" -msgstr "Tvinga förloppsrapportering" +msgid "show original filename (Default: auto)" +msgstr "visa originalfilnamn (Standard: auto)" #: builtin/blame.c:874 -msgid "Show output score for blame entries" -msgstr "Visa utdatapoäng för klandringsposter" +msgid "show original linenumber (Default: off)" +msgstr "visa ursprungligt radnummer (Standard: av)" #: builtin/blame.c:875 -msgid "Show original filename (Default: auto)" -msgstr "Visa originalfilnamn (Standard: auto)" +msgid "show in a format designed for machine consumption" +msgstr "visa i ett format avsett för maskinkonsumtion" #: builtin/blame.c:876 -msgid "Show original linenumber (Default: off)" -msgstr "Visa ursprungligt radnummer (Standard: av)" +msgid "show porcelain format with per-line commit information" +msgstr "visa porslinsformat med per-rad-incheckningsinformation" #: builtin/blame.c:877 -msgid "Show in a format designed for machine consumption" -msgstr "Visa i ett format avsett för maskinkonsumtion" +msgid "use the same output mode as git-annotate (Default: off)" +msgstr "använd samma utdataläge som git-annotate (Standard: av)" #: builtin/blame.c:878 -msgid "Show porcelain format with per-line commit information" -msgstr "Visa porslinsformat med per-rad-incheckningsinformation" +msgid "show raw timestamp (Default: off)" +msgstr "visa rå tidsstämpel (Standard: av)" #: builtin/blame.c:879 -msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "Använd samma utdataläge som git-annotate (Standard: av)" +msgid "show long commit SHA1 (Default: off)" +msgstr "visa lång inchecknings-SHA1 (Standard: av)" #: builtin/blame.c:880 -msgid "Show raw timestamp (Default: off)" -msgstr "Visa rå tidsstämpel (Standard: av)" +msgid "suppress author name and timestamp (Default: off)" +msgstr "undertryck författarnamn och tidsstämpel (Standard: av)" #: builtin/blame.c:881 -msgid "Show long commit SHA1 (Default: off)" -msgstr "Visa lång inchecknings-SHA1 (Standard: av)" +msgid "show author email instead of name (Default: off)" +msgstr "visa författarens e-post istället för namn (Standard: av)" #: builtin/blame.c:882 -msgid "Suppress author name and timestamp (Default: off)" -msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" +msgid "ignore whitespace differences" +msgstr "ignorera ändringar i blanksteg" + +#: builtin/blame.c:883 builtin/log.c:1812 +msgid "rev" +msgstr "incheckning" #: builtin/blame.c:883 -msgid "Show author email instead of name (Default: off)" -msgstr "Visa författarens e-post istället för namn (Standard: av)" +msgid "ignore <rev> when blaming" +msgstr "ignorera <incheckning> vid klandringen" #: builtin/blame.c:884 -msgid "Ignore whitespace differences" -msgstr "Ignorera ändringar i blanksteg" - -#: builtin/blame.c:885 builtin/log.c:1813 -msgid "rev" -msgstr "rev" +msgid "ignore revisions from <file>" +msgstr "ignorera incheckningar från <fil>" #: builtin/blame.c:885 -msgid "Ignore <rev> when blaming" -msgstr "ignorera <rev> vid klandren" - -#: builtin/blame.c:886 -msgid "Ignore revisions from <file>" -msgstr "ignorera revisioner från <fil>" - -#: builtin/blame.c:887 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:888 +#: builtin/blame.c:886 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:889 -msgid "Spend extra cycles to find better match" -msgstr "Slösa extra cykler med att hitta bättre träff" +#: builtin/blame.c:887 +msgid "spend extra cycles to find better match" +msgstr "slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:890 -msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" +#: builtin/blame.c:888 +msgid "use revisions from <file> instead of calling git-rev-list" +msgstr "använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:891 -msgid "Use <file>'s contents as the final image" -msgstr "Använd <fil>s innehåll som slutgiltig bild" +#: builtin/blame.c:889 +msgid "use <file>'s contents as the final image" +msgstr "använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:892 builtin/blame.c:893 +#: builtin/blame.c:890 builtin/blame.c:891 msgid "score" msgstr "poäng" -#: builtin/blame.c:892 -msgid "Find line copies within and across files" -msgstr "Hitta kopierade rader inuti och mellan filer" +#: builtin/blame.c:890 +msgid "find line copies within and across files" +msgstr "hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:893 -msgid "Find line movements within and across files" -msgstr "Hitta flyttade rader inuti och mellan filer" +#: builtin/blame.c:891 +msgid "find line movements within and across files" +msgstr "hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:894 +#: builtin/blame.c:892 msgid "range" msgstr "intervall" -#: builtin/blame.c:895 -msgid "Process only line range <start>,<end> or function :<funcname>" +#: builtin/blame.c:893 +msgid "process only line range <start>,<end> or function :<funcname>" msgstr "" -"Behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" +"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>" -#: builtin/blame.c:947 +#: builtin/blame.c:945 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -10787,18 +11090,18 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:998 +#: builtin/blame.c:996 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:1114 +#: builtin/blame.c:1112 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "filen %s har bara %lu rad" msgstr[1] "filen %s har bara %lu rader" -#: builtin/blame.c:1159 +#: builtin/blame.c:1157 msgid "Blaming lines" msgstr "Klandra rader" @@ -10866,118 +11169,108 @@ msgstr "" msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:220 +#: builtin/branch.c:223 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:226 +#: builtin/branch.c:230 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:240 +#: builtin/branch.c:244 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\"" -#: builtin/branch.c:255 +#: builtin/branch.c:259 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "fjärrspårande grenen \"%s\" hittades inte." -#: builtin/branch.c:256 +#: builtin/branch.c:260 #, c-format msgid "branch '%s' not found." msgstr "grenen \"%s\" hittades inte." -#: builtin/branch.c:271 -#, c-format -msgid "Error deleting remote-tracking branch '%s'" -msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" - -#: builtin/branch.c:272 -#, c-format -msgid "Error deleting branch '%s'" -msgstr "Fel vid borttagning av grenen \"%s\"" - -#: builtin/branch.c:279 +#: builtin/branch.c:291 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "Tog bort fjärrspårande grenen %s (var %s).\n" -#: builtin/branch.c:280 +#: builtin/branch.c:292 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "Tog bort grenen %s (var %s).\n" -#: builtin/branch.c:429 builtin/tag.c:61 +#: builtin/branch.c:438 builtin/tag.c:61 msgid "unable to parse format string" msgstr "kan inte tolka formatsträng" -#: builtin/branch.c:460 +#: builtin/branch.c:469 msgid "could not resolve HEAD" msgstr "kunde inte slå upp HEAD" -#: builtin/branch.c:466 +#: builtin/branch.c:475 #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) pekar utenför refs/heads/" -#: builtin/branch.c:481 +#: builtin/branch.c:490 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:485 +#: builtin/branch.c:494 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:502 +#: builtin/branch.c:511 msgid "cannot copy the current branch while not on any." msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:504 +#: builtin/branch.c:513 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:515 +#: builtin/branch.c:524 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:544 +#: builtin/branch.c:553 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:546 +#: builtin/branch.c:555 msgid "Branch copy failed" msgstr "Misslyckades kopiera gren" -#: builtin/branch.c:550 +#: builtin/branch.c:559 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "Skapade kopia av felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:553 +#: builtin/branch.c:562 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:559 +#: builtin/branch.c:568 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:568 +#: builtin/branch.c:577 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:570 +#: builtin/branch.c:579 msgid "Branch is copied, but update of config-file failed" msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:586 +#: builtin/branch.c:595 #, c-format msgid "" "Please edit the description for the branch\n" @@ -10988,211 +11281,211 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:620 +#: builtin/branch.c:629 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:622 +#: builtin/branch.c:631 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:623 +#: builtin/branch.c:632 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:624 +#: builtin/branch.c:633 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:626 +#: builtin/branch.c:635 msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:628 builtin/rebase.c:532 +#: builtin/branch.c:637 builtin/rebase.c:534 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:628 +#: builtin/branch.c:637 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:629 +#: builtin/branch.c:638 msgid "unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:630 +#: builtin/branch.c:639 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:631 +#: builtin/branch.c:640 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:633 builtin/branch.c:635 +#: builtin/branch.c:642 builtin/branch.c:644 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:634 builtin/branch.c:636 +#: builtin/branch.c:643 builtin/branch.c:645 msgid "print only branches that don't contain the commit" msgstr "visa endast grenar som inte innehåller incheckningen" -#: builtin/branch.c:639 +#: builtin/branch.c:648 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:640 +#: builtin/branch.c:649 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:642 +#: builtin/branch.c:651 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:643 +#: builtin/branch.c:652 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:644 +#: builtin/branch.c:653 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:645 +#: builtin/branch.c:654 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:646 +#: builtin/branch.c:655 msgid "copy a branch and its reflog" msgstr "kopiera en gren och dess reflogg" -#: builtin/branch.c:647 +#: builtin/branch.c:656 msgid "copy a branch, even if target exists" msgstr "kopiera en gren, även om målet finns" -#: builtin/branch.c:648 +#: builtin/branch.c:657 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:649 +#: builtin/branch.c:658 msgid "show current branch name" msgstr "visa namn på aktuell gren" -#: builtin/branch.c:650 +#: builtin/branch.c:659 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:652 +#: builtin/branch.c:661 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:653 +#: builtin/branch.c:662 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:654 +#: builtin/branch.c:663 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:655 +#: builtin/branch.c:664 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:656 +#: builtin/branch.c:665 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:658 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:667 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:434 +#: builtin/tag.c:466 msgid "object" msgstr "objekt" -#: builtin/branch.c:659 +#: builtin/branch.c:668 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441 +#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473 msgid "sorting and filtering are case insensitive" msgstr "sortering och filtrering skiljer gemener och VERSALER" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439 +#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" -#: builtin/branch.c:684 builtin/clone.c:790 +#: builtin/branch.c:693 builtin/clone.c:790 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:708 +#: builtin/branch.c:717 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:753 +#: builtin/branch.c:764 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:758 +#: builtin/branch.c:769 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:765 +#: builtin/branch.c:776 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu." -#: builtin/branch.c:768 +#: builtin/branch.c:779 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:783 +#: builtin/branch.c:794 msgid "too many branches for a copy operation" msgstr "för många grenar för kopiering" -#: builtin/branch.c:792 +#: builtin/branch.c:803 msgid "too many arguments for a rename operation" msgstr "för många flaggor för namnbyte" -#: builtin/branch.c:797 +#: builtin/branch.c:808 msgid "too many arguments to set new upstream" msgstr "för många flaggor för att byta uppström" -#: builtin/branch.c:801 +#: builtin/branch.c:812 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:815 builtin/branch.c:838 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:808 +#: builtin/branch.c:819 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:821 +#: builtin/branch.c:832 msgid "too many arguments to unset upstream" msgstr "för många flaggor för att ta bort uppström" -#: builtin/branch.c:825 +#: builtin/branch.c:836 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:831 +#: builtin/branch.c:842 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:841 +#: builtin/branch.c:852 msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list <pattern>?" @@ -11200,7 +11493,7 @@ msgstr "" "Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n" "Menade du att använda: -a|-r --list <mönster>?" -#: builtin/branch.c:845 +#: builtin/branch.c:856 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -11321,19 +11614,19 @@ msgstr "git bundle list-heads <fil> [<refnamn>...]" msgid "git bundle unbundle <file> [<refname>...]" msgstr "git bundle unbundle <fil> [<refnamn>...]" -#: builtin/bundle.c:67 builtin/pack-objects.c:3480 +#: builtin/bundle.c:67 builtin/pack-objects.c:3495 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/bundle.c:69 builtin/pack-objects.c:3482 +#: builtin/bundle.c:69 builtin/pack-objects.c:3497 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/bundle.c:71 builtin/pack-objects.c:3484 +#: builtin/bundle.c:71 builtin/pack-objects.c:3499 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/bundle.c:74 builtin/pack-objects.c:3487 +#: builtin/bundle.c:74 builtin/pack-objects.c:3502 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" @@ -11476,8 +11769,8 @@ msgstr "läs filnamn från standard in" msgid "terminate input and output records by a NUL character" msgstr "avsluta in- och utdataposter med NUL-tecken" -#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541 -#: builtin/worktree.c:561 +#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549 +#: builtin/worktree.c:489 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -11530,54 +11823,54 @@ msgstr "kunde inte tolka kontakt: %s" msgid "no contacts specified" msgstr "inga kontakter angavs" -#: builtin/checkout-index.c:139 +#: builtin/checkout-index.c:152 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<flaggor>] [--] [<fil>...]" -#: builtin/checkout-index.c:156 +#: builtin/checkout-index.c:169 msgid "stage should be between 1 and 3 or all" msgstr "etapp måste vara mellan 1 och 3 eller \"all\"" -#: builtin/checkout-index.c:173 +#: builtin/checkout-index.c:186 msgid "check out all files in the index" msgstr "checka ut alla filer i indexet" -#: builtin/checkout-index.c:174 +#: builtin/checkout-index.c:187 msgid "force overwrite of existing files" msgstr "tvinga överskrivning av befintliga filer" -#: builtin/checkout-index.c:176 +#: builtin/checkout-index.c:189 msgid "no warning for existing files and files not in index" msgstr "ingen varning för existerande filer och filer ej i indexet" -#: builtin/checkout-index.c:178 +#: builtin/checkout-index.c:191 msgid "don't checkout new files" msgstr "checka inte ut nya filer" -#: builtin/checkout-index.c:180 +#: builtin/checkout-index.c:193 msgid "update stat information in the index file" msgstr "uppdatera stat-information i indexfilen" -#: builtin/checkout-index.c:184 +#: builtin/checkout-index.c:197 msgid "read list of paths from the standard input" msgstr "läs listan över sökvägar från standard in" -#: builtin/checkout-index.c:186 +#: builtin/checkout-index.c:199 msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" -#: builtin/checkout-index.c:187 builtin/column.c:31 +#: builtin/checkout-index.c:200 builtin/column.c:31 #: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827 #: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333 -#: builtin/worktree.c:757 +#: builtin/worktree.c:717 msgid "string" msgstr "sträng" -#: builtin/checkout-index.c:188 +#: builtin/checkout-index.c:201 msgid "when creating files, prepend <string>" msgstr "när filer skapas, lägg till <sträng> först" -#: builtin/checkout-index.c:190 +#: builtin/checkout-index.c:203 msgid "copy out the files from named stage" msgstr "kopiera ut filer från namngiven etapp" @@ -11679,16 +11972,16 @@ msgstr "\"%s\" måste användas när \"%s\" inte anges" msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:541 builtin/checkout.c:548 +#: builtin/checkout.c:543 builtin/checkout.c:550 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:716 +#: builtin/checkout.c:718 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:770 +#: builtin/checkout.c:772 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -11697,50 +11990,50 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:866 +#: builtin/checkout.c:865 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:908 +#: builtin/checkout.c:907 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 +#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:916 +#: builtin/checkout.c:915 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:919 +#: builtin/checkout.c:918 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:923 +#: builtin/checkout.c:922 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:925 builtin/checkout.c:1356 +#: builtin/checkout.c:924 builtin/checkout.c:1355 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:927 +#: builtin/checkout.c:926 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:978 +#: builtin/checkout.c:977 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:984 +#: builtin/checkout.c:983 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -11763,7 +12056,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:1003 +#: builtin/checkout.c:1002 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -11790,19 +12083,19 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:1038 +#: builtin/checkout.c:1037 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:1042 +#: builtin/checkout.c:1041 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:1082 builtin/checkout.c:1351 +#: builtin/checkout.c:1081 builtin/checkout.c:1350 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:1164 +#: builtin/checkout.c:1163 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -11811,7 +12104,7 @@ msgstr "" "\"%s\" kan vara både en lokal fil och en spårande gren.\n" "Använd -- (och möjligen --no-guess) för att göra otvetydig" -#: builtin/checkout.c:1171 +#: builtin/checkout.c:1170 msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" @@ -11831,51 +12124,51 @@ msgstr "" "föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n" "checkout.defaultRemote=origin i din konfiguration." -#: builtin/checkout.c:1181 +#: builtin/checkout.c:1180 #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar" -#: builtin/checkout.c:1247 +#: builtin/checkout.c:1246 msgid "only one reference expected" msgstr "endast en referens förväntades" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1263 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510 +#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1323 builtin/checkout.c:1689 +#: builtin/checkout.c:1322 builtin/checkout.c:1688 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1370 +#: builtin/checkout.c:1369 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "förväntade gren, fick taggen \"%s\"" -#: builtin/checkout.c:1372 +#: builtin/checkout.c:1371 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "förväntade gren, fick fjärrgrenen \"%s\"" -#: builtin/checkout.c:1373 builtin/checkout.c:1381 +#: builtin/checkout.c:1372 builtin/checkout.c:1380 #, c-format msgid "a branch is expected, got '%s'" msgstr "förväntade gren, fick \"%s\"" -#: builtin/checkout.c:1376 +#: builtin/checkout.c:1375 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "förväntade gren, fick incheckningen \"%s\"" -#: builtin/checkout.c:1392 +#: builtin/checkout.c:1391 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -11883,7 +12176,7 @@ msgstr "" "kan inte växla gren vid sammanslagning\n" "Överväg \"git merge --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1396 +#: builtin/checkout.c:1395 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -11891,7 +12184,7 @@ msgstr "" "kan inte växla gren mitt i en \"am\"-körning\n" "Överväg \"git am --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1400 +#: builtin/checkout.c:1399 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -11899,7 +12192,7 @@ msgstr "" "kan inte växla gren vid ombasering\n" "Överväg \"git rebase --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1404 +#: builtin/checkout.c:1403 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -11907,7 +12200,7 @@ msgstr "" "kan inte växla gren i en \"cherry-pick\"\n" "Överväg \"git cherry-pick --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1408 +#: builtin/checkout.c:1407 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -11915,146 +12208,139 @@ msgstr "" "kan inte växla gren i en \"revert\"\n" "Överväg \"git revert --quit\" eller \"git worktree add\"." -#: builtin/checkout.c:1412 +#: builtin/checkout.c:1411 msgid "you are switching branch while bisecting" msgstr "då växlar grenar medan du gör en \"bisect\"" -#: builtin/checkout.c:1419 +#: builtin/checkout.c:1418 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430 +#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440 -#: builtin/checkout.c:1445 builtin/checkout.c:1450 +#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439 +#: builtin/checkout.c:1444 builtin/checkout.c:1449 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1447 +#: builtin/checkout.c:1446 #, c-format msgid "'%s' cannot take <start-point>" msgstr "\"%s\" kan inte ta <startpunkt>" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1454 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1461 msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84 -#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296 -#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575 -#: builtin/send-pack.c:198 -msgid "force progress reporting" -msgstr "tvinga förloppsrapportering" - -#: builtin/checkout.c:1505 +#: builtin/checkout.c:1504 msgid "perform a 3-way merge with the new branch" msgstr "utför en 3-vägssammanslagning för den nya grenen" -#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322 +#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322 msgid "style" msgstr "stil" -#: builtin/checkout.c:1507 +#: builtin/checkout.c:1506 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1519 builtin/worktree.c:558 +#: builtin/checkout.c:1518 builtin/worktree.c:486 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1520 +#: builtin/checkout.c:1519 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1522 +#: builtin/checkout.c:1521 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1524 +#: builtin/checkout.c:1523 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1526 builtin/merge.c:300 +#: builtin/checkout.c:1525 builtin/merge.c:301 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1529 +#: builtin/checkout.c:1528 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1542 +#: builtin/checkout.c:1541 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1545 +#: builtin/checkout.c:1544 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1549 +#: builtin/checkout.c:1548 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1604 +#: builtin/checkout.c:1603 #, c-format msgid "-%c, -%c and --orphan are mutually exclusive" msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1608 +#: builtin/checkout.c:1607 msgid "-p and --overlay are mutually exclusive" msgstr "-p och --overlay är ömsesidigt uteslutande" -#: builtin/checkout.c:1645 +#: builtin/checkout.c:1644 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1650 +#: builtin/checkout.c:1649 #, c-format msgid "missing branch name; try -%c" msgstr "grennamn saknas; försök med -%c" -#: builtin/checkout.c:1682 +#: builtin/checkout.c:1681 #, c-format msgid "could not resolve %s" msgstr "kunde inte upplösa %s" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1697 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1705 +#: builtin/checkout.c:1704 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" -#: builtin/checkout.c:1709 +#: builtin/checkout.c:1708 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1718 +#: builtin/checkout.c:1717 msgid "--pathspec-from-file is incompatible with --detach" msgstr "--pathspec-from-file är inkompatibelt med --detach" -#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499 +#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566 msgid "--pathspec-from-file is incompatible with --patch" msgstr "--pathspec-from-file är inkompatibelt med --patch" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1733 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -12062,70 +12348,70 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1739 +#: builtin/checkout.c:1738 msgid "you must specify path(s) to restore" msgstr "du måste ange katalog(er) att återställa" -#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816 -#: builtin/checkout.c:1818 builtin/clone.c:122 builtin/remote.c:170 -#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554 -#: builtin/worktree.c:556 +#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815 +#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482 +#: builtin/worktree.c:484 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1766 +#: builtin/checkout.c:1765 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1768 +#: builtin/checkout.c:1767 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1769 +#: builtin/checkout.c:1768 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1771 +#: builtin/checkout.c:1770 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1771 msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1817 +#: builtin/checkout.c:1816 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1819 +#: builtin/checkout.c:1818 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1821 +#: builtin/checkout.c:1820 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1823 +#: builtin/checkout.c:1822 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1857 +#: builtin/checkout.c:1856 msgid "which tree-ish to checkout from" msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1859 +#: builtin/checkout.c:1858 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1861 +#: builtin/checkout.c:1860 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1863 +#: builtin/checkout.c:1862 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1864 +#: builtin/checkout.c:1863 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -12271,8 +12557,8 @@ msgid "remove whole directories" msgstr "ta bort hela kataloger" #: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 -#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185 -#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 +#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186 +#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" @@ -12368,7 +12654,7 @@ msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" #: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563 -#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358 +#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357 msgid "name" msgstr "namn" @@ -12384,7 +12670,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860 +#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861 #: builtin/pull.c:208 msgid "depth" msgstr "djup" @@ -12393,7 +12679,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535 +#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550 #: builtin/pull.c:211 msgid "time" msgstr "tid" @@ -12402,12 +12688,12 @@ msgstr "tid" msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200 -#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317 +#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323 msgid "revision" msgstr "revision" -#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215 +#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" @@ -12440,24 +12726,24 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76 +#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77 #: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234 +#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234 #: builtin/push.c:585 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237 +#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237 #: builtin/push.c:587 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -12558,112 +12844,112 @@ msgstr "kan inte packa om för att städa upp" msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:992 builtin/receive-pack.c:2493 +#: builtin/clone.c:993 builtin/receive-pack.c:2493 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:996 +#: builtin/clone.c:997 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:1009 +#: builtin/clone.c:1010 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:1012 +#: builtin/clone.c:1013 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:1025 +#: builtin/clone.c:1026 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:1029 builtin/fetch.c:1841 +#: builtin/clone.c:1030 builtin/fetch.c:1951 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:1039 +#: builtin/clone.c:1040 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1045 +#: builtin/clone.c:1046 #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "arkivsökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:1059 +#: builtin/clone.c:1060 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271 -#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386 +#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271 +#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1079 +#: builtin/clone.c:1080 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1099 +#: builtin/clone.c:1100 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1101 +#: builtin/clone.c:1102 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1125 +#: builtin/clone.c:1126 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "" "clone --recursive är inte kompatibel med --reference och --reference-if-able" -#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705 +#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705 #, c-format msgid "'%s' is not a valid remote name" msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv" -#: builtin/clone.c:1210 +#: builtin/clone.c:1211 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1212 +#: builtin/clone.c:1213 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1214 +#: builtin/clone.c:1215 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1216 +#: builtin/clone.c:1217 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1219 +#: builtin/clone.c:1220 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1224 +#: builtin/clone.c:1225 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1311 builtin/clone.c:1319 +#: builtin/clone.c:1315 builtin/clone.c:1323 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1322 +#: builtin/clone.c:1326 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -12721,14 +13007,14 @@ msgid "could not find object directory matching %s" msgstr "kunde inte hitta objektkatalog för %s" #: builtin/commit-graph.c:80 builtin/commit-graph.c:210 -#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769 +#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768 msgid "dir" msgstr "kat" #: builtin/commit-graph.c:81 builtin/commit-graph.c:211 #: builtin/commit-graph.c:317 -msgid "The object directory to store the graph" -msgstr "Objektkatalogen där grafen ska lagras" +msgid "the object directory to store the graph" +msgstr "objektkatalogen där grafen ska lagras" #: builtin/commit-graph.c:83 msgid "if the commit-graph is split, only verify the tip file" @@ -12816,7 +13102,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "duplicerad förälder %s ignorerades" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -12844,9 +13130,9 @@ msgstr "förälder" msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" -#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470 -#: builtin/tag.c:413 +#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537 +#: builtin/tag.c:445 msgid "message" msgstr "meddelande" @@ -12858,7 +13144,7 @@ msgstr "incheckningsmeddelande" msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" -#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298 +#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299 #: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -13012,7 +13298,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:729 builtin/shortlog.c:425 +#: builtin/commit.c:729 builtin/shortlog.c:413 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -13110,7 +13396,7 @@ msgstr "Kan inte läsa indexet" msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:1011 builtin/tag.c:276 +#: builtin/commit.c:1011 builtin/tag.c:308 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" @@ -13202,7 +13488,7 @@ msgid "version" msgstr "version" #: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560 -#: builtin/worktree.c:725 +#: builtin/worktree.c:679 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -13216,7 +13502,7 @@ msgstr "terminera poster med NUL" #: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541 #: builtin/fast-export.c:1198 builtin/fast-export.c:1201 -#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336 +#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336 msgid "mode" msgstr "läge" @@ -13272,7 +13558,7 @@ msgstr "visa diff i mallen för incheckningsmeddelandet" msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415 +#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447 msgid "read message from file" msgstr "läs meddelande från fil" @@ -13284,7 +13570,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1503 builtin/gc.c:542 +#: builtin/commit.c:1503 builtin/gc.c:550 msgid "date" msgstr "datum" @@ -13293,7 +13579,7 @@ msgid "override date for commit" msgstr "överstyr datum för incheckningen" #: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507 -#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87 +#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90 msgid "commit" msgstr "incheckning" @@ -13320,7 +13606,7 @@ msgstr "" msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301 +#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302 #: builtin/pull.c:145 builtin/revert.c:110 msgid "add a Signed-off-by trailer" msgstr "lägg till Signed-off-by-släprad" @@ -13956,41 +14242,41 @@ msgstr "--stdin och --merge-base är ömsesidigt uteslutande" msgid "--merge-base only works with two commits" msgstr "--merge-base fungerar endast med två incheckningar" -#: builtin/diff.c:91 +#: builtin/diff.c:92 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:258 +#: builtin/diff.c:259 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:375 +#: builtin/diff.c:376 #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s: ingen sammanslagningsbas" -#: builtin/diff.c:485 +#: builtin/diff.c:486 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:530 builtin/grep.c:681 +#: builtin/diff.c:532 builtin/grep.c:682 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:541 +#: builtin/diff.c:543 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:546 +#: builtin/diff.c:548 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/diff.c:580 +#: builtin/diff.c:582 #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s: flera sammanslagningsbaser, använder %s" @@ -14171,40 +14457,40 @@ msgid "select handling of commit messages in an alternate encoding" msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" #: builtin/fast-export.c:1208 -msgid "Dump marks to this file" -msgstr "Dumpa märken till filen" +msgid "dump marks to this file" +msgstr "dumpa märken till filen" #: builtin/fast-export.c:1210 -msgid "Import marks from this file" -msgstr "Importera märken från filen" +msgid "import marks from this file" +msgstr "importera märken från filen" #: builtin/fast-export.c:1214 -msgid "Import marks from this file if it exists" -msgstr "Importera märken från filen, om den finns" +msgid "import marks from this file if it exists" +msgstr "importera märken från filen, om den finns" #: builtin/fast-export.c:1216 -msgid "Fake a tagger when tags lack one" -msgstr "Fejka taggare när taggen saknar en" +msgid "fake a tagger when tags lack one" +msgstr "fejka taggare när taggen saknar en" #: builtin/fast-export.c:1218 -msgid "Output full tree for each commit" -msgstr "Skriv ut hela trädet för varje incheckning" +msgid "output full tree for each commit" +msgstr "skriv ut hela trädet för varje incheckning" #: builtin/fast-export.c:1220 -msgid "Use the done feature to terminate the stream" -msgstr "Använd done-funktionen för att avsluta strömmen" +msgid "use the done feature to terminate the stream" +msgstr "använd done-funktionen för att avsluta strömmen" #: builtin/fast-export.c:1221 -msgid "Skip output of blob data" -msgstr "Hoppa över skrivning av blob-data" +msgid "skip output of blob data" +msgstr "hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1222 builtin/log.c:1816 +#: builtin/fast-export.c:1222 builtin/log.c:1815 msgid "refspec" msgstr "referensspecifikation" #: builtin/fast-export.c:1223 -msgid "Apply refspec to exported refs" -msgstr "Applicera referensspecifikation på exporterade referenser" +msgid "apply refspec to exported refs" +msgstr "applicera referensspecifikation på exporterade referenser" #: builtin/fast-export.c:1224 msgid "anonymize output" @@ -14219,16 +14505,16 @@ msgid "convert <from> to <to> in anonymized output" msgstr "konvertera <från> till <till> i anonymiserad utdata" #: builtin/fast-export.c:1229 -msgid "Reference parents which are not in fast-export stream by object id" -msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id" +msgid "reference parents which are not in fast-export stream by object id" +msgstr "referera föräldrar som inte finns i fast-export-ström med objekt-id" #: builtin/fast-export.c:1231 -msgid "Show original object ids of blobs/commits" -msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar" +msgid "show original object ids of blobs/commits" +msgstr "visa ursprungliga objekt-id för blobbar/incheckningar" #: builtin/fast-export.c:1233 -msgid "Label tags with mark ids" -msgstr "Märk taggar med märke-id" +msgid "label tags with mark ids" +msgstr "märk taggar med märke-id" #: builtin/fast-export.c:1256 msgid "--anonymize-map without --anonymize does not make sense" @@ -14267,7 +14553,7 @@ msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan" msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features" -#: builtin/fetch-pack.c:241 +#: builtin/fetch-pack.c:242 #, c-format msgid "Lockfile created but not reported: %s" msgstr "Låsfil skapad men inte rapporterad: %s" @@ -14288,93 +14574,97 @@ msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:119 +#: builtin/fetch.c:120 msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel kan inte vara negativt" -#: builtin/fetch.c:142 builtin/pull.c:185 +#: builtin/fetch.c:143 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:144 builtin/pull.c:245 +#: builtin/fetch.c:145 builtin/pull.c:245 msgid "set upstream for git pull/fetch" msgstr "ställ in uppström för git pull/fetch" -#: builtin/fetch.c:146 builtin/pull.c:188 +#: builtin/fetch.c:147 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över" -#: builtin/fetch.c:148 builtin/pull.c:191 +#: builtin/fetch.c:149 +msgid "use atomic transaction to update references" +msgstr "använd atomiska transaktioner för att uppdatera referenser" + +#: builtin/fetch.c:151 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:149 +#: builtin/fetch.c:152 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:151 +#: builtin/fetch.c:154 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:153 builtin/pull.c:195 +#: builtin/fetch.c:156 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:155 +#: builtin/fetch.c:158 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:157 +#: builtin/fetch.c:160 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:159 builtin/pull.c:198 +#: builtin/fetch.c:162 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:161 +#: builtin/fetch.c:164 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar" -#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122 +#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:163 +#: builtin/fetch.c:166 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:168 +#: builtin/fetch.c:171 msgid "write fetched references to the FETCH_HEAD file" msgstr "skriv hämtade referenser till FETCH_HEAD-filen" -#: builtin/fetch.c:169 builtin/pull.c:206 +#: builtin/fetch.c:172 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:171 +#: builtin/fetch.c:174 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209 +#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209 #: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:176 builtin/pull.c:212 +#: builtin/fetch.c:179 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:182 builtin/pull.c:221 +#: builtin/fetch.c:185 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:185 +#: builtin/fetch.c:188 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:188 +#: builtin/fetch.c:191 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -14382,98 +14672,98 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:192 builtin/pull.c:224 +#: builtin/fetch.c:195 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:193 builtin/pull.c:226 +#: builtin/fetch.c:196 builtin/pull.c:226 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:194 builtin/pull.c:227 +#: builtin/fetch.c:197 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:201 builtin/pull.c:240 +#: builtin/fetch.c:204 builtin/pull.c:240 msgid "report that we have only objects reachable from this object" msgstr "rapportera att vi bara har objekt nåbara från detta objektet" -#: builtin/fetch.c:204 builtin/fetch.c:206 +#: builtin/fetch.c:207 builtin/fetch.c:209 msgid "run 'maintenance --auto' after fetching" msgstr "kör \"maintenance --auto\" efter hämtning" -#: builtin/fetch.c:208 builtin/pull.c:243 +#: builtin/fetch.c:211 builtin/pull.c:243 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:210 +#: builtin/fetch.c:213 msgid "write the commit-graph after fetching" msgstr "skriv incheckingsgrafen efter hämtning" -#: builtin/fetch.c:212 +#: builtin/fetch.c:215 msgid "accept refspecs from stdin" msgstr "ta emot referenser från standard in" -#: builtin/fetch.c:523 +#: builtin/fetch.c:526 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:677 +#: builtin/fetch.c:697 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s" -#: builtin/fetch.c:775 +#: builtin/fetch.c:796 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:779 +#: builtin/fetch.c:800 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880 +#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:793 +#: builtin/fetch.c:814 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:803 +#: builtin/fetch.c:824 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863 -#: builtin/fetch.c:875 +#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884 +#: builtin/fetch.c:896 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:808 +#: builtin/fetch.c:829 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:830 +#: builtin/fetch.c:851 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:833 +#: builtin/fetch.c:854 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:836 +#: builtin/fetch.c:857 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:875 +#: builtin/fetch.c:896 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:880 +#: builtin/fetch.c:901 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:901 +#: builtin/fetch.c:1005 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -14484,7 +14774,7 @@ msgstr "" "av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n" "\"git config fetch.showForcedUpdates true\"." -#: builtin/fetch.c:905 +#: builtin/fetch.c:1009 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -14497,22 +14787,22 @@ msgstr "" "showForcedUpdates\n" "false\" för att undvika testet.\n" -#: builtin/fetch.c:939 +#: builtin/fetch.c:1041 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s sände inte alla nödvändiga objekt\n" -#: builtin/fetch.c:960 +#: builtin/fetch.c:1069 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "avvisa %s då grunda rötter inte kan uppdateras" -#: builtin/fetch.c:1053 builtin/fetch.c:1191 +#: builtin/fetch.c:1146 builtin/fetch.c:1297 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1064 +#: builtin/fetch.c:1168 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -14521,56 +14811,56 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:1161 +#: builtin/fetch.c:1267 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1162 +#: builtin/fetch.c:1268 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1194 +#: builtin/fetch.c:1300 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1195 builtin/remote.c:1118 +#: builtin/fetch.c:1301 builtin/remote.c:1118 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1218 +#: builtin/fetch.c:1324 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1343 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s" -#: builtin/fetch.c:1240 +#: builtin/fetch.c:1346 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1448 +#: builtin/fetch.c:1558 msgid "multiple branches detected, incompatible with --set-upstream" msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" -#: builtin/fetch.c:1463 +#: builtin/fetch.c:1573 msgid "not setting upstream for a remote remote-tracking branch" msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren" -#: builtin/fetch.c:1465 +#: builtin/fetch.c:1575 msgid "not setting upstream for a remote tag" msgstr "ställer inte in uppström för en fjärrtag" -#: builtin/fetch.c:1467 +#: builtin/fetch.c:1577 msgid "unknown branch type" msgstr "okänd grentyp" -#: builtin/fetch.c:1469 +#: builtin/fetch.c:1579 msgid "" "no source branch found.\n" "you need to specify exactly one branch with the --set-upstream option." @@ -14578,22 +14868,22 @@ msgstr "" "hittade ingen källgren.\n" "du måste ange exakt en gren med flaggan --set-upstream." -#: builtin/fetch.c:1598 builtin/fetch.c:1661 +#: builtin/fetch.c:1708 builtin/fetch.c:1771 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101 +#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1620 +#: builtin/fetch.c:1730 #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1724 +#: builtin/fetch.c:1834 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -14601,44 +14891,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar ska hämtas från." -#: builtin/fetch.c:1760 +#: builtin/fetch.c:1870 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1825 +#: builtin/fetch.c:1935 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1827 +#: builtin/fetch.c:1937 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1832 +#: builtin/fetch.c:1942 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1834 +#: builtin/fetch.c:1944 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1851 +#: builtin/fetch.c:1961 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1853 +#: builtin/fetch.c:1963 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1862 +#: builtin/fetch.c:1972 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1869 +#: builtin/fetch.c:1979 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" -#: builtin/fetch.c:1887 +#: builtin/fetch.c:1997 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -14646,9 +14936,13 @@ msgstr "" "--filter kan endast användas med fjärren konfigurerad i extensions." "partialclone" -#: builtin/fetch.c:1891 +#: builtin/fetch.c:2001 +msgid "--atomic can only be used when fetching from one remote" +msgstr "--atomic kan bara användas vid hämtning från en fjärr" + +#: builtin/fetch.c:2005 msgid "--stdin can only be used when fetching from one remote" -msgstr "--stdin kan bara användas för att hämta från en fjärr" +msgstr "--stdin kan bara användas vid hämtning fårn en fjärr" #: builtin/fmt-merge-msg.c:7 msgid "" @@ -14714,7 +15008,7 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:39 builtin/tag.c:440 +#: builtin/for-each-ref.c:39 builtin/tag.c:472 msgid "respect format colors" msgstr "använd formatfärger" @@ -14754,32 +15048,32 @@ msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar" msgid "missing --config=<config>" msgstr "saknar --config=<konfig>" -#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149 +#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131 msgid "unknown" msgstr "okänd" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:101 builtin/fsck.c:121 +#: builtin/fsck.c:83 builtin/fsck.c:103 #, c-format msgid "error in %s %s: %s" msgstr "fel i %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:115 +#: builtin/fsck.c:97 #, c-format msgid "warning in %s %s: %s" msgstr "varning i %s %s: %s" -#: builtin/fsck.c:144 builtin/fsck.c:147 +#: builtin/fsck.c:126 builtin/fsck.c:129 #, c-format msgid "broken link from %7s %s" msgstr "trasig länk från %7s %s" -#: builtin/fsck.c:156 +#: builtin/fsck.c:138 msgid "wrong object type in link" msgstr "fel objekttyp i länk" -#: builtin/fsck.c:172 +#: builtin/fsck.c:154 #, c-format msgid "" "broken link from %7s %s\n" @@ -14788,215 +15082,215 @@ msgstr "" "trasig länk från %7s %s\n" " till %7s %s" -#: builtin/fsck.c:283 +#: builtin/fsck.c:265 #, c-format msgid "missing %s %s" msgstr "saknat %s %s" -#: builtin/fsck.c:310 +#: builtin/fsck.c:292 #, c-format msgid "unreachable %s %s" msgstr "onåbart %s %s" -#: builtin/fsck.c:330 +#: builtin/fsck.c:312 #, c-format msgid "dangling %s %s" msgstr "hängande %s %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:322 msgid "could not create lost-found" msgstr "kunde inte skapa lost-found" -#: builtin/fsck.c:351 +#: builtin/fsck.c:333 #, c-format msgid "could not finish '%s'" msgstr "kunde inte avsluta \"%s\"" -#: builtin/fsck.c:368 +#: builtin/fsck.c:350 #, c-format msgid "Checking %s" msgstr "Kontrollerar %s" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:406 +#: builtin/fsck.c:388 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Kontrollerar konnektivitet (%d objekt)" -#: builtin/fsck.c:425 +#: builtin/fsck.c:407 #, c-format msgid "Checking %s %s" msgstr "Kontrollerar %s %s" -#: builtin/fsck.c:430 +#: builtin/fsck.c:412 msgid "broken links" msgstr "trasiga länkar" -#: builtin/fsck.c:439 +#: builtin/fsck.c:421 #, c-format msgid "root %s" msgstr "roten %s" -#: builtin/fsck.c:447 +#: builtin/fsck.c:429 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "taggad %s %s (%s) i %s" -#: builtin/fsck.c:476 +#: builtin/fsck.c:458 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: objekt trasigt eller saknas" -#: builtin/fsck.c:501 +#: builtin/fsck.c:483 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: ogiltig reflog-post %s" -#: builtin/fsck.c:515 +#: builtin/fsck.c:497 #, c-format msgid "Checking reflog %s->%s" msgstr "Kontrollerar reflog %s->%s" -#: builtin/fsck.c:549 +#: builtin/fsck.c:531 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: ogiltig sha1-pekare %s" -#: builtin/fsck.c:556 +#: builtin/fsck.c:538 #, c-format msgid "%s: not a commit" msgstr "%s: inte en incheckning!" -#: builtin/fsck.c:610 +#: builtin/fsck.c:592 msgid "notice: No default references" msgstr "obs: Inga förvalda referenser" -#: builtin/fsck.c:625 +#: builtin/fsck.c:607 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: objektet trasigt eller saknas: %s" -#: builtin/fsck.c:638 +#: builtin/fsck.c:620 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: objektet kunde inte tolkas: %s" -#: builtin/fsck.c:658 +#: builtin/fsck.c:640 #, c-format msgid "bad sha1 file: %s" msgstr "ogiltig sha1-fil: %s" -#: builtin/fsck.c:673 +#: builtin/fsck.c:655 msgid "Checking object directory" msgstr "Kontrollerar objektkatalog" -#: builtin/fsck.c:676 +#: builtin/fsck.c:658 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:691 +#: builtin/fsck.c:673 #, c-format msgid "Checking %s link" msgstr "Kontrollerar %s-länk" -#: builtin/fsck.c:696 builtin/index-pack.c:865 +#: builtin/fsck.c:678 builtin/index-pack.c:865 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/fsck.c:703 +#: builtin/fsck.c:685 #, c-format msgid "%s points to something strange (%s)" msgstr "%s pekar på något konstigt (%s)" -#: builtin/fsck.c:709 +#: builtin/fsck.c:691 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: frånkopplat HEAD pekar på ingenting" -#: builtin/fsck.c:713 +#: builtin/fsck.c:695 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "obs: %s pekar på en ofödd gren (%s)" -#: builtin/fsck.c:725 +#: builtin/fsck.c:707 msgid "Checking cache tree" msgstr "Kontrollerar cacheträd" -#: builtin/fsck.c:730 +#: builtin/fsck.c:712 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: ogiltig sha1-pekare i cacheträd" -#: builtin/fsck.c:739 +#: builtin/fsck.c:721 msgid "non-tree in cache-tree" msgstr "icke-träd i cacheträd" -#: builtin/fsck.c:770 +#: builtin/fsck.c:752 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:776 +#: builtin/fsck.c:758 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:777 +#: builtin/fsck.c:759 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:778 +#: builtin/fsck.c:760 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:779 +#: builtin/fsck.c:761 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:780 +#: builtin/fsck.c:762 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:781 +#: builtin/fsck.c:763 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:782 +#: builtin/fsck.c:764 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och supplerande objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:783 +#: builtin/fsck.c:765 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:784 +#: builtin/fsck.c:766 builtin/mktag.c:78 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:786 +#: builtin/fsck.c:768 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:787 builtin/prune.c:134 +#: builtin/fsck.c:769 builtin/prune.c:134 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:788 +#: builtin/fsck.c:770 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:847 builtin/index-pack.c:261 +#: builtin/fsck.c:829 builtin/index-pack.c:261 msgid "Checking objects" msgstr "Kontrollerar objekt" -#: builtin/fsck.c:875 +#: builtin/fsck.c:857 #, c-format msgid "%s: object missing" msgstr "%s: objekt saknas" -#: builtin/fsck.c:886 +#: builtin/fsck.c:868 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" @@ -15005,27 +15299,27 @@ msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" -#: builtin/gc.c:94 +#: builtin/gc.c:93 #, c-format msgid "Failed to fstat %s: %s" msgstr "Misslyckades ta status (fstat) på %s: %s" -#: builtin/gc.c:130 +#: builtin/gc.c:129 #, c-format msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:479 builtin/init-db.c:58 +#: builtin/gc.c:487 builtin/init-db.c:58 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530 +#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:495 +#: builtin/gc.c:503 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -15040,52 +15334,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:543 +#: builtin/gc.c:551 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:545 +#: builtin/gc.c:553 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:546 +#: builtin/gc.c:554 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:549 +#: builtin/gc.c:557 msgid "force running gc even if there may be another gc running" msgstr "tvinga gc-körning även om en annan gc kanske körs" -#: builtin/gc.c:552 +#: builtin/gc.c:560 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:569 +#: builtin/gc.c:576 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:580 +#: builtin/gc.c:587 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:600 +#: builtin/gc.c:607 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n" -#: builtin/gc.c:602 +#: builtin/gc.c:609 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:603 +#: builtin/gc.c:610 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Se \"git help gc\" för manuell hushållning.\n" -#: builtin/gc.c:643 +#: builtin/gc.c:650 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -15093,145 +15387,172 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:698 +#: builtin/gc.c:705 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/gc.c:708 +#: builtin/gc.c:715 msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]" -#: builtin/gc.c:738 +#: builtin/gc.c:745 msgid "--no-schedule is not allowed" msgstr "--no-schedule tillåts inte" -#: builtin/gc.c:743 +#: builtin/gc.c:750 #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "okänt argument för --schedule, %s" -#: builtin/gc.c:862 +#: builtin/gc.c:869 msgid "failed to write commit-graph" msgstr "kunde inte skriva incheckningsgraf" -#: builtin/gc.c:901 +#: builtin/gc.c:914 msgid "failed to fill remotes" msgstr "kunde inte fylla fjärrar" -#: builtin/gc.c:1024 +#: builtin/gc.c:1037 msgid "failed to start 'git pack-objects' process" msgstr "kunde inte starta \"git pack-objects\"-process" -#: builtin/gc.c:1041 +#: builtin/gc.c:1054 msgid "failed to finish 'git pack-objects' process" msgstr "kunde inte avsluta \"git pack-objects\"-process" -#: builtin/gc.c:1093 +#: builtin/gc.c:1106 msgid "failed to write multi-pack-index" msgstr "kunde inte skriva multi-pack-index" -#: builtin/gc.c:1111 +#: builtin/gc.c:1124 msgid "'git multi-pack-index expire' failed" msgstr "\"git multi-pack-index expire\" misslyckades" -#: builtin/gc.c:1172 +#: builtin/gc.c:1185 msgid "'git multi-pack-index repack' failed" msgstr "\"git multi-pack-index repack\" misslyckades" -#: builtin/gc.c:1181 +#: builtin/gc.c:1194 msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "" "hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är " "inaktiverat" -#: builtin/gc.c:1279 +#: builtin/gc.c:1298 #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "låsfilen \"%s\" finns, hoppar över underhåll" -#: builtin/gc.c:1309 +#: builtin/gc.c:1328 #, c-format msgid "task '%s' failed" msgstr "uppgiften \"%s\" misslyckades" -#: builtin/gc.c:1389 +#: builtin/gc.c:1410 #, c-format msgid "'%s' is not a valid task" msgstr "\"%s\" är inte en giltig uppgift" -#: builtin/gc.c:1394 +#: builtin/gc.c:1415 #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "uppgiften \"%s\" kan inte väljas flera gånger" -#: builtin/gc.c:1409 +#: builtin/gc.c:1430 msgid "run tasks based on the state of the repository" msgstr "kör uppgifter baserad på arkivets tillstånd" -#: builtin/gc.c:1410 +#: builtin/gc.c:1431 msgid "frequency" msgstr "frekvens" -#: builtin/gc.c:1411 +#: builtin/gc.c:1432 msgid "run tasks based on frequency" msgstr "kör uppgifter baserat på frekvens" -#: builtin/gc.c:1414 +#: builtin/gc.c:1435 msgid "do not report progress or other information over stderr" msgstr "rapportera inte framgång eller annan information över standard fel" -#: builtin/gc.c:1415 +#: builtin/gc.c:1436 msgid "task" msgstr "uppgift" -#: builtin/gc.c:1416 +#: builtin/gc.c:1437 msgid "run a specific task" msgstr "utför en specifik uppgift" -#: builtin/gc.c:1433 +#: builtin/gc.c:1454 msgid "use at most one of --auto and --schedule=<frequency>" msgstr "använd som mest en av --auto och --schedule=<frekvens>" -#: builtin/gc.c:1467 +#: builtin/gc.c:1497 msgid "failed to run 'git config'" msgstr "misslyckades köra \"git config\"" -#: builtin/gc.c:1512 -msgid "another process is scheduling background maintenance" -msgstr "en annan process schemalägger bakgrundsunderhåll" +#: builtin/gc.c:1562 +#, c-format +msgid "failed to expand path '%s'" +msgstr "misslyckades expandera sökvägen \"%s\"" + +#: builtin/gc.c:1591 +msgid "failed to start launchctl" +msgstr "misslyckades starta launchctl" + +#: builtin/gc.c:1628 +#, c-format +msgid "failed to create directories for '%s'" +msgstr "misslyckades skapa kataloger för \"%s\"" + +#: builtin/gc.c:1689 +#, c-format +msgid "failed to bootstrap service %s" +msgstr "misslyckades starta tjänsten %s" + +#: builtin/gc.c:1760 +msgid "failed to create temp xml file" +msgstr "misslyckades skapa temporär xml-fil" -#: builtin/gc.c:1525 +#: builtin/gc.c:1850 +msgid "failed to start schtasks" +msgstr "misslyckades starta schtasks" + +#: builtin/gc.c:1894 msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "" "kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1544 +#: builtin/gc.c:1911 msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\"" -#: builtin/gc.c:1550 +#: builtin/gc.c:1915 msgid "failed to open stdin of 'crontab'" msgstr "misslyckades öppna standard in för \"crontab\"" -#: builtin/gc.c:1592 +#: builtin/gc.c:1956 msgid "'crontab' died" msgstr "\"crontab\" dog" -#: builtin/gc.c:1605 +#: builtin/gc.c:1990 +msgid "another process is scheduling background maintenance" +msgstr "en annan process schemalägger bakgrundsunderhåll" + +#: builtin/gc.c:2009 msgid "failed to add repo to global config" msgstr "misslyckades lägga till arkiv till global konfiguration" -#: builtin/gc.c:1615 +#: builtin/gc.c:2019 msgid "git maintenance <subcommand> [<options>]" msgstr "git maintenance <underkommando> [<flaggor>]" -#: builtin/gc.c:1634 +#: builtin/gc.c:2038 #, c-format msgid "invalid subcommand: %s" msgstr "felaktigt underkommando: %s" @@ -15240,12 +15561,12 @@ msgstr "felaktigt underkommando: %s" msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:225 +#: builtin/grep.c:223 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:279 +#: builtin/grep.c:277 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" @@ -15254,258 +15575,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766 -#: builtin/pack-objects.c:2936 +#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792 +#: builtin/pack-objects.c:2944 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 +#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:655 +#: builtin/grep.c:656 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:736 +#: builtin/grep.c:737 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:835 +#: builtin/grep.c:836 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:837 +#: builtin/grep.c:838 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:839 +#: builtin/grep.c:840 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:841 +#: builtin/grep.c:842 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:843 +#: builtin/grep.c:844 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:846 +#: builtin/grep.c:847 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:848 +#: builtin/grep.c:849 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:850 +#: builtin/grep.c:851 msgid "match patterns only at word boundaries" msgstr "träffa endast mönster vid ordgränser" -#: builtin/grep.c:852 +#: builtin/grep.c:853 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:854 +#: builtin/grep.c:855 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:857 +#: builtin/grep.c:858 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:859 +#: builtin/grep.c:860 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:861 +#: builtin/grep.c:862 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:865 +#: builtin/grep.c:866 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:868 +#: builtin/grep.c:869 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:871 +#: builtin/grep.c:872 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:874 +#: builtin/grep.c:875 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:877 +#: builtin/grep.c:878 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:878 +#: builtin/grep.c:879 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:879 +#: builtin/grep.c:880 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:880 +#: builtin/grep.c:881 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:882 +#: builtin/grep.c:883 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:884 +#: builtin/grep.c:885 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:886 +#: builtin/grep.c:887 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:889 +#: builtin/grep.c:890 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:891 +#: builtin/grep.c:892 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:894 +#: builtin/grep.c:895 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:896 +#: builtin/grep.c:897 msgid "show the number of matches instead of matching lines" msgstr "visa antal träffar istället för träffade rader" -#: builtin/grep.c:897 +#: builtin/grep.c:898 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:899 +#: builtin/grep.c:900 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:901 +#: builtin/grep.c:902 msgid "show filename only once above matches from same file" msgstr "visa filnamn endast en gång ovanför träffar från samma fil" -#: builtin/grep.c:904 +#: builtin/grep.c:905 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:907 +#: builtin/grep.c:908 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:909 +#: builtin/grep.c:910 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:911 +#: builtin/grep.c:912 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:912 +#: builtin/grep.c:913 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:915 +#: builtin/grep.c:916 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:917 +#: builtin/grep.c:918 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:920 +#: builtin/grep.c:921 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:922 +#: builtin/grep.c:923 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:924 +#: builtin/grep.c:925 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:936 +#: builtin/grep.c:937 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:938 +#: builtin/grep.c:939 msgid "show only matches from files that match all patterns" msgstr "visa endast träffar från filer som träffar alla mönster" -#: builtin/grep.c:940 -msgid "show parse tree for grep expression" -msgstr "visa analysträd för grep-uttryck" - -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:944 +#: builtin/grep.c:942 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:948 +#: builtin/grep.c:946 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:1014 +#: builtin/grep.c:1012 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1050 +#: builtin/grep.c:1048 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1058 +#: builtin/grep.c:1056 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1088 +#: builtin/grep.c:1086 msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked stöds inte med --recurse-submodules" -#: builtin/grep.c:1092 +#: builtin/grep.c:1090 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1095 builtin/pack-objects.c:3655 +#: builtin/grep.c:1093 builtin/pack-objects.c:3672 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933 +#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1132 +#: builtin/grep.c:1130 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1158 +#: builtin/grep.c:1156 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1164 +#: builtin/grep.c:1159 +msgid "--untracked cannot be used with --cached" +msgstr "--untracked kan inte användas med --cached" + +#: builtin/grep.c:1165 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll" -#: builtin/grep.c:1172 +#: builtin/grep.c:1173 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -15637,12 +15958,12 @@ msgstr "ingen man-visare hanterade förfrågan" msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:520 builtin/help.c:531 git.c:337 +#: builtin/help.c:520 builtin/help.c:531 git.c:340 #, c-format msgid "'%s' is aliased to '%s'" msgstr "\"%s\" är ett alias för \"%s\"" -#: builtin/help.c:534 git.c:369 +#: builtin/help.c:534 git.c:372 #, c-format msgid "bad alias.%s string: %s" msgstr "felaktig alias.%s-sträng: %s" @@ -15690,7 +16011,7 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:324 builtin/pack-objects.c:619 +#: builtin/index-pack.c:324 builtin/pack-objects.c:624 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" @@ -15698,7 +16019,7 @@ msgstr "paket för stort för nuvarande definition av off_t" msgid "pack exceeds maximum allowed size" msgstr "paket är större än tillåten maximal storlek" -#: builtin/index-pack.c:342 builtin/repack.c:286 +#: builtin/index-pack.c:342 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" @@ -15823,7 +16144,7 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()" msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697 +#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" @@ -15861,10 +16182,10 @@ msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1444 +#: builtin/index-pack.c:1445 #, c-format -msgid "packfile name '%s' does not end with '.pack'" -msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" +msgid "packfile name '%s' does not end with '.%s'" +msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\"" #: builtin/index-pack.c:1469 #, c-format @@ -15876,79 +16197,83 @@ msgstr "kan inte ta skriva %s-fil \"%s\"" msgid "cannot close written %s file '%s'" msgstr "kan inte stänga skriven %s-fil \"%s\"" -#: builtin/index-pack.c:1501 +#: builtin/index-pack.c:1503 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1515 +#: builtin/index-pack.c:1517 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1523 +#: builtin/index-pack.c:1525 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944 +#: builtin/index-pack.c:1534 +msgid "cannot store reverse index file" +msgstr "kan inte spara reverse-index-fil" + +#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1631 +#: builtin/index-pack.c:1650 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1633 +#: builtin/index-pack.c:1652 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1681 +#: builtin/index-pack.c:1700 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1688 +#: builtin/index-pack.c:1707 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1728 +#: builtin/index-pack.c:1749 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: builtin/index-pack.c:1777 builtin/index-pack.c:1780 -#: builtin/index-pack.c:1796 builtin/index-pack.c:1800 +#: builtin/index-pack.c:1803 builtin/index-pack.c:1806 +#: builtin/index-pack.c:1822 builtin/index-pack.c:1826 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625 +#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625 #, c-format msgid "unknown hash algorithm '%s'" msgstr "okänd hashningsalgoritm \"%s\"" -#: builtin/index-pack.c:1821 +#: builtin/index-pack.c:1851 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1823 +#: builtin/index-pack.c:1853 msgid "--stdin requires a git repository" msgstr "--stdin kräver ett git-arkiv" -#: builtin/index-pack.c:1825 +#: builtin/index-pack.c:1855 msgid "--object-format cannot be used with --stdin" msgstr "--object-format kan inte användas med --stdin" -#: builtin/index-pack.c:1831 +#: builtin/index-pack.c:1870 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" -#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582 +#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "fsck-fel i packat objekt" @@ -16165,130 +16490,130 @@ msgstr "--trailer med --only-input ger ingen mening" msgid "no input file given for in-place editing" msgstr "ingen indatafil angiven för redigering på plats" -#: builtin/log.c:58 +#: builtin/log.c:59 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/log.c:59 +#: builtin/log.c:60 msgid "git show [<options>] <object>..." msgstr "git show [<flaggor>] <objekt>..." -#: builtin/log.c:112 +#: builtin/log.c:113 #, c-format msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:180 -msgid "Use mail map file" -msgstr "Använd e-postmappningsfil" +#: builtin/log.c:181 +msgid "use mail map file" +msgstr "använd e-postmappningsfil" -#: builtin/log.c:183 +#: builtin/log.c:184 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:185 +#: builtin/log.c:186 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:186 +#: builtin/log.c:187 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:189 +#: builtin/log.c:190 msgid "" -"Trace the evolution of line range <start>,<end> or function :<funcname> in " +"trace the evolution of line range <start>,<end> or function :<funcname> in " "<file>" msgstr "" -"Spåra utvecklingen av intervallet <start>,<slut> eller funktionen :" +"spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :" "<funknamn> i <fil>" -#: builtin/log.c:212 +#: builtin/log.c:213 msgid "-L<range>:<file> cannot be used with pathspec" msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation" -#: builtin/log.c:302 +#: builtin/log.c:303 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:564 +#: builtin/log.c:566 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:579 builtin/log.c:674 +#: builtin/log.c:581 builtin/log.c:671 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:699 +#: builtin/log.c:696 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:848 +#: builtin/log.c:841 #, c-format msgid "%s: invalid cover from description mode" msgstr "%s: ogiltigt omslag från beskrivningsläge" -#: builtin/log.c:855 +#: builtin/log.c:848 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:984 +#: builtin/log.c:977 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:1001 +#: builtin/log.c:994 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:1011 +#: builtin/log.c:1004 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1175 +#: builtin/log.c:1168 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1181 +#: builtin/log.c:1174 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1262 +#: builtin/log.c:1261 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1289 +#: builtin/log.c:1288 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1347 +#: builtin/log.c:1346 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332 +#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "misslyckades slå upp \"%s\" som en giltig referens" -#: builtin/log.c:1518 +#: builtin/log.c:1517 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1528 +#: builtin/log.c:1527 msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -16298,393 +16623,397 @@ msgstr "" "använd git branch --set-upstream-to för att spåra en fjärrgren.\n" "Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt" -#: builtin/log.c:1551 +#: builtin/log.c:1550 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1568 +#: builtin/log.c:1567 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1578 +#: builtin/log.c:1577 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1636 +#: builtin/log.c:1635 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1693 +#: builtin/log.c:1692 msgid "failed to infer range-diff origin of current series" msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1695 +#: builtin/log.c:1694 #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie" -#: builtin/log.c:1739 +#: builtin/log.c:1738 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1742 +#: builtin/log.c:1741 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1746 +#: builtin/log.c:1745 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1748 +#: builtin/log.c:1747 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1750 +#: builtin/log.c:1749 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1751 +#: builtin/log.c:1750 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1752 +#: builtin/log.c:1751 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1754 +#: builtin/log.c:1753 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1756 +#: builtin/log.c:1755 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1758 +#: builtin/log.c:1757 msgid "max length of output filename" msgstr "maximal längd för utdatafilnamn" -#: builtin/log.c:1760 -msgid "Use [RFC PATCH] instead of [PATCH]" -msgstr "Använd [RFC PATCH] istället för [PATCH]" +#: builtin/log.c:1759 +msgid "use [RFC PATCH] instead of [PATCH]" +msgstr "använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1763 +#: builtin/log.c:1762 msgid "cover-from-description-mode" msgstr "cover-from-description-läge" -#: builtin/log.c:1764 +#: builtin/log.c:1763 msgid "generate parts of a cover letter based on a branch's description" msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen" -#: builtin/log.c:1766 -msgid "Use [<prefix>] instead of [PATCH]" -msgstr "Använd [<prefix>] istället för [PATCH]" +#: builtin/log.c:1765 +msgid "use [<prefix>] instead of [PATCH]" +msgstr "använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1769 +#: builtin/log.c:1768 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1772 +#: builtin/log.c:1771 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1775 +#: builtin/log.c:1774 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1777 +#: builtin/log.c:1776 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1779 +#: builtin/log.c:1778 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1781 +#: builtin/log.c:1780 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1783 +#: builtin/log.c:1782 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1784 +#: builtin/log.c:1783 msgid "header" msgstr "huvud" -#: builtin/log.c:1785 +#: builtin/log.c:1784 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1786 builtin/log.c:1787 +#: builtin/log.c:1785 builtin/log.c:1786 msgid "email" msgstr "epost" -#: builtin/log.c:1786 +#: builtin/log.c:1785 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1787 +#: builtin/log.c:1786 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1788 +#: builtin/log.c:1787 msgid "ident" msgstr "ident" -#: builtin/log.c:1789 +#: builtin/log.c:1788 msgid "set From address to <ident> (or committer ident if absent)" msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)" -#: builtin/log.c:1791 +#: builtin/log.c:1790 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1792 +#: builtin/log.c:1791 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1793 builtin/log.c:1796 +#: builtin/log.c:1792 builtin/log.c:1795 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1794 +#: builtin/log.c:1793 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1797 +#: builtin/log.c:1796 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1801 +#: builtin/log.c:1800 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1803 +#: builtin/log.c:1802 msgid "signature" msgstr "signatur" -#: builtin/log.c:1804 +#: builtin/log.c:1803 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1805 +#: builtin/log.c:1804 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1806 +#: builtin/log.c:1805 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1809 +#: builtin/log.c:1808 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1810 +#: builtin/log.c:1809 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1812 +#: builtin/log.c:1811 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1814 +#: builtin/log.c:1813 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1817 +#: builtin/log.c:1816 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1819 +#: builtin/log.c:1818 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1905 +#: builtin/log.c:1904 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1920 +#: builtin/log.c:1919 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1922 +#: builtin/log.c:1921 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1930 +#: builtin/log.c:1929 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1932 +#: builtin/log.c:1931 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1934 +#: builtin/log.c:1933 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1956 +#: builtin/log.c:1955 msgid "--stdout, --output, and --output-directory are mutually exclusive" msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande" -#: builtin/log.c:2079 +#: builtin/log.c:2078 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2083 +#: builtin/log.c:2082 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:2084 +#: builtin/log.c:2083 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff mot v%d:" -#: builtin/log.c:2090 +#: builtin/log.c:2089 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor kräver --range-diff" -#: builtin/log.c:2094 +#: builtin/log.c:2093 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff kräver --cover-letter eller ensam patch" -#: builtin/log.c:2102 +#: builtin/log.c:2101 msgid "Range-diff:" msgstr "Intervall-diff:" -#: builtin/log.c:2103 +#: builtin/log.c:2102 #, c-format msgid "Range-diff against v%d:" msgstr "Intervall-diff mot v%d:" -#: builtin/log.c:2114 +#: builtin/log.c:2113 #, c-format msgid "unable to read signature file '%s'" msgstr "kunde inte läsa signaturfil \"%s\"" -#: builtin/log.c:2150 +#: builtin/log.c:2149 msgid "Generating patches" msgstr "Skapar patchar" -#: builtin/log.c:2194 +#: builtin/log.c:2193 msgid "failed to create output files" msgstr "misslyckades skapa utdatafiler" -#: builtin/log.c:2253 +#: builtin/log.c:2252 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:2307 +#: builtin/log.c:2306 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:486 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:527 +#: builtin/ls-files.c:542 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:529 +#: builtin/ls-files.c:544 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:531 +#: builtin/ls-files.c:546 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "använd små bokstäver för \"fsmonitor clean\"-filer" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:548 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:550 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:552 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:539 +#: builtin/ls-files.c:554 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:541 +#: builtin/ls-files.c:556 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:544 +#: builtin/ls-files.c:559 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:546 +#: builtin/ls-files.c:561 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:563 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:550 +#: builtin/ls-files.c:565 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:552 +#: builtin/ls-files.c:567 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:570 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:572 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:559 +#: builtin/ls-files.c:574 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:562 +#: builtin/ls-files.c:577 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:565 +#: builtin/ls-files.c:580 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:567 +#: builtin/ls-files.c:582 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:571 +#: builtin/ls-files.c:586 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:574 +#: builtin/ls-files.c:589 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:591 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:592 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:578 +#: builtin/ls-files.c:593 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:580 +#: builtin/ls-files.c:595 msgid "show debugging data" msgstr "visa felsökningsutdata" +#: builtin/ls-files.c:597 +msgid "suppress duplicate entries" +msgstr "undertyck dublettposter" + #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" @@ -16695,39 +17024,39 @@ msgstr "" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<arkiv> [<referenser>...]]" -#: builtin/ls-remote.c:59 +#: builtin/ls-remote.c:60 msgid "do not print remote URL" msgstr "visa inte fjärr-URL" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398 +#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404 msgid "exec" msgstr "exec" -#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 +#: builtin/ls-remote.c:62 builtin/ls-remote.c:64 msgid "path of git-upload-pack on the remote host" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/ls-remote.c:65 +#: builtin/ls-remote.c:66 msgid "limit to tags" msgstr "begränsa till taggar" -#: builtin/ls-remote.c:66 +#: builtin/ls-remote.c:67 msgid "limit to heads" msgstr "begränsa till huvuden" -#: builtin/ls-remote.c:67 +#: builtin/ls-remote.c:68 msgid "do not show peeled tags" msgstr "visa inte avskalade taggar" -#: builtin/ls-remote.c:69 +#: builtin/ls-remote.c:70 msgid "take url.<base>.insteadOf into account" msgstr "ta hänsyn till url.<bas>.insteadOf" -#: builtin/ls-remote.c:72 +#: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas" -#: builtin/ls-remote.c:75 +#: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "visa underliggande referens och objektet det pekar på" @@ -16883,192 +17212,192 @@ msgstr "kunde inte bestämma referensen \"%s\"" msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<flaggor>] [<incheckning>...]" -#: builtin/merge.c:58 +#: builtin/merge.c:59 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:59 +#: builtin/merge.c:60 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:122 +#: builtin/merge.c:123 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:145 +#: builtin/merge.c:146 #, c-format msgid "option `%s' requires a value" msgstr "flaggan \"%s\" behöver ett värde" -#: builtin/merge.c:198 +#: builtin/merge.c:199 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:199 +#: builtin/merge.c:200 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:204 +#: builtin/merge.c:205 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:255 builtin/pull.c:133 +#: builtin/merge.c:256 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "visa inte en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:258 builtin/pull.c:136 +#: builtin/merge.c:259 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:259 builtin/pull.c:139 +#: builtin/merge.c:260 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:261 builtin/pull.c:142 +#: builtin/merge.c:262 builtin/pull.c:142 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet" -#: builtin/merge.c:264 builtin/pull.c:148 +#: builtin/merge.c:265 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:266 builtin/pull.c:151 +#: builtin/merge.c:267 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:268 builtin/pull.c:154 +#: builtin/merge.c:269 builtin/pull.c:154 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:270 +#: builtin/merge.c:271 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:272 builtin/pull.c:161 +#: builtin/merge.c:273 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:276 builtin/pull.c:164 +#: builtin/merge.c:277 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur" -#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168 -#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114 +#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:278 builtin/pull.c:169 +#: builtin/merge.c:279 builtin/pull.c:169 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:279 builtin/pull.c:172 +#: builtin/merge.c:280 builtin/pull.c:172 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:280 builtin/pull.c:173 +#: builtin/merge.c:281 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:289 +#: builtin/merge.c:290 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:291 +#: builtin/merge.c:292 msgid "--abort but leave index and working tree alone" msgstr "--abort men lämna index och arbetskatalog ensamma" -#: builtin/merge.c:293 +#: builtin/merge.c:294 msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:295 builtin/pull.c:180 +#: builtin/merge.c:296 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:302 +#: builtin/merge.c:303 msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "förbigå pre-merge-commit- och commit-msg-krokar" -#: builtin/merge.c:319 +#: builtin/merge.c:320 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:324 +#: builtin/merge.c:325 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:329 +#: builtin/merge.c:330 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:351 builtin/merge.c:368 +#: builtin/merge.c:352 builtin/merge.c:369 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:398 +#: builtin/merge.c:399 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:409 +#: builtin/merge.c:410 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:459 +#: builtin/merge.c:460 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:510 +#: builtin/merge.c:511 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:597 +#: builtin/merge.c:598 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:723 +#: builtin/merge.c:724 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:736 +#: builtin/merge.c:737 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209 +#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:807 +#: builtin/merge.c:808 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:816 +#: builtin/merge.c:817 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:822 +#: builtin/merge.c:823 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -17079,11 +17408,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:827 +#: builtin/merge.c:828 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:830 +#: builtin/merge.c:831 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -17092,73 +17421,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:883 +#: builtin/merge.c:884 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:898 +#: builtin/merge.c:899 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:959 +#: builtin/merge.c:960 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:998 +#: builtin/merge.c:999 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1000 +#: builtin/merge.c:1001 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1002 +#: builtin/merge.c:1003 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1007 +#: builtin/merge.c:1008 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Ingen fjärrspårande gren för %s från %s" -#: builtin/merge.c:1064 +#: builtin/merge.c:1065 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1167 +#: builtin/merge.c:1168 #, c-format msgid "not something we can merge in %s: %s" msgstr "inte något vi kan slå ihop med %s: %s" -#: builtin/merge.c:1201 +#: builtin/merge.c:1202 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1311 +#: builtin/merge.c:1312 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1315 +#: builtin/merge.c:1316 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1333 +#: builtin/merge.c:1334 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1346 +#: builtin/merge.c:1347 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1350 +#: builtin/merge.c:1351 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1366 +#: builtin/merge.c:1367 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17166,7 +17495,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1373 +#: builtin/merge.c:1374 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -17174,101 +17503,142 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1376 +#: builtin/merge.c:1377 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1390 +#: builtin/merge.c:1391 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1392 +#: builtin/merge.c:1393 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1408 +#: builtin/merge.c:1409 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1425 +#: builtin/merge.c:1426 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1427 +#: builtin/merge.c:1428 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud" -#: builtin/merge.c:1432 +#: builtin/merge.c:1433 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1434 +#: builtin/merge.c:1435 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud" -#: builtin/merge.c:1515 +#: builtin/merge.c:1516 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1524 +#: builtin/merge.c:1525 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1534 +#: builtin/merge.c:1535 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1580 +#: builtin/merge.c:1581 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1587 +#: builtin/merge.c:1588 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1612 +#: builtin/merge.c:1613 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1618 +#: builtin/merge.c:1619 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1646 builtin/merge.c:1711 +#: builtin/merge.c:1647 builtin/merge.c:1712 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1650 +#: builtin/merge.c:1651 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1702 +#: builtin/merge.c:1703 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1704 +#: builtin/merge.c:1705 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1713 +#: builtin/merge.c:1714 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Använder %s för att förbereda lösning för hand.\n" -#: builtin/merge.c:1727 +#: builtin/merge.c:1728 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n" +#: builtin/mktag.c:10 +msgid "git mktag" +msgstr "git mktag" + +#: builtin/mktag.c:30 +#, c-format +msgid "warning: tag input does not pass fsck: %s" +msgstr "varning: taggindata godkänns inte av fsck: %s" + +#: builtin/mktag.c:41 +#, c-format +msgid "error: tag input does not pass fsck: %s" +msgstr "fel: taggindata godkänns inte av fsck: %s" + +#: builtin/mktag.c:44 +#, c-format +msgid "%d (FSCK_IGNORE?) should never trigger this callback" +msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop" + +#: builtin/mktag.c:59 +#, c-format +msgid "could not read tagged object '%s'" +msgstr "kunde inte läsa det taggade objektet \"%s\"" + +#: builtin/mktag.c:62 +#, c-format +msgid "object '%s' tagged as '%s', but is a '%s' type" +msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\"" + +#: builtin/mktag.c:99 +msgid "tag on stdin did not pass our strict fsck check" +msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll" + +#: builtin/mktag.c:102 +msgid "tag on stdin did not refer to a valid object" +msgstr "taggen på stdin pekar inte på ett giltigt objekt" + +#: builtin/mktag.c:105 builtin/tag.c:232 +msgid "unable to write tag file" +msgstr "kunde inte skriva tagg-filen" + #: builtin/mktree.c:66 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -17305,7 +17675,10 @@ msgstr "" "vid ompackning, samla mindre paketfiler i en bunt som är större än denna " "storlekt" -#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25 +#: builtin/multi-pack-index.c:50 builtin/notes.c:376 builtin/notes.c:431 +#: builtin/notes.c:509 builtin/notes.c:521 builtin/notes.c:598 +#: builtin/notes.c:665 builtin/notes.c:815 builtin/notes.c:963 +#: builtin/notes.c:985 builtin/prune-packed.c:25 builtin/tag.c:575 msgid "too many arguments" msgstr "för många argument" @@ -17410,7 +17783,7 @@ msgstr "%s, källa=%s, mål=%s" msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484 +#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -17602,7 +17975,7 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:242 builtin/tag.c:533 +#: builtin/notes.c:242 builtin/tag.c:565 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -17642,12 +18015,6 @@ msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\"" msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)" -#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509 -#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665 -#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985 -msgid "too many parameters" -msgstr "för många parametrar" - #: builtin/notes.c:389 builtin/notes.c:678 #, c-format msgid "no note found for object %s." @@ -17705,8 +18072,8 @@ msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" #: builtin/notes.c:517 -msgid "too few parameters" -msgstr "för få parametrar" +msgid "too few arguments" +msgstr "för få argument" #: builtin/notes.c:538 #, c-format @@ -17836,7 +18203,7 @@ msgstr "" "%s och checka in resultatet med \"git notes merge --commit\", eller avbryt " "sammanslagningen med \"git notes merge --abort\".\n" -#: builtin/notes.c:897 builtin/tag.c:546 +#: builtin/notes.c:897 builtin/tag.c:578 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -17854,7 +18221,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -17870,7 +18237,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1604 +#: builtin/notes.c:1034 builtin/stash.c:1671 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -17887,102 +18254,116 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:443 +#: builtin/pack-objects.c:440 +#, c-format +msgid "" +"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in " +"pack %s" +msgstr "" +"write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i " +"paketet %s" + +#: builtin/pack-objects.c:448 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:454 +#: builtin/pack-objects.c:459 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:585 +#: builtin/pack-objects.c:590 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:796 +#: builtin/pack-objects.c:801 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:1004 +#: builtin/pack-objects.c:896 +#, c-format +msgid "expected object at offset %<PRIuMAX> in pack %s" +msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s" + +#: builtin/pack-objects.c:1015 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit" -#: builtin/pack-objects.c:1017 +#: builtin/pack-objects.c:1028 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1078 builtin/update-index.c:90 +#: builtin/pack-objects.c:1089 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:1131 +#: builtin/pack-objects.c:1141 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1348 +#: builtin/pack-objects.c:1358 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas" -#: builtin/pack-objects.c:1796 +#: builtin/pack-objects.c:1806 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "deltabasoffset utanför gränsen i pack för %s" -#: builtin/pack-objects.c:1805 +#: builtin/pack-objects.c:1815 #, c-format msgid "delta base offset out of bound for %s" msgstr "deltabasoffset utanför gränsvärden för %s" -#: builtin/pack-objects.c:2086 +#: builtin/pack-objects.c:2096 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:2231 +#: builtin/pack-objects.c:2241 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317 -#: builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327 +#: builtin/pack-objects.c:2337 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331 +#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)" -#: builtin/pack-objects.c:2341 +#: builtin/pack-objects.c:2351 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2656 +#: builtin/pack-objects.c:2666 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2805 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "kan inte packa objekt nåbara från taggen %s" -#: builtin/pack-objects.c:2883 +#: builtin/pack-objects.c:2891 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2889 +#: builtin/pack-objects.c:2897 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2961 +#: builtin/pack-objects.c:2976 #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-" @@ -17991,14 +18372,14 @@ msgstr "" "värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> " "<paket-hash> <uri>' (fick '%s')" -#: builtin/pack-objects.c:2964 +#: builtin/pack-objects.c:2979 #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "" "objektet redan konfigurerat i et annat uploadpack.blobpackfileuri (fick '%s)" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:3008 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -18007,7 +18388,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2999 +#: builtin/pack-objects.c:3014 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -18016,236 +18397,236 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:3097 +#: builtin/pack-objects.c:3112 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:3187 +#: builtin/pack-objects.c:3202 #, c-format msgid "loose object at %s could not be examined" msgstr "lösa objekt på %s kunde inte underökas" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3287 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3365 +#: builtin/pack-objects.c:3380 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3368 +#: builtin/pack-objects.c:3383 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3393 +#: builtin/pack-objects.c:3408 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3446 +#: builtin/pack-objects.c:3461 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3450 +#: builtin/pack-objects.c:3465 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3488 +#: builtin/pack-objects.c:3503 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3489 +#: builtin/pack-objects.c:3504 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3492 +#: builtin/pack-objects.c:3507 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3494 +#: builtin/pack-objects.c:3509 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från supplerande objektlager" -#: builtin/pack-objects.c:3496 +#: builtin/pack-objects.c:3511 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3498 +#: builtin/pack-objects.c:3513 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3500 +#: builtin/pack-objects.c:3515 msgid "limit pack window by memory in addition to object limit" msgstr "begränsa paketfönster efter minne förutom objektgräns" -#: builtin/pack-objects.c:3502 +#: builtin/pack-objects.c:3517 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "maximal längd på deltakedja tillåten i slutligt paket" -#: builtin/pack-objects.c:3504 +#: builtin/pack-objects.c:3519 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3506 +#: builtin/pack-objects.c:3521 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3508 +#: builtin/pack-objects.c:3523 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3510 +#: builtin/pack-objects.c:3525 msgid "use threads when searching for best delta matches" msgstr "använd trådar vid sökning efter bästa deltaträffar" -#: builtin/pack-objects.c:3512 +#: builtin/pack-objects.c:3527 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3514 +#: builtin/pack-objects.c:3529 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3531 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till dem som ännu inte packats" -#: builtin/pack-objects.c:3519 +#: builtin/pack-objects.c:3534 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3522 +#: builtin/pack-objects.c:3537 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3525 +#: builtin/pack-objects.c:3540 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3528 +#: builtin/pack-objects.c:3543 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3530 +#: builtin/pack-objects.c:3545 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som ska packas" -#: builtin/pack-objects.c:3532 +#: builtin/pack-objects.c:3547 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3534 +#: builtin/pack-objects.c:3549 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3536 +#: builtin/pack-objects.c:3551 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3539 +#: builtin/pack-objects.c:3554 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3541 +#: builtin/pack-objects.c:3556 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3543 +#: builtin/pack-objects.c:3558 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3545 +#: builtin/pack-objects.c:3560 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3547 +#: builtin/pack-objects.c:3562 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3549 +#: builtin/pack-objects.c:3564 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3551 +#: builtin/pack-objects.c:3566 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3553 +#: builtin/pack-objects.c:3568 msgid "use a bitmap index if available to speed up counting objects" msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare" -#: builtin/pack-objects.c:3555 +#: builtin/pack-objects.c:3570 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3559 +#: builtin/pack-objects.c:3574 msgid "write a bitmap index if possible" msgstr "skriv bitkartindex om möjligt" -#: builtin/pack-objects.c:3563 +#: builtin/pack-objects.c:3578 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3566 +#: builtin/pack-objects.c:3581 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3568 +#: builtin/pack-objects.c:3583 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3570 +#: builtin/pack-objects.c:3585 msgid "protocol" msgstr "protokoll" -#: builtin/pack-objects.c:3571 +#: builtin/pack-objects.c:3586 msgid "exclude any configured uploadpack.blobpackfileuri with this protocol" msgstr "" "uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll" -#: builtin/pack-objects.c:3600 +#: builtin/pack-objects.c:3617 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "deltakedjedjupet %d är för djupt, påtvingar %d" -#: builtin/pack-objects.c:3605 +#: builtin/pack-objects.c:3622 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "pack.deltaCacheLimit är för högt, påtvingar %d" -#: builtin/pack-objects.c:3659 +#: builtin/pack-objects.c:3676 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size kan inte användas för att bygga ett paket som ska överföras" -#: builtin/pack-objects.c:3661 +#: builtin/pack-objects.c:3678 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3666 +#: builtin/pack-objects.c:3683 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin kan inte användas för att bygga ett indexerbart paket" -#: builtin/pack-objects.c:3669 +#: builtin/pack-objects.c:3686 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3675 +#: builtin/pack-objects.c:3692 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3735 +#: builtin/pack-objects.c:3752 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3766 +#: builtin/pack-objects.c:3783 #, c-format msgid "" "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" @@ -18254,6 +18635,20 @@ msgstr "" "Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), " "paket-återanvända %<PRIu32>" +#: builtin/pack-redundant.c:601 +msgid "" +"'git pack-redundant' is nominated for removal.\n" +"If you still use this command, please add an extra\n" +"option, '--i-still-use-this', on the command line\n" +"and let us know you still use it by sending an e-mail\n" +"to <git@vger.kernel.org>. Thanks.\n" +msgstr "" +"\"git pack-redundant\" har nominerats för borttagning.\n" +"Om du fortfarande använder kommandot, lägg till flaggan\n" +"\"--i-still-use-this\" på kommandoraden och berätta för\n" +"oss att du fortfarande använder det på e-post till\n" +"<git@vger.kernel.org>. Tack.\n" + #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<flaggor>]" @@ -18311,7 +18706,7 @@ msgstr "Alternativ gällande sammanslagning" msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126 +#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" @@ -18336,36 +18731,7 @@ msgstr "antal undermoduler som hämtas parallellt" msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:348 -msgid "" -"Pulling without specifying how to reconcile divergent branches is\n" -"discouraged. You can squelch this message by running one of the following\n" -"commands sometime before your next pull:\n" -"\n" -" git config pull.rebase false # merge (the default strategy)\n" -" git config pull.rebase true # rebase\n" -" git config pull.ff only # fast-forward only\n" -"\n" -"You can replace \"git config\" with \"git config --global\" to set a " -"default\n" -"preference for all repositories. You can also pass --rebase, --no-rebase,\n" -"or --ff-only on the command line to override the configured default per\n" -"invocation.\n" -msgstr "" -"Det avråds från att göra \"pull\" utan att ange hur avvikande grenar\n" -"ska förlikas. Du kan ta bort det här meddelandet genom att köra ett av\n" -"följande kommandon innan du gör \"pull\" nästa gång: \n" -"\n" -" git config pull.rebase false # sammanslagning (förvald strategi)\n" -" git config pull.rebase true # ombasering\n" -" git config pull.ff only # endast snabbspolning\n" -"\n" -"Du kan ersätta \"git config\" med \"git config --global\" för att välja en\n" -"förvald inställning för alla arkiv. Du kan också ange --rebase, --no-rebase\n" -"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" -"förvalet vid körning.\n" - -#: builtin/pull.c:458 +#: builtin/pull.c:445 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -18373,14 +18739,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:460 +#: builtin/pull.c:447 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Det finns ingen kandidat för sammanslagning bland referenserna du precis har " "hämtat." -#: builtin/pull.c:461 +#: builtin/pull.c:448 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -18388,7 +18754,7 @@ msgstr "" "Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n" "motsvarade något i fjärränden." -#: builtin/pull.c:464 +#: builtin/pull.c:451 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -18399,41 +18765,41 @@ msgstr "" "gren. Eftersom det inte är den fjärr som är konfigurerad som\n" "standard för aktuell gren måste du ange en gren på kommandoraden." -#: builtin/pull.c:469 builtin/rebase.c:1246 +#: builtin/pull.c:456 builtin/rebase.c:1253 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:471 builtin/pull.c:486 +#: builtin/pull.c:458 builtin/pull.c:473 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:473 builtin/pull.c:488 +#: builtin/pull.c:460 builtin/pull.c:475 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:474 builtin/pull.c:489 +#: builtin/pull.c:461 builtin/pull.c:476 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491 -#: builtin/rebase.c:1252 +#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478 +#: builtin/rebase.c:1259 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496 +#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:484 builtin/rebase.c:1244 +#: builtin/pull.c:471 builtin/rebase.c:1251 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:493 +#: builtin/pull.c:480 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:" -#: builtin/pull.c:498 +#: builtin/pull.c:485 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -18442,28 +18808,57 @@ msgstr "" "Dina inställningar anger sammanslagning med referensen \"%s\"\n" "från fjärren, men någon sådan referens togs inte emot." -#: builtin/pull.c:609 +#: builtin/pull.c:596 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:915 +#: builtin/pull.c:902 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:972 +#: builtin/pull.c:930 +msgid "" +"Pulling without specifying how to reconcile divergent branches is\n" +"discouraged. You can squelch this message by running one of the following\n" +"commands sometime before your next pull:\n" +"\n" +" git config pull.rebase false # merge (the default strategy)\n" +" git config pull.rebase true # rebase\n" +" git config pull.ff only # fast-forward only\n" +"\n" +"You can replace \"git config\" with \"git config --global\" to set a " +"default\n" +"preference for all repositories. You can also pass --rebase, --no-rebase,\n" +"or --ff-only on the command line to override the configured default per\n" +"invocation.\n" +msgstr "" +"Det avråds från att göra \"pull\" utan att ange hur avvikande grenar\n" +"ska förlikas. Du kan ta bort det här meddelandet genom att köra ett av\n" +"följande kommandon innan du gör \"pull\" nästa gång: \n" +"\n" +" git config pull.rebase false # sammanslagning (förvald strategi)\n" +" git config pull.rebase true # ombasering\n" +" git config pull.ff only # endast snabbspolning\n" +"\n" +"Du kan ersätta \"git config\" med \"git config --global\" för att välja en\n" +"förvald inställning för alla arkiv. Du kan också ange --rebase, --no-rebase\n" +"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n" +"förvalet vid körning.\n" + +#: builtin/pull.c:991 msgid "Updating an unborn branch with changes added to the index." msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet." -#: builtin/pull.c:976 +#: builtin/pull.c:995 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:977 +#: builtin/pull.c:996 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:1002 +#: builtin/pull.c:1021 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -18474,7 +18869,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:1008 +#: builtin/pull.c:1027 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -18491,15 +18886,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:1023 +#: builtin/pull.c:1042 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:1027 +#: builtin/pull.c:1046 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:1041 +#: builtin/pull.c:1067 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -18806,45 +19201,53 @@ msgstr "--all och --mirror är inkompatibla" msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" -#: builtin/range-diff.c:8 +#: builtin/range-diff.c:9 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>" msgstr "" "git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>" -#: builtin/range-diff.c:9 +#: builtin/range-diff.c:10 msgid "git range-diff [<options>] <old-tip>...<new-tip>" msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>" -#: builtin/range-diff.c:10 +#: builtin/range-diff.c:11 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>" msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>" -#: builtin/range-diff.c:22 +#: builtin/range-diff.c:28 msgid "Percentage by which creation is weighted" msgstr "Procent som skapelse vägs med" -#: builtin/range-diff.c:24 +#: builtin/range-diff.c:30 msgid "use simple diff colors" msgstr "använd enkla diff-färger" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "notes" msgstr "anteckningar" -#: builtin/range-diff.c:26 +#: builtin/range-diff.c:32 msgid "passed to 'git log'" msgstr "sänds till \"git log\"" -#: builtin/range-diff.c:50 builtin/range-diff.c:54 +#: builtin/range-diff.c:35 +msgid "only emit output related to the first range" +msgstr "visa endast utdata för det första intervallet" + +#: builtin/range-diff.c:37 +msgid "only emit output related to the second range" +msgstr "visa endast utdata för det andra intervallet" + +#: builtin/range-diff.c:60 builtin/range-diff.c:64 #, c-format -msgid "no .. in range: '%s'" -msgstr ".. saknas i intervall: \"%s\"" +msgid "not a commit range: '%s'" +msgstr "inte ett incheckningsintervall: \"%s\"" -#: builtin/range-diff.c:64 +#: builtin/range-diff.c:74 msgid "single arg format must be symmetric range" msgstr "ensamt argument måste vara symmetriskt intervall" -#: builtin/range-diff.c:79 +#: builtin/range-diff.c:89 msgid "need two commit ranges" msgstr "behöver två incheckningsintervall" @@ -18948,193 +19351,193 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244 +#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246 #, c-format msgid "unusable todo list: '%s'" msgstr "oanvändbar todo-lista: %s" -#: builtin/rebase.c:310 +#: builtin/rebase.c:312 #, c-format msgid "could not create temporary %s" msgstr "kunde inte skapa temporär %s" -#: builtin/rebase.c:316 +#: builtin/rebase.c:318 msgid "could not mark as interactive" msgstr "kunde inte markera som interaktiv" -#: builtin/rebase.c:369 +#: builtin/rebase.c:371 msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:411 +#: builtin/rebase.c:413 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:480 +#: builtin/rebase.c:482 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:493 builtin/rebase.c:1388 +#: builtin/rebase.c:495 builtin/rebase.c:1394 msgid "keep commits which start empty" msgstr "behåller incheckningar som är tomma från början" -#: builtin/rebase.c:497 builtin/revert.c:128 +#: builtin/rebase.c:499 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:499 +#: builtin/rebase.c:501 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:501 +#: builtin/rebase.c:503 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:503 +#: builtin/rebase.c:505 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:504 +#: builtin/rebase.c:506 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:506 builtin/rebase.c:1327 +#: builtin/rebase.c:508 builtin/rebase.c:1333 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:508 +#: builtin/rebase.c:510 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:510 +#: builtin/rebase.c:512 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:511 +#: builtin/rebase.c:513 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:513 +#: builtin/rebase.c:515 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:516 +#: builtin/rebase.c:518 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:518 +#: builtin/rebase.c:520 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:520 +#: builtin/rebase.c:522 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:522 +#: builtin/rebase.c:524 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:524 +#: builtin/rebase.c:526 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:525 +#: builtin/rebase.c:527 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:528 +#: builtin/rebase.c:530 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:530 +#: builtin/rebase.c:532 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:531 +#: builtin/rebase.c:533 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:533 +#: builtin/rebase.c:535 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:535 +#: builtin/rebase.c:537 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:540 +#: builtin/rebase.c:542 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:541 +#: builtin/rebase.c:543 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:542 +#: builtin/rebase.c:544 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:543 +#: builtin/rebase.c:545 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:544 +#: builtin/rebase.c:546 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:545 +#: builtin/rebase.c:547 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:546 +#: builtin/rebase.c:548 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:549 builtin/rebase.c:1421 +#: builtin/rebase.c:551 builtin/rebase.c:1427 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:565 +#: builtin/rebase.c:567 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:581 +#: builtin/rebase.c:583 #, c-format msgid "%s requires the merge backend" msgstr "%s kräver \"merge\"-bakändan" -#: builtin/rebase.c:624 +#: builtin/rebase.c:626 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:641 +#: builtin/rebase.c:643 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:666 +#: builtin/rebase.c:668 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:811 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -19148,7 +19551,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:894 +#: builtin/rebase.c:896 #, c-format msgid "" "\n" @@ -19167,7 +19570,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1220 +#: builtin/rebase.c:1227 #, c-format msgid "" "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" @@ -19175,7 +19578,7 @@ msgid "" msgstr "" "okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"." -#: builtin/rebase.c:1238 +#: builtin/rebase.c:1245 #, c-format msgid "" "%s\n" @@ -19192,7 +19595,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1254 +#: builtin/rebase.c:1261 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -19205,148 +19608,148 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1284 +#: builtin/rebase.c:1291 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1288 +#: builtin/rebase.c:1295 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1324 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1320 +#: builtin/rebase.c:1326 msgid "use the merge-base of upstream and branch as the current base" msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas" -#: builtin/rebase.c:1322 +#: builtin/rebase.c:1328 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1324 +#: builtin/rebase.c:1330 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1330 +#: builtin/rebase.c:1336 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1333 +#: builtin/rebase.c:1339 msgid "add a Signed-off-by trailer to each commit" msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning" -#: builtin/rebase.c:1336 +#: builtin/rebase.c:1342 msgid "make committer date match author date" msgstr "sätt incheckningsdatum till författardatum" -#: builtin/rebase.c:1338 +#: builtin/rebase.c:1344 msgid "ignore author date and use current date" msgstr "ignorera författardatum och använd nuvarande" -#: builtin/rebase.c:1340 +#: builtin/rebase.c:1346 msgid "synonym of --reset-author-date" msgstr "synonym för --reset-author-date" -#: builtin/rebase.c:1342 builtin/rebase.c:1346 +#: builtin/rebase.c:1348 builtin/rebase.c:1352 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1344 +#: builtin/rebase.c:1350 msgid "ignore changes in whitespace" msgstr "ignorera ändringar i blanksteg" -#: builtin/rebase.c:1348 builtin/rebase.c:1351 +#: builtin/rebase.c:1354 builtin/rebase.c:1357 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1353 +#: builtin/rebase.c:1359 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1356 +#: builtin/rebase.c:1362 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1358 +#: builtin/rebase.c:1364 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1361 +#: builtin/rebase.c:1367 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1362 +#: builtin/rebase.c:1368 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1365 +#: builtin/rebase.c:1371 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1374 msgid "use apply strategies to rebase" msgstr "använd appliceringstrategier för ombasering" -#: builtin/rebase.c:1372 +#: builtin/rebase.c:1378 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för ombasering" -#: builtin/rebase.c:1376 +#: builtin/rebase.c:1382 msgid "let the user edit the list of commits to rebase" msgstr "låt användaren redigera listan över incheckningar att ombasera" -#: builtin/rebase.c:1380 +#: builtin/rebase.c:1386 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "" "(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1385 +#: builtin/rebase.c:1391 msgid "how to handle commits that become empty" msgstr "hur incheckningar som blir tomma ska hanteras" -#: builtin/rebase.c:1392 +#: builtin/rebase.c:1398 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1399 +#: builtin/rebase.c:1405 msgid "add exec lines after each commit of the editable list" msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan" -#: builtin/rebase.c:1403 +#: builtin/rebase.c:1409 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1407 +#: builtin/rebase.c:1413 msgid "try to rebase merges instead of skipping them" msgstr "försök ombasera sammanslagningar istället för att ignorera dem" -#: builtin/rebase.c:1410 +#: builtin/rebase.c:1416 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "använd \"merge-base --fork-point\" för att förfina uppström" -#: builtin/rebase.c:1412 +#: builtin/rebase.c:1418 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1414 builtin/revert.c:115 +#: builtin/rebase.c:1420 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1415 +#: builtin/rebase.c:1421 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1418 +#: builtin/rebase.c:1424 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1423 +#: builtin/rebase.c:1429 msgid "apply all changes, even those already present upstream" msgstr "applicera alla ändringar, även de som redan finns uppströms" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1446 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -19354,41 +19757,41 @@ msgstr "" "stödet för rebase.useBuiltin har tagits bort!\n" "Se posten för det i \"git help config\" för detaljer." -#: builtin/rebase.c:1446 +#: builtin/rebase.c:1452 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera." -#: builtin/rebase.c:1487 +#: builtin/rebase.c:1493 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "" "git rebase --preserve-merges avråds från. Använd --rebase-merges istället." -#: builtin/rebase.c:1492 +#: builtin/rebase.c:1498 msgid "cannot combine '--keep-base' with '--onto'" msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" -#: builtin/rebase.c:1494 +#: builtin/rebase.c:1500 msgid "cannot combine '--keep-base' with '--root'" msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" -#: builtin/rebase.c:1498 +#: builtin/rebase.c:1504 msgid "cannot combine '--root' with '--fork-point'" msgstr "kan inte kombinera \"--root\" med \"--fork-point\"" -#: builtin/rebase.c:1501 +#: builtin/rebase.c:1507 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1505 +#: builtin/rebase.c:1511 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123 +#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1540 +#: builtin/rebase.c:1546 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -19396,16 +19799,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1559 +#: builtin/rebase.c:1565 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1584 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1624 +#: builtin/rebase.c:1630 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -19426,134 +19829,134 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1652 +#: builtin/rebase.c:1658 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1700 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1733 +#: builtin/rebase.c:1739 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1763 +#: builtin/rebase.c:1769 msgid "cannot combine apply options with merge options" msgstr "kan inte kombinera apply-flaggor med merge-flaggor" -#: builtin/rebase.c:1776 +#: builtin/rebase.c:1782 #, c-format msgid "Unknown rebase backend: %s" msgstr "Okänd rebase-bakända: %s" -#: builtin/rebase.c:1806 +#: builtin/rebase.c:1812 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1826 +#: builtin/rebase.c:1832 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1830 +#: builtin/rebase.c:1836 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1854 +#: builtin/rebase.c:1860 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1860 +#: builtin/rebase.c:1866 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1886 +#: builtin/rebase.c:1892 #, c-format msgid "'%s': need exactly one merge base with branch" msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1895 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1897 +#: builtin/rebase.c:1903 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1923 +#: builtin/rebase.c:1931 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1931 builtin/submodule--helper.c:40 +#: builtin/rebase.c:1939 builtin/submodule--helper.c:40 #: builtin/submodule--helper.c:2414 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1942 +#: builtin/rebase.c:1950 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1963 +#: builtin/rebase.c:1971 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:1999 +#: builtin/rebase.c:2007 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2010 +#: builtin/rebase.c:2018 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2012 +#: builtin/rebase.c:2020 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2020 +#: builtin/rebase.c:2028 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2022 +#: builtin/rebase.c:2030 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n" -#: builtin/rebase.c:2030 +#: builtin/rebase.c:2038 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2037 +#: builtin/rebase.c:2045 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2048 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2065 +#: builtin/rebase.c:2073 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2082 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2083 +#: builtin/rebase.c:2091 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -19648,36 +20051,36 @@ msgstr "git reflog exists <referens>" msgid "'%s' is not a valid timestamp" msgstr "\"%s\" är inte en giltig tidsstämpel" -#: builtin/reflog.c:606 +#: builtin/reflog.c:609 #, c-format msgid "Marking reachable objects..." msgstr "Markerar nåbara objekt..." -#: builtin/reflog.c:644 +#: builtin/reflog.c:647 #, c-format msgid "%s points nowhere!" msgstr "%s pekar ingenstans!" -#: builtin/reflog.c:696 +#: builtin/reflog.c:699 msgid "no reflog specified to delete" msgstr "ingen referenslogg att ta bort angavs" -#: builtin/reflog.c:705 +#: builtin/reflog.c:708 #, c-format msgid "not a reflog: %s" msgstr "inte en referenslogg: %s" -#: builtin/reflog.c:710 +#: builtin/reflog.c:713 #, c-format msgid "no reflog for '%s'" msgstr "ingen referenslogg för \"%s\"" -#: builtin/reflog.c:756 +#: builtin/reflog.c:759 #, c-format msgid "invalid ref format: %s" msgstr "felaktigt referensformat: %s" -#: builtin/reflog.c:765 +#: builtin/reflog.c:768 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" @@ -20189,11 +20592,11 @@ msgstr "Ingen sådan URL hittades: %s" msgid "Will not delete all non-push URLs" msgstr "Kommer inte ta bort alla icke-sänd-URL:er" -#: builtin/repack.c:25 +#: builtin/repack.c:26 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:30 +#: builtin/repack.c:31 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -20202,117 +20605,117 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:197 +#: builtin/repack.c:198 msgid "could not start pack-objects to repack promisor objects" msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:268 builtin/repack.c:447 +#: builtin/repack.c:270 builtin/repack.c:446 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." -#: builtin/repack.c:295 +#: builtin/repack.c:294 msgid "could not finish pack-objects to repack promisor objects" msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt" -#: builtin/repack.c:323 +#: builtin/repack.c:322 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:325 +#: builtin/repack.c:324 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:328 +#: builtin/repack.c:327 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:330 +#: builtin/repack.c:329 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:332 +#: builtin/repack.c:331 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:334 +#: builtin/repack.c:333 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:337 +#: builtin/repack.c:336 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:339 +#: builtin/repack.c:338 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:341 +#: builtin/repack.c:340 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:342 +#: builtin/repack.c:341 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:343 +#: builtin/repack.c:342 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:345 +#: builtin/repack.c:344 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:347 +#: builtin/repack.c:346 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:348 builtin/repack.c:354 +#: builtin/repack.c:347 builtin/repack.c:353 msgid "bytes" msgstr "byte" -#: builtin/repack.c:349 +#: builtin/repack.c:348 msgid "same as the above, but limit memory size instead of entries count" msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal" -#: builtin/repack.c:351 +#: builtin/repack.c:350 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:353 +#: builtin/repack.c:352 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:355 +#: builtin/repack.c:354 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:357 +#: builtin/repack.c:356 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:359 +#: builtin/repack.c:358 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:369 +#: builtin/repack.c:368 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:373 +#: builtin/repack.c:372 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:456 +#: builtin/repack.c:455 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:486 +#: builtin/repack.c:485 #, c-format msgid "missing required file: %s" msgstr "nödvändig fil saknas: %s" -#: builtin/repack.c:488 +#: builtin/repack.c:487 #, c-format msgid "could not unlink: %s" msgstr "kunde inte ta bort: \"%s\"" @@ -20645,8 +21048,8 @@ msgstr "HEAD är nu på %s" msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594 -#: builtin/stash.c:618 +#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661 +#: builtin/stash.c:685 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -20730,19 +21133,19 @@ msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/rev-list.c:499 +#: builtin/rev-list.c:534 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:560 +#: builtin/rev-list.c:595 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:610 +#: builtin/rev-list.c:651 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:615 +#: builtin/rev-list.c:656 msgid "marked counting is incompatible with --objects" msgstr "markerad räkning är inkompatibelt med --objects" @@ -20982,52 +21385,52 @@ msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<flaggor>]" -#: builtin/shortlog.c:135 +#: builtin/shortlog.c:123 msgid "using multiple --group options with stdin is not supported" msgstr "mer än en --group-flagga stöds inte med standard in" -#: builtin/shortlog.c:145 +#: builtin/shortlog.c:133 msgid "using --group=trailer with stdin is not supported" msgstr "att använda --group=trailer stöds inte med standard in" -#: builtin/shortlog.c:335 +#: builtin/shortlog.c:323 #, c-format msgid "unknown group type: %s" msgstr "okänd grupptyp: %s" -#: builtin/shortlog.c:363 -msgid "Group by committer rather than author" -msgstr "Gruppera efter incheckare istället för författare" +#: builtin/shortlog.c:351 +msgid "group by committer rather than author" +msgstr "gruppera efter incheckare istället för författare" -#: builtin/shortlog.c:366 +#: builtin/shortlog.c:354 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:368 -msgid "Suppress commit descriptions, only provides commit count" -msgstr "Undertryck beskrivningar, visa bara antal incheckningar" +#: builtin/shortlog.c:356 +msgid "suppress commit descriptions, only provides commit count" +msgstr "undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:370 -msgid "Show the email address of each author" -msgstr "Visa e-postadress för varje författare" +#: builtin/shortlog.c:358 +msgid "show the email address of each author" +msgstr "visa e-postadress för varje författare" -#: builtin/shortlog.c:371 +#: builtin/shortlog.c:359 msgid "<w>[,<i1>[,<i2>]]" msgstr "<w>[,<i1>[,<i2>]]" -#: builtin/shortlog.c:372 -msgid "Linewrap output" -msgstr "Radbryt utdata" +#: builtin/shortlog.c:360 +msgid "linewrap output" +msgstr "radbryt utdata" -#: builtin/shortlog.c:374 +#: builtin/shortlog.c:362 msgid "field" msgstr "föt" -#: builtin/shortlog.c:375 -msgid "Group by field" -msgstr "Gruppera efter fält" +#: builtin/shortlog.c:363 +msgid "group by field" +msgstr "gruppera efter fält" -#: builtin/shortlog.c:403 +#: builtin/shortlog.c:391 msgid "too many arguments given outside repository" msgstr "för många flaggor givna utanför arkivet" @@ -21223,71 +21626,71 @@ msgstr "visa referenser från standard in som inte finns i lokalt arkiv" msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>" msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <flaggor>" -#: builtin/sparse-checkout.c:50 +#: builtin/sparse-checkout.c:45 msgid "git sparse-checkout list" msgstr "git sparse-checkout list" -#: builtin/sparse-checkout.c:76 +#: builtin/sparse-checkout.c:71 msgid "this worktree is not sparse (sparse-checkout file may not exist)" msgstr "" "arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)" -#: builtin/sparse-checkout.c:228 +#: builtin/sparse-checkout.c:223 msgid "failed to create directory for sparse-checkout file" msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen" -#: builtin/sparse-checkout.c:269 +#: builtin/sparse-checkout.c:264 msgid "unable to upgrade repository format to enable worktreeConfig" msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig" -#: builtin/sparse-checkout.c:271 +#: builtin/sparse-checkout.c:266 msgid "failed to set extensions.worktreeConfig setting" msgstr "misslyckades ändra inställningen extensions.worktreeConfig" -#: builtin/sparse-checkout.c:288 +#: builtin/sparse-checkout.c:283 msgid "git sparse-checkout init [--cone]" msgstr "git sparse-checkout init [--cone]" -#: builtin/sparse-checkout.c:307 +#: builtin/sparse-checkout.c:302 msgid "initialize the sparse-checkout in cone mode" msgstr "initiera sparse-checkout i konläge" -#: builtin/sparse-checkout.c:344 +#: builtin/sparse-checkout.c:339 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/sparse-checkout.c:401 +#: builtin/sparse-checkout.c:396 #, c-format msgid "could not normalize path %s" msgstr "kunde inte normalisera sökvägen \"%s\"" -#: builtin/sparse-checkout.c:413 +#: builtin/sparse-checkout.c:408 msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)" -#: builtin/sparse-checkout.c:438 +#: builtin/sparse-checkout.c:433 #, c-format msgid "unable to unquote C-style string '%s'" msgstr "kan inte ta bort citering av C-sträng \"%s\"" -#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516 +#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511 msgid "unable to load existing sparse-checkout patterns" msgstr "kunde inte läsa in existerande mönster för gles utcheckning" -#: builtin/sparse-checkout.c:561 +#: builtin/sparse-checkout.c:556 msgid "read patterns from standard in" msgstr "läs mönster från standard in" -#: builtin/sparse-checkout.c:576 +#: builtin/sparse-checkout.c:571 msgid "git sparse-checkout reapply" msgstr "git sparse-checkout reapply" -#: builtin/sparse-checkout.c:595 +#: builtin/sparse-checkout.c:590 msgid "git sparse-checkout disable" msgstr "git sparse-checkout disable" -#: builtin/sparse-checkout.c:623 +#: builtin/sparse-checkout.c:618 msgid "error while refreshing working directory" msgstr "fel vid uppdatering av arbetskatalog" @@ -21377,153 +21780,164 @@ msgid "%s is not a valid reference" msgstr "%s är inte en giltigt referens" #: builtin/stash.c:225 -msgid "git stash clear with parameters is unimplemented" -msgstr "\"git stash clear\" med parametrar har inte implementerats" +msgid "git stash clear with arguments is unimplemented" +msgstr "\"git stash clear\" med argument har inte implementerats" + +#: builtin/stash.c:429 +#, c-format +msgid "" +"WARNING: Untracked file in way of tracked file! Renaming\n" +" %s -> %s\n" +" to make room.\n" +msgstr "" +"VARNING: En ospårad fil är i vägen för en spårad fil! Byter namn\n" +" %s -> %s\n" +" för att lämna plats.\n" -#: builtin/stash.c:404 +#: builtin/stash.c:490 msgid "cannot apply a stash in the middle of a merge" msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning" -#: builtin/stash.c:415 +#: builtin/stash.c:501 #, c-format msgid "could not generate diff %s^!." msgstr "kunde inte skapa diff %s^!." -#: builtin/stash.c:422 +#: builtin/stash.c:508 msgid "conflicts in index. Try without --index." msgstr "konflikter i indexet. Testa utan --index." -#: builtin/stash.c:428 +#: builtin/stash.c:514 msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:437 +#: builtin/stash.c:523 msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:451 +#: builtin/stash.c:537 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:461 +#: builtin/stash.c:547 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:522 builtin/stash.c:620 +#: builtin/stash.c:589 builtin/stash.c:687 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:566 +#: builtin/stash.c:633 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:569 +#: builtin/stash.c:636 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:582 +#: builtin/stash.c:649 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:632 +#: builtin/stash.c:699 msgid "The stash entry is kept in case you need it again." msgstr "Stash-posten behålls ifall du behöver den igen." -#: builtin/stash.c:655 +#: builtin/stash.c:722 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:799 builtin/stash.c:836 +#: builtin/stash.c:866 builtin/stash.c:903 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536 +#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:827 +#: builtin/stash.c:894 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1042 +#: builtin/stash.c:1109 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1142 +#: builtin/stash.c:1209 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1169 +#: builtin/stash.c:1236 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1178 +#: builtin/stash.c:1245 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1189 builtin/stash.c:1198 +#: builtin/stash.c:1256 builtin/stash.c:1265 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1226 +#: builtin/stash.c:1293 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1275 +#: builtin/stash.c:1342 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt" -#: builtin/stash.c:1291 +#: builtin/stash.c:1358 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1306 +#: builtin/stash.c:1373 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1313 +#: builtin/stash.c:1380 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1328 +#: builtin/stash.c:1395 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1333 +#: builtin/stash.c:1400 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1423 +#: builtin/stash.c:1490 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1462 builtin/stash.c:1527 +#: builtin/stash.c:1529 builtin/stash.c:1594 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1464 builtin/stash.c:1529 +#: builtin/stash.c:1531 builtin/stash.c:1596 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1465 builtin/stash.c:1530 +#: builtin/stash.c:1532 builtin/stash.c:1597 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1467 builtin/stash.c:1532 +#: builtin/stash.c:1534 builtin/stash.c:1599 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1469 builtin/stash.c:1534 +#: builtin/stash.c:1536 builtin/stash.c:1601 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1569 +#: builtin/stash.c:1636 msgid "" "the stash.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -21601,12 +22015,13 @@ msgstr "" "." #: builtin/submodule--helper.c:565 -msgid "Suppress output of entering each submodule command" -msgstr "Dölj utdata från för varje undermodulskommando som startas" +msgid "suppress output of entering each submodule command" +msgstr "dölj utdata från för varje undermodulskommando som startas" -#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487 -msgid "Recurse into nested submodules" -msgstr "Rekursera in i nästlade undermoduler" +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888 +#: builtin/submodule--helper.c:1487 +msgid "recurse into nested submodules" +msgstr "rekursera in i nästlade undermoduler" #: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" @@ -21642,8 +22057,8 @@ msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" #: builtin/submodule--helper.c:709 -msgid "Suppress output for initializing a submodule" -msgstr "Dölj utdata från initiering av undermodul" +msgid "suppress output for initializing a submodule" +msgstr "dölj utdata från initiering av undermodul" #: builtin/submodule--helper.c:714 msgid "git submodule--helper init [<options>] [<path>]" @@ -21665,21 +22080,17 @@ msgid "failed to recurse into submodule '%s'" msgstr "misslyckades rekursera in i undermodulen \"%s\"" #: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623 -msgid "Suppress submodule status output" -msgstr "Hindra statusutskrift för undermodul" +msgid "suppress submodule status output" +msgstr "hindra statusutskrift för undermodul" #: builtin/submodule--helper.c:887 msgid "" -"Use commit stored in the index instead of the one stored in the submodule " +"use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "" -"Visa incheckning från indexet istället för den som lagrats i undermodulens " +"visa incheckning från indexet istället för den som lagrats i undermodulens " "HEAD" -#: builtin/submodule--helper.c:888 -msgid "recurse into nested submodules" -msgstr "rekursera in i nästlade undermoduler" - #: builtin/submodule--helper.c:893 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]" @@ -21766,8 +22177,8 @@ msgid "failed to update remote for submodule '%s'" msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\"" #: builtin/submodule--helper.c:1485 -msgid "Suppress output of synchronizing submodule url" -msgstr "Dölj utdata från synkroniering av undermodul-url" +msgid "suppress output of synchronizing submodule url" +msgstr "dölj utdata från synkronisering av undermodul-url" #: builtin/submodule--helper.c:1492 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" @@ -21812,13 +22223,13 @@ msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" #: builtin/submodule--helper.c:1624 -msgid "Remove submodule working trees even if they contain local changes" +msgid "remove submodule working trees even if they contain local changes" msgstr "" -"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" +"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar" #: builtin/submodule--helper.c:1625 -msgid "Unregister all submodules" -msgstr "Avregistrera alla undermoduler" +msgid "unregister all submodules" +msgstr "avregistrera alla undermoduler" #: builtin/submodule--helper.c:1630 msgid "" @@ -21964,8 +22375,8 @@ msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" #: builtin/submodule--helper.c:2340 -msgid "Create a shallow clone truncated to the specified number of revisions" -msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" +msgid "create a shallow clone truncated to the specified number of revisions" +msgstr "skapa en grund klon trunkerad till angivet antal revisioner" #: builtin/submodule--helper.c:2343 msgid "parallel jobs" @@ -22035,8 +22446,8 @@ msgid "please make sure that the .gitmodules file is in the working tree" msgstr "se till att .gitmodules finns i arbetskatalogen" #: builtin/submodule--helper.c:2681 -msgid "Suppress output for setting url of a submodule" -msgstr "Dölj utdata från inställning av url för undermodul" +msgid "suppress output for setting url of a submodule" +msgstr "dölj utdata från inställning av url för undermodul" #: builtin/submodule--helper.c:2685 msgid "git submodule--helper set-url [--quiet] <path> <newurl>" @@ -22068,7 +22479,7 @@ msgstr "--branch eller --default krävs" msgid "--branch and --default are mutually exclusive" msgstr "--branch och --default är ömsesidigt uteslutande" -#: builtin/submodule--helper.c:2792 git.c:438 git.c:711 +#: builtin/submodule--helper.c:2792 git.c:441 git.c:714 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" @@ -22140,12 +22551,12 @@ msgstr "git tag -v [--format=<format>] <taggnamn>..." msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:105 +#: builtin/tag.c:124 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:135 +#: builtin/tag.c:159 #, c-format msgid "" "\n" @@ -22158,7 +22569,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:139 +#: builtin/tag.c:163 #, c-format msgid "" "\n" @@ -22173,15 +22584,11 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:198 +#: builtin/tag.c:230 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:200 -msgid "unable to write tag file" -msgstr "kunde inte skriva tagg-filen" - -#: builtin/tag.c:216 +#: builtin/tag.c:248 #, c-format msgid "" "You have created a nested tag. The object referred to by your new tag is\n" @@ -22194,138 +22601,134 @@ msgstr "" "\n" "\tgit tag -f %s %s^{}" -#: builtin/tag.c:232 +#: builtin/tag.c:264 msgid "bad object type." msgstr "felaktig objekttyp." -#: builtin/tag.c:285 +#: builtin/tag.c:317 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:292 +#: builtin/tag.c:324 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:403 +#: builtin/tag.c:435 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:405 +#: builtin/tag.c:437 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:407 +#: builtin/tag.c:439 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:408 +#: builtin/tag.c:440 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:410 +#: builtin/tag.c:442 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:412 +#: builtin/tag.c:444 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:414 +#: builtin/tag.c:446 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:416 +#: builtin/tag.c:448 msgid "force edit of tag message" msgstr "tvinga redigering av incheckningsmeddelande" -#: builtin/tag.c:417 +#: builtin/tag.c:449 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:420 +#: builtin/tag.c:452 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:421 +#: builtin/tag.c:453 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:422 builtin/update-ref.c:505 +#: builtin/tag.c:454 builtin/update-ref.c:505 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:424 +#: builtin/tag.c:456 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:425 +#: builtin/tag.c:457 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:426 builtin/tag.c:428 +#: builtin/tag.c:458 builtin/tag.c:460 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:427 builtin/tag.c:429 +#: builtin/tag.c:459 builtin/tag.c:461 msgid "print only tags that don't contain the commit" msgstr "visa endast taggar som inte innehåller incheckningen" -#: builtin/tag.c:430 +#: builtin/tag.c:462 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:431 +#: builtin/tag.c:463 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:435 +#: builtin/tag.c:467 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:483 +#: builtin/tag.c:515 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:505 +#: builtin/tag.c:537 msgid "-n option is only allowed in list mode" msgstr "Flaggan -n är endast tillåten i listläge" -#: builtin/tag.c:507 +#: builtin/tag.c:539 msgid "--contains option is only allowed in list mode" msgstr "Flaggan --contains är endast tillåten i listläge" -#: builtin/tag.c:509 +#: builtin/tag.c:541 msgid "--no-contains option is only allowed in list mode" msgstr "Flaggan --no-contains är endast tillåten i listläge" -#: builtin/tag.c:511 +#: builtin/tag.c:543 msgid "--points-at option is only allowed in list mode" msgstr "Flaggan --points-at är endast tillåten i listläge" -#: builtin/tag.c:513 +#: builtin/tag.c:545 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge" -#: builtin/tag.c:524 +#: builtin/tag.c:556 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:543 -msgid "too many params" -msgstr "för många parametrar" - -#: builtin/tag.c:549 +#: builtin/tag.c:581 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:554 +#: builtin/tag.c:586 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:585 +#: builtin/tag.c:617 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -22677,89 +23080,63 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:17 +#: builtin/worktree.c:18 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" -#: builtin/worktree.c:18 +#: builtin/worktree.c:19 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:20 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:20 +#: builtin/worktree.c:21 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:22 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:22 +#: builtin/worktree.c:23 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:23 +#: builtin/worktree.c:24 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:60 builtin/worktree.c:973 +#: builtin/worktree.c:61 builtin/worktree.c:933 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:85 -msgid "not a valid directory" -msgstr "inte i en giltig katalog" - -#: builtin/worktree.c:91 -msgid "gitdir file does not exist" -msgstr "gitdir-filen existerar inte" - -#: builtin/worktree.c:96 builtin/worktree.c:105 -#, c-format -msgid "unable to read gitdir file (%s)" -msgstr "kunde inte läsa gitdir-filen (%s)" - -#: builtin/worktree.c:115 -#, c-format -msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)" -msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)" - -#: builtin/worktree.c:123 -msgid "invalid gitdir file" -msgstr "ogiltig gitdir-fil" - -#: builtin/worktree.c:131 -msgid "gitdir file points to non-existent location" -msgstr "gitdir-filen pekar på en ickeexisterande plats" - -#: builtin/worktree.c:146 +#: builtin/worktree.c:74 #, c-format msgid "Removing %s/%s: %s" msgstr "Tar bort %s/%s: %s" -#: builtin/worktree.c:221 +#: builtin/worktree.c:149 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:223 +#: builtin/worktree.c:151 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:293 +#: builtin/worktree.c:221 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:302 +#: builtin/worktree.c:230 #, c-format msgid "unusable worktree destination '%s'" msgstr "oanvändbar mål för arbetskatalog \"%s\"" -#: builtin/worktree.c:307 +#: builtin/worktree.c:235 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -22769,7 +23146,7 @@ msgstr "" "använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" för att rensa" -#: builtin/worktree.c:309 +#: builtin/worktree.c:237 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -22779,116 +23156,129 @@ msgstr "" "använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att " "rensa" -#: builtin/worktree.c:360 +#: builtin/worktree.c:288 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:494 builtin/worktree.c:500 +#: builtin/worktree.c:422 builtin/worktree.c:428 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:496 +#: builtin/worktree.c:424 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)" -#: builtin/worktree.c:505 +#: builtin/worktree.c:433 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:511 +#: builtin/worktree.c:439 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:552 +#: builtin/worktree.c:480 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog" -#: builtin/worktree.c:555 +#: builtin/worktree.c:483 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:557 +#: builtin/worktree.c:485 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:559 +#: builtin/worktree.c:487 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:560 +#: builtin/worktree.c:488 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:563 +#: builtin/worktree.c:491 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:566 +#: builtin/worktree.c:494 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök träffa namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:574 +#: builtin/worktree.c:502 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:635 +#: builtin/worktree.c:563 msgid "--[no-]track can only be used if a new branch is created" msgstr "--[no-]track kan endast användas när ny gran skapas" -#: builtin/worktree.c:758 +#: builtin/worktree.c:680 +msgid "show extended annotations and reasons, if available" +msgstr "visa utökade annoteringar och grunder, om tillgängliga" + +#: builtin/worktree.c:682 +msgid "add 'prunable' annotation to worktrees older than <time>" +msgstr "" +"lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>" + +#: builtin/worktree.c:691 +msgid "--verbose and --porcelain are mutually exclusive" +msgstr "--verbose och --porcelain är ömsesidigt uteslutande" + +#: builtin/worktree.c:718 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877 -#: builtin/worktree.c:1001 +#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837 +#: builtin/worktree.c:961 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:772 builtin/worktree.c:805 +#: builtin/worktree.c:732 builtin/worktree.c:765 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:777 +#: builtin/worktree.c:737 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:779 +#: builtin/worktree.c:739 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:807 +#: builtin/worktree.c:767 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:848 +#: builtin/worktree.c:808 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:856 +#: builtin/worktree.c:816 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:879 builtin/worktree.c:1003 +#: builtin/worktree.c:839 builtin/worktree.c:963 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:884 +#: builtin/worktree.c:844 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:897 +#: builtin/worktree.c:857 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -22897,7 +23287,7 @@ msgstr "" "kan inte flytta en låst arbetskatalog, orsak till lås: %s\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:899 +#: builtin/worktree.c:859 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -22905,38 +23295,38 @@ msgstr "" "kan inte flytta en låst arbetskatalog;\n" "använd \"move -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:902 +#: builtin/worktree.c:862 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:907 +#: builtin/worktree.c:867 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:953 +#: builtin/worktree.c:913 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:957 +#: builtin/worktree.c:917 #, c-format msgid "'%s' contains modified or untracked files, use --force to delete it" msgstr "" "\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta " "bort det" -#: builtin/worktree.c:962 +#: builtin/worktree.c:922 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "misslyckades köra \"git status\" på \"%s\", kod %d" -#: builtin/worktree.c:985 +#: builtin/worktree.c:945 msgid "force removal even if worktree is dirty or locked" msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:1008 +#: builtin/worktree.c:968 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -22945,7 +23335,7 @@ msgstr "" "kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:1010 +#: builtin/worktree.c:970 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -22953,17 +23343,17 @@ msgstr "" "kan inte ta bort en låst arbetskatalog;\n" "använd \"remove -f -f\" för att överstyra, eller lås upp först" -#: builtin/worktree.c:1013 +#: builtin/worktree.c:973 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" -#: builtin/worktree.c:1037 +#: builtin/worktree.c:997 #, c-format msgid "repair: %s: %s" msgstr "reparera: %s: %s" -#: builtin/worktree.c:1040 +#: builtin/worktree.c:1000 #, c-format msgid "error: %s: %s" msgstr "fel: %s: %s" @@ -23026,6 +23416,7 @@ msgid "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" +" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n" @@ -23034,9 +23425,10 @@ msgstr "" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n" +" [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n" " <kommando> [<flaggor>]" -#: git.c:35 +#: git.c:36 msgid "" "'git help -a' and 'git help -g' list available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" @@ -23048,47 +23440,47 @@ msgstr "" "<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n" "See \"git help git\" för en översikt över systemet." -#: git.c:187 +#: git.c:188 #, c-format msgid "no directory given for --git-dir\n" msgstr "ingen katalog angavs för --git-dir\n" -#: git.c:201 +#: git.c:202 #, c-format msgid "no namespace given for --namespace\n" msgstr "ingen namnrymd angavs för --namespace\n" -#: git.c:215 +#: git.c:216 #, c-format msgid "no directory given for --work-tree\n" msgstr "ingen katalog angavs för --work-tree\n" -#: git.c:229 +#: git.c:230 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "inget prefix angavs för --super-prefix\n" -#: git.c:251 +#: git.c:252 #, c-format msgid "-c expects a configuration string\n" msgstr "-c förväntar en konfigurationssträng\n" -#: git.c:289 +#: git.c:292 #, c-format msgid "no directory given for -C\n" msgstr "ingen katalog angavs för -C\n" -#: git.c:315 +#: git.c:318 #, c-format msgid "unknown option: %s\n" msgstr "okänd flagga: %s\n" -#: git.c:364 +#: git.c:367 #, c-format msgid "while expanding alias '%s': '%s'" msgstr "vid expandering av aliaset \"%s\": \"%s\"" -#: git.c:373 +#: git.c:376 #, c-format msgid "" "alias '%s' changes environment variables.\n" @@ -23097,39 +23489,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:380 +#: git.c:383 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:383 +#: git.c:386 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:465 +#: git.c:468 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:467 +#: git.c:470 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:469 +#: git.c:472 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:820 +#: git.c:823 #, c-format msgid "alias loop detected: expansion of '%s' does not terminate:%s" msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s" -#: git.c:870 +#: git.c:873 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:883 +#: git.c:886 #, c-format msgid "" "usage: %s\n" @@ -23138,13 +23530,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:903 +#: git.c:906 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "" "expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n" -#: git.c:915 +#: git.c:918 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -23377,11 +23769,11 @@ msgid "" "with --pathspec-from-file, pathspec elements are separated with NUL character" msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "key" msgstr "nyckel" -#: ref-filter.h:96 +#: ref-filter.h:99 msgid "field name to sort on" msgstr "fältnamn att sortera på" @@ -23389,14 +23781,6 @@ msgstr "fältnamn att sortera på" msgid "update the index with reused conflict resolution if possible" msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt" -#: wt-status.h:80 -msgid "HEAD detached at " -msgstr "HEAD frånkopplad vid " - -#: wt-status.h:81 -msgid "HEAD detached from " -msgstr "HEAD frånkopplad från " - #: command-list.h:50 msgid "Add file contents to the index" msgstr "Lägg filinnehåll till indexet" @@ -23728,8 +24112,8 @@ msgid "Write and verify multi-pack-indexes" msgstr "Skriv och verifiera multi-pack-index" #: command-list.h:132 -msgid "Creates a tag object" -msgstr "Skapar ett taggobjekt" +msgid "Creates a tag object with extra validation" +msgstr "skapar ett taggobjekt med extra validering" #: command-list.h:133 msgid "Build a tree-object from ls-tree formatted text" @@ -24036,69 +24420,55 @@ msgid "Specifies intentionally untracked files to ignore" msgstr "Ange avsiktligen ospårade filer att ignorera" #: command-list.h:209 +msgid "Map author/committer names and/or E-Mail addresses" +msgstr "Mappa författar-/incheckarnamn och/eller -e-postadresser" + +#: command-list.h:210 msgid "Defining submodule properties" msgstr "Ange egenskaper för undermoduler" -#: command-list.h:210 +#: command-list.h:211 msgid "Git namespaces" msgstr "Git-namnrymder" -#: command-list.h:211 +#: command-list.h:212 msgid "Helper programs to interact with remote repositories" msgstr "Hjälpprogram för att interagera med fjärrarkiv" -#: command-list.h:212 +#: command-list.h:213 msgid "Git Repository Layout" msgstr "Gits arkivlayout" -#: command-list.h:213 +#: command-list.h:214 msgid "Specifying revisions and ranges for Git" msgstr "Ange versioner och intervall i Git" -#: command-list.h:214 +#: command-list.h:215 msgid "Mounting one repository inside another" msgstr "Monterar ett arkiv inuti ett annat" -#: command-list.h:215 +#: command-list.h:216 msgid "A tutorial introduction to Git: part two" msgstr "Introduktion till Git: del två" -#: command-list.h:216 +#: command-list.h:217 msgid "A tutorial introduction to Git" msgstr "Introduktion till Git" -#: command-list.h:217 +#: command-list.h:218 msgid "An overview of recommended workflows with Git" msgstr "Översikt över rekommenderade arbetsflöden med Git" -#: git-bisect.sh:48 -#, sh-format -msgid "Bad rev input: $arg" -msgstr "Felaktig rev-indata: $arg" - -#: git-bisect.sh:82 -msgid "No logfile given" -msgstr "Ingen loggfil angiven" - -#: git-bisect.sh:83 -#, sh-format -msgid "cannot read $file for replaying" -msgstr "kan inte läsa $file för uppspelning" - -#: git-bisect.sh:105 -msgid "?? what are you talking about?" -msgstr "?? vad menar du?" - -#: git-bisect.sh:115 +#: git-bisect.sh:68 msgid "bisect run failed: no command provided." msgstr "bisect-körning misslyckades: inget kommando gavs." -#: git-bisect.sh:120 +#: git-bisect.sh:73 #, sh-format msgid "running $command" msgstr "kör $command" -#: git-bisect.sh:127 +#: git-bisect.sh:80 #, sh-format msgid "" "bisect run failed:\n" @@ -24107,11 +24477,11 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "felkod $res från \"$command\" är < 0 eller >= 128" -#: git-bisect.sh:152 +#: git-bisect.sh:105 msgid "bisect run cannot continue any more" msgstr "\"bisect\"-körningen kan inte fortsätta längre" -#: git-bisect.sh:158 +#: git-bisect.sh:111 #, sh-format msgid "" "bisect run failed:\n" @@ -24120,14 +24490,10 @@ msgstr "" "\"bisect\"-körningen misslyckades:\n" "\"bisect-state $state\" avslutades med felkoden $res" -#: git-bisect.sh:165 +#: git-bisect.sh:118 msgid "bisect run success" msgstr "\"bisect\"-körningen lyckades" -#: git-bisect.sh:173 -msgid "We are not bisecting." -msgstr "Vi utför ingen bisect för tillfället." - #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " @@ -25420,6 +25786,74 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "rev-list died" +#~ msgstr "rev-list dog" + +#~ msgid "" +#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> " +#~ "<good_term> <bad_term>" +#~ msgstr "" +#~ "git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-" +#~ "för-rätt> <term-för-fel>" + +#~ msgid "" +#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> " +#~ "<bad_term>" +#~ msgstr "" +#~ "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-" +#~ "rätt> <term-för-fel>" + +#~ msgid "git bisect--helper --bisect-auto-next" +#~ msgstr "git bisect--helper --bisect-auto-next" + +#~ msgid "write out the bisection state in BISECT_LOG" +#~ msgstr "skriver bisect-tillståndet i BISECT_LOG" + +#~ msgid "check and set terms in a bisection state" +#~ msgstr "visa och ange termer för bisect-tillstånd" + +#~ msgid "" +#~ "verify the next bisection state then checkout the next bisection commit" +#~ msgstr "" +#~ "kontrollera nästa bisect-tillstånd och checka så ut nästa bisect-" +#~ "incheckning" + +#~ msgid "--bisect-write requires either 4 or 5 arguments" +#~ msgstr "--bisect-write kräver antingen 4 eller 5 argument" + +#~ msgid "--check-and-set-terms requires 3 arguments" +#~ msgstr "--check-and-set-terms kräver tre argument" + +#~ msgid "--bisect-auto-next requires 0 arguments" +#~ msgstr "--bisect-auto-next kräver 0 argument" + +#~ msgid "Force progress reporting" +#~ msgstr "Tvinga förloppsrapportering" + +#~ msgid "Error deleting remote-tracking branch '%s'" +#~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\"" + +#~ msgid "Error deleting branch '%s'" +#~ msgstr "Fel vid borttagning av grenen \"%s\"" + +#~ msgid "show parse tree for grep expression" +#~ msgstr "visa analysträd för grep-uttryck" + +#~ msgid "too many parameters" +#~ msgstr "för många parametrar" + +#~ msgid "too few parameters" +#~ msgstr "för få parametrar" + +#~ msgid "Recurse into nested submodules" +#~ msgstr "Rekursera in i nästlade undermoduler" + +#~ msgid "too many params" +#~ msgstr "för många parametrar" + +#~ msgid "Bad rev input: $arg" +#~ msgstr "Felaktig rev-indata: $arg" + #~ msgid "Counting distinct commits in commit graph" #~ msgstr "Räknar olika incheckningar i incheckningsgraf" @@ -25456,9 +25890,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "git bisect--helper --write-terms <bad_term> <good_term>" #~ msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>" -#~ msgid "git bisect--helper --bisect-clean-state" -#~ msgstr "git bisect--helper --bisect-clean-state" - #~ msgid "git bisect--helper --bisect-autostart" #~ msgstr "git bisect--helper --bisect-autostart" @@ -25928,12 +26359,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Server supports ofs-delta" #~ msgstr "Servern stöder \"ofs-delta\"" -#~ msgid "(HEAD detached at %s)" -#~ msgstr "(HEAD frånkopplat vid %s)" - -#~ msgid "(HEAD detached from %s)" -#~ msgstr "(HEAD frånkopplat från %s)" - #~ msgid "Checking out files" #~ msgstr "Checkar ut filer" @@ -27138,9 +27563,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "--detach cannot be used with -b/-B/--orphan" #~ msgstr "--detcah kan inte användas med -b/-B/--orphan" -#~ msgid "--detach cannot be used with -t" -#~ msgstr "--detach kan inte användas med -t" - #~ msgid "--orphan and -b|-B are mutually exclusive" #~ msgstr "--orphan och -b|-B kan inte användas samtidigt" |