diff options
Diffstat (limited to 'po/sv.po')
| -rw-r--r-- | po/sv.po | 4275 |
1 files changed, 2808 insertions, 1467 deletions
@@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2016 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2017 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. # msgid "" msgstr "" -"Project-Id-Version: git 2.11.0\n" +"Project-Id-Version: git 2.12.0\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2016-11-25 22:50+0800\n" -"PO-Revision-Date: 2016-11-25 22:59+0800\n" +"POT-Creation-Date: 2017-02-18 01:00+0800\n" +"PO-Revision-Date: 2017-02-20 19:38+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Svenska <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -70,7 +70,7 @@ msgstr "" msgid "Exiting because of an unresolved conflict." msgstr "Avslutar på grund av olöst konflikgt." -#: advice.c:114 builtin/merge.c:1181 +#: advice.c:114 builtin/merge.c:1206 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." @@ -250,34 +250,34 @@ msgstr "binärpatchen på rad %d känns inte igen" msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: apply.c:2274 +#: apply.c:2265 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: apply.c:2278 +#: apply.c:2269 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: apply.c:2931 +#: apply.c:2922 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: apply.c:3050 +#: apply.c:3041 #, 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:3062 +#: apply.c:3053 #, 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:3068 +#: apply.c:3059 #, c-format msgid "" "while searching for:\n" @@ -286,25 +286,25 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: apply.c:3090 +#: apply.c:3081 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: apply.c:3098 +#: apply.c:3089 #, 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:3144 +#: apply.c:3135 #, 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:3154 +#: apply.c:3145 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -312,418 +312,419 @@ msgstr "" "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande " "innehållet." -#: apply.c:3162 +#: apply.c:3153 #, 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:3180 +#: apply.c:3171 #, 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:3193 +#: apply.c:3184 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: apply.c:3199 +#: apply.c:3190 #, 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:3220 +#: apply.c:3211 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: apply.c:3342 +#: apply.c:3333 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 +#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:248 #, c-format msgid "failed to read %s" msgstr "misslyckades läsa %s" -#: apply.c:3398 +#: apply.c:3389 #, 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:3427 apply.c:3667 +#: apply.c:3418 apply.c:3658 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: apply.c:3510 apply.c:3681 +#: apply.c:3501 apply.c:3672 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: apply.c:3519 apply.c:3689 +#: apply.c:3510 apply.c:3680 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: apply.c:3554 +#: apply.c:3545 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:3557 +#: apply.c:3548 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Faller tillbaka på trevägssammanslagning...\n" -#: apply.c:3573 apply.c:3577 +#: apply.c:3564 apply.c:3568 #, c-format msgid "cannot read the current contents of '%s'" msgstr "kunde inte läsa aktuellt innehåll i \"%s\"" -#: apply.c:3589 +#: apply.c:3580 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n" -#: apply.c:3603 +#: apply.c:3594 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Applicerade patchen på \"%s\" med konflikter.\n" -#: apply.c:3608 +#: apply.c:3599 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Tillämpade patchen på \"%s\" rent.\n" -#: apply.c:3634 +#: apply.c:3625 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: apply.c:3706 +#: apply.c:3697 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: apply.c:3708 +#: apply.c:3699 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: apply.c:3859 apply.c:3861 +#: apply.c:3850 apply.c:3852 #, c-format msgid "invalid path '%s'" msgstr "ogiltig sökväg: %s" -#: apply.c:3917 +#: apply.c:3908 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: apply.c:3920 +#: apply.c:3911 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: apply.c:3940 +#: apply.c:3931 #, 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:3945 +#: apply.c:3936 #, 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:3965 +#: apply.c:3956 #, 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:3969 +#: apply.c:3960 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: apply.c:3984 +#: apply.c:3975 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: apply.c:4075 +#: apply.c:4066 #, 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:4082 +#: apply.c:4073 #, 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:4085 +#: apply.c:4076 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1-informationen saknas eller är oanvändbar (%s)." -#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 +#: apply.c:4081 builtin/checkout.c:233 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: apply.c:4094 +#: apply.c:4085 #, c-format msgid "could not add %s to temporary index" msgstr "kunde inte lägga till %s till temporärt index" -#: apply.c:4104 +#: apply.c:4095 #, c-format msgid "could not write temporary index to %s" msgstr "kunde inte skriva temporärt index till %s" -#: apply.c:4242 +#: apply.c:4233 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: apply.c:4277 +#: apply.c:4268 #, c-format msgid "corrupt patch for submodule %s" msgstr "trasig patch för undermodulen %s" -#: apply.c:4283 +#: apply.c:4274 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: apply.c:4291 +#: apply.c:4282 #, 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:4297 apply.c:4441 +#: apply.c:4288 apply.c:4432 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: apply.c:4338 +#: apply.c:4329 #, c-format msgid "failed to write to '%s'" msgstr "misslyckades skriva till \"%s\"" -#: apply.c:4342 +#: apply.c:4333 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: apply.c:4412 +#: apply.c:4403 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: apply.c:4510 +#: apply.c:4501 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: apply.c:4518 +#: apply.c:4509 msgid "internal error" msgstr "internt fel" -#: apply.c:4521 +#: apply.c:4512 #, 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:4532 +#: apply.c:4523 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 +#: apply.c:4531 builtin/fetch.c:737 builtin/fetch.c:986 #, c-format msgid "cannot open %s" msgstr "kan inte öppna %s" -#: apply.c:4554 +#: apply.c:4545 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: apply.c:4558 +#: apply.c:4549 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: apply.c:4668 +#: apply.c:4659 #, c-format msgid "Skipped patch '%s'." msgstr "Ignorerar patch \"%s\"." -#: apply.c:4676 +#: apply.c:4667 msgid "unrecognized input" msgstr "indata känns inte igen" -#: apply.c:4695 +#: apply.c:4686 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: apply.c:4833 +#: apply.c:4824 #, c-format msgid "can't open patch '%s': %s" msgstr "kan inte öppna patchen \"%s\": %s" -#: apply.c:4858 +#: apply.c:4849 #, 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:4864 apply.c:4879 +#: apply.c:4855 apply.c:4870 #, 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:4872 +#: apply.c:4863 #, 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:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +#: apply.c:4879 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" -#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: apply.c:4910 apply.c:4913 builtin/am.c:2277 builtin/am.c:2280 #: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 -#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 -#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:591 +#: builtin/submodule--helper.c:594 builtin/submodule--helper.c:960 +#: builtin/submodule--helper.c:963 builtin/submodule--helper.c:1104 +#: git-add--interactive.perl:239 msgid "path" msgstr "sökväg" -#: apply.c:4920 +#: apply.c:4911 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: apply.c:4923 +#: apply.c:4914 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: apply.c:4925 builtin/am.c:2286 +#: apply.c:4916 builtin/am.c:2286 msgid "num" msgstr "antal" -#: apply.c:4926 +#: apply.c:4917 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: apply.c:4929 +#: apply.c:4920 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: apply.c:4931 +#: apply.c:4922 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:4935 +#: apply.c:4926 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: apply.c:4937 +#: apply.c:4928 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:4939 +#: apply.c:4930 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:4941 +#: apply.c:4932 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: apply.c:4943 +#: apply.c:4934 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: apply.c:4945 +#: apply.c:4936 msgid "accept a patch that touches outside the working area" msgstr "godta en patch som rör filer utanför arbetskatalogen" -#: apply.c:4947 +#: apply.c:4938 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: apply.c:4949 +#: apply.c:4940 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:4951 +#: apply.c:4942 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +#: apply.c:4945 builtin/checkout-index.c:169 builtin/ls-files.c:507 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: apply.c:4956 +#: apply.c:4947 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: apply.c:4957 builtin/am.c:2265 +#: apply.c:4948 builtin/am.c:2265 msgid "action" msgstr "åtgärd" -#: apply.c:4958 +#: apply.c:4949 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: apply.c:4961 apply.c:4964 +#: apply.c:4952 apply.c:4955 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: apply.c:4967 +#: apply.c:4958 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: apply.c:4969 +#: apply.c:4960 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: apply.c:4971 +#: apply.c:4962 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: apply.c:4973 +#: apply.c:4964 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 -#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 -#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +#: apply.c:4965 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651 +#: builtin/log.c:1860 builtin/mv.c:122 builtin/read-tree.c:114 msgid "be verbose" msgstr "var pratsam" -#: apply.c:4976 +#: apply.c:4967 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: apply.c:4979 +#: apply.c:4970 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: apply.c:4981 builtin/am.c:2274 +#: apply.c:4972 builtin/am.c:2274 msgid "root" msgstr "rot" -#: apply.c:4982 +#: apply.c:4973 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" @@ -746,7 +747,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" @@ -767,11 +768,11 @@ msgstr "prefix" msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603 -#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987 -#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101 -#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401 -#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153 +#: archive.c:432 builtin/blame.c:2607 builtin/blame.c:2608 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1054 +#: builtin/hash-object.c:101 builtin/ls-files.c:541 builtin/ls-files.c:544 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 msgid "file" msgstr "fil" @@ -804,7 +805,7 @@ msgid "list supported archive formats" msgstr "visa understödda arkivformat" #: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 -#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +#: builtin/submodule--helper.c:603 builtin/submodule--helper.c:969 msgid "repo" msgstr "arkiv" @@ -900,12 +901,12 @@ msgstr "" #: bisect.c:750 #, c-format msgid "" -"Some %s revs are not ancestor of the %s rev.\n" +"Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" "Några %s-revisioner är inte föräldrar till %s-revisionen.\n" -"git bisect kan inte arbeta korrekt i detta fall.\n" +"git bisect kan inte fungera korrekt i detta fall.\n" "Kanske du skrev fel %s- och %s-revisioner?\n" #: bisect.c:763 @@ -930,7 +931,7 @@ msgstr "Bisect: en sammanslagningsbas måste testas\n" msgid "a %s revision is needed" msgstr "en %s-revision behövs" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:262 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" @@ -1122,7 +1123,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:87 sequencer.c:963 builtin/commit.c:777 +#: bundle.c:87 sequencer.c:1331 sequencer.c:1752 builtin/commit.c:777 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" @@ -1131,10 +1132,10 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 -#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: bundle.c:163 ref-filter.c:1499 sequencer.c:1154 sequencer.c:2290 +#: builtin/blame.c:2820 builtin/commit.c:1061 builtin/log.c:348 #: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 -#: builtin/merge.c:356 builtin/shortlog.c:170 +#: builtin/merge.c:360 builtin/shortlog.c:177 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -1173,7 +1174,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:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:282 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -1191,13 +1192,13 @@ msgstr "kan inte skapa \"%s\"" msgid "index-pack died" msgstr "index-pack dog" -#: color.c:290 +#: color.c:300 #, c-format msgid "invalid color value: %.*s" msgstr "felaktigt färgvärde: %.*s" -#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 -#: builtin/am.c:2127 +#: commit.c:40 sequencer.c:1564 builtin/am.c:421 builtin/am.c:457 +#: builtin/am.c:1493 builtin/am.c:2127 #, c-format msgid "could not parse %s" msgstr "kunde inte tolka %s" @@ -1221,130 +1222,140 @@ msgstr "" msgid "memory exhausted" msgstr "minnet slut" -#: config.c:516 +#: config.c:518 #, c-format msgid "bad config line %d in blob %s" msgstr "felaktig konfigurationsfil rad %d i blob:en %s" -#: config.c:520 +#: config.c:522 #, c-format msgid "bad config line %d in file %s" msgstr "felaktig konfigurationsfil rad %d i filen %s" -#: config.c:524 +#: config.c:526 #, c-format msgid "bad config line %d in standard input" msgstr "felaktig konfigurationsfil rad %d i standard in" -#: config.c:528 +#: config.c:530 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s" -#: config.c:532 +#: config.c:534 #, c-format msgid "bad config line %d in command line %s" msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s" -#: config.c:536 +#: config.c:538 #, c-format msgid "bad config line %d in %s" msgstr "felaktig konfigurationsfil rad %d i %s" -#: config.c:655 +#: config.c:657 msgid "out of range" msgstr "utanför intervallet" -#: config.c:655 +#: config.c:657 msgid "invalid unit" msgstr "ogiltig enhet" -#: config.c:661 +#: config.c:663 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s" -#: config.c:666 +#: config.c:668 #, 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:669 +#: config.c:671 #, 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:672 +#: config.c:674 #, 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:675 +#: config.c:677 #, 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:678 +#: config.c:680 #, 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:681 +#: config.c:683 #, 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:768 +#: config.c:770 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "misslyckades expandera användarkatalog i: \"%s\"" -#: config.c:852 config.c:863 +#: config.c:865 config.c:876 #, c-format msgid "bad zlib compression level %d" msgstr "felaktigt zlib-komprimeringsgrad %d" -#: config.c:978 +#: config.c:993 #, c-format msgid "invalid mode for object creation: %s" msgstr "felaktigt läge för skapande av objekt: %s" -#: config.c:1312 +#: config.c:1149 +#, c-format +msgid "bad pack compression level %d" +msgstr "felaktig paketkomprimeringsgrad %d" + +#: config.c:1339 msgid "unable to parse command-line config" msgstr "kan inte tolka kommandoradskonfiguration" -#: config.c:1362 +#: config.c:1389 msgid "unknown error occurred while reading the configuration files" msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna" -#: config.c:1716 +#: config.c:1743 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration" -#: config.c:1718 +#: config.c:1745 #, 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:1777 +#: config.c:1804 #, c-format msgid "%s has multiple values" msgstr "%s har flera värden" -#: config.c:2311 +#: config.c:2225 config.c:2450 +#, c-format +msgid "fstat on %s failed" +msgstr "fstat misslyckades på %s" + +#: config.c:2343 #, c-format msgid "could not set '%s' to '%s'" msgstr "kunde inte ställa in \"%s\" till \"%s\"" -#: config.c:2313 +#: config.c:2345 #, c-format msgid "could not unset '%s'" msgstr "kunde inte ta bort inställning för \"%s\"" @@ -1367,7 +1378,7 @@ msgstr "" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140 msgid "Checking connectivity" msgstr "Kontrollerar konnektivitet" @@ -1503,12 +1514,12 @@ msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:283 +#: diff.c:281 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:346 +#: diff.c:344 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -1517,20 +1528,20 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3087 +#: diff.c:3085 #, c-format msgid "external diff died, stopping at %s" msgstr "extern diff dog, stannar vid %s" -#: diff.c:3412 +#: diff.c:3411 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande" -#: diff.c:3502 +#: diff.c:3501 msgid "--follow requires exactly one pathspec" msgstr "--follow kräver exakt en sökvägsangivelse" -#: diff.c:3665 +#: diff.c:3664 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1539,35 +1550,40 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3679 +#: diff.c:3678 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: diff.c:4700 +#: diff.c:4696 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:4703 +#: diff.c:4699 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:4706 +#: diff.c:4702 #, 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:1866 +#: dir.c:1862 msgid "failed to get kernel name and information" msgstr "misslyckades hämta kärnans namn och information" -#: dir.c:1985 +#: dir.c:1981 msgid "Untracked cache is disabled on this system or location." msgstr "Ospårad cache är inaktiverad på systemet eller platsen." +#: dir.c:2759 +#, c-format +msgid "could not migrate git directory from '%s' to '%s'" +msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\"" + #: fetch-pack.c:213 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: förväntade grund lista" @@ -1748,35 +1764,40 @@ msgstr "kunde inte skapa temporära fil" msgid "failed writing detached signature to '%s'" msgstr "misslyckades skriva fristående signatur till \"%s\"" -#: grep.c:1782 +#: graph.c:96 +#, c-format +msgid "ignore invalid color '%.*s' in log.graphColors" +msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors" + +#: grep.c:1794 #, c-format msgid "'%s': unable to read %s" msgstr "\"%s\" kunde inte läsa %s" -#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 +#: grep.c:1811 builtin/clone.c:381 builtin/diff.c:81 builtin/rm.c:133 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: grep.c:1810 +#: grep.c:1822 #, c-format msgid "'%s': short read" msgstr "\"%s\": kort läsning" -#: help.c:203 +#: help.c:218 #, c-format msgid "available git commands in '%s'" msgstr "git-kommandon tillgängliga i \"%s\"" -#: help.c:210 +#: help.c:225 msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:241 +#: help.c:256 msgid "These are common Git commands used in various situations:" msgstr "Dessa vanliga Git-kommandon används i olika situationer:" -#: help.c:306 +#: help.c:321 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1785,11 +1806,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:361 +#: help.c:376 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:383 +#: help.c:398 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -1798,17 +1819,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:388 +#: help.c:403 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:395 +#: help.c:410 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:399 help.c:465 +#: help.c:414 help.c:480 msgid "" "\n" "Did you mean this?" @@ -1822,7 +1843,7 @@ msgstr[1] "" "\n" "Menade du ett av dessa?" -#: help.c:461 +#: help.c:476 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" @@ -1891,69 +1912,69 @@ msgstr "kunde inte skriva ny indexfil" msgid "(bad commit)\n" msgstr "(felaktig incheckning)\n" -#: merge-recursive.c:231 +#: merge-recursive.c:231 merge-recursive.c:239 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" -#: merge-recursive.c:301 +#: merge-recursive.c:303 msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:720 +#: merge-recursive.c:727 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:731 +#: merge-recursive.c:738 #, 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:745 merge-recursive.c:764 +#: merge-recursive.c:752 merge-recursive.c:771 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:754 +#: merge-recursive.c:761 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospårad fil vid \"%s\"" -#: merge-recursive.c:796 builtin/cat-file.c:34 +#: merge-recursive.c:803 builtin/cat-file.c:34 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:798 +#: merge-recursive.c:805 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:822 +#: merge-recursive.c:829 #, c-format msgid "failed to open '%s': %s" msgstr "misslyckades öppna \"%s\": %s" -#: merge-recursive.c:833 +#: merge-recursive.c:840 #, c-format msgid "failed to symlink '%s': %s" msgstr "misslyckades skapa symboliska länken \"%s\": %s" -#: merge-recursive.c:838 +#: merge-recursive.c:845 #, 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:978 +#: merge-recursive.c:985 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:982 +#: merge-recursive.c:989 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: merge-recursive.c:1088 merge-recursive.c:1102 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1962,7 +1983,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:1087 merge-recursive.c:1100 +#: merge-recursive.c:1094 merge-recursive.c:1107 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -1971,20 +1992,20 @@ 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:1143 +#: merge-recursive.c:1150 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1143 +#: merge-recursive.c:1150 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1200 +#: merge-recursive.c:1207 #, 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:1225 +#: merge-recursive.c:1232 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -1993,135 +2014,135 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1230 +#: merge-recursive.c:1237 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1292 +#: merge-recursive.c:1299 #, 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:1325 +#: merge-recursive.c:1332 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn på %s till %s och %s till %s istället" -#: merge-recursive.c:1531 +#: merge-recursive.c:1535 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1546 +#: merge-recursive.c:1550 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: merge-recursive.c:1557 merge-recursive.c:1771 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s istället" -#: merge-recursive.c:1610 +#: merge-recursive.c:1614 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1613 +#: merge-recursive.c:1617 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1666 +#: merge-recursive.c:1670 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1666 +#: merge-recursive.c:1670 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1676 +#: merge-recursive.c:1680 msgid "content" msgstr "innehåll" -#: merge-recursive.c:1683 +#: merge-recursive.c:1687 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1718 +#: merge-recursive.c:1723 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1732 +#: merge-recursive.c:1737 #, c-format msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1736 git-submodule.sh:924 +#: merge-recursive.c:1741 git-submodule.sh:930 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1737 +#: merge-recursive.c:1742 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1831 +#: merge-recursive.c:1836 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1857 +#: merge-recursive.c:1862 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1863 +#: merge-recursive.c:1868 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1868 +#: merge-recursive.c:1874 #, 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:1877 +#: merge-recursive.c:1883 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1914 +#: merge-recursive.c:1920 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1923 +#: merge-recursive.c:1929 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:2006 +#: merge-recursive.c:2012 msgid "Merging:" msgstr "Slår ihop:" -#: merge-recursive.c:2019 +#: merge-recursive.c:2025 #, 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:2058 +#: merge-recursive.c:2064 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2121 +#: merge-recursive.c:2127 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +#: merge-recursive.c:2141 builtin/merge.c:645 builtin/merge.c:792 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -2163,7 +2184,7 @@ 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:242 +#: object.c:240 #, c-format msgid "unable to parse object: %s" msgstr "kunde inte tolka objektet: %s" @@ -2203,12 +2224,12 @@ msgstr "felformat objektnamn \"%s\"" msgid "Could not make %s writable by group" msgstr "Kunde inte göra %s skrivbar för gruppen" -#: pathspec.c:133 +#: pathspec.c:142 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla" -#: pathspec.c:143 +#: pathspec.c:149 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2216,46 +2237,51 @@ msgstr "" "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra " "globala sökvägsinställningar" -#: pathspec.c:177 +#: pathspec.c:188 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\"" -#: pathspec.c:183 +#: pathspec.c:201 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "felaktigt sökvägsuttryck \"%.*s\" i \"%s\"" -#: pathspec.c:187 +#: pathspec.c:206 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\"" -#: pathspec.c:205 +#: pathspec.c:238 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Tecknet \"%c\" i sökvägsuttrycket i \"%s\" har inte implementerats" -#: pathspec.c:230 +#: pathspec.c:293 pathspec.c:315 +#, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" + +#: pathspec.c:350 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: \"literal\" och \"glob\" är inkompatibla" -#: pathspec.c:241 +#: pathspec.c:363 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: \"%s\" är utanför arkivet" -#: pathspec.c:291 +#: pathspec.c:451 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\"" +msgid "'%s' (mnemonic: '%c')" +msgstr "\"%s\" (minnesstöd: \"%c\")" -#: pathspec.c:353 +#: pathspec.c:461 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s" -#: pathspec.c:408 +#: pathspec.c:511 msgid "" "empty strings as pathspecs will be made invalid in upcoming releases. please " "use . instead if you meant to match all paths" @@ -2263,12 +2289,12 @@ msgstr "" "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande " "utgåva. använd istället . om du vill träffa alla sökvägar" -#: pathspec.c:440 +#: pathspec.c:535 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk" -#: pathspec.c:449 +#: pathspec.c:544 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" @@ -2276,11 +2302,11 @@ msgstr "" "Ingenting att exkludera från med :(exkludera)-mönster.\n" "Glömde du kanske att antingen lägga till \":/\" eller \".\"?" -#: pretty.c:971 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "kunde inte tolka format för --pretty" -#: read-cache.c:1315 +#: read-cache.c:1307 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2289,7 +2315,7 @@ msgstr "" "index.version satt, men värdet är ogiltigt.\n" "Använder version %i" -#: read-cache.c:1325 +#: read-cache.c:1317 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2298,7 +2324,7 @@ msgstr "" "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n" "Använder version %i" -#: refs.c:576 builtin/merge.c:840 +#: refs.c:576 builtin/merge.c:844 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" @@ -2318,227 +2344,232 @@ msgstr "kunde inte ta bort referenser: %s" msgid "could not remove reference %s" msgstr "kunde inte ta bort referensen %s" -#: ref-filter.c:55 +#: ref-filter.c:56 #, c-format msgid "expected format: %%(color:<color>)" msgstr "förväntat format: %%(color:<color>)" -#: ref-filter.c:57 +#: ref-filter.c:58 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "okänd färg: %%(color:%s)" -#: ref-filter.c:71 +#: ref-filter.c:72 #, c-format msgid "unrecognized format: %%(%s)" msgstr "okänt format: %%(%s)" -#: ref-filter.c:77 +#: ref-filter.c:78 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) tar inte argument" -#: ref-filter.c:84 +#: ref-filter.c:85 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) tar inte argument" -#: ref-filter.c:101 +#: ref-filter.c:92 +#, c-format +msgid "%%(trailers) does not take arguments" +msgstr "%%(trailers) tar inte argument" + +#: ref-filter.c:111 #, c-format msgid "positive value expected contents:lines=%s" msgstr "positivt värde förväntat contents:lines=%s" -#: ref-filter.c:103 +#: ref-filter.c:113 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "okänt %%(contents)-argument: %s" -#: ref-filter.c:113 +#: ref-filter.c:123 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "okänt %%(objectname)-argument: %s" -#: ref-filter.c:135 +#: ref-filter.c:145 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "förväntat format: %%(align:<bredd>,<position>)" -#: ref-filter.c:147 +#: ref-filter.c:157 #, c-format msgid "unrecognized position:%s" msgstr "okänd position:%s" -#: ref-filter.c:151 +#: ref-filter.c:161 #, c-format msgid "unrecognized width:%s" msgstr "okänd bredd:%s" -#: ref-filter.c:157 +#: ref-filter.c:167 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "okänt %%(align)-argument: %s" -#: ref-filter.c:161 +#: ref-filter.c:171 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "positiv bredd förväntad med atomen %%(align)" -#: ref-filter.c:244 +#: ref-filter.c:255 #, c-format msgid "malformed field name: %.*s" msgstr "felformat fältnamn: %.*s" -#: ref-filter.c:270 +#: ref-filter.c:281 #, c-format msgid "unknown field name: %.*s" msgstr "okänt fältnamn: %.*s" -#: ref-filter.c:372 +#: ref-filter.c:383 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "format: atomen %%(end) använd utan motsvarande atom" -#: ref-filter.c:424 +#: ref-filter.c:435 #, c-format msgid "malformed format string %s" msgstr "felformad formatsträng %s" -#: ref-filter.c:878 +#: ref-filter.c:898 msgid ":strip= requires a positive integer argument" msgstr ":strip= kräver ett positivt heltalsargument" -#: ref-filter.c:883 +#: ref-filter.c:903 #, c-format msgid "ref '%s' does not have %ld components to :strip" msgstr "referensen \"%s\" har inte %ld komponenter för :strip" -#: ref-filter.c:1046 +#: ref-filter.c:1066 #, c-format msgid "unknown %.*s format %s" msgstr "okänt \"%.*s\"-format %s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: ref-filter.c:1086 ref-filter.c:1117 #, c-format msgid "missing object %s for %s" msgstr "objektet %s saknas för %s" -#: ref-filter.c:1069 ref-filter.c:1100 +#: ref-filter.c:1089 ref-filter.c:1120 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer misslyckades på %s för %s" -#: ref-filter.c:1311 +#: ref-filter.c:1343 #, c-format msgid "malformed object at '%s'" msgstr "felformat objekt vid \"%s\"" -#: ref-filter.c:1373 +#: ref-filter.c:1410 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignorerar referens med trasigt namn %s" -#: ref-filter.c:1378 +#: ref-filter.c:1415 #, c-format msgid "ignoring broken ref %s" msgstr "ignorerar trasig referens %s" -#: ref-filter.c:1633 +#: ref-filter.c:1670 #, c-format msgid "format: %%(end) atom missing" msgstr "format: atomen %%(end) saknas" -#: ref-filter.c:1687 +#: ref-filter.c:1734 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: remote.c:746 +#: remote.c:754 #, 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:750 +#: remote.c:758 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s spårar vanligtvis %s, inte %s" -#: remote.c:754 +#: remote.c:762 #, c-format msgid "%s tracks both %s and %s" msgstr "%s spårar både %s och %s" -#: remote.c:762 +#: remote.c:770 msgid "Internal error" msgstr "Internt fel" -#: remote.c:1677 remote.c:1720 +#: remote.c:1685 remote.c:1787 msgid "HEAD does not point to a branch" msgstr "HEAD pekar inte på en gren" -#: remote.c:1686 +#: remote.c:1694 #, c-format msgid "no such branch: '%s'" msgstr "okänd gren: \"%s\"" -#: remote.c:1689 +#: remote.c:1697 #, c-format msgid "no upstream configured for branch '%s'" msgstr "ingen standarduppström angiven för grenen \"%s\"" -#: remote.c:1695 +#: remote.c:1703 #, 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:1710 +#: remote.c:1718 #, 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:1725 +#: remote.c:1730 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "grenen \"%s\" har ingen fjärr för \"push\"" -#: remote.c:1736 +#: remote.c:1741 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\"" -#: remote.c:1749 +#: remote.c:1754 msgid "push has no destination (push.default is 'nothing')" msgstr "\"push\" har inget mål (push.default är \"ingenting\")" -#: remote.c:1771 +#: remote.c:1776 msgid "cannot resolve 'simple' push to a single destination" msgstr "\"enkel push\" motsvarar flera olika mål" -#: remote.c:2073 +#: remote.c:2081 #, 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:2077 +#: remote.c:2085 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n" -#: remote.c:2080 +#: remote.c:2088 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "Din gren är à jour med \"%s\".\n" -#: remote.c:2084 +#: remote.c:2092 #, 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:2090 +#: remote.c:2098 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:2093 +#: remote.c:2101 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -2548,11 +2579,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:2101 +#: remote.c:2109 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:2104 +#: remote.c:2112 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -2567,7 +2598,7 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:2114 +#: remote.c:2122 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" @@ -2584,11 +2615,11 @@ msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar" msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent är inkompatibelt med --bisect" -#: run-command.c:106 +#: run-command.c:125 msgid "open /dev/null failed" msgstr "misslyckades öppna /dev/null" -#: run-command.c:108 +#: run-command.c:127 #, c-format msgid "dup2(%d,%d) failed" msgstr "dup2(%d,%d) misslyckades" @@ -2617,15 +2648,24 @@ msgstr "mottagarsidan stöder inte push med --atomic" msgid "the receiving end does not support push options" msgstr "mottagarsidan stöder inte push-flaggor" -#: sequencer.c:171 +#: sequencer.c:215 msgid "revert" msgstr "revert" -#: sequencer.c:171 +#: sequencer.c:217 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:228 +#: sequencer.c:219 +msgid "rebase -i" +msgstr "rebase -i" + +#: sequencer.c:221 +#, c-format +msgid "Unknown action: %d" +msgstr "Okänd funktion: %d" + +#: sequencer.c:278 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -2633,7 +2673,7 @@ msgstr "" "efter att ha löst konflikterna, markera de rättade sökvägarna\n" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"" -#: sequencer.c:231 +#: sequencer.c:281 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -2643,60 +2683,63 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:244 sequencer.c:1209 +#: sequencer.c:294 sequencer.c:1667 #, c-format msgid "could not lock '%s'" msgstr "kunde inte låsa \"%s\"" -#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#: sequencer.c:297 sequencer.c:1545 sequencer.c:1672 sequencer.c:1686 #, c-format msgid "could not write to '%s'" msgstr "kunde inte skriva till \"%s\"" -#: sequencer.c:251 +#: sequencer.c:301 #, c-format msgid "could not write eol to '%s'" msgstr "kunde inte skriva radslut till \"%s\"" -#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 +#: sequencer.c:305 sequencer.c:1550 sequencer.c:1674 #, c-format msgid "failed to finalize '%s'." msgstr "misslyckades färdigställa \"%s\"." -#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#: sequencer.c:329 sequencer.c:808 sequencer.c:1571 builtin/am.c:259 +#: builtin/commit.c:749 builtin/merge.c:1036 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: sequencer.c:305 +#: sequencer.c:355 #, c-format msgid "your local changes would be overwritten by %s." msgstr "dina lokala ändringar skulle skrivas över av %s." -#: sequencer.c:309 +#: sequencer.c:359 msgid "commit your changes or stash them to proceed." msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta." -#: sequencer.c:324 +#: sequencer.c:388 #, c-format msgid "%s: fast-forward" msgstr "%s: snabbspola" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:399 +#. TRANSLATORS: %s will be "revert", "cherry-pick" or +#. * "rebase -i". +#. +#: sequencer.c:470 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:418 +#: sequencer.c:489 msgid "could not resolve HEAD commit\n" msgstr "kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:438 +#: sequencer.c:509 msgid "unable to update cache tree\n" msgstr "kan inte uppdatera cacheträd\n" -#: sequencer.c:483 +#: sequencer.c:592 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -2725,172 +2768,394 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:567 +#: sequencer.c:688 #, c-format msgid "could not parse commit %s\n" msgstr "kunde inte tolka incheckningen %s\n" -#: sequencer.c:572 +#: sequencer.c:693 #, c-format msgid "could not parse parent commit %s\n" msgstr "kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:656 +#: sequencer.c:815 +#, c-format +msgid "" +"unexpected 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"oväntad första rad i squash-meddelande:\n" +"\n" +"\t%.*s" + +#: sequencer.c:821 +#, c-format +msgid "" +"invalid 1st line of squash message:\n" +"\n" +"\t%.*s" +msgstr "" +"ogiltig första rad i squash-meddelande:\n" +"\n" +"\t%.*s" + +#: sequencer.c:827 sequencer.c:852 +#, c-format +msgid "This is a combination of %d commits." +msgstr "Det här är en kombination av %d incheckningar." + +#: sequencer.c:836 +msgid "need a HEAD to fixup" +msgstr "behöver en HEAD-incheckning att rätta" + +#: sequencer.c:838 +msgid "could not read HEAD" +msgstr "kunde inte läsa HEAD" + +#: sequencer.c:840 +msgid "could not read HEAD's commit message" +msgstr "kunde inte läsa HEAD:s incheckningsmeddelande" + +#: sequencer.c:846 +#, c-format +msgid "cannot write '%s'" +msgstr "kan inte skriva \"%s\"" + +#: sequencer.c:855 git-rebase--interactive.sh:445 +msgid "This is the 1st commit message:" +msgstr "Det här är 1:a incheckningsmeddelandet:" + +#: sequencer.c:863 +#, c-format +msgid "could not read commit message of %s" +msgstr "kunde inte läsa incheckningsmeddelande för %s" + +#: sequencer.c:870 +#, c-format +msgid "This is the commit message #%d:" +msgstr "Det här är incheckningsmeddelande %d:" + +#: sequencer.c:875 +#, c-format +msgid "The commit message #%d will be skipped:" +msgstr "Incheckningsmeddelande %d kommer hoppas över:" + +#: sequencer.c:880 +#, c-format +msgid "unknown command: %d" +msgstr "okänt kommando: %d" + +#: sequencer.c:946 msgid "your index file is unmerged." msgstr "din indexfil har inte slagits ihop." -#: sequencer.c:675 +#: sequencer.c:964 #, 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:683 +#: sequencer.c:972 #, c-format msgid "commit %s does not have parent %d" msgstr "incheckning %s har inte förälder %d" -#: sequencer.c:687 +#: sequencer.c:976 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning" +#: sequencer.c:982 +#, 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:700 +#: sequencer.c:1001 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:705 +#: sequencer.c:1063 sequencer.c:1812 #, c-format -msgid "cannot get commit message for %s" -msgstr "kan inte hämta incheckningsmeddelande för %s" +msgid "could not rename '%s' to '%s'" +msgstr "kunde inte byta namn på \"%s\" till \"%s\"" -#: sequencer.c:797 +#: sequencer.c:1114 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:798 +#: sequencer.c:1115 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:833 +#: sequencer.c:1157 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:843 +#: sequencer.c:1167 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:850 +#: sequencer.c:1174 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:944 +#: sequencer.c:1294 #, c-format msgid "invalid line %d: %.*s" msgstr "ogiltig rad %d: %.*s" -#: sequencer.c:950 -msgid "no commits parsed." -msgstr "inga incheckningar lästes." +#: sequencer.c:1302 +#, c-format +msgid "cannot '%s' without a previous commit" +msgstr "Kan inte utföra \"%s\" utan en föregående incheckning" -#: sequencer.c:966 +#: sequencer.c:1334 #, c-format msgid "could not read '%s'." msgstr "kunde inte läsa \"%s\"." -#: sequencer.c:972 +#: sequencer.c:1341 +msgid "please fix this using 'git rebase --edit-todo'." +msgstr "rätta det med \"git rebase --edit-todo\"." + +#: sequencer.c:1343 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "oanvändbart manus: %s" -#: sequencer.c:983 +#: sequencer.c:1348 +msgid "no commits parsed." +msgstr "inga incheckningar lästes." + +#: sequencer.c:1359 msgid "cannot cherry-pick during a revert." msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"." -#: sequencer.c:985 +#: sequencer.c:1361 msgid "cannot revert during a cherry-pick." msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"." -#: sequencer.c:1028 +#: sequencer.c:1424 #, c-format msgid "invalid key: %s" msgstr "felaktig nyckel: %s" -#: sequencer.c:1031 +#: sequencer.c:1427 #, c-format msgid "invalid value for %s: %s" msgstr "felaktigt värde för %s: %s" -#: sequencer.c:1063 +#: sequencer.c:1484 #, c-format msgid "malformed options sheet: '%s'" msgstr "trasigt manus: %s" -#: sequencer.c:1101 +#: sequencer.c:1522 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:1102 +#: sequencer.c:1523 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:1106 +#: sequencer.c:1526 #, c-format msgid "could not create sequencer directory '%s'" msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:1120 +#: sequencer.c:1540 msgid "could not lock HEAD" msgstr "kunde inte låsa HEAD" -#: sequencer.c:1151 sequencer.c:1289 +#: sequencer.c:1596 sequencer.c:2150 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:1153 +#: sequencer.c:1598 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:1155 sequencer.c:1189 +#: sequencer.c:1600 sequencer.c:1634 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:1175 builtin/grep.c:578 +#: sequencer.c:1620 builtin/grep.c:904 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: sequencer.c:1177 +#: sequencer.c:1622 #, c-format msgid "cannot read '%s': %s" msgstr "kan inte läsa \"%s\": %s" -#: sequencer.c:1178 +#: sequencer.c:1623 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:1184 +#: sequencer.c:1629 #, 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:1354 +#: sequencer.c:1640 +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:1777 sequencer.c:2049 +msgid "cannot read HEAD" +msgstr "kan inte läsa HEAD" + +#: sequencer.c:1817 builtin/difftool.c:574 +#, c-format +msgid "could not copy '%s' to '%s'" +msgstr "kunde inte kopiera in \"%s\" till \"%s\"" + +#: sequencer.c:1833 +msgid "could not read index" +msgstr "Kunde inte läsa indexet" + +#: sequencer.c:1838 +#, c-format +msgid "" +"execution failed: %s\n" +"%sYou can fix the problem, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"körningen misslyckades: %s\n" +"%sDu kan rätta problemet och sedan köra\n" +"\n" +"\tgit rebase --continue\n" +"\n" + +#: sequencer.c:1844 +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:1850 +#, c-format +msgid "" +"execution succeeded: %s\n" +"but left changes to the index and/or the working tree\n" +"Commit or stash your changes, and then run\n" +"\n" +" git rebase --continue\n" +"\n" +msgstr "" +"körningen lyckades: %s\n" +"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n" +"Checka in eller utför \"stash\" på ändringarna och kör sedan\n" +"\n" +"\tgit rebase --continue\n" +"\n" + +#: sequencer.c:1905 git-rebase.sh:168 +#, c-format +msgid "Applied autostash." +msgstr "Tillämpade autostash." + +#: sequencer.c:1917 +#, c-format +msgid "cannot store %s" +msgstr "kan inte spara %s" + +#: sequencer.c:1919 git-rebase.sh:172 +#, c-format +msgid "" +"Applying autostash resulted in conflicts.\n" +"Your changes are safe in the stash.\n" +"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" +msgstr "" +"Tillämpning av autostash gav konflikter.\n" +"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:2000 +#, c-format +msgid "stopped at %s... %.*s" +msgstr "stoppade på %s... %.*s" + +#: sequencer.c:2027 +#, c-format +msgid "unknown command %d" +msgstr "okänt kommando %d" + +#: sequencer.c:2057 +msgid "could not read orig-head" +msgstr "Kunde inte läsa orig-head" + +#: sequencer.c:2061 +msgid "could not read 'onto'" +msgstr "kunde inte läsa \"onto\"" + +#: sequencer.c:2068 +#, c-format +msgid "could not update %s" +msgstr "kunde inte uppdatera %s" + +#: sequencer.c:2075 +#, c-format +msgid "could not update HEAD to %s" +msgstr "kunde inte uppdatera HEAD till %s" + +#: sequencer.c:2159 +msgid "cannot rebase: You have unstaged changes." +msgstr "kan inte ombasera: Du har oköade ändringar." + +#: sequencer.c:2164 +msgid "could not remove CHERRY_PICK_HEAD" +msgstr "kunde inte ta bort CHERRY_PICK_HEAD" + +#: sequencer.c:2173 +msgid "cannot amend non-existing commit" +msgstr "kan inte lägga till incheckning som inte finns" + +#: sequencer.c:2175 +#, c-format +msgid "invalid file: '%s'" +msgstr "ogiltig fil: \"%s\"" + +#: sequencer.c:2177 +#, c-format +msgid "invalid contents: '%s'" +msgstr "ogiltigt innehåll: \"%s\"" + +#: sequencer.c:2180 +msgid "" +"\n" +"You have uncommitted changes in your working tree. Please, commit them\n" +"first and then run 'git rebase --continue' again." +msgstr "" +"\n" +"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" +"först och kör sedan \"git rebase --continute\" igen." + +#: sequencer.c:2190 +msgid "could not commit staged changes." +msgstr "kunde inte checka in köade ändringar." + +#: sequencer.c:2270 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\"" -#: sequencer.c:1358 +#: sequencer.c:2274 #, c-format msgid "%s: bad revision" msgstr "%s: felaktig revision" -#: sequencer.c:1391 +#: sequencer.c:2307 msgid "can't revert as initial commit" msgstr "kan inte ångra som första incheckning" @@ -2927,29 +3192,29 @@ msgstr "" "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n" "\"git <kommando> [<revision>...] -- [<fil>...]\"" -#: setup.c:468 +#: setup.c:470 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Förväntade git-arkivversion <= %d, hittade %d" -#: setup.c:476 +#: setup.c:478 msgid "unknown repository extensions found:" msgstr "okända arkivutökningar hittades:" -#: setup.c:762 +#: setup.c:768 #, 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:764 setup.c:915 builtin/index-pack.c:1641 +#: setup.c:770 setup.c:922 builtin/index-pack.c:1643 msgid "Cannot come back to cwd" msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)" -#: setup.c:845 +#: setup.c:852 msgid "Unable to read current working directory" msgstr "Kan inte läsa aktuell arbetskatalog" -#: setup.c:920 +#: setup.c:927 #, c-format msgid "" "Not a git repository (or any parent up to mount point %s)\n" @@ -2959,12 +3224,12 @@ msgstr "" "monteringspunkten %s)\n" "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)." -#: setup.c:927 +#: setup.c:934 #, c-format msgid "Cannot change to '%s/..'" msgstr "kan inte byta till \"%s/..\"" -#: setup.c:989 +#: setup.c:996 #, c-format msgid "" "Problem with core.sharedRepository filemode value (0%.3o).\n" @@ -2973,41 +3238,41 @@ 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." -#: sha1_file.c:473 +#: sha1_file.c:490 #, c-format msgid "path '%s' does not exist" msgstr "sökvägen \"%s\" finns inte" -#: sha1_file.c:499 +#: sha1_file.c:516 #, 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:505 +#: sha1_file.c:522 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv." -#: sha1_file.c:511 +#: sha1_file.c:528 #, c-format msgid "reference repository '%s' is shallow" msgstr "referensarkivet \"%s\" är grunt" -#: sha1_file.c:519 +#: sha1_file.c:536 #, c-format msgid "reference repository '%s' is grafted" msgstr "referensarkivet \"%s\" är ympat" -#: sha1_file.c:1159 +#: sha1_file.c:1176 msgid "offset before end of packfile (broken .idx?)" msgstr "offset före slutet av packfilen (trasig .idx?)" -#: sha1_file.c:2592 +#: sha1_file.c:2637 #, 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?)" -#: sha1_file.c:2596 +#: sha1_file.c:2641 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "offset borton slutet av packindex för %s (trunkerat index?)" @@ -3043,90 +3308,135 @@ msgstr "" "Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n" "genom att köra \"git config advice.objectNameWarning false\"" -#: submodule.c:64 submodule.c:98 +#: submodule.c:65 submodule.c:99 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" "Kan inte ändra .gitmodules-fil som inte slagits ihop, lös " "sammanslagningskonflikter först" -#: submodule.c:68 submodule.c:102 +#: submodule.c:69 submodule.c:103 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s" -#: submodule.c:76 +#: submodule.c:77 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Kunde inte uppdatera .gitmodules-posten %s" -#: submodule.c:109 +#: submodule.c:110 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "Kunde inte ta bort .gitmodules-posten för %s" -#: submodule.c:120 +#: submodule.c:121 msgid "staging updated .gitmodules failed" msgstr "misslyckades köa uppdaterad .gitmodules" -#: submodule.c:158 +#: submodule.c:159 msgid "negative values not allowed for submodule.fetchJobs" msgstr "negativa värden är inte tillåtna för submodule.fetchJobs" -#: submodule-config.c:358 +#: submodule.c:1184 +#, c-format +msgid "could not start 'git status in submodule '%s'" +msgstr "kunde inte starta \"git status\" i undermodulen \"%s\"" + +#: submodule.c:1197 +#, c-format +msgid "could not run 'git status in submodule '%s'" +msgstr "kunde inte köra \"git status\" i undermodulen \"%s\"" + +#: submodule.c:1398 +#, c-format +msgid "" +"relocate_gitdir for submodule '%s' with more than one worktree not supported" +msgstr "" +"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, " +"stöds ej" + +#: submodule.c:1410 submodule.c:1471 +#, c-format +msgid "could not lookup name for submodule '%s'" +msgstr "kunde inte slå upp namnet för undermodulen \"%s\"" + +#: submodule.c:1414 submodule.c:1474 builtin/submodule--helper.c:640 +#: builtin/submodule--helper.c:650 +#, c-format +msgid "could not create directory '%s'" +msgstr "kunde inte skapa katalogen \"%s\"" + +#: submodule.c:1420 +#, c-format +msgid "" +"Migrating git directory of '%s%s' from\n" +"'%s' to\n" +"'%s'\n" +msgstr "" +"Migrerar git-katalogen för \"%s%s\" från\n" +"\"%s\" till\n" +"\"%s\"\n" + +#: submodule.c:1512 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "kunde inte rekursera in i undermodulen \"%s\"" + +#: submodule-config.c:360 #, c-format msgid "invalid value for %s" msgstr "ogiltigt värde för %s" -#: trailer.c:238 +#: trailer.c:240 #, c-format msgid "running trailer command '%s' failed" msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\"" -#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 -#: trailer.c:541 +#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539 +#: trailer.c:543 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "okänt värde \"%s\" för nyckeln \"%s\"" -#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#: trailer.c:525 trailer.c:530 builtin/remote.c:289 #, c-format msgid "more than one %s" msgstr "mer än en %s" -#: trailer.c:672 +#: trailer.c:702 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "tom släpradssymbol i släpraden \"%.*s\"" -#: trailer.c:695 +#: trailer.c:722 #, c-format msgid "could not read input file '%s'" msgstr "kunde inte läsa indatafilen \"%s\"" -#: trailer.c:698 +#: trailer.c:725 msgid "could not read from stdin" msgstr "Kunde inte läsa från standard in" -#: trailer.c:929 builtin/am.c:44 +#: trailer.c:949 builtin/am.c:44 #, c-format msgid "could not stat %s" msgstr "kunde inte ta status på %s" -#: trailer.c:931 +#: trailer.c:951 #, c-format msgid "file %s is not a regular file" msgstr "filen %s är inte en normal fil" -#: trailer.c:933 +#: trailer.c:953 #, c-format msgid "file %s is not writable by user" msgstr "filen %s är inte skrivbar av användaren" -#: trailer.c:945 +#: trailer.c:965 msgid "could not open temporary file" msgstr "kunde inte öppna temporär file" -#: trailer.c:983 +#: trailer.c:1001 #, c-format msgid "could not rename temporary file to %s" msgstr "kunde inte byta namn på temporär fil till %s" @@ -3141,7 +3451,7 @@ msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n" msgid "transport: invalid depth option '%s'" msgstr "transport: ogiltig flagga för depth: %s" -#: transport.c:817 +#: transport.c:885 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -3150,7 +3460,7 @@ msgstr "" "Följande undermodulsökvägar innehåller ändringar som\n" "inte kan hittas av fjärrarna:\n" -#: transport.c:821 +#: transport.c:889 #, c-format msgid "" "\n" @@ -3177,11 +3487,11 @@ msgstr "" "för att sända dem till fjärren.\n" "\n" -#: transport.c:829 +#: transport.c:897 msgid "Aborting." msgstr "Avbryter." -#: transport-helper.c:1075 +#: transport-helper.c:1082 #, c-format msgid "Could not read ref %s" msgstr "Kunde inte läsa referensen %s" @@ -3202,7 +3512,7 @@ msgstr "tomt filnamn i trädpost" msgid "too-short tree file" msgstr "trädfil för kort" -#: unpack-trees.c:64 +#: unpack-trees.c:99 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3211,7 +3521,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:66 +#: unpack-trees.c:101 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -3220,7 +3530,7 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n" "%%s" -#: unpack-trees.c:69 +#: unpack-trees.c:104 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3230,7 +3540,7 @@ msgstr "" "sammanslagning:\n" "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren." -#: unpack-trees.c:71 +#: unpack-trees.c:106 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -3240,7 +3550,7 @@ msgstr "" "sammanslagning:\n" "%%s" -#: unpack-trees.c:74 +#: unpack-trees.c:109 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3249,7 +3559,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:76 +#: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -3258,17 +3568,17 @@ msgstr "" "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:81 +#: unpack-trees.c:116 #, c-format msgid "" -"Updating the following directories would lose untracked files in it:\n" +"Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "Uppdatering av följande kataloger gör att ospårade filer går förlorade i " "dem:\n" "%s" -#: unpack-trees.c:85 +#: unpack-trees.c:120 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3277,7 +3587,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:87 +#: unpack-trees.c:122 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -3286,7 +3596,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n" "%%s" -#: unpack-trees.c:90 +#: unpack-trees.c:125 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3296,7 +3606,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du slår samman." -#: unpack-trees.c:92 +#: unpack-trees.c:127 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -3306,7 +3616,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:95 +#: unpack-trees.c:130 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3315,7 +3625,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:97 +#: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -3324,7 +3634,7 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n" "%%s" -#: unpack-trees.c:102 +#: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3335,7 +3645,7 @@ msgstr "" "utcheckningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:104 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -3346,7 +3656,7 @@ msgstr "" "utcheckningen:\n" "%%s" -#: unpack-trees.c:107 +#: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3356,7 +3666,7 @@ msgstr "" "sammanslagningen:\n" "%%sFlytta eller ta bort dem innan du byter gren." -#: unpack-trees.c:109 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -3366,7 +3676,7 @@ msgstr "" "sammanslagningen:\n" "%%s" -#: unpack-trees.c:112 +#: unpack-trees.c:147 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3375,7 +3685,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:114 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -3384,12 +3694,12 @@ msgstr "" "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:156 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda." -#: unpack-trees.c:124 +#: unpack-trees.c:159 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up-to-date:\n" @@ -3398,7 +3708,7 @@ msgstr "" "Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n" "%s" -#: unpack-trees.c:126 +#: unpack-trees.c:161 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -3409,7 +3719,7 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:128 +#: unpack-trees.c:163 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -3420,12 +3730,12 @@ msgstr "" "utcheckning:\n" "%s" -#: unpack-trees.c:205 +#: unpack-trees.c:240 #, c-format msgid "Aborting\n" msgstr "Avbryter\n" -#: unpack-trees.c:237 +#: unpack-trees.c:270 msgid "Checking out files" msgstr "Checkar ut filer" @@ -3474,7 +3784,7 @@ msgid "could not open '%s' for writing" msgstr "kunde inte öppna \"%s\" för skrivning" #: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 -#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1033 #: builtin/pull.c:341 #, c-format msgid "could not open '%s' for reading" @@ -3688,63 +3998,67 @@ msgstr " (använd \"git am --skip\" för att hoppa över patchen)" msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:1172 +#: wt-status.c:1176 +msgid "git-rebase-todo is missing." +msgstr "git-rebase-todo saknas." + +#: wt-status.c:1178 msgid "No commands done." msgstr "Inga kommandon utförda." -#: wt-status.c:1175 +#: wt-status.c:1181 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "Sista kommandot utfört (%d kommando utfört):" msgstr[1] "Sista kommandot utfört (%d kommandon utfört):" -#: wt-status.c:1186 +#: wt-status.c:1192 #, c-format msgid " (see more in file %s)" msgstr " (se fler i filen %s)" -#: wt-status.c:1191 +#: wt-status.c:1197 msgid "No commands remaining." msgstr "Inga kommandon återstår." -#: wt-status.c:1194 +#: wt-status.c:1200 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "Nästa kommando att utföra (%d kommando återstår):" msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):" -#: wt-status.c:1202 +#: wt-status.c:1208 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)" -#: wt-status.c:1215 +#: wt-status.c:1221 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." -#: wt-status.c:1220 +#: wt-status.c:1226 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:1234 +#: wt-status.c:1240 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:1236 +#: wt-status.c:1242 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:1238 +#: wt-status.c:1244 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:1244 +#: wt-status.c:1250 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:1248 +#: wt-status.c:1254 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." @@ -3752,122 +4066,122 @@ msgstr "" "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1253 +#: wt-status.c:1259 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:1256 +#: wt-status.c:1262 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:1260 +#: wt-status.c:1266 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "" "Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " "ovanpå \"%s\"." -#: wt-status.c:1265 +#: wt-status.c:1271 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:1268 +#: wt-status.c:1274 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:1270 +#: wt-status.c:1276 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:1280 +#: wt-status.c:1286 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s." -#: wt-status.c:1285 +#: wt-status.c:1291 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")" -#: wt-status.c:1288 +#: wt-status.c:1294 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")" -#: wt-status.c:1290 +#: wt-status.c:1296 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:1299 +#: wt-status.c:1305 #, c-format msgid "You are currently reverting commit %s." msgstr "Du håller på med att ångra incheckningen %s." -#: wt-status.c:1304 +#: wt-status.c:1310 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (rätta konflikter och kör sedan \"git revert --continue\")" -#: wt-status.c:1307 +#: wt-status.c:1313 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (alla konflikter rättade: kör \"git revert --continue\")" -#: wt-status.c:1309 +#: wt-status.c:1315 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)" -#: wt-status.c:1320 +#: wt-status.c:1326 #, 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:1324 +#: wt-status.c:1330 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:1327 +#: wt-status.c:1333 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:1524 +#: wt-status.c:1530 msgid "On branch " msgstr "På grenen " -#: wt-status.c:1530 +#: wt-status.c:1536 msgid "interactive rebase in progress; onto " msgstr "interaktiv ombasering pågår; ovanpå" -#: wt-status.c:1532 +#: wt-status.c:1538 msgid "rebase in progress; onto " msgstr "ombasering pågår; ovanpå" -#: wt-status.c:1537 +#: wt-status.c:1543 msgid "HEAD detached at " msgstr "HEAD frånkopplad vid " -#: wt-status.c:1539 +#: wt-status.c:1545 msgid "HEAD detached from " msgstr "HEAD frånkopplad från " -#: wt-status.c:1542 +#: wt-status.c:1548 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:1560 +#: wt-status.c:1566 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1574 +#: wt-status.c:1580 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1576 +#: wt-status.c:1582 msgid "Ignored files" msgstr "Ignorerade filer" -#: wt-status.c:1580 +#: wt-status.c:1586 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -3879,32 +4193,32 @@ msgstr "" "lägga till nya filer själv (se \"git help status\")." # %s är nästa sträng eller tom. -#: wt-status.c:1586 +#: wt-status.c:1592 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1588 +#: wt-status.c:1594 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1594 +#: wt-status.c:1600 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1599 +#: wt-status.c:1605 #, 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:1602 +#: wt-status.c:1608 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1605 +#: wt-status.c:1611 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -3913,62 +4227,62 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1608 +#: wt-status.c:1614 #, 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:1611 +#: wt-status.c:1617 #, 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:1614 wt-status.c:1619 +#: wt-status.c:1620 wt-status.c:1625 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1617 +#: wt-status.c:1623 #, 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:1621 +#: wt-status.c:1627 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1728 +#: wt-status.c:1734 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1732 +#: wt-status.c:1738 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1761 +#: wt-status.c:1767 msgid "gone" msgstr "försvunnen" -#: wt-status.c:1763 wt-status.c:1771 +#: wt-status.c:1769 wt-status.c:1777 msgid "behind " msgstr "efter " -#: wt-status.c:1766 wt-status.c:1769 +#: wt-status.c:1772 wt-status.c:1775 msgid "ahead " msgstr "före " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2270 +#: wt-status.c:2277 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "kan inte %s: Du har oköade ändringar." -#: wt-status.c:2276 +#: wt-status.c:2283 msgid "additionally, your index contains uncommitted changes." msgstr "dessutom innehåller dit index ändringar som inte har checkats in." -#: wt-status.c:2278 +#: wt-status.c:2285 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in." @@ -4000,7 +4314,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:209 builtin/rev-parse.c:840 +#: builtin/add.c:209 builtin/rev-parse.c:845 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" @@ -4035,9 +4349,9 @@ 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:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 -#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:123 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524 +#: builtin/remote.c:1326 builtin/rm.c:241 builtin/send-pack.c:162 msgid "dry run" msgstr "testkörning" @@ -4045,7 +4359,7 @@ msgstr "testkörning" msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +#: builtin/add.c:270 builtin/checkout.c:1159 builtin/reset.c:286 msgid "select hunks interactively" msgstr "välj stycken interaktivt" @@ -4127,7 +4441,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n" #: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 #: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271 #: builtin/submodule--helper.c:244 msgid "index file corrupt" msgstr "indexfilen trasig" @@ -4250,7 +4564,7 @@ msgstr "" msgid "Failed to merge in the changes." msgstr "Misslyckades slå ihop ändringarna." -#: builtin/am.c:1686 builtin/merge.c:628 +#: builtin/am.c:1686 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" @@ -4258,8 +4572,8 @@ msgstr "git write-tree misslyckades skriva ett träd" msgid "applying to an empty history" msgstr "tillämpar på en tom historik" -#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 -#: builtin/merge.c:823 +#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802 +#: builtin/merge.c:827 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" @@ -4371,7 +4685,7 @@ msgid "allow fall back on 3way merging if needed" msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt" #: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 -#: builtin/repack.c:172 +#: builtin/repack.c:178 msgid "be quiet" msgstr "var tyst" @@ -4414,15 +4728,15 @@ msgid "pass it through git-apply" msgstr "sänd det genom git-apply" #: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 -#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 -#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185 -#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340 +#: builtin/grep.c:1038 builtin/merge.c:202 builtin/pull.c:135 +#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191 +#: builtin/show-branch.c:644 builtin/show-ref.c:169 builtin/tag.c:355 #: parse-options.h:132 parse-options.h:134 parse-options.h:245 msgid "n" msgstr "n" #: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 +#: builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format" msgstr "format" @@ -4458,8 +4772,8 @@ msgstr "ljug om incheckningsdatum" msgid "use current timestamp for author date" msgstr "använd nuvarande tidsstämpel för författardatum" -#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 -#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +#: builtin/am.c:2315 builtin/commit.c:1600 builtin/merge.c:233 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:370 msgid "key-id" msgstr "nyckel-id" @@ -4560,118 +4874,111 @@ msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>" msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)" -#: builtin/blame.c:1781 +#: builtin/blame.c:1786 msgid "Blaming lines" msgstr "Klandra rader" -#: builtin/blame.c:2577 +#: builtin/blame.c:2582 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2578 +#: builtin/blame.c:2583 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2579 +#: builtin/blame.c:2584 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2580 +#: builtin/blame.c:2585 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2581 +#: builtin/blame.c:2586 msgid "Force progress reporting" msgstr "Tvinga förloppsrapportering" -#: builtin/blame.c:2582 +#: builtin/blame.c:2587 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2583 +#: builtin/blame.c:2588 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2584 +#: builtin/blame.c:2589 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2585 +#: builtin/blame.c:2590 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2586 +#: builtin/blame.c:2591 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2587 +#: builtin/blame.c:2592 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:2588 +#: builtin/blame.c:2593 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2589 +#: builtin/blame.c:2594 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2590 +#: builtin/blame.c:2595 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2591 +#: builtin/blame.c:2596 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:2592 +#: builtin/blame.c:2597 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2599 -msgid "Use an experimental indent-based heuristic to improve diffs" -msgstr "" -"Använd en experimentell indenteringsbaserad algoritm för att förbättra diffar" - -#: builtin/blame.c:2600 -msgid "Use an experimental blank-line-based heuristic to improve diffs" -msgstr "" -"Använd en experimentell algoritm baserad på tomma rader för att förbättra " -"diffar" +#: builtin/blame.c:2604 +msgid "Use an experimental heuristic to improve diffs" +msgstr "Använd en experimentell algoritm för att förbättra diffar" -#: builtin/blame.c:2602 +#: builtin/blame.c:2606 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2603 +#: builtin/blame.c:2607 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:2604 +#: builtin/blame.c:2608 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2605 builtin/blame.c:2606 +#: builtin/blame.c:2609 builtin/blame.c:2610 msgid "score" msgstr "poäng" -#: builtin/blame.c:2605 +#: builtin/blame.c:2609 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2606 +#: builtin/blame.c:2610 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2607 +#: builtin/blame.c:2611 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" -#: builtin/blame.c:2654 +#: builtin/blame.c:2658 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress kan inte användas med --incremental eller porslinsformat" @@ -4681,42 +4988,42 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat" #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2700 +#: builtin/blame.c:2706 msgid "4 years, 11 months ago" msgstr "4 år, 11 månader sedan" -#: builtin/blame.c:2780 +#: builtin/blame.c:2786 msgid "--contents and --reverse do not blend well." msgstr "--contents och --reverse fungerar inte så bra tillsammans." -#: builtin/blame.c:2800 +#: builtin/blame.c:2806 msgid "cannot use --contents with final commit object name" msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt" -#: builtin/blame.c:2805 +#: builtin/blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "--reverse och --first-parent tillsammans kräver att du anger senaste " "incheckningen" -#: builtin/blame.c:2832 +#: builtin/blame.c:2838 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" -#: builtin/blame.c:2843 +#: builtin/blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "sökvägen %s i %s finns inte" -#: builtin/blame.c:2854 +#: builtin/blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "kan inte läsa objektet %s för sökvägen %s" -#: builtin/blame.c:2873 +#: builtin/blame.c:2879 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" @@ -4894,45 +5201,45 @@ msgstr "(HEAD frånkopplat från %s)" msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:544 +#: builtin/branch.c:535 #, c-format msgid "Branch %s is being rebased at %s" msgstr "Grenen %s ombaseras på %s" -#: builtin/branch.c:548 +#: builtin/branch.c:539 #, c-format msgid "Branch %s is being bisected at %s" msgstr "Grenen %s är i en \"bisect\" på %s" -#: builtin/branch.c:563 +#: builtin/branch.c:554 msgid "cannot rename the current branch while not on any." msgstr "" "kunde inte byta namn på aktuell gren när du inte befinner dig på någon." -#: builtin/branch.c:573 +#: builtin/branch.c:564 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:590 +#: builtin/branch.c:581 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:594 +#: builtin/branch.c:585 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:597 +#: builtin/branch.c:588 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!" -#: builtin/branch.c:604 +#: builtin/branch.c:595 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:620 +#: builtin/branch.c:611 #, c-format msgid "" "Please edit the description for the branch\n" @@ -4943,204 +5250,208 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/branch.c:651 +#: builtin/branch.c:643 msgid "Generic options" msgstr "Allmänna flaggor" -#: builtin/branch.c:653 +#: builtin/branch.c:645 msgid "show hash and subject, give twice for upstream branch" msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren" -#: builtin/branch.c:654 +#: builtin/branch.c:646 msgid "suppress informational messages" msgstr "undertryck informationsmeddelanden" -#: builtin/branch.c:655 +#: builtin/branch.c:647 msgid "set up tracking mode (see git-pull(1))" msgstr "ställ in spårningsläge (se git-pull(1))" -#: builtin/branch.c:657 +#: builtin/branch.c:649 msgid "change upstream info" msgstr "ändra uppströmsinformation" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "upstream" msgstr "uppströms" -#: builtin/branch.c:659 +#: builtin/branch.c:651 msgid "change the upstream info" msgstr "ändra uppströmsinformationen" -#: builtin/branch.c:660 +#: builtin/branch.c:652 msgid "Unset the upstream info" msgstr "ta bort uppströmsinformationen" -#: builtin/branch.c:661 +#: builtin/branch.c:653 msgid "use colored output" msgstr "använd färgad utdata" -#: builtin/branch.c:662 +#: builtin/branch.c:654 msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" -#: builtin/branch.c:664 builtin/branch.c:665 +#: builtin/branch.c:656 builtin/branch.c:657 msgid "print only branches that contain the commit" msgstr "visa endast grenar som innehåller incheckningen" -#: builtin/branch.c:668 +#: builtin/branch.c:660 msgid "Specific git-branch actions:" msgstr "Specifika git-branch-åtgärder:" -#: builtin/branch.c:669 +#: builtin/branch.c:661 msgid "list both remote-tracking and local branches" msgstr "visa både fjärrspårande och lokala grenar" -#: builtin/branch.c:671 +#: builtin/branch.c:663 msgid "delete fully merged branch" msgstr "ta bort helt sammanslagen gren" -#: builtin/branch.c:672 +#: builtin/branch.c:664 msgid "delete branch (even if not merged)" msgstr "ta bort gren (även om inte helt sammanslagen)" -#: builtin/branch.c:673 +#: builtin/branch.c:665 msgid "move/rename a branch and its reflog" msgstr "flytta/ta bort en gren och dess reflogg" -#: builtin/branch.c:674 +#: builtin/branch.c:666 msgid "move/rename a branch, even if target exists" msgstr "flytta/ta bort en gren, även om målet finns" -#: builtin/branch.c:675 +#: builtin/branch.c:667 msgid "list branch names" msgstr "lista namn på grenar" -#: builtin/branch.c:676 +#: builtin/branch.c:668 msgid "create the branch's reflog" msgstr "skapa grenens reflogg" -#: builtin/branch.c:678 +#: builtin/branch.c:670 msgid "edit the description for the branch" msgstr "redigera beskrivning för grenen" -#: builtin/branch.c:679 +#: builtin/branch.c:671 msgid "force creation, move/rename, deletion" msgstr "tvinga skapande, flytt/namnändring, borttagande" -#: builtin/branch.c:680 +#: builtin/branch.c:672 msgid "print only branches that are merged" msgstr "visa endast sammanslagna grenar" -#: builtin/branch.c:681 +#: builtin/branch.c:673 msgid "print only branches that are not merged" msgstr "visa endast ej sammanslagna grenar" -#: builtin/branch.c:682 +#: builtin/branch.c:674 msgid "list branches in columns" msgstr "visa grenar i spalter" -#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366 +#: builtin/branch.c:675 builtin/for-each-ref.c:38 builtin/tag.c:381 msgid "key" msgstr "nyckel" -#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367 +#: builtin/branch.c:676 builtin/for-each-ref.c:39 builtin/tag.c:382 msgid "field name to sort on" msgstr "fältnamn att sortera på" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/branch.c:678 builtin/for-each-ref.c:41 builtin/notes.c:404 #: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 -#: builtin/tag.c:369 +#: builtin/tag.c:384 msgid "object" msgstr "objekt" -#: builtin/branch.c:687 +#: builtin/branch.c:679 msgid "print only branches of the object" msgstr "visa endast grenar för objektet" -#: builtin/branch.c:705 +#: builtin/branch.c:681 builtin/for-each-ref.c:46 builtin/tag.c:388 +msgid "sorting and filtering are case insensitive" +msgstr "sortering och filtrering skiljer gemener och VERSALER" + +#: builtin/branch.c:698 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:709 builtin/clone.c:706 +#: builtin/branch.c:702 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:729 +#: builtin/branch.c:724 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:740 builtin/branch.c:782 +#: builtin/branch.c:735 builtin/branch.c:787 msgid "branch name required" msgstr "grennamn krävs" -#: builtin/branch.c:758 +#: builtin/branch.c:763 msgid "Cannot give description to detached HEAD" msgstr "Kan inte beskriva frånkopplad HEAD" -#: builtin/branch.c:763 +#: builtin/branch.c:768 msgid "cannot edit description of more than one branch" msgstr "kan inte redigera beskrivning för mer än en gren" -#: builtin/branch.c:770 +#: builtin/branch.c:775 #, c-format msgid "No commit on branch '%s' yet." msgstr "Inga incheckningar på grenen \"%s\" ännu" -#: builtin/branch.c:773 +#: builtin/branch.c:778 #, c-format msgid "No branch named '%s'." msgstr "Ingen gren vid namnet \"%s\"." -#: builtin/branch.c:788 +#: builtin/branch.c:793 msgid "too many branches for a rename operation" msgstr "för många grenar för namnbyte" -#: builtin/branch.c:793 +#: builtin/branch.c:798 msgid "too many branches to set new upstream" msgstr "för många grenar för att byta uppström" -#: builtin/branch.c:797 +#: builtin/branch.c:802 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "" "kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren." -#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843 +#: builtin/branch.c:805 builtin/branch.c:827 builtin/branch.c:848 #, c-format msgid "no such branch '%s'" msgstr "okänd gren \"%s\"" -#: builtin/branch.c:804 +#: builtin/branch.c:809 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:816 +#: builtin/branch.c:821 msgid "too many branches to unset upstream" msgstr "för många grenar för att ta bort uppström" -#: builtin/branch.c:820 +#: builtin/branch.c:825 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren." -#: builtin/branch.c:826 +#: builtin/branch.c:831 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:840 +#: builtin/branch.c:845 msgid "it does not make sense to create 'HEAD' manually" msgstr "kan inte skapa \"HEAD\" manuellt" -#: builtin/branch.c:846 +#: builtin/branch.c:851 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:849 +#: builtin/branch.c:854 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -5149,7 +5460,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:866 +#: builtin/branch.c:871 #, c-format msgid "" "\n" @@ -5217,7 +5528,7 @@ msgstr "för blob-objekt, kör filter på objektets innehåll" 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:561 git-submodule.sh:923 +#: builtin/cat-file.c:561 git-submodule.sh:929 msgid "blob" msgstr "blob" @@ -5274,7 +5585,7 @@ 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:18 builtin/checkout.c:1137 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1140 builtin/gc.c:332 msgid "suppress progress reporting" msgstr "undertryck förloppsrapportering" @@ -5364,9 +5675,9 @@ msgid "write the content to temporary files" msgstr "skriv innehåll till temporära filer" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 -#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 -#: builtin/worktree.c:469 +#: builtin/submodule--helper.c:597 builtin/submodule--helper.c:600 +#: builtin/submodule--helper.c:606 builtin/submodule--helper.c:967 +#: builtin/worktree.c:471 msgid "string" msgstr "sträng" @@ -5441,50 +5752,50 @@ msgstr "sökvägen \"%s\" har inte slagits ihop" msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:624 +#: builtin/checkout.c:625 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Kan inte skapa referenslogg för \"%s\": %s\n" -#: builtin/checkout.c:663 +#: builtin/checkout.c:666 msgid "HEAD is now at" msgstr "HEAD är nu på" -#: builtin/checkout.c:667 builtin/clone.c:660 +#: builtin/checkout.c:670 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "kan inte uppdatera HEAD" -#: builtin/checkout.c:671 +#: builtin/checkout.c:674 #, c-format msgid "Reset branch '%s'\n" msgstr "Återställ gren \"%s\"\n" -#: builtin/checkout.c:674 +#: builtin/checkout.c:677 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:678 +#: builtin/checkout.c:681 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:680 builtin/checkout.c:1069 +#: builtin/checkout.c:683 builtin/checkout.c:1072 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:682 +#: builtin/checkout.c:685 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:733 +#: builtin/checkout.c:736 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" -#: builtin/checkout.c:739 +#: builtin/checkout.c:742 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -5507,7 +5818,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:758 +#: builtin/checkout.c:761 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5534,151 +5845,151 @@ msgstr[1] "" " git branch <nytt_grennamn> %s\n" "\n" -#: builtin/checkout.c:794 +#: builtin/checkout.c:797 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:798 +#: builtin/checkout.c:801 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:825 builtin/checkout.c:1064 +#: builtin/checkout.c:828 builtin/checkout.c:1067 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" -#: builtin/checkout.c:970 +#: builtin/checkout.c:973 #, c-format msgid "only one reference expected, %d given." msgstr "endast en referens förväntades, %d gavs." -#: builtin/checkout.c:1010 builtin/worktree.c:214 +#: builtin/checkout.c:1013 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" -#: builtin/checkout.c:1039 +#: builtin/checkout.c:1042 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "paths cannot be used with switching branches" msgstr "sökvägar kan inte användas vid byte av gren" -#: builtin/checkout.c:1081 builtin/checkout.c:1085 +#: builtin/checkout.c:1084 builtin/checkout.c:1088 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "\"%s\" kan inte användas vid byte av gren" -#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 -#: builtin/checkout.c:1100 +#: builtin/checkout.c:1092 builtin/checkout.c:1095 builtin/checkout.c:1100 +#: builtin/checkout.c:1103 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "\"%s\" kan inte användas med \"%s\"" -#: builtin/checkout.c:1105 +#: builtin/checkout.c:1108 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 +#: builtin/checkout.c:1141 builtin/checkout.c:1143 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "gren" -#: builtin/checkout.c:1139 +#: builtin/checkout.c:1142 msgid "create and checkout a new branch" msgstr "skapa och checka ut en ny gren" -#: builtin/checkout.c:1141 +#: builtin/checkout.c:1144 msgid "create/reset and checkout a branch" msgstr "skapa/nollställ och checka ut en gren" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1145 msgid "create reflog for new branch" msgstr "skapa reflogg för ny gren" -#: builtin/checkout.c:1143 builtin/worktree.c:328 +#: builtin/checkout.c:1146 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "koppla från HEAD vid namngiven incheckning" -#: builtin/checkout.c:1144 +#: builtin/checkout.c:1147 msgid "set upstream info for new branch" msgstr "sätt uppströmsinformation för ny gren" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new-branch" msgstr "ny-gren" -#: builtin/checkout.c:1146 +#: builtin/checkout.c:1149 msgid "new unparented branch" msgstr "ny gren utan förälder" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1150 msgid "checkout our version for unmerged files" msgstr "checka ut vår version för ej sammanslagna filer" -#: builtin/checkout.c:1149 +#: builtin/checkout.c:1152 msgid "checkout their version for unmerged files" msgstr "checka ut deras version för ej sammanslagna filer" -#: builtin/checkout.c:1151 +#: builtin/checkout.c:1154 msgid "force checkout (throw away local modifications)" msgstr "tvinga utcheckning (kasta bort lokala ändringar)" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1155 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:1153 builtin/merge.c:231 +#: builtin/checkout.c:1156 builtin/merge.c:235 msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 +#: builtin/checkout.c:1157 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "stil" -#: builtin/checkout.c:1155 +#: builtin/checkout.c:1158 msgid "conflict style (merge or diff3)" msgstr "konfliktstil (merge eller diff3)" -#: builtin/checkout.c:1158 +#: builtin/checkout.c:1161 msgid "do not limit pathspecs to sparse entries only" msgstr "begränsa inte sökvägar till endast glesa poster" -#: builtin/checkout.c:1160 +#: builtin/checkout.c:1163 msgid "second guess 'git checkout <no-such-branch>'" msgstr "förutspå \"git checkout <gren-saknas>\"" -#: builtin/checkout.c:1162 +#: builtin/checkout.c:1165 msgid "do not check if another worktree is holding the given ref" msgstr "" "kontrollera inte om en annan arbetskatalog håller den angivna referensen" -#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 -#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 +#: builtin/checkout.c:1166 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:232 builtin/pull.c:117 builtin/push.c:539 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" -#: builtin/checkout.c:1194 +#: builtin/checkout.c:1197 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B och --orphan är ömsesidigt uteslutande" -#: builtin/checkout.c:1211 +#: builtin/checkout.c:1214 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:1216 +#: builtin/checkout.c:1219 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1252 +#: builtin/checkout.c:1255 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1259 +#: builtin/checkout.c:1262 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5687,12 +5998,12 @@ msgstr "" "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n" "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?" -#: builtin/checkout.c:1264 +#: builtin/checkout.c:1267 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\"" -#: builtin/checkout.c:1268 +#: builtin/checkout.c:1271 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5732,19 +6043,21 @@ msgstr "Skulle hoppa över arkivet %s\n" msgid "failed to remove %s" msgstr "misslyckades ta bort %s" -#: builtin/clean.c:291 +#: builtin/clean.c:291 git-add--interactive.perl:623 +#, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" -" - (empty) select nothing" +" - (empty) select nothing\n" msgstr "" "Kommandohjälp:\n" "1 - markera en numrerad post\n" "foo - markera post baserad på unikt prefix\n" -" - (tomt) markera ingenting" +" - (tomt) markera ingenting\n" -#: builtin/clean.c:295 +#: builtin/clean.c:295 git-add--interactive.perl:632 +#, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" @@ -5753,7 +6066,7 @@ msgid "" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" -" - (empty) finish selecting" +" - (empty) finish selecting\n" msgstr "" "Kommandohjälp:\n" "1 - markera en ensam post\n" @@ -5762,12 +6075,13 @@ msgstr "" "foo - markera post baserad på unikt prefix\n" "-... - avmarkera specifika poster\n" "* - välj alla poster\n" -" - (tomt) avsluta markering" +" - (tomt) avsluta markering\n" -#: builtin/clean.c:511 -#, c-format -msgid "Huh (%s)?" -msgstr "Vadå (%s)?" +#: builtin/clean.c:511 git-add--interactive.perl:598 +#: git-add--interactive.perl:603 +#, c-format, perl-format +msgid "Huh (%s)?\n" +msgstr "Vadå (%s)?\n" #: builtin/clean.c:653 #, c-format @@ -5789,9 +6103,10 @@ msgstr "Välj poster att ta bort" msgid "Remove %s [y/N]? " msgstr "Ta bort %s [Y=ja / N=nej]?" -#: builtin/clean.c:777 -msgid "Bye." -msgstr "Hej då." +#: builtin/clean.c:777 git-add--interactive.perl:1669 +#, c-format +msgid "Bye.\n" +msgstr "Hej då.\n" #: builtin/clean.c:785 msgid "" @@ -5811,11 +6126,11 @@ msgstr "" "help - denna skärm\n" "? - hjälp för kommandoval" -#: builtin/clean.c:812 +#: builtin/clean.c:812 git-add--interactive.perl:1745 msgid "*** Commands ***" msgstr "*** Kommandon ***" -#: builtin/clean.c:813 +#: builtin/clean.c:813 git-add--interactive.perl:1742 msgid "What now" msgstr "Vad nu" @@ -5845,8 +6160,8 @@ msgstr "städa interaktivt" msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 -#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:1056 +#: builtin/ls-files.c:538 builtin/name-rev.c:313 builtin/show-ref.c:176 msgid "pattern" msgstr "mönster" @@ -5926,8 +6241,8 @@ msgstr "mallkatalog" msgid "directory from which templates will be used" msgstr "katalog att använda mallar från" -#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 -#: builtin/submodule--helper.c:954 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:604 +#: builtin/submodule--helper.c:970 msgid "reference repository" msgstr "referensarkiv" @@ -5951,7 +6266,7 @@ msgstr "checka ut <gren> istället för fjärrens HEAD" msgid "path to git-upload-pack on the remote" msgstr "sökväg till git-upload-pack på fjärren" -#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:999 #: builtin/pull.c:202 msgid "depth" msgstr "djup" @@ -5960,7 +6275,7 @@ msgstr "djup" msgid "create a shallow clone of that depth" msgstr "skapa en grund klon på detta djup" -#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2836 #: parse-options.h:142 msgid "time" msgstr "tid" @@ -5974,8 +6289,8 @@ msgid "revision" msgstr "revision" #: builtin/clone.c:102 builtin/fetch.c:125 -msgid "deepen history of shallow clone by excluding rev" -msgstr "fördjupa historik för grund klon genom att exkludera revision" +msgid "deepen history of shallow clone, excluding rev" +msgstr "fördjupa historik för grund klon, exkludera revisionen" #: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" @@ -6001,11 +6316,11 @@ msgstr "nyckel=värde" msgid "set config inside the new repository" msgstr "ställ in konfiguration i det nya arkivet" -#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:550 msgid "use IPv4 addresses only" msgstr "använd endast IPv4-adresser" -#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:552 msgid "use IPv6 addresses only" msgstr "använd endast IPv6-adresser" @@ -6119,7 +6434,7 @@ msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:905 builtin/fetch.c:1338 +#: builtin/clone.c:905 builtin/fetch.c:1335 #, c-format msgid "depth %s is not a positive number" msgstr "djupet %s är inte ett positivt tal" @@ -6134,8 +6449,9 @@ msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 -#: builtin/worktree.c:222 builtin/worktree.c:249 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/difftool.c:252 +#: builtin/submodule--helper.c:659 builtin/worktree.c:222 +#: builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" @@ -6405,7 +6721,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:704 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:295 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -6505,7 +6821,7 @@ msgstr "Kan inte läsa indexet" msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:969 builtin/tag.c:266 +#: builtin/commit.c:968 builtin/tag.c:280 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" @@ -6516,7 +6832,7 @@ msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare" -#: builtin/commit.c:1086 builtin/commit.c:1327 +#: builtin/commit.c:1086 builtin/commit.c:1325 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" @@ -6567,65 +6883,61 @@ msgid "No paths with --include/--only does not make sense." msgstr "Du måste ange sökvägar tillsammans med --include/--only." #: builtin/commit.c:1212 -msgid "Clever... amending the last one with dirty index." -msgstr "Smart... utöka den senaste med smutsigt index." - -#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1226 builtin/tag.c:474 +#: builtin/commit.c:1224 builtin/tag.c:495 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1231 +#: builtin/commit.c:1229 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1341 builtin/commit.c:1617 +#: builtin/commit.c:1339 builtin/commit.c:1612 msgid "show status concisely" msgstr "visa koncis status" -#: builtin/commit.c:1343 builtin/commit.c:1619 +#: builtin/commit.c:1341 builtin/commit.c:1614 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1345 +#: builtin/commit.c:1343 msgid "version" msgstr "version" -#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 -#: builtin/worktree.c:440 +#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525 +#: builtin/worktree.c:442 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1348 builtin/commit.c:1623 +#: builtin/commit.c:1346 builtin/commit.c:1618 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1351 builtin/commit.c:1626 +#: builtin/commit.c:1349 builtin/commit.c:1621 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 -#: builtin/fast-export.c:984 builtin/tag.c:353 +#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981 +#: builtin/fast-export.c:984 builtin/tag.c:368 msgid "mode" msgstr "läge" -#: builtin/commit.c:1354 builtin/commit.c:1629 +#: builtin/commit.c:1352 builtin/commit.c:1624 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1357 +#: builtin/commit.c:1355 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1358 parse-options.h:155 +#: builtin/commit.c:1356 parse-options.h:155 msgid "when" msgstr "när" -#: builtin/commit.c:1359 +#: builtin/commit.c:1357 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6633,201 +6945,201 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1361 +#: builtin/commit.c:1359 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1437 +#: builtin/commit.c:1435 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1439 +#: builtin/commit.c:1437 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1484 +#: builtin/commit.c:1482 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1487 +#: builtin/commit.c:1485 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1587 +#: builtin/commit.c:1582 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1588 +#: builtin/commit.c:1583 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1590 +#: builtin/commit.c:1585 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1591 builtin/tag.c:351 +#: builtin/commit.c:1586 builtin/tag.c:366 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "author" msgstr "författare" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1593 builtin/gc.c:326 +#: builtin/commit.c:1588 builtin/gc.c:333 msgid "date" msgstr "datum" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "override date for commit" msgstr "överstyr datum för incheckningen" -#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 -#: builtin/notes.c:561 builtin/tag.c:349 +#: builtin/commit.c:1589 builtin/merge.c:222 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:364 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1594 +#: builtin/commit.c:1589 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 -#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 +#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592 +#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:81 msgid "commit" msgstr "incheckning" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1596 +#: builtin/commit.c:1591 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 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:1600 builtin/log.c:1413 builtin/revert.c:86 +#: builtin/commit.c:1595 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "default" msgstr "standard" -#: builtin/commit.c:1603 builtin/tag.c:354 +#: builtin/commit.c:1598 builtin/tag.c:369 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 +#: builtin/commit.c:1601 builtin/merge.c:234 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG-signera incheckning" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1610 +#: builtin/commit.c:1605 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1611 +#: builtin/commit.c:1606 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1612 +#: builtin/commit.c:1607 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1613 +#: builtin/commit.c:1608 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "bypass pre-commit and commit-msg hooks" msgstr "förbigå pre-commit- och commit-msg-krokar" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1627 +#: builtin/commit.c:1622 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1628 +#: builtin/commit.c:1623 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1635 +#: builtin/commit.c:1630 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1664 +#: builtin/commit.c:1659 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1712 +#: builtin/commit.c:1707 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1719 +#: builtin/commit.c:1714 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1738 +#: builtin/commit.c:1733 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1749 +#: builtin/commit.c:1744 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1754 +#: builtin/commit.c:1749 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1802 +#: builtin/commit.c:1797 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -7151,35 +7463,123 @@ msgstr "Inga namn hittades, kan inte beskriva något." msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden" -#: builtin/diff.c:86 +#: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:237 +#: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:361 +#: builtin/diff.c:358 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:404 +#: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:413 +#: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:420 +#: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." +#: builtin/difftool.c:28 +msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" +msgstr "" +"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]" + +#: builtin/difftool.c:241 +#, c-format +msgid "failed: %d" +msgstr "misslyckades: %d" + +#: builtin/difftool.c:342 +msgid "" +"combined diff formats('-c' and '--cc') are not supported in\n" +"directory diff mode('-d' and '--dir-diff')." +msgstr "" +"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n" +"katalogdiffläge (\"-d\" och \"--dir-diff\")." + +#: builtin/difftool.c:567 +#, c-format +msgid "both files modified: '%s' and '%s'." +msgstr "bägge filerna ändrade: \"%s\" och \"%s\"." + +#: builtin/difftool.c:569 +msgid "working tree file has been left." +msgstr "filen i arbetskatalogen lämnades kvar." + +#: builtin/difftool.c:580 +#, c-format +msgid "temporary files exist in '%s'." +msgstr "temporära filer finns i \"%s\"." + +#: builtin/difftool.c:581 +msgid "you may want to cleanup or recover these." +msgstr "du kanske vill städa eller rädda dem." + +#: builtin/difftool.c:626 +msgid "use `diff.guitool` instead of `diff.tool`" +msgstr "använd \"diff.guitool\" istället för \"diff.tool\"" + +#: builtin/difftool.c:628 +msgid "perform a full-directory diff" +msgstr "utför diff för hela katalogen" + +#: builtin/difftool.c:630 +msgid "do not prompt before launching a diff tool" +msgstr "fråga inte vid start av diff-verktyg" + +#: builtin/difftool.c:636 +msgid "use symlinks in dir-diff mode" +msgstr "använd symboliska länkar i katalogdiffläge" + +#: builtin/difftool.c:637 +msgid "<tool>" +msgstr "<verktyg>" + +#: builtin/difftool.c:638 +msgid "use the specified diff tool" +msgstr "använd angivet diff-verktyg" + +#: builtin/difftool.c:640 +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:643 +msgid "" +"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " +"code" +msgstr "" +"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde " +"skilt från noll" + +#: builtin/difftool.c:645 +msgid "<command>" +msgstr "<kommando>" + +#: builtin/difftool.c:646 +msgid "specify a custom command for viewing diffs" +msgstr "ange eget kommando för att visa diffar" + +#: builtin/difftool.c:670 +msgid "no <tool> given for --tool=<tool>" +msgstr "inget <verktyg> angavs för --tool=<verktyg>" + +#: builtin/difftool.c:677 +msgid "no <cmd> given for --extcmd=<cmd>" +msgstr "inget <kommando> angavs för --extcmd=<kommando>" + #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" @@ -7336,77 +7736,77 @@ msgstr "referenskarta" msgid "specify fetch refmap" msgstr "ange referenskarta för \"fetch\"" -#: builtin/fetch.c:398 +#: builtin/fetch.c:395 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:514 +#: builtin/fetch.c:511 #, 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:607 +#: builtin/fetch.c:604 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:611 +#: builtin/fetch.c:608 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:624 builtin/fetch.c:704 +#: builtin/fetch.c:621 builtin/fetch.c:701 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:625 +#: builtin/fetch.c:622 msgid "can't fetch in current branch" msgstr "kan inte hämta i aktuell gren" -#: builtin/fetch.c:634 +#: builtin/fetch.c:631 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 -#: builtin/fetch.c:699 +#: builtin/fetch.c:632 builtin/fetch.c:665 builtin/fetch.c:681 +#: builtin/fetch.c:696 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:654 +#: builtin/fetch.c:651 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:657 +#: builtin/fetch.c:654 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:660 +#: builtin/fetch.c:657 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:699 +#: builtin/fetch.c:696 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:704 +#: builtin/fetch.c:701 msgid "non-fast-forward" msgstr "ej snabbspolad" -#: builtin/fetch.c:749 +#: builtin/fetch.c:746 #, 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:769 +#: builtin/fetch.c:766 #, 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:856 builtin/fetch.c:952 +#: builtin/fetch.c:853 builtin/fetch.c:949 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:867 +#: builtin/fetch.c:864 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -7415,55 +7815,55 @@ 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:922 +#: builtin/fetch.c:919 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:923 +#: builtin/fetch.c:920 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:955 +#: builtin/fetch.c:952 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:956 builtin/remote.c:1020 +#: builtin/fetch.c:953 builtin/remote.c:1020 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:979 +#: builtin/fetch.c:976 #, 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:998 +#: builtin/fetch.c:995 #, 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:1001 +#: builtin/fetch.c:998 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:1077 +#: builtin/fetch.c:1074 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:1237 +#: builtin/fetch.c:1234 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:1239 builtin/remote.c:96 +#: builtin/fetch.c:1236 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:1257 +#: builtin/fetch.c:1254 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -7471,40 +7871,40 @@ 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:1280 +#: builtin/fetch.c:1277 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:1322 +#: builtin/fetch.c:1319 msgid "Negative depth in --deepen is not supported" msgstr "Negativa djup stöds inte i --deepen" -#: builtin/fetch.c:1324 +#: builtin/fetch.c:1321 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen och --depth är ömsesidigt uteslutande" -#: builtin/fetch.c:1329 +#: builtin/fetch.c:1326 msgid "--depth and --unshallow cannot be used together" msgstr "--depth och --unshallow kan inte användas samtidigt" -#: builtin/fetch.c:1331 +#: builtin/fetch.c:1328 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow kan inte användas på ett komplett arkiv" -#: builtin/fetch.c:1353 +#: builtin/fetch.c:1350 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:1355 +#: builtin/fetch.c:1352 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:1366 +#: builtin/fetch.c:1363 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1374 +#: builtin/fetch.c:1371 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -7570,7 +7970,7 @@ msgstr "citera platshållare passande för Tcl" msgid "show only <n> matched refs" msgstr "visa endast <n> träffade refs" -#: builtin/for-each-ref.c:37 builtin/tag.c:372 +#: builtin/for-each-ref.c:37 builtin/tag.c:387 builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "format att använda för utdata" @@ -7590,65 +7990,65 @@ msgstr "visa endast referenser som ej slagits samman" msgid "print only refs which contain the commit" msgstr "visa endast referenser som innehåller incheckningen" -#: builtin/fsck.c:519 +#: builtin/fsck.c:554 msgid "Checking object directories" msgstr "Kontrollerar objektkataloger" -#: builtin/fsck.c:588 +#: builtin/fsck.c:646 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<flaggor>] [<objekt>...]" -#: builtin/fsck.c:594 +#: builtin/fsck.c:652 msgid "show unreachable objects" msgstr "visa onåbara objekt" -#: builtin/fsck.c:595 +#: builtin/fsck.c:653 msgid "show dangling objects" msgstr "visa dinglande objekt" -#: builtin/fsck.c:596 +#: builtin/fsck.c:654 msgid "report tags" msgstr "rapportera taggar" -#: builtin/fsck.c:597 +#: builtin/fsck.c:655 msgid "report root nodes" msgstr "rapportera rotnoder" -#: builtin/fsck.c:598 +#: builtin/fsck.c:656 msgid "make index objects head nodes" msgstr "gör indexojekt till huvudnoder" -#: builtin/fsck.c:599 +#: builtin/fsck.c:657 msgid "make reflogs head nodes (default)" msgstr "gör refloggar till huvudnoder (standard)" -#: builtin/fsck.c:600 +#: builtin/fsck.c:658 msgid "also consider packs and alternate objects" msgstr "ta även hänsyn till paket och alternativa objekt" # Vague original, not networking-related, but rather related to the actual # objects in the database. -#: builtin/fsck.c:601 +#: builtin/fsck.c:659 msgid "check only connectivity" msgstr "kontrollera endast konnektivitet" -#: builtin/fsck.c:602 +#: builtin/fsck.c:660 msgid "enable more strict checking" msgstr "aktivera striktare kontroll" -#: builtin/fsck.c:604 +#: builtin/fsck.c:662 msgid "write dangling objects in .git/lost-found" msgstr "skriv dinglande objekt i .git/lost-found" -#: builtin/fsck.c:605 builtin/prune.c:107 +#: builtin/fsck.c:663 builtin/prune.c:107 msgid "show progress" msgstr "visa förlopp" -#: builtin/fsck.c:606 +#: builtin/fsck.c:664 msgid "show verbose names for reachable objects" msgstr "visa ordrika namn för nåbara objekt" -#: builtin/fsck.c:665 +#: builtin/fsck.c:725 msgid "Checking objects" msgstr "Kontrollerar objekt" @@ -7666,7 +8066,7 @@ msgstr "Felaktigt %s: \"%s\"" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:290 +#: builtin/gc.c:297 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -7681,38 +8081,38 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:327 +#: builtin/gc.c:334 msgid "prune unreferenced objects" msgstr "rensa ej refererade objekt" -#: builtin/gc.c:329 +#: builtin/gc.c:336 msgid "be more thorough (increased runtime)" msgstr "var mer grundlig (ökar körtiden)" -#: builtin/gc.c:330 +#: builtin/gc.c:337 msgid "enable auto-gc mode" msgstr "aktivera auto-gc-läge" -#: builtin/gc.c:331 +#: builtin/gc.c:338 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:373 +#: builtin/gc.c:380 #, 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:375 +#: builtin/gc.c:382 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:376 +#: builtin/gc.c:383 #, 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:397 +#: builtin/gc.c:404 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -7720,240 +8120,256 @@ msgstr "" "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte " "är fallet)" -#: builtin/gc.c:441 +#: builtin/gc.c:448 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort " "dem." -#: builtin/grep.c:23 +#: builtin/grep.c:25 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]" -#: builtin/grep.c:219 +#: builtin/grep.c:232 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:277 +#: builtin/grep.c:290 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "felaktigt antal trådar angivet (%d) för %s" -#: builtin/grep.c:453 builtin/grep.c:488 +#: builtin/grep.c:763 builtin/grep.c:804 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:503 +#: builtin/grep.c:823 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:561 +#: builtin/grep.c:887 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:647 +#: builtin/grep.c:973 msgid "search in index instead of in the work tree" msgstr "sök i indexet istället för i arbetskatalogen" -#: builtin/grep.c:649 +#: builtin/grep.c:975 msgid "find in contents not managed by git" msgstr "sök i innehåll som inte hanteras av git" -#: builtin/grep.c:651 +#: builtin/grep.c:977 msgid "search in both tracked and untracked files" msgstr "sök i både spårade och ospårade filer" -#: builtin/grep.c:653 +#: builtin/grep.c:979 msgid "ignore files specified via '.gitignore'" msgstr "ignorera filer angivna i \".gitignore\"" -#: builtin/grep.c:656 +#: builtin/grep.c:981 +msgid "recursivley search in each submodule" +msgstr "sök varje undermodul rekursivt" + +#: builtin/grep.c:983 +msgid "basename" +msgstr "basnamn" + +#: builtin/grep.c:984 +msgid "prepend parent project's basename to output" +msgstr "lägg till föräldraprojektets basnamn i utdata" + +#: builtin/grep.c:987 msgid "show non-matching lines" msgstr "visa rader som inte träffas" -#: builtin/grep.c:658 +#: builtin/grep.c:989 msgid "case insensitive matching" msgstr "skiftlägesokänslig sökning" -#: builtin/grep.c:660 +#: builtin/grep.c:991 msgid "match patterns only at word boundaries" msgstr "matcha endast mönster vid ordgränser" -#: builtin/grep.c:662 +#: builtin/grep.c:993 msgid "process binary files as text" msgstr "hantera binärfiler som text" -#: builtin/grep.c:664 +#: builtin/grep.c:995 msgid "don't match patterns in binary files" msgstr "träffa inte mönster i binärfiler" -#: builtin/grep.c:667 +#: builtin/grep.c:998 msgid "process binary files with textconv filters" msgstr "hantera binärfiler med textconv-filter" -#: builtin/grep.c:669 +#: builtin/grep.c:1000 msgid "descend at most <depth> levels" msgstr "gå som mest ned <djup> nivåer" -#: builtin/grep.c:673 +#: builtin/grep.c:1004 msgid "use extended POSIX regular expressions" msgstr "använd utökade POSIX-reguljära uttryck" -#: builtin/grep.c:676 +#: builtin/grep.c:1007 msgid "use basic POSIX regular expressions (default)" msgstr "använd grundläggande POSIX-reguljära uttryck (standard)" -#: builtin/grep.c:679 +#: builtin/grep.c:1010 msgid "interpret patterns as fixed strings" msgstr "tolka mönster som fixerade strängar" -#: builtin/grep.c:682 +#: builtin/grep.c:1013 msgid "use Perl-compatible regular expressions" msgstr "använd Perlkompatibla reguljära uttryck" -#: builtin/grep.c:685 +#: builtin/grep.c:1016 msgid "show line numbers" msgstr "visa radnummer" -#: builtin/grep.c:686 +#: builtin/grep.c:1017 msgid "don't show filenames" msgstr "visa inte filnamn" -#: builtin/grep.c:687 +#: builtin/grep.c:1018 msgid "show filenames" msgstr "visa filnamn" -#: builtin/grep.c:689 +#: builtin/grep.c:1020 msgid "show filenames relative to top directory" msgstr "visa filnamn relativa till toppkatalogen" -#: builtin/grep.c:691 +#: builtin/grep.c:1022 msgid "show only filenames instead of matching lines" msgstr "visa endast filnamn istället för träffade rader" -#: builtin/grep.c:693 +#: builtin/grep.c:1024 msgid "synonym for --files-with-matches" msgstr "synonym för --files-with-matches" -#: builtin/grep.c:696 +#: builtin/grep.c:1027 msgid "show only the names of files without match" msgstr "visa endast namn på filer utan träffar" -#: builtin/grep.c:698 +#: builtin/grep.c:1029 msgid "print NUL after filenames" msgstr "skriv NUL efter filnamn" -#: builtin/grep.c:700 +#: builtin/grep.c:1031 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:701 +#: builtin/grep.c:1032 msgid "highlight matches" msgstr "ljusmarkera träffar" -#: builtin/grep.c:703 +#: builtin/grep.c:1034 msgid "print empty line between matches from different files" msgstr "skriv tomma rader mellan träffar från olika filer" -#: builtin/grep.c:705 +#: builtin/grep.c:1036 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:708 +#: builtin/grep.c:1039 msgid "show <n> context lines before and after matches" msgstr "visa <n> rader sammanhang före och efter träffar" -#: builtin/grep.c:711 +#: builtin/grep.c:1042 msgid "show <n> context lines before matches" msgstr "visa <n> rader sammanhang före träffar" -#: builtin/grep.c:713 +#: builtin/grep.c:1044 msgid "show <n> context lines after matches" msgstr "visa <n> rader sammanhang efter träffar" -#: builtin/grep.c:715 +#: builtin/grep.c:1046 msgid "use <n> worker threads" msgstr "använd <n> jobbtrådar" -#: builtin/grep.c:716 +#: builtin/grep.c:1047 msgid "shortcut for -C NUM" msgstr "genväg för -C NUM" -#: builtin/grep.c:719 +#: builtin/grep.c:1050 msgid "show a line with the function name before matches" msgstr "visa en rad med funktionsnamnet före träffen" -#: builtin/grep.c:721 +#: builtin/grep.c:1052 msgid "show the surrounding function" msgstr "visa den omkringliggande funktionen" -#: builtin/grep.c:724 +#: builtin/grep.c:1055 msgid "read patterns from file" msgstr "läs mönster från fil" -#: builtin/grep.c:726 +#: builtin/grep.c:1057 msgid "match <pattern>" msgstr "träffa <mönster>" -#: builtin/grep.c:728 +#: builtin/grep.c:1059 msgid "combine patterns specified with -e" msgstr "kombinera mönster som anges med -e" -#: builtin/grep.c:740 +#: builtin/grep.c:1071 msgid "indicate hit with exit status without output" msgstr "ange träff med slutstatuskod utan utdata" -#: builtin/grep.c:742 +#: builtin/grep.c:1073 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:744 +#: builtin/grep.c:1075 msgid "show parse tree for grep expression" msgstr "visa analysträd för grep-uttryck" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "pager" msgstr "bläddrare" -#: builtin/grep.c:748 +#: builtin/grep.c:1079 msgid "show matching files in the pager" msgstr "visa träffade filer i filbläddraren" -#: builtin/grep.c:751 +#: builtin/grep.c:1082 msgid "allow calling of grep(1) (ignored by this build)" msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)" -#: builtin/grep.c:814 +#: builtin/grep.c:1146 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:846 builtin/index-pack.c:1480 +#: builtin/grep.c:1178 builtin/index-pack.c:1482 #, c-format msgid "invalid number of threads specified (%d)" msgstr "felaktigt antal trådar angivet (%d)" -#: builtin/grep.c:876 +#: builtin/grep.c:1215 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:902 +#: builtin/grep.c:1238 +msgid "option not supported with --recurse-submodules." +msgstr "flaggan stöds inte med --recurse-submodules." + +#: builtin/grep.c:1244 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:907 +#: builtin/grep.c:1249 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:910 +#: builtin/grep.c:1252 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:918 +#: builtin/grep.c:1260 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -8232,183 +8648,187 @@ msgid "serious inflate inconsistency" msgstr "allvarlig inflate-inkonsekvens" #: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 -#: builtin/index-pack.c:811 builtin/index-pack.c:820 +#: builtin/index-pack.c:813 builtin/index-pack.c:822 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !" -#: builtin/index-pack.c:751 builtin/pack-objects.c:166 -#: builtin/pack-objects.c:258 +#: builtin/index-pack.c:751 builtin/pack-objects.c:164 +#: builtin/pack-objects.c:256 #, c-format msgid "unable to read %s" msgstr "kunde inte läsa %s" -#: builtin/index-pack.c:817 +#: builtin/index-pack.c:819 #, c-format msgid "cannot read existing object %s" msgstr "kan inte läsa befintligt objekt %s" -#: builtin/index-pack.c:831 +#: builtin/index-pack.c:833 #, c-format msgid "invalid blob object %s" msgstr "ogiltigt blob-objekt %s" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:847 #, c-format msgid "invalid %s" msgstr "ogiltigt %s" -#: builtin/index-pack.c:848 +#: builtin/index-pack.c:850 msgid "Error in object" msgstr "Fel i objekt" -#: builtin/index-pack.c:850 +#: builtin/index-pack.c:852 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Inte alla barnobjekt för %s kan nås" -#: builtin/index-pack.c:922 builtin/index-pack.c:953 +#: builtin/index-pack.c:924 builtin/index-pack.c:955 msgid "failed to apply delta" msgstr "misslyckades tillämpa delta" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Receiving objects" msgstr "Tar emot objekt" -#: builtin/index-pack.c:1123 +#: builtin/index-pack.c:1125 msgid "Indexing objects" msgstr "Skapar index för objekt" -#: builtin/index-pack.c:1155 +#: builtin/index-pack.c:1157 msgid "pack is corrupted (SHA1 mismatch)" msgstr "paketet är trasigt (SHA1 stämmer inte)" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1162 msgid "cannot fstat packfile" msgstr "kan inte utföra \"fstat\" på paketfil" -#: builtin/index-pack.c:1163 +#: builtin/index-pack.c:1165 msgid "pack has junk at the end" msgstr "paket har skräp i slutet" -#: builtin/index-pack.c:1174 +#: builtin/index-pack.c:1176 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "förvirrad bortom vanvett i parse_pack_objects()" -#: builtin/index-pack.c:1197 +#: builtin/index-pack.c:1199 msgid "Resolving deltas" msgstr "Analyserar delta" -#: builtin/index-pack.c:1208 +#: builtin/index-pack.c:1210 #, c-format msgid "unable to create thread: %s" msgstr "kunde inte skapa tråd: %s" -#: builtin/index-pack.c:1250 +#: builtin/index-pack.c:1252 msgid "confusion beyond insanity" msgstr "förvirrad bortom vanvett" -#: builtin/index-pack.c:1256 +#: builtin/index-pack.c:1258 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "slutfördes med %d lokalt objekt" msgstr[1] "slutfördes med %d lokala objekt" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1270 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Oväntad svanschecksumma för %s (trasig disk?)" -#: builtin/index-pack.c:1272 +#: builtin/index-pack.c:1274 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "paketet har %d oanalyserat delta" msgstr[1] "paketet har %d oanalyserade delta" -#: builtin/index-pack.c:1296 +#: builtin/index-pack.c:1298 #, c-format msgid "unable to deflate appended object (%d)" msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)" -#: builtin/index-pack.c:1372 +#: builtin/index-pack.c:1374 #, c-format msgid "local object %s is corrupt" msgstr "lokalt objekt %s är trasigt" -#: builtin/index-pack.c:1396 +#: builtin/index-pack.c:1398 msgid "error while closing pack file" msgstr "fel vid stängning av paketfil" -#: builtin/index-pack.c:1409 +#: builtin/index-pack.c:1411 #, c-format msgid "cannot write keep file '%s'" msgstr "kan inte ta skriva \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1417 +#: builtin/index-pack.c:1419 #, c-format msgid "cannot close written keep file '%s'" msgstr "akn inte stänga skriven \"keep\"-fil \"%s\"" -#: builtin/index-pack.c:1430 +#: builtin/index-pack.c:1432 msgid "cannot store pack file" msgstr "kan inte spara paketfil" -#: builtin/index-pack.c:1441 +#: builtin/index-pack.c:1443 msgid "cannot store index file" msgstr "kan inte spara indexfil" -#: builtin/index-pack.c:1474 +#: builtin/index-pack.c:1476 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "felaktig pack.indexversion=%<PRIu32>" -#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1486 builtin/index-pack.c:1683 #, c-format msgid "no threads support, ignoring %s" msgstr "trådstöd saknas, ignorerar %s" -#: builtin/index-pack.c:1542 +#: builtin/index-pack.c:1544 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Kan inte öppna befintlig paketfil \"%s\"" -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1546 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\"" -#: builtin/index-pack.c:1591 +#: builtin/index-pack.c:1593 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "icke-delta: %d objekt" msgstr[1] "icke-delta: %d objekt" -#: builtin/index-pack.c:1598 +#: builtin/index-pack.c:1600 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "kedjelängd = %d: %lu objekt" msgstr[1] "kedjelängd = %d: %lu objekt" -#: builtin/index-pack.c:1611 +#: builtin/index-pack.c:1613 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\"" -#: builtin/index-pack.c:1693 builtin/index-pack.c:1696 -#: builtin/index-pack.c:1712 builtin/index-pack.c:1716 +#: builtin/index-pack.c:1695 builtin/index-pack.c:1698 +#: builtin/index-pack.c:1714 builtin/index-pack.c:1718 #, c-format msgid "bad %s" msgstr "felaktig %s" -#: builtin/index-pack.c:1732 +#: builtin/index-pack.c:1734 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin kan inte användas med --stdin" -#: builtin/index-pack.c:1740 +#: builtin/index-pack.c:1736 +msgid "--stdin requires a git repository" +msgstr "--stdin kräver ett git-arkiv" + +#: builtin/index-pack.c:1744 msgid "--verify with no packfile name given" msgstr "--verify angavs utan paketfilnamn" @@ -8656,7 +9076,7 @@ msgstr "Två utdatakataloger?" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:476 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." @@ -8888,103 +9308,103 @@ msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:460 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<flaggor>] [<fil>...]" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:509 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:509 +#: builtin/ls-files.c:511 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:511 +#: builtin/ls-files.c:513 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:513 +#: builtin/ls-files.c:515 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:515 +#: builtin/ls-files.c:517 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:517 +#: builtin/ls-files.c:519 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:519 +#: builtin/ls-files.c:521 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:522 +#: builtin/ls-files.c:524 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:524 +#: builtin/ls-files.c:526 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:528 msgid "show 'other' directories' names only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:530 msgid "show line endings of files" msgstr "visa radslut i filer" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:532 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:533 +#: builtin/ls-files.c:535 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:535 +#: builtin/ls-files.c:537 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:537 +#: builtin/ls-files.c:539 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:542 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:545 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:547 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:548 +#: builtin/ls-files.c:550 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:553 msgid "recurse through submodules" msgstr "rekursera ner i undermoduler" -#: builtin/ls-files.c:553 +#: builtin/ls-files.c:555 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:556 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:555 +#: builtin/ls-files.c:557 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:557 +#: builtin/ls-files.c:559 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -9038,35 +9458,35 @@ msgstr "visa underliggande referens och objektet det pekar på" msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]" -#: builtin/ls-tree.c:128 +#: builtin/ls-tree.c:126 msgid "only show trees" msgstr "visa endast träd" -#: builtin/ls-tree.c:130 +#: builtin/ls-tree.c:128 msgid "recurse into subtrees" msgstr "rekursera ner i underträd" -#: builtin/ls-tree.c:132 +#: builtin/ls-tree.c:130 msgid "show trees when recursing" msgstr "visa träd medan rekursering" -#: builtin/ls-tree.c:135 +#: builtin/ls-tree.c:133 msgid "terminate entries with NUL byte" msgstr "terminera poster med NUL-byte" -#: builtin/ls-tree.c:136 +#: builtin/ls-tree.c:134 msgid "include object size" msgstr "inkludera objektstorlek" -#: builtin/ls-tree.c:138 builtin/ls-tree.c:140 +#: builtin/ls-tree.c:136 builtin/ls-tree.c:138 msgid "list only filenames" msgstr "visa endast filnamn" -#: builtin/ls-tree.c:143 +#: builtin/ls-tree.c:141 msgid "use full path names" msgstr "använd fullständiga sökvägsnamn" -#: builtin/ls-tree.c:145 +#: builtin/ls-tree.c:143 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)" @@ -9082,163 +9502,171 @@ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>" msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:102 +#: builtin/merge.c:49 +msgid "git merge --continue" +msgstr "git merge --continue" + +#: builtin/merge.c:104 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:139 +#: builtin/merge.c:141 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:140 +#: builtin/merge.c:142 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:145 +#: builtin/merge.c:147 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:195 builtin/pull.c:127 +#: builtin/merge.c:197 builtin/pull.c:127 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:198 builtin/pull.c:130 +#: builtin/merge.c:200 builtin/pull.c:130 msgid "show a diffstat at the end of the merge" msgstr "visa en diffstat när sammanslagningen är färdig" -#: builtin/merge.c:199 builtin/pull.c:133 +#: builtin/merge.c:201 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(synonym till --stat)" -#: builtin/merge.c:201 builtin/pull.c:136 +#: builtin/merge.c:203 builtin/pull.c:136 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:204 builtin/pull.c:139 +#: builtin/merge.c:206 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "skapa en ensam incheckning istället för en sammanslagning" -#: builtin/merge.c:206 builtin/pull.c:142 +#: builtin/merge.c:208 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "utför en incheckning om sammanslagningen lyckades (standard)" -#: builtin/merge.c:208 builtin/pull.c:145 +#: builtin/merge.c:210 builtin/pull.c:145 msgid "edit message before committing" msgstr "redigera meddelande innan incheckning" -#: builtin/merge.c:209 +#: builtin/merge.c:211 msgid "allow fast-forward (default)" msgstr "tillåt snabbspolning (standard)" -#: builtin/merge.c:211 builtin/pull.c:151 +#: builtin/merge.c:213 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:215 builtin/pull.c:154 +#: builtin/merge.c:217 builtin/pull.c:154 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:216 builtin/notes.c:774 builtin/pull.c:158 +#: builtin/merge.c:218 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "strategi" -#: builtin/merge.c:217 builtin/pull.c:159 +#: builtin/merge.c:219 builtin/pull.c:159 msgid "merge strategy to use" msgstr "sammanslagningsstrategi att använda" -#: builtin/merge.c:218 builtin/pull.c:162 +#: builtin/merge.c:220 builtin/pull.c:162 msgid "option=value" msgstr "alternativ=värde" -#: builtin/merge.c:219 builtin/pull.c:163 +#: builtin/merge.c:221 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "alternativ för vald sammanslagningsstrategi" -#: builtin/merge.c:221 +#: builtin/merge.c:223 msgid "merge commit message (for a non-fast-forward merge)" msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning" -#: builtin/merge.c:225 +#: builtin/merge.c:227 msgid "abort the current in-progress merge" msgstr "avbryt den pågående sammanslagningen" -#: builtin/merge.c:227 builtin/pull.c:170 +#: builtin/merge.c:229 +msgid "continue the current in-progress merge" +msgstr "fortsätt den pågående sammanslagningen" + +#: builtin/merge.c:231 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "tillåt sammanslagning av orelaterade historier" -#: builtin/merge.c:255 +#: builtin/merge.c:259 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:260 +#: builtin/merge.c:264 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:265 +#: builtin/merge.c:269 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:284 builtin/merge.c:301 +#: builtin/merge.c:288 builtin/merge.c:305 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:331 +#: builtin/merge.c:335 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:342 +#: builtin/merge.c:346 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:392 +#: builtin/merge.c:396 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:443 +#: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:533 +#: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:652 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:666 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:681 +#: builtin/merge.c:685 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:733 +#: builtin/merge.c:737 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:742 +#: builtin/merge.c:746 #, 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:748 +#: builtin/merge.c:752 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -9254,67 +9682,79 @@ msgstr "" "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:772 +#: builtin/merge.c:776 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:792 +#: builtin/merge.c:796 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:847 +#: builtin/merge.c:851 #, 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:863 +#: builtin/merge.c:867 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:904 +#: builtin/merge.c:908 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:906 +#: builtin/merge.c:910 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:908 +#: builtin/merge.c:912 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:913 +#: builtin/merge.c:917 #, 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:960 +#: builtin/merge.c:964 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\"" -#: builtin/merge.c:1034 +#: builtin/merge.c:1038 #, c-format msgid "could not close '%s'" msgstr "kunde inte stänga \"%s\"" -#: builtin/merge.c:1061 +#: builtin/merge.c:1065 #, 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:1095 +#: builtin/merge.c:1099 msgid "not something we can merge" msgstr "inte något vi kan slå ihop" -#: builtin/merge.c:1162 +#: builtin/merge.c:1167 +msgid "--abort expects no arguments" +msgstr "--abort tar inga argument" + +#: builtin/merge.c:1171 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." +msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1178 +#: builtin/merge.c:1183 +msgid "--continue expects no arguments" +msgstr "--continue tar inga argument" + +#: builtin/merge.c:1187 +msgid "There is no merge in progress (MERGE_HEAD missing)." +msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)." + +#: builtin/merge.c:1203 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9322,7 +9762,7 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du slår ihop." -#: builtin/merge.c:1185 +#: builtin/merge.c:1210 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -9330,114 +9770,114 @@ 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:1188 +#: builtin/merge.c:1213 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:1197 +#: builtin/merge.c:1222 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1205 +#: builtin/merge.c:1230 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1222 +#: builtin/merge.c:1247 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1224 +#: builtin/merge.c:1249 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:1229 +#: builtin/merge.c:1254 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1231 +#: builtin/merge.c:1256 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:1287 +#: builtin/merge.c:1312 #, 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." -#: builtin/merge.c:1290 +#: builtin/merge.c:1315 #, 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." -#: builtin/merge.c:1293 +#: builtin/merge.c:1318 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Incheckning %s har inte någon GPG-signatur." -#: builtin/merge.c:1296 +#: builtin/merge.c:1321 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n" -#: builtin/merge.c:1358 +#: builtin/merge.c:1383 msgid "refusing to merge unrelated histories" msgstr "vägrar slå samman orelaterad historik" -#: builtin/merge.c:1367 +#: builtin/merge.c:1392 msgid "Already up-to-date." msgstr "Redan à jour." -#: builtin/merge.c:1377 +#: builtin/merge.c:1402 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1418 +#: builtin/merge.c:1443 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1425 +#: builtin/merge.c:1450 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1475 msgid "Already up-to-date. Yeeah!" msgstr "Redan à jour. Toppen!" -#: builtin/merge.c:1456 +#: builtin/merge.c:1481 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1479 builtin/merge.c:1558 +#: builtin/merge.c:1504 builtin/merge.c:1583 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1483 +#: builtin/merge.c:1508 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagningsstrategin %s...\n" -#: builtin/merge.c:1549 +#: builtin/merge.c:1574 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1576 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1560 +#: builtin/merge.c:1585 #, 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:1572 +#: builtin/merge.c:1597 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -9570,95 +10010,95 @@ msgstr "tillåt saknade objekt" msgid "allow creation of more than one tree" msgstr "tillåt skapa mer än ett träd" -#: builtin/mv.c:15 +#: builtin/mv.c:16 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<flaggor>] <källa>... <mål>" -#: builtin/mv.c:70 +#: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "Katalogen %s är i indexet och inte en undermodul?" -#: builtin/mv.c:72 builtin/rm.c:317 +#: builtin/mv.c:84 builtin/rm.c:290 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "" "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta" -#: builtin/mv.c:90 +#: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s är i indexet" -#: builtin/mv.c:112 +#: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "tvinga flytta/ändra namn även om målet finns" -#: builtin/mv.c:113 +#: builtin/mv.c:125 msgid "skip move/rename errors" msgstr "hoppa över fel vid flytt/namnändring" -#: builtin/mv.c:155 +#: builtin/mv.c:167 #, c-format msgid "destination '%s' is not a directory" msgstr "destinationen \"%s\" är ingen katalog" -#: builtin/mv.c:166 +#: builtin/mv.c:178 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:170 +#: builtin/mv.c:182 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:173 +#: builtin/mv.c:185 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:176 +#: builtin/mv.c:188 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:185 +#: builtin/mv.c:197 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:210 +#: builtin/mv.c:222 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:213 +#: builtin/mv.c:225 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:221 +#: builtin/mv.c:233 #, c-format msgid "overwriting '%s'" msgstr "skriver över \"%s\"" -#: builtin/mv.c:224 +#: builtin/mv.c:236 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:227 +#: builtin/mv.c:239 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:229 +#: builtin/mv.c:241 msgid "destination directory does not exist" msgstr "destinationskatalogen finns inte" -#: builtin/mv.c:236 +#: builtin/mv.c:248 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:257 +#: builtin/mv.c:269 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375 +#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" @@ -9846,12 +10286,12 @@ msgstr "kunde inte skriva anteckningsobjekt" msgid "the note contents have been left in %s" msgstr "anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:233 builtin/tag.c:439 +#: builtin/notes.c:233 builtin/tag.c:460 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:235 builtin/tag.c:442 +#: builtin/notes.c:235 builtin/tag.c:463 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" @@ -10130,175 +10570,175 @@ msgid "" msgstr "" "git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]" -#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 +#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 #, c-format msgid "deflate error (%d)" msgstr "fel i deflate (%d)" -#: builtin/pack-objects.c:768 +#: builtin/pack-objects.c:766 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:781 +#: builtin/pack-objects.c:779 msgid "Writing objects" msgstr "Skriver objekt" -#: builtin/pack-objects.c:1070 +#: builtin/pack-objects.c:1068 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:2346 +#: builtin/pack-objects.c:2344 msgid "Compressing objects" msgstr "Komprimerar objekt" -#: builtin/pack-objects.c:2759 +#: builtin/pack-objects.c:2747 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2763 +#: builtin/pack-objects.c:2751 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2793 +#: builtin/pack-objects.c:2781 msgid "do not show progress meter" msgstr "visa inte förloppsindikator" -#: builtin/pack-objects.c:2795 +#: builtin/pack-objects.c:2783 msgid "show progress meter" msgstr "visa förloppsindikator" -#: builtin/pack-objects.c:2797 +#: builtin/pack-objects.c:2785 msgid "show progress meter during object writing phase" msgstr "visa förloppsindikator under objektskrivningsfasen" -#: builtin/pack-objects.c:2800 +#: builtin/pack-objects.c:2788 msgid "similar to --all-progress when progress meter is shown" msgstr "som --all-progress när förloppsindikatorn visas" -#: builtin/pack-objects.c:2801 +#: builtin/pack-objects.c:2789 msgid "version[,offset]" msgstr "version[,offset]" -#: builtin/pack-objects.c:2802 +#: builtin/pack-objects.c:2790 msgid "write the pack index file in the specified idx format version" msgstr "skriv paketindexfilen i angiven indexformatversion" -#: builtin/pack-objects.c:2805 +#: builtin/pack-objects.c:2793 msgid "maximum size of each output pack file" msgstr "maximal storlek på varje utdatapaketfil" -#: builtin/pack-objects.c:2807 +#: builtin/pack-objects.c:2795 msgid "ignore borrowed objects from alternate object store" msgstr "ignorera lånade objekt från alternativa objektlager" -#: builtin/pack-objects.c:2809 +#: builtin/pack-objects.c:2797 msgid "ignore packed objects" msgstr "ignorera packade objekt" -#: builtin/pack-objects.c:2811 +#: builtin/pack-objects.c:2799 msgid "limit pack window by objects" msgstr "begränsa paketfönster efter objekt" -#: builtin/pack-objects.c:2813 +#: builtin/pack-objects.c:2801 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:2815 +#: builtin/pack-objects.c:2803 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:2817 +#: builtin/pack-objects.c:2805 msgid "reuse existing deltas" msgstr "återanvänd befintliga delta" -#: builtin/pack-objects.c:2819 +#: builtin/pack-objects.c:2807 msgid "reuse existing objects" msgstr "återanvänd befintliga objekt" -#: builtin/pack-objects.c:2821 +#: builtin/pack-objects.c:2809 msgid "use OFS_DELTA objects" msgstr "använd OFS_DELTA-objekt" -#: builtin/pack-objects.c:2823 +#: builtin/pack-objects.c:2811 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:2825 +#: builtin/pack-objects.c:2813 msgid "do not create an empty pack output" msgstr "försök inte skapa tom paketutdata" -#: builtin/pack-objects.c:2827 +#: builtin/pack-objects.c:2815 msgid "read revision arguments from standard input" msgstr "läs revisionsargument från standard in" -#: builtin/pack-objects.c:2829 +#: builtin/pack-objects.c:2817 msgid "limit the objects to those that are not yet packed" msgstr "begränsa objekt till de som ännu inte packats" -#: builtin/pack-objects.c:2832 +#: builtin/pack-objects.c:2820 msgid "include objects reachable from any reference" msgstr "inkludera objekt som kan nås från någon referens" -#: builtin/pack-objects.c:2835 +#: builtin/pack-objects.c:2823 msgid "include objects referred by reflog entries" msgstr "inkludera objekt som refereras från referensloggposter" -#: builtin/pack-objects.c:2838 +#: builtin/pack-objects.c:2826 msgid "include objects referred to by the index" msgstr "inkludera objekt som refereras från indexet" -#: builtin/pack-objects.c:2841 +#: builtin/pack-objects.c:2829 msgid "output pack to stdout" msgstr "skriv paket på standard ut" -#: builtin/pack-objects.c:2843 +#: builtin/pack-objects.c:2831 msgid "include tag objects that refer to objects to be packed" msgstr "inkludera taggobjekt som refererar objekt som skall packas" -#: builtin/pack-objects.c:2845 +#: builtin/pack-objects.c:2833 msgid "keep unreachable objects" msgstr "behåll onåbara objekt" -#: builtin/pack-objects.c:2847 +#: builtin/pack-objects.c:2835 msgid "pack loose unreachable objects" msgstr "packa lösa onåbara objekt" -#: builtin/pack-objects.c:2849 +#: builtin/pack-objects.c:2837 msgid "unpack unreachable objects newer than <time>" msgstr "packa upp onåbara objekt nyare än <tid>" -#: builtin/pack-objects.c:2852 +#: builtin/pack-objects.c:2840 msgid "create thin packs" msgstr "skapa tunna paket" -#: builtin/pack-objects.c:2854 +#: builtin/pack-objects.c:2842 msgid "create packs suitable for shallow fetches" msgstr "skapa packfiler lämpade för grunda hämtningar" -#: builtin/pack-objects.c:2856 +#: builtin/pack-objects.c:2844 msgid "ignore packs that have companion .keep file" msgstr "ignorera paket som har tillhörande .keep-fil" -#: builtin/pack-objects.c:2858 +#: builtin/pack-objects.c:2846 msgid "pack compression level" msgstr "komprimeringsgrad för paket" -#: builtin/pack-objects.c:2860 +#: builtin/pack-objects.c:2848 msgid "do not hide commits by grafts" msgstr "göm inte incheckningar med ympningar (\"grafts\")" -#: builtin/pack-objects.c:2862 +#: builtin/pack-objects.c:2850 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:2864 +#: builtin/pack-objects.c:2852 msgid "write a bitmap index together with the pack index" msgstr "använd bitkartindex tillsammans med packindexet" -#: builtin/pack-objects.c:2993 +#: builtin/pack-objects.c:2979 msgid "Counting objects" msgstr "Räknar objekt" @@ -10326,11 +10766,11 @@ msgstr "Tar bort duplicerade objekt" msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]" -#: builtin/prune.c:106 builtin/worktree.c:128 +#: builtin/prune.c:106 msgid "report pruned objects" msgstr "rapportera borttagna objekt" -#: builtin/prune.c:109 builtin/worktree.c:130 +#: builtin/prune.c:109 msgid "expire objects older than <time>" msgstr "låt tid gå ut för objekt äldre än <tid>" @@ -10431,7 +10871,7 @@ msgstr "Se git-pull(1) för detaljer." msgid "<remote>" msgstr "<fjärr>" -#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451 +#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<gren>" @@ -10600,14 +11040,14 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:242 +#: builtin/push.c:245 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:249 +#: builtin/push.c:252 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -10619,7 +11059,7 @@ msgstr "" "\"git pull ....\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:255 +#: builtin/push.c:258 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -10631,7 +11071,7 @@ msgstr "" "\"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:261 +#: builtin/push.c:264 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -10645,11 +11085,11 @@ msgstr "" "(t.ex. \"git pull ...\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." -#: builtin/push.c:268 +#: builtin/push.c:271 msgid "Updates were rejected because the tag already exists in the remote." msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." -#: builtin/push.c:271 +#: builtin/push.c:274 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -10660,22 +11100,22 @@ msgstr "" "pekar på något som inte är en incheckning, utan att använda flaggan\n" "\"--force\".\n" -#: builtin/push.c:331 +#: builtin/push.c:334 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:335 +#: builtin/push.c:338 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:366 +#: builtin/push.c:369 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:367 +#: builtin/push.c:370 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -10696,114 +11136,114 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:385 +#: builtin/push.c:388 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:386 +#: builtin/push.c:389 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:391 +#: builtin/push.c:394 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:392 +#: builtin/push.c:395 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:397 +#: builtin/push.c:400 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:515 +#: builtin/push.c:518 msgid "repository" msgstr "arkiv" -#: builtin/push.c:516 builtin/send-pack.c:161 +#: builtin/push.c:519 builtin/send-pack.c:161 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:517 builtin/send-pack.c:163 +#: builtin/push.c:520 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:519 +#: builtin/push.c:522 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:520 +#: builtin/push.c:523 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:523 builtin/send-pack.c:164 +#: builtin/push.c:526 builtin/send-pack.c:164 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:525 builtin/send-pack.c:175 +#: builtin/push.c:528 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "refnamn>:<förvänta" -#: builtin/push.c:526 builtin/send-pack.c:176 +#: builtin/push.c:529 builtin/send-pack.c:176 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:529 +#: builtin/push.c:532 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:531 builtin/send-pack.c:169 +#: builtin/push.c:534 builtin/send-pack.c:169 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158 +#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:534 +#: builtin/push.c:537 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:537 +#: builtin/push.c:540 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:539 +#: builtin/push.c:542 msgid "bypass pre-push hook" msgstr "förbigå pre-push-krok" -#: builtin/push.c:540 +#: builtin/push.c:543 msgid "push missing but relevant tags" msgstr "sänd in saknade men relevanta taggar" -#: builtin/push.c:543 builtin/send-pack.c:166 +#: builtin/push.c:546 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "GPG-signera insändningen" -#: builtin/push.c:545 builtin/send-pack.c:170 +#: builtin/push.c:548 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "begär atomiska transaktioner på fjärrsidan" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "server-specific" msgstr "serverspecifik" -#: builtin/push.c:546 +#: builtin/push.c:549 msgid "option to transmit" msgstr "" "inget att checka in\n" "flagga att sända" -#: builtin/push.c:560 +#: builtin/push.c:563 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är inkompatibel med --all, --mirror och --tags" -#: builtin/push.c:562 +#: builtin/push.c:565 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" -#: builtin/push.c:579 +#: builtin/push.c:584 msgid "push options must not have new line characters" msgstr "push-flaggor kan inte innehålla radbrytning" @@ -10892,8 +11332,8 @@ msgid "" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" -"You can set 'receive.denyCurrentBranch' configuration variable to\n" -"'ignore' or 'warn' in the remote repository to allow pushing into\n" +"You can set the 'receive.denyCurrentBranch' configuration variable\n" +"to 'ignore' or 'warn' in the remote repository to allow pushing into\n" "its current branch; however, this is not recommended unless you\n" "arranged to update its work tree to match what you pushed in some\n" "other way.\n" @@ -11461,83 +11901,92 @@ msgstr "Okänt underkommando: %s" msgid "git repack [<options>]" msgstr "git repack [<flaggor>]" -#: builtin/repack.c:160 +#: builtin/repack.c:22 +msgid "" +"Incremental repacks are incompatible with bitmap indexes. Use\n" +"--no-write-bitmap-index or disable the pack.writebitmaps configuration." +msgstr "" +"Inkrementella ompackningar är inte kompatibla med bitmapp-index.\n" +"Använd --no-write-bitmap-index eller inaktivera inställningen\n" +"pack.writebitmaps" + +#: builtin/repack.c:166 msgid "pack everything in a single pack" msgstr "packa allt i ett enda paket" -#: builtin/repack.c:162 +#: builtin/repack.c:168 msgid "same as -a, and turn unreachable objects loose" msgstr "samma som -a, och gör onåbara objekt lösa" -#: builtin/repack.c:165 +#: builtin/repack.c:171 msgid "remove redundant packs, and run git-prune-packed" msgstr "ta bort överflödiga paket, och kör git-prune-packed" -#: builtin/repack.c:167 +#: builtin/repack.c:173 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "sänd --no-reuse-delta till git-pack-objects" -#: builtin/repack.c:169 +#: builtin/repack.c:175 msgid "pass --no-reuse-object to git-pack-objects" msgstr "sänd --no-reuse-object till git-pack-objects" -#: builtin/repack.c:171 +#: builtin/repack.c:177 msgid "do not run git-update-server-info" msgstr "kör inte git-update-server-info" -#: builtin/repack.c:174 +#: builtin/repack.c:180 msgid "pass --local to git-pack-objects" msgstr "sänd --local till git-pack-objects" -#: builtin/repack.c:176 +#: builtin/repack.c:182 msgid "write bitmap index" msgstr "skriv bitkartindex" -#: builtin/repack.c:177 +#: builtin/repack.c:183 msgid "approxidate" msgstr "cirkadatum" -#: builtin/repack.c:178 +#: builtin/repack.c:184 msgid "with -A, do not loosen objects older than this" msgstr "med -A, lös inte upp objekt äldre än detta" -#: builtin/repack.c:180 +#: builtin/repack.c:186 msgid "with -a, repack unreachable objects" msgstr "med -a, packa om onåbara objekt" -#: builtin/repack.c:182 +#: builtin/repack.c:188 msgid "size of the window used for delta compression" msgstr "storlek på fönster använt för deltakomprimering" -#: builtin/repack.c:183 builtin/repack.c:187 +#: builtin/repack.c:189 builtin/repack.c:193 msgid "bytes" msgstr "byte" -#: builtin/repack.c:184 +#: builtin/repack.c:190 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:186 +#: builtin/repack.c:192 msgid "limits the maximum delta depth" msgstr "begränsa maximalt deltadjup" -#: builtin/repack.c:188 +#: builtin/repack.c:194 msgid "maximum size of each packfile" msgstr "maximal storlek på varje paketfil" -#: builtin/repack.c:190 +#: builtin/repack.c:196 msgid "repack objects in packs marked with .keep" msgstr "packa om objekt i paket märkta med .keep" -#: builtin/repack.c:200 +#: builtin/repack.c:206 msgid "cannot delete packs in a precious-objects repo" msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv" -#: builtin/repack.c:204 +#: builtin/repack.c:210 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable och -A kan inte användas samtidigt" -#: builtin/repack.c:391 builtin/worktree.c:115 +#: builtin/repack.c:400 builtin/worktree.c:115 #, c-format msgid "failed to remove '%s'" msgstr "misslyckades ta bort \"%s\"" @@ -11767,23 +12216,23 @@ msgstr "Kunde inte skriva ny indexfil." msgid "rev-list does not support display of notes" msgstr "rev-list stöder inte visning av anteckningar" -#: builtin/rev-parse.c:386 +#: builtin/rev-parse.c:391 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]" -#: builtin/rev-parse.c:391 +#: builtin/rev-parse.c:396 msgid "keep the `--` passed as an arg" msgstr "behåll \"--\" sänt som argument" -#: builtin/rev-parse.c:393 +#: builtin/rev-parse.c:398 msgid "stop parsing after the first non-option argument" msgstr "sluta tolka efter första argument som inte är flagga" -#: builtin/rev-parse.c:396 +#: builtin/rev-parse.c:401 msgid "output in stuck long form" msgstr "utdata fast i lång form" -#: builtin/rev-parse.c:527 +#: builtin/rev-parse.c:532 msgid "" "git rev-parse --parseopt [<options>] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" @@ -11883,29 +12332,7 @@ msgstr "\"cherry-pick\" misslyckades" msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<flaggor>] [--] <fil>..." -#: builtin/rm.c:65 -msgid "" -"the following submodule (or one of its nested submodules)\n" -"uses a .git directory:" -msgid_plural "" -"the following submodules (or one of their nested submodules)\n" -"use a .git directory:" -msgstr[0] "" -"följande undermodul (eller en av dess nästlade undermoduler)\n" -"använder en .git-katalog:" -msgstr[1] "" -"följande undermoduler (eller en av deras nästlade undermoduler)\n" -"använder en .git-katalog:" - -#: builtin/rm.c:71 -msgid "" -"\n" -"(use 'rm -rf' if you really want to remove it including all of its history)" -msgstr "" -"\n" -"(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" - -#: builtin/rm.c:230 +#: builtin/rm.c:205 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" @@ -11917,7 +12344,7 @@ msgstr[0] "" msgstr[1] "" "följande filer har köat innehåll som skiljer sig både från filen och HEAD:" -#: builtin/rm.c:235 +#: builtin/rm.c:210 msgid "" "\n" "(use -f to force removal)" @@ -11925,13 +12352,13 @@ msgstr "" "\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:239 +#: builtin/rm.c:214 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "följande fil har ändringar köade i indexet:" msgstr[1] "följande filer har ändringar köade i indexet:" -#: builtin/rm.c:243 builtin/rm.c:254 +#: builtin/rm.c:218 builtin/rm.c:227 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" @@ -11939,42 +12366,47 @@ msgstr "" "\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:251 +#: builtin/rm.c:224 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "följande fil har lokala ändringar:" msgstr[1] "följande filer har lokala ändringar:" -#: builtin/rm.c:269 +#: builtin/rm.c:242 msgid "do not list removed files" msgstr "lista inte borttagna filer" -#: builtin/rm.c:270 +#: builtin/rm.c:243 msgid "only remove from the index" msgstr "ta bara bort från indexet" -#: builtin/rm.c:271 +#: builtin/rm.c:244 msgid "override the up-to-date check" msgstr "överstyr àjour-testet" -#: builtin/rm.c:272 +#: builtin/rm.c:245 msgid "allow recursive removal" msgstr "tillåt rekursiv borttagning" -#: builtin/rm.c:274 +#: builtin/rm.c:247 msgid "exit with a zero status even if nothing matched" msgstr "avsluta med nollstatus även om inget träffades" -#: builtin/rm.c:335 +#: builtin/rm.c:308 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:374 +#: builtin/rm.c:347 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" +#: builtin/rm.c:370 +#, c-format +msgid "could not remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + #: builtin/send-pack.c:18 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" @@ -12007,23 +12439,27 @@ msgstr "visa status från fjärrhjälpare" msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]" -#: builtin/shortlog.c:242 +#: builtin/shortlog.c:249 +msgid "Group by committer rather than author" +msgstr "Gruppera efter incheckare istället för författare" + +#: builtin/shortlog.c:251 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:244 +#: builtin/shortlog.c:253 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:246 +#: builtin/shortlog.c:255 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:247 +#: builtin/shortlog.c:256 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:248 +#: builtin/shortlog.c:257 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -12175,35 +12611,35 @@ msgstr "" msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<mönster>]" -#: builtin/show-ref.c:165 +#: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "visa endast taggar (kan kombineras med huvuden)" -#: builtin/show-ref.c:166 +#: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "visa endast huvuden (kan kombineras med taggar)" -#: builtin/show-ref.c:167 +#: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "striktare referenskontroll, kräver exakt referenssökväg" -#: builtin/show-ref.c:170 builtin/show-ref.c:172 +#: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "visa HEAD-refrens, även när den skulle filtreras ut" -#: builtin/show-ref.c:174 +#: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "avreferera taggar till objekt-id" -#: builtin/show-ref.c:176 +#: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "visa SHA1-hash endast med <n> siffror" -#: builtin/show-ref.c:180 +#: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "visa inte resultat på standard ut (användbart med --verify)" -#: builtin/show-ref.c:182 +#: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "visa referenser från standard in som inte finns i lokalt arkiv" @@ -12223,12 +12659,12 @@ msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken" msgid "prepend comment character and space to each line" msgstr "lägg in kommentarstecken och blanksteg först på varje rad" -#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046 +#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1062 #, c-format msgid "No such ref: %s" msgstr "Ingen sådan referens: %s" -#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1071 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Förväntade fullt referensnamn, fick %s" @@ -12238,8 +12674,7 @@ msgstr "Förväntade fullt referensnamn, fick %s" msgid "cannot strip one component off url '%s'" msgstr "kan inte ta bort en komponent från url:en \"%s\"" -#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408 -#: builtin/submodule--helper.c:590 +#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:592 msgid "alternative anchor for relative paths" msgstr "alternativa ankare för relativa sökvägar" @@ -12247,84 +12682,84 @@ msgstr "alternativa ankare för relativa sökvägar" msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]" -#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343 +#: builtin/submodule--helper.c:333 builtin/submodule--helper.c:347 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules" -#: builtin/submodule--helper.c:369 +#: builtin/submodule--helper.c:373 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Misslyckades registrera url för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:373 +#: builtin/submodule--helper.c:377 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n" -#: builtin/submodule--helper.c:383 +#: builtin/submodule--helper.c:387 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n" -#: builtin/submodule--helper.c:390 +#: builtin/submodule--helper.c:394 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\"" -#: builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:410 msgid "Suppress output for initializing a submodule" msgstr "Dölj utdata från initiering av undermodul" -#: builtin/submodule--helper.c:414 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<sökväg>]" -#: builtin/submodule--helper.c:435 +#: builtin/submodule--helper.c:436 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <sökväg>" -#: builtin/submodule--helper.c:441 +#: builtin/submodule--helper.c:442 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\"" -#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527 +#: builtin/submodule--helper.c:525 builtin/submodule--helper.c:528 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s" -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:564 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:571 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte" -#: builtin/submodule--helper.c:593 +#: builtin/submodule--helper.c:595 msgid "where the new submodule will be cloned to" msgstr "var den nya undermodulen skall klonas till" -#: builtin/submodule--helper.c:596 +#: builtin/submodule--helper.c:598 msgid "name of the new submodule" msgstr "namn på den nya undermodulen" -#: builtin/submodule--helper.c:599 +#: builtin/submodule--helper.c:601 msgid "url where to clone the submodule from" msgstr "URL att klona undermodulen från" -#: builtin/submodule--helper.c:605 +#: builtin/submodule--helper.c:607 msgid "depth for shallow clones" msgstr "djup för grunda kloner" -#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964 +#: builtin/submodule--helper.c:610 builtin/submodule--helper.c:980 msgid "force cloning progress" msgstr "tvinga kloningsförlopp" -#: builtin/submodule--helper.c:613 +#: builtin/submodule--helper.c:615 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" @@ -12332,97 +12767,92 @@ msgstr "" "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference " "<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>" -#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648 -#, c-format -msgid "could not create directory '%s'" -msgstr "kunde inte skapa katalogen \"%s\"" - -#: builtin/submodule--helper.c:644 +#: builtin/submodule--helper.c:646 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\"" -#: builtin/submodule--helper.c:660 +#: builtin/submodule--helper.c:662 #, c-format msgid "cannot open file '%s'" msgstr "kan inte öppna filen \"%s\"" -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "could not close file %s" msgstr "kunde inte stänga filen %s" -#: builtin/submodule--helper.c:672 +#: builtin/submodule--helper.c:674 #, c-format msgid "could not get submodule directory for '%s'" msgstr "kunde inte få tag i undermodulkatalog för \"%s\"" -#: builtin/submodule--helper.c:726 +#: builtin/submodule--helper.c:742 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Undermodulsökvägen \"%s\" har inte initierats" -#: builtin/submodule--helper.c:730 +#: builtin/submodule--helper.c:746 msgid "Maybe you want to use 'update --init'?" msgstr "Kanske menade du att använda \"update --init\"?" -#: builtin/submodule--helper.c:756 +#: builtin/submodule--helper.c:772 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Hoppar över ej sammanslagen undermodul %s" -#: builtin/submodule--helper.c:777 +#: builtin/submodule--helper.c:793 #, c-format msgid "Skipping submodule '%s'" msgstr "Hoppar över undermodulen \"%s\"" -#: builtin/submodule--helper.c:913 +#: builtin/submodule--helper.c:929 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Misslyckades klona \"%s\". Nytt försök planlagt" -#: builtin/submodule--helper.c:924 +#: builtin/submodule--helper.c:940 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "Misslyckades klona \"%s\" för andra gången, avbryter" -#: builtin/submodule--helper.c:945 +#: builtin/submodule--helper.c:961 builtin/submodule--helper.c:1105 msgid "path into the working tree" msgstr "sökväg inuti arbetskatalogen" -#: builtin/submodule--helper.c:948 +#: builtin/submodule--helper.c:964 msgid "path into the working tree, across nested submodule boundaries" msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser" -#: builtin/submodule--helper.c:952 +#: builtin/submodule--helper.c:968 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout eller none" -#: builtin/submodule--helper.c:956 +#: builtin/submodule--helper.c:972 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Skapa en grund klon trunkerad till angivet antal revisioner" -#: builtin/submodule--helper.c:959 +#: builtin/submodule--helper.c:975 msgid "parallel jobs" msgstr "parallella jobb" -#: builtin/submodule--helper.c:961 +#: builtin/submodule--helper.c:977 msgid "whether the initial clone should follow the shallow recommendation" msgstr "om den första klonen skall följa rekommendation för grund kloning" -#: builtin/submodule--helper.c:962 +#: builtin/submodule--helper.c:978 msgid "don't print cloning progress" msgstr "skriv inte klonförlopp" -#: builtin/submodule--helper.c:969 +#: builtin/submodule--helper.c:985 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:979 +#: builtin/submodule--helper.c:995 msgid "bad value for update parameter" msgstr "felaktigt värde för parametern update" -#: builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:1066 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -12431,11 +12861,24 @@ msgstr "" "Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men " "huvudprojektet är inte på någon gren" -#: builtin/submodule--helper.c:1100 +#: builtin/submodule--helper.c:1106 +msgid "recurse into submodules" +msgstr "rekursera ner i undermoduler" + +#: builtin/submodule--helper.c:1112 +msgid "git submodule--helper embed-git-dir [<path>...]" +msgstr "git submodule--helper embed-git-dir [<sökväg>...]" + +#: builtin/submodule--helper.c:1157 msgid "submodule--helper subcommand must be called with a subcommand" msgstr "underkommandot submodule--helper måste anropas med ett underkommando" -#: builtin/submodule--helper.c:1107 +#: builtin/submodule--helper.c:1164 +#, c-format +msgid "%s doesn't support --super-prefix" +msgstr "%s stöder inte --super-prefix" + +#: builtin/submodule--helper.c:1170 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper" @@ -12490,25 +12933,25 @@ msgstr "" "\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]" #: builtin/tag.c:27 -msgid "git tag -v <tagname>..." -msgstr "git tag -v <taggnamn>..." +msgid "git tag -v [--format=<format>] <tagname>..." +msgstr "git tag -v [--format=<format>] <taggnamn>..." -#: builtin/tag.c:81 +#: builtin/tag.c:82 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:86 +#: builtin/tag.c:87 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:101 +#: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:117 +#: builtin/tag.c:131 #, c-format msgid "" "\n" @@ -12521,7 +12964,7 @@ msgstr "" " %s\n" "Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:121 +#: builtin/tag.c:135 #, c-format msgid "" "\n" @@ -12536,138 +12979,138 @@ msgstr "" "Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" "du vill.\n" -#: builtin/tag.c:199 +#: builtin/tag.c:213 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:201 +#: builtin/tag.c:215 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:226 +#: builtin/tag.c:240 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:239 +#: builtin/tag.c:253 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:275 +#: builtin/tag.c:289 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:281 +#: builtin/tag.c:295 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:339 +#: builtin/tag.c:354 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:341 +#: builtin/tag.c:356 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:343 +#: builtin/tag.c:358 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:344 +#: builtin/tag.c:359 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:346 +#: builtin/tag.c:361 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:348 +#: builtin/tag.c:363 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:350 +#: builtin/tag.c:365 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:352 +#: builtin/tag.c:367 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:356 +#: builtin/tag.c:371 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:357 +#: builtin/tag.c:372 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:358 builtin/update-ref.c:368 +#: builtin/tag.c:373 builtin/update-ref.c:368 msgid "create a reflog" msgstr "skapa en reflog" -#: builtin/tag.c:360 +#: builtin/tag.c:375 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:361 +#: builtin/tag.c:376 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:362 builtin/tag.c:363 +#: builtin/tag.c:377 builtin/tag.c:378 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:364 +#: builtin/tag.c:379 msgid "print only tags that are merged" msgstr "visa endast taggar som slagits samman" -#: builtin/tag.c:365 +#: builtin/tag.c:380 msgid "print only tags that are not merged" msgstr "visa endast taggar som ej slagits samman" -#: builtin/tag.c:370 +#: builtin/tag.c:385 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:399 +#: builtin/tag.c:415 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:419 +#: builtin/tag.c:437 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:421 +#: builtin/tag.c:439 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:423 +#: builtin/tag.c:441 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:425 +#: builtin/tag.c:443 msgid "--merged and --no-merged option are only allowed with -l" msgstr "flaggorna --merged och --no-merged tillåts endast tillsammans med -l" -#: builtin/tag.c:433 +#: builtin/tag.c:454 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:452 +#: builtin/tag.c:473 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:458 +#: builtin/tag.c:479 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:463 +#: builtin/tag.c:484 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:491 +#: builtin/tag.c:512 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -12857,7 +13300,7 @@ msgstr "testa om filsystemet stöder ospårad cache" msgid "enable untracked cache without testing the filesystem" msgstr "aktivera ospårad cache utan att testa filsystemet" -#: builtin/update-index.c:1119 +#: builtin/update-index.c:1120 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -12865,11 +13308,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:1123 +#: builtin/update-index.c:1124 msgid "Untracked cache disabled" msgstr "Ospårad cache är inaktiverad" -#: builtin/update-index.c:1131 +#: builtin/update-index.c:1132 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -12877,7 +13320,7 @@ 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:1135 +#: builtin/update-index.c:1136 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Ospårad cache är aktiverad för \"%s\"" @@ -12926,7 +13369,7 @@ msgstr "git verify-commit [-v | --verbose] <incheckning>..." msgid "print commit contents" msgstr "visa innehåll för incheckning" -#: builtin/verify-commit.c:73 builtin/verify-tag.c:35 +#: builtin/verify-commit.c:73 builtin/verify-tag.c:37 msgid "print raw gpg status output" msgstr "visa råa gpg-statusdata" @@ -12942,11 +13385,11 @@ msgstr "pratsam" msgid "show statistics only" msgstr "visa endast statistik" -#: builtin/verify-tag.c:17 -msgid "git verify-tag [-v | --verbose] <tag>..." -msgstr "git verify-tag [-v | --verbose] <tagg>..." +#: 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:34 +#: builtin/verify-tag.c:36 msgid "print tag contents" msgstr "visa innehåll för tag" @@ -12995,6 +13438,14 @@ msgstr "Tar bort worktrees/%s: felaktig gitdir-fil" 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:128 +msgid "report pruned working trees" +msgstr "rapportera borttagna arbetskataloger" + +#: builtin/worktree.c:130 +msgid "expire working trees older than <time>" +msgstr "låt tid gå ut för arbetskataloger äldre än <tid>" + #: builtin/worktree.c:204 #, c-format msgid "'%s' already exists" @@ -13031,30 +13482,30 @@ msgstr "befolka den nya arbetskatalogen" msgid "-b, -B, and --detach are mutually exclusive" msgstr "-b, -B och --detach är ömsesidigt uteslutande" -#: builtin/worktree.c:470 +#: builtin/worktree.c:472 msgid "reason for locking" msgstr "orsak till lås" -#: builtin/worktree.c:482 builtin/worktree.c:515 +#: builtin/worktree.c:484 builtin/worktree.c:517 #, c-format msgid "'%s' is not a working tree" msgstr "\"%s\" är inte en arbetskatalog" -#: builtin/worktree.c:484 builtin/worktree.c:517 +#: builtin/worktree.c:486 builtin/worktree.c:519 msgid "The main working tree cannot be locked or unlocked" msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp" -#: builtin/worktree.c:489 +#: builtin/worktree.c:491 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "\"%s\" är redan låst, orsak: %s" -#: builtin/worktree.c:491 +#: builtin/worktree.c:493 #, c-format msgid "'%s' is already locked" msgstr "\"%s\" är redan låst" -#: builtin/worktree.c:519 +#: builtin/worktree.c:521 #, c-format msgid "'%s' is not locked" msgstr "\"%s\" är inte låst" @@ -13079,19 +13530,19 @@ msgstr "endast användbart vid felsökning" msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<flaggor>] <katalog>" -#: upload-pack.c:1028 +#: upload-pack.c:1036 msgid "quit after a single request/response exchange" msgstr "avsluta omedelbart efter första anrop/svar-utväxling" -#: upload-pack.c:1030 +#: upload-pack.c:1038 msgid "exit immediately after initial ref advertisement" msgstr "avsluta omedelbart efter inledande kungörelse av referenser" -#: upload-pack.c:1032 +#: upload-pack.c:1040 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog" -#: upload-pack.c:1034 +#: upload-pack.c:1042 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "avbryt överföringen efter <n> sekunders inaktivitet" @@ -13122,14 +13573,30 @@ msgstr "" "några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n" "<koncept>\" för att läsa mer om specifika underkommandon och koncept." -#: http.c:342 +#: http.c:344 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "Delegerad styrning stöds inte av cURL < 7.22.0" -#: http.c:351 +#: http.c:353 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:1713 +#, c-format +msgid "" +"unable to update url base from redirection:\n" +" asked for: %s\n" +" redirect: %s" +msgstr "" +"kan inte uppdatera urlbas från omdirigerin:\n" +" bad om: %s\n" +" omdirigering: %s" + +#: remote-curl.c:319 +#, c-format +msgid "redirecting to %s" +msgstr "omdirigerar till %s" + #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "starta arbetskatalog (se också: git help tutorial)" @@ -13502,7 +13969,7 @@ msgstr "Försök enkel sammanslagning med $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning." -#: git-rebase.sh:56 +#: git-rebase.sh:57 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -13513,51 +13980,37 @@ msgstr "" "Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n" "För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"." -#: git-rebase.sh:156 git-rebase.sh:395 +#: git-rebase.sh:157 git-rebase.sh:396 #, sh-format msgid "Could not move back to $head_name" msgstr "Kunde inte flytta tillbaka till $head_name" -#: git-rebase.sh:167 -msgid "Applied autostash." -msgstr "Tillämpade autostash." - -#: git-rebase.sh:170 +#: git-rebase.sh:171 #, sh-format msgid "Cannot store $stash_sha1" msgstr "Kan inte spara $stash_sha1" -#: git-rebase.sh:171 -msgid "" -"Applying autostash resulted in conflicts.\n" -"Your changes are safe in the stash.\n" -"You can run \"git stash pop\" or \"git stash drop\" at any time.\n" -msgstr "" -"Tillämpning av autostash gav konflikter.\n" -"Dina ändringar är säkra i stashen.\n" -"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n" - -#: git-rebase.sh:210 +#: git-rebase.sh:211 msgid "The pre-rebase hook refused to rebase." msgstr "Kroken pre-rebase vägrade ombaseringen." -#: git-rebase.sh:215 +#: git-rebase.sh:216 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "Det verkar som en git-am körs. Kan inte ombasera." -#: git-rebase.sh:356 +#: git-rebase.sh:357 msgid "No rebase in progress?" msgstr "Ingen ombasering pågår?" -#: git-rebase.sh:367 +#: git-rebase.sh:368 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering." -#: git-rebase.sh:374 +#: git-rebase.sh:375 msgid "Cannot read HEAD" msgstr "Kan inte läsa HEAD" -#: git-rebase.sh:377 +#: git-rebase.sh:378 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -13565,7 +14018,7 @@ msgstr "" "Du måste redigera alla sammanslagningskonflikter och\n" "därefter markera dem som lösta med git add" -#: git-rebase.sh:414 +#: git-rebase.sh:418 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -13586,65 +14039,65 @@ msgstr "" "och kör programmet igen. Jag avslutar ifall du fortfarande har\n" "något av värde där." -#: git-rebase.sh:465 +#: git-rebase.sh:469 #, sh-format msgid "invalid upstream $upstream_name" msgstr "ogiltig uppström $upstream_name" -#: git-rebase.sh:489 +#: git-rebase.sh:493 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: mer än en sammanslagningsbas finns" -#: git-rebase.sh:492 git-rebase.sh:496 +#: git-rebase.sh:496 git-rebase.sh:500 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ingen sammanslagningsbas finns" -#: git-rebase.sh:501 +#: git-rebase.sh:505 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "Peka på en giltig incheckning: $onto_name" -#: git-rebase.sh:524 +#: git-rebase.sh:528 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "ödesdigert: ingen sådan gren: $branch_name" -#: git-rebase.sh:557 +#: git-rebase.sh:561 msgid "Cannot autostash" msgstr "Kan inte utföra \"autostash\"" -#: git-rebase.sh:562 +#: git-rebase.sh:566 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "Skapade autostash: $stash_abbrev" -#: git-rebase.sh:566 +#: git-rebase.sh:570 msgid "Please commit or stash them." msgstr "Checka in eller använd \"stash\" på dem." -#: git-rebase.sh:586 +#: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "Aktuell gren $branch_name är à jour." -#: git-rebase.sh:590 +#: git-rebase.sh:594 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad." -#: git-rebase.sh:601 +#: git-rebase.sh:605 #, sh-format msgid "Changes from $mb to $onto:" msgstr "Ändringar från $mb till $onto:" -#: git-rebase.sh:610 +#: git-rebase.sh:614 msgid "First, rewinding head to replay your work on top of it..." msgstr "" "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..." -#: git-rebase.sh:620 +#: git-rebase.sh:624 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "Snabbspolade $branch_name till $onto_name." @@ -13810,21 +14263,26 @@ msgstr "Inget grennamn angavs" msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:184 +#: git-submodule.sh:181 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå" -#: git-submodule.sh:194 +#: git-submodule.sh:191 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:211 +#: git-submodule.sh:210 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:215 +#: git-submodule.sh:213 +#, sh-format +msgid "'$sm_path' already exists in the index and is not a submodule" +msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul" + +#: git-submodule.sh:218 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -13835,22 +14293,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:233 +#: git-submodule.sh:236 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:235 +#: git-submodule.sh:238 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:243 +#: git-submodule.sh:246 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:245 +#: git-submodule.sh:248 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -13868,48 +14326,48 @@ msgstr "" "arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n" "flaggan \"--name\"." -#: git-submodule.sh:251 +#: git-submodule.sh:254 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:263 +#: git-submodule.sh:266 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:268 +#: git-submodule.sh:271 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:277 +#: git-submodule.sh:280 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:324 +#: git-submodule.sh:327 #, sh-format msgid "Entering '$displaypath'" msgstr "Går in i \"$displaypath\"" -#: git-submodule.sh:344 +#: git-submodule.sh:347 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "" "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:415 +#: git-submodule.sh:418 #, sh-format msgid "pathspec and --all are incompatible" msgstr "sökvägsangivelse och --all är inkompatibla" -#: git-submodule.sh:420 +#: git-submodule.sh:423 #, sh-format msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler" -#: git-submodule.sh:440 +#: git-submodule.sh:443 #, sh-format msgid "" "Submodule work tree '$displaypath' contains a .git directory\n" @@ -13918,7 +14376,7 @@ msgstr "" "Undermodulsarbetskatalogen \"$displaypath\" innehåller en .git-katalog\n" "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" -#: git-submodule.sh:448 +#: git-submodule.sh:451 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " @@ -13927,38 +14385,38 @@ msgstr "" "Undermodulens arbetskatalog \"$displaypath\" har lokala ändringar; \"-f\" " "kastar bort dem" -#: git-submodule.sh:451 +#: git-submodule.sh:454 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "Rensade katalogen \"$displaypath\"" -#: git-submodule.sh:452 +#: git-submodule.sh:455 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "Kunde inte ta bort undermodulens arbetskatalog \"$displaypath\"" -#: git-submodule.sh:455 +#: git-submodule.sh:458 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "Kunde inte skapa tom undermodulskatalog \"$displaypath\"" -#: git-submodule.sh:464 +#: git-submodule.sh:467 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "" "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\"" -#: git-submodule.sh:617 +#: git-submodule.sh:623 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:627 +#: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:632 +#: git-submodule.sh:638 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -13967,12 +14425,12 @@ msgstr "" "Kan inte hitta aktuell revision för ${remote_name}/${branch} i " "undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:650 +#: git-submodule.sh:656 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\"" -#: git-submodule.sh:656 +#: git-submodule.sh:662 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -13981,84 +14439,84 @@ msgstr "" "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. " "Direkt hämtning av incheckningen misslyckades." -#: git-submodule.sh:663 +#: git-submodule.sh:669 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:664 +#: git-submodule.sh:670 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\"" -#: git-submodule.sh:668 +#: git-submodule.sh:674 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:669 +#: git-submodule.sh:675 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:674 +#: git-submodule.sh:680 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:675 +#: git-submodule.sh:681 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:680 +#: git-submodule.sh:686 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:681 +#: git-submodule.sh:687 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\"" -#: git-submodule.sh:712 +#: git-submodule.sh:718 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\"" -#: git-submodule.sh:820 +#: git-submodule.sh:826 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" -#: git-submodule.sh:872 +#: git-submodule.sh:878 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:892 +#: git-submodule.sh:898 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src" -#: git-submodule.sh:895 +#: git-submodule.sh:901 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst" -#: git-submodule.sh:898 +#: git-submodule.sh:904 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Varning: $display_name innehåller inte incheckningarna $sha1_src och " "$sha1_dst" -#: git-submodule.sh:1045 +#: git-submodule.sh:1051 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:1112 +#: git-submodule.sh:1118 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "Synkroniserar undermodul-url för \"$displaypath\"" @@ -14068,12 +14526,12 @@ msgstr "Synkroniserar undermodul-url för \"$displaypath\"" msgid "See git-${cmd}(1) for details." msgstr "Se git-${cmd}(1) för detaljer." -#: git-rebase--interactive.sh:131 +#: git-rebase--interactive.sh:140 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "Ombaserar ($new_count/$total)" -#: git-rebase--interactive.sh:147 +#: git-rebase--interactive.sh:156 msgid "" "\n" "Commands:\n" @@ -14099,7 +14557,7 @@ msgstr "" "\n" "Du kan byta ordning på raderna, de utförs uppifrån och ned.\n" -#: git-rebase--interactive.sh:162 +#: git-rebase--interactive.sh:171 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -14108,7 +14566,7 @@ msgstr "" "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en " "incheckning.\n" -#: git-rebase--interactive.sh:166 +#: git-rebase--interactive.sh:175 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -14116,7 +14574,7 @@ msgstr "" "\n" "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n" -#: git-rebase--interactive.sh:202 +#: git-rebase--interactive.sh:211 #, sh-format msgid "" "You can amend the commit now, with\n" @@ -14135,87 +14593,83 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:227 +#: git-rebase--interactive.sh:236 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1: inte en incheckning som kan väljas" -#: git-rebase--interactive.sh:266 +#: git-rebase--interactive.sh:275 #, sh-format msgid "Invalid commit name: $sha1" msgstr "Felaktigt incheckningsnamn: $sha1" -#: git-rebase--interactive.sh:308 +#: git-rebase--interactive.sh:317 msgid "Cannot write current commit's replacement sha1" msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning" -#: git-rebase--interactive.sh:360 +#: git-rebase--interactive.sh:369 #, sh-format msgid "Fast-forward to $sha1" msgstr "Snabbspolade till $sha1" -#: git-rebase--interactive.sh:362 +#: git-rebase--interactive.sh:371 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "Kan inte snabbspola till $sha1" -#: git-rebase--interactive.sh:371 +#: git-rebase--interactive.sh:380 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "Kan inte flytta HEAD till $first_parent" -#: git-rebase--interactive.sh:376 +#: git-rebase--interactive.sh:385 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1" -#: git-rebase--interactive.sh:390 +#: git-rebase--interactive.sh:399 #, sh-format msgid "Error redoing merge $sha1" msgstr "Fel när sammanslagningen $sha1 skulle göras om" -#: git-rebase--interactive.sh:398 +#: git-rebase--interactive.sh:407 #, sh-format msgid "Could not pick $sha1" msgstr "Kunde inte välja $sha1" -#: git-rebase--interactive.sh:407 +#: git-rebase--interactive.sh:416 #, sh-format msgid "This is the commit message #${n}:" msgstr "Det här är incheckningsmeddelande ${n}:" -#: git-rebase--interactive.sh:412 +#: git-rebase--interactive.sh:421 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "Incheckningsmeddelande ${n} kommer hoppas över:" -#: git-rebase--interactive.sh:423 +#: git-rebase--interactive.sh:432 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "Det här är en kombination av $count incheckning." msgstr[1] "Det här är en kombination av $count incheckningar." -#: git-rebase--interactive.sh:431 +#: git-rebase--interactive.sh:441 #, sh-format msgid "Cannot write $fixup_msg" msgstr "Kan inte skriva $fixup_msg" -#: git-rebase--interactive.sh:434 +#: git-rebase--interactive.sh:444 msgid "This is a combination of 2 commits." msgstr "Det här är en kombination av 2 incheckningar." -#: git-rebase--interactive.sh:435 -msgid "This is the 1st commit message:" -msgstr "Det här är 1:a incheckningsmeddelandet:" - -#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518 -#: git-rebase--interactive.sh:521 +#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528 +#: git-rebase--interactive.sh:531 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "kunde inte tillämpa $sha1... $rest" -#: git-rebase--interactive.sh:549 +#: git-rebase--interactive.sh:559 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" @@ -14229,31 +14683,31 @@ msgstr "" "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n" "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet." -#: git-rebase--interactive.sh:564 +#: git-rebase--interactive.sh:574 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "Stoppade på $sha1_abbrev... $rest" -#: git-rebase--interactive.sh:579 +#: git-rebase--interactive.sh:589 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning" -#: git-rebase--interactive.sh:621 +#: git-rebase--interactive.sh:631 #, sh-format msgid "Executing: $rest" msgstr "Kör: $rest" -#: git-rebase--interactive.sh:629 +#: git-rebase--interactive.sh:639 #, sh-format msgid "Execution failed: $rest" msgstr "Körning misslyckades: $rest" -#: git-rebase--interactive.sh:631 +#: git-rebase--interactive.sh:641 msgid "and made changes to the index and/or the working tree" msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen" -#: git-rebase--interactive.sh:633 +#: git-rebase--interactive.sh:643 msgid "" "You can fix the problem, and then run\n" "\n" @@ -14264,7 +14718,7 @@ msgstr "" "\tgit rebase --continue\"" #. TRANSLATORS: after these lines is a command to be issued by the user -#: git-rebase--interactive.sh:646 +#: git-rebase--interactive.sh:656 #, sh-format msgid "" "Execution succeeded: $rest\n" @@ -14279,25 +14733,25 @@ msgstr "" "\n" "\tgit rebase --continue" -#: git-rebase--interactive.sh:657 +#: git-rebase--interactive.sh:667 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "Okänt kommando: $command $sha1 $rest" -#: git-rebase--interactive.sh:658 +#: git-rebase--interactive.sh:668 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "Rätta det med \"git rebase --edit-todo\"." -#: git-rebase--interactive.sh:693 +#: git-rebase--interactive.sh:703 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "Lyckades ombasera och uppdatera $head_name." -#: git-rebase--interactive.sh:740 +#: git-rebase--interactive.sh:750 msgid "Could not skip unnecessary pick commands" msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon" -#: git-rebase--interactive.sh:898 +#: git-rebase--interactive.sh:908 #, sh-format msgid "" "Warning: the SHA-1 is missing or isn't a commit in the following line:\n" @@ -14306,7 +14760,7 @@ msgstr "" "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n" " - $line" -#: git-rebase--interactive.sh:931 +#: git-rebase--interactive.sh:941 #, sh-format msgid "" "Warning: the command isn't recognized in the following line:\n" @@ -14315,11 +14769,11 @@ msgstr "" "Varning: kommandot kändes inte igen på följande rad:\n" " - $line" -#: git-rebase--interactive.sh:970 +#: git-rebase--interactive.sh:980 msgid "could not detach HEAD" msgstr "kunde inte koppla från HEAD" -#: git-rebase--interactive.sh:1008 +#: git-rebase--interactive.sh:1018 msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):" @@ -14327,7 +14781,7 @@ msgstr "" "Varning: vissa incheckningar kan av misstag ha tappats.\n" "Tappade incheckningar (nyaste först):" -#: git-rebase--interactive.sh:1016 +#: git-rebase--interactive.sh:1026 msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" @@ -14344,7 +14798,7 @@ msgstr "" "Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error" "\" (fel)." -#: git-rebase--interactive.sh:1027 +#: git-rebase--interactive.sh:1037 #, sh-format msgid "" "Unrecognized setting $check_level for option rebase.missingCommitsCheck. " @@ -14352,7 +14806,7 @@ msgid "" msgstr "" "Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar." -#: git-rebase--interactive.sh:1044 +#: git-rebase--interactive.sh:1054 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'." @@ -14360,15 +14814,15 @@ msgstr "" "Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --" "continue\"." -#: git-rebase--interactive.sh:1045 +#: git-rebase--interactive.sh:1055 msgid "Or you can abort the rebase with 'git rebase --abort'." msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"." -#: git-rebase--interactive.sh:1069 +#: git-rebase--interactive.sh:1079 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "Kunde inte ta bort CHERRY_PICK_HEAD" -#: git-rebase--interactive.sh:1074 +#: git-rebase--interactive.sh:1084 #, sh-format msgid "" "You have staged changes in your working tree.\n" @@ -14399,11 +14853,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: git-rebase--interactive.sh:1091 +#: git-rebase--interactive.sh:1101 msgid "Error trying to find the author identity to amend commit" msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning" -#: git-rebase--interactive.sh:1096 +#: git-rebase--interactive.sh:1106 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." @@ -14411,11 +14865,11 @@ msgstr "" "Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n" "först och kör sedan \"git rebase --continute\" igen." -#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105 +#: git-rebase--interactive.sh:1111 git-rebase--interactive.sh:1115 msgid "Could not commit staged changes." msgstr "Kunde inte checka in köade ändringar." -#: git-rebase--interactive.sh:1129 +#: git-rebase--interactive.sh:1139 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -14429,40 +14883,40 @@ msgstr "" " git rebase --continue\n" "\n" -#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295 +#: git-rebase--interactive.sh:1147 git-rebase--interactive.sh:1305 msgid "Could not execute editor" msgstr "Kunde inte starta textredigerare" -#: git-rebase--interactive.sh:1150 +#: git-rebase--interactive.sh:1160 #, sh-format msgid "Could not checkout $switch_to" msgstr "Kunde inte checka ut $switch_to" -#: git-rebase--interactive.sh:1155 +#: git-rebase--interactive.sh:1165 msgid "No HEAD?" msgstr "Inget HEAD?" -#: git-rebase--interactive.sh:1156 +#: git-rebase--interactive.sh:1166 #, sh-format msgid "Could not create temporary $state_dir" msgstr "Kunde inte skapa temporär $state_dir" -#: git-rebase--interactive.sh:1158 +#: git-rebase--interactive.sh:1168 msgid "Could not mark as interactive" msgstr "Kunde inte markera som interaktiv" -#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173 +#: git-rebase--interactive.sh:1178 git-rebase--interactive.sh:1183 msgid "Could not init rewritten commits" msgstr "Kunde inte initiera omskrivna incheckningar" -#: git-rebase--interactive.sh:1273 +#: git-rebase--interactive.sh:1283 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)" msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)" -#: git-rebase--interactive.sh:1278 +#: git-rebase--interactive.sh:1288 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -14472,7 +14926,7 @@ msgstr "" "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n" "\n" -#: git-rebase--interactive.sh:1285 +#: git-rebase--interactive.sh:1295 msgid "Note that empty commits are commented out" msgstr "Observera att tomma incheckningar är utkommenterade" @@ -14536,6 +14990,908 @@ msgstr "Du måste köra kommandot från arbetskatalogens toppnivå." msgid "Unable to determine absolute path of git directory" msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" +#. TRANSLATORS: you can adjust this to align "git add -i" status menu +#: git-add--interactive.perl:238 +#, perl-format +msgid "%12s %12s %s" +msgstr "%12s %12s %s" + +#: git-add--interactive.perl:239 +msgid "staged" +msgstr "köad" + +#: git-add--interactive.perl:239 +msgid "unstaged" +msgstr "ej köad" + +#: git-add--interactive.perl:297 git-add--interactive.perl:322 +msgid "binary" +msgstr "binär" + +#: git-add--interactive.perl:306 git-add--interactive.perl:360 +msgid "nothing" +msgstr "ingenting" + +#: git-add--interactive.perl:342 git-add--interactive.perl:357 +msgid "unchanged" +msgstr "oändrad" + +#: git-add--interactive.perl:653 +#, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "lade till %d sökväg\n" +msgstr[1] "lade till %d sökvägar\n" + +#: git-add--interactive.perl:656 +#, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "uppdaterade %d sökväg\n" +msgstr[1] "uppdaterade %d sökvägar\n" + +#: git-add--interactive.perl:659 +#, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "återställde %d sökväg\n" +msgstr[1] "återställde %d sökvägar\n" + +#: git-add--interactive.perl:662 +#, perl-format +msgid "touched %d path\n" +msgid_plural "touched %d paths\n" +msgstr[0] "rörde %d sökväg\n" +msgstr[1] "rörde %d sökvägar\n" + +#: git-add--interactive.perl:671 +msgid "Update" +msgstr "Uppdatera" + +#: git-add--interactive.perl:683 +msgid "Revert" +msgstr "Återställ" + +#: git-add--interactive.perl:706 +#, perl-format +msgid "note: %s is untracked now.\n" +msgstr "observera: %s spåras inte längre.\n" + +#: git-add--interactive.perl:717 +msgid "Add untracked" +msgstr "Lägg till ospårad" + +#: git-add--interactive.perl:723 +msgid "No untracked files.\n" +msgstr "Inga ospårade filer.\n" + +#: git-add--interactive.perl:1039 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for staging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"köas omedelbart." + +#: git-add--interactive.perl:1042 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for stashing." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"läggas till i \"stash\" omedelbart." + +#: git-add--interactive.perl:1045 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for unstaging." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"tas bort från kön omedelbart." + +#: git-add--interactive.perl:1048 git-add--interactive.perl:1057 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for applying." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för applicering omedelbart." + +#: git-add--interactive.perl:1051 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding" +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för kasta omedelbart" + +#: git-add--interactive.perl:1054 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be\n" +"marked for discarding." +msgstr "" +"Om patchen kan appliceras rent kommer det redigerade stycket att\n" +"markeras för kasta omedelbart." + +#: git-add--interactive.perl:1067 +#, perl-format +msgid "failed to open hunk edit file for writing: %s" +msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s" + +#: git-add--interactive.perl:1068 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n" + +#: git-add--interactive.perl:1074 +#, perl-format +msgid "" +"---\n" +"To remove '%s' lines, make them ' ' lines (context).\n" +"To remove '%s' lines, delete them.\n" +"Lines starting with %s will be removed.\n" +msgstr "" +"---\n" +"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n" +"Ta bort \"%s\" rader genom att radera dem.\n" +"Rader som börjar med %s kommer att tas bort.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: git-add--interactive.perl:1082 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n" +"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n" +"redigeringen och stycket lämnas oförändrat.\n" + +#: git-add--interactive.perl:1096 +#, perl-format +msgid "failed to open hunk edit file for reading: %s" +msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: git-add--interactive.perl:1187 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) " +"[y/n]?" + +#: git-add--interactive.perl:1196 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file" +msgstr "" +"y - köa stycket\n" +"n - köa inte stycket\n" +"q - avsluta; köa inte stycket eller något av de följande\n" +"a - köa stycket och alla följande i filen\n" +"d - köa inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1202 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file" +msgstr "" +"y - \"stash\":a stycket\n" +"n - \"stash\":a inte stycket\n" +"q - avsluta; \"stash\":a inte stycket eller något av de följande\n" +"a - \"stash\":a stycket och alla följande i filen\n" +"d - \"stash\":a inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1208 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file" +msgstr "" +"y - ta bort stycket från kön\n" +"n - ta inte bort stycket från kön\n" +"q - avsluta; ta inte bort stycket eller något av de följande från kön\n" +"a - ta bort stycket och alla följande i filen från kön\n" +"d - ta inte bort stycket eller något av de följande i filen från kön" + +#: git-add--interactive.perl:1214 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - applicera stycket på indexet\n" +"n - applicera inte stycket på indexet\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1220 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - förkasta stycket från arbetskatalogen\n" +"n - förkasta inte stycket från arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1226 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file" +msgstr "" +"y - förkasta stycket från indexet och arbetskatalogen\n" +"n - förkasta inte stycket från indexet och arbetskatalogen\n" +"q - avsluta; förkasta inte stycket eller något av de följande\n" +"a - förkasta stycket och alla följande i filen\n" +"d - förkasta inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1232 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file" +msgstr "" +"y - applicera stycket på indexet och arbetskatalogen\n" +"n - applicera inte stycket på indexet och arbetskatalogen\n" +"q - avsluta; applicera inte stycket eller något av de följande\n" +"a - applicera stycket och alla följande i filen\n" +"d - applicera inte stycket eller något av de följande i filen" + +#: git-add--interactive.perl:1241 +msgid "" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"g - välj ett stycke att gå till\n" +"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n" +"j - lämna stycket obestämt, se nästa obestämda stycke\n" +"J - lämna stycket obestämt, se nästa stycke\n" +"k - lämna stycket obestämt, se föregående obestämda stycke\n" +"K - lämna stycket obestämt, se föregående stycke\n" +"s - dela aktuellt stycke i mindre styckens\n" +"e - redigera aktuellt stycke manuellt\n" +"? - visa hjälp\n" + +#: git-add--interactive.perl:1272 +msgid "The selected hunks do not apply to the index!\n" +msgstr "Markerade stycken kan inte appliceras på indexet!\n" + +#: git-add--interactive.perl:1273 +msgid "Apply them to the worktree anyway? " +msgstr "Applicera dem på arbetskatalogen trots det? " + +#: git-add--interactive.perl:1276 +msgid "Nothing was applied.\n" +msgstr "Ingenting applicerades.\n" + +#: git-add--interactive.perl:1287 +#, perl-format +msgid "ignoring unmerged: %s\n" +msgstr "ignorerar ej sammanslagen: %s\n" + +#: git-add--interactive.perl:1296 +msgid "Only binary files changed.\n" +msgstr "Endast binära filer ändrade.\n" + +#: git-add--interactive.perl:1298 +msgid "No changes.\n" +msgstr "Inga ändringar.\n" + +#: git-add--interactive.perl:1306 +msgid "Patch update" +msgstr "Uppdatera patch" + +#: git-add--interactive.perl:1358 +#, perl-format +msgid "Stage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Köa ändrat läge [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1359 +#, perl-format +msgid "Stage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Köa borttagning [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1360 +#, perl-format +msgid "Stage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Köa stycket [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1363 +#, perl-format +msgid "Stash mode change [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a ändrat läge [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1364 +#, perl-format +msgid "Stash deletion [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a borttagning [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1365 +#, perl-format +msgid "Stash this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Stash:a stycket [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1368 +#, perl-format +msgid "Unstage mode change [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort ändrat läge från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1369 +#, perl-format +msgid "Unstage deletion [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort borttagning från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1370 +#, perl-format +msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? " +msgstr "Ta bort stycket från kön [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1373 +#, perl-format +msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera ändrat läge på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1374 +#, perl-format +msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera borttagning på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1375 +#, perl-format +msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? " +msgstr "Applicera stycket på indexet [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1378 +#, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1379 +#, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1380 +#, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1383 +#, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1384 +#, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1385 +#, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1388 +#, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1389 +#, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "" +"Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1390 +#, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? " +msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d,/%s,?]?" + +#: git-add--interactive.perl:1493 +msgid "go to which hunk (<ret> to see more)? " +msgstr "gå till vilket stycke (<ret> för att se fler)?" + +#: git-add--interactive.perl:1495 +msgid "go to which hunk? " +msgstr "gå till vilket stycke?" + +#: git-add--interactive.perl:1504 +#, perl-format +msgid "Invalid number: '%s'\n" +msgstr "Ogiltigt siffervärde: \"%s\"\n" + +#: git-add--interactive.perl:1509 +#, perl-format +msgid "Sorry, only %d hunk available.\n" +msgid_plural "Sorry, only %d hunks available.\n" +msgstr[0] "Beklagar, det finns bara %d stycke.\n" +msgstr[1] "Beklagar, det finns bara %d stycken.\n" + +#: git-add--interactive.perl:1535 +msgid "search for regex? " +msgstr "sök efter reguljärt uttryck? " + +#: git-add--interactive.perl:1548 +#, perl-format +msgid "Malformed search regexp %s: %s\n" +msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n" + +#: git-add--interactive.perl:1558 +msgid "No hunk matches the given pattern\n" +msgstr "Inga stycken motsvarar givet mönster\n" + +#: git-add--interactive.perl:1570 git-add--interactive.perl:1592 +msgid "No previous hunk\n" +msgstr "Inget föregående stycke\n" + +#: git-add--interactive.perl:1579 git-add--interactive.perl:1598 +msgid "No next hunk\n" +msgstr "Inget följande stycke\n" + +#: git-add--interactive.perl:1606 +#, perl-format +msgid "Split into %d hunk.\n" +msgid_plural "Split into %d hunks.\n" +msgstr[0] "Dela i %d stycke.\n" +msgstr[1] "Dela i %d stycken.\n" + +#: git-add--interactive.perl:1658 +msgid "Review diff" +msgstr "Granska diff" + +#. TRANSLATORS: please do not translate the command names +#. 'status', 'update', 'revert', etc. +#: git-add--interactive.perl:1677 +msgid "" +"status - show paths with changes\n" +"update - add working tree state to the staged set of changes\n" +"revert - revert staged set of changes back to the HEAD version\n" +"patch - pick hunks and update selectively\n" +"diff\t - view diff between HEAD and index\n" +"add untracked - add contents of untracked files to the staged set of " +"changes\n" +msgstr "" +"status - visa sökvägar med ändringar\n" +"update - lägg arbetskatalogens tillstånd till köade ändringar\n" +"revert - återställ köade ändringar till HEAD-versionen\n" +"patch - välj och uppdatera valda stycken\n" +"diff\t - visa diff mellan HEAD och index\n" +"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n" + +#: git-add--interactive.perl:1694 git-add--interactive.perl:1699 +#: git-add--interactive.perl:1702 git-add--interactive.perl:1709 +#: git-add--interactive.perl:1713 git-add--interactive.perl:1719 +msgid "missing --" +msgstr "saknad --" + +#: git-add--interactive.perl:1715 +#, perl-format +msgid "unknown --patch mode: %s" +msgstr "okänt läge för --patch: %s" + +#: git-add--interactive.perl:1721 git-add--interactive.perl:1727 +#, perl-format +msgid "invalid argument %s, expecting --" +msgstr "felaktigt argument %s, förväntar --" + +#: git-send-email.perl:121 +msgid "local zone differs from GMT by a non-minute interval\n" +msgstr "lokal zon skiljer sig från GMT med delar av minuter\n" + +#: git-send-email.perl:128 git-send-email.perl:134 +msgid "local time offset greater than or equal to 24 hours\n" +msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n" + +#: git-send-email.perl:202 git-send-email.perl:208 +msgid "the editor exited uncleanly, aborting everything" +msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting" + +#: git-send-email.perl:282 +#, perl-format +msgid "" +"'%s' contains an intermediate version of the email you were composing.\n" +msgstr "" +"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n" + +#: git-send-email.perl:287 +#, perl-format +msgid "'%s.final' contains the composed email.\n" +msgstr "\"%s.final\" innehåller det skrivna brevet.\n" + +#: git-send-email.perl:305 +msgid "--dump-aliases incompatible with other options\n" +msgstr "--dump-alias är inkompatibelt med andra flaggor\n" + +#: git-send-email.perl:368 git-send-email.perl:623 +msgid "Cannot run git format-patch from outside a repository\n" +msgstr "Kan inte köra git format-patch från utanför arkivet\n" + +#: git-send-email.perl:437 +#, perl-format +msgid "Unknown --suppress-cc field: '%s'\n" +msgstr "Okänt fält i --suppress-cc: \"%s\"\n" + +#: git-send-email.perl:466 +#, perl-format +msgid "Unknown --confirm setting: '%s'\n" +msgstr "Okänd inställning i --confirm: \"%s\"\n" + +#: git-send-email.perl:498 +#, perl-format +msgid "warning: sendmail alias with quotes is not supported: %s\n" +msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n" + +#: git-send-email.perl:500 +#, perl-format +msgid "warning: `:include:` not supported: %s\n" +msgstr "varning: \":include:\" stöds inte: %s\n" + +#: git-send-email.perl:502 +#, perl-format +msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" +msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n" + +#: git-send-email.perl:507 +#, perl-format +msgid "warning: sendmail line is not recognized: %s\n" +msgstr "varning: sendmail-raden känns inte igen: %s\n" + +#: git-send-email.perl:589 +#, perl-format +msgid "" +"File '%s' exists but it could also be the range of commits\n" +"to produce patches for. Please disambiguate by...\n" +"\n" +" * Saying \"./%s\" if you mean a file; or\n" +" * Giving --format-patch option if you mean a range.\n" +msgstr "" +"Filen \"%s\" finns men kan också vara ett incheckningsintervall\n" +"att skapa patchar för. Gör otvetydigt genom att...\n" +"\n" +" * Säga \"./%s\" om du menar en fil; eller\n" +" * Ange flaggan --format-patch om du menar ett intervall.\n" + +#: git-send-email.perl:610 +#, perl-format +msgid "Failed to opendir %s: %s" +msgstr "Misslyckades utföra opendir %s: %s" + +#: git-send-email.perl:634 +#, perl-format +msgid "" +"fatal: %s: %s\n" +"warning: no patches were sent\n" +msgstr "" +"ödesdigert: %s: %s\n" +"varning: inga patchar har sänts\n" + +#: git-send-email.perl:645 +msgid "" +"\n" +"No patch files specified!\n" +"\n" +msgstr "" +"\n" +"Inga patchfiler angavs!\n" +"\n" + +#: git-send-email.perl:658 +#, perl-format +msgid "No subject line in %s?" +msgstr "Ingen ärenderad i %s?" + +#: git-send-email.perl:668 +#, perl-format +msgid "Failed to open for writing %s: %s" +msgstr "Kunde inte öppna för skrivning %s: %s" + +#: git-send-email.perl:678 +msgid "" +"Lines beginning in \"GIT:\" will be removed.\n" +"Consider including an overall diffstat or table of contents\n" +"for the patch you are writing.\n" +"\n" +"Clear the body content if you don't wish to send a summary.\n" +msgstr "" +"Rader som börjar med \"GIT:\" kommer tas bort.\n" +"Överväg att ta med en övergripande diffstatus eller\n" +"innehållsförteckning för patchen du skriver.\n" +"\n" +"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n" + +#: git-send-email.perl:701 +#, perl-format +msgid "Failed to open %s.final: %s" +msgstr "Misslyckades öppna %s.final: %s" + +#: git-send-email.perl:704 +#, perl-format +msgid "Failed to open %s: %s" +msgstr "Misslyckades öppna %s: %s" + +#: git-send-email.perl:739 +msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" +msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n" + +#: git-send-email.perl:748 +msgid "Summary email is empty, skipping it\n" +msgstr "Sammanfattande brev tomt, hoppar över\n" + +#. TRANSLATORS: please keep [y/N] as is. +#: git-send-email.perl:780 +#, perl-format +msgid "Are you sure you want to use <%s> [y/N]? " +msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? " + +#: git-send-email.perl:809 +msgid "" +"The following files are 8bit, but do not declare a Content-Transfer-" +"Encoding.\n" +msgstr "" +"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n" + +#: git-send-email.perl:814 +msgid "Which 8bit encoding should I declare [UTF-8]? " +msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]?" + +#: git-send-email.perl:822 +#, perl-format +msgid "" +"Refusing to send because the patch\n" +"\t%s\n" +"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " +"want to send.\n" +msgstr "" +"Vägrar sända eftersom patchen\n" +"\t%s\n" +"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen " +"vill sända.\n" + +#: git-send-email.perl:841 +msgid "To whom should the emails be sent (if anyone)?" +msgstr "Till vem skall breven sändas (om någon)?" + +#: git-send-email.perl:859 +#, perl-format +msgid "fatal: alias '%s' expands to itself\n" +msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n" + +#: git-send-email.perl:871 +msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " +msgstr "" +"Message-ID att använda som In-Reply-To för det första brevet (om något)?" + +#: git-send-email.perl:921 git-send-email.perl:929 +#, perl-format +msgid "error: unable to extract a valid address from: %s\n" +msgstr "fel: kunde inte få fram en giltig adress från: %s\n" + +#. TRANSLATORS: Make sure to include [q] [d] [e] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:933 +msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " +msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera):" + +#: git-send-email.perl:1234 +#, perl-format +msgid "CA path \"%s\" does not exist" +msgstr "CA-sökvägen \"%s\" finns inte" + +#: git-send-email.perl:1309 +msgid "" +" The Cc list above has been expanded by additional\n" +" addresses found in the patch commit message. By default\n" +" send-email prompts before sending whenever this occurs.\n" +" This behavior is controlled by the sendemail.confirm\n" +" configuration setting.\n" +"\n" +" For additional information, run 'git send-email --help'.\n" +" To retain the current behavior, but squelch this message,\n" +" run 'git config --global sendemail.confirm auto'.\n" +"\n" +msgstr "" +" Kopielistan ovan har utökats av ytterligare adresser\n" +" funna i patchens incheckningsmeddelande. Send-email\n" +" frågar som standard innan sändning när detta sker.\n" +" Beteendet styrs av konfigurationsinställningen\n" +" sendemail.confirm\n" +"\n" +" För ytterligare information, kör \"git send-email --help\".\n" +" För att behålla nuvarande beteende, men dölja detta\n" +" meddelande, kör \"git config --global sendemail.confirm auto\".\n" +"\n" + +#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your +#. translation. The program will only accept English input +#. at this point. +#: git-send-email.perl:1324 +msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): " +msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): " + +#: git-send-email.perl:1327 +msgid "Send this email reply required" +msgstr "Svar krävs på frågan \"Sända brevet?\"" + +#: git-send-email.perl:1353 +msgid "The required SMTP server is not properly defined." +msgstr "Nödvändig SMTP-server har inte angivits korrekt." + +#: git-send-email.perl:1397 +#, perl-format +msgid "Server does not support STARTTLS! %s" +msgstr "Servern stöder inte SMARTTLS! %s" + +#: git-send-email.perl:1403 +msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." +msgstr "" +"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --" +"smtp-debug." + +#: git-send-email.perl:1421 +#, perl-format +msgid "Failed to send %s\n" +msgstr "Misslyckades sända %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Dry-Sent %s\n" +msgstr "Test-Sände %s\n" + +#: git-send-email.perl:1424 +#, perl-format +msgid "Sent %s\n" +msgstr "Sände %s\n" + +#: git-send-email.perl:1426 +msgid "Dry-OK. Log says:\n" +msgstr "Test-OK. Loggen säger:\n" + +#: git-send-email.perl:1426 +msgid "OK. Log says:\n" +msgstr "OK. Loggen säger:\n" + +#: git-send-email.perl:1438 +msgid "Result: " +msgstr "Resultat: " + +#: git-send-email.perl:1441 +msgid "Result: OK\n" +msgstr "Resultat: OK\n" + +#: git-send-email.perl:1454 +#, perl-format +msgid "can't open file %s" +msgstr "kan inte öppna filen %s" + +#: git-send-email.perl:1501 git-send-email.perl:1521 +#, perl-format +msgid "(mbox) Adding cc: %s from line '%s'\n" +msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n" + +#: git-send-email.perl:1507 +#, perl-format +msgid "(mbox) Adding to: %s from line '%s'\n" +msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n" + +#: git-send-email.perl:1555 +#, perl-format +msgid "(non-mbox) Adding cc: %s from line '%s'\n" +msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n" + +#: git-send-email.perl:1578 +#, perl-format +msgid "(body) Adding cc: %s from line '%s'\n" +msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n" + +#: git-send-email.perl:1676 +#, perl-format +msgid "(%s) Could not execute '%s'" +msgstr "(%s) Kunde inte köra \"%s\"" + +#: git-send-email.perl:1683 +#, perl-format +msgid "(%s) Adding %s: %s from: '%s'\n" +msgstr "(%s) Lägger till %s: %s från: \"%s\"\n" + +#: git-send-email.perl:1687 +#, perl-format +msgid "(%s) failed to close pipe to '%s'" +msgstr "(%s) misslyckades stänga röret till \"%s\"" + +#: git-send-email.perl:1714 +msgid "cannot send message as 7bit" +msgstr "kan inte sända brev som sjubitars" + +#: git-send-email.perl:1722 +msgid "invalid transfer encoding" +msgstr "ogiltig överföringskondning" + +#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802 +#, perl-format +msgid "unable to open %s: %s\n" +msgstr "kunde inte öppna %s: %s\n" + +#: git-send-email.perl:1744 +#, perl-format +msgid "%s: patch contains a line longer than 998 characters" +msgstr "%s: patchen innehåller en rad längre än 998 tecken" + +#: git-send-email.perl:1760 +#, perl-format +msgid "Skipping %s with backup suffix '%s'.\n" +msgstr "" +"Hoppar över %s med filnamnstillägget \"%s\" som används för " +"säkerhetskopior.\n" + +#. TRANSLATORS: please keep "[y|N]" as is. +#: git-send-email.perl:1764 +#, perl-format +msgid "Do you really want to send %s? [y|N]: " +msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: " + +#~ msgid "Use an experimental blank-line-based heuristic to improve diffs" +#~ msgstr "" +#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra " +#~ "diffar" + +#~ msgid "Clever... amending the last one with dirty index." +#~ msgstr "Smart... utöka den senaste med smutsigt index." + +#~ msgid "" +#~ "the following submodule (or one of its nested submodules)\n" +#~ "uses a .git directory:" +#~ msgid_plural "" +#~ "the following submodules (or one of their nested submodules)\n" +#~ "use a .git directory:" +#~ msgstr[0] "" +#~ "följande undermodul (eller en av dess nästlade undermoduler)\n" +#~ "använder en .git-katalog:" +#~ msgstr[1] "" +#~ "följande undermoduler (eller en av deras nästlade undermoduler)\n" +#~ "använder en .git-katalog:" + +#~ msgid "" +#~ "\n" +#~ "(use 'rm -rf' if you really want to remove it including all of its " +#~ "history)" +#~ msgstr "" +#~ "\n" +#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)" + #~ msgid "Could not write to %s" #~ msgstr "Kunde inte skriva till %s" @@ -14723,9 +16079,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "bug: unhandled diff status %c" #~ msgstr "programfel: diff-status %c ej hanterad" -#~ msgid "read of %s failed" -#~ msgstr "misslyckades läsa %s" - #~ msgid "could not write branch description template" #~ msgstr "kunde inte skriva grenbeskrivningsmall" @@ -14810,12 +16163,6 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "unable to access '%s': %s" #~ msgstr "kan inte komma åt \"%s\": %s" -#~ msgid "could not open '%s' for reading: %s" -#~ msgstr "kunde inte öppna \"%s\" för läsning: %s" - -#~ msgid "could not open '%s' for writing: %s" -#~ msgstr "Kunde inte öppna \"%s\" för skrivning: %s" - #~ msgid " git branch -d %s\n" #~ msgstr " git branch -d %s\n" @@ -15310,18 +16657,12 @@ msgstr "Kunde inte bestämma absolut sökväg till git-katalogen" #~ msgid "oops" #~ msgstr "hoppsan" -#~ msgid "Would not remove %s\n" -#~ msgstr "Skulle inte ta bort %s\n" - #~ msgid "Not removing %s\n" #~ msgstr "Tar inte bort %s\n" #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" -#~ msgid " 0 files changed" -#~ msgstr " 0 filer ändrade" - #~ msgid " %d file changed" #~ msgid_plural " %d files changed" #~ msgstr[0] " %d fil ändrad" |