diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 5240 |
1 files changed, 2689 insertions, 2551 deletions
@@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: git 2.23.0\n" +"Project-Id-Version: git 2.24.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-07-30 09:59+0800\n" -"PO-Revision-Date: 2019-07-31 12:40+0200\n" +"POT-Creation-Date: 2019-10-28 13:19+0800\n" +"PO-Revision-Date: 2019-10-30 23: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" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.2\n" +"X-Generator: Gtranslator 2.91.7\n" #: advice.c:109 #, c-format @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:193 builtin/merge.c:1332 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -208,17 +208,7 @@ msgstr "ogiltigt läge på rad %d: %s" msgid "inconsistent header lines %d and %d" msgstr "huvudet är inkonsekvent mellan rad %d och %d" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: förväntade rad: %.*s" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "patch-fragment utan huvud på rad %d: %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -234,82 +224,92 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: förväntade rad: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "patch-fragment utan huvud på rad %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2925 +#: apply.c:2926 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3046 +#: apply.c:3047 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: apply.c:3058 +#: apply.c:3059 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: apply.c:3064 +#: apply.c:3065 #, c-format msgid "" "while searching for:\n" @@ -318,25 +318,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3087 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3094 +#: apply.c:3095 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s" "\"" -#: apply.c:3141 +#: apply.c:3142 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden" -#: apply.c:3151 +#: apply.c:3152 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -344,426 +344,426 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3159 +#: apply.c:3160 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "patchen appliceras på en tom \"%s\", men den är inte tom" -#: apply.c:3177 +#: apply.c:3178 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas" -#: apply.c:3190 +#: apply.c:3191 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3196 +#: apply.c:3197 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: apply.c:3217 +#: apply.c:3218 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3340 +#: apply.c:3341 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3400 +#: apply.c:3401 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk" -#: apply.c:3429 apply.c:3672 +#: apply.c:3430 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3515 apply.c:3687 +#: apply.c:3516 apply.c:3688 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3524 apply.c:3695 +#: apply.c:3525 apply.c:3696 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3559 +#: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: apply.c:3562 +#: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3594 +#: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3608 +#: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3613 +#: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3639 +#: apply.c:3640 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3712 +#: apply.c:3713 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3714 +#: apply.c:3715 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 +#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 #: read-cache.c:1309 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg \"%s\"" -#: apply.c:3923 +#: apply.c:3924 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3926 +#: apply.c:3927 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3946 +#: apply.c:3947 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: apply.c:3951 +#: apply.c:3952 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: apply.c:3971 +#: apply.c:3972 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk" -#: apply.c:3975 +#: apply.c:3976 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3990 +#: apply.c:3991 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4082 +#: apply.c:4083 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s" -#: apply.c:4089 +#: apply.c:4090 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "nytt läge för %s, som inte finns i nuvarande HEAD" -#: apply.c:4092 +#: apply.c:4093 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 +#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4101 +#: apply.c:4102 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4111 +#: apply.c:4112 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4249 +#: apply.c:4250 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4283 +#: apply.c:4284 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4289 +#: apply.c:4290 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4297 +#: apply.c:4298 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: apply.c:4303 apply.c:4448 +#: apply.c:4304 apply.c:4449 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4346 +#: apply.c:4347 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4350 +#: apply.c:4351 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4420 +#: apply.c:4421 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4518 +#: apply.c:4519 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4526 +#: apply.c:4527 msgid "internal error" msgstr "internt fel" -#: apply.c:4529 +#: apply.c:4530 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: apply.c:4540 +#: apply.c:4541 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161 +#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4562 +#: apply.c:4563 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4566 +#: apply.c:4567 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4676 +#: apply.c:4686 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4684 +#: apply.c:4694 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4704 +#: apply.c:4714 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4859 +#: apply.c:4871 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4886 +#: apply.c:4898 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: apply.c:4892 apply.c:4907 +#: apply.c:4904 apply.c:4919 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d rad lägger till fel i blanksteg." msgstr[1] "%d rader lägger till fel i blanksteg." -#: apply.c:4900 +#: apply.c:4912 #, c-format msgid "%d line applied after fixing whitespace errors." 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:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 +#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 +#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 +#: builtin/pull.c:209 builtin/submodule--helper.c:407 #: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 #: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 #: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 msgid "path" msgstr "sökväg" -#: apply.c:4944 +#: apply.c:4956 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4947 +#: apply.c:4959 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4961 builtin/am.c:2206 msgid "num" msgstr "antal" -#: apply.c:4950 +#: apply.c:4962 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4953 +#: apply.c:4965 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4955 +#: apply.c:4967 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: apply.c:4959 +#: apply.c:4971 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4961 +#: apply.c:4973 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: apply.c:4963 +#: apply.c:4975 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: apply.c:4965 +#: apply.c:4977 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4967 +#: apply.c:4979 msgid "mark new files with `git add --intent-to-add`" msgstr "markera nya filer med \"git add --intent-to-add\"" -#: apply.c:4969 +#: apply.c:4981 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4971 +#: apply.c:4983 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4974 +#: apply.c:4986 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:4988 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: apply.c:4978 +#: apply.c:4990 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4983 +#: apply.c:4995 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3319 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 msgid "action" msgstr "åtgärd" -#: apply.c:4985 +#: apply.c:4997 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4988 apply.c:4991 +#: apply.c:5000 apply.c:5003 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4994 +#: apply.c:5006 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4996 +#: apply.c:5008 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4998 +#: apply.c:5010 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:5000 +#: apply.c:5012 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 +#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 #: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 #: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "var pratsam" -#: apply.c:5003 +#: apply.c:5015 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:5006 +#: apply.c:5018 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5020 builtin/am.c:2194 msgid "root" msgstr "rot" -#: apply.c:5009 +#: apply.c:5021 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -818,7 +818,7 @@ msgstr "fmt" msgid "archive format" msgstr "arkivformat" -#: archive.c:458 builtin/log.c:1597 +#: archive.c:458 builtin/log.c:1581 msgid "prefix" msgstr "prefix" @@ -826,11 +826,12 @@ 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:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 +#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:186 msgid "file" msgstr "fil" @@ -862,7 +863,7 @@ msgstr "komprimera bättre" msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 #: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 msgid "repo" msgstr "arkiv" @@ -871,7 +872,7 @@ msgstr "arkiv" msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "kommando" @@ -907,26 +908,26 @@ msgstr "Argumentet stöd inte för formatet \"%s\": -%d" msgid "cannot stream blob %s" msgstr "kan inte strömma blob:en %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:363 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "filens läge stöds ej: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:353 #, c-format msgid "cannot read %s" msgstr "kan inte läsa %s" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "kunde inte starta filtret \"%s\"" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "kan inte omdirigera handtag" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "filtret \"%s\" rapporterade fel" @@ -941,7 +942,7 @@ msgstr "sökvägen är inte giltig UTF-8: %s" msgid "path too long (%d chars, SHA1: %s): %s" msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229 +#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" @@ -951,17 +952,17 @@ msgstr "fel i deflate (%d)" msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>" -#: attr.c:211 +#: attr.c:213 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%-*s är inte ett giltigt namn på attribut" -#: attr.c:368 +#: attr.c:370 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s inte tillåtet: %s:%d" -#: attr.c:408 +#: attr.c:410 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -1089,41 +1090,41 @@ msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n" msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980 -#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 +#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 +#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 +#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-" "kedjan" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" @@ -1281,7 +1282,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil" msgid "unrecognized header: %s%s (%d)" msgstr "okänt huvud: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 #: builtin/commit.c:791 #, c-format msgid "could not open '%s'" @@ -1334,7 +1335,7 @@ msgstr "rev-list dog" msgid "ref '%s' is excluded by the rev-list options" msgstr "referensen \"%s\" exkluderas av argumenten till rev-list" -#: bundle.c:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306 +#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1357,8 +1358,8 @@ msgstr "index-pack dog" msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 +#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1388,29 +1389,29 @@ msgstr "" "Slå av detta meddelande genom att skriva\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1127 +#: commit.c:1128 #, 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:1130 +#: commit.c:1131 #, 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:1133 +#: commit.c:1134 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: commit.c:1136 +#: commit.c:1137 #, 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:1390 +#: commit.c:1391 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" @@ -1472,180 +1473,195 @@ msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde" msgid "unable to find all commit-graph files" msgstr "kan inte hitta alla incheckingsgraffiler" -#: commit-graph.c:553 commit-graph.c:613 +#: commit-graph.c:561 commit-graph.c:621 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig" -#: commit-graph.c:574 +#: commit-graph.c:582 #, c-format msgid "could not find commit %s" msgstr "kunde inte hitta incheckningen %s" -#: commit-graph.c:1001 builtin/pack-objects.c:2651 +#: commit-graph.c:855 builtin/am.c:1287 +#, c-format +msgid "unable to parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: commit-graph.c:859 +#, c-format +msgid "unable to get tree for %s" +msgstr "kunde inte hämta trädet på %s" + +#: commit-graph.c:1017 builtin/pack-objects.c:2641 #, c-format msgid "unable to get type of object %s" msgstr "kunde inte hämta typ för objektet %s" -#: commit-graph.c:1033 +#: commit-graph.c:1049 msgid "Loading known commits in commit graph" msgstr "Läser in kända incheckningar i incheckningsgraf" -#: commit-graph.c:1050 +#: commit-graph.c:1066 msgid "Expanding reachable commits in commit graph" msgstr "Expanderar nåbara incheckningar i incheckningsgraf" -#: commit-graph.c:1069 +#: commit-graph.c:1085 msgid "Clearing commit marks in commit graph" msgstr "Rensar incheckningsmärken i incheckningsgraf" -#: commit-graph.c:1088 +#: commit-graph.c:1104 msgid "Computing commit graph generation numbers" msgstr "Beräknar generationsvärden för incheckningsgraf" -#: commit-graph.c:1162 +#: commit-graph.c:1179 #, 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:1175 +#: commit-graph.c:1192 #, c-format msgid "error adding pack %s" msgstr "fel vid tillägg av paketet %s" -#: commit-graph.c:1179 +#: commit-graph.c:1196 #, c-format msgid "error opening index for %s" msgstr "fel vid öppning av indexet för %s" -#: commit-graph.c:1203 +#: commit-graph.c:1220 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens" msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser" -#: commit-graph.c:1237 +#: commit-graph.c:1240 +#, c-format +msgid "invalid commit object id: %s" +msgstr "ogiltigt inchecknings-objekt-id %s" + +#: commit-graph.c:1255 msgid "Finding commits for commit graph among packed objects" msgstr "Söker incheckningar för incheckingsgraf i packade objekt" -#: commit-graph.c:1252 +#: commit-graph.c:1270 msgid "Counting distinct commits in commit graph" msgstr "Räknar olika incheckningar i incheckningsgraf" -#: commit-graph.c:1283 +#: commit-graph.c:1300 msgid "Finding extra edges in commit graph" msgstr "Söker ytterligare kanter i incheckingsgraf" -#: commit-graph.c:1331 +#: commit-graph.c:1346 msgid "failed to write correct number of base graph ids" msgstr "kunde inte skriva korrekt antal bas-graf-id:n" -#: commit-graph.c:1364 midx.c:811 +#: commit-graph.c:1379 midx.c:810 #, c-format msgid "unable to create leading directories of %s" msgstr "kunde inte skapa inledande kataloger för %s" -#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251 +#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 #, c-format msgid "unable to create '%s'" msgstr "kunde inte skapa \"%s\"" -#: commit-graph.c:1436 +#: commit-graph.c:1451 #, 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:1477 +#: commit-graph.c:1492 msgid "unable to open commit-graph chain file" msgstr "Kunde inte öppna incheckningsgrafkedjefilen" -#: commit-graph.c:1489 +#: commit-graph.c:1504 msgid "failed to rename base commit-graph file" msgstr "kunde inte byta namn på bas-incheckingsgraffilen" -#: commit-graph.c:1509 +#: commit-graph.c:1524 msgid "failed to rename temporary commit-graph file" msgstr "kunde inte byta namn på temporär incheckningsgraffil" -#: commit-graph.c:1620 +#: commit-graph.c:1635 msgid "Scanning merged commits" msgstr "Söker sammanslagna incheckningar" -#: commit-graph.c:1631 +#: commit-graph.c:1646 #, c-format msgid "unexpected duplicate commit id %s" msgstr "oväntat duplicerat inchecknings-id %s" -#: commit-graph.c:1656 +#: commit-graph.c:1670 msgid "Merging commit-graph" msgstr "Slår ihop incheckningsgraf" -#: commit-graph.c:1842 +#: commit-graph.c:1860 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar" -#: commit-graph.c:1853 +#: commit-graph.c:1871 msgid "too many commits to write graph" msgstr "för många incheckningar för att skriva graf" -#: commit-graph.c:1943 +#: commit-graph.c:1961 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:1953 +#: commit-graph.c:1971 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s" -#: commit-graph.c:1963 commit-graph.c:1978 +#: commit-graph.c:1981 commit-graph.c:1996 #, 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:1970 +#: commit-graph.c:1988 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "kunde inte tolka incheckning %s från incheckningsgraf" -#: commit-graph.c:1987 +#: commit-graph.c:2006 msgid "Verifying commits in commit graph" msgstr "Bekräftar incheckningar i incheckningsgrafen" -#: commit-graph.c:2000 +#: commit-graph.c:2020 #, 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:2007 +#: commit-graph.c:2027 #, 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:2017 +#: commit-graph.c:2037 #, 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:2026 +#: commit-graph.c:2046 #, 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:2039 +#: commit-graph.c:2059 #, 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:2044 +#: commit-graph.c:2064 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1653,7 +1669,7 @@ msgstr "" "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-" "noll på annan plats" -#: commit-graph.c:2048 +#: commit-graph.c:2068 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1661,12 +1677,12 @@ msgstr "" "incheckningsgrafen har generationsnummer skilt från noll för incheckningen " "%s, men noll på annan plats" -#: commit-graph.c:2063 +#: commit-graph.c:2083 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u" -#: commit-graph.c:2069 +#: commit-graph.c:2089 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1705,289 +1721,283 @@ msgstr "relativa konfigureringsinkluderingar måste komma från filer" msgid "relative config include conditionals must come from files" msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer" -#: config.c:375 +#: config.c:376 #, c-format msgid "key does not contain a section: %s" msgstr "nyckeln innehåller inte ett stycke: %s" -#: config.c:381 +#: config.c:382 #, c-format msgid "key does not contain variable name: %s" msgstr "nyckeln innehåller inte variabelnamn: %s" -#: config.c:405 sequencer.c:2463 +#: config.c:406 sequencer.c:2401 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: config.c:411 +#: config.c:412 #, c-format msgid "invalid key (newline): %s" msgstr "ogiltig nyckel (nyradstecken): %s" -#: config.c:447 config.c:459 +#: config.c:448 config.c:460 #, c-format msgid "bogus config parameter: %s" msgstr "falsk konfigureringsparameter: %s" -#: config.c:494 +#: config.c:495 #, c-format msgid "bogus format in %s" msgstr "felaktigt format i %s" -#: config.c:820 +#: config.c:821 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:824 +#: config.c:825 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:828 +#: config.c:829 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:832 +#: config.c:833 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:836 +#: config.c:837 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:840 +#: config.c:841 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:977 +#: config.c:978 msgid "out of range" msgstr "utanför intervallet" -#: config.c:977 +#: config.c:978 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:978 +#: config.c:979 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:997 +#: config.c:998 #, 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:1000 +#: config.c:1001 #, 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:1003 +#: config.c:1004 #, 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:1006 +#: config.c:1007 #, 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:1009 +#: config.c:1010 #, 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:1012 +#: config.c:1013 #, 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:1107 +#: config.c:1108 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:1116 +#: config.c:1117 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel" -#: config.c:1207 +#: config.c:1208 #, c-format msgid "abbrev length out of range: %d" msgstr "förkortningslängd utanför intervallet: %d" -#: config.c:1221 config.c:1232 +#: config.c:1222 config.c:1233 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:1324 +#: config.c:1325 msgid "core.commentChar should only be one character" msgstr "core.commentChar kan bara vara ett tecken" -#: config.c:1357 +#: config.c:1358 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1429 +#: config.c:1425 #, c-format msgid "malformed value for %s" msgstr "felformat värde för %s" -#: config.c:1455 +#: config.c:1451 #, c-format msgid "malformed value for %s: %s" msgstr "felformat värde för %s: %s" -#: config.c:1456 +#: config.c:1452 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:1517 builtin/pack-objects.c:3399 +#: config.c:1513 builtin/pack-objects.c:3394 #, c-format msgid "bad pack compression level %d" msgstr "felaktig paketkomprimeringsgrad %d" -#: config.c:1638 +#: config.c:1634 #, c-format msgid "unable to load config blob object '%s'" msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\"" -#: config.c:1641 +#: config.c:1637 #, c-format msgid "reference '%s' does not point to a blob" msgstr "referensen \"%s\" pekar inte på en blob" -#: config.c:1658 +#: config.c:1654 #, c-format msgid "unable to resolve config blob '%s'" msgstr "kan inte slå upp konfigurerings-bloben \"%s\"" -#: config.c:1688 +#: config.c:1684 #, c-format msgid "failed to parse %s" msgstr "kunde inte tolka %s" -#: config.c:1744 +#: config.c:1740 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:2093 +#: config.c:2091 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:2263 +#: config.c:2261 #, c-format msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" #: config.c:2306 #, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\"" - -#: config.c:2332 -#, 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:2378 +#: config.c:2352 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:2380 +#: config.c:2354 #, 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:2461 +#: config.c:2435 #, c-format msgid "invalid section name '%s'" msgstr "felaktigt sektionsnamn \"%s\"" -#: config.c:2493 +#: config.c:2467 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2522 +#: config.c:2496 #, c-format msgid "failed to write new configuration file %s" msgstr "kan inte skriva nya konfigurationsfilen \"%s\"" -#: config.c:2774 config.c:3098 +#: config.c:2748 config.c:3072 #, c-format msgid "could not lock config file %s" msgstr "kunde inte låsa konfigurationsfilen %s" -#: config.c:2785 +#: config.c:2759 #, c-format msgid "opening %s" msgstr "öppnar %s" -#: config.c:2820 builtin/config.c:328 +#: config.c:2794 builtin/config.c:328 #, c-format msgid "invalid pattern: %s" msgstr "ogiltigt mönster: %s" -#: config.c:2845 +#: config.c:2819 #, c-format msgid "invalid config file %s" msgstr "ogiltig konfigurationsfil: \"%s\"" -#: config.c:2858 config.c:3111 +#: config.c:2832 config.c:3085 #, c-format msgid "fstat on %s failed" msgstr "fstat misslyckades på %s" -#: config.c:2869 +#: config.c:2843 #, c-format msgid "unable to mmap '%s'" msgstr "kunde inte utföra mmap på \"%s\"" -#: config.c:2878 config.c:3116 +#: config.c:2852 config.c:3090 #, c-format msgid "chmod on %s failed" msgstr "chmod misslyckades på %s" -#: config.c:2963 config.c:3213 +#: config.c:2937 config.c:3187 #, c-format msgid "could not write config file %s" msgstr "kunde inte skriva konfigurationsfilen %s" -#: config.c:2997 +#: config.c:2971 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2999 builtin/remote.c:782 +#: config.c:2973 builtin/remote.c:782 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" -#: config.c:3089 +#: config.c:3063 #, c-format msgid "invalid section name: %s" msgstr "felaktigt namn på stycke: %s" -#: config.c:3256 +#: config.c:3230 #, c-format msgid "missing value for '%s'" msgstr "värde saknas för \"%s\"" @@ -2111,7 +2121,7 @@ msgstr "kunde inte slå upp %s (%s)" msgid "unknown port %s" msgstr "okänd port %s" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "konstigt värdnamn \"%s\" blockerat" @@ -2126,60 +2136,60 @@ msgstr "konstig port \"%s\" blockerad" msgid "cannot start proxy %s" msgstr "kan inte starta mellanserver (proxy) %s" -#: connect.c:924 +#: connect.c:928 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:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "ssh-varianten \"simple\" stöder inte -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "ssh-varianten \"simple\" stöder inte -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh-varianten \"simple\" stöder inte val av port" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "konstigt sökvägsnamn \"%s\" blockerat" -#: connect.c:1307 +#: connect.c:1311 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:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" -#: connected.c:98 +#: connected.c:100 msgid "Could not run 'git rev-list'" msgstr "Kunde inte köra \"git rev-list\"" -#: connected.c:118 +#: connected.c:120 msgid "failed write to rev-list" msgstr "kunde inte skriva till rev-list" -#: connected.c:125 +#: connected.c:127 msgid "failed to close rev-list's stdin" msgstr "kunde inte stänga rev-list:s standard in" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "felaktig crlf_action %d" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF skulle ersättas av LF i %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2188,12 +2198,12 @@ msgstr "" "CRLF kommer att ersättas av LF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF skulle ersättas av CRLF i %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2202,12 +2212,12 @@ msgstr "" "LF kommer att ersättas av CRLF i %s.\n" "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog" -#: convert.c:279 +#: convert.c:280 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "BOM är förbjudet i \"%s\" om kodat som %s" -#: convert.c:286 +#: convert.c:287 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" @@ -2216,12 +2226,12 @@ msgstr "" "Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som " "teckenkodning i arbetskatalogen." -#: convert.c:304 +#: convert.c:305 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "BOM krävs om \"%s\" kodas som %s" -#: convert.c:306 +#: convert.c:307 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" @@ -2230,51 +2240,51 @@ msgstr "" "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE " "(beroende på byteordning) som teckenkodning i arbetskatalogen." -#: convert.c:424 convert.c:495 +#: convert.c:425 convert.c:496 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "misslyckades omkoda \"%s\" från %s till %s" -#: convert.c:467 +#: convert.c:468 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat" -#: convert.c:673 +#: convert.c:674 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "kan inte grena (fork) för att köra externt filter \"%s\"" -#: convert.c:693 +#: convert.c:694 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "kunde inte skicka indata till externt filter \"%s\"" -#: convert.c:700 +#: convert.c:701 #, c-format msgid "external filter '%s' failed %d" msgstr "externt filter \"%s\" misslyckades %d" -#: convert.c:735 convert.c:738 +#: convert.c:736 convert.c:739 #, c-format msgid "read from external filter '%s' failed" msgstr "läsning från externt filter \"%s\" misslyckades" -#: convert.c:741 convert.c:796 +#: convert.c:742 convert.c:797 #, c-format msgid "external filter '%s' failed" msgstr "externt filter \"%s\" misslyckades" -#: convert.c:844 +#: convert.c:845 msgid "unexpected filter type" msgstr "oväntad filtertyp" -#: convert.c:855 +#: convert.c:856 msgid "path name too long for external filter" msgstr "sökvägen för lång för externt filter" -#: convert.c:929 +#: convert.c:930 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2283,67 +2293,67 @@ msgstr "" "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar " "inte har filtrerats" -#: convert.c:1228 +#: convert.c:1229 msgid "true/false are no valid working-tree-encodings" msgstr "true/false är inte giltig teckenkodning för arbetskatalogen" -#: convert.c:1398 convert.c:1432 +#: convert.c:1417 convert.c:1451 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: \"clean\"-filtret \"%s\" misslyckades" -#: convert.c:1476 +#: convert.c:1495 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "i framtiden" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> sekund sedan" msgstr[1] "%<PRIuMAX> sekunder sedan" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minut sedan" msgstr[1] "%<PRIuMAX> minuter sedan" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> timme sedan" msgstr[1] "%<PRIuMAX> timmar sedan" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> dag sedan" msgstr[1] "%<PRIuMAX> dagar sedan" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> vecka sedan" msgstr[1] "%<PRIuMAX> veckor sedan" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> månad sedan" msgstr[1] "%<PRIuMAX> månader sedan" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2351,14 +2361,14 @@ msgstr[0] "%<PRIuMAX> år" msgstr[1] "%<PRIuMAX> år" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> månad sedan" msgstr[1] "%s, %<PRIuMAX> månader sedan" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2394,7 +2404,7 @@ msgstr "Markerade %d öar, klar.\n" msgid "failed to read orderfile '%s'" msgstr "kunde inte läsa orderfilen \"%s\"" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Utför onöjaktig namnbytesdetektering" @@ -2460,35 +2470,35 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:4215 +#: diff.c:4218 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:4560 +#: diff.c:4563 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:4563 +#: diff.c:4566 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S och --find-object är ömsesidigt uteslutande" -#: diff.c:4641 +#: diff.c:4644 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:4689 +#: diff.c:4692 #, c-format msgid "invalid --stat value: %s" msgstr "ogiltigt värde för --stat: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 +#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225 #: parse-options.c:199 parse-options.c:203 #, c-format msgid "%s expects a numerical value" msgstr "%s förväntar ett numeriskt värde" -#: diff.c:4726 +#: diff.c:4729 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2497,42 +2507,42 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:4811 +#: diff.c:4814 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4838 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "okänt värde efter ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4852 #, c-format msgid "unable to resolve '%s'" msgstr "kunde inte slå upp \"%s\"" -#: diff.c:4899 diff.c:4905 +#: diff.c:4902 diff.c:4908 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s förväntar formen <n>/<m>" -#: diff.c:4917 +#: diff.c:4920 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s förväntar ett tecken, fick \"%s\"" -#: diff.c:4938 +#: diff.c:4941 #, c-format msgid "bad --color-moved argument: %s" msgstr "felaktigt argument till --color-moved: %s" -#: diff.c:4957 +#: diff.c:4960 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "ogiltigt läge %s\" i --color-moved-ws" -#: diff.c:4997 +#: diff.c:5000 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2540,149 +2550,149 @@ msgstr "" "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och " "\"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5036 diff.c:5056 #, c-format msgid "invalid argument to %s" msgstr "ogiltigt argument för %s" -#: diff.c:5191 +#: diff.c:5194 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:5247 +#: diff.c:5250 #, c-format msgid "bad --word-diff argument: %s" msgstr "felaktigt argument --word-diff: %s" -#: diff.c:5270 +#: diff.c:5273 msgid "Diff output format options" msgstr "Formatflaggor för diff-utdata" -#: diff.c:5272 diff.c:5278 +#: diff.c:5275 diff.c:5281 msgid "generate patch" msgstr "skapar patch" -#: diff.c:5275 builtin/log.c:182 +#: diff.c:5278 builtin/log.c:172 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5283 diff.c:5397 diff.c:5404 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5284 diff.c:5287 msgid "generate diffs with <n> lines context" msgstr "skapa diffar med <n> rader sammanhang" -#: diff.c:5286 +#: diff.c:5289 msgid "generate the diff in raw format" msgstr "generera diff i råformat" -#: diff.c:5289 +#: diff.c:5292 msgid "synonym for '-p --raw'" msgstr "synonym till \"-p --raw\"" -#: diff.c:5293 +#: diff.c:5296 msgid "synonym for '-p --stat'" msgstr "synonym till \"-p --stat\"" -#: diff.c:5297 +#: diff.c:5300 msgid "machine friendly --stat" msgstr "maskinläsbar --stat" -#: diff.c:5300 +#: diff.c:5303 msgid "output only the last line of --stat" msgstr "skriv bara ut den sista raden för --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5305 diff.c:5313 msgid "<param1,param2>..." msgstr "<param1,param2>..." -#: diff.c:5303 +#: diff.c:5306 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:5307 +#: diff.c:5310 msgid "synonym for --dirstat=cumulative" msgstr "synonym för --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5314 msgid "synonym for --dirstat=files,param1,param2..." msgstr "synonym för --dirstat=filer,param1,param2..." -#: diff.c:5315 +#: diff.c:5318 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel" -#: diff.c:5318 +#: diff.c:5321 msgid "condensed summary such as creations, renames and mode changes" msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen" -#: diff.c:5321 +#: diff.c:5324 msgid "show only names of changed files" msgstr "visa endast namnen på ändrade filer" -#: diff.c:5324 +#: diff.c:5327 msgid "show only names and status of changed files" msgstr "visa endast namn och status för ändrade filer" -#: diff.c:5326 +#: diff.c:5329 msgid "<width>[,<name-width>[,<count>]]" msgstr "<bredd>[,<namn-bredd>[,<antal>]]" -#: diff.c:5327 +#: diff.c:5330 msgid "generate diffstat" msgstr "skapa diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5332 diff.c:5335 diff.c:5338 msgid "<width>" msgstr "<bredd>" -#: diff.c:5330 +#: diff.c:5333 msgid "generate diffstat with a given width" msgstr "generera en diffstat med given bredd" -#: diff.c:5333 +#: diff.c:5336 msgid "generate diffstat with a given name width" msgstr "generera en diffstat med given namnbredd" -#: diff.c:5336 +#: diff.c:5339 msgid "generate diffstat with a given graph width" msgstr "generera en diffstat med given grafbredd" -#: diff.c:5338 +#: diff.c:5341 msgid "<count>" msgstr "<antal>" -#: diff.c:5339 +#: diff.c:5342 msgid "generate diffstat with limited lines" msgstr "generera diffstat med begränsade rader" -#: diff.c:5342 +#: diff.c:5345 msgid "generate compact summary in diffstat" msgstr "skapa kompakt översikt i diffstat" -#: diff.c:5345 +#: diff.c:5348 msgid "output a binary diff that can be applied" msgstr "skapa en binärdiff som kan appliceras" -#: diff.c:5348 +#: diff.c:5351 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:5350 +#: diff.c:5353 msgid "show colored diff" msgstr "visa färgad diff" -#: diff.c:5351 +#: diff.c:5354 msgid "<kind>" msgstr "<typ>" -#: diff.c:5352 +#: diff.c:5355 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2690,7 +2700,7 @@ msgstr "" "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller " "\"new\" (nya) rader i diffen" -#: diff.c:5355 +#: diff.c:5358 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2698,87 +2708,87 @@ msgstr "" "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw " "eller --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473 msgid "<prefix>" msgstr "<prefix>" -#: diff.c:5359 +#: diff.c:5362 msgid "show the given source prefix instead of \"a/\"" msgstr "visa givet källprefix istället för \"a/\"" -#: diff.c:5362 +#: diff.c:5365 msgid "show the given destination prefix instead of \"b/\"" msgstr "visa givet målprefix istället för \"b/\"" -#: diff.c:5365 +#: diff.c:5368 msgid "prepend an additional prefix to every line of output" msgstr "lägg till ytterligare prefix på alla rader i utdata" -#: diff.c:5368 +#: diff.c:5371 msgid "do not show any source or destination prefix" msgstr "visa inte käll- eller målprefix" -#: diff.c:5371 +#: diff.c:5374 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:5375 diff.c:5380 diff.c:5385 +#: diff.c:5378 diff.c:5383 diff.c:5388 msgid "<char>" msgstr "<tecken>" -#: diff.c:5376 +#: diff.c:5379 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:5381 +#: diff.c:5384 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:5386 +#: diff.c:5389 msgid "specify the character to indicate a context instead of ' '" msgstr "ange tecken för att ange sammanhang istället för \" \"" -#: diff.c:5389 +#: diff.c:5392 msgid "Diff rename options" msgstr "Diff-namnbytesflaggor" -#: diff.c:5390 +#: diff.c:5393 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5394 msgid "break complete rewrite changes into pairs of delete and create" msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par" -#: diff.c:5395 +#: diff.c:5398 msgid "detect renames" msgstr "detektera namnändringar" -#: diff.c:5399 +#: diff.c:5402 msgid "omit the preimage for deletes" msgstr "ta bort för-version för borttagningar" -#: diff.c:5402 +#: diff.c:5405 msgid "detect copies" msgstr "detektera kopior" -#: diff.c:5406 +#: diff.c:5409 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:5408 +#: diff.c:5411 msgid "disable rename detection" msgstr "inaktivera detektering av namnbyten" -#: diff.c:5411 +#: diff.c:5414 msgid "use empty blobs as rename source" msgstr "använd tomma blob:ar som namnändringskälla" -#: diff.c:5413 +#: diff.c:5416 msgid "continue listing the history of a file beyond renames" msgstr "fortsätt lista historiken för en fil bortom namnändringar" -#: diff.c:5416 +#: diff.c:5419 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2786,159 +2796,159 @@ msgstr "" "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver " "given gräns" -#: diff.c:5418 +#: diff.c:5421 msgid "Diff algorithm options" msgstr "Alternativ för diff-algoritm" -#: diff.c:5420 +#: diff.c:5423 msgid "produce the smallest possible diff" msgstr "skapa minsta möjliga diff" -#: diff.c:5423 +#: diff.c:5426 msgid "ignore whitespace when comparing lines" msgstr "ignorera blanktecken vid radjämförelse" -#: diff.c:5426 +#: diff.c:5429 msgid "ignore changes in amount of whitespace" msgstr "ignorera ändringar i antal blanktecken vid radjämförelse" -#: diff.c:5429 +#: diff.c:5432 msgid "ignore changes in whitespace at EOL" msgstr "ignorera blanktecken vid radslut" -#: diff.c:5432 +#: diff.c:5435 msgid "ignore carrier-return at the end of line" msgstr "ignorera CR-tecken vid radslut" -#: diff.c:5435 +#: diff.c:5438 msgid "ignore changes whose lines are all blank" msgstr "ignorera ändringar i rader som är helt blanka" -#: diff.c:5438 +#: diff.c:5441 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:5441 +#: diff.c:5444 msgid "generate diff using the \"patience diff\" algorithm" msgstr "skapa diffar med algoritmen \"patience diff\"" -#: diff.c:5445 +#: diff.c:5448 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "skapa diffar med algoritmen \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5450 msgid "<algorithm>" msgstr "<algoritm>" -#: diff.c:5448 +#: diff.c:5451 msgid "choose a diff algorithm" msgstr "välj en diff-algoritm" -#: diff.c:5450 +#: diff.c:5453 msgid "<text>" msgstr "<text>" -#: diff.c:5451 +#: diff.c:5454 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "skapa diffar med algoritmen \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5456 diff.c:5465 diff.c:5468 msgid "<mode>" msgstr "<läge>" -#: diff.c:5454 +#: diff.c:5457 msgid "show word diff, using <mode> to delimit changed words" msgstr "visa orddiff, där <läge> avgränsar ändrade ord" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5459 diff.c:5462 diff.c:5507 msgid "<regex>" msgstr "<reguttr>" -#: diff.c:5457 +#: diff.c:5460 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:5460 +#: diff.c:5463 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>" -#: diff.c:5463 +#: diff.c:5466 msgid "moved lines of code are colored differently" msgstr "flyttade kodrader färgas på annat sätt" -#: diff.c:5466 +#: diff.c:5469 msgid "how white spaces are ignored in --color-moved" msgstr "hur blanktecken ignoreras i --color-moved" -#: diff.c:5469 +#: diff.c:5472 msgid "Other diff options" msgstr "Andra diff-flaggor" -#: diff.c:5471 +#: diff.c:5474 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:5475 +#: diff.c:5478 msgid "treat all files as text" msgstr "hantera alla filer som text" -#: diff.c:5477 +#: diff.c:5480 msgid "swap two inputs, reverse the diff" msgstr "växla två indatafiler, vänd diffen" -#: diff.c:5479 +#: diff.c:5482 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "avsluta med 1 vid ändringar, annars 0" -#: diff.c:5481 +#: diff.c:5484 msgid "disable all output of the program" msgstr "slå av alla utdata från programmet" -#: diff.c:5483 +#: diff.c:5486 msgid "allow an external diff helper to be executed" msgstr "tillåt köra en extern diff-hjälpare" -#: diff.c:5485 +#: diff.c:5488 msgid "run external text conversion filters when comparing binary files" msgstr "kör externt textkonverteringsfiler när binärfiler jämförs" -#: diff.c:5487 +#: diff.c:5490 msgid "<when>" msgstr "<när>" -#: diff.c:5488 +#: diff.c:5491 msgid "ignore changes to submodules in the diff generation" msgstr "ignorera ändringar i undermoduler när diffen skapas" -#: diff.c:5491 +#: diff.c:5494 msgid "<format>" msgstr "<format>" -#: diff.c:5492 +#: diff.c:5495 msgid "specify how differences in submodules are shown" msgstr "ange hur ändringar i undermoduler visas" -#: diff.c:5496 +#: diff.c:5499 msgid "hide 'git add -N' entries from the index" msgstr "dölj \"git add -N\"-poster från indexet" -#: diff.c:5499 +#: diff.c:5502 msgid "treat 'git add -N' entries as real in the index" msgstr "tolka \"git add -N\"-poster som äkta i indexet" -#: diff.c:5501 +#: diff.c:5504 msgid "<string>" msgstr "<sträng>" -#: diff.c:5502 +#: diff.c:5505 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:5505 +#: diff.c:5508 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -2946,94 +2956,94 @@ msgstr "" "se efter ändringar som ändrar antalet förekomster av angivet reguljärt " "uttryck" -#: diff.c:5508 +#: diff.c:5511 msgid "show all changes in the changeset with -S or -G" msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G" -#: diff.c:5511 +#: diff.c:5514 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:5514 +#: diff.c:5517 msgid "control the order in which files appear in the output" msgstr "styr ordningen i vilken filer visas i utdata" -#: diff.c:5515 +#: diff.c:5518 msgid "<object-id>" msgstr "<objekt-id>" -#: diff.c:5516 +#: diff.c:5519 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:5518 +#: diff.c:5521 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5522 msgid "select files by diff type" msgstr "välj filter efter diff-typ" -#: diff.c:5521 +#: diff.c:5524 msgid "<file>" msgstr "<fil>" -#: diff.c:5522 +#: diff.c:5525 msgid "Output to a specific file" msgstr "Skriv utdata till en specifik fil" -#: diff.c:6177 +#: diff.c:6180 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:6180 +#: diff.c:6183 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:6183 +#: diff.c:6186 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "" "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt." -#: dir.c:537 +#: dir.c:549 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer" -#: dir.c:926 +#: dir.c:938 #, c-format msgid "cannot use %s as an exclude file" msgstr "kan inte använda %s som exkluderingsfil" -#: dir.c:1843 +#: dir.c:1877 #, c-format msgid "could not open directory '%s'" msgstr "kunde inte öppna katalogen \"%s\"" -#: dir.c:2085 +#: dir.c:2128 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:2209 +#: dir.c:2252 msgid "untracked cache is disabled on this system or location" msgstr "ospårad cache är inaktiverad på systemet eller platsen" -#: dir.c:3013 +#: dir.c:3056 #, c-format msgid "index file corrupt in repo %s" msgstr "indexfilen trasig i arkivet %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3101 dir.c:3106 #, c-format msgid "could not create directories for %s" msgstr "kunde inte skapa kataloger för %s" -#: dir.c:3092 +#: dir.c:3135 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" @@ -3052,12 +3062,12 @@ msgstr "Filtrerar innehåll" msgid "could not stat file '%s'" msgstr "kunde inte ta status på filen \"%s\"" -#: environment.c:150 +#: environment.c:148 #, c-format msgid "bad git namespace path \"%s\"" msgstr "felaktig git-namnrymdssökväg \"%s\"" -#: environment.c:332 +#: environment.c:330 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "kunde inte ställa in GIT_DIR till \"%s\"" @@ -3067,158 +3077,154 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\"" msgid "too many args to run %s" msgstr "för många flaggor för att köra %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Fjärr utan URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\"" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "kunde inte skriva till fjärren" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc kräver \"multi_ack_detailed\"" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1280 #, c-format msgid "invalid shallow line: %s" msgstr "ogiltig \"shallow\"-rad: %s" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1286 #, c-format msgid "invalid unshallow line: %s" msgstr "ogiltig \"unshallow\"-rad: %s" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1288 #, c-format msgid "object not found: %s" msgstr "objektet hittades inte: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1291 #, c-format msgid "error in object: %s" msgstr "fel i objekt: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1293 #, c-format msgid "no shallow found: %s" msgstr "ingen \"shallow\" hittades: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1297 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "förväntade shallow/unshallow, fick %s" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "fick %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "ogiltig incheckning %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "ger upp" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:312 msgid "done" msgstr "klart" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "fick %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Markerar %s som komplett" -#: fetch-pack.c:744 +#: fetch-pack.c:742 #, c-format msgid "already have %s (%s)" msgstr "har redan %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:781 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare" -#: fetch-pack.c:791 +#: fetch-pack.c:789 msgid "protocol error: bad pack header" msgstr "protokollfel: felaktigt packhuvud" -#: fetch-pack.c:859 +#: fetch-pack.c:857 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-patch: kunde inte grena av %s" -#: fetch-pack.c:875 +#: fetch-pack.c:873 #, c-format msgid "%s failed" msgstr "%s misslyckades" -#: fetch-pack.c:877 +#: fetch-pack.c:875 msgid "error in sideband demultiplexer" msgstr "fel i sidbands-avmultiplexare" -#: fetch-pack.c:908 +#: fetch-pack.c:907 #, c-format msgid "Server version is %.*s" msgstr "Serverversionen är %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927 +#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943 +#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959 +#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981 #, c-format msgid "Server supports %s" msgstr "Servern stöder %s" -#: fetch-pack.c:915 +#: fetch-pack.c:914 msgid "Server does not support shallow clients" msgstr "Servern stöder inte klienter med grunda arkiv" -#: fetch-pack.c:975 +#: fetch-pack.c:974 msgid "Server does not support --shallow-since" msgstr "Servern stöder inte --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:979 msgid "Server does not support --shallow-exclude" msgstr "Servern stöder inte --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:983 msgid "Server does not support --deepen" msgstr "Servern stöder inte --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1000 msgid "no common commits" msgstr "inga gemensamma incheckningar" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1012 fetch-pack.c:1468 msgid "git fetch-pack: fetch failed." msgstr "git fetch-patch: hämtning misslyckades." -#: fetch-pack.c:1151 +#: fetch-pack.c:1150 msgid "Server does not support shallow requests" msgstr "Servern stöder inte grunda förfrågningar" @@ -3226,73 +3232,73 @@ msgstr "Servern stöder inte grunda förfrågningar" msgid "Server supports filter" msgstr "Servern stöder filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1180 msgid "unable to write request to remote" msgstr "kunde inte skriva anrop till fjärren" -#: fetch-pack.c:1202 +#: fetch-pack.c:1198 #, c-format msgid "error reading section header '%s'" msgstr "fel vid läsning av styckehuvudet \"%s\"" -#: fetch-pack.c:1208 +#: fetch-pack.c:1204 #, c-format msgid "expected '%s', received '%s'" msgstr "förväntade \"%s\", tog emot \"%s\"" -#: fetch-pack.c:1247 +#: fetch-pack.c:1243 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "förväntade bekräftelserad: \"%s\"" -#: fetch-pack.c:1252 +#: fetch-pack.c:1248 #, c-format msgid "error processing acks: %d" msgstr "fel vid hantering av bekräftelser: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1258 msgid "expected packfile to be sent after 'ready'" msgstr "väntade att paketfil skulle sändas efter \"ready\"" -#: fetch-pack.c:1264 +#: fetch-pack.c:1260 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:1306 +#: fetch-pack.c:1302 #, c-format msgid "error processing shallow info: %d" msgstr "fel vid hantering av grund (\"shallow\") info: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1349 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "förväntade wanted-ref, fick %s" -#: fetch-pack.c:1358 +#: fetch-pack.c:1354 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "oväntad wanted-ref: \"%s\"" -#: fetch-pack.c:1363 +#: fetch-pack.c:1359 #, c-format msgid "error processing wanted refs: %d" msgstr "fel vid hantering av önskade referenser: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1693 msgid "no matching remote head" msgstr "inget motsvarande fjärrhuvud" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1716 builtin/clone.c:685 msgid "remote did not send all necessary objects" msgstr "fjärren sände inte alla nödvändiga objekt" -#: fetch-pack.c:1739 +#: fetch-pack.c:1743 #, c-format msgid "no such remote ref %s" msgstr "ingen sådan fjärreferens: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1746 #, 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" @@ -3315,18 +3321,26 @@ msgstr "misslyckades skriva fristående signatur till \"%s\"" msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" -#: grep.c:2117 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -" +"P under PCRE v2" + +#: grep.c:2124 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:2145 +#: grep.c:2152 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" @@ -3469,12 +3483,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<flaggor>]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3547,41 +3561,56 @@ msgstr "namnet består enbart av ej tillåtna tecken: %s" msgid "invalid date format: %s" msgstr "felaktigt datumformat: %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "kunde inte läsa in rot-trädet för incheckningen %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "flera filterspecifikationer kan inte kombineras" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "kunde inte nå gles blob på \"%s\"" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "kunde inte tolka gles filterdata i %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "förväntade \"tree:<djup>\"" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "sparse:sökväg-filter stöds inte längre" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "felaktig filterspecifikation: \"%s\"" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "kan inte ändra kontraktsfjärr för delvis kloning" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "måste använda specialsekvens i delfilter-spec: \"%c\"" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "förväntade någonting efter combine:" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "flera filterspecifikationer kan inte kombineras" #: lockfile.c:151 #, c-format @@ -3612,121 +3641,117 @@ msgstr "Kunde inte skapa \"%s.lock\": %s" msgid "failed to read the cache" msgstr "misslyckades läsa cachen" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 +#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 +#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 #: builtin/stash.c:264 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: merge-recursive.c:322 +#: merge-recursive.c:367 msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "" "add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen." -#: merge-recursive.c:354 +#: merge-recursive.c:399 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar " "sammanslagningen." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "fel vid byggande av träd" - -#: merge-recursive.c:863 +#: merge-recursive.c:885 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:874 +#: merge-recursive.c:896 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:910 merge-recursive.c:929 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:897 +#: merge-recursive.c:919 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:960 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:941 +#: merge-recursive.c:965 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:965 +#: merge-recursive.c:990 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:976 +#: merge-recursive.c:1001 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:981 +#: merge-recursive.c:1006 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:1177 +#: merge-recursive.c:1199 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1206 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1213 #, 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:1199 merge-recursive.c:1211 +#: merge-recursive.c:1221 merge-recursive.c:1233 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Snabbspolar undermodulen %s till följande incheckning:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1224 merge-recursive.c:1236 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Snabbspolar undermodulen %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1259 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar " "hittades inte)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1263 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1264 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:1245 +#: merge-recursive.c:1267 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3743,32 +3768,32 @@ msgstr "" "\n" "vilket godtar lösningen.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1276 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "" "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1349 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:1332 +#: merge-recursive.c:1354 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1364 +#: merge-recursive.c:1386 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1387 +#: merge-recursive.c:1410 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället." -#: merge-recursive.c:1459 +#: merge-recursive.c:1482 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3777,7 +3802,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1464 +#: merge-recursive.c:1487 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3786,7 +3811,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet." -#: merge-recursive.c:1471 +#: merge-recursive.c:1494 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3795,7 +3820,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1499 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3804,40 +3829,40 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av " "%s lämnad i trädet vid %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1511 +#: merge-recursive.c:1534 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093 +#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Vägrar förlora lortig fil vid \"%s\"" -#: merge-recursive.c:1601 +#: merge-recursive.c:1624 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen." -#: merge-recursive.c:1659 +#: merge-recursive.c:1682 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1713 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1695 +#: merge-recursive.c:1718 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället" -#: merge-recursive.c:1714 +#: merge-recursive.c:1737 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3846,17 +3871,17 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1742 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1851 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3867,7 +3892,7 @@ msgstr "" "katalogen %s bytte namn till flera andra kataloger, utan att någon " "destination fick en majoritet av filerna." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3876,7 +3901,7 @@ 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:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3885,7 +3910,7 @@ 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:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3894,7 +3919,7 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog " "%s->%s i %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3903,52 +3928,52 @@ msgstr "" "VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har " "bytt namn." -#: merge-recursive.c:2937 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:2940 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:3004 +#: merge-recursive.c:3028 msgid "modify" msgstr "ändra" -#: merge-recursive.c:3004 +#: merge-recursive.c:3028 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:3016 +#: merge-recursive.c:3040 msgid "content" msgstr "innehåll" -#: merge-recursive.c:3020 +#: merge-recursive.c:3044 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:3043 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:3065 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:937 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:3066 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3096 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:3178 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -3957,7 +3982,7 @@ msgstr "" "Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; " "flyttar den till %s." -#: merge-recursive.c:3181 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -3966,7 +3991,7 @@ 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:3185 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -3975,7 +4000,7 @@ 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:3188 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -3984,227 +4009,227 @@ 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:3302 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:3325 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:3330 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:3337 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:3346 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:3355 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s" -#: merge-recursive.c:3393 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Dina lokala ändringar av följande filer skulle skrivas över av " -"sammanslagning:\n" -" %s" - -#: merge-recursive.c:3404 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Redan à jour!" -#: merge-recursive.c:3413 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:3512 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:3525 +#: merge-recursive.c:3550 #, 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:3564 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:3630 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Dina lokala ändringar av följande filer skulle skrivas över av " +"sammanslagning:\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "multi-pack-indexfilen %s är för liten" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-indexversionen %d stöds inte" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "hash-versionen %u stämmer inte" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "felaktigt offset för stycke (för stort)" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" -msgstr "avslutande multi-pack-index-stycke-ID förekommer tidigare än förväntat" +msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "multi-pack-index saknar krävd paketnamn-stycke" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "multi-pack-index saknar krävt OID-utbredningsstycke" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "multi-pack-index saknar krävt objekt-offsetstycke" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\"" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "bad pack-int-id: %u (%u paket totalt)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "fel när paketfiler från multi-pack-index skulle förberedas" -#: midx.c:470 +#: midx.c:469 #, c-format msgid "failed to add packfile '%s'" msgstr "misslyckades läsa paketfilen \"%s\"" -#: midx.c:476 +#: midx.c:475 #, c-format msgid "failed to open pack-index '%s'" msgstr "misslyckades öppna paketindexet \"%s\"" -#: midx.c:536 +#: midx.c:535 #, c-format msgid "failed to locate object %d in packfile" msgstr "misslyckades hitta objekt %d i paketfilen" -#: midx.c:865 +#: midx.c:864 #, c-format msgid "did not see pack-file %s to drop" msgstr "såg inte paketfilen %s som skulle kastas" -#: midx.c:1036 +#: midx.c:1035 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "misslyckades städa multi-pack-index på %s" -#: midx.c:1091 +#: midx.c:1090 msgid "Looking for referenced packfiles" msgstr "Ser efter refererade packfiler" -#: midx.c:1106 +#: midx.c:1105 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1110 +#: midx.c:1109 msgid "Verifying OID order in MIDX" msgstr "Bekräftar OID-ordning i MIDX" -#: midx.c:1119 +#: midx.c:1118 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1137 msgid "Sorting objects by packfile" msgstr "Sorterar objekt efter packfil" -#: midx.c:1144 +#: midx.c:1143 msgid "Verifying object offsets" msgstr "Bekräftar offset för objekt" -#: midx.c:1160 +#: midx.c:1159 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "misslyckades läsa paketpost för oid[%d] = %s" -#: midx.c:1166 +#: midx.c:1165 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "misslyckades läsa paketindex för paketfil %s" -#: midx.c:1175 +#: midx.c:1174 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1349 msgid "could not start pack-objects" msgstr "kunde inte starta pack-objects" -#: midx.c:1369 +#: midx.c:1368 msgid "could not finish pack-objects" msgstr "kunde inte avsluta pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "misslyckades skapa lazy_dir-tråd: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "misslyckades skapa lazy_name-tråd: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "misslyckades utföra join på lazy_name-tråd: %s" @@ -4249,41 +4274,41 @@ 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.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "ogiltig objekttyp \"%s\"" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "objektet %s är en %s, inte en %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "objektet %s har okänd typ-id %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:277 #, c-format msgid "hash mismatch %s" msgstr "hashvärde stämmer inte överens %s" -#: packfile.c:648 +#: packfile.c:641 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: packfile.c:1899 +#: packfile.c:1887 #, 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:1903 +#: packfile.c:1891 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -4328,26 +4353,26 @@ msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)" msgid "did you mean `--%s` (with two dashes ?)" msgstr "menade du \"--%s\" (med två bindestreck?)" -#: parse-options.c:859 +#: parse-options.c:860 #, c-format msgid "unknown option `%s'" msgstr "okänd flagga \"%s\"" -#: parse-options.c:861 +#: parse-options.c:862 #, c-format msgid "unknown switch `%c'" msgstr "okänd flagga \"%c\"" -#: parse-options.c:863 +#: parse-options.c:864 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "okänd icke-ascii-flagga i strängen: \"%s\"" -#: parse-options.c:887 +#: parse-options.c:888 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:907 #, c-format msgid "usage: %s" msgstr "användning: %s" @@ -4355,21 +4380,21 @@ msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:913 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:915 +#: parse-options.c:916 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:955 msgid "-NUM" msgstr "-TAL" -#: parse-options.c:968 +#: parse-options.c:969 #, c-format msgid "alias of --%s" msgstr "alias för --%s" @@ -4538,29 +4563,38 @@ msgstr "kunde inte skapa trådad lstat: %s" msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: range-diff.c:70 +#: promisor-remote.c:25 +msgid "Remote with no URL" +msgstr "Fjärr utan URL" + +#: promisor-remote.c:61 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "kontraktsfjärr kan inte börja med \"/\": %s" + +#: range-diff.c:71 msgid "could not start `log`" msgstr "kunde inte starta \"log\"" -#: range-diff.c:72 +#: range-diff.c:73 msgid "could not read `log` output" msgstr "kunde inte läsa utdata från \"log\"" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:92 sequencer.c:4985 #, c-format msgid "could not parse commit '%s'" msgstr "kunde inte tolka incheckningen \"%s\"" -#: range-diff.c:117 +#: range-diff.c:118 #, c-format msgid "could not parse git header '%.*s'" msgstr "kunde inte tolka git-huvudet \"%.*s\"" -#: range-diff.c:274 +#: range-diff.c:275 msgid "failed to generate diff" msgstr "misslyckades skapa diff" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:507 range-diff.c:509 #, c-format msgid "could not parse log for '%s'" msgstr "kunde inte tolka loggen för \"%s\"" @@ -4605,11 +4639,11 @@ msgstr "kan inte ta status på \"%s\"" msgid "'%s' appears as both a file and as a directory" msgstr "\"%s\" finns både som en fil och en katalog" -#: read-cache.c:1499 +#: read-cache.c:1520 msgid "Refresh index" msgstr "Uppdatera indexet" -#: read-cache.c:1613 +#: read-cache.c:1635 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4618,7 +4652,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1623 +#: read-cache.c:1645 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4627,138 +4661,138 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1679 +#: read-cache.c:1701 #, c-format msgid "bad signature 0x%08x" msgstr "felaktig signatur 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1704 #, c-format msgid "bad index version %d" msgstr "felaktig indexversion %d" -#: read-cache.c:1691 +#: read-cache.c:1713 msgid "bad index file sha1 signature" msgstr "felaktig sha1-signatur för indexfil" -#: read-cache.c:1721 +#: read-cache.c:1743 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "index använder filtillägget %.4s, vilket vi inte förstår" -#: read-cache.c:1723 +#: read-cache.c:1745 #, c-format msgid "ignoring %.4s extension" msgstr "ignorerar filtillägget %.4s" -#: read-cache.c:1760 +#: read-cache.c:1782 #, c-format msgid "unknown index entry format 0x%08x" msgstr "okänt format 0x%08x på indexpost" -#: read-cache.c:1776 +#: read-cache.c:1798 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "felformat namnfält i indexet, nära sökvägen \"%s\"" -#: read-cache.c:1833 +#: read-cache.c:1855 msgid "unordered stage entries in index" msgstr "osorterade köposter i index" -#: read-cache.c:1836 +#: read-cache.c:1858 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "flera köposter för den sammanslagna filen \"%s\"" -#: read-cache.c:1839 +#: read-cache.c:1861 #, c-format msgid "unordered stage entries for '%s'" msgstr "osorterade köposter för \"%s\"" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 +#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 +#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 +#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 #: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 #: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 msgid "index file corrupt" msgstr "indexfilen trasig" -#: read-cache.c:2087 +#: read-cache.c:2108 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "kunde inte läsa in cache_entries-tråden: %s" -#: read-cache.c:2100 +#: read-cache.c:2121 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "kunde inte utföra join på cache_entries-tråden: %s" -#: read-cache.c:2133 +#: read-cache.c:2154 #, c-format msgid "%s: index file open failed" msgstr "%s: öppning av indexfilen misslyckades" -#: read-cache.c:2137 +#: read-cache.c:2158 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: kan inte ta startus på det öppna indexet" -#: read-cache.c:2141 +#: read-cache.c:2162 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: indexfilen mindre än förväntat" -#: read-cache.c:2145 +#: read-cache.c:2166 #, c-format msgid "%s: unable to map index file" msgstr "%s: kan inte koppla indexfilen" -#: read-cache.c:2187 +#: read-cache.c:2208 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "kunde inte skapa load_index_extensions-tråden: %s" -#: read-cache.c:2214 +#: read-cache.c:2235 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "kunde inte utföra join på load_index_extensions-tråden: %s" -#: read-cache.c:2246 +#: read-cache.c:2267 #, c-format msgid "could not freshen shared index '%s'" msgstr "kunde inte uppdatera delat index \"%s\"" -#: read-cache.c:2293 +#: read-cache.c:2314 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "trasigt index, förväntade %s i %s, fick %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 #, c-format msgid "could not stat '%s'" msgstr "kunde inte ta status på \"%s\"" -#: read-cache.c:3105 +#: read-cache.c:3126 #, c-format msgid "unable to open git dir: %s" msgstr "kunde inte öppna git-katalog: %s" -#: read-cache.c:3117 +#: read-cache.c:3138 #, c-format msgid "unable to unlink: %s" msgstr "misslyckades ta bort länken: %s" -#: read-cache.c:3142 +#: read-cache.c:3163 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "kan inte rätta behörighetsbitar på \"%s\"" -#: read-cache.c:3291 +#: read-cache.c:3312 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: kan inte återgå till kö 0" @@ -4866,8 +4900,8 @@ msgstr "" msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388 +#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235 #, c-format msgid "could not write '%s'" msgstr "kunde inte skriva \"%s\"" @@ -4916,7 +4950,7 @@ msgstr "\"%s\" pekar inte på ett giltigt objekt!" msgid "ignoring dangling symref %s" msgstr "ignorerar dinglande symbolisk referens %s" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" @@ -4941,14 +4975,14 @@ msgstr "referensen \"%s\" finns redan" msgid "unexpected object ID when writing '%s'" msgstr "oväntat objekt-id vid skrivning \"%s\"" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 +#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 +#: builtin/rebase.c:1004 #, c-format msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" @@ -4983,21 +5017,21 @@ msgstr "vägrar uppdatera referens med trasigt namn \"%s\"" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref misslyckades för referensen \"%s\": %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "flera uppdateringar för referensen \"%s\" tillåts inte" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "referensuppdateringar förbjudna i karantänmiljö" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "\"%s\" finns; kan inte skapa \"%s\"" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" @@ -5007,13 +5041,13 @@ msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt" msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "kunde inte ta bort referensen %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1251 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "kunde inte ta bort referenser: %s" @@ -5023,7 +5057,7 @@ msgstr "kunde inte ta bort referenser: %s" msgid "invalid refspec '%s'" msgstr "felaktig referensspecifikation: \"%s\"" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "försvunnen" @@ -5042,281 +5076,281 @@ msgstr "bakom %d" msgid "ahead %d, behind %d" msgstr "före %d, bakom %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Heltalsvärde förväntades refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Heltalsvärde förväntades refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "okänt %%(%s)-argument: %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) tar inte argument" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "okänt %%(objectsize)-argument: %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) tar inte argument" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "okänt %%(trailers)-argument: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "positivt värde förväntat objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "okänt %%(if)-argument: %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" msgstr "" "inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "format: atomen %%(if) använd utan en %%(then)-atom" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "format: atomen %%(then) använd utan en %%(if)-atom" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "format: atomen %%(then) använd mer än en gång" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "format: atomen %%(then) använd efter %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "format: atomen %%(else) använd utan en %%(if)-atom" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "format: atomen %%(else) använd utan en %%(then)-atom" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "format: atomen %%(else) använd mer än en gång" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "ingen gren, ombaserar %s" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "ingen gren, ombaserar frånkopplat HEAD %s" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "ingen gren, \"bisect\" startad på %s" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "ingen gren" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "flaggan \"%s\" är inkompatibel med --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "flaggan \"%s\" är inkompatibel med --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "flaggan \"%s\" måste peka på en incheckning" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s" -#: remote.c:410 +#: remote.c:413 msgid "more than one receivepack given, using the first" msgstr "mer än en receivepack angavs, använder den första" -#: remote.c:418 +#: remote.c:421 msgid "more than one uploadpack given, using the first" msgstr "mer än en uploadpack angavs, använder den första" -#: remote.c:608 +#: remote.c:611 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Kan inte hämta både %s och %s till %s" -#: remote.c:612 +#: remote.c:615 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:616 +#: remote.c:619 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:684 +#: remote.c:687 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:694 +#: remote.c:697 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\"" -#: remote.c:1000 +#: remote.c:1003 #, c-format msgid "src refspec %s does not match any" msgstr "käll-referensspecifikationen %s motsvarar ingen" -#: remote.c:1005 +#: remote.c:1008 #, c-format msgid "src refspec %s matches more than one" msgstr "käll-referensspecifikationen %s motsvarar mer än en" @@ -5325,7 +5359,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1023 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5348,7 +5382,7 @@ msgstr "" "\n" "Inget av dem fungerade, så vi gav upp. Ange fullständig referens." -#: remote.c:1040 +#: remote.c:1043 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5359,7 +5393,7 @@ msgstr "" "Var det meningen att skapa en ny gren genom att sända\n" "till \"%s:refs/heads/%s\"?" -#: remote.c:1045 +#: remote.c:1048 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5370,7 +5404,7 @@ msgstr "" "Var det meningen att skapa en ny tagg genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1050 +#: remote.c:1053 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5381,7 +5415,7 @@ msgstr "" "Var det meningen att tagga ett nytt träd genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1055 +#: remote.c:1058 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5392,114 +5426,114 @@ msgstr "" "Var det meningen att tagga en ny blob genom att sända\n" "till \"%s:refs/tags/%s\"?" -#: remote.c:1091 +#: remote.c:1094 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s kan inte slås upp till en gren" -#: remote.c:1102 +#: remote.c:1105 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte" -#: remote.c:1114 +#: remote.c:1117 #, c-format msgid "dst refspec %s matches more than one" msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en" -#: remote.c:1121 +#: remote.c:1124 #, 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:1624 remote.c:1725 +#: remote.c:1627 remote.c:1728 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1633 +#: remote.c:1636 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1636 +#: remote.c:1639 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1642 +#: remote.c:1645 #, 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:1657 +#: remote.c:1660 #, 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:1669 +#: remote.c:1672 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1679 +#: remote.c:1682 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1692 +#: remote.c:1695 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1714 +#: remote.c:1717 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:1840 +#: remote.c:1843 #, c-format msgid "couldn't find remote ref %s" msgstr "Kunde inte hitta fjärr-referensen %s" -#: remote.c:1853 +#: remote.c:1856 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignorerar märklig referens \"%s\" lokalt" -#: remote.c:2016 +#: remote.c:2019 #, 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:2020 +#: remote.c:2023 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2023 +#: remote.c:2026 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2027 +#: remote.c:2030 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n" -#: remote.c:2030 +#: remote.c:2033 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (använd \"%s\" för detaljer)\n" -#: remote.c:2034 +#: remote.c:2037 #, 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:2040 +#: remote.c:2043 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:2043 +#: remote.c:2046 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5509,11 +5543,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2051 +#: remote.c:2054 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:2054 +#: remote.c:2057 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5528,11 +5562,11 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2064 +#: remote.c:2067 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:2247 +#: remote.c:2250 #, c-format msgid "cannot parse expected object name '%s'" msgstr "kan inte tolka förväntat objektnamn \"%s\"" @@ -5645,20 +5679,20 @@ msgstr "Glömde lösning för \"%s\"\n" msgid "unable to open rr-cache directory" msgstr "kan inte uppdatera katalogen rr-cache" -#: revision.c:2507 +#: revision.c:2509 msgid "your current branch appears to be broken" msgstr "din nuvarande gren verkar vara trasig" -#: revision.c:2510 +#: revision.c:2512 #, 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:2710 +#: revision.c:2720 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: revision.c:2714 +#: revision.c:2724 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" @@ -5680,29 +5714,29 @@ msgstr "" "Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n" "Du kan inaktivera varningen med \"git config advice.ignoredHook false\"." -#: send-pack.c:141 +#: send-pack.c:142 msgid "unexpected flush packet while reading remote unpack status" msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus" -#: send-pack.c:143 +#: send-pack.c:144 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "kunde inte tolka fjärruppackningsstatus: %s" -#: send-pack.c:145 +#: send-pack.c:146 #, c-format msgid "remote unpack failed: %s" msgstr "fjärruppackning misslyckades: %s" -#: send-pack.c:306 +#: send-pack.c:307 msgid "failed to sign the push certificate" msgstr "misslyckades underteckna push-certifikatet" -#: send-pack.c:420 +#: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "mottagarsidan stöder inte push med --signed" -#: send-pack.c:422 +#: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5710,11 +5744,11 @@ msgstr "" "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --" "signed" -#: send-pack.c:434 +#: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "mottagarsidan stöder inte push med --atomic" -#: send-pack.c:439 +#: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" @@ -5728,7 +5762,7 @@ msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\"" msgid "could not delete '%s'" msgstr "kunde inte ta bort \"%s\"" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369 #, c-format msgid "could not remove '%s'" msgstr "kunde inte ta bort \"%s\"" @@ -5768,7 +5802,7 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:401 sequencer.c:2847 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" @@ -5778,15 +5812,15 @@ msgstr "kunde inte låsa \"%s\"" msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 +#: sequencer.c:3130 #, c-format msgid "failed to finalize '%s'" msgstr "misslyckades färdigställa \"%s\"" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 +#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 +#: builtin/rebase.c:568 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" @@ -5813,70 +5847,65 @@ msgstr "Felaktigt städningsläge %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. -#: sequencer.c:632 +#: sequencer.c:631 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:649 +#: sequencer.c:648 msgid "unable to update cache tree" msgstr "kan inte uppdatera cacheträd" -#: sequencer.c:663 +#: sequencer.c:662 msgid "could not resolve HEAD commit" msgstr "kunde inte bestämma HEAD:s incheckning" -#: sequencer.c:743 +#: sequencer.c:742 #, c-format msgid "no key present in '%.*s'" msgstr "ingen nyckel i \"%.*s\"" -#: sequencer.c:754 +#: sequencer.c:753 #, c-format msgid "unable to dequote value of '%s'" msgstr "kan inte ta bort citering av värdet \"%s\"" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 +#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: sequencer.c:801 +#: sequencer.c:800 msgid "'GIT_AUTHOR_NAME' already given" msgstr "\"GIT_AUTHOR_NAME\" har redan angivits" -#: sequencer.c:806 +#: sequencer.c:805 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits" -#: sequencer.c:811 +#: sequencer.c:810 msgid "'GIT_AUTHOR_DATE' already given" msgstr "\"GIT_AUTHOR_DATE\" har redan angivits" -#: sequencer.c:815 +#: sequencer.c:814 #, c-format msgid "unknown variable '%s'" msgstr "okänd variabel \"%s\"" -#: sequencer.c:820 +#: sequencer.c:819 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "\"GIT_AUTHOR_NAME\" saknas" -#: sequencer.c:822 +#: sequencer.c:821 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "\"GIT_AUTHOR_EMAIL\" saknas" -#: sequencer.c:824 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "\"GIT_AUTHOR_DATE\" saknas" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "ogiltigt datumformat \"%s\" i \"%s\"" - -#: sequencer.c:901 +#: sequencer.c:872 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -5905,15 +5934,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "skriver rotincheckning" - -#: sequencer.c:1216 +#: sequencer.c:1146 msgid "'prepare-commit-msg' hook failed" msgstr "kroken \"prepare-commit-msg\" misslyckades" -#: sequencer.c:1223 +#: sequencer.c:1153 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5940,7 +5965,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1166 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -5965,327 +5990,327 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1208 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: sequencer.c:1280 +#: sequencer.c:1210 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: sequencer.c:1326 +#: sequencer.c:1256 msgid "unable to resolve HEAD after creating commit" msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning" -#: sequencer.c:1328 +#: sequencer.c:1258 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: sequencer.c:1332 +#: sequencer.c:1262 msgid " (root-commit)" msgstr " (rotincheckning)" -#: sequencer.c:1353 +#: sequencer.c:1283 msgid "could not parse HEAD" msgstr "kunde inte tolka HEAD" -#: sequencer.c:1355 +#: sequencer.c:1285 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s är inte en incheckning!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1289 builtin/commit.c:1571 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1341 sequencer.c:1933 msgid "unable to parse commit author" msgstr "kunde inte tolka incheckningens författare" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1369 sequencer.c:1429 #, c-format msgid "unable to read commit message from '%s'" msgstr "kunde inte läsa incheckningsmeddelande från \"%s\"" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 +#: builtin/merge.c:908 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: sequencer.c:1526 +#: sequencer.c:1456 #, c-format msgid "could not parse commit %s" msgstr "kunde inte tolka incheckningen %s" -#: sequencer.c:1531 +#: sequencer.c:1461 #, c-format msgid "could not parse parent commit %s" msgstr "kunde inte tolka föräldraincheckningen %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1535 sequencer.c:1645 #, c-format msgid "unknown command: %d" msgstr "okänt kommando: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1592 sequencer.c:1617 #, c-format msgid "This is a combination of %d commits." msgstr "Det här är en kombination av %d incheckningar." -#: sequencer.c:1672 +#: sequencer.c:1602 msgid "need a HEAD to fixup" msgstr "behöver en HEAD-incheckning att rätta" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1604 sequencer.c:3157 msgid "could not read HEAD" msgstr "kunde inte läsa HEAD" -#: sequencer.c:1676 +#: sequencer.c:1606 msgid "could not read HEAD's commit message" msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" -#: sequencer.c:1682 +#: sequencer.c:1612 #, c-format msgid "cannot write '%s'" msgstr "kan inte skriva \"%s\"" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Det här är 1:a incheckningsmeddelandet:" -#: sequencer.c:1697 +#: sequencer.c:1627 #, c-format msgid "could not read commit message of %s" msgstr "kunde inte läsa incheckningsmeddelande för %s" -#: sequencer.c:1704 +#: sequencer.c:1634 #, c-format msgid "This is the commit message #%d:" msgstr "Det här är incheckningsmeddelande %d:" -#: sequencer.c:1710 +#: sequencer.c:1640 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Incheckningsmeddelande %d kommer hoppas över:" -#: sequencer.c:1798 +#: sequencer.c:1728 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:1805 +#: sequencer.c:1735 msgid "cannot fixup root commit" msgstr "kan inte göra \"fixup\" på rotincheckning" -#: sequencer.c:1824 +#: sequencer.c:1754 #, 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:1832 sequencer.c:1840 +#: sequencer.c:1762 sequencer.c:1770 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:1846 +#: sequencer.c:1776 #, 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:1865 +#: sequencer.c:1795 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:1930 +#: sequencer.c:1860 #, c-format msgid "could not rename '%s' to '%s'" msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:1985 +#: sequencer.c:1915 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1916 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1983 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:2052 +#: sequencer.c:1990 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:2128 +#: sequencer.c:2066 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s tar inte argument: \"%s\"" -#: sequencer.c:2137 +#: sequencer.c:2075 #, c-format msgid "missing arguments for %s" msgstr "argument saknas för %s" -#: sequencer.c:2174 +#: sequencer.c:2112 #, c-format msgid "could not parse '%.*s'" msgstr "kunde inte tolka \"%.*s\"" -#: sequencer.c:2228 +#: sequencer.c:2166 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2177 #, c-format msgid "cannot '%s' without a previous commit" msgstr "kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 +#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 #: builtin/rebase.c:204 builtin/rebase.c:229 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:2323 +#: sequencer.c:2261 msgid "cancelling a cherry picking in progress" msgstr "avbryter pågående \"cherry-pick\"" -#: sequencer.c:2330 +#: sequencer.c:2268 msgid "cancelling a revert in progress" msgstr "avbryter pågående \"revert\"" -#: sequencer.c:2364 +#: sequencer.c:2302 msgid "please fix this using 'git rebase --edit-todo'." msgstr "rätta det med \"git rebase --edit-todo\"." -#: sequencer.c:2366 +#: sequencer.c:2304 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: \"%s\"" -#: sequencer.c:2371 +#: sequencer.c:2309 msgid "no commits parsed." msgstr "inga incheckningar lästes." -#: sequencer.c:2382 +#: sequencer.c:2320 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:2384 +#: sequencer.c:2322 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:2466 +#: sequencer.c:2404 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2491 msgid "unusable squash-onto" msgstr "oanvändbar squash-onto" -#: sequencer.c:2569 +#: sequencer.c:2507 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: \"%s\"" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2590 sequencer.c:4308 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:2668 +#: sequencer.c:2606 msgid "revert is already in progress" msgstr "en \"revert\" pågår redan" -#: sequencer.c:2670 +#: sequencer.c:2608 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "testa \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2611 msgid "cherry-pick is already in progress" msgstr "en \"cherry-pick\" pågår redan" -#: sequencer.c:2675 +#: sequencer.c:2613 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2627 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:2704 +#: sequencer.c:2642 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2702 sequencer.c:4057 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2704 sequencer.c:2715 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2706 sequencer.c:2750 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:2798 builtin/grep.c:734 +#: sequencer.c:2736 builtin/grep.c:736 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:2800 +#: sequencer.c:2738 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:2801 +#: sequencer.c:2739 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:2807 +#: sequencer.c:2745 #, 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:2818 +#: sequencer.c:2756 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:2859 +#: sequencer.c:2797 msgid "no revert in progress" msgstr "ingen \"revers\" pågår" -#: sequencer.c:2867 +#: sequencer.c:2805 msgid "no cherry-pick in progress" msgstr "ingen \"cherry-pick\" pågår" -#: sequencer.c:2877 +#: sequencer.c:2815 msgid "failed to skip the commit" msgstr "kunde inte hoppa över incheckningen" -#: sequencer.c:2884 +#: sequencer.c:2822 msgid "there is nothing to skip" msgstr "ingenting att hoppa över" -#: sequencer.c:2887 +#: sequencer.c:2825 #, c-format msgid "" "have you committed already?\n" @@ -6294,21 +6319,21 @@ msgstr "" "har du redan checkat in?\n" "testa \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:2949 sequencer.c:3969 #, c-format msgid "could not update %s" msgstr "kunde inte uppdatera %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:2987 sequencer.c:3949 msgid "cannot read HEAD" msgstr "kan inte läsa HEAD" -#: sequencer.c:3066 +#: sequencer.c:3004 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "kan inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3074 +#: sequencer.c:3012 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6327,27 +6352,27 @@ msgstr "" "\n" "\tgit rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3022 #, c-format msgid "Could not apply %s... %.*s" msgstr "Kunde inte tillämpa %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3029 #, c-format msgid "Could not merge %.*s" msgstr "Kunde inte slå ihop %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "kunde inte kopiera in \"%s\" till \"%s\"" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 +#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 +#: builtin/rebase.c:1987 builtin/rebase.c:2031 msgid "could not read index" msgstr "kunde inte läsa indexet" -#: sequencer.c:3136 +#: sequencer.c:3074 #, c-format msgid "" "execution failed: %s\n" @@ -6362,11 +6387,11 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3080 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:3148 +#: sequencer.c:3086 #, c-format msgid "" "execution succeeded: %s\n" @@ -6383,76 +6408,76 @@ msgstr "" "\tgit rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3147 #, c-format msgid "illegal label name: '%.*s'" msgstr "ogiltigt etikettnamn: \"%.*s\"" -#: sequencer.c:3263 +#: sequencer.c:3201 msgid "writing fake root commit" msgstr "skriver fejkad rotincheckning" -#: sequencer.c:3268 +#: sequencer.c:3206 msgid "writing squash-onto" msgstr "skriver squash-onto" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861 #, c-format msgid "failed to find tree of %s" msgstr "kunde inte hitta trädet för %s." -#: sequencer.c:3324 builtin/rebase.c:873 +#: sequencer.c:3262 builtin/rebase.c:874 msgid "could not write index" msgstr "kunde inte skriva indexet" -#: sequencer.c:3351 +#: sequencer.c:3289 #, c-format msgid "could not resolve '%s'" msgstr "kunde inte upplösa \"%s\"" -#: sequencer.c:3379 +#: sequencer.c:3320 msgid "cannot merge without a current revision" msgstr "kan inte slå ihop utan en aktuell incheckning" -#: sequencer.c:3401 +#: sequencer.c:3342 #, c-format msgid "unable to parse '%.*s'" msgstr "kan inte tolka \"%.*s\"" -#: sequencer.c:3410 +#: sequencer.c:3351 #, c-format msgid "nothing to merge: '%.*s'" msgstr "inget att slå samman: \"%.*s\"" -#: sequencer.c:3422 +#: sequencer.c:3363 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:3437 +#: sequencer.c:3378 #, c-format msgid "could not get commit message of '%s'" msgstr "kunde inte läsa incheckningsmeddelande för \"%s\"" -#: sequencer.c:3590 +#: sequencer.c:3538 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "kunde inte ens försöka slå ihop \"%.*s\"" -#: sequencer.c:3606 +#: sequencer.c:3554 msgid "merge: Unable to write new index file" msgstr "sammanslagning: Kunde inte skriva ny indexfil" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3623 builtin/rebase.c:712 #, c-format msgid "Applied autostash.\n" msgstr "Tillämpade autostash.\n" -#: sequencer.c:3687 +#: sequencer.c:3635 #, c-format msgid "cannot store %s" msgstr "kan inte spara %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6463,31 +6488,31 @@ 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:3751 +#: sequencer.c:3699 #, c-format msgid "could not checkout %s" msgstr "kunde inte checka ut %s" -#: sequencer.c:3765 +#: sequencer.c:3713 #, c-format msgid "%s: not a valid OID" msgstr "%s: inte ett giltigt OID" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3718 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: sequencer.c:3785 +#: sequencer.c:3733 #, c-format msgid "Stopped at HEAD\n" msgstr "Stoppade på HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3735 #, c-format msgid "Stopped at %s\n" msgstr "Stoppade på %s\n" -#: sequencer.c:3795 +#: sequencer.c:3743 #, c-format msgid "" "Could not execute the todo command\n" @@ -6508,48 +6533,48 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3827 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Stoppade på %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3898 #, c-format msgid "unknown command %d" msgstr "okänt kommando %d" -#: sequencer.c:4003 +#: sequencer.c:3957 msgid "could not read orig-head" msgstr "kunde inte läsa orig-head" -#: sequencer.c:4008 +#: sequencer.c:3962 msgid "could not read 'onto'" msgstr "kunde inte läsa \"onto\"" -#: sequencer.c:4022 +#: sequencer.c:3976 #, c-format msgid "could not update HEAD to %s" msgstr "kunde inte uppdatera HEAD till %s" -#: sequencer.c:4115 +#: sequencer.c:4069 msgid "cannot rebase: You have unstaged changes." msgstr "kan inte ombasera: Du har oköade ändringar." -#: sequencer.c:4124 +#: sequencer.c:4078 msgid "cannot amend non-existing commit" msgstr "kan inte lägga till incheckning som inte finns" -#: sequencer.c:4126 +#: sequencer.c:4080 #, c-format msgid "invalid file: '%s'" msgstr "ogiltig fil: \"%s\"" -#: sequencer.c:4128 +#: sequencer.c:4082 #, c-format msgid "invalid contents: '%s'" msgstr "ogiltigt innehåll: \"%s\"" -#: sequencer.c:4131 +#: sequencer.c:4085 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6559,42 +6584,42 @@ 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:4167 sequencer.c:4205 +#: sequencer.c:4121 sequencer.c:4159 #, c-format msgid "could not write file: '%s'" msgstr "kunde inte skriva fil: \"%s\"" -#: sequencer.c:4220 +#: sequencer.c:4174 msgid "could not remove CHERRY_PICK_HEAD" msgstr "kunde inte ta bort CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4181 msgid "could not commit staged changes." msgstr "kunde inte checka in köade ändringar." -#: sequencer.c:4328 +#: sequencer.c:4285 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:4332 +#: sequencer.c:4289 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:4367 +#: sequencer.c:4324 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" -#: sequencer.c:4810 +#: sequencer.c:4774 msgid "make_script: unhandled options" msgstr "make_script: flaggor som inte stöds" -#: sequencer.c:4813 +#: sequencer.c:4777 msgid "make_script: error preparing revisions" msgstr "make_script: fel när revisioner skulle förberedas" -#: sequencer.c:4971 +#: sequencer.c:4935 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -6604,24 +6629,24 @@ msgstr "" "continue\".\n" "Avbryt ombaseringen med \"git rebase --abort\".\n" -#: sequencer.c:5083 sequencer.c:5100 +#: sequencer.c:5047 sequencer.c:5064 msgid "nothing to do" msgstr "inget att göra" -#: sequencer.c:5114 +#: sequencer.c:5078 msgid "could not skip unnecessary pick commands" msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon" -#: sequencer.c:5197 +#: sequencer.c:5166 msgid "the script was already rearranged." msgstr "skriptet har redan omordnats." -#: setup.c:123 +#: setup.c:124 #, c-format msgid "'%s' is outside repository" msgstr "\"%s\" är utanför arkivet" -#: setup.c:173 +#: setup.c:174 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6631,7 +6656,7 @@ msgstr "" "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns " "lokalt." -#: setup.c:186 +#: setup.c:187 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6643,12 +6668,12 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:235 +#: setup.c:236 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor" -#: setup.c:254 +#: setup.c:255 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6659,92 +6684,92 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:390 +#: setup.c:391 msgid "unable to set up work tree using invalid config" msgstr "kan inte skapa arbetskatalog med felaktig konfiguration" -#: setup.c:394 +#: setup.c:395 msgid "this operation must be run in a work tree" msgstr "funktionen måste köras i en arbetskatalog" -#: setup.c:540 +#: setup.c:541 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:548 +#: setup.c:549 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:567 +#: setup.c:568 #, c-format msgid "error opening '%s'" msgstr "fel vid öppning av \"%s\"" -#: setup.c:569 +#: setup.c:570 #, c-format msgid "too large to be a .git file: '%s'" msgstr "för stor för att vara en .git-fil: \"%s\"" -#: setup.c:571 +#: setup.c:572 #, c-format msgid "error reading %s" msgstr "fel vid läsning av %s" -#: setup.c:573 +#: setup.c:574 #, c-format msgid "invalid gitfile format: %s" msgstr "ogiltigt gitfilformat: %s" -#: setup.c:575 +#: setup.c:576 #, c-format msgid "no path in gitfile: %s" msgstr "ingen sökväg i gitfil: %s" -#: setup.c:577 +#: setup.c:578 #, c-format msgid "not a git repository: %s" msgstr "inte ett git-arkiv: %s" -#: setup.c:676 +#: setup.c:677 #, c-format msgid "'$%s' too big" msgstr "\"$%s\" för stor" -#: setup.c:690 +#: setup.c:691 #, c-format msgid "not a git repository: '%s'" msgstr "inte ett git-arkiv: \"%s\"" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:720 setup.c:722 setup.c:753 #, c-format msgid "cannot chdir to '%s'" msgstr "kan inte byta katalog (chdir) till \"%s\"" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 msgid "cannot come back to cwd" msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:851 +#: setup.c:852 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "misslyckades ta status på \"%*ss%s%s\"" -#: setup.c:1083 +#: setup.c:1090 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:1092 setup.c:1098 +#: setup.c:1099 setup.c:1105 #, c-format msgid "cannot change to '%s'" msgstr "kan inte byta till \"%s\"" -#: setup.c:1103 +#: setup.c:1110 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s" -#: setup.c:1109 +#: setup.c:1116 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6754,7 +6779,7 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:1220 +#: setup.c:1227 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6763,76 +6788,76 @@ msgstr "" "problem med filläges-värdet i core.sharedRepository (0%.3o).\n" "Ägaren av filerna måste alltid ha läs- och skrivbehörighet." -#: setup.c:1264 +#: setup.c:1271 msgid "open /dev/null or dup failed" msgstr "misslyckades öppna /dev/null eller \"dup\"" -#: setup.c:1279 +#: setup.c:1286 msgid "fork failed" msgstr "\"fork\" misslyckades" -#: setup.c:1284 +#: setup.c:1291 msgid "setsid failed" msgstr "\"setsid\" misslyckades" -#: sha1-file.c:453 +#: sha1-file.c:452 #, 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:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "kunde inte normalisera alternativ objektsökväg: %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "kan inte normalisera objektkatalogen: %s" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\"" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "kan inte läsa \"alternates\"-filen" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "kan inte flytta ny \"alternates\"-fil på plats" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1-file.c:712 +#: sha1-file.c:711 #, 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:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "felaktig rad vid tolkning av alternativa referenser: %s" @@ -6842,204 +6867,204 @@ msgstr "felaktig rad vid tolkning av alternativa referenser: %s" 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:968 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap misslyckades" -#: sha1-file.c:1132 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "objektfilen %s är tom" -#: sha1-file.c:1256 sha1-file.c:2395 +#: sha1-file.c:1252 sha1-file.c:2392 #, c-format msgid "corrupt loose object '%s'" msgstr "trasigt löst objekt \"%s\"" -#: sha1-file.c:1258 sha1-file.c:2399 +#: sha1-file.c:1254 sha1-file.c:2396 #, c-format msgid "garbage at end of loose object '%s'" msgstr "skräp i slutet av löst objekt \"%s\"" -#: sha1-file.c:1300 +#: sha1-file.c:1296 msgid "invalid object type" msgstr "felaktig objekttyp" -#: sha1-file.c:1384 +#: sha1-file.c:1380 #, 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:1387 +#: sha1-file.c:1383 #, c-format msgid "unable to unpack %s header" msgstr "kan inte packa upp %s-huvudet" -#: sha1-file.c:1393 +#: sha1-file.c:1389 #, 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:1396 +#: sha1-file.c:1392 #, c-format msgid "unable to parse %s header" msgstr "kan inte tolka %s-huvud" -#: sha1-file.c:1587 +#: sha1-file.c:1584 #, c-format msgid "failed to read object %s" msgstr "misslyckades läsa objektet %s" -#: sha1-file.c:1591 +#: sha1-file.c:1588 #, c-format msgid "replacement %s not found for %s" msgstr "ersättningen %s hittades inte för %s" -#: sha1-file.c:1595 +#: sha1-file.c:1592 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "löst objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1599 +#: sha1-file.c:1596 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "packat objekt %s (lagrat i %s) är trasigt" -#: sha1-file.c:1702 +#: sha1-file.c:1699 #, c-format msgid "unable to write file %s" msgstr "kunde inte skriva filen %s" -#: sha1-file.c:1709 +#: sha1-file.c:1706 #, c-format msgid "unable to set permission to '%s'" msgstr "kan inte sätta behörigheten till \"%s\"" -#: sha1-file.c:1716 +#: sha1-file.c:1713 msgid "file write error" msgstr "fel vid skrivning av fil" -#: sha1-file.c:1735 +#: sha1-file.c:1732 msgid "error when closing loose object file" msgstr "fel vid stängning av fil för löst objekt" -#: sha1-file.c:1800 +#: sha1-file.c:1797 #, 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:1802 +#: sha1-file.c:1799 msgid "unable to create temporary file" msgstr "kan inte skapa temporär fil" -#: sha1-file.c:1826 +#: sha1-file.c:1823 msgid "unable to write loose object file" msgstr "kunde inte skriva fil för löst objekt" -#: sha1-file.c:1832 +#: sha1-file.c:1829 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)" -#: sha1-file.c:1836 +#: sha1-file.c:1833 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "\"deflateend\" på objektet %s misslyckades (%d)" -#: sha1-file.c:1840 +#: sha1-file.c:1837 #, c-format msgid "confused by unstable object source data for %s" msgstr "förvirrad av instabil objektkälldata för %s" -#: sha1-file.c:1850 builtin/pack-objects.c:920 +#: sha1-file.c:1847 builtin/pack-objects.c:925 #, c-format msgid "failed utime() on %s" msgstr "\"utime()\" misslyckades på %s" -#: sha1-file.c:1925 +#: sha1-file.c:1922 #, c-format msgid "cannot read object for %s" msgstr "kan inte läsa objekt för %s" -#: sha1-file.c:1965 +#: sha1-file.c:1962 msgid "corrupt commit" msgstr "trasik incheckning" -#: sha1-file.c:1973 +#: sha1-file.c:1970 msgid "corrupt tag" msgstr "trasig tagg" -#: sha1-file.c:2072 +#: sha1-file.c:2069 #, c-format msgid "read error while indexing %s" msgstr "läsfel vid indexering av %s" -#: sha1-file.c:2075 +#: sha1-file.c:2072 #, c-format msgid "short read while indexing %s" msgstr "för lite lästes vid indexering av %s" -#: sha1-file.c:2148 sha1-file.c:2157 +#: sha1-file.c:2145 sha1-file.c:2154 #, c-format msgid "%s: failed to insert into database" msgstr "%s: misslyckades lägga in i databasen" -#: sha1-file.c:2163 +#: sha1-file.c:2160 #, c-format msgid "%s: unsupported file type" msgstr "%s: filtypen stöds ej" -#: sha1-file.c:2187 +#: sha1-file.c:2184 #, c-format msgid "%s is not a valid object" msgstr "%s är inte ett giltigt objekt" -#: sha1-file.c:2189 +#: sha1-file.c:2186 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: sha1-file.c:2216 builtin/index-pack.c:155 +#: sha1-file.c:2213 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "kan inte öppna %s" -#: sha1-file.c:2406 sha1-file.c:2458 +#: sha1-file.c:2403 sha1-file.c:2455 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "hash stämmer inte för %s (förväntade %s)" -#: sha1-file.c:2430 +#: sha1-file.c:2427 #, c-format msgid "unable to mmap %s" msgstr "kan inte utföra \"mmap\" för %s" -#: sha1-file.c:2435 +#: sha1-file.c:2432 #, c-format msgid "unable to unpack header of %s" msgstr "kan inte packa upp huvud för %s" -#: sha1-file.c:2441 +#: sha1-file.c:2438 #, c-format msgid "unable to parse header of %s" msgstr "kan inte tolka huvud för %s" -#: sha1-file.c:2452 +#: sha1-file.c:2449 #, c-format msgid "unable to unpack contents of %s" msgstr "kan inte tolka innehåll i %s" -#: sha1-name.c:490 +#: sha1-name.c:487 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "kort SHA1 %s är tvetydig" -#: sha1-name.c:501 +#: sha1-name.c:498 msgid "The candidates are:" msgstr "Kandidaterna är:" -#: sha1-name.c:800 +#: sha1-name.c:797 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" @@ -7062,43 +7087,43 @@ msgstr "" "genom att köra \"git config advice.objectNameWarning false\"" #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:822 #, c-format msgid "%u.%2.2u GiB" msgstr "%u,%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:824 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u,%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:832 #, c-format msgid "%u.%2.2u MiB" msgstr "%u,%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:834 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u,%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:841 #, c-format msgid "%u.%2.2u KiB" msgstr "%u,%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:843 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u,%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:849 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7106,7 +7131,7 @@ msgstr[0] "%u byte" msgstr[1] "%u bytes" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:851 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" @@ -7225,26 +7250,26 @@ msgstr "kunde inte starta ls-files i .." msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree returnerade en oväntad returkod %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignorerar misstänkt undermodulnamn: %s" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "negativa värden är inte tillåtna för submodule.fetchjobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s" -#: submodule-config.c:486 +#: submodule-config.c:490 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: submodule-config.c:755 +#: submodule-config.c:761 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" @@ -7279,7 +7304,7 @@ msgstr "kunde inte läsa indatafilen \"%s\"" msgid "could not read from stdin" msgstr "kunde inte läsa från standard in" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" @@ -7308,47 +7333,47 @@ msgstr "kunde inte byta namn på temporär fil till %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "kunde inte läsa paketet (bundlen) \"%s\"" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: \"%s\"" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "se protocol.version i \"git help config\" för mer information" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "serverflaggor kräver protokollversion 2 eller senare" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "kunde inte tolka inställningen för transport.color.*" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "stöd för protokoll v2 ännu ej implementerat" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "okänt värde för inställningen \"%s\": %s" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "transporten \"%s\" tillåts inte" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync stöds inte längre" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7357,7 +7382,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7384,32 +7409,32 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Avbryter." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "kunde inte sända alla nödvändiga undermoduler" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:655 msgid "operation not supported by protocol" msgstr "funktionen stöds inte av protokollet" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "komplett skrivning till fjärrhjälpare misslyckades" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "kan inte hitta fjärrhjälpare för \"%s\"" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:569 msgid "can't dup helper output fd" msgstr "kunde inte duplicera utdata-filhandtag" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7418,101 +7443,106 @@ msgstr "" "okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en " "nyare version av Git" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "" "fjärrhjälparen behöver implementera förmåga för referensspecifikationer " "(refspec)" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:424 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s sade oväntat: \"%s\"" -#: transport-helper.c:403 +#: transport-helper.c:413 #, c-format msgid "%s also locked %s" msgstr "%s låste också %s" -#: transport-helper.c:481 +#: transport-helper.c:491 msgid "couldn't run fast-import" msgstr "kunde inte köra fast-import" -#: transport-helper.c:504 +#: transport-helper.c:514 msgid "error while running fast-import" msgstr "fel när fast-import kördes" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:543 transport-helper.c:1132 #, c-format msgid "could not read ref %s" msgstr "kunde inte läsa referensen %s" -#: transport-helper.c:578 +#: transport-helper.c:588 #, c-format msgid "unknown response to connect: %s" msgstr "okänt svar på ansluntning: %s" -#: transport-helper.c:600 +#: transport-helper.c:610 msgid "setting remote service path not supported by protocol" msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst" -#: transport-helper.c:602 +#: transport-helper.c:612 msgid "invalid remote service path" msgstr "felaktig sökväg till fjärrtjänst" -#: transport-helper.c:648 +#: transport-helper.c:658 #, c-format msgid "can't connect to subservice %s" msgstr "kan inte ansluta till undertjänsten %s" -#: transport-helper.c:720 +#: transport-helper.c:734 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\"" -#: transport-helper.c:773 +#: transport-helper.c:787 #, c-format msgid "helper reported unexpected status of %s" msgstr "hjälparen returnerade oväntad status %s" -#: transport-helper.c:834 +#: transport-helper.c:848 #, c-format msgid "helper %s does not support dry-run" msgstr "hjälparen %s stöder inte dry-run" -#: transport-helper.c:837 +#: transport-helper.c:851 #, c-format msgid "helper %s does not support --signed" msgstr "hjälparen %s stöder inte --signed" -#: transport-helper.c:840 +#: transport-helper.c:854 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "hjälparen %s stöder inte --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:859 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "hjälparen %s stöder inte --atomic" + +#: transport-helper.c:865 #, c-format msgid "helper %s does not support 'push-option'" msgstr "hjälparen %s stöder inte \"push-option\"" -#: transport-helper.c:945 +#: transport-helper.c:963 msgid "remote-helper doesn't support push; refspec needed" msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs" -#: transport-helper.c:950 +#: transport-helper.c:968 #, c-format msgid "helper %s does not support 'force'" msgstr "hjälparen %s stöder inte \"force\"" -#: transport-helper.c:997 +#: transport-helper.c:1015 msgid "couldn't run fast-export" msgstr "kunde inte köra fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1020 msgid "error while running fast-export" msgstr "fel vid körning av fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1045 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7521,47 +7551,47 @@ msgstr "" "Inga gemensamma referenser och inga angavs; gör inget.\n" "Du kanske borde ange en gren såsom \"master\".\n" -#: transport-helper.c:1091 +#: transport-helper.c:1118 #, c-format msgid "malformed response in ref list: %s" msgstr "felformat svar i referenslistan: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1270 #, c-format msgid "read(%s) failed" msgstr "läs(%s) misslyckades" -#: transport-helper.c:1271 +#: transport-helper.c:1297 #, c-format msgid "write(%s) failed" msgstr "skriv(%s) misslyckades" -#: transport-helper.c:1320 +#: transport-helper.c:1346 #, c-format msgid "%s thread failed" msgstr "%s-tråden misslyckades" -#: transport-helper.c:1324 +#: transport-helper.c:1350 #, c-format msgid "%s thread failed to join: %s" msgstr "%s-tråden misslyckades ansluta: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1369 transport-helper.c:1373 #, 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:1384 +#: transport-helper.c:1410 #, c-format msgid "%s process failed to wait" msgstr "processen %s misslyckades vänta" -#: transport-helper.c:1388 +#: transport-helper.c:1414 #, c-format msgid "%s process failed" msgstr "processen %s misslyckades" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1432 transport-helper.c:1441 msgid "can't start thread for copying data" msgstr "kan inte skapa tråd för kopiering av data" @@ -7581,7 +7611,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7590,7 +7620,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7599,7 +7629,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7609,7 +7639,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7619,7 +7649,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7628,7 +7658,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7637,7 +7667,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7647,7 +7677,7 @@ msgstr "" "dem:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7656,7 +7686,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7665,7 +7695,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7675,7 +7705,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7685,7 +7715,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7694,7 +7724,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7703,7 +7733,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7714,7 +7744,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7725,7 +7755,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7735,7 +7765,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7745,7 +7775,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7754,7 +7784,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%sFlytta eller ta bort dem innan du \"%s\"." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7763,12 +7793,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7777,7 +7807,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7788,7 +7818,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7799,7 +7829,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -7808,16 +7838,16 @@ msgstr "" "Kan inte uppdatera undermodul:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Uppdaterar filer" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7856,7 +7886,7 @@ msgstr "felaktigt portnummer" msgid "invalid '..' path segment" msgstr "felaktigt \"..\"-sökvägssegment" -#: worktree.c:258 builtin/am.c:2095 +#: worktree.c:258 builtin/am.c:2084 #, c-format msgid "failed to read '%s'" msgstr "misslyckades läsa \"%s\"" @@ -7886,17 +7916,17 @@ msgstr "\"%s\" är inte en .git-fil, felkod %d" msgid "'%s' does not point back to '%s'" msgstr "\"%s\" pekar inte tillbaka till \"%s\"" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "kunde inte öppna \"%s\" för läsning och skrivning" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "kan inte komma åt \"%s\"" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "kan inte hämta aktuell arbetskatalog" @@ -8232,83 +8262,91 @@ msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" #: wt-status.c:1437 +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:1439 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:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "Ångring pågår." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (kör \"git revert --continue\" för att fortsätta)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (använd \"git revert --skip\" för att hoppa över patchen)" + +#: wt-status.c:1468 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:1478 #, 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:1482 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1481 +#: wt-status.c:1485 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:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Inga incheckningar ännu" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8320,32 +8358,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1766 +#: wt-status.c:1770 #, 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:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8354,66 +8392,71 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, 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:1778 +#: wt-status.c:1782 #, 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:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, 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:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Inga incheckningar ännu på " -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "olika" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "efter " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." +#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + #: builtin/add.c:25 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<flaggor>] [--] <sökväg>..." @@ -8436,7 +8479,7 @@ msgstr "ta bort \"%s\"\n" msgid "Unstaged changes after refreshing the index:" msgstr "Oköade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:234 builtin/rev-parse.c:897 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -8471,8 +8514,8 @@ msgstr "Kunde inte tillämpa \"%s\"" 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:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 +#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 #: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 msgid "dry run" msgstr "testkörning" @@ -8525,7 +8568,7 @@ msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:309 builtin/update-index.c:1002 msgid "override the executable bit of the listed files" msgstr "överstyr exekveringsbiten för angivna filer" @@ -8601,113 +8644,109 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/am.c:348 +#: builtin/am.c:347 msgid "could not parse author script" msgstr "kunde inte tolka författarskript" -#: builtin/am.c:432 +#: builtin/am.c:431 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "\"%s\" togs bort av kroken applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:473 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/am.c:512 +#: builtin/am.c:511 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/am.c:538 +#: builtin/am.c:537 msgid "fseek failed" msgstr "\"fseek\" misslyckades" -#: builtin/am.c:726 +#: builtin/am.c:725 #, c-format msgid "could not parse patch '%s'" msgstr "kunde inte tolka patchen \"%s\"" -#: builtin/am.c:791 +#: builtin/am.c:790 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan tillämpas åt gången" -#: builtin/am.c:839 +#: builtin/am.c:838 msgid "invalid timestamp" msgstr "ogiltig tidsstämpel" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:843 builtin/am.c:855 msgid "invalid Date line" msgstr "ogiltig \"Date\"-rad" -#: builtin/am.c:851 +#: builtin/am.c:850 msgid "invalid timezone offset" msgstr "ogiltig tidszons-offset" -#: builtin/am.c:944 +#: builtin/am.c:943 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:948 builtin/clone.c:406 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/am.c:954 +#: builtin/am.c:953 msgid "Failed to split patches." msgstr "Misslyckades dela patchar." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "kan inte skriva indexfil" - -#: builtin/am.c:1098 +#: builtin/am.c:1084 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "När du har löst problemet, kör \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1085 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället." -#: builtin/am.c:1100 +#: builtin/am.c:1086 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"." -#: builtin/am.c:1183 +#: builtin/am.c:1169 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats." -#: builtin/am.c:1211 +#: builtin/am.c:1197 msgid "Patch is empty." msgstr "Patchen är tom." -#: builtin/am.c:1277 +#: builtin/am.c:1262 #, c-format -msgid "invalid ident line: %.*s" -msgstr "ogiltig ident-rad: %.*s" +msgid "missing author line in commit %s" +msgstr "saknad \"author\"-rad i incheckningen %s" -#: builtin/am.c:1299 +#: builtin/am.c:1265 #, c-format -msgid "unable to parse commit %s" -msgstr "kunde inte tolka incheckningen %s" +msgid "invalid ident line: %.*s" +msgstr "ogiltig ident-rad: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1484 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Arkivet saknar objekt som behövs för att falla tillbaka på 3-" "vägssammanslagning." -#: builtin/am.c:1498 +#: builtin/am.c:1486 msgid "Using index info to reconstruct a base tree..." msgstr "Använder indexinfo för att återskapa ett basträd..." -#: builtin/am.c:1517 +#: builtin/am.c:1505 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8715,25 +8754,25 @@ msgstr "" "Har du handredigerat din patch?\n" "Den kan inte tillämpas på blobbar som antecknats i dess index." -#: builtin/am.c:1523 +#: builtin/am.c:1511 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..." -#: builtin/am.c:1549 +#: builtin/am.c:1537 msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1581 +#: builtin/am.c:1569 msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1616 builtin/am.c:1620 #, c-format msgid "cannot resume: %s does not exist." msgstr "kan inte återuppta: %s finns inte." -#: builtin/am.c:1650 +#: builtin/am.c:1638 msgid "Commit Body is:" msgstr "Incheckningskroppen är:" @@ -8741,36 +8780,40 @@ msgstr "Incheckningskroppen är:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1648 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: " -#: builtin/am.c:1710 +#: builtin/am.c:1695 builtin/commit.c:374 +msgid "unable to write index file" +msgstr "kan inte skriva indexfil" + +#: builtin/am.c:1699 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1739 builtin/am.c:1807 #, c-format msgid "Applying: %.*s" msgstr "Tillämpar: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1756 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan tillämpats." -#: builtin/am.c:1773 +#: builtin/am.c:1762 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch misslyckades på %s %.*s" -#: builtin/am.c:1777 +#: builtin/am.c:1766 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" "Använd \"git am --show-current-patch\" för att se patchen som misslyckades" -#: builtin/am.c:1821 +#: builtin/am.c:1810 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8780,7 +8823,7 @@ msgstr "" "Om det inte är något kvar att köa kan det hända att något annat redan\n" "introducerat samma ändringar; kanske du bör hoppa över patchen." -#: builtin/am.c:1828 +#: builtin/am.c:1817 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8792,17 +8835,17 @@ msgstr "" "lösta.\n" "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 +#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 #: builtin/reset.c:337 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"." -#: builtin/am.c:1987 +#: builtin/am.c:1976 msgid "failed to clean index" msgstr "misslyckades städa upp indexet" -#: builtin/am.c:2031 +#: builtin/am.c:2020 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8810,143 +8853,143 @@ msgstr "" "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n" "Återställer inte till ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2117 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Felaktigt värde för --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2153 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2154 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<flaggor>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2160 msgid "run interactively" msgstr "kör interaktivt" -#: builtin/am.c:2173 +#: builtin/am.c:2162 msgid "historical option -- no-op" msgstr "historisk flagga -- no-op" -#: builtin/am.c:2175 +#: builtin/am.c:2164 msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:307 builtin/stash.c:806 +#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:297 builtin/stash.c:812 msgid "be quiet" msgstr "var tyst" -#: builtin/am.c:2178 +#: builtin/am.c:2167 msgid "add a Signed-off-by line to the commit message" msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet" -#: builtin/am.c:2181 +#: builtin/am.c:2170 msgid "recode into utf8 (default)" msgstr "koda om till utf8 (standard)" -#: builtin/am.c:2183 +#: builtin/am.c:2172 msgid "pass -k flag to git-mailinfo" msgstr "sänd flaggan -k till git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2174 msgid "pass -b flag to git-mailinfo" msgstr "sänd flaggan -b till git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2176 msgid "pass -m flag to git-mailinfo" msgstr "sänd flaggan -m till git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2178 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet" -#: builtin/am.c:2192 +#: builtin/am.c:2181 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr" -#: builtin/am.c:2195 +#: builtin/am.c:2184 msgid "strip everything before a scissors line" msgstr "ta bort allting före en saxlinje" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 +#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 +#: builtin/am.c:2213 msgid "pass it through git-apply" msgstr "sänd det genom git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324 +#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 +#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 +#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 +#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:150 parse-options.h:171 parse-options.h:312 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39 +#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "format" -#: builtin/am.c:2221 +#: builtin/am.c:2210 msgid "format the patch(es) are in" msgstr "format för patch(ar)" -#: builtin/am.c:2227 +#: builtin/am.c:2216 msgid "override error message when patch failure occurs" msgstr "överstyr felmeddelanden när patchfel uppstår" -#: builtin/am.c:2229 +#: builtin/am.c:2218 msgid "continue applying patches after resolving a conflict" msgstr "fortsätt applicera patchar efter att ha löst en konflikt" -#: builtin/am.c:2232 +#: builtin/am.c:2221 msgid "synonyms for --continue" msgstr "synonymer till --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2224 msgid "skip the current patch" msgstr "hoppa över den aktuella grenen" -#: builtin/am.c:2238 +#: builtin/am.c:2227 msgid "restore the original branch and abort the patching operation." msgstr "återställ originalgrenen och avbryt patchningen." -#: builtin/am.c:2241 +#: builtin/am.c:2230 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:2244 +#: builtin/am.c:2233 msgid "show the patch being applied." msgstr "visa patchen som tillämpas." -#: builtin/am.c:2248 +#: builtin/am.c:2237 msgid "lie about committer date" msgstr "ljug om incheckningsdatum" -#: builtin/am.c:2250 +#: builtin/am.c:2239 msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 +#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 +#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "nyckel-id" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 msgid "GPG-sign commits" msgstr "GPG-signera incheckningar" -#: builtin/am.c:2256 +#: builtin/am.c:2245 msgid "(internal use for git-rebase)" msgstr "(används internt av git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2263 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -8954,16 +8997,16 @@ msgstr "" "Flaggan -b/--binary har varit utan funktion länge, och\n" "kommer tas bort. Vi ber dig att inte använda den längre." -#: builtin/am.c:2281 +#: builtin/am.c:2270 msgid "failed to read the index" msgstr "misslyckades läsa indexet" -#: builtin/am.c:2296 +#: builtin/am.c:2285 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs." -#: builtin/am.c:2320 +#: builtin/am.c:2309 #, c-format msgid "" "Stray %s directory found.\n" @@ -8972,11 +9015,11 @@ msgstr "" "Kvarbliven katalog %s hittades.\n" "Använd \"git am --abort\" för att ta bort den." -#: builtin/am.c:2326 +#: builtin/am.c:2315 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: builtin/am.c:2336 +#: builtin/am.c:2325 msgid "interactive mode requires patches on the command line" msgstr "interaktivt läge kräver patchar på kommandoraden" @@ -9200,7 +9243,8 @@ msgstr "felaktigt HEAD - Jag behöver ett HEAD" #: builtin/bisect--helper.c:526 #, 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>\"." +msgstr "" +"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"." # cogito-relaterat #: builtin/bisect--helper.c:547 @@ -9292,154 +9336,154 @@ msgstr "--bisect-next-check kräver 2 eller 3 argument" msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms kräver noll eller ett argument" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "förväntade en färg: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "måste sluta med en färg" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, 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:747 msgid "invalid value for blame.coloring" msgstr "ogiltigt värde för blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "kan inte hitta revision %s att ignorera" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:855 +#: builtin/blame.c:854 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:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 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:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:861 builtin/log.c:1646 +#: builtin/blame.c:860 builtin/log.c:1630 msgid "rev" msgstr "rev" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "ignorera <rev> vid klandren" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "ignorera revisioner från <fil>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "färglägg redundant metadata från tidigare rader annorlunda" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "färglägg rader efter ålder" -#: builtin/blame.c:871 +#: builtin/blame.c:870 msgid "Use an experimental heuristic to improve diffs" msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:873 +#: builtin/blame.c:872 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:874 +#: builtin/blame.c:873 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:875 +#: builtin/blame.c:874 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:875 builtin/blame.c:876 msgid "score" msgstr "poäng" -#: builtin/blame.c:876 +#: builtin/blame.c:875 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:877 +#: builtin/blame.c:876 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:877 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -9676,7 +9720,7 @@ msgstr "ställ in spårningsläge (se git-pull(1))" msgid "do not use" msgstr "använd ej" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:486 msgid "upstream" msgstr "uppströms" @@ -9783,11 +9827,11 @@ 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:438 -#: builtin/verify-tag.c:39 +#: 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:761 +#: builtin/branch.c:684 builtin/clone.c:760 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" @@ -9889,7 +9933,7 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/cat-file.c:594 +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -9897,7 +9941,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -9905,72 +9949,72 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "endast en buntflagga kan anges" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<typ> kan vara en av: blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "visa objekttyp" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "visa objektstorlek" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "avsluta med noll när det inte uppstått något fel" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "visa objektets innehåll snyggt" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "för blob-objekt, kör filter på objektets innehåll" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "för blob-objekt, kör filger på objektets innehåll" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:936 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "använd specifik sökväg för --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "buffra utdata från --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "visa information och innehåll för objekt som listas på standard in" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "visa information för objekt som listas på standard in" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "följ symboliska länkar i trädet (använd med --batch eller --batch-check)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "visa alla objekt med --batch eller --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "ordna inte --batch-all-objects output" @@ -9998,8 +10042,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:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 +#: builtin/worktree.c:506 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -10091,7 +10135,7 @@ msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:178 builtin/column.c:31 #: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 #: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/worktree.c:679 msgid "string" msgstr "sträng" @@ -10119,98 +10163,98 @@ msgstr "git switch [<flaggor>] [<gren>]" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:173 builtin/checkout.c:212 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:190 +#: builtin/checkout.c:191 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner" -#: builtin/checkout.c:240 +#: builtin/checkout.c:241 #, c-format msgid "path '%s' does not have necessary versions" msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:258 +#: builtin/checkout.c:259 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:274 +#: builtin/checkout.c:275 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:374 +#: builtin/checkout.c:375 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Återskapade %d sammanslagningskonflikt" msgstr[1] "Återskapade %d sammanslagningskonflikter" -#: builtin/checkout.c:379 +#: builtin/checkout.c:380 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Uppdaterade %d sökväg från %s" msgstr[1] "Uppdaterade %d sökvägar från %s" -#: builtin/checkout.c:386 +#: builtin/checkout.c:387 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Uppdaterade %d sökväg från indexet" msgstr[1] "Uppdaterade %d sökvägar från indexet" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 +#: builtin/checkout.c:420 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "\"%s\" kan inte användas vid uppdatering av sökvägar" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:423 builtin/checkout.c:426 #, c-format msgid "'%s' cannot be used with %s" msgstr "\"%s\" kan inte användas med %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:430 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt." -#: builtin/checkout.c:433 +#: builtin/checkout.c:434 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "varken \"%s\" eller \"%s\" har angivits" -#: builtin/checkout.c:437 +#: builtin/checkout.c:438 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "\"%s\" måste användas när \"%s\" inte anges" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:443 builtin/checkout.c:448 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "\"%s\" eller \"%s\" kan inte användas med %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:507 builtin/checkout.c:514 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:679 +#: builtin/checkout.c:680 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:729 +#: builtin/checkout.c:730 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10219,11 +10263,6 @@ msgstr "" "kan inte fortsätta med köade ändringar i följande filer:\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "köade ändringar i följande filer kan gå förlorade: %s" - #: builtin/checkout.c:833 #, c-format msgid "Can not do reflog for '%s': %s\n" @@ -10233,7 +10272,7 @@ msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:879 builtin/clone.c:713 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" @@ -10347,7 +10386,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:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" @@ -10450,9 +10489,9 @@ msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" msgid "missing branch or commit argument" msgstr "saknar gren- eller incheckingsargument" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 -#: builtin/send-pack.c:174 +#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 +#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 +#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -10460,7 +10499,7 @@ msgstr "tvinga förloppsrapportering" 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:1439 builtin/log.c:1634 parse-options.h:318 +#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 msgid "style" msgstr "stil" @@ -10468,7 +10507,7 @@ msgstr "stil" msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1452 builtin/worktree.c:503 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" @@ -10541,7 +10580,8 @@ msgstr "felaktig sökvägsangivelse" #: builtin/checkout.c:1638 #, 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" +msgstr "" +"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den" #: builtin/checkout.c:1642 #, c-format @@ -10585,9 +10625,9 @@ 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:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 +#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 +#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 msgid "branch" msgstr "gren" @@ -10611,39 +10651,39 @@ msgstr "förutspå \"git checkout <gren-saknas>\" (förval)" msgid "use overlay mode (default)" msgstr "använd överläggsläge (standard)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1743 msgid "create and switch to a new branch" msgstr "skapa och växla till en ny gren" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1745 msgid "create/reset and switch to a branch" msgstr "skapa/nollställ och växla till en gren" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1747 msgid "second guess 'git switch <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1749 msgid "throw away local modifications" msgstr "kasta bort lokala ändringar" -#: builtin/checkout.c:1772 -msgid "where the checkout from" -msgstr "källa till utcheckning" +#: builtin/checkout.c:1781 +msgid "which tree-ish to checkout from" +msgstr "vilken träd-igt att checka ut från" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1783 msgid "restore the index" msgstr "återställ indexet" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1785 msgid "restore the working tree (default)" msgstr "återställ arbetskatalogen (förval)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1787 msgid "ignore unmerged entries" msgstr "ignorera ej sammanslagna poster" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1788 msgid "use overlay mode" msgstr "använd överläggsläge" @@ -10684,7 +10724,7 @@ msgstr "misslyckades ta bort %s" msgid "could not lstat %s\n" msgstr "kunde inte ta status (\"lstat\") på %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:593 #, c-format msgid "" "Prompt help:\n" @@ -10697,7 +10737,7 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" " - (tomt) markera ingenting\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:602 #, c-format msgid "" "Prompt help:\n" @@ -10718,38 +10758,38 @@ msgstr "" "* - välj alla poster\n" " - (tomt) avsluta markering\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 +#: builtin/clean.c:521 git-add--interactive.perl:568 #: git-add--interactive.perl:573 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Vadå (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Ange ignoreringsmönster>>" -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "VARNING: Hittar inte poster som motsvarar: %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Välj poster att ta bort" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 +#: builtin/clean.c:787 git-add--interactive.perl:1763 #, c-format msgid "Bye.\n" msgstr "Hej då.\n" -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -10767,64 +10807,64 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:821 git-add--interactive.perl:1849 +#: builtin/clean.c:822 git-add--interactive.perl:1849 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:822 git-add--interactive.perl:1846 +#: builtin/clean.c:823 git-add--interactive.perl:1846 msgid "What now" msgstr "Vad nu" -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Skulle ta bort följande post:" msgstr[1] "Skulle ta bort följande poster:" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Inga fler filer att städa, avslutar." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "tvinga" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "städa interaktivt" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 +#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 +#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 #: builtin/show-ref.c:179 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -10832,7 +10872,7 @@ msgstr "" "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -10840,162 +10880,162 @@ msgstr "" "clean.requireForce har standardvärdet true och varken -i, -n eller -f " "angavs; vägrar städa" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]" -#: builtin/clone.c:93 +#: builtin/clone.c:92 msgid "don't create a checkout" msgstr "skapa inte någon utcheckning" -#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489 +#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 msgid "create a bare repository" msgstr "skapa ett naket (\"bare\") arkiv" -#: builtin/clone.c:98 +#: builtin/clone.c:97 msgid "create a mirror repository (implies bare)" msgstr "skapa ett spegelarkiv (implicerar \"bare\")" -#: builtin/clone.c:100 +#: builtin/clone.c:99 msgid "to clone from a local repository" msgstr "för att klona från ett lokalt arkiv" -#: builtin/clone.c:102 +#: builtin/clone.c:101 msgid "don't use local hardlinks, always copy" msgstr "skapa inte lokala hårda länkar, kopiera alltid" -#: builtin/clone.c:104 +#: builtin/clone.c:103 msgid "setup as shared repository" msgstr "skapa som ett delat arkiv" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "pathspec" msgstr "sökvägsangivelse" -#: builtin/clone.c:107 +#: builtin/clone.c:106 msgid "initialize submodules in the clone" msgstr "initiera undermoduler i klonen" -#: builtin/clone.c:110 +#: builtin/clone.c:109 msgid "number of submodules cloned in parallel" msgstr "antal undermoduler som klonas parallellt" -#: builtin/clone.c:111 builtin/init-db.c:486 +#: builtin/clone.c:110 builtin/init-db.c:486 msgid "template-directory" msgstr "mallkatalog" -#: builtin/clone.c:112 builtin/init-db.c:487 +#: builtin/clone.c:111 builtin/init-db.c:487 msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 +#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 #: builtin/submodule--helper.c:1860 msgid "reference repository" msgstr "referensarkiv" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 +#: builtin/clone.c:117 builtin/submodule--helper.c:1382 #: builtin/submodule--helper.c:1862 msgid "use --reference only while cloning" msgstr "använd --reference endast under kloningen" -#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3308 builtin/repack.c:330 +#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3294 builtin/repack.c:320 msgid "name" msgstr "namn" -#: builtin/clone.c:120 +#: builtin/clone.c:119 msgid "use <name> instead of 'origin' to track upstream" msgstr "använd <namn> istället för \"origin\" för att spåra uppströms" -#: builtin/clone.c:122 +#: builtin/clone.c:121 msgid "checkout <branch> instead of the remote's HEAD" msgstr "checka ut <gren> istället för fjärrens HEAD" -#: builtin/clone.c:124 +#: builtin/clone.c:123 msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 +#: builtin/pull.c:227 msgid "depth" msgstr "djup" -#: builtin/clone.c:126 +#: builtin/clone.c:125 msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297 +#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 msgid "time" msgstr "tid" -#: builtin/clone.c:128 +#: builtin/clone.c:127 msgid "create a shallow clone since a specific time" msgstr "skapa en grund klon från en angiven tidpunkt" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 +#: builtin/rebase.c:1417 msgid "revision" msgstr "revision" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:129 builtin/fetch.c:172 msgid "deepen history of shallow clone, excluding rev" msgstr "fördjupa historik för grund klon, exkludera revisionen" -#: builtin/clone.c:132 +#: builtin/clone.c:131 msgid "clone only one branch, HEAD or --branch" msgstr "klona endast en gren, HEAD eller --branch" -#: builtin/clone.c:134 +#: builtin/clone.c:133 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "klona inga taggar och gör att senare hämtningar inte följer dem" -#: builtin/clone.c:136 +#: builtin/clone.c:135 msgid "any cloned submodules will be shallow" msgstr "klonade undermoduler kommer vara grunda" -#: builtin/clone.c:137 builtin/init-db.c:495 +#: builtin/clone.c:136 builtin/init-db.c:495 msgid "gitdir" msgstr "gitkat" -#: builtin/clone.c:138 builtin/init-db.c:496 +#: builtin/clone.c:137 builtin/init-db.c:496 msgid "separate git dir from working tree" msgstr "separera gitkatalogen från arbetskatalogen" -#: builtin/clone.c:139 +#: builtin/clone.c:138 msgid "key=value" msgstr "nyckel=värde" -#: builtin/clone.c:140 +#: builtin/clone.c:139 msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:172 msgid "server-specific" msgstr "serverspecifik" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76 +#: builtin/push.c:572 builtin/send-pack.c:173 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 +#: builtin/push.c:573 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 +#: builtin/push.c:575 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" -#: builtin/clone.c:149 +#: builtin/clone.c:148 msgid "any cloned submodules will use their remote-tracking branch" msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren" -#: builtin/clone.c:285 +#: builtin/clone.c:284 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11003,47 +11043,42 @@ msgstr "" "Kunde inte gissa katalognamn.\n" "Ange en katalog på kommandoraden" -#: builtin/clone.c:338 +#: builtin/clone.c:337 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:410 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:428 +#: builtin/clone.c:427 #, c-format msgid "failed to start iterator over '%s'" msgstr "misslyckades starta iterator över \"%s\"" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken \"%s\"" - -#: builtin/clone.c:458 +#: builtin/clone.c:457 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:462 +#: builtin/clone.c:461 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:467 +#: builtin/clone.c:466 #, c-format msgid "failed to iterate over '%s'" msgstr "misslyckades iterera över \"%s\"" -#: builtin/clone.c:492 +#: builtin/clone.c:491 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:505 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11053,133 +11088,133 @@ msgstr "" "Du kan inspektera det som checkades ut med \"git status\"\n" "och försöka med \"git restore -source=HEAD :/\"\n" -#: builtin/clone.c:583 +#: builtin/clone.c:582 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:702 +#: builtin/clone.c:701 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: builtin/clone.c:752 +#: builtin/clone.c:751 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:782 msgid "unable to checkout working tree" msgstr "kunde inte checka ut arbetskatalogen" -#: builtin/clone.c:833 +#: builtin/clone.c:832 msgid "unable to write parameters to config file" msgstr "kunde inte skriva parametrar till konfigurationsfilen" -#: builtin/clone.c:896 +#: builtin/clone.c:895 msgid "cannot repack to clean up" msgstr "kan inte packa om för att städa upp" -#: builtin/clone.c:898 +#: builtin/clone.c:897 msgid "cannot unlink temporary alternates file" msgstr "kunde inte ta bort temporär \"alternates\"-fil" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:937 builtin/receive-pack.c:1948 msgid "Too many arguments." msgstr "För många argument." -#: builtin/clone.c:942 +#: builtin/clone.c:941 msgid "You must specify a repository to clone." msgstr "Du måste ange ett arkiv att klona." -#: builtin/clone.c:955 +#: builtin/clone.c:954 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:958 +#: builtin/clone.c:957 msgid "--bare and --separate-git-dir are incompatible." msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." -#: builtin/clone.c:971 +#: builtin/clone.c:970 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:977 builtin/fetch.c:1653 +#: builtin/clone.c:976 builtin/fetch.c:1790 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" -#: builtin/clone.c:987 +#: builtin/clone.c:986 #, 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:997 +#: builtin/clone.c:996 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 +#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:1017 +#: builtin/clone.c:1016 #, c-format msgid "could not create work tree dir '%s'" msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:1037 +#: builtin/clone.c:1036 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1038 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1062 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:1124 +#: builtin/clone.c:1123 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1126 +#: builtin/clone.c:1125 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:1128 +#: builtin/clone.c:1127 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:1130 +#: builtin/clone.c:1129 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter ignoreras i lokala kloningar; använd file:// istället." -#: builtin/clone.c:1133 +#: builtin/clone.c:1132 msgid "source repository is shallow, ignoring --local" msgstr "källarkivet är grunt, ignorerar --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1137 msgid "--local is ignored" msgstr "--local ignoreras" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1212 builtin/clone.c:1220 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1223 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -11228,7 +11263,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:542 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 #, c-format msgid "not a valid object name %s" msgstr "objektnamnet är inte giltigt: %s" @@ -11257,7 +11292,7 @@ msgid "id of a parent commit object" msgstr "id på ett förälderincheckningsobjekt" #: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 #: builtin/tag.c:412 msgid "message" msgstr "meddelande" @@ -11271,7 +11306,7 @@ msgid "read commit log message from file" msgstr "läs incheckningsloggmeddelande från fil" #: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/pull.c:195 builtin/revert.c:118 msgid "GPG sign commit" msgstr "GPG-signera incheckning" @@ -11599,8 +11634,8 @@ msgstr "beräkna fullständiga före-/efter-värden" msgid "version" msgstr "version" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 +#: builtin/worktree.c:650 msgid "machine-readable output" msgstr "maskinläsbar utdata" @@ -11613,8 +11648,8 @@ msgid "terminate entries with NUL" msgstr "terminera poster med NUL" #: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 msgid "mode" msgstr "läge" @@ -11630,7 +11665,7 @@ msgstr "" "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: " "traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1362 parse-options.h:188 msgid "when" msgstr "när" @@ -11682,7 +11717,7 @@ msgstr "författare" msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1499 builtin/gc.c:538 msgid "date" msgstr "datum" @@ -11718,8 +11753,8 @@ 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:1506 builtin/log.c:1581 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 +#: builtin/pull.c:164 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" @@ -11827,67 +11862,69 @@ msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <objkat>]" #: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir <objkat>] [--shallow]" +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c:14 builtin/commit-graph.c:29 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" "git commit-graph write [--object-dir <objkat>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <delnings-flaggor>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1601 +#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 +#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 +#: builtin/log.c:1585 msgid "dir" msgstr "kat" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:56 builtin/commit-graph.c:108 +#: builtin/commit-graph.c:171 builtin/commit-graph.c:255 msgid "The object directory to store the graph" msgstr "Objektkatalogen där grafen skall lagras" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:58 msgid "if the commit-graph is split, only verify the tip file" msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:80 builtin/commit-graph.c:125 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Kunde inte öppna incheckningsgrafen \"%s\"" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:173 msgid "start walk at all refs" msgstr "starta traversering vid alla referenser" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:175 msgid "scan pack-indexes listed by stdin for commits" msgstr "sök paketindex listade på standard in efter incheckningar" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:177 msgid "start walk at commits listed by stdin" msgstr "börja gå genom incheckningar listade på standard in" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:179 msgid "include all commits already in the commit-graph file" msgstr "ta med alla incheckningar redan i filen commit-graph" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:182 msgid "allow writing an incremental commit-graph file" msgstr "tillåt skriva en inkrementell incheckningsgraffil" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:184 builtin/commit-graph.c:188 msgid "maximum number of commits in a non-base split commit-graph" msgstr "" "maximalt antal incheckningar i en delad incheckingsgraf som inte är bad" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:186 msgid "maximum ratio between two levels of a split commit-graph" msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:204 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs" @@ -12201,58 +12238,58 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "skriv storlekar i människoläsbart format" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<flaggor>] [<incheckning-igt>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<flaggor>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "huvud" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "lättviktig" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "annoterad" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n" -#: builtin/describe.c:379 +#: builtin/describe.c:381 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:407 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12261,7 +12298,7 @@ msgstr "" "Inga annoterade taggar kan beskriva \"%s\".\n" "Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:411 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12270,12 +12307,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:439 +#: builtin/describe.c:441 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:442 +#: builtin/describe.c:444 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12284,90 +12321,90 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:512 #, c-format msgid "describe %s\n" msgstr "beskriva %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:515 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:521 +#: builtin/describe.c:523 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s är varken incheckning eller blob" -#: builtin/describe.c:535 +#: builtin/describe.c:537 msgid "find the tag that comes after the commit" msgstr "hitta taggen som kommer efter incheckningen" -#: builtin/describe.c:536 +#: builtin/describe.c:538 msgid "debug search strategy on stderr" msgstr "felsök sökstrategin på standard fel" -#: builtin/describe.c:537 +#: builtin/describe.c:539 msgid "use any ref" msgstr "använd alla referenser" -#: builtin/describe.c:538 +#: builtin/describe.c:540 msgid "use any tag, even unannotated" msgstr "använd alla taggar, även oannoterade" -#: builtin/describe.c:539 +#: builtin/describe.c:541 msgid "always use long format" msgstr "använd alltid långt format" -#: builtin/describe.c:540 +#: builtin/describe.c:542 msgid "only follow first parent" msgstr "följ endast första föräldern" -#: builtin/describe.c:543 +#: builtin/describe.c:545 msgid "only output exact matches" msgstr "skriv endast ut exakta träffar" -#: builtin/describe.c:545 +#: builtin/describe.c:547 msgid "consider <n> most recent tags (default: 10)" msgstr "överväg de <n> nyaste taggarna (standard: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:549 msgid "only consider tags matching <pattern>" msgstr "överväg endast taggar som motsvarar <mönster>" -#: builtin/describe.c:549 +#: builtin/describe.c:551 msgid "do not consider tags matching <pattern>" msgstr "överväg inte taggar som motsvarar <mönster>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:553 builtin/name-rev.c:426 msgid "show abbreviated commit object as fallback" msgstr "visa förkortade incheckningsobjekt som standard" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:554 builtin/describe.c:557 msgid "mark" msgstr "märke" -#: builtin/describe.c:553 +#: builtin/describe.c:555 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:558 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:576 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:605 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:654 +#: builtin/describe.c:656 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/describe.c:656 +#: builtin/describe.c:658 msgid "--broken is incompatible with commit-ishes" msgstr "--broken är inkompatibelt med \"commit-ish\"-värden" @@ -12405,27 +12442,27 @@ msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "" "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "misslyckades: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "kunde inte läsa symbolisk länk-fil %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "kunde inte läsa objektet %s för symboliska länken %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12433,53 +12470,53 @@ msgstr "" "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" "katalogdiffläge (\"-d\" och \"--dir-diff\")." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "filen i arbetskatalogen lämnades kvar." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "temporära filer finns i \"%s\"." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "du kanske vill städa eller rädda dem." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "utför diff för hela katalogen" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "fråga inte vid start av diff-verktyg" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "använd symboliska länkar i katalogdiffläge" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "verktyg" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "använd angivet diff-verktyg" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\"" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12487,31 +12524,31 @@ msgstr "" "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " "skilt från noll" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "ange eget kommando för att visa diffar" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "sändes till \"diff\"" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool kräver en arbetskatalog eller --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff är inkompatibelt med --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "inget <verktyg> angavs för --tool=<verktyg>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "inget <kommando> angavs för --extcmd=<kommando>" @@ -12551,156 +12588,180 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:852 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Dumpa märken till filen" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "Importera märken från filen, om den finns" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" -#: builtin/fast-export.c:1145 builtin/log.c:1649 +#: builtin/fast-export.c:1177 builtin/log.c:1633 msgid "refspec" msgstr "referensspecifikation" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Applicera referensspecifikation på exporterade referenser" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "anonymisera utdata" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 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:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" -msgstr "Visa ursprungliga objekt-ID för blobbar/incheckningar" +msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar" + +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Märk taggar med märke-id" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "Kan inte ange både --import-marks och --import-marks-if-exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<flaggor>] <grupp>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<flaggor>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:115 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel kan inte vara negativt" + +#: builtin/fetch.c:138 builtin/pull.c:204 msgid "fetch from all remotes" msgstr "hämta från alla fjärrar" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:140 builtin/pull.c:248 +msgid "set upstream for git pull/fetch" +msgstr "ställ in uppström för git pull/fetch" + +#: builtin/fetch.c:142 builtin/pull.c:207 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:129 builtin/pull.c:209 +#: builtin/fetch.c:144 builtin/pull.c:210 msgid "path to upload pack on remote end" msgstr "sökväg till upload pack på fjärren" -#: builtin/fetch.c:130 +#: builtin/fetch.c:145 msgid "force overwrite of local reference" msgstr "tvinga överskrivning av lokal referens" -#: builtin/fetch.c:132 +#: builtin/fetch.c:147 msgid "fetch from multiple remotes" msgstr "hämta från flera fjärrar" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:149 builtin/pull.c:214 msgid "fetch all tags and associated objects" msgstr "hämta alla taggar och associerade objekt" -#: builtin/fetch.c:136 +#: builtin/fetch.c:151 msgid "do not fetch all tags (--no-tags)" msgstr "hämta inte alla taggar (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:153 msgid "number of submodules fetched in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:155 builtin/pull.c:217 msgid "prune remote-tracking branches no longer on remote" msgstr "rensa fjärrspårande grenar ej längre på fjärren" -#: builtin/fetch.c:142 +#: builtin/fetch.c:157 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:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 msgid "on-demand" msgstr "on-demand" -#: builtin/fetch.c:144 +#: builtin/fetch.c:159 msgid "control recursive fetching of submodules" msgstr "styr rekursiv hämtning av undermoduler" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:163 builtin/pull.c:225 msgid "keep downloaded pack" msgstr "behåll hämtade paket" -#: builtin/fetch.c:150 +#: builtin/fetch.c:165 msgid "allow updating of HEAD ref" msgstr "tillåt uppdatering av HEAD-referens" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:155 +#: builtin/fetch.c:170 msgid "deepen history of shallow repository based on time" msgstr "fördjupa historik för grund klon baserad på tid" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:176 builtin/pull.c:231 msgid "convert to a complete repository" msgstr "konvertera till komplett arkiv" -#: builtin/fetch.c:164 +#: builtin/fetch.c:179 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:167 +#: builtin/fetch.c:182 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12708,105 +12769,129 @@ msgstr "" "standard för rekursiv hämtning av undermoduler (lägre prioritet än " "konfigurationsfiler)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:186 builtin/pull.c:234 msgid "accept refs that update .git/shallow" msgstr "tar emot referenser som uppdaterar .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:187 builtin/pull.c:236 msgid "refmap" msgstr "referenskarta" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:188 builtin/pull.c:237 msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:180 +#: builtin/fetch.c:195 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:183 +#: builtin/fetch.c:198 msgid "run 'gc --auto' after fetching" msgstr "kör \"gc --auto\" efter hämtning" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:200 builtin/pull.c:246 msgid "check for forced-updates on all updated branches" msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar" -#: builtin/fetch.c:491 +#: builtin/fetch.c:510 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:630 +#: builtin/fetch.c:650 #, 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:728 +#: builtin/fetch.c:748 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:732 +#: builtin/fetch.c:752 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:766 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:756 +#: builtin/fetch.c:776 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 +#: builtin/fetch.c:848 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:761 +#: builtin/fetch.c:781 msgid "would clobber existing tag" msgstr "skulle skriva över befintlig tagg" -#: builtin/fetch.c:783 +#: builtin/fetch.c:803 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:806 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:809 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:848 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:833 +#: builtin/fetch.c:853 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:879 +#: builtin/fetch.c:874 +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" +"flag or run 'git config fetch.showForcedUpdates true'." +msgstr "" +"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har " +"slagits\n" +"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:878 +#, c-format +msgid "" +"It took %.2f seconds to check forced updates. You can use\n" +"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " +"false'\n" +" to avoid this check.\n" +msgstr "" +"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n" +"\"--no-show-forced-updates\" eller köra \"git config fetch." +"showForcedUpdates\n" +"false\" för att undvika testet.\n" + +#: builtin/fetch.c:908 #, 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:900 +#: builtin/fetch.c:929 #, 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:991 builtin/fetch.c:1124 +#: builtin/fetch.c:1020 builtin/fetch.c:1157 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:1002 +#: builtin/fetch.c:1031 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -12815,89 +12900,79 @@ 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:1008 -msgid "" -"Fetch normally indicates which branches had a forced update, but that check " -"has been disabled." -msgstr "" -"Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, men " -"det testet har slagits av." - -#: builtin/fetch.c:1009 -msgid "" -"To re-enable, use '--show-forced-updates' flag or run 'git config fetch." -"showForcedUpdates true'." -msgstr "" -"För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör " -"\"git config fetch.showForcedUpdates true\"." - -#: builtin/fetch.c:1011 -#, c-format -msgid "" -"It took %.2f seconds to check forced updates. You can use '--no-show-forced-" -"updates'\n" -msgstr "" -"Det tog %.2f sekunder att se efter tvingade uppdateringar. Du kan använda " -"\"--no-show-forced-updates\"\n" - -#: builtin/fetch.c:1013 -msgid "" -"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" -msgstr "" -"eller kör \"git config fetch.showForcedUpdates false\" för undvika testet.\n" - -#: builtin/fetch.c:1094 +#: builtin/fetch.c:1127 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:1095 +#: builtin/fetch.c:1128 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1160 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:1128 builtin/remote.c:1036 +#: builtin/fetch.c:1161 builtin/remote.c:1036 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:1151 +#: builtin/fetch.c:1184 #, 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:1170 +#: builtin/fetch.c:1203 #, 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:1173 +#: builtin/fetch.c:1206 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1477 +#: builtin/fetch.c:1414 +msgid "multiple branch detected, incompatible with --set-upstream" +msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream" + +#: builtin/fetch.c:1429 +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:1431 +msgid "not setting upstream for a remote tag" +msgstr "ställer inte in uppström för en fjärrtag" + +#: builtin/fetch.c:1433 +msgid "unknown branch type" +msgstr "okänd grentyp" + +#: builtin/fetch.c:1435 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"hittade ingen källgren.\n" +"du måste ange exakt en gren med flaggan --set-upstream." + +#: builtin/fetch.c:1561 builtin/fetch.c:1623 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1479 builtin/remote.c:100 +#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1525 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"--filter kan endast användas med fjärren konfigurerad i extensions." -"partialClone" +#: builtin/fetch.c:1583 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "kunde inte hämta \"%s\" (felkod: %d)\n" -#: builtin/fetch.c:1549 +#: builtin/fetch.c:1685 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -12905,44 +12980,44 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:1586 +#: builtin/fetch.c:1722 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1637 +#: builtin/fetch.c:1774 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1639 +#: builtin/fetch.c:1776 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1781 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1783 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1662 +#: builtin/fetch.c:1799 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1664 +#: builtin/fetch.c:1801 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1673 +#: builtin/fetch.c:1810 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1817 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:1696 +#: builtin/fetch.c:1835 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13284,7 +13359,7 @@ msgstr "%s: objekt saknas" msgid "invalid parameter: expected sha1, got '%s'" msgstr "ogiltig parameter: förväntade sha1, fick \"%s\"" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<flaggor>]" @@ -13298,17 +13373,17 @@ msgstr "Misslyckades ta status (fstat) på %s: %s" msgid "failed to parse '%s' value '%s'" msgstr "misslyckades tolka \"%s\" värde \"%s\"" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13323,52 +13398,52 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:546 +#: builtin/gc.c:545 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:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "packa om alla paket förutom det största paketet" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "kunde inte tolka värdet %s för gc.logexpiry" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "kunde inte tolka värdet %s för prune expiry" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, 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:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, 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:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13376,7 +13451,7 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -13402,257 +13477,257 @@ msgstr "felaktigt antal trådar angivet (%d) för %s" #. grep.threads #. #: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2722 +#: builtin/pack-objects.c:2708 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:650 #, c-format msgid "unable to grep from object of type %s" msgstr "kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:714 +#: builtin/grep.c:716 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:813 +#: builtin/grep.c:815 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:815 +#: builtin/grep.c:817 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:817 +#: builtin/grep.c:819 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:819 +#: builtin/grep.c:821 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:821 +#: builtin/grep.c:823 msgid "recursively search in each submodule" msgstr "sök varje undermodul rekursivt" -#: builtin/grep.c:824 +#: builtin/grep.c:826 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:826 +#: builtin/grep.c:828 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:828 +#: builtin/grep.c:830 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:830 +#: builtin/grep.c:832 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:832 +#: builtin/grep.c:834 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:835 +#: builtin/grep.c:837 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:837 +#: builtin/grep.c:839 msgid "search in subdirectories (default)" msgstr "sök i underkataloger (standard)" -#: builtin/grep.c:839 +#: builtin/grep.c:841 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:843 +#: builtin/grep.c:845 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:846 +#: builtin/grep.c:848 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:849 +#: builtin/grep.c:851 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:852 +#: builtin/grep.c:854 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:855 +#: builtin/grep.c:857 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:856 +#: builtin/grep.c:858 msgid "show column number of first match" msgstr "visa kolumnnummer för första träff" -#: builtin/grep.c:857 +#: builtin/grep.c:859 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:858 +#: builtin/grep.c:860 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:860 +#: builtin/grep.c:862 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:862 +#: builtin/grep.c:864 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:864 +#: builtin/grep.c:866 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:869 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:869 +#: builtin/grep.c:871 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:872 +#: builtin/grep.c:874 msgid "show only matching parts of a line" msgstr "visa endast träffade delar av rader" -#: builtin/grep.c:874 +#: builtin/grep.c:876 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:875 +#: builtin/grep.c:877 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:877 +#: builtin/grep.c:879 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:879 +#: builtin/grep.c:881 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:882 +#: builtin/grep.c:884 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:885 +#: builtin/grep.c:887 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:887 +#: builtin/grep.c:889 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:890 +#: builtin/grep.c:892 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:895 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:895 +#: builtin/grep.c:897 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:898 +#: builtin/grep.c:900 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:900 +#: builtin/grep.c:902 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:902 +#: builtin/grep.c:904 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:914 +#: builtin/grep.c:916 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:916 +#: builtin/grep.c:918 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:918 +#: builtin/grep.c:920 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:922 +#: builtin/grep.c:924 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:926 +#: builtin/grep.c:928 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:990 +#: builtin/grep.c:992 msgid "no pattern given" msgstr "inget mönster angavs" -#: builtin/grep.c:1026 +#: builtin/grep.c:1028 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index och --untracked kan inte användas med revisioner" -#: builtin/grep.c:1034 +#: builtin/grep.c:1036 #, c-format msgid "unable to resolve revision: %s" msgstr "kan inte slå upp revision: %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1067 msgid "invalid option combination, ignoring --threads" msgstr "ogiltig kombination av flaggor, ignorerar --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3405 +#: builtin/grep.c:1070 builtin/pack-objects.c:3400 msgid "no threads support, ignoring --threads" msgstr "trådstöd saknas, ignorerar --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719 +#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1096 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1117 +#: builtin/grep.c:1119 msgid "option not supported with --recurse-submodules" msgstr "flaggan stöds inte med --recurse-submodules" -#: builtin/grep.c:1123 +#: builtin/grep.c:1125 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached och --untracked kan inte användas med --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1131 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:1137 +#: builtin/grep.c:1139 msgid "both --cached and trees are given" msgstr "både --cached och träd angavs" @@ -13837,7 +13912,7 @@ msgstr "indataläsfel" msgid "used more bytes than were available" msgstr "använde fler byte än tillgängligt" -#: builtin/index-pack.c:288 builtin/pack-objects.c:600 +#: builtin/index-pack.c:288 builtin/pack-objects.c:604 msgid "pack too large for current definition of off_t" msgstr "paket för stort för nuvarande definition av off_t" @@ -13903,8 +13978,8 @@ msgstr "allvarlig inflate-inkonsekvens" msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:153 -#: builtin/pack-objects.c:213 builtin/pack-objects.c:307 +#: builtin/index-pack.c:738 builtin/pack-objects.c:157 +#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" @@ -13965,7 +14040,7 @@ msgstr "förvirrad bortom vanvett i parse_pack_objects()" msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491 +#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" @@ -14030,7 +14105,7 @@ msgstr "kan inte spara paketfil" msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730 +#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" @@ -14277,128 +14352,108 @@ msgstr "git show [<flaggor>] <objekt>..." msgid "invalid --decorate option: %s" msgstr "ogiltig flagga för --decorate: %s" -#: builtin/log.c:160 -msgid "" -"log.mailmap is not set; its implicit value will change in an\n" -"upcoming release. To squelch this message and preserve current\n" -"behaviour, set the log.mailmap configuration value to false.\n" -"\n" -"To squelch this message and adopt the new behaviour now, set the\n" -"log.mailmap configuration value to true.\n" -"\n" -"See 'git help config' and search for 'log.mailmap' for further information." -msgstr "" -"log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" -"version. För att dölja det här meddelandet och behålla nuvarande\n" -"beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" -"\n" -"För att dölja det här meddelandet och använda det nya beteendet,\n" -"sätt konfigurationsvariabeln log.mailmap till true.\n" -"\n" -"Se \"git help config\" och sök efter \"log.mailmap\" för mer information." - -#: builtin/log.c:183 +#: builtin/log.c:173 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:184 +#: builtin/log.c:174 msgid "Use mail map file" msgstr "Använd e-postmappningsfil" -#: builtin/log.c:186 +#: builtin/log.c:176 msgid "only decorate refs that match <pattern>" msgstr "dekorera endast referenser som motsvarar <mönster>" -#: builtin/log.c:188 +#: builtin/log.c:178 msgid "do not decorate refs that match <pattern>" msgstr "dekorera inte referenser som motsvarar <mönster>" -#: builtin/log.c:189 +#: builtin/log.c:179 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:192 +#: builtin/log.c:182 msgid "Process line range n,m in file, counting from 1" msgstr "Behandla radintervallet n,m i filen, med början på 1" -#: builtin/log.c:297 +#: builtin/log.c:280 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:551 +#: builtin/log.c:534 #, c-format msgid "git show %s: bad file" msgstr "git show %s: felaktig fil" -#: builtin/log.c:566 builtin/log.c:660 +#: builtin/log.c:549 builtin/log.c:644 #, c-format msgid "could not read object %s" msgstr "kunde inte läsa objektet %s" -#: builtin/log.c:685 +#: builtin/log.c:669 #, c-format msgid "unknown type: %d" msgstr "okänd typ: %d" -#: builtin/log.c:808 +#: builtin/log.c:792 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:925 +#: builtin/log.c:909 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:941 +#: builtin/log.c:925 #, c-format msgid "cannot open patch file %s" msgstr "kan inte öppna patchfilen %s" -#: builtin/log.c:958 +#: builtin/log.c:942 msgid "need exactly one range" msgstr "behöver precis ett intervall" -#: builtin/log.c:968 +#: builtin/log.c:952 msgid "not a range" msgstr "inte ett intervall" -#: builtin/log.c:1091 +#: builtin/log.c:1075 msgid "cover letter needs email format" msgstr "omslagsbrevet behöver e-postformat" -#: builtin/log.c:1097 +#: builtin/log.c:1081 msgid "failed to create cover-letter file" msgstr "misslyckades skapa fil för omslagsbrev" -#: builtin/log.c:1176 +#: builtin/log.c:1160 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:1203 +#: builtin/log.c:1187 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:1261 +#: builtin/log.c:1245 msgid "two output directories?" msgstr "två utdatakataloger?" -#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 +#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130 #, c-format msgid "unknown commit %s" msgstr "okänd incheckning %s" -#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1366 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:1387 +#: builtin/log.c:1371 msgid "could not find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1391 +#: builtin/log.c:1375 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" @@ -14408,216 +14463,216 @@ 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:1411 +#: builtin/log.c:1395 msgid "failed to find exact merge base" msgstr "kunde inte hitta exakt sammanslagningsbas" -#: builtin/log.c:1422 +#: builtin/log.c:1406 msgid "base commit should be the ancestor of revision list" msgstr "basincheckningen bör vara förfader till revisionslistan" -#: builtin/log.c:1426 +#: builtin/log.c:1410 msgid "base commit shouldn't be in revision list" msgstr "basincheckningen bör inte vara i revisionslistan" -#: builtin/log.c:1479 +#: builtin/log.c:1463 msgid "cannot get patch id" msgstr "kan inte hämta patch-id" -#: builtin/log.c:1531 +#: builtin/log.c:1515 msgid "failed to infer range-diff ranges" msgstr "misslyckades räkna ut intervall range-diff" -#: builtin/log.c:1576 +#: builtin/log.c:1560 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:1579 +#: builtin/log.c:1563 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1583 +#: builtin/log.c:1567 msgid "print patches to standard out" msgstr "skriv patcharna på standard ut" -#: builtin/log.c:1585 +#: builtin/log.c:1569 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1587 +#: builtin/log.c:1571 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1588 +#: builtin/log.c:1572 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1589 +#: builtin/log.c:1573 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1591 +#: builtin/log.c:1575 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1593 +#: builtin/log.c:1577 msgid "mark the series as Nth re-roll" msgstr "markera serien som N:te försök" -#: builtin/log.c:1595 +#: builtin/log.c:1579 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Använd [RFC PATCH] istället för [PATCH]" -#: builtin/log.c:1598 +#: builtin/log.c:1582 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1601 +#: builtin/log.c:1585 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1604 +#: builtin/log.c:1588 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1607 +#: builtin/log.c:1591 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1609 +#: builtin/log.c:1593 msgid "output all-zero hash in From header" msgstr "använd hashvärde med nollor i From-huvud" -#: builtin/log.c:1611 +#: builtin/log.c:1595 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1613 +#: builtin/log.c:1597 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1615 +#: builtin/log.c:1599 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1616 +#: builtin/log.c:1600 msgid "header" msgstr "huvud" -#: builtin/log.c:1617 +#: builtin/log.c:1601 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1618 builtin/log.c:1620 +#: builtin/log.c:1602 builtin/log.c:1604 msgid "email" msgstr "epost" -#: builtin/log.c:1618 +#: builtin/log.c:1602 msgid "add To: header" msgstr "lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1620 +#: builtin/log.c:1604 msgid "add Cc: header" msgstr "lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1622 +#: builtin/log.c:1606 msgid "ident" msgstr "ident" -#: builtin/log.c:1623 +#: builtin/log.c:1607 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:1625 +#: builtin/log.c:1609 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1626 +#: builtin/log.c:1610 msgid "make first mail a reply to <message-id>" msgstr "gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1627 builtin/log.c:1630 +#: builtin/log.c:1611 builtin/log.c:1614 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1628 +#: builtin/log.c:1612 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1631 +#: builtin/log.c:1615 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1635 +#: builtin/log.c:1619 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1637 +#: builtin/log.c:1621 msgid "signature" msgstr "signatur" -#: builtin/log.c:1638 +#: builtin/log.c:1622 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1639 +#: builtin/log.c:1623 msgid "base-commit" msgstr "basincheckning" -#: builtin/log.c:1640 +#: builtin/log.c:1624 msgid "add prerequisite tree info to the patch series" msgstr "lägg till förhandskrävd trädinfo i patchserien" -#: builtin/log.c:1642 +#: builtin/log.c:1626 msgid "add a signature from a file" msgstr "lägg till signatur från fil" -#: builtin/log.c:1643 +#: builtin/log.c:1627 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1645 +#: builtin/log.c:1629 msgid "show progress while generating patches" msgstr "visa förloppsindikator medan patchar skapas" -#: builtin/log.c:1647 +#: builtin/log.c:1631 msgid "show changes against <rev> in cover letter or single patch" msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch" -#: builtin/log.c:1650 +#: builtin/log.c:1634 msgid "show changes against <refspec> in cover letter or single patch" msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch" -#: builtin/log.c:1652 +#: builtin/log.c:1636 msgid "percentage by which creation is weighted" msgstr "procent som skapelse vägs med" -#: builtin/log.c:1727 +#: builtin/log.c:1711 #, c-format msgid "invalid ident line: %s" msgstr "ogiltig ident-rad: %s" -#: builtin/log.c:1742 +#: builtin/log.c:1726 msgid "-n and -k are mutually exclusive" msgstr "-n och -k kan inte användas samtidigt" -#: builtin/log.c:1744 +#: builtin/log.c:1728 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt" -#: builtin/log.c:1752 +#: builtin/log.c:1736 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1754 +#: builtin/log.c:1738 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1756 +#: builtin/log.c:1740 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1788 +#: builtin/log.c:1773 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" @@ -14792,7 +14847,7 @@ msgstr "" 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:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 msgid "exec" msgstr "exec" @@ -14901,32 +14956,32 @@ msgstr "Tillgängliga strategier är:" msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:244 builtin/pull.c:152 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:247 builtin/pull.c:154 +#: builtin/merge.c:247 builtin/pull.c:155 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:248 builtin/pull.c:158 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:250 builtin/pull.c:161 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:253 builtin/pull.c:166 +#: builtin/merge.c:253 builtin/pull.c:167 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:255 builtin/pull.c:170 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:257 builtin/pull.c:173 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" @@ -14934,28 +14989,28 @@ msgstr "redigera meddelande innan incheckning" msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:261 builtin/pull.c:180 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:265 builtin/pull.c:183 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:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 +#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:267 builtin/pull.c:188 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:268 builtin/pull.c:191 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:269 builtin/pull.c:192 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" @@ -14975,13 +15030,13 @@ msgstr "--abort men lämna index och arbetskatalog ensamma" msgid "continue the current in-progress merge" msgstr "fortsätt den pågående sammanslagningen" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:284 builtin/pull.c:199 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" #: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "bekräfta commit-msg-krok" +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "förbigå pre-merge-commit- och commit-msg-krokar" #: builtin/merge.c:307 msgid "could not run stash." @@ -15024,33 +15079,33 @@ msgstr "\"%s\" verkar inte peka på en incheckning" msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:708 +#: builtin/merge.c:705 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:722 +#: builtin/merge.c:719 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:734 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:789 +#: builtin/merge.c:786 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:798 +#: builtin/merge.c:795 #, 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:804 +#: builtin/merge.c:801 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" @@ -15061,11 +15116,11 @@ msgstr "" "temagren.\n" "\n" -#: builtin/merge.c:809 +#: builtin/merge.c:806 msgid "An empty message aborts the commit.\n" msgstr "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/merge.c:812 +#: builtin/merge.c:809 #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" @@ -15074,73 +15129,73 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:862 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:872 +#: builtin/merge.c:877 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:938 #, 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:972 +#: builtin/merge.c:977 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:974 +#: builtin/merge.c:979 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:976 +#: builtin/merge.c:981 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:981 +#: builtin/merge.c:986 #, 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:1038 +#: builtin/merge.c:1043 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1141 +#: builtin/merge.c:1146 #, 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:1175 +#: builtin/merge.c:1180 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1278 +#: builtin/merge.c:1283 msgid "--abort expects no arguments" msgstr "--abort tar inga argument" -#: builtin/merge.c:1282 +#: builtin/merge.c:1287 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1296 msgid "--quit expects no arguments" msgstr "--quit tar inga argument" -#: builtin/merge.c:1304 +#: builtin/merge.c:1309 msgid "--continue expects no arguments" msgstr "--continue tar inga argument" -#: builtin/merge.c:1308 +#: builtin/merge.c:1313 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1329 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15148,7 +15203,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1331 +#: builtin/merge.c:1336 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15156,96 +15211,96 @@ 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:1334 +#: builtin/merge.c:1339 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:1348 +#: builtin/merge.c:1353 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1355 msgid "You cannot combine --squash with --commit." msgstr "Du kan inte kombinera --squash med --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1371 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1383 +#: builtin/merge.c:1388 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1385 +#: builtin/merge.c:1390 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:1390 +#: builtin/merge.c:1395 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1392 +#: builtin/merge.c:1397 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:1471 +#: builtin/merge.c:1476 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1480 +#: builtin/merge.c:1485 msgid "Already up to date." msgstr "Redan à jour." -#: builtin/merge.c:1490 +#: builtin/merge.c:1495 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1537 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1544 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1569 msgid "Already up to date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1575 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1598 builtin/merge.c:1663 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1602 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1654 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1656 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1665 #, 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:1672 +#: builtin/merge.c:1677 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15331,33 +15386,33 @@ msgstr "varna inte om konflikter" msgid "set labels for file1/orig-file/file2" msgstr "sätt etiketter för fil1/origfil/fil2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "okänd flagga %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "kunde inte tolka objektet \"%s\"" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s." msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "kunde inte bestämma referensen \"%s\"" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Slår ihop %s med %s\n" @@ -15499,52 +15554,52 @@ 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:277 builtin/remote.c:717 builtin/repack.c:520 +#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:356 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<flaggor>] <incheckning>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:357 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<flaggor>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:358 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<flaggor>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:415 msgid "print only names (no SHA-1)" msgstr "skriv endast namn (ingen SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:416 msgid "only use tags to name the commits" msgstr "använd endast taggar för att namnge incheckningar" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:418 msgid "only use refs matching <pattern>" msgstr "använd endast referenser som motsvarar <mönster>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:420 msgid "ignore refs matching <pattern>" msgstr "ignorera referenser som motsvarar <mönster>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:422 msgid "list all commits reachable from all refs" msgstr "lista alla incheckningar som kan nås alla referenser" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:423 msgid "read from stdin" msgstr "läs från standard in" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:424 msgid "allow to print `undefined` names (default)" msgstr "tillåt att skriva \"odefinierade\" namn (standard)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:430 msgid "dereference tags in the input (internal use)" msgstr "avreferera taggar i indata (används internt)" @@ -15943,7 +15998,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:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "ta inte bort, bara visa" @@ -15959,7 +16014,7 @@ msgstr "anteckningar-ref" msgid "use notes from <notes-ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1607 #, c-format msgid "unknown subcommand: %s" msgstr "okänt underkommando: %s" @@ -15976,125 +16031,125 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:424 +#: builtin/pack-objects.c:428 #, c-format msgid "bad packed object CRC for %s" msgstr "felaktig CRC för packat objekt %s" -#: builtin/pack-objects.c:435 +#: builtin/pack-objects.c:439 #, c-format msgid "corrupt packed object for %s" msgstr "trasigt packat objekt för %s" -#: builtin/pack-objects.c:566 +#: builtin/pack-objects.c:570 #, c-format msgid "recursive delta detected for object %s" msgstr "rekursivt delta upptäcktes för objektet %s" -#: builtin/pack-objects.c:777 +#: builtin/pack-objects.c:781 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "ordnade %u objekt, förväntade %<PRIu32>" -#: builtin/pack-objects.c:790 +#: builtin/pack-objects.c:794 #, c-format msgid "packfile is invalid: %s" msgstr "packfil är ogiltig: %s" -#: builtin/pack-objects.c:794 +#: builtin/pack-objects.c:798 #, c-format msgid "unable to open packfile for reuse: %s" msgstr "kan inte öppna packfil för återanvändning: %s" -#: builtin/pack-objects.c:798 +#: builtin/pack-objects.c:802 msgid "unable to seek in reused packfile" msgstr "kan inte söka i återanvänd packfil" -#: builtin/pack-objects.c:809 +#: builtin/pack-objects.c:813 msgid "unable to read from reused packfile" msgstr "kan inte läsa från återanvänd packfil" -#: builtin/pack-objects.c:837 +#: builtin/pack-objects.c:841 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:850 +#: builtin/pack-objects.c:854 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:912 builtin/update-index.c:89 +#: builtin/pack-objects.c:917 builtin/update-index.c:89 #, c-format msgid "failed to stat %s" msgstr "misslyckades ta status på %s" -#: builtin/pack-objects.c:965 +#: builtin/pack-objects.c:970 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades" -#: builtin/pack-objects.c:1161 +#: builtin/pack-objects.c:1164 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:1591 +#: builtin/pack-objects.c:1592 #, 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:1600 +#: builtin/pack-objects.c:1601 #, 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:1869 +#: builtin/pack-objects.c:1870 msgid "Counting objects" msgstr "Räknar objekt" -#: builtin/pack-objects.c:1999 +#: builtin/pack-objects.c:2000 #, c-format msgid "unable to get size of %s" msgstr "kan inte hämta storlek på %s" -#: builtin/pack-objects.c:2014 +#: builtin/pack-objects.c:2015 #, c-format msgid "unable to parse object header of %s" msgstr "kunde inte tolka objekthuvud för %s" -#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100 -#: builtin/pack-objects.c:2110 +#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101 +#: builtin/pack-objects.c:2111 #, c-format msgid "object %s cannot be read" msgstr "objektet %s kunde inte läsas" -#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114 +#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115 #, 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:2124 +#: builtin/pack-objects.c:2125 msgid "suboptimal pack - out of memory" msgstr "icke-optimalt pack - minnet slut" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2440 #, c-format msgid "Delta compression using up to %d threads" msgstr "Deltakomprimering använder upp till %d trådar" -#: builtin/pack-objects.c:2582 +#: builtin/pack-objects.c:2572 #, 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:2669 +#: builtin/pack-objects.c:2659 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2665 msgid "inconsistency with delta count" msgstr "deltaräknaren är inkonsekvent" -#: builtin/pack-objects.c:2756 +#: builtin/pack-objects.c:2742 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16103,7 +16158,7 @@ msgstr "" "förväntade kant-objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2748 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16112,239 +16167,243 @@ msgstr "" "förväntade objekt-id, fick skräp:\n" " %s" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2846 msgid "invalid value for --missing" msgstr "ogiltigt värde för --missing" -#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027 +#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013 msgid "cannot open pack index" msgstr "kan inte öppna paketfilen" -#: builtin/pack-objects.c:2950 +#: builtin/pack-objects.c:2936 #, 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:3035 +#: builtin/pack-objects.c:3021 msgid "unable to force loose object" msgstr "kan inte tvinga lösa objekt" -#: builtin/pack-objects.c:3127 +#: builtin/pack-objects.c:3113 #, c-format msgid "not a rev '%s'" msgstr "inte en referens \"%s\"" -#: builtin/pack-objects.c:3130 +#: builtin/pack-objects.c:3116 #, c-format msgid "bad revision '%s'" msgstr "felaktig revision \"%s\"" -#: builtin/pack-objects.c:3155 +#: builtin/pack-objects.c:3141 msgid "unable to add recent objects" msgstr "kan inte lägga till nya objekt" -#: builtin/pack-objects.c:3208 +#: builtin/pack-objects.c:3194 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:3212 +#: builtin/pack-objects.c:3198 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3228 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3230 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3232 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:3249 +#: builtin/pack-objects.c:3235 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3236 msgid "<version>[,<offset>]" msgstr "<version>[,<offset>]" -#: builtin/pack-objects.c:3251 +#: builtin/pack-objects.c:3237 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3240 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3242 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3244 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3246 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3248 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:3264 +#: builtin/pack-objects.c:3250 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:3266 +#: builtin/pack-objects.c:3252 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3254 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3256 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3258 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:3274 +#: builtin/pack-objects.c:3260 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3262 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3264 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:3281 +#: builtin/pack-objects.c:3267 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3270 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3273 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3276 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:3292 +#: builtin/pack-objects.c:3278 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:3294 +#: builtin/pack-objects.c:3280 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3282 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3284 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:3301 +#: builtin/pack-objects.c:3287 msgid "use the sparse reachability algorithm" msgstr "använd gles-nåbarhetsalgoritmen" -#: builtin/pack-objects.c:3303 +#: builtin/pack-objects.c:3289 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:3305 +#: builtin/pack-objects.c:3291 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3293 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3295 msgid "ignore this pack" msgstr "ignorera detta paket" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3297 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3299 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3301 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:3317 +#: builtin/pack-objects.c:3303 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:3320 +#: builtin/pack-objects.c:3307 +msgid "write a bitmap index if possible" +msgstr "skriv bitkartindex om möjligt" + +#: builtin/pack-objects.c:3311 msgid "handling for missing objects" msgstr "hantering av saknade objekt" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3314 msgid "do not pack objects in promisor packfiles" msgstr "packa inte objekt i kontraktspackfiler" -#: builtin/pack-objects.c:3325 +#: builtin/pack-objects.c:3316 msgid "respect islands during delta compression" msgstr "respektera öar under deltakomprimering" -#: builtin/pack-objects.c:3350 +#: builtin/pack-objects.c:3345 #, 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:3355 +#: builtin/pack-objects.c:3350 #, 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:3409 +#: builtin/pack-objects.c:3404 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 skall överföras" -#: builtin/pack-objects.c:3411 +#: builtin/pack-objects.c:3406 msgid "minimum pack size limit is 1 MiB" msgstr "minsta packstorlek är 1 MiB" -#: builtin/pack-objects.c:3416 +#: builtin/pack-objects.c:3411 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:3419 +#: builtin/pack-objects.c:3414 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt" -#: builtin/pack-objects.c:3425 +#: builtin/pack-objects.c:3420 msgid "cannot use --filter without --stdout" msgstr "kan inte använda --filter utan --stdout" -#: builtin/pack-objects.c:3486 +#: builtin/pack-objects.c:3481 msgid "Enumerating objects" msgstr "Räknar upp objekt" -#: builtin/pack-objects.c:3516 +#: builtin/pack-objects.c:3511 #, c-format msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" msgstr "" @@ -16399,44 +16458,44 @@ msgstr "Felaktigt värde för %s: %s" msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:142 msgid "control for recursive fetching of submodules" msgstr "styrning för rekursiv hämtning av undermoduler" -#: builtin/pull.c:145 +#: builtin/pull.c:146 msgid "Options related to merging" msgstr "Alternativ gällande sammanslagning" -#: builtin/pull.c:148 +#: builtin/pull.c:149 msgid "incorporate changes by rebasing rather than merging" msgstr "inlemma ändringar genom ombasering i stället för sammanslagning" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126 msgid "allow fast-forward" msgstr "tillåt snabbspolning" -#: builtin/pull.c:185 +#: builtin/pull.c:186 msgid "automatically stash/stash pop before and after rebase" msgstr "utför automatiskt stash/stash pop före och efter ombasering" -#: builtin/pull.c:201 +#: builtin/pull.c:202 msgid "Options related to fetching" msgstr "Alternativ gällande hämtningar" -#: builtin/pull.c:211 +#: builtin/pull.c:212 msgid "force overwrite of local branch" msgstr "tvinga överskrivning av lokal gren" -#: builtin/pull.c:219 +#: builtin/pull.c:220 msgid "number of submodules pulled in parallel" msgstr "antal undermoduler som hämtas parallellt" -#: builtin/pull.c:316 +#: builtin/pull.c:320 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Felaktigt värde för pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:437 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16444,14 +16503,14 @@ msgstr "" "Det finns ingen kandidat för ombasering bland referenserna du precis har " "hämtat." -#: builtin/pull.c:435 +#: builtin/pull.c:439 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:436 +#: builtin/pull.c:440 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16459,7 +16518,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:439 +#: builtin/pull.c:443 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16470,42 +16529,42 @@ 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:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Du är inte på någon gren för närvarande." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Ange vilken gren du vill ombasera mot." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Ange vilken gren du vill slå samman med." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:453 builtin/pull.c:468 msgid "See git-pull(1) for details." msgstr "Se git-pull(1) för detaljer." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470 +#: builtin/rebase.c:1353 git-parse-remote.sh:64 msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Det finns ingen spårningsinformation för aktuell gren." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:472 git-parse-remote.sh:95 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:473 +#: builtin/pull.c:477 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16514,32 +16573,32 @@ 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:581 +#: builtin/pull.c:587 #, c-format msgid "unable to access commit %s" msgstr "kunde inte komma åt incheckningen %s" -#: builtin/pull.c:861 +#: builtin/pull.c:867 msgid "ignoring --verify-signatures for rebase" msgstr "ignorera --verify-signatures för ombasering" -#: builtin/pull.c:916 +#: builtin/pull.c:922 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash är endast giltig med --rebase." -#: builtin/pull.c:924 +#: builtin/pull.c:930 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:928 +#: builtin/pull.c:934 msgid "pull with rebase" msgstr "pull med ombasering" -#: builtin/pull.c:929 +#: builtin/pull.c:935 msgid "please commit or stash them." msgstr "checka in eller använd \"stash\" på dem." -#: builtin/pull.c:954 +#: builtin/pull.c:960 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16550,7 +16609,7 @@ msgstr "" "snabbspolar din arbetskatalog från\n" "incheckningen %s." -#: builtin/pull.c:960 +#: builtin/pull.c:966 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16567,15 +16626,15 @@ msgstr "" "$ git reset --hard\n" "för att återgå." -#: builtin/pull.c:975 +#: builtin/pull.c:981 msgid "Cannot merge multiple branches into empty head." msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: builtin/pull.c:979 +#: builtin/pull.c:985 msgid "Cannot rebase onto multiple branches." msgstr "Kan inte ombasera ovanpå flera grenar." -#: builtin/pull.c:986 +#: builtin/pull.c:992 msgid "cannot rebase with locally recorded submodule modifications" msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful" @@ -16734,135 +16793,135 @@ msgstr "" msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:364 +#: builtin/push.c:366 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "felaktigt arkiv \"%s\"" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Ingen destination har angivits.\n" -"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" -"\n" -" git remote add <namn> <url>\n" -"\n" -"och sänd sedan med hjälp av fjärrnamnet\n" -"\n" -" git push <namn>\n" - -#: builtin/push.c:554 +#: builtin/push.c:541 msgid "repository" msgstr "arkiv" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:542 builtin/send-pack.c:164 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:543 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:558 +#: builtin/push.c:545 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:559 +#: builtin/push.c:546 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:549 builtin/send-pack.c:167 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:551 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<refnamn>:<förvänta>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:552 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "kräv att ref:s tidigare värde är detta" -#: builtin/push.c:568 +#: builtin/push.c:555 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:557 builtin/send-pack.c:175 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:573 +#: builtin/push.c:560 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:563 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:578 +#: builtin/push.c:565 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:579 +#: builtin/push.c:566 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:569 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:571 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:602 +#: builtin/push.c:589 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:604 +#: builtin/push.c:591 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:607 +#: builtin/push.c:611 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:612 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Ingen destination har angivits.\n" +"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n" +"\n" +" git remote add <namn> <url>\n" +"\n" +"och sänd sedan med hjälp av fjärrnamnet\n" +"\n" +" git push <namn>\n" + +#: builtin/push.c:627 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:609 +#: builtin/push.c:629 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:613 +#: builtin/push.c:633 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:615 +#: builtin/push.c:635 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:618 +#: builtin/push.c:638 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:637 +#: builtin/push.c:642 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -16980,11 +17039,11 @@ msgstr "undertryck återkopplingsmeddelanden" #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] [<uppström>] " -"[<gren>]" +"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] " +"[<uppström> [<gren>]]" #: builtin/rebase.c:34 msgid "" @@ -17023,189 +17082,189 @@ msgstr "kunde inte markera som interaktiv" msgid "could not generate todo list" msgstr "Kunde inte skapa attgöra-lista" -#: builtin/rebase.c:382 +#: builtin/rebase.c:383 msgid "a base commit must be provided with --upstream or --onto" msgstr "en basincheckning måste anges med --upstream eller --onto" -#: builtin/rebase.c:437 +#: builtin/rebase.c:438 msgid "git rebase--interactive [<options>]" msgstr "git rebase--interactive [<flaggor>]" -#: builtin/rebase.c:449 +#: builtin/rebase.c:450 msgid "keep empty commits" msgstr "behåll tomma incheckningar" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:452 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "tillåt incheckningar med tomt meddelande" -#: builtin/rebase.c:452 +#: builtin/rebase.c:453 msgid "rebase merge commits" msgstr "ombasera sammanslagningar" -#: builtin/rebase.c:454 +#: builtin/rebase.c:455 msgid "keep original branch points of cousins" msgstr "behåll ursprungliga förgreningspunkter för kusiner" -#: builtin/rebase.c:456 +#: builtin/rebase.c:457 msgid "move commits that begin with squash!/fixup!" msgstr "flytta incheckningar som inleds med squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:458 msgid "sign commits" msgstr "signera incheckningar" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:460 builtin/rebase.c:1427 msgid "display a diffstat of what changed upstream" msgstr "vis diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:461 +#: builtin/rebase.c:462 msgid "continue rebase" msgstr "fortsätt ombasering" -#: builtin/rebase.c:463 +#: builtin/rebase.c:464 msgid "skip commit" msgstr "hoppa över incheckning" -#: builtin/rebase.c:464 +#: builtin/rebase.c:465 msgid "edit the todo list" msgstr "redigera attgöra-listan" -#: builtin/rebase.c:466 +#: builtin/rebase.c:467 msgid "show the current patch" msgstr "visa nuvarande patch" -#: builtin/rebase.c:469 +#: builtin/rebase.c:470 msgid "shorten commit ids in the todo list" msgstr "förkorta inchecknings-id i todo-listan" -#: builtin/rebase.c:471 +#: builtin/rebase.c:472 msgid "expand commit ids in the todo list" msgstr "utöka inchecknings-id i todo-listan" -#: builtin/rebase.c:473 +#: builtin/rebase.c:474 msgid "check the todo list" msgstr "kontrollera todo-listan" -#: builtin/rebase.c:475 +#: builtin/rebase.c:476 msgid "rearrange fixup/squash lines" msgstr "ordna om fixup-/squash-rader" -#: builtin/rebase.c:477 +#: builtin/rebase.c:478 msgid "insert exec commands in todo list" msgstr "lägg in exec-kommandon i todo-listan" -#: builtin/rebase.c:478 +#: builtin/rebase.c:479 msgid "onto" msgstr "ovanpå" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict-revision" msgstr "restrict-revision" -#: builtin/rebase.c:481 +#: builtin/rebase.c:482 msgid "restrict revision" msgstr "begränsa revision" -#: builtin/rebase.c:483 +#: builtin/rebase.c:484 msgid "squash-onto" msgstr "squash-onto" -#: builtin/rebase.c:484 +#: builtin/rebase.c:485 msgid "squash onto" msgstr "tryck ihop ovanpå" -#: builtin/rebase.c:486 +#: builtin/rebase.c:487 msgid "the upstream commit" msgstr "uppströmsincheckningen" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head-name" msgstr "head-name" -#: builtin/rebase.c:488 +#: builtin/rebase.c:489 msgid "head name" msgstr "namn på huvud" -#: builtin/rebase.c:493 +#: builtin/rebase.c:494 msgid "rebase strategy" msgstr "sammanslagningsstrategi" -#: builtin/rebase.c:494 +#: builtin/rebase.c:495 msgid "strategy-opts" msgstr "strategy-opts" -#: builtin/rebase.c:495 +#: builtin/rebase.c:496 msgid "strategy options" msgstr "strategiflaggor" -#: builtin/rebase.c:496 +#: builtin/rebase.c:497 msgid "switch-to" msgstr "switch-to" -#: builtin/rebase.c:497 +#: builtin/rebase.c:498 msgid "the branch or commit to checkout" msgstr "gren eller inchecking att checka ut" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto-name" msgstr "onto-name" -#: builtin/rebase.c:498 +#: builtin/rebase.c:499 msgid "onto name" msgstr "på-namn" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "cmd" msgstr "kmd" -#: builtin/rebase.c:499 +#: builtin/rebase.c:500 msgid "the command to run" msgstr "kommando att köra" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:503 builtin/rebase.c:1510 msgid "automatically re-schedule any `exec` that fails" msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt" -#: builtin/rebase.c:518 +#: builtin/rebase.c:519 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:535 #, c-format msgid "%s requires an interactive rebase" msgstr "%s kräver en interaktiv ombasering" -#: builtin/rebase.c:586 +#: builtin/rebase.c:587 #, c-format msgid "could not get 'onto': '%s'" msgstr "kunde inte hämta \"onto\": \"%s\"" -#: builtin/rebase.c:601 +#: builtin/rebase.c:602 #, c-format msgid "invalid orig-head: '%s'" msgstr "ogiltigt orig-head: \"%s\"" -#: builtin/rebase.c:626 +#: builtin/rebase.c:627 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\"" -#: builtin/rebase.c:702 +#: builtin/rebase.c:703 #, c-format msgid "Could not read '%s'" msgstr "Kunde inte läsa \"%s\"" -#: builtin/rebase.c:720 +#: builtin/rebase.c:721 #, c-format msgid "Cannot store %s" msgstr "Kan inte spara %s" -#: builtin/rebase.c:827 +#: builtin/rebase.c:828 msgid "could not determine HEAD revision" msgstr "kunde inte bestämma HEAD-revision" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:951 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" @@ -17219,7 +17278,7 @@ msgstr "" "För att avbryta och återgå till där du var före ombaseringen, kör \"git " "rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1032 #, c-format msgid "" "\n" @@ -17238,7 +17297,7 @@ msgstr "" "\n" "Därför kan inte git ombasera dessa." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1339 #, c-format msgid "" "%s\n" @@ -17255,7 +17314,7 @@ msgstr "" " git rebase '<gren>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1355 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17268,128 +17327,132 @@ msgstr "" " git branch --set-upstream-to=%s/<gren> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1385 msgid "exec commands cannot contain newlines" msgstr "exec-kommandon kan inte innehålla nyradstecken" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1389 msgid "empty exec command" msgstr "tomt exec-kommando" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1418 msgid "rebase onto given branch instead of upstream" msgstr "ombasera mot given grenen istället för uppström" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1420 +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:1422 msgid "allow pre-rebase hook to run" msgstr "tillåt pre-rebase-krok att köra" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1424 msgid "be quiet. implies --no-stat" msgstr "var tyst. implicerar --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1430 msgid "do not show diffstat of what changed upstream" msgstr "visa inte en diffstat för vad som ändrats uppströms" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1433 msgid "add a Signed-off-by: line to each commit" msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441 msgid "passed to 'git am'" msgstr "sänds till \"git am\"" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1443 builtin/rebase.c:1445 msgid "passed to 'git apply'" msgstr "sänds till \"git apply\"" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1447 builtin/rebase.c:1450 msgid "cherry-pick all commits, even if unchanged" msgstr "utför cherry-pick på alla incheckningar, även om oändrad" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1452 msgid "continue" msgstr "fortsätt" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1455 msgid "skip current patch and continue" msgstr "hoppa över nuvarande patch och fortsätt" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1457 msgid "abort and check out the original branch" msgstr "avbryt och checka ut ursprungsgrenen" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1460 msgid "abort but keep HEAD where it is" msgstr "avbryt men behåll HEAD där det är" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1461 msgid "edit the todo list during an interactive rebase" msgstr "redigera attgöra-listan under interaktiv ombasering." -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1464 msgid "show the patch file being applied or merged" msgstr "visa patchen som tillämpas eller slås samman" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1467 msgid "use merging strategies to rebase" msgstr "använd sammanslagningsstrategier för sammanslagning" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1471 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:1451 +#: builtin/rebase.c:1475 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:1455 +#: builtin/rebase.c:1479 msgid "preserve empty commits during rebase" msgstr "behåll tomma incheckningar under ombasering" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1481 msgid "move commits that begin with squash!/fixup! under -i" msgstr "flytta incheckningar som börjar med squash!/fixup! under -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1487 msgid "automatically stash/stash pop before and after" msgstr "utför automatiskt stash/stash pop före och efter" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1489 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:1469 +#: builtin/rebase.c:1493 msgid "allow rebasing commits with empty messages" msgstr "tillåt ombasering av incheckningar med tomt meddelande" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1496 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:1475 +#: builtin/rebase.c:1499 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:1477 +#: builtin/rebase.c:1501 msgid "use the given merge strategy" msgstr "använd angiven sammanslagningsstrategi" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1503 builtin/revert.c:115 msgid "option" msgstr "alternativ" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1504 msgid "pass the argument through to the merge strategy" msgstr "sänd flaggan till sammanslagningsstrategin" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1507 msgid "rebase all reachable commits up to the root(s)" msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1524 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17397,29 +17460,37 @@ 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:1506 +#: builtin/rebase.c:1530 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:1547 +#: builtin/rebase.c:1571 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:1551 +#: builtin/rebase.c:1576 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "kan inte kombinera \"--keep-base\" med \"--onto\"" + +#: builtin/rebase.c:1578 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "kan inte kombinera \"--keep-base\" med \"--root\"" + +#: builtin/rebase.c:1582 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1586 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:1578 +#: builtin/rebase.c:1609 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1621 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17427,16 +17498,16 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1640 msgid "could not discard worktree changes" msgstr "kunde inte kasta ändringar i arbetskatalogen" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1659 #, c-format msgid "could not move back to %s" msgstr "kunde inte flytta tillbaka till %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1704 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17457,167 +17528,159 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1725 msgid "switch `C' expects a numerical value" msgstr "flaggan \"C\" förväntar ett numeriskt värde" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1766 #, c-format msgid "Unknown mode: %s" msgstr "Okänt läge: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1788 msgid "--strategy requires --merge or --interactive" msgstr "--strategy kräver --merge eller --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1828 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec kräver --exec eller --interactive" -#: builtin/rebase.c:1809 +#: builtin/rebase.c:1840 msgid "cannot combine am options with either interactive or merge options" msgstr "" "kan inte kombinera am-flaggor med varken interaktiv- eller " "sammanslagningsflaggor" -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1859 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\"" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1863 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec" "\"" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy\"" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1887 #, c-format msgid "invalid upstream '%s'" msgstr "felaktig uppström \"%s\"" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1893 msgid "Could not create new root commit" msgstr "kunde inte skapa ny rotincheckning" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:1919 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "\"%s\": behöver precis en sammanslagningsbas med gren" + +#: builtin/rebase.c:1922 #, c-format msgid "'%s': need exactly one merge base" msgstr "\"%s\": behöver precis en sammanslagningsbas" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:1930 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "Pekar inte på en giltig incheckning: \"%s\"" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:1955 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\"" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 +#: builtin/rebase.c:1963 builtin/submodule--helper.c:38 #: builtin/submodule--helper.c:1934 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:1974 msgid "Could not resolve HEAD to a revision" msgstr "Kunde inte bestämma HEAD:s incheckning" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2012 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2015 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Oväntat svar från stash: \"%s\"" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2021 #, c-format msgid "Could not create directory for '%s'" msgstr "Kunde inte skapa katalog för \"%s\"" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2024 #, c-format msgid "Created autostash: %s\n" msgstr "Skapade autostash: %s\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2027 msgid "could not reset --hard" msgstr "kunde inte utföra \"reset --hard\"" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD är nu på %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2036 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: builtin/rebase.c:2040 +#: builtin/rebase.c:2063 #, c-format msgid "could not parse '%s'" msgstr "kunde inte tolka \"%s\"" -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2076 #, c-format msgid "could not switch to %s" msgstr "kunde inte växla till %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2087 msgid "HEAD is up to date." msgstr "HEAD är à jour." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2089 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Aktuell gren %s är à jour.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2097 msgid "HEAD is up to date, rebase forced." msgstr "HEAD är à jour, ombasering framtvingad." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2099 #, 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:2084 +#: builtin/rebase.c:2107 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2114 #, c-format msgid "Changes to %s:\n" msgstr "Ändringar till %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2117 #, c-format msgid "Changes from %s to %s:\n" msgstr "Ändringar från %s till %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2142 #, 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:2128 +#: builtin/rebase.c:2151 msgid "Could not detach HEAD" msgstr "Kunde inte koppla från HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2160 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Snabbspolade %s till %s.\n" @@ -17626,7 +17689,7 @@ msgstr "Snabbspolade %s till %s.\n" msgid "git receive-pack <git-dir>" msgstr "git receive-pack <git-katalog>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:830 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -17656,7 +17719,7 @@ msgstr "" "För att undvika detta meddelande och fortfarande behålla det\n" "normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:850 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -17677,11 +17740,11 @@ msgstr "" "\n" "För att undvika detta meddelande kan du sätta det till \"refuse\"." -#: builtin/receive-pack.c:1938 +#: builtin/receive-pack.c:1936 msgid "quiet" msgstr "tyst" -#: builtin/receive-pack.c:1952 +#: builtin/receive-pack.c:1950 msgid "You must specify a directory." msgstr "Du måste ange en katalog." @@ -18251,11 +18314,11 @@ msgstr "var pratsam; måste skrivas före ett underkommando" msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18264,112 +18327,112 @@ msgstr "" "Använd --no-write-bitmap-index eller inaktivera inställningen\n" "pack.writebitmaps" -#: builtin/repack.c:201 +#: builtin/repack.c:191 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:240 builtin/repack.c:418 +#: builtin/repack.c:230 builtin/repack.c:409 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." +"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects." -#: builtin/repack.c:257 +#: builtin/repack.c:247 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:295 +#: builtin/repack.c:285 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:297 +#: builtin/repack.c:287 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:300 +#: builtin/repack.c:290 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:302 +#: builtin/repack.c:292 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:304 +#: builtin/repack.c:294 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:306 +#: builtin/repack.c:296 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:309 +#: builtin/repack.c:299 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:311 +#: builtin/repack.c:301 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:313 +#: builtin/repack.c:303 msgid "pass --delta-islands to git-pack-objects" msgstr "sänd --delta-islands till git-pack-objects" -#: builtin/repack.c:314 +#: builtin/repack.c:304 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:315 +#: builtin/repack.c:305 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:317 +#: builtin/repack.c:307 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:319 +#: builtin/repack.c:309 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:320 builtin/repack.c:326 +#: builtin/repack.c:310 builtin/repack.c:316 msgid "bytes" msgstr "byte" -#: builtin/repack.c:321 +#: builtin/repack.c:311 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:323 +#: builtin/repack.c:313 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:325 +#: builtin/repack.c:315 msgid "limits the maximum number of threads" msgstr "begränsar maximalt antal trådar" -#: builtin/repack.c:327 +#: builtin/repack.c:317 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:329 +#: builtin/repack.c:319 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:331 +#: builtin/repack.c:321 msgid "do not repack this pack" msgstr "packa inte om detta paket" -#: builtin/repack.c:341 +#: builtin/repack.c:331 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:345 +#: builtin/repack.c:335 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:427 +#: builtin/repack.c:418 msgid "Nothing new to pack." msgstr "Inget nytt att packa." -#: builtin/repack.c:488 +#: builtin/repack.c:479 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18388,7 +18451,7 @@ msgstr "" "VARNING: namnet misslyckades också.\n" "VARNING: Byt namn på dem i %s manuellt:\n" -#: builtin/repack.c:536 +#: builtin/repack.c:527 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -18496,8 +18559,8 @@ msgstr "kan inte utföra \"fstat\" på %s" msgid "unable to write object to database" msgstr "kan inte skriva objektet till databasen" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423 +#: builtin/replace.c:453 #, c-format msgid "not a valid object name: '%s'" msgstr "objektnamnet är inte giltigt: \"%s\"" @@ -18516,22 +18579,22 @@ msgstr "misslyckades redigera objektfilen" msgid "new object is the same as the old one: '%s'" msgstr "nytt objekt är samma som det gamla: \"%s\"" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "kunde inte tolka %s som incheckning" -#: builtin/replace.c:414 +#: builtin/replace.c:415 #, c-format msgid "bad mergetag in commit '%s'" msgstr "felaktig sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:416 +#: builtin/replace.c:417 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "felformad sammanslagningstagg i incheckningen \"%s\"" -#: builtin/replace.c:428 +#: builtin/replace.c:429 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18540,31 +18603,31 @@ msgstr "" "den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s" "\" som har förkastats; använd --edit istället för --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:468 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur" -#: builtin/replace.c:468 +#: builtin/replace.c:469 msgid "the signature will be removed in the replacement commit!" msgstr "signaturen kommer att tas bort i ersättningsincheckningen!" -#: builtin/replace.c:478 +#: builtin/replace.c:479 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "kunde inte skriva ersättningsincheckning för: \"%s\"" -#: builtin/replace.c:486 +#: builtin/replace.c:487 #, c-format msgid "graft for '%s' unnecessary" msgstr "ympning för \"%s\" behövs inte" -#: builtin/replace.c:490 +#: builtin/replace.c:491 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "ny incheckning är samma som den gamla: \"%s\"" -#: builtin/replace.c:525 +#: builtin/replace.c:526 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18573,71 +18636,71 @@ msgstr "" "kunde inte konvertera följande ympning(ar):\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:547 msgid "list replace refs" msgstr "visa ersättningsreferenser" -#: builtin/replace.c:547 +#: builtin/replace.c:548 msgid "delete replace refs" msgstr "ta bort ersättningsreferenser" -#: builtin/replace.c:548 +#: builtin/replace.c:549 msgid "edit existing object" msgstr "redigera befintligt objekt" -#: builtin/replace.c:549 +#: builtin/replace.c:550 msgid "change a commit's parents" msgstr "ändra en inchecknings föräldrar" -#: builtin/replace.c:550 +#: builtin/replace.c:551 msgid "convert existing graft file" msgstr "konvertera befintlig ympningsfil" -#: builtin/replace.c:551 +#: builtin/replace.c:552 msgid "replace the ref if it exists" msgstr "ersätt referensen om den finns" -#: builtin/replace.c:553 +#: builtin/replace.c:554 msgid "do not pretty-print contents for --edit" msgstr "använd inte snygg visning av innehåll för --edit" -#: builtin/replace.c:554 +#: builtin/replace.c:555 msgid "use this format" msgstr "använd detta format" -#: builtin/replace.c:567 +#: builtin/replace.c:568 msgid "--format cannot be used when not listing" msgstr "--format kan inte användas utanför listning" -#: builtin/replace.c:575 +#: builtin/replace.c:576 msgid "-f only makes sense when writing a replacement" msgstr "-f kan endast användas vid skrivning av ersättning" -#: builtin/replace.c:579 +#: builtin/replace.c:580 msgid "--raw only makes sense with --edit" msgstr "--raw kan bara användas med --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:586 msgid "-d needs at least one argument" msgstr "-d behöver minst ett argument" -#: builtin/replace.c:591 +#: builtin/replace.c:592 msgid "bad number of arguments" msgstr "fel antal argument" -#: builtin/replace.c:597 +#: builtin/replace.c:598 msgid "-e needs exactly one argument" msgstr "-e tar exakt ett argument" -#: builtin/replace.c:603 +#: builtin/replace.c:604 msgid "-g needs at least one argument" msgstr "-g tar minst ett argument" -#: builtin/replace.c:609 +#: builtin/replace.c:610 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file tar inga argument" -#: builtin/replace.c:615 +#: builtin/replace.c:616 msgid "only one pattern can be given with -l" msgstr "endast ett mönster kan anges med -l" @@ -18705,13 +18768,18 @@ msgstr "Kunde inte hitta trädet för HEAD." msgid "Failed to find tree of %s." msgstr "Kunde inte hitta trädet för %s." +#: builtin/reset.c:114 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + #: builtin/reset.c:193 #, c-format 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:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" @@ -18795,24 +18863,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:412 +#: builtin/rev-list.c:411 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "kan inte kombinera --exclude-promisor-objects och --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:472 msgid "object filtering requires --objects" msgstr "objektfiltrering kräver --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "ogiltigt värde för sparse: \"%s\"" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:522 msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-list.c:530 +#: builtin/rev-list.c:525 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering" @@ -19350,134 +19413,134 @@ msgstr "konflikter i indexet. Testa utan --index." msgid "could not save index tree" msgstr "kunde inte spara indexträd" -#: builtin/stash.c:434 +#: builtin/stash.c:436 msgid "could not restore untracked files from stash" msgstr "kunde inte återställa ospårade filer från stash-post" -#: builtin/stash.c:448 +#: builtin/stash.c:450 #, c-format msgid "Merging %s with %s" msgstr "Slår ihop %s med %s" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:460 git-legacy-stash.sh:680 msgid "Index was not unstashed." msgstr "Indexet har inte tagits upp ur \"stash\":en" -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "försök återskapa indexet" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Kastade %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Kunde inte kasta \"stash\"-post" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "\"%s\" är inte en \"stash\"-referens" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:694 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:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:712 msgid "No branch name specified" msgstr "Inget grennamn angavs" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Kan inte uppdatera %s med %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506 msgid "stash message" msgstr "\"stash\"-meddelande" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" kräver ett <incheckning>-argument" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1046 git-legacy-stash.sh:217 msgid "No changes selected" msgstr "Inga ändringar valda" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1145 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Du har inte den första incheckningen ännu" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1172 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1181 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Kan inte spara ospårade filer" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 +#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200 #: git-legacy-stash.sh:213 msgid "Cannot save the current worktree state" msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1229 git-legacy-stash.sh:233 msgid "Cannot record working tree state" msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1278 git-legacy-stash.sh:337 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:1285 +#: builtin/stash.c:1294 msgid "Did you forget to 'git add'?" msgstr "Glömde du använda \"git add\"?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1309 git-legacy-stash.sh:345 msgid "No local changes to save" msgstr "Inga lokala ändringar att spara" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1316 git-legacy-stash.sh:350 msgid "Cannot initialize stash" msgstr "Kan inte initiera \"stash\"" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1331 git-legacy-stash.sh:354 msgid "Cannot save the current status" msgstr "Kan inte spara aktuell status" -#: builtin/stash.c:1327 +#: builtin/stash.c:1336 #, c-format msgid "Saved working directory and index state %s" msgstr "Sparade arbetskatalogen och indexstatus %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1426 git-legacy-stash.sh:384 msgid "Cannot remove worktree changes" msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1461 builtin/stash.c:1497 msgid "keep index" msgstr "behåll indexet" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1463 builtin/stash.c:1499 msgid "stash in patch mode" msgstr "\"stash\" i \"patch\"-läge" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1464 builtin/stash.c:1500 msgid "quiet mode" msgstr "tyst läge" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1466 builtin/stash.c:1502 msgid "include untracked files in stash" msgstr "ta med ospårade filer i \"stash\"" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1468 builtin/stash.c:1504 msgid "include ignore files" msgstr "ta med ignorerade filer" -#: builtin/stash.c:1555 +#: builtin/stash.c:1564 #, c-format msgid "could not exec %s" msgstr "kunde inte köra %s" @@ -19846,8 +19909,8 @@ msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" #: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" -msgstr "git submodule--helper update_clone [--prefix=<sökväg>] [<sökväg>...]" +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" +msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]" #: builtin/submodule--helper.c:1890 msgid "bad value for update parameter" @@ -19900,7 +19963,7 @@ msgstr "git submodule--helper config --check-writeable" 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:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2235 git.c:433 git.c:683 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s stöder inte --super-prefix" @@ -20224,139 +20287,139 @@ msgstr " OK" msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<flaggor>] [--] [<fil>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:972 msgid "continue refresh even when index needs update" msgstr "fortsätt uppdatera även när index inte är àjour" -#: builtin/update-index.c:974 +#: builtin/update-index.c:975 msgid "refresh: ignore submodules" msgstr "refresh: ignorera undermoduler" -#: builtin/update-index.c:977 +#: builtin/update-index.c:978 msgid "do not ignore new files" msgstr "ignorera inte nya filer" -#: builtin/update-index.c:979 +#: builtin/update-index.c:980 msgid "let files replace directories and vice-versa" msgstr "låt filer ersätta kataloger och omvänt" -#: builtin/update-index.c:981 +#: builtin/update-index.c:982 msgid "notice files missing from worktree" msgstr "lägg märke till filer som saknas i arbetskatalogen" -#: builtin/update-index.c:983 +#: builtin/update-index.c:984 msgid "refresh even if index contains unmerged entries" msgstr "uppdatera även om indexet innehåller ej sammanslagna poster" -#: builtin/update-index.c:986 +#: builtin/update-index.c:987 msgid "refresh stat information" msgstr "uppdatera statusinformation" -#: builtin/update-index.c:990 +#: builtin/update-index.c:991 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "som --refresh, men ignorera assume-unchanged-inställning" -#: builtin/update-index.c:994 +#: builtin/update-index.c:995 msgid "<mode>,<object>,<path>" msgstr "<läge>,<objekt>,<sökväg>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:996 msgid "add the specified entry to the index" msgstr "lägg till angiven post i indexet" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1006 msgid "mark files as \"not changing\"" msgstr "markera filer som \"ändras inte\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1009 msgid "clear assumed-unchanged bit" msgstr "rensa \"assume-unchanged\"-biten" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1012 msgid "mark files as \"index-only\"" msgstr "markera filer som \"endast index\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1015 msgid "clear skip-worktree bit" msgstr "töm \"skip-worktree\"-biten" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1018 msgid "add to index only; do not add content to object database" msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1020 msgid "remove named paths even if present in worktree" msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1022 msgid "with --stdin: input lines are terminated by null bytes" msgstr "med --stdin: indatarader termineras med null-byte" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1024 msgid "read list of paths to be updated from standard input" msgstr "läs lista över sökvägar att uppdatera från standard in" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1028 msgid "add entries from standard input to the index" msgstr "lägg poster från standard in till indexet" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1032 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "återfyll etapp 2 och 3 från angivna sökvägar" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1036 msgid "only update entries that differ from HEAD" msgstr "uppdatera endast poster som skiljer sig från HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1040 msgid "ignore files missing from worktree" msgstr "ignorera filer som saknas i arbetskatalogen" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1043 msgid "report actions to standard output" msgstr "rapportera åtgärder på standard ut" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1045 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(för porslin) glöm sparade olösta konflikter" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1049 msgid "write index in this format" msgstr "skriv index i detta format" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1051 msgid "enable or disable split index" msgstr "aktivera eller inaktivera delat index" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1053 msgid "enable/disable untracked cache" msgstr "aktivera/inaktivera ospårad cache" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1055 msgid "test if the filesystem supports untracked cache" msgstr "testa om filsystemet stöder ospårad cache" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1057 msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1059 msgid "write out the index even if is not flagged as changed" msgstr "skriv ut indexet även om det inte angivits som ändrat" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1061 msgid "enable or disable file system monitor" msgstr "aktivera eller inaktivera filsystemsövervakning" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1063 msgid "mark files as fsmonitor valid" msgstr "markera filer som \"fsmonitor valid\"" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1066 msgid "clear fsmonitor valid bit" msgstr "töm \"fsmonitor valid\"-bit" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1169 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20364,7 +20427,7 @@ msgstr "" "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen " "vill aktivera delat index" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1178 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20372,7 +20435,7 @@ msgstr "" "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen " "vill inaktivera delat index" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1190 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20380,11 +20443,11 @@ msgstr "" "core.untrackedCache är satt till true; ta bort eller ändra det om du " "verkligen vill inaktivera den ospårade cachen" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1194 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1202 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20392,26 +20455,26 @@ msgstr "" "core.untrackedCache är satt till false; ta bort eller ändra det om du " "verkligen vill aktivera den ospårade cachen" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1206 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1214 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1218 msgid "fsmonitor enabled" msgstr "fsmonitor aktiverat" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1221 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1225 msgid "fsmonitor disabled" msgstr "fsmonitor inaktiverat" @@ -20471,15 +20534,15 @@ msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" -#: builtin/verify-commit.c:20 +#: builtin/verify-commit.c:19 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <incheckning>..." -#: builtin/verify-commit.c:69 +#: builtin/verify-commit.c:68 msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:70 builtin/verify-tag.c:38 +#: builtin/verify-commit.c:69 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -20495,63 +20558,63 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:19 +#: builtin/verify-tag.c:18 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..." -#: builtin/verify-tag.c:37 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehåll för tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<flaggor>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<flaggor>] <sökväg>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <arbetskatalog> <ny-sökväg>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<flaggor>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<flaggor>] <arbetskatalog>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <sökväg>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:898 #, c-format msgid "failed to delete '%s'" msgstr "misslyckades ta bort \"%s\"" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Tar bort worktrees/%s: inte en giltig katalog" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -20560,35 +20623,35 @@ msgstr "" "Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste " "%<PRIuMAX>)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "rapportera borttagna arbetskataloger" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "\"%s\" finns redan" -#: builtin/worktree.c:252 +#: builtin/worktree.c:251 #, c-format msgid "unable to re-add worktree '%s'" msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen" -#: builtin/worktree.c:257 +#: builtin/worktree.c:256 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -20598,7 +20661,7 @@ msgstr "" "använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller " "\"remove\" för att rensa" -#: builtin/worktree.c:259 +#: builtin/worktree.c:258 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -20608,121 +20671,121 @@ msgstr "" "använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för " "att rensa" -#: builtin/worktree.c:309 +#: builtin/worktree.c:308 #, c-format msgid "could not create directory of '%s'" msgstr "kunde inte skapa katalogen \"%s\"" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:439 builtin/worktree.c:445 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Förbereder arbetskatalog (ny gren \"%s\")" -#: builtin/worktree.c:442 +#: builtin/worktree.c:441 #, 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:451 +#: builtin/worktree.c:450 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Förbereder arbetskatalog (checkar ut \"%s\")" -#: builtin/worktree.c:457 +#: builtin/worktree.c:456 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:497 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:501 +#: builtin/worktree.c:500 msgid "create a new branch" msgstr "skapa en ny gren" -#: builtin/worktree.c:503 +#: builtin/worktree.c:502 msgid "create or reset a branch" msgstr "skapa eller återställ en gren" -#: builtin/worktree.c:505 +#: builtin/worktree.c:504 msgid "populate the new working tree" msgstr "befolka den nya arbetskatalogen" -#: builtin/worktree.c:506 +#: builtin/worktree.c:505 msgid "keep the new working tree locked" msgstr "låt arbetskatalogen förbli låst" -#: builtin/worktree.c:509 +#: builtin/worktree.c:508 msgid "set up tracking mode (see git-branch(1))" msgstr "ställ in spårningsläge (se git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:511 msgid "try to match the new branch name with a remote-tracking branch" msgstr "försök matcha namn på ny gren mot en fjärrspårande gren" -#: builtin/worktree.c:520 +#: builtin/worktree.c:519 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:581 +#: builtin/worktree.c:580 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:681 +#: builtin/worktree.c:680 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799 +#: builtin/worktree.c:926 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:694 builtin/worktree.c:727 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:700 +#: builtin/worktree.c:699 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:701 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:730 +#: builtin/worktree.c:729 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" -#: builtin/worktree.c:771 +#: builtin/worktree.c:770 msgid "working trees containing submodules cannot be moved or removed" msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort" -#: builtin/worktree.c:779 +#: builtin/worktree.c:778 msgid "force move even if worktree is dirty or locked" msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:801 builtin/worktree.c:928 #, c-format msgid "'%s' is a main working tree" msgstr "\"%s\" är inte en huvudarbetskatalog" -#: builtin/worktree.c:807 +#: builtin/worktree.c:806 #, c-format msgid "could not figure out destination name from '%s'" msgstr "kunde inte lista ut målnamn från \"%s\"" -#: builtin/worktree.c:813 +#: builtin/worktree.c:812 #, c-format msgid "target '%s' already exists" msgstr "målet \"%s\" finns redan" -#: builtin/worktree.c:821 +#: builtin/worktree.c:820 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -20731,7 +20794,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:823 +#: builtin/worktree.c:822 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -20739,36 +20802,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:826 +#: builtin/worktree.c:825 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:830 #, c-format msgid "failed to move '%s' to '%s'" msgstr "misslyckades flytta \"%s\" till \"%s\"" -#: builtin/worktree.c:879 +#: builtin/worktree.c:878 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "misslyckades köra \"git status\" på \"%s\"" -#: builtin/worktree.c:883 +#: builtin/worktree.c:882 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "\"%s\" är smutsigt, använd --force för att ta bort det" +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:888 +#: builtin/worktree.c:887 #, 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:911 +#: builtin/worktree.c:910 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:934 +#: builtin/worktree.c:933 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -20777,7 +20842,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:936 +#: builtin/worktree.c:935 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -20785,7 +20850,7 @@ 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:939 +#: builtin/worktree.c:938 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s" @@ -20806,6 +20871,16 @@ msgstr "visa trädobjekt för underkatalogen <prefix>" msgid "only useful for debugging" msgstr "endast användbart vid felsökning" +#: fast-import.c:3118 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Förväntade \"mark\"-kommando, fick %s" + +#: fast-import.c:3123 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Förväntade \"to\"-kommando, fick %s" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -20918,39 +20993,39 @@ msgstr "" "aliaset \"%s\" ändrar miljövariabler.\n" "Du kan använda \"!git\" i aliaset för att göra det" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "tomt alias för %s" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "rekursivt alias: %s" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "skrivfel på standard ut" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "okänt skrivfel på standard ut" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "stäng misslyckades på standard ut" -#: git.c:796 +#: git.c:792 #, 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:846 +#: git.c:842 #, c-format msgid "cannot handle %s as a builtin" msgstr "kan inte hantera %s som inbyggd" -#: git.c:859 +#: git.c:855 #, c-format msgid "" "usage: %s\n" @@ -20959,13 +21034,13 @@ msgstr "" "användning: %s\n" "\n" -#: git.c:879 +#: git.c:875 #, 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:891 +#: git.c:887 #, c-format msgid "failed to run command '%s': %s\n" msgstr "misslyckades köra kommandot \"%s\": %s\n" @@ -20983,30 +21058,30 @@ msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0" -#: http.c:876 +#: http.c:878 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0" msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0" -#: http.c:949 +#: http.c:951 msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4" -#: http.c:1085 +#: http.c:1088 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:" -#: http.c:1092 +#: http.c:1095 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor" -#: http.c:1096 +#: http.c:1099 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt" -#: http.c:1965 +#: http.c:1968 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21017,128 +21092,128 @@ msgstr "" " bad om: %s\n" " omdirigering: %s" -#: remote-curl.c:157 +#: remote-curl.c:166 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "felaktig citering på värde för push-option: \"%s\"" -#: remote-curl.c:254 +#: remote-curl.c:263 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?" -#: remote-curl.c:355 +#: remote-curl.c:364 msgid "invalid server response; expected service, got flush packet" msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket" -#: remote-curl.c:386 +#: remote-curl.c:395 #, c-format msgid "invalid server response; got '%s'" msgstr "ogiltigt svar från servern; fick \"%s\"" -#: remote-curl.c:446 +#: remote-curl.c:455 #, c-format msgid "repository '%s' not found" msgstr "arkivet \"%s\" hittades inte" -#: remote-curl.c:450 +#: remote-curl.c:459 #, c-format msgid "Authentication failed for '%s'" msgstr "Autentisering misslyckades \"%s\"" -#: remote-curl.c:454 +#: remote-curl.c:463 #, c-format msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: remote-curl.c:460 +#: remote-curl.c:469 #, c-format msgid "redirecting to %s" msgstr "omdirigerar till %s" -#: remote-curl.c:584 +#: remote-curl.c:593 msgid "shouldn't have EOF when not gentle on EOF" msgstr "borde inte ha EOF när inte försiktig på EOF" -#: remote-curl.c:664 +#: remote-curl.c:673 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer" -#: remote-curl.c:724 +#: remote-curl.c:733 #, c-format msgid "RPC failed; %s" msgstr "RPC misslyckades; %s" -#: remote-curl.c:764 +#: remote-curl.c:773 msgid "cannot handle pushes this big" msgstr "kan inte hantera så stora sändningar" -#: remote-curl.c:879 +#: remote-curl.c:888 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "kan inte packa upp anrop; zlib-deflate-fel %d" -#: remote-curl.c:883 +#: remote-curl.c:892 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "kan inte packa upp anrop; zlib-slutfel %d" -#: remote-curl.c:1014 +#: remote-curl.c:1023 msgid "dumb http transport does not support shallow capabilities" msgstr "dum http-transport stöder inte grunda arkiv" -#: remote-curl.c:1028 +#: remote-curl.c:1037 msgid "fetch failed." msgstr "mottagning misslyckades." -#: remote-curl.c:1076 +#: remote-curl.c:1085 msgid "cannot fetch by sha1 over smart http" msgstr "kan inte hämta med sha1 över smart http" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1129 remote-curl.c:1135 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "protokollfel: förväntade sha/ref, fick \"%s\"" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1147 remote-curl.c:1261 #, c-format msgid "http transport does not support %s" msgstr "http-transporten stöder inte %s" -#: remote-curl.c:1174 +#: remote-curl.c:1183 msgid "git-http-push failed" msgstr "git-http-push misslyckades" -#: remote-curl.c:1360 +#: remote-curl.c:1367 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]" -#: remote-curl.c:1392 +#: remote-curl.c:1399 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: fel vid läsning av kommandoström från git" -#: remote-curl.c:1399 +#: remote-curl.c:1406 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: försökte ta emot utan lokalt arkiv" -#: remote-curl.c:1439 +#: remote-curl.c:1446 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: okänt kommando \"%s\" från git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "argument" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "objektfiltrering" -#: parse-options.h:170 +#: parse-options.h:179 msgid "expiry-date" msgstr "giltig-till" -#: parse-options.h:184 +#: parse-options.h:193 msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" @@ -21170,11 +21245,11 @@ 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:68 +#: wt-status.h:67 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.h:69 +#: wt-status.h:68 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " @@ -21385,7 +21460,7 @@ msgstr "Städa onödiga filer och optimera det lokala arkivet" #: command-list.h:101 msgid "Extract commit ID from an archive created using git-archive" -msgstr "Hämta inchecknings-ID från ett arkiv skapat med git-archive" +msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive" #: command-list.h:102 msgid "Print lines matching a pattern" @@ -21397,7 +21472,7 @@ msgstr "Ett portabelt grafiskt gränssnitt för Git" #: command-list.h:104 msgid "Compute object ID and optionally creates a blob from a file" -msgstr "Beräkna objekt-ID och möjligen skapa en blob från en fil" +msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil" #: command-list.h:105 msgid "Display help information about Git" @@ -23524,6 +23599,75 @@ msgstr "" msgid "Do you really want to send %s? [y|N]: " msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep" +#~ "\"" + +#~ msgid "cannot change partial clone promisor remote" +#~ msgstr "kan inte ändra kontraktsfjärr för delvis kloning" + +#~ msgid "error building trees" +#~ msgstr "fel vid byggande av träd" + +#~ msgid "invalid date format '%s' in '%s'" +#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\"" + +#~ msgid "writing root commit" +#~ msgstr "skriver rotincheckning" + +#~ msgid "staged changes in the following files may be lost: %s" +#~ msgstr "köade ändringar i följande filer kan gå förlorade: %s" + +#~ msgid "" +#~ "--filter can only be used with the remote configured in extensions." +#~ "partialClone" +#~ msgstr "" +#~ "--filter kan endast användas med fjärren konfigurerad i extensions." +#~ "partialClone" + +#~ msgid "verify commit-msg hook" +#~ msgstr "bekräfta commit-msg-krok" + +#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\"" + +#~ msgid "invalid sparse value '%s'" +#~ msgstr "ogiltigt värde för sparse: \"%s\"" + +#~ msgid "" +#~ "Fetch normally indicates which branches had a forced update, but that " +#~ "check has been disabled." +#~ msgstr "" +#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, " +#~ "men det testet har slagits av." + +#~ msgid "" +#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n" +#~ msgstr "" +#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika " +#~ "testet.\n" + +#~ msgid "" +#~ "log.mailmap is not set; its implicit value will change in an\n" +#~ "upcoming release. To squelch this message and preserve current\n" +#~ "behaviour, set the log.mailmap configuration value to false.\n" +#~ "\n" +#~ "To squelch this message and adopt the new behaviour now, set the\n" +#~ "log.mailmap configuration value to true.\n" +#~ "\n" +#~ "See 'git help config' and search for 'log.mailmap' for further " +#~ "information." +#~ msgstr "" +#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n" +#~ "version. För att dölja det här meddelandet och behålla nuvarande\n" +#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n" +#~ "\n" +#~ "För att dölja det här meddelandet och använda det nya beteendet,\n" +#~ "sätt konfigurationsvariabeln log.mailmap till true.\n" +#~ "\n" +#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information." + #~ msgid "Server supports multi_ack_detailed" #~ msgstr "Servern stöder \"multi_ack_detailed\"" @@ -24405,9 +24549,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "Could not append '%s'" #~ msgstr "Kunde inte lägga till på \"%s\"" -#~ msgid "Missing author: %s" -#~ msgstr "Författare saknas: %s" - #~ msgid "Testing " #~ msgstr "Testar" @@ -24465,9 +24606,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " #~ msgid "option %s does not accept negative form" #~ msgstr "flaggan %s godtar inte negativ form" -#~ msgid "unable to parse value '%s' for option %s" -#~ msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" - #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b och -B kan inte användas samtidigt" |